From 097fc9fd9aa02547237ac4fb69328978fa36a7c7 Mon Sep 17 00:00:00 2001 From: Norgesnerd <5824576+Norgesnerd@users.noreply.github.com> Date: Fri, 23 May 2025 11:18:13 +0200 Subject: [PATCH] Implement & link ef_kyousou_onpu --- configure.py | 2 +- src/effect/ef_kyousou_onpu.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index 3955dc84..1a3a628c 100644 --- a/configure.py +++ b/configure.py @@ -1287,7 +1287,7 @@ config.libs = [ Object(NonMatching, "effect/ef_kisha_kemuri.c"), Object(NonMatching, "effect/ef_konpu.c"), Object(NonMatching, "effect/ef_kpun.c"), - Object(NonMatching, "effect/ef_kyousou_onpu.c"), + Object(Matching, "effect/ef_kyousou_onpu.c"), Object(Matching, "effect/ef_lamp_light.c"), Object(NonMatching, "effect/ef_lovelove.c"), Object(NonMatching, "effect/ef_lovelove2.c"), diff --git a/src/effect/ef_kyousou_onpu.c b/src/effect/ef_kyousou_onpu.c index a1b48677..db3621d4 100644 --- a/src/effect/ef_kyousou_onpu.c +++ b/src/effect/ef_kyousou_onpu.c @@ -1,5 +1,7 @@ #include "ef_effect_control.h" +#include "m_common_data.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); @@ -18,17 +20,21 @@ eEC_PROFILE_c iam_ef_kyousou_onpu = { }; static void eKyousou_Onpu_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { - // TODO + if (eEC_CLIP != NULL) { + eEC_CLIP->effect_make_proc(eEC_EFFECT_KONPU, pos, prio, angle, game, item_name, 2, 0); + } + + eEC_CLIP->make_effect_proc(eEC_EFFECT_KYOUSOU_ONPU, pos, NULL, game, NULL, item_name, prio, arg0, arg1); } static void eKyousou_Onpu_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) { - // TODO + effect->timer = 0; } static void eKyousou_Onpu_mv(eEC_Effect_c* effect, GAME* game) { - // TODO + return; } static void eKyousou_Onpu_dw(eEC_Effect_c* effect, GAME* game) { - // TODO + return; }