diff --git a/configure.py b/configure.py index 2d392449..94c41762 100644 --- a/configure.py +++ b/configure.py @@ -1345,7 +1345,7 @@ config.libs = [ Object(NonMatching, "effect/ef_tumble_dust.c"), Object(Matching, "effect/ef_turi_hamon.c"), Object(Matching, "effect/ef_turi_hane0.c"), - Object(NonMatching, "effect/ef_turi_hane1.c"), + Object(Matching, "effect/ef_turi_hane1.c"), Object(Matching, "effect/ef_turi_mizu.c"), Object(NonMatching, "effect/ef_turi_suiteki.c"), Object(NonMatching, "effect/ef_turn_asimoto.c"), diff --git a/src/effect/ef_turi_hane1.c b/src/effect/ef_turi_hane1.c index 75c3acec..290934f7 100644 --- a/src/effect/ef_turi_hane1.c +++ b/src/effect/ef_turi_hane1.c @@ -1,5 +1,16 @@ #include "ef_effect_control.h" +#include "m_common_data.h" +#include "m_rcp.h" +#include "sys_matrix.h" + +extern Gfx ef_turi_hane02_00_modelT[]; + +extern u8 ef_turi_hane02_0_int_i4[]; +extern u8 ef_turi_hane02_1_int_i4[]; +extern u8 ef_turi_hane02_2_int_i4[]; +extern u8 ef_turi_hane02_3_int_i4[]; + 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); @@ -17,18 +28,42 @@ eEC_PROFILE_c iam_ef_turi_hane1 = { // clang-format on }; +static u8* eTuri_Hane1Ptn[] = { + ef_turi_hane02_0_int_i4, ef_turi_hane02_0_int_i4, ef_turi_hane02_1_int_i4, ef_turi_hane02_1_int_i4, + ef_turi_hane02_2_int_i4, ef_turi_hane02_2_int_i4, ef_turi_hane02_3_int_i4, ef_turi_hane02_3_int_i4, +}; + static void eTH0_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { - // TODO + eEC_CLIP->make_effect_proc(eEC_EFFECT_TURI_HANE1, pos, NULL, game, NULL, item_name, prio, 0, 0); } static void eTH0_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) { - // TODO + effect->timer = 16; + + effect->scale.x = 0.01f; + effect->scale.y = 0.01f; + effect->scale.z = 0.01f; } static void eTH0_mv(eEC_Effect_c* effect, GAME* game) { - // TODO + return; } static void eTH0_dw(eEC_Effect_c* effect, GAME* game) { - // TODO + xyz_t scale = effect->scale; + s16 counter = (s16)(16 - effect->timer) >> 1; + counter = CLAMP(counter, 0, 7); + + OPEN_DISP(game->graph); + + _texture_z_light_fog_prim_xlu(game->graph); + + Matrix_translate(effect->position.x, effect->position.y, effect->position.z, FALSE); + Matrix_scale(scale.x, scale.y, scale.z, TRUE); + + gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(NEXT_POLY_XLU_DISP, G_MWO_SEGMENT_8, eTuri_Hane1Ptn[counter]); + gSPDisplayList(NEXT_POLY_XLU_DISP, ef_turi_hane02_00_modelT); + + CLOSE_DISP(game->graph); }