diff --git a/src/ef_ase.c b/src/ef_ase.c index f9cd633a..d3cd033a 100644 --- a/src/ef_ase.c +++ b/src/ef_ase.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eAS_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eAS_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eAS_mv(eEC_Effect_c* effect, GAME* game); +static void eAS_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_ase = { + // clang-format off + &eAS_init, + &eAS_ct, + &eAS_mv, + &eAS_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eAS_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eAS_mv(eEC_Effect_c* effect, GAME* game) { static void eAS_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_ase = { - // clang-format off - &eAS_init, - &eAS_ct, - &eAS_mv, - &eAS_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_ase2.c b/src/ef_ase2.c index ff94dc12..f1d9ed27 100644 --- a/src/ef_ase2.c +++ b/src/ef_ase2.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eAS2_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eAS2_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eAS2_mv(eEC_Effect_c* effect, GAME* game); +static void eAS2_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_ase2 = { + // clang-format off + &eAS2_init, + &eAS2_ct, + &eAS2_mv, + &eAS2_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eAS2_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eAS2_mv(eEC_Effect_c* effect, GAME* game) { static void eAS2_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_ase2 = { - // clang-format off - &eAS2_init, - &eAS2_ct, - &eAS2_mv, - &eAS2_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_ase_ch.c b/src/ef_ase_ch.c index f54225e3..5b63d5a5 100644 --- a/src/ef_ase_ch.c +++ b/src/ef_ase_ch.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eASC_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eASC_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eASC_mv(eEC_Effect_c* effect, GAME* game); +static void eASC_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_ase_ch = { + // clang-format off + &eASC_init, + &eASC_ct, + &eASC_mv, + &eASC_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eASC_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eASC_mv(eEC_Effect_c* effect, GAME* game) { static void eASC_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_ase_ch = { - // clang-format off - &eASC_init, - &eASC_ct, - &eASC_mv, - &eASC_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_break_axe.c b/src/ef_break_axe.c index 86c159de..d0c8233d 100644 --- a/src/ef_break_axe.c +++ b/src/ef_break_axe.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eBreak_Axe_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eBreak_Axe_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eBreak_Axe_mv(eEC_Effect_c* effect, GAME* game); +static void eBreak_Axe_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_break_axe = { + // clang-format off + &eBreak_Axe_init, + &eBreak_Axe_ct, + &eBreak_Axe_mv, + &eBreak_Axe_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eBreak_Axe_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eBreak_Axe_mv(eEC_Effect_c* effect, GAME* game) { static void eBreak_Axe_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_break_axe = { - // clang-format off - &eBreak_Axe_init, - &eBreak_Axe_ct, - &eBreak_Axe_mv, - &eBreak_Axe_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_bubu.c b/src/ef_bubu.c index e2b8feac..a3813a93 100644 --- a/src/ef_bubu.c +++ b/src/ef_bubu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eBubu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eBubu_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eBubu_mv(eEC_Effect_c* effect, GAME* game); +static void eBubu_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_bubu = { + // clang-format off + &eBubu_init, + &eBubu_ct, + &eBubu_mv, + &eBubu_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eBubu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eBubu_mv(eEC_Effect_c* effect, GAME* game) { static void eBubu_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_bubu = { - // clang-format off - &eBubu_init, - &eBubu_ct, - &eBubu_mv, - &eBubu_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_buruburu.c b/src/ef_buruburu.c index 5bee3d46..cd798e04 100644 --- a/src/ef_buruburu.c +++ b/src/ef_buruburu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eBR_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eBR_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eBR_mv(eEC_Effect_c* effect, GAME* game); +static void eBR_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_buruburu = { + // clang-format off + &eBR_init, + &eBR_ct, + &eBR_mv, + &eBR_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eBR_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eBR_mv(eEC_Effect_c* effect, GAME* game) { static void eBR_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_buruburu = { - // clang-format off - &eBR_init, - &eBR_ct, - &eBR_mv, - &eBR_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_bush_happa.c b/src/ef_bush_happa.c index 0315df14..058a993e 100644 --- a/src/ef_bush_happa.c +++ b/src/ef_bush_happa.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eBushHappa_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eBushHappa_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eBushHappa_mv(eEC_Effect_c* effect, GAME* game); +static void eBushHappa_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_bush_happa = { + // clang-format off + &eBushHappa_init, + &eBushHappa_ct, + &eBushHappa_mv, + &eBushHappa_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eBushHappa_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eBushHappa_mv(eEC_Effect_c* effect, GAME* game) { static void eBushHappa_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_bush_happa = { - // clang-format off - &eBushHappa_init, - &eBushHappa_ct, - &eBushHappa_mv, - &eBushHappa_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_bush_yuki.c b/src/ef_bush_yuki.c index 760c0c31..68ae4d10 100644 --- a/src/ef_bush_yuki.c +++ b/src/ef_bush_yuki.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eBushYuki_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eBushYuki_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eBushYuki_mv(eEC_Effect_c* effect, GAME* game); +static void eBushYuki_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_bush_yuki = { + // clang-format off + &eBushYuki_init, + &eBushYuki_ct, + &eBushYuki_mv, + &eBushYuki_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eBushYuki_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eBushYuki_mv(eEC_Effect_c* effect, GAME* game) { static void eBushYuki_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_bush_yuki = { - // clang-format off - &eBushYuki_init, - &eBushYuki_ct, - &eBushYuki_mv, - &eBushYuki_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_car_blight.c b/src/ef_car_blight.c index 920517c3..0981ae4a 100644 --- a/src/ef_car_blight.c +++ b/src/ef_car_blight.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eCar_Blight_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eCar_Blight_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eCar_Blight_mv(eEC_Effect_c* effect, GAME* game); +static void eCar_Blight_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_car_blight = { + // clang-format off + &eCar_Blight_init, + &eCar_Blight_ct, + &eCar_Blight_mv, + &eCar_Blight_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eCar_Blight_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eCar_Blight_mv(eEC_Effect_c* effect, GAME* game) { static void eCar_Blight_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_car_blight = { - // clang-format off - &eCar_Blight_init, - &eCar_Blight_ct, - &eCar_Blight_mv, - &eCar_Blight_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_car_light.c b/src/ef_car_light.c index 0758ee66..9e5f11fc 100644 --- a/src/ef_car_light.c +++ b/src/ef_car_light.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eCar_Light_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eCar_Light_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eCar_Light_mv(eEC_Effect_c* effect, GAME* game); +static void eCar_Light_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_car_light = { + // clang-format off + &eCar_Light_init, + &eCar_Light_ct, + &eCar_Light_mv, + &eCar_Light_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eCar_Light_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eCar_Light_mv(eEC_Effect_c* effect, GAME* game) { static void eCar_Light_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_car_light = { - // clang-format off - &eCar_Light_init, - &eCar_Light_ct, - &eCar_Light_mv, - &eCar_Light_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_clacker.c b/src/ef_clacker.c index 19430537..649025aa 100644 --- a/src/ef_clacker.c +++ b/src/ef_clacker.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eClacker_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eClacker_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eClacker_mv(eEC_Effect_c* effect, GAME* game); +static void eClacker_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_clacker = { + // clang-format off + &eClacker_init, + &eClacker_ct, + &eClacker_mv, + &eClacker_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eClacker_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eClacker_mv(eEC_Effect_c* effect, GAME* game) { static void eClacker_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_clacker = { - // clang-format off - &eClacker_init, - &eClacker_ct, - &eClacker_mv, - &eClacker_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_coin.c b/src/ef_coin.c index 0c74ec12..0077dacf 100644 --- a/src/ef_coin.c +++ b/src/ef_coin.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eCoin_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eCoin_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eCoin_mv(eEC_Effect_c* effect, GAME* game); +static void eCoin_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_coin = { + // clang-format off + &eCoin_init, + &eCoin_ct, + &eCoin_mv, + &eCoin_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eCoin_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eCoin_mv(eEC_Effect_c* effect, GAME* game) { static void eCoin_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_coin = { - // clang-format off - &eCoin_init, - &eCoin_ct, - &eCoin_mv, - &eCoin_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_dash_asimoto.c b/src/ef_dash_asimoto.c index e167169b..5484966d 100644 --- a/src/ef_dash_asimoto.c +++ b/src/ef_dash_asimoto.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eDashAsimoto_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eDashAsimoto_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eDashAsimoto_mv(eEC_Effect_c* effect, GAME* game); +static void eDashAsimoto_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_dash_asimoto = { + // clang-format off + &eDashAsimoto_init, + &eDashAsimoto_ct, + &eDashAsimoto_mv, + &eDashAsimoto_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eDashAsimoto_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eDashAsimoto_mv(eEC_Effect_c* effect, GAME* game) { static void eDashAsimoto_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_dash_asimoto = { - // clang-format off - &eDashAsimoto_init, - &eDashAsimoto_ct, - &eDashAsimoto_mv, - &eDashAsimoto_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_dig_hole.c b/src/ef_dig_hole.c index b3c55965..8842c2ea 100644 --- a/src/ef_dig_hole.c +++ b/src/ef_dig_hole.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eDig_Hole_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eDig_Hole_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eDig_Hole_mv(eEC_Effect_c* effect, GAME* game); +static void eDig_Hole_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_dig_hole = { + // clang-format off + &eDig_Hole_init, + &eDig_Hole_ct, + &eDig_Hole_mv, + &eDig_Hole_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eDig_Hole_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eDig_Hole_mv(eEC_Effect_c* effect, GAME* game) { static void eDig_Hole_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_dig_hole = { - // clang-format off - &eDig_Hole_init, - &eDig_Hole_ct, - &eDig_Hole_mv, - &eDig_Hole_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_dig_mud.c b/src/ef_dig_mud.c index bce7567c..a6d7fa1a 100644 --- a/src/ef_dig_mud.c +++ b/src/ef_dig_mud.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eDig_Mud_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eDig_Mud_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eDig_Mud_mv(eEC_Effect_c* effect, GAME* game); +static void eDig_Mud_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_dig_mud = { + // clang-format off + &eDig_Mud_init, + &eDig_Mud_ct, + &eDig_Mud_mv, + &eDig_Mud_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eDig_Mud_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eDig_Mud_mv(eEC_Effect_c* effect, GAME* game) { static void eDig_Mud_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_dig_mud = { - // clang-format off - &eDig_Mud_init, - &eDig_Mud_ct, - &eDig_Mud_mv, - &eDig_Mud_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_dig_scoop.c b/src/ef_dig_scoop.c index 5119f234..88c2e0be 100644 --- a/src/ef_dig_scoop.c +++ b/src/ef_dig_scoop.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eDig_Scoop_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eDig_Scoop_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eDig_Scoop_mv(eEC_Effect_c* effect, GAME* game); +static void eDig_Scoop_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_dig_scoop = { + // clang-format off + &eDig_Scoop_init, + &eDig_Scoop_ct, + &eDig_Scoop_mv, + &eDig_Scoop_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eDig_Scoop_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eDig_Scoop_mv(eEC_Effect_c* effect, GAME* game) { static void eDig_Scoop_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_dig_scoop = { - // clang-format off - &eDig_Scoop_init, - &eDig_Scoop_ct, - &eDig_Scoop_mv, - &eDig_Scoop_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_douzou_light.c b/src/ef_douzou_light.c index c8179129..fabcfc5e 100644 --- a/src/ef_douzou_light.c +++ b/src/ef_douzou_light.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eDouzou_Light_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eDouzou_Light_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eDouzou_Light_mv(eEC_Effect_c* effect, GAME* game); +static void eDouzou_Light_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_douzou_light = { + // clang-format off + &eDouzou_Light_init, + &eDouzou_Light_ct, + &eDouzou_Light_mv, + &eDouzou_Light_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eDouzou_Light_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eDouzou_Light_mv(eEC_Effect_c* effect, GAME* game) { static void eDouzou_Light_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_douzou_light = { - // clang-format off - &eDouzou_Light_init, - &eDouzou_Light_ct, - &eDouzou_Light_mv, - &eDouzou_Light_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_doyon.c b/src/ef_doyon.c index 7f9df86c..a311e8ac 100644 --- a/src/ef_doyon.c +++ b/src/ef_doyon.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eDoyon_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eDoyon_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eDoyon_mv(eEC_Effect_c* effect, GAME* game); +static void eDoyon_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_doyon = { + // clang-format off + &eDoyon_init, + &eDoyon_ct, + &eDoyon_mv, + &eDoyon_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eDoyon_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eDoyon_mv(eEC_Effect_c* effect, GAME* game) { static void eDoyon_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_doyon = { - // clang-format off - &eDoyon_init, - &eDoyon_ct, - &eDoyon_mv, - &eDoyon_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_dust.c b/src/ef_dust.c index 33986151..05b06ac2 100644 --- a/src/ef_dust.c +++ b/src/ef_dust.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eDT_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eDT_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eDT_mv(eEC_Effect_c* effect, GAME* game); +static void eDT_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_dust = { + // clang-format off + &eDT_init, + &eDT_ct, + &eDT_mv, + &eDT_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eDT_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eDT_mv(eEC_Effect_c* effect, GAME* game) { static void eDT_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_dust = { - // clang-format off - &eDT_init, - &eDT_ct, - &eDT_mv, - &eDT_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_furo_yuge.c b/src/ef_furo_yuge.c index f0c70d3c..e526265d 100644 --- a/src/ef_furo_yuge.c +++ b/src/ef_furo_yuge.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eFuro_Yuge_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eFuro_Yuge_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eFuro_Yuge_mv(eEC_Effect_c* effect, GAME* game); +static void eFuro_Yuge_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_furo_yuge = { + // clang-format off + &eFuro_Yuge_init, + &eFuro_Yuge_ct, + &eFuro_Yuge_mv, + &eFuro_Yuge_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eFuro_Yuge_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eFuro_Yuge_mv(eEC_Effect_c* effect, GAME* game) { static void eFuro_Yuge_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_furo_yuge = { - // clang-format off - &eFuro_Yuge_init, - &eFuro_Yuge_ct, - &eFuro_Yuge_mv, - &eFuro_Yuge_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_gimonhu.c b/src/ef_gimonhu.c index d5041dee..514db582 100644 --- a/src/ef_gimonhu.c +++ b/src/ef_gimonhu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eGM_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eGM_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eGM_mv(eEC_Effect_c* effect, GAME* game); +static void eGM_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_gimonhu = { + // clang-format off + &eGM_init, + &eGM_ct, + &eGM_mv, + &eGM_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eGM_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eGM_mv(eEC_Effect_c* effect, GAME* game) { static void eGM_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_gimonhu = { - // clang-format off - &eGM_init, - &eGM_ct, - &eGM_mv, - &eGM_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_goki.c b/src/ef_goki.c index 7c5059ca..2883149a 100644 --- a/src/ef_goki.c +++ b/src/ef_goki.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eGoki_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eGoki_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eGoki_mv(eEC_Effect_c* effect, GAME* game); +static void eGoki_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_goki = { + // clang-format off + &eGoki_init, + &eGoki_ct, + &eGoki_mv, + &eGoki_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eGoki_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eGoki_mv(eEC_Effect_c* effect, GAME* game) { static void eGoki_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_goki = { - // clang-format off - &eGoki_init, - &eGoki_ct, - &eGoki_mv, - &eGoki_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_ha.c b/src/ef_ha.c index 88f38318..db2d7f93 100644 --- a/src/ef_ha.c +++ b/src/ef_ha.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHA_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHA_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHA_mv(eEC_Effect_c* effect, GAME* game); +static void eHA_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_ha = { + // clang-format off + &eHA_init, + &eHA_ct, + &eHA_mv, + &eHA_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eHA_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHA_mv(eEC_Effect_c* effect, GAME* game) { static void eHA_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_ha = { - // clang-format off - &eHA_init, - &eHA_ct, - &eHA_mv, - &eHA_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_halloween.c b/src/ef_halloween.c index 7d95ec91..923de7e8 100644 --- a/src/ef_halloween.c +++ b/src/ef_halloween.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHalloween_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHalloween_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHalloween_mv(eEC_Effect_c* effect, GAME* game); +static void eHalloween_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_halloween = { + // clang-format off + &eHalloween_init, + &eHalloween_ct, + &eHalloween_mv, + &eHalloween_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eHalloween_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHalloween_mv(eEC_Effect_c* effect, GAME* game) { static void eHalloween_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_halloween = { - // clang-format off - &eHalloween_init, - &eHalloween_ct, - &eHalloween_mv, - &eHalloween_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_halloween_smoke.c b/src/ef_halloween_smoke.c index c4e9e5a3..f580282e 100644 --- a/src/ef_halloween_smoke.c +++ b/src/ef_halloween_smoke.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHalloween_Smoke_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHalloween_Smoke_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHalloween_Smoke_mv(eEC_Effect_c* effect, GAME* game); +static void eHalloween_Smoke_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_halloween_smoke = { + // clang-format off + &eHalloween_Smoke_init, + &eHalloween_Smoke_ct, + &eHalloween_Smoke_mv, + &eHalloween_Smoke_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eHalloween_Smoke_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHalloween_Smoke_mv(eEC_Effect_c* effect, GAME* game) { static void eHalloween_Smoke_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_halloween_smoke = { - // clang-format off - &eHalloween_Smoke_init, - &eHalloween_Smoke_ct, - &eHalloween_Smoke_mv, - &eHalloween_Smoke_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hanabi_botan1.c b/src/ef_hanabi_botan1.c index 9f72bff4..4efaefb1 100644 --- a/src/ef_hanabi_botan1.c +++ b/src/ef_hanabi_botan1.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHanabiBotan1_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHanabiBotan1_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHanabiBotan1_mv(eEC_Effect_c* effect, GAME* game); +static void eHanabiBotan1_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hanabi_botan1 = { + // clang-format off + &eHanabiBotan1_init, + &eHanabiBotan1_ct, + &eHanabiBotan1_mv, + &eHanabiBotan1_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eHanabiBotan1_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHanabiBotan1_mv(eEC_Effect_c* effect, GAME* game) { static void eHanabiBotan1_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hanabi_botan1 = { - // clang-format off - &eHanabiBotan1_init, - &eHanabiBotan1_ct, - &eHanabiBotan1_mv, - &eHanabiBotan1_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hanabi_botan2.c b/src/ef_hanabi_botan2.c index 7da38f0d..f1413fe5 100644 --- a/src/ef_hanabi_botan2.c +++ b/src/ef_hanabi_botan2.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHanabiBotan2_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHanabiBotan2_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHanabiBotan2_mv(eEC_Effect_c* effect, GAME* game); +static void eHanabiBotan2_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hanabi_botan2 = { + // clang-format off + &eHanabiBotan2_init, + &eHanabiBotan2_ct, + &eHanabiBotan2_mv, + &eHanabiBotan2_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eHanabiBotan2_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHanabiBotan2_mv(eEC_Effect_c* effect, GAME* game) { static void eHanabiBotan2_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hanabi_botan2 = { - // clang-format off - &eHanabiBotan2_init, - &eHanabiBotan2_ct, - &eHanabiBotan2_mv, - &eHanabiBotan2_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hanabi_dummy.c b/src/ef_hanabi_dummy.c index 4dc24b2f..aefed319 100644 --- a/src/ef_hanabi_dummy.c +++ b/src/ef_hanabi_dummy.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHanabiDummy_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHanabiDummy_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHanabiDummy_mv(eEC_Effect_c* effect, GAME* game); +static void eHanabiDummy_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hanabi_dummy = { + // clang-format off + &eHanabiDummy_init, + &eHanabiDummy_ct, + &eHanabiDummy_mv, + &eHanabiDummy_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eHanabiDummy_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHanabiDummy_mv(eEC_Effect_c* effect, GAME* game) { static void eHanabiDummy_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hanabi_dummy = { - // clang-format off - &eHanabiDummy_init, - &eHanabiDummy_ct, - &eHanabiDummy_mv, - &eHanabiDummy_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hanabi_hoshi.c b/src/ef_hanabi_hoshi.c index c310be85..67e6907f 100644 --- a/src/ef_hanabi_hoshi.c +++ b/src/ef_hanabi_hoshi.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHanabiHoshi_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHanabiHoshi_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHanabiHoshi_mv(eEC_Effect_c* effect, GAME* game); +static void eHanabiHoshi_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hanabi_hoshi = { + // clang-format off + &eHanabiHoshi_init, + &eHanabiHoshi_ct, + &eHanabiHoshi_mv, + &eHanabiHoshi_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eHanabiHoshi_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHanabiHoshi_mv(eEC_Effect_c* effect, GAME* game) { static void eHanabiHoshi_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hanabi_hoshi = { - // clang-format off - &eHanabiHoshi_init, - &eHanabiHoshi_ct, - &eHanabiHoshi_mv, - &eHanabiHoshi_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hanabi_set.c b/src/ef_hanabi_set.c index 511781fb..f070053f 100644 --- a/src/ef_hanabi_set.c +++ b/src/ef_hanabi_set.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHanabiSet_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHanabiSet_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHanabiSet_mv(eEC_Effect_c* effect, GAME* game); +static void eHanabiSet_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hanabi_set = { + // clang-format off + &eHanabiSet_init, + &eHanabiSet_ct, + &eHanabiSet_mv, + &eHanabiSet_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eHanabiSet_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHanabiSet_mv(eEC_Effect_c* effect, GAME* game) { static void eHanabiSet_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hanabi_set = { - // clang-format off - &eHanabiSet_init, - &eHanabiSet_ct, - &eHanabiSet_mv, - &eHanabiSet_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hanabi_switch.c b/src/ef_hanabi_switch.c index 5bed808b..005ef222 100644 --- a/src/ef_hanabi_switch.c +++ b/src/ef_hanabi_switch.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHanabiSwitch_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHanabiSwitch_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHanabiSwitch_mv(eEC_Effect_c* effect, GAME* game); +static void eHanabiSwitch_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hanabi_switch = { + // clang-format off + &eHanabiSwitch_init, + &eHanabiSwitch_ct, + &eHanabiSwitch_mv, + &eHanabiSwitch_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eHanabiSwitch_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHanabiSwitch_mv(eEC_Effect_c* effect, GAME* game) { static void eHanabiSwitch_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hanabi_switch = { - // clang-format off - &eHanabiSwitch_init, - &eHanabiSwitch_ct, - &eHanabiSwitch_mv, - &eHanabiSwitch_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hanabi_yanagi.c b/src/ef_hanabi_yanagi.c index 694f5781..41bfe5bb 100644 --- a/src/ef_hanabi_yanagi.c +++ b/src/ef_hanabi_yanagi.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHanabiYanagi_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHanabiYanagi_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHanabiYanagi_mv(eEC_Effect_c* effect, GAME* game); +static void eHanabiYanagi_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hanabi_yanagi = { + // clang-format off + &eHanabiYanagi_init, + &eHanabiYanagi_ct, + &eHanabiYanagi_mv, + &eHanabiYanagi_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eHanabiYanagi_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHanabiYanagi_mv(eEC_Effect_c* effect, GAME* game) { static void eHanabiYanagi_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hanabi_yanagi = { - // clang-format off - &eHanabiYanagi_init, - &eHanabiYanagi_ct, - &eHanabiYanagi_mv, - &eHanabiYanagi_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hanabira.c b/src/ef_hanabira.c index b2016277..93c9930d 100644 --- a/src/ef_hanabira.c +++ b/src/ef_hanabira.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHanabira_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHanabira_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHanabira_mv(eEC_Effect_c* effect, GAME* game); +static void eHanabira_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hanabira = { + // clang-format off + &eHanabira_init, + &eHanabira_ct, + &eHanabira_mv, + &eHanabira_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eHanabira_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHanabira_mv(eEC_Effect_c* effect, GAME* game) { static void eHanabira_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hanabira = { - // clang-format off - &eHanabira_init, - &eHanabira_ct, - &eHanabira_mv, - &eHanabira_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hanatiri.c b/src/ef_hanatiri.c index 4484dc27..9102f464 100644 --- a/src/ef_hanatiri.c +++ b/src/ef_hanatiri.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHanatiri_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHanatiri_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHanatiri_mv(eEC_Effect_c* effect, GAME* game); +static void eHanatiri_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hanatiri = { + // clang-format off + &eHanatiri_init, + &eHanatiri_ct, + &eHanatiri_mv, + &eHanatiri_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eHanatiri_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHanatiri_mv(eEC_Effect_c* effect, GAME* game) { static void eHanatiri_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hanatiri = { - // clang-format off - &eHanatiri_init, - &eHanatiri_ct, - &eHanatiri_mv, - &eHanatiri_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hirameki_den.c b/src/ef_hirameki_den.c index f820fd37..1b0f48c1 100644 --- a/src/ef_hirameki_den.c +++ b/src/ef_hirameki_den.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHiramekiD_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHiramekiD_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHiramekiD_mv(eEC_Effect_c* effect, GAME* game); +static void eHiramekiD_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hirameki_den = { + // clang-format off + &eHiramekiD_init, + &eHiramekiD_ct, + &eHiramekiD_mv, + &eHiramekiD_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eHiramekiD_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHiramekiD_mv(eEC_Effect_c* effect, GAME* game) { static void eHiramekiD_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hirameki_den = { - // clang-format off - &eHiramekiD_init, - &eHiramekiD_ct, - &eHiramekiD_mv, - &eHiramekiD_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_hirameki_hikari.c b/src/ef_hirameki_hikari.c index d6c4ccab..167af0a6 100644 --- a/src/ef_hirameki_hikari.c +++ b/src/ef_hirameki_hikari.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eHiramekiH_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eHiramekiH_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eHiramekiH_mv(eEC_Effect_c* effect, GAME* game); +static void eHiramekiH_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_hirameki_hikari = { + // clang-format off + &eHiramekiH_init, + &eHiramekiH_ct, + &eHiramekiH_mv, + &eHiramekiH_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eHiramekiH_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eHiramekiH_mv(eEC_Effect_c* effect, GAME* game) { static void eHiramekiH_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_hirameki_hikari = { - // clang-format off - &eHiramekiH_init, - &eHiramekiH_ct, - &eHiramekiH_mv, - &eHiramekiH_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_ikigire.c b/src/ef_ikigire.c index 40110166..6359450f 100644 --- a/src/ef_ikigire.c +++ b/src/ef_ikigire.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eIkigire_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eIkigire_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eIkigire_mv(eEC_Effect_c* effect, GAME* game); +static void eIkigire_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_ikigire = { + // clang-format off + &eIkigire_init, + &eIkigire_ct, + &eIkigire_mv, + &eIkigire_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eIkigire_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eIkigire_mv(eEC_Effect_c* effect, GAME* game) { static void eIkigire_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_ikigire = { - // clang-format off - &eIkigire_init, - &eIkigire_ct, - &eIkigire_mv, - &eIkigire_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_impact_star.c b/src/ef_impact_star.c index fc83695c..4c7bdb0c 100644 --- a/src/ef_impact_star.c +++ b/src/ef_impact_star.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eImpact_Star_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eImpact_Star_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eImpact_Star_mv(eEC_Effect_c* effect, GAME* game); +static void eImpact_Star_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_impact_star = { + // clang-format off + &eImpact_Star_init, + &eImpact_Star_ct, + &eImpact_Star_mv, + &eImpact_Star_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eImpact_Star_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eImpact_Star_mv(eEC_Effect_c* effect, GAME* game) { static void eImpact_Star_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_impact_star = { - // clang-format off - &eImpact_Star_init, - &eImpact_Star_ct, - &eImpact_Star_mv, - &eImpact_Star_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kagu_happa.c b/src/ef_kagu_happa.c index 8efd50de..cab6939a 100644 --- a/src/ef_kagu_happa.c +++ b/src/ef_kagu_happa.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKagu_Happa_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKagu_Happa_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKagu_Happa_mv(eEC_Effect_c* effect, GAME* game); +static void eKagu_Happa_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kagu_happa = { + // clang-format off + &eKagu_Happa_init, + &eKagu_Happa_ct, + &eKagu_Happa_mv, + &eKagu_Happa_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKagu_Happa_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKagu_Happa_mv(eEC_Effect_c* effect, GAME* game) { static void eKagu_Happa_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kagu_happa = { - // clang-format off - &eKagu_Happa_init, - &eKagu_Happa_ct, - &eKagu_Happa_mv, - &eKagu_Happa_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kamifubuki.c b/src/ef_kamifubuki.c index 35bb5254..0c5e4da8 100644 --- a/src/ef_kamifubuki.c +++ b/src/ef_kamifubuki.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKamifubuki_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKamifubuki_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKamifubuki_mv(eEC_Effect_c* effect, GAME* game); +static void eKamifubuki_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kamifubuki = { + // clang-format off + &eKamifubuki_init, + &eKamifubuki_ct, + &eKamifubuki_mv, + &eKamifubuki_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKamifubuki_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKamifubuki_mv(eEC_Effect_c* effect, GAME* game) { static void eKamifubuki_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kamifubuki = { - // clang-format off - &eKamifubuki_init, - &eKamifubuki_ct, - &eKamifubuki_mv, - &eKamifubuki_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kangaeru.c b/src/ef_kangaeru.c index 3319413b..3361c713 100644 --- a/src/ef_kangaeru.c +++ b/src/ef_kangaeru.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKG_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKG_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKG_mv(eEC_Effect_c* effect, GAME* game); +static void eKG_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kangaeru = { + // clang-format off + &eKG_init, + &eKG_ct, + &eKG_mv, + &eKG_dw, + 7, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKG_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKG_mv(eEC_Effect_c* effect, GAME* game) { static void eKG_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kangaeru = { - // clang-format off - &eKG_init, - &eKG_ct, - &eKG_mv, - &eKG_dw, - 7, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kantanhu.c b/src/ef_kantanhu.c index c4a7547e..acb90958 100644 --- a/src/ef_kantanhu.c +++ b/src/ef_kantanhu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKT_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKT_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKT_mv(eEC_Effect_c* effect, GAME* game); +static void eKT_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kantanhu = { + // clang-format off + &eKT_init, + &eKT_ct, + &eKT_mv, + &eKT_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKT_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKT_mv(eEC_Effect_c* effect, GAME* game) { static void eKT_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kantanhu = { - // clang-format off - &eKT_init, - &eKT_ct, - &eKT_mv, - &eKT_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kasamizu.c b/src/ef_kasamizu.c index 0b7c1bcb..bc21e585 100644 --- a/src/ef_kasamizu.c +++ b/src/ef_kasamizu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKasamizu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKasamizu_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKasamizu_mv(eEC_Effect_c* effect, GAME* game); +static void eKasamizu_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kasamizu = { + // clang-format off + &eKasamizu_init, + &eKasamizu_ct, + &eKasamizu_mv, + &eKasamizu_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKasamizu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKasamizu_mv(eEC_Effect_c* effect, GAME* game) { static void eKasamizu_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kasamizu = { - // clang-format off - &eKasamizu_init, - &eKasamizu_ct, - &eKasamizu_mv, - &eKasamizu_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kasamizutama.c b/src/ef_kasamizutama.c index 9c5700f2..762bd6a8 100644 --- a/src/ef_kasamizutama.c +++ b/src/ef_kasamizutama.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKasamizutama_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKasamizutama_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKasamizutama_mv(eEC_Effect_c* effect, GAME* game); +static void eKasamizutama_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kasamizutama = { + // clang-format off + &eKasamizutama_init, + &eKasamizutama_ct, + &eKasamizutama_mv, + &eKasamizutama_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKasamizutama_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKasamizutama_mv(eEC_Effect_c* effect, GAME* game) { static void eKasamizutama_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kasamizutama = { - // clang-format off - &eKasamizutama_init, - &eKasamizutama_ct, - &eKasamizutama_mv, - &eKasamizutama_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kaze.c b/src/ef_kaze.c index 30d795ad..8e4d81c1 100644 --- a/src/ef_kaze.c +++ b/src/ef_kaze.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKZ_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKZ_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKZ_mv(eEC_Effect_c* effect, GAME* game); +static void eKZ_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kaze = { + // clang-format off + &eKZ_init, + &eKZ_ct, + &eKZ_mv, + &eKZ_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKZ_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKZ_mv(eEC_Effect_c* effect, GAME* game) { static void eKZ_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kaze = { - // clang-format off - &eKZ_init, - &eKZ_ct, - &eKZ_mv, - &eKZ_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kaze_happa.c b/src/ef_kaze_happa.c index 6bf98487..36d96306 100644 --- a/src/ef_kaze_happa.c +++ b/src/ef_kaze_happa.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKZH_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKZH_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKZH_mv(eEC_Effect_c* effect, GAME* game); +static void eKZH_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kaze_happa = { + // clang-format off + &eKZH_init, + &eKZH_ct, + &eKZH_mv, + &eKZH_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKZH_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKZH_mv(eEC_Effect_c* effect, GAME* game) { static void eKZH_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kaze_happa = { - // clang-format off - &eKZH_init, - &eKZH_ct, - &eKZH_mv, - &eKZH_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kigae.c b/src/ef_kigae.c index 27ee37a9..7b91a2b4 100644 --- a/src/ef_kigae.c +++ b/src/ef_kigae.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKigae_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKigae_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKigae_mv(eEC_Effect_c* effect, GAME* game); +static void eKigae_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kigae = { + // clang-format off + &eKigae_init, + &eKigae_ct, + &eKigae_mv, + &eKigae_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKigae_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKigae_mv(eEC_Effect_c* effect, GAME* game) { static void eKigae_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kigae = { - // clang-format off - &eKigae_init, - &eKigae_ct, - &eKigae_mv, - &eKigae_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kigae_light.c b/src/ef_kigae_light.c index 8443f27c..db3f007c 100644 --- a/src/ef_kigae_light.c +++ b/src/ef_kigae_light.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKigae_Light_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKigae_Light_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKigae_Light_mv(eEC_Effect_c* effect, GAME* game); +static void eKigae_Light_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kigae_light = { + // clang-format off + &eKigae_Light_init, + &eKigae_Light_ct, + &eKigae_Light_mv, + &eKigae_Light_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKigae_Light_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKigae_Light_mv(eEC_Effect_c* effect, GAME* game) { static void eKigae_Light_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kigae_light = { - // clang-format off - &eKigae_Light_init, - &eKigae_Light_ct, - &eKigae_Light_mv, - &eKigae_Light_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kikuzu.c b/src/ef_kikuzu.c index 0c851f4b..7c4265ea 100644 --- a/src/ef_kikuzu.c +++ b/src/ef_kikuzu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKikuzu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKikuzu_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKikuzu_mv(eEC_Effect_c* effect, GAME* game); +static void eKikuzu_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kikuzu = { + // clang-format off + &eKikuzu_init, + &eKikuzu_ct, + &eKikuzu_mv, + &eKikuzu_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKikuzu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKikuzu_mv(eEC_Effect_c* effect, GAME* game) { static void eKikuzu_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kikuzu = { - // clang-format off - &eKikuzu_init, - &eKikuzu_ct, - &eKikuzu_mv, - &eKikuzu_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kisha_kemuri.c b/src/ef_kisha_kemuri.c index c154d121..f83fa2b5 100644 --- a/src/ef_kisha_kemuri.c +++ b/src/ef_kisha_kemuri.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKishaK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKishaK_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKishaK_mv(eEC_Effect_c* effect, GAME* game); +static void eKishaK_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kisha_kemuri = { + // clang-format off + &eKishaK_init, + &eKishaK_ct, + &eKishaK_mv, + &eKishaK_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKishaK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKishaK_mv(eEC_Effect_c* effect, GAME* game) { static void eKishaK_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kisha_kemuri = { - // clang-format off - &eKishaK_init, - &eKishaK_ct, - &eKishaK_mv, - &eKishaK_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_konpu.c b/src/ef_konpu.c index 2151bbdd..ec4b35a3 100644 --- a/src/ef_konpu.c +++ b/src/ef_konpu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKONP_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKONP_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKONP_mv(eEC_Effect_c* effect, GAME* game); +static void eKONP_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_konpu = { + // clang-format off + &eKONP_init, + &eKONP_ct, + &eKONP_mv, + &eKONP_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKONP_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKONP_mv(eEC_Effect_c* effect, GAME* game) { static void eKONP_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_konpu = { - // clang-format off - &eKONP_init, - &eKONP_ct, - &eKONP_mv, - &eKONP_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kpun.c b/src/ef_kpun.c index 91d52188..72b1994d 100644 --- a/src/ef_kpun.c +++ b/src/ef_kpun.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKPun_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKPun_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKPun_mv(eEC_Effect_c* effect, GAME* game); +static void eKPun_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kpun = { + // clang-format off + &eKPun_init, + &eKPun_ct, + &eKPun_mv, + &eKPun_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKPun_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKPun_mv(eEC_Effect_c* effect, GAME* game) { static void eKPun_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kpun = { - // clang-format off - &eKPun_init, - &eKPun_ct, - &eKPun_mv, - &eKPun_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_kyousou_onpu.c b/src/ef_kyousou_onpu.c index e3d75ee2..a1b48677 100644 --- a/src/ef_kyousou_onpu.c +++ b/src/ef_kyousou_onpu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eKyousou_Onpu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eKyousou_Onpu_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eKyousou_Onpu_mv(eEC_Effect_c* effect, GAME* game); +static void eKyousou_Onpu_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_kyousou_onpu = { + // clang-format off + &eKyousou_Onpu_init, + &eKyousou_Onpu_ct, + &eKyousou_Onpu_mv, + &eKyousou_Onpu_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eKyousou_Onpu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eKyousou_Onpu_mv(eEC_Effect_c* effect, GAME* game) { static void eKyousou_Onpu_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_kyousou_onpu = { - // clang-format off - &eKyousou_Onpu_init, - &eKyousou_Onpu_ct, - &eKyousou_Onpu_mv, - &eKyousou_Onpu_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_lovelove.c b/src/ef_lovelove.c index 0513e451..bccc0f20 100644 --- a/src/ef_lovelove.c +++ b/src/ef_lovelove.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eLove_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eLove_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eLove_mv(eEC_Effect_c* effect, GAME* game); +static void eLove_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_lovelove = { + // clang-format off + &eLove_init, + &eLove_ct, + &eLove_mv, + &eLove_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eLove_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eLove_mv(eEC_Effect_c* effect, GAME* game) { static void eLove_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_lovelove = { - // clang-format off - &eLove_init, - &eLove_ct, - &eLove_mv, - &eLove_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_lovelove2.c b/src/ef_lovelove2.c index dda5a8fe..1ce83096 100644 --- a/src/ef_lovelove2.c +++ b/src/ef_lovelove2.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eLL2_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eLL2_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eLL2_mv(eEC_Effect_c* effect, GAME* game); +static void eLL2_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_lovelove2 = { + // clang-format off + &eLL2_init, + &eLL2_ct, + &eLL2_mv, + &eLL2_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eLL2_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eLL2_mv(eEC_Effect_c* effect, GAME* game) { static void eLL2_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_lovelove2 = { - // clang-format off - &eLL2_init, - &eLL2_ct, - &eLL2_mv, - &eLL2_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_lovelove_heart.c b/src/ef_lovelove_heart.c index d069b49d..f08f89c1 100644 --- a/src/ef_lovelove_heart.c +++ b/src/ef_lovelove_heart.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eLoveH_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eLoveH_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eLoveH_mv(eEC_Effect_c* effect, GAME* game); +static void eLoveH_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_lovelove_heart = { + // clang-format off + &eLoveH_init, + &eLoveH_ct, + &eLoveH_mv, + &eLoveH_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eLoveH_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eLoveH_mv(eEC_Effect_c* effect, GAME* game) { static void eLoveH_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_lovelove_heart = { - // clang-format off - &eLoveH_init, - &eLoveH_ct, - &eLoveH_mv, - &eLoveH_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_mizutama.c b/src/ef_mizutama.c index 6efac671..5817baa9 100644 --- a/src/ef_mizutama.c +++ b/src/ef_mizutama.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eMizutama_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eMizutama_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eMizutama_mv(eEC_Effect_c* effect, GAME* game); +static void eMizutama_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_mizutama = { + // clang-format off + &eMizutama_init, + &eMizutama_ct, + &eMizutama_mv, + &eMizutama_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eMizutama_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eMizutama_mv(eEC_Effect_c* effect, GAME* game) { static void eMizutama_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_mizutama = { - // clang-format off - &eMizutama_init, - &eMizutama_ct, - &eMizutama_mv, - &eMizutama_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_motiyuge.c b/src/ef_motiyuge.c index a4365a16..1db5de11 100644 --- a/src/ef_motiyuge.c +++ b/src/ef_motiyuge.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eMotiyuge_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eMotiyuge_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eMotiyuge_mv(eEC_Effect_c* effect, GAME* game); +static void eMotiyuge_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_motiyuge = { + // clang-format off + &eMotiyuge_init, + &eMotiyuge_ct, + &eMotiyuge_mv, + &eMotiyuge_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eMotiyuge_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eMotiyuge_mv(eEC_Effect_c* effect, GAME* game) { static void eMotiyuge_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_motiyuge = { - // clang-format off - &eMotiyuge_init, - &eMotiyuge_ct, - &eMotiyuge_mv, - &eMotiyuge_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_muka.c b/src/ef_muka.c index 3c9323c2..ff8c1689 100644 --- a/src/ef_muka.c +++ b/src/ef_muka.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eMK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eMK_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eMK_mv(eEC_Effect_c* effect, GAME* game); +static void eMK_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_muka = { + // clang-format off + &eMK_init, + &eMK_ct, + &eMK_mv, + &eMK_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eMK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eMK_mv(eEC_Effect_c* effect, GAME* game) { static void eMK_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_muka = { - // clang-format off - &eMK_init, - &eMK_ct, - &eMK_mv, - &eMK_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_naku.c b/src/ef_naku.c index 6b0b2e76..50e3d831 100644 --- a/src/ef_naku.c +++ b/src/ef_naku.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eNaku_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eNaku_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eNaku_mv(eEC_Effect_c* effect, GAME* game); +static void eNaku_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_naku = { + // clang-format off + &eNaku_init, + &eNaku_ct, + &eNaku_mv, + &eNaku_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eNaku_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eNaku_mv(eEC_Effect_c* effect, GAME* game) { static void eNaku_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_naku = { - // clang-format off - &eNaku_init, - &eNaku_ct, - &eNaku_mv, - &eNaku_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_namida.c b/src/ef_namida.c index 84b70714..4d70f95a 100644 --- a/src/ef_namida.c +++ b/src/ef_namida.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eNamida_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eNamida_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eNamida_mv(eEC_Effect_c* effect, GAME* game); +static void eNamida_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_namida = { + // clang-format off + &eNamida_init, + &eNamida_ct, + &eNamida_mv, + &eNamida_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eNamida_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eNamida_mv(eEC_Effect_c* effect, GAME* game) { static void eNamida_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_namida = { - // clang-format off - &eNamida_init, - &eNamida_ct, - &eNamida_mv, - &eNamida_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_neboke.c b/src/ef_neboke.c index 7eea2a98..95c3a8c0 100644 --- a/src/ef_neboke.c +++ b/src/ef_neboke.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eNebo_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eNebo_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eNebo_mv(eEC_Effect_c* effect, GAME* game); +static void eNebo_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_neboke = { + // clang-format off + &eNebo_init, + &eNebo_ct, + &eNebo_mv, + &eNebo_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eNebo_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eNebo_mv(eEC_Effect_c* effect, GAME* game) { static void eNebo_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_neboke = { - // clang-format off - &eNebo_init, - &eNebo_ct, - &eNebo_mv, - &eNebo_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_neboke_akubi.c b/src/ef_neboke_akubi.c index 740bcb5b..d0227ec3 100644 --- a/src/ef_neboke_akubi.c +++ b/src/ef_neboke_akubi.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eNeboke_Akubi_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eNeboke_Akubi_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eNeboke_Akubi_mv(eEC_Effect_c* effect, GAME* game); +static void eNeboke_Akubi_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_neboke_akubi = { + // clang-format off + &eNeboke_Akubi_init, + &eNeboke_Akubi_ct, + &eNeboke_Akubi_mv, + &eNeboke_Akubi_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eNeboke_Akubi_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eNeboke_Akubi_mv(eEC_Effect_c* effect, GAME* game) { static void eNeboke_Akubi_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_neboke_akubi = { - // clang-format off - &eNeboke_Akubi_init, - &eNeboke_Akubi_ct, - &eNeboke_Akubi_mv, - &eNeboke_Akubi_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_neboke_awa.c b/src/ef_neboke_awa.c index aadc1c53..4f451062 100644 --- a/src/ef_neboke_awa.c +++ b/src/ef_neboke_awa.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSleep_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSleep_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSleep_mv(eEC_Effect_c* effect, GAME* game); +static void eSleep_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_neboke_awa = { + // clang-format off + &eSleep_init, + &eSleep_ct, + &eSleep_mv, + &eSleep_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSleep_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSleep_mv(eEC_Effect_c* effect, GAME* game) { static void eSleep_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_neboke_awa = { - // clang-format off - &eSleep_init, - &eSleep_ct, - &eSleep_mv, - &eSleep_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_night13_moon.c b/src/ef_night13_moon.c index 0777f3b7..45718819 100644 --- a/src/ef_night13_moon.c +++ b/src/ef_night13_moon.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eNight13Moon_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eNight13Moon_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eNight13Moon_mv(eEC_Effect_c* effect, GAME* game); +static void eNight13Moon_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_night13_moon = { + // clang-format off + &eNight13Moon_init, + &eNight13Moon_ct, + &eNight13Moon_mv, + &eNight13Moon_dw, + 80, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eNight13Moon_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eNight13Moon_mv(eEC_Effect_c* effect, GAME* game) { static void eNight13Moon_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_night13_moon = { - // clang-format off - &eNight13Moon_init, - &eNight13Moon_ct, - &eNight13Moon_mv, - &eNight13Moon_dw, - 80, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_night15_moon.c b/src/ef_night15_moon.c index aa089a78..525d03ae 100644 --- a/src/ef_night15_moon.c +++ b/src/ef_night15_moon.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eNight15Moon_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eNight15Moon_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eNight15Moon_mv(eEC_Effect_c* effect, GAME* game); +static void eNight15Moon_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_night15_moon = { + // clang-format off + &eNight15Moon_init, + &eNight15Moon_ct, + &eNight15Moon_mv, + &eNight15Moon_dw, + 60, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eNight15Moon_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eNight15Moon_mv(eEC_Effect_c* effect, GAME* game) { static void eNight15Moon_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_night15_moon = { - // clang-format off - &eNight15Moon_init, - &eNight15Moon_ct, - &eNight15Moon_mv, - &eNight15Moon_dw, - 60, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_ongen.c b/src/ef_ongen.c index 319df15b..ce4d1e01 100644 --- a/src/ef_ongen.c +++ b/src/ef_ongen.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eOngen_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eOngen_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eOngen_mv(eEC_Effect_c* effect, GAME* game); +static void eOngen_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_ongen = { + // clang-format off + &eOngen_init, + &eOngen_ct, + &eOngen_mv, + &eOngen_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eOngen_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eOngen_mv(eEC_Effect_c* effect, GAME* game) { static void eOngen_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_ongen = { - // clang-format off - &eOngen_init, - &eOngen_ct, - &eOngen_mv, - &eOngen_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_otikomi.c b/src/ef_otikomi.c index 59c7138a..f5cf17b1 100644 --- a/src/ef_otikomi.c +++ b/src/ef_otikomi.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eOMN_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eOMN_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eOMN_mv(eEC_Effect_c* effect, GAME* game); +static void eOMN_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_otikomi = { + // clang-format off + &eOMN_init, + &eOMN_ct, + &eOMN_mv, + &eOMN_dw, + 10, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eOMN_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eOMN_mv(eEC_Effect_c* effect, GAME* game) { static void eOMN_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_otikomi = { - // clang-format off - &eOMN_init, - &eOMN_ct, - &eOMN_mv, - &eOMN_dw, - 10, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_otosiana.c b/src/ef_otosiana.c index a8a69175..59f60c98 100644 --- a/src/ef_otosiana.c +++ b/src/ef_otosiana.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eOtosiana_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eOtosiana_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eOtosiana_mv(eEC_Effect_c* effect, GAME* game); +static void eOtosiana_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_otosiana = { + // clang-format off + &eOtosiana_init, + &eOtosiana_ct, + &eOtosiana_mv, + &eOtosiana_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eOtosiana_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eOtosiana_mv(eEC_Effect_c* effect, GAME* game) { static void eOtosiana_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_otosiana = { - // clang-format off - &eOtosiana_init, - &eOtosiana_ct, - &eOtosiana_mv, - &eOtosiana_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_pun.c b/src/ef_pun.c index 77c9a7ca..0c933b48 100644 --- a/src/ef_pun.c +++ b/src/ef_pun.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void ePun_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void ePun_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void ePun_mv(eEC_Effect_c* effect, GAME* game); +static void ePun_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_pun = { + // clang-format off + &ePun_init, + &ePun_ct, + &ePun_mv, + &ePun_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void ePun_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void ePun_mv(eEC_Effect_c* effect, GAME* game) { static void ePun_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_pun = { - // clang-format off - &ePun_init, - &ePun_ct, - &ePun_mv, - &ePun_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_pun_sekimen.c b/src/ef_pun_sekimen.c index 10437cdf..0235184e 100644 --- a/src/ef_pun_sekimen.c +++ b/src/ef_pun_sekimen.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void ePunRed_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void ePunRed_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void ePunRed_mv(eEC_Effect_c* effect, GAME* game); +static void ePunRed_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_pun_sekimen = { + // clang-format off + &ePunRed_init, + &ePunRed_ct, + &ePunRed_mv, + &ePunRed_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void ePunRed_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void ePunRed_mv(eEC_Effect_c* effect, GAME* game) { static void ePunRed_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_pun_sekimen = { - // clang-format off - &ePunRed_init, - &ePunRed_ct, - &ePunRed_mv, - &ePunRed_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_pun_yuge.c b/src/ef_pun_yuge.c index c9f086cc..fe59bea3 100644 --- a/src/ef_pun_yuge.c +++ b/src/ef_pun_yuge.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void ePunYuge_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void ePunYuge_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void ePunYuge_mv(eEC_Effect_c* effect, GAME* game); +static void ePunYuge_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_pun_yuge = { + // clang-format off + &ePunYuge_init, + &ePunYuge_ct, + &ePunYuge_mv, + &ePunYuge_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void ePunYuge_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void ePunYuge_mv(eEC_Effect_c* effect, GAME* game) { static void ePunYuge_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_pun_yuge = { - // clang-format off - &ePunYuge_init, - &ePunYuge_ct, - &ePunYuge_mv, - &ePunYuge_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_reset_hole.c b/src/ef_reset_hole.c index c291b353..670936c0 100644 --- a/src/ef_reset_hole.c +++ b/src/ef_reset_hole.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eReset_Hole_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eReset_Hole_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eReset_Hole_mv(eEC_Effect_c* effect, GAME* game); +static void eReset_Hole_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_reset_hole = { + // clang-format off + &eReset_Hole_init, + &eReset_Hole_ct, + &eReset_Hole_mv, + &eReset_Hole_dw, + 24, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eReset_Hole_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eReset_Hole_mv(eEC_Effect_c* effect, GAME* game) { static void eReset_Hole_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_reset_hole = { - // clang-format off - &eReset_Hole_init, - &eReset_Hole_ct, - &eReset_Hole_mv, - &eReset_Hole_dw, - 24, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_sandsplash.c b/src/ef_sandsplash.c index ea20210c..07b65b06 100644 --- a/src/ef_sandsplash.c +++ b/src/ef_sandsplash.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSandsplash_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSandsplash_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSandsplash_mv(eEC_Effect_c* effect, GAME* game); +static void eSandsplash_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_sandsplash = { + // clang-format off + &eSandsplash_init, + &eSandsplash_ct, + &eSandsplash_mv, + &eSandsplash_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSandsplash_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSandsplash_mv(eEC_Effect_c* effect, GAME* game) { static void eSandsplash_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_sandsplash = { - // clang-format off - &eSandsplash_init, - &eSandsplash_ct, - &eSandsplash_mv, - &eSandsplash_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_shock.c b/src/ef_shock.c index 7107533f..60196607 100644 --- a/src/ef_shock.c +++ b/src/ef_shock.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSK_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSK_mv(eEC_Effect_c* effect, GAME* game); +static void eSK_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_shock = { + // clang-format off + &eSK_init, + &eSK_ct, + &eSK_mv, + &eSK_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSK_mv(eEC_Effect_c* effect, GAME* game) { static void eSK_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_shock = { - // clang-format off - &eSK_init, - &eSK_ct, - &eSK_mv, - &eSK_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_shooting.c b/src/ef_shooting.c index bedc831d..c4a929a4 100644 --- a/src/ef_shooting.c +++ b/src/ef_shooting.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eShooting_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eShooting_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eShooting_mv(eEC_Effect_c* effect, GAME* game); +static void eShooting_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_shooting = { + // clang-format off + &eShooting_init, + &eShooting_ct, + &eShooting_mv, + &eShooting_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eShooting_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eShooting_mv(eEC_Effect_c* effect, GAME* game) { static void eShooting_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_shooting = { - // clang-format off - &eShooting_init, - &eShooting_ct, - &eShooting_mv, - &eShooting_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_shooting_kira.c b/src/ef_shooting_kira.c index 205eb88f..e063b7c7 100644 --- a/src/ef_shooting_kira.c +++ b/src/ef_shooting_kira.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eShootingKira_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eShootingKira_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eShootingKira_mv(eEC_Effect_c* effect, GAME* game); +static void eShootingKira_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_shooting_kira = { + // clang-format off + &eShootingKira_init, + &eShootingKira_ct, + &eShootingKira_mv, + &eShootingKira_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eShootingKira_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eShootingKira_mv(eEC_Effect_c* effect, GAME* game) { static void eShootingKira_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_shooting_kira = { - // clang-format off - &eShootingKira_init, - &eShootingKira_ct, - &eShootingKira_mv, - &eShootingKira_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_shooting_set.c b/src/ef_shooting_set.c index 8e459ec2..b4116fee 100644 --- a/src/ef_shooting_set.c +++ b/src/ef_shooting_set.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eShootingSet_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eShootingSet_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eShootingSet_mv(eEC_Effect_c* effect, GAME* game); +static void eShootingSet_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_shooting_set = { + // clang-format off + &eShootingSet_init, + &eShootingSet_ct, + &eShootingSet_mv, + &eShootingSet_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eShootingSet_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eShootingSet_mv(eEC_Effect_c* effect, GAME* game) { static void eShootingSet_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_shooting_set = { - // clang-format off - &eShootingSet_init, - &eShootingSet_ct, - &eShootingSet_mv, - &eShootingSet_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_siawase_hana.c b/src/ef_siawase_hana.c index 2ad57b97..5b63f08f 100644 --- a/src/ef_siawase_hana.c +++ b/src/ef_siawase_hana.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSSHN_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSSHN_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSSHN_mv(eEC_Effect_c* effect, GAME* game); +static void eSSHN_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_siawase_hana = { + // clang-format off + &eSSHN_init, + &eSSHN_ct, + &eSSHN_mv, + &eSSHN_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSSHN_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSSHN_mv(eEC_Effect_c* effect, GAME* game) { static void eSSHN_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_siawase_hana = { - // clang-format off - &eSSHN_init, - &eSSHN_ct, - &eSSHN_mv, - &eSSHN_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_siawase_hana_ch.c b/src/ef_siawase_hana_ch.c index 886c6982..7f34af93 100644 --- a/src/ef_siawase_hana_ch.c +++ b/src/ef_siawase_hana_ch.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSSHNC_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSSHNC_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSSHNC_mv(eEC_Effect_c* effect, GAME* game); +static void eSSHNC_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_siawase_hana_ch = { + // clang-format off + &eSSHNC_init, + &eSSHNC_ct, + &eSSHNC_mv, + &eSSHNC_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSSHNC_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSSHNC_mv(eEC_Effect_c* effect, GAME* game) { static void eSSHNC_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_siawase_hana_ch = { - // clang-format off - &eSSHNC_init, - &eSSHNC_ct, - &eSSHNC_mv, - &eSSHNC_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_siawase_hikari.c b/src/ef_siawase_hikari.c index a6b0f973..7065cba3 100644 --- a/src/ef_siawase_hikari.c +++ b/src/ef_siawase_hikari.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSSHKR_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSSHKR_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSSHKR_mv(eEC_Effect_c* effect, GAME* game); +static void eSSHKR_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_siawase_hikari = { + // clang-format off + &eSSHKR_init, + &eSSHKR_ct, + &eSSHKR_mv, + &eSSHKR_dw, + 72, + eEC_EFFECT_SIAWASE_HANA, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSSHKR_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSSHKR_mv(eEC_Effect_c* effect, GAME* game) { static void eSSHKR_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_siawase_hikari = { - // clang-format off - &eSSHKR_init, - &eSSHKR_ct, - &eSSHKR_mv, - &eSSHKR_dw, - 72, - eEC_EFFECT_SIAWASE_HANA, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_sibuki.c b/src/ef_sibuki.c index f09cfda6..13778aa9 100644 --- a/src/ef_sibuki.c +++ b/src/ef_sibuki.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSibuki_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSibuki_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSibuki_mv(eEC_Effect_c* effect, GAME* game); +static void eSibuki_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_sibuki = { + // clang-format off + &eSibuki_init, + &eSibuki_ct, + &eSibuki_mv, + &eSibuki_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSibuki_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSibuki_mv(eEC_Effect_c* effect, GAME* game) { static void eSibuki_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_sibuki = { - // clang-format off - &eSibuki_init, - &eSibuki_ct, - &eSibuki_mv, - &eSibuki_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_situren.c b/src/ef_situren.c index e93b3356..1a3793ee 100644 --- a/src/ef_situren.c +++ b/src/ef_situren.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSN_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSN_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSN_mv(eEC_Effect_c* effect, GAME* game); +static void eSN_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_situren = { + // clang-format off + &eSN_init, + &eSN_ct, + &eSN_mv, + &eSN_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSN_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSN_mv(eEC_Effect_c* effect, GAME* game) { static void eSN_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_situren = { - // clang-format off - &eSN_init, - &eSN_ct, - &eSN_mv, - &eSN_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_slip.c b/src/ef_slip.c index 91aa6ce6..b0a73062 100644 --- a/src/ef_slip.c +++ b/src/ef_slip.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSlip_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSlip_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSlip_mv(eEC_Effect_c* effect, GAME* game); +static void eSlip_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_slip = { + // clang-format off + &eSlip_init, + &eSlip_ct, + &eSlip_mv, + &eSlip_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSlip_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSlip_mv(eEC_Effect_c* effect, GAME* game) { static void eSlip_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_slip = { - // clang-format off - &eSlip_init, - &eSlip_ct, - &eSlip_mv, - &eSlip_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_slip_footprint.c b/src/ef_slip_footprint.c index b241d352..9b292e4a 100644 --- a/src/ef_slip_footprint.c +++ b/src/ef_slip_footprint.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSlipFootPrint_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSlipFootPrint_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSlipFootPrint_mv(eEC_Effect_c* effect, GAME* game); +static void eSlipFootPrint_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_slip_footprint = { + // clang-format off + &eSlipFootPrint_init, + &eSlipFootPrint_ct, + &eSlipFootPrint_mv, + &eSlipFootPrint_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSlipFootPrint_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSlipFootPrint_mv(eEC_Effect_c* effect, GAME* game) { static void eSlipFootPrint_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_slip_footprint = { - // clang-format off - &eSlipFootPrint_init, - &eSlipFootPrint_ct, - &eSlipFootPrint_mv, - &eSlipFootPrint_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_soba_yuge.c b/src/ef_soba_yuge.c index 384839d1..a281c8e7 100644 --- a/src/ef_soba_yuge.c +++ b/src/ef_soba_yuge.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSoba_Yuge_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSoba_Yuge_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSoba_Yuge_mv(eEC_Effect_c* effect, GAME* game); +static void eSoba_Yuge_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_soba_yuge = { + // clang-format off + &eSoba_Yuge_init, + &eSoba_Yuge_ct, + &eSoba_Yuge_mv, + &eSoba_Yuge_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_IGNORE_DEATH_DIST, + // clang-format on +}; + static void eSoba_Yuge_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSoba_Yuge_mv(eEC_Effect_c* effect, GAME* game) { static void eSoba_Yuge_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_soba_yuge = { - // clang-format off - &eSoba_Yuge_init, - &eSoba_Yuge_ct, - &eSoba_Yuge_mv, - &eSoba_Yuge_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_IGNORE_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_steam.c b/src/ef_steam.c index 6f6aa090..ec126299 100644 --- a/src/ef_steam.c +++ b/src/ef_steam.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSteam_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSteam_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSteam_mv(eEC_Effect_c* effect, GAME* game); +static void eSteam_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_steam = { + // clang-format off + &eSteam_init, + &eSteam_ct, + &eSteam_mv, + &eSteam_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSteam_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSteam_mv(eEC_Effect_c* effect, GAME* game) { static void eSteam_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_steam = { - // clang-format off - &eSteam_init, - &eSteam_ct, - &eSteam_mv, - &eSteam_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_string.c b/src/ef_string.c index 77520683..44b4d0e2 100644 --- a/src/ef_string.c +++ b/src/ef_string.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eString_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eString_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eString_mv(eEC_Effect_c* effect, GAME* game); +static void eString_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_string = { + // clang-format off + &eString_init, + &eString_ct, + &eString_mv, + &eString_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eString_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eString_mv(eEC_Effect_c* effect, GAME* game) { static void eString_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_string = { - // clang-format off - &eString_init, - &eString_ct, - &eString_mv, - &eString_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_suisou_awa.c b/src/ef_suisou_awa.c index ea6de5ee..8614cae5 100644 --- a/src/ef_suisou_awa.c +++ b/src/ef_suisou_awa.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSuisou_Awa_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSuisou_Awa_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSuisou_Awa_mv(eEC_Effect_c* effect, GAME* game); +static void eSuisou_Awa_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_suisou_awa = { + // clang-format off + &eSuisou_Awa_init, + &eSuisou_Awa_ct, + &eSuisou_Awa_mv, + &eSuisou_Awa_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSuisou_Awa_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSuisou_Awa_mv(eEC_Effect_c* effect, GAME* game) { static void eSuisou_Awa_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_suisou_awa = { - // clang-format off - &eSuisou_Awa_init, - &eSuisou_Awa_ct, - &eSuisou_Awa_mv, - &eSuisou_Awa_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_swing_axe.c b/src/ef_swing_axe.c index b04f9cb7..d0dd8b6f 100644 --- a/src/ef_swing_axe.c +++ b/src/ef_swing_axe.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSwing_Axe_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSwing_Axe_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSwing_Axe_mv(eEC_Effect_c* effect, GAME* game); +static void eSwing_Axe_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_swing_axe = { + // clang-format off + &eSwing_Axe_init, + &eSwing_Axe_ct, + &eSwing_Axe_mv, + &eSwing_Axe_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSwing_Axe_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSwing_Axe_mv(eEC_Effect_c* effect, GAME* game) { static void eSwing_Axe_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_swing_axe = { - // clang-format off - &eSwing_Axe_init, - &eSwing_Axe_ct, - &eSwing_Axe_mv, - &eSwing_Axe_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_swing_net.c b/src/ef_swing_net.c index 12f3b150..c6159256 100644 --- a/src/ef_swing_net.c +++ b/src/ef_swing_net.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSwing_Net_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSwing_Net_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSwing_Net_mv(eEC_Effect_c* effect, GAME* game); +static void eSwing_Net_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_swing_net = { + // clang-format off + &eSwing_Net_init, + &eSwing_Net_ct, + &eSwing_Net_mv, + &eSwing_Net_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSwing_Net_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSwing_Net_mv(eEC_Effect_c* effect, GAME* game) { static void eSwing_Net_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_swing_net = { - // clang-format off - &eSwing_Net_init, - &eSwing_Net_ct, - &eSwing_Net_mv, - &eSwing_Net_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_swing_rod.c b/src/ef_swing_rod.c index 0096d319..2955d80a 100644 --- a/src/ef_swing_rod.c +++ b/src/ef_swing_rod.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eSwing_Rod_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eSwing_Rod_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eSwing_Rod_mv(eEC_Effect_c* effect, GAME* game); +static void eSwing_Rod_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_swing_rod = { + // clang-format off + &eSwing_Rod_init, + &eSwing_Rod_ct, + &eSwing_Rod_mv, + &eSwing_Rod_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eSwing_Rod_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eSwing_Rod_mv(eEC_Effect_c* effect, GAME* game) { static void eSwing_Rod_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_swing_rod = { - // clang-format off - &eSwing_Rod_init, - &eSwing_Rod_ct, - &eSwing_Rod_mv, - &eSwing_Rod_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_taberu.c b/src/ef_taberu.c index dab24c54..d579e518 100644 --- a/src/ef_taberu.c +++ b/src/ef_taberu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTaberu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTaberu_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTaberu_mv(eEC_Effect_c* effect, GAME* game); +static void eTaberu_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_taberu = { + // clang-format off + &eTaberu_init, + &eTaberu_ct, + &eTaberu_mv, + &eTaberu_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTaberu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTaberu_mv(eEC_Effect_c* effect, GAME* game) { static void eTaberu_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_taberu = { - // clang-format off - &eTaberu_init, - &eTaberu_ct, - &eTaberu_mv, - &eTaberu_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_takurami.c b/src/ef_takurami.c index e1708dee..800a1e39 100644 --- a/src/ef_takurami.c +++ b/src/ef_takurami.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTM_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTM_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTM_mv(eEC_Effect_c* effect, GAME* game); +static void eTM_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_takurami = { + // clang-format off + &eTM_init, + &eTM_ct, + &eTM_mv, + &eTM_dw, + eEC_IGNORE_DEATH, + eEC_EFFECT_TAKURAMI_KIRA, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTM_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTM_mv(eEC_Effect_c* effect, GAME* game) { static void eTM_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_takurami = { - // clang-format off - &eTM_init, - &eTM_ct, - &eTM_mv, - &eTM_dw, - eEC_IGNORE_DEATH, - eEC_EFFECT_TAKURAMI_KIRA, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_takurami_kira.c b/src/ef_takurami_kira.c index 0165f1e0..0942c4de 100644 --- a/src/ef_takurami_kira.c +++ b/src/ef_takurami_kira.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTMK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTMK_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTMK_mv(eEC_Effect_c* effect, GAME* game); +static void eTMK_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_takurami_kira = { + // clang-format off + &eTMK_init, + &eTMK_ct, + &eTMK_mv, + &eTMK_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTMK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTMK_mv(eEC_Effect_c* effect, GAME* game) { static void eTMK_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_takurami_kira = { - // clang-format off - &eTMK_init, - &eTMK_ct, - &eTMK_mv, - &eTMK_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_tamaire.c b/src/ef_tamaire.c index 925fcf7d..f4d9b9f6 100644 --- a/src/ef_tamaire.c +++ b/src/ef_tamaire.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTamaire_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTamaire_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTamaire_mv(eEC_Effect_c* effect, GAME* game); +static void eTamaire_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_tamaire = { + // clang-format off + &eTamaire_init, + &eTamaire_ct, + &eTamaire_mv, + &eTamaire_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTamaire_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTamaire_mv(eEC_Effect_c* effect, GAME* game) { static void eTamaire_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_tamaire = { - // clang-format off - &eTamaire_init, - &eTamaire_ct, - &eTamaire_mv, - &eTamaire_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_tape.c b/src/ef_tape.c index 39f09213..d0484c7e 100644 --- a/src/ef_tape.c +++ b/src/ef_tape.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTape_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTape_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTape_mv(eEC_Effect_c* effect, GAME* game); +static void eTape_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_tape = { + // clang-format off + &eTape_init, + &eTape_ct, + &eTape_mv, + &eTape_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTape_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTape_mv(eEC_Effect_c* effect, GAME* game) { static void eTape_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_tape = { - // clang-format off - &eTape_init, - &eTape_ct, - &eTape_mv, - &eTape_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_tent_lamp.c b/src/ef_tent_lamp.c index f497a8a1..ef1e6bbf 100644 --- a/src/ef_tent_lamp.c +++ b/src/ef_tent_lamp.c @@ -1,9 +1,5 @@ #include "ef_effect_control.h" -#include "m_common_data.h" -#include "sys_matrix.h" -#include "m_rcp.h" - static void eTL_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); static void eTL_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); static void eTL_mv(eEC_Effect_c* effect, GAME* game); @@ -22,64 +18,17 @@ eEC_PROFILE_c iam_ef_tent_lamp = { }; static void eTL_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { - (*eEC_CLIP->make_effect_proc)(eEC_EFFECT_TENT_LAMP, pos, NULL, game, NULL, item_name, prio, arg0, arg1); -} - -static s16 eTL_GetNiceSwitchStat() { - if (Common_Get(time.now_sec) >= (5 * mTM_SECONDS_IN_HOUR) && - Common_Get(time.now_sec) < (18 * mTM_SECONDS_IN_HOUR)) { - return FALSE; - } - - return TRUE; + // TODO } static void eTL_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) { - GAME_PLAY* play = (GAME_PLAY*)game; - - effect->timer = 100; - if (eTL_GetNiceSwitchStat() == TRUE) { - mEnv_RequestChangeLightON(play, mRmTp_LIGHT_SWITCH_HOUSE0_BASEMENT, FALSE); - effect->offset.x = 1.0f; - } else { - mEnv_RequestChangeLightOFF(play, mRmTp_LIGHT_SWITCH_HOUSE0_BASEMENT, 0.5f); - effect->offset.x = 0.0f; - } + // TODO } static void eTL_mv(eEC_Effect_c* effect, GAME* game) { - GAME_PLAY* play = (GAME_PLAY*)game; - f32 target; - int nice_switch_state = eTL_GetNiceSwitchStat(); - - (*eEC_CLIP->set_continious_env_proc)(effect, 100, 100); - - if (nice_switch_state == TRUE) { - mEnv_RequestChangeLightON(play, mRmTp_LIGHT_SWITCH_HOUSE0_BASEMENT, FALSE); - target = 1.0f; - } else { - mEnv_RequestChangeLightOFF(play, mRmTp_LIGHT_SWITCH_HOUSE0_BASEMENT, 0.01f); - target = 0.0f; - } - - add_calc(&effect->offset.x, target, 0.015f, 0.1f, 0.001f); + // TODO } -extern Gfx obj_tent_lamp_model[]; - static void eTL_dw(eEC_Effect_c* effect, GAME* game) { - int l = (int)(255.0f + effect->offset.x * -255.0f); - - _texture_z_light_fog_prim(game->graph); - - OPEN_DISP(game->graph); - - Matrix_translate(0.0f, 0.0f, 0.0f, 0); - Matrix_scale(0.05f, 0.05f, 0.05f, 1); - - gDPSetPrimColor(NEXT_POLY_OPA_DISP, 0, l, 255, 255, 255, 255); - gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(NEXT_POLY_OPA_DISP, obj_tent_lamp_model); - - CLOSE_DISP(game->graph); + // TODO } diff --git a/src/ef_tumble.c b/src/ef_tumble.c index 017e0db3..77283a0c 100644 --- a/src/ef_tumble.c +++ b/src/ef_tumble.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTumble_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTumble_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTumble_mv(eEC_Effect_c* effect, GAME* game); +static void eTumble_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_tumble = { + // clang-format off + &eTumble_init, + &eTumble_ct, + &eTumble_mv, + &eTumble_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTumble_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTumble_mv(eEC_Effect_c* effect, GAME* game) { static void eTumble_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_tumble = { - // clang-format off - &eTumble_init, - &eTumble_ct, - &eTumble_mv, - &eTumble_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_tumble_bodyprint.c b/src/ef_tumble_bodyprint.c index 6d82e370..0c843431 100644 --- a/src/ef_tumble_bodyprint.c +++ b/src/ef_tumble_bodyprint.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTumbleBodyPrint_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTumbleBodyPrint_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTumbleBodyPrint_mv(eEC_Effect_c* effect, GAME* game); +static void eTumbleBodyPrint_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_tumble_bodyprint = { + // clang-format off + &eTumbleBodyPrint_init, + &eTumbleBodyPrint_ct, + &eTumbleBodyPrint_mv, + &eTumbleBodyPrint_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTumbleBodyPrint_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTumbleBodyPrint_mv(eEC_Effect_c* effect, GAME* game) { static void eTumbleBodyPrint_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_tumble_bodyprint = { - // clang-format off - &eTumbleBodyPrint_init, - &eTumbleBodyPrint_ct, - &eTumbleBodyPrint_mv, - &eTumbleBodyPrint_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_tumble_dust.c b/src/ef_tumble_dust.c index faa6027d..13b28e8a 100644 --- a/src/ef_tumble_dust.c +++ b/src/ef_tumble_dust.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTumbleDust_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTumbleDust_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTumbleDust_mv(eEC_Effect_c* effect, GAME* game); +static void eTumbleDust_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_tumble_dust = { + // clang-format off + &eTumbleDust_init, + &eTumbleDust_ct, + &eTumbleDust_mv, + &eTumbleDust_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTumbleDust_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTumbleDust_mv(eEC_Effect_c* effect, GAME* game) { static void eTumbleDust_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_tumble_dust = { - // clang-format off - &eTumbleDust_init, - &eTumbleDust_ct, - &eTumbleDust_mv, - &eTumbleDust_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_turi_hamon.c b/src/ef_turi_hamon.c index ab36baf3..05e6e22c 100644 --- a/src/ef_turi_hamon.c +++ b/src/ef_turi_hamon.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTH_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTH_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTH_mv(eEC_Effect_c* effect, GAME* game); +static void eTH_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_turi_hamon = { + // clang-format off + &eTH_init, + &eTH_ct, + &eTH_mv, + &eTH_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTH_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTH_mv(eEC_Effect_c* effect, GAME* game) { static void eTH_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_turi_hamon = { - // clang-format off - &eTH_init, - &eTH_ct, - &eTH_mv, - &eTH_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_turi_hane0.c b/src/ef_turi_hane0.c index 52259c7d..aa014e4e 100644 --- a/src/ef_turi_hane0.c +++ b/src/ef_turi_hane0.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTH0_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTH0_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTH0_mv(eEC_Effect_c* effect, GAME* game); +static void eTH0_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_turi_hane0 = { + // clang-format off + &eTH0_init, + &eTH0_ct, + &eTH0_mv, + &eTH0_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTH0_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTH0_mv(eEC_Effect_c* effect, GAME* game) { static void eTH0_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_turi_hane0 = { - // clang-format off - &eTH0_init, - &eTH0_ct, - &eTH0_mv, - &eTH0_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_turi_hane1.c b/src/ef_turi_hane1.c index 73dd1e0e..75c3acec 100644 --- a/src/ef_turi_hane1.c +++ b/src/ef_turi_hane1.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTH0_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTH0_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTH0_mv(eEC_Effect_c* effect, GAME* game); +static void eTH0_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_turi_hane1 = { + // clang-format off + &eTH0_init, + &eTH0_ct, + &eTH0_mv, + &eTH0_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTH0_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTH0_mv(eEC_Effect_c* effect, GAME* game) { static void eTH0_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_turi_hane1 = { - // clang-format off - &eTH0_init, - &eTH0_ct, - &eTH0_mv, - &eTH0_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_turi_mizu.c b/src/ef_turi_mizu.c index fea71a0b..934edb9d 100644 --- a/src/ef_turi_mizu.c +++ b/src/ef_turi_mizu.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTM_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTM_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTM_mv(eEC_Effect_c* effect, GAME* game); +static void eTM_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_turi_mizu = { + // clang-format off + &eTM_init, + &eTM_ct, + &eTM_mv, + &eTM_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTM_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTM_mv(eEC_Effect_c* effect, GAME* game) { static void eTM_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_turi_mizu = { - // clang-format off - &eTM_init, - &eTM_ct, - &eTM_mv, - &eTM_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_turi_suiteki.c b/src/ef_turi_suiteki.c index 0171c007..fc82ecf9 100644 --- a/src/ef_turi_suiteki.c +++ b/src/ef_turi_suiteki.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTS_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTS_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTS_mv(eEC_Effect_c* effect, GAME* game); +static void eTS_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_turi_suiteki = { + // clang-format off + &eTS_init, + &eTS_ct, + &eTS_mv, + &eTS_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTS_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTS_mv(eEC_Effect_c* effect, GAME* game) { static void eTS_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_turi_suiteki = { - // clang-format off - &eTS_init, - &eTS_ct, - &eTS_mv, - &eTS_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_turn_asimoto.c b/src/ef_turn_asimoto.c index 96715923..81193a08 100644 --- a/src/ef_turn_asimoto.c +++ b/src/ef_turn_asimoto.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTurnAsimoto_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTurnAsimoto_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTurnAsimoto_mv(eEC_Effect_c* effect, GAME* game); +static void eTurnAsimoto_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_turn_asimoto = { + // clang-format off + &eTurnAsimoto_init, + &eTurnAsimoto_ct, + &eTurnAsimoto_mv, + &eTurnAsimoto_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTurnAsimoto_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTurnAsimoto_mv(eEC_Effect_c* effect, GAME* game) { static void eTurnAsimoto_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_turn_asimoto = { - // clang-format off - &eTurnAsimoto_init, - &eTurnAsimoto_ct, - &eTurnAsimoto_mv, - &eTurnAsimoto_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_turn_footprint.c b/src/ef_turn_footprint.c index a1a0c588..3b4ddf11 100644 --- a/src/ef_turn_footprint.c +++ b/src/ef_turn_footprint.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eTurnFootPrint_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eTurnFootPrint_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eTurnFootPrint_mv(eEC_Effect_c* effect, GAME* game); +static void eTurnFootPrint_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_turn_footprint = { + // clang-format off + &eTurnFootPrint_init, + &eTurnFootPrint_ct, + &eTurnFootPrint_mv, + &eTurnFootPrint_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eTurnFootPrint_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eTurnFootPrint_mv(eEC_Effect_c* effect, GAME* game) { static void eTurnFootPrint_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_turn_footprint = { - // clang-format off - &eTurnFootPrint_init, - &eTurnFootPrint_ct, - &eTurnFootPrint_mv, - &eTurnFootPrint_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_uranai.c b/src/ef_uranai.c index acfdd6d2..79d12057 100644 --- a/src/ef_uranai.c +++ b/src/ef_uranai.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eUranai_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eUranai_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eUranai_mv(eEC_Effect_c* effect, GAME* game); +static void eUranai_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_uranai = { + // clang-format off + &eUranai_init, + &eUranai_ct, + &eUranai_mv, + &eUranai_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eUranai_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eUranai_mv(eEC_Effect_c* effect, GAME* game) { static void eUranai_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_uranai = { - // clang-format off - &eUranai_init, - &eUranai_ct, - &eUranai_mv, - &eUranai_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_wait_asimoto.c b/src/ef_wait_asimoto.c index 690599a4..f2ae7bda 100644 --- a/src/ef_wait_asimoto.c +++ b/src/ef_wait_asimoto.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eWait_Asimoto_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eWait_Asimoto_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eWait_Asimoto_mv(eEC_Effect_c* effect, GAME* game); +static void eWait_Asimoto_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_wait_asimoto = { + // clang-format off + &eWait_Asimoto_init, + &eWait_Asimoto_ct, + &eWait_Asimoto_mv, + &eWait_Asimoto_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eWait_Asimoto_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eWait_Asimoto_mv(eEC_Effect_c* effect, GAME* game) { static void eWait_Asimoto_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_wait_asimoto = { - // clang-format off - &eWait_Asimoto_init, - &eWait_Asimoto_ct, - &eWait_Asimoto_mv, - &eWait_Asimoto_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_walk_asimoto.c b/src/ef_walk_asimoto.c index a4e9945c..b343a12d 100644 --- a/src/ef_walk_asimoto.c +++ b/src/ef_walk_asimoto.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eWalk_Asimoto_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eWalk_Asimoto_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eWalk_Asimoto_mv(eEC_Effect_c* effect, GAME* game); +static void eWalk_Asimoto_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_walk_asimoto = { + // clang-format off + &eWalk_Asimoto_init, + &eWalk_Asimoto_ct, + &eWalk_Asimoto_mv, + &eWalk_Asimoto_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eWalk_Asimoto_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eWalk_Asimoto_mv(eEC_Effect_c* effect, GAME* game) { static void eWalk_Asimoto_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_walk_asimoto = { - // clang-format off - &eWalk_Asimoto_init, - &eWalk_Asimoto_ct, - &eWalk_Asimoto_mv, - &eWalk_Asimoto_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_warau.c b/src/ef_warau.c index f78bc602..3de70ec9 100644 --- a/src/ef_warau.c +++ b/src/ef_warau.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eWU_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eWU_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eWU_mv(eEC_Effect_c* effect, GAME* game); +static void eWU_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_warau = { + // clang-format off + &eWU_init, + &eWU_ct, + &eWU_mv, + &eWU_dw, + eEC_IMMEDIATE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eWU_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eWU_mv(eEC_Effect_c* effect, GAME* game) { static void eWU_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_warau = { - // clang-format off - &eWU_init, - &eWU_ct, - &eWU_mv, - &eWU_dw, - eEC_IMMEDIATE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_yajirushi.c b/src/ef_yajirushi.c index 6a806457..83a168bd 100644 --- a/src/ef_yajirushi.c +++ b/src/ef_yajirushi.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eYajirushi_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eYajirushi_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eYajirushi_mv(eEC_Effect_c* effect, GAME* game); +static void eYajirushi_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_yajirushi = { + // clang-format off + &eYajirushi_init, + &eYajirushi_ct, + &eYajirushi_mv, + &eYajirushi_dw, + 6, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eYajirushi_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eYajirushi_mv(eEC_Effect_c* effect, GAME* game) { static void eYajirushi_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_yajirushi = { - // clang-format off - &eYajirushi_init, - &eYajirushi_ct, - &eYajirushi_mv, - &eYajirushi_dw, - 6, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_young_tree.c b/src/ef_young_tree.c index 6f93c7a5..e9b11e91 100644 --- a/src/ef_young_tree.c +++ b/src/ef_young_tree.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eYoung_Tree_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eYoung_Tree_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eYoung_Tree_mv(eEC_Effect_c* effect, GAME* game); +static void eYoung_Tree_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_young_tree = { + // clang-format off + &eYoung_Tree_init, + &eYoung_Tree_ct, + &eYoung_Tree_mv, + &eYoung_Tree_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eYoung_Tree_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eYoung_Tree_mv(eEC_Effect_c* effect, GAME* game) { static void eYoung_Tree_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_young_tree = { - // clang-format off - &eYoung_Tree_init, - &eYoung_Tree_ct, - &eYoung_Tree_mv, - &eYoung_Tree_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_yukidama.c b/src/ef_yukidama.c index 599a77c3..3f1e0cf6 100644 --- a/src/ef_yukidama.c +++ b/src/ef_yukidama.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eYukidama_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eYukidama_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eYukidama_mv(eEC_Effect_c* effect, GAME* game); +static void eYukidama_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_yukidama = { + // clang-format off + &eYukidama_init, + &eYukidama_ct, + &eYukidama_mv, + &eYukidama_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eYukidama_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eYukidama_mv(eEC_Effect_c* effect, GAME* game) { static void eYukidama_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_yukidama = { - // clang-format off - &eYukidama_init, - &eYukidama_ct, - &eYukidama_mv, - &eYukidama_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_yukidaruma.c b/src/ef_yukidaruma.c index 254e332f..e2cc60ce 100644 --- a/src/ef_yukidaruma.c +++ b/src/ef_yukidaruma.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eYukidaruma_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eYukidaruma_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eYukidaruma_mv(eEC_Effect_c* effect, GAME* game); +static void eYukidaruma_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_yukidaruma = { + // clang-format off + &eYukidaruma_init, + &eYukidaruma_ct, + &eYukidaruma_mv, + &eYukidaruma_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eYukidaruma_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eYukidaruma_mv(eEC_Effect_c* effect, GAME* game) { static void eYukidaruma_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_yukidaruma = { - // clang-format off - &eYukidaruma_init, - &eYukidaruma_ct, - &eYukidaruma_mv, - &eYukidaruma_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -}; diff --git a/src/ef_yukihane.c b/src/ef_yukihane.c index 6081eb9d..b7bd15fb 100644 --- a/src/ef_yukihane.c +++ b/src/ef_yukihane.c @@ -1,5 +1,22 @@ #include "ef_effect_control.h" +static void eYukihane_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1); +static void eYukihane_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg); +static void eYukihane_mv(eEC_Effect_c* effect, GAME* game); +static void eYukihane_dw(eEC_Effect_c* effect, GAME* game); + +eEC_PROFILE_c iam_ef_yukihane = { + // clang-format off + &eYukihane_init, + &eYukihane_ct, + &eYukihane_mv, + &eYukihane_dw, + eEC_IGNORE_DEATH, + eEC_NO_CHILD_ID, + eEC_DEFAULT_DEATH_DIST, + // clang-format on +}; + static void eYukihane_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { // TODO } @@ -15,15 +32,3 @@ static void eYukihane_mv(eEC_Effect_c* effect, GAME* game) { static void eYukihane_dw(eEC_Effect_c* effect, GAME* game) { // TODO } - -eEC_PROFILE_c iam_ef_yukihane = { - // clang-format off - &eYukihane_init, - &eYukihane_ct, - &eYukihane_mv, - &eYukihane_dw, - eEC_IGNORE_DEATH, - eEC_NO_CHILD_ID, - eEC_DEFAULT_DEATH_DIST, - // clang-format on -};