diff --git a/configure.py b/configure.py index ce879650..57a032bb 100644 --- a/configure.py +++ b/configure.py @@ -1254,7 +1254,7 @@ config.libs = [ Object(Matching, "effect/ef_flash.c"), Object(Matching, "effect/ef_footprint.c"), Object(Matching, "effect/ef_furo_yuge.c"), - Object(NonMatching, "effect/ef_gimonhu.c"), + Object(Matching, "effect/ef_gimonhu.c"), Object(NonMatching, "effect/ef_goki.c"), Object(NonMatching, "effect/ef_ha.c"), Object(Matching, "effect/ef_halloween.c"), diff --git a/src/effect/ef_gimonhu.c b/src/effect/ef_gimonhu.c index 514db582..da8ecb56 100644 --- a/src/effect/ef_gimonhu.c +++ b/src/effect/ef_gimonhu.c @@ -1,12 +1,19 @@ #include "ef_effect_control.h" +#include "m_common_data.h" +#include "m_rcp.h" +#include "sys_matrix.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); +#define EFFECT_LIFETIME 72 +#define EFFECT_STAGE2 64 +#define EFFECT_STAGE1 50 + +// clang-format off eEC_PROFILE_c iam_ef_gimonhu = { - // clang-format off &eGM_init, &eGM_ct, &eGM_mv, @@ -14,21 +21,78 @@ eEC_PROFILE_c iam_ef_gimonhu = { eEC_IGNORE_DEATH, eEC_NO_CHILD_ID, eEC_DEFAULT_DEATH_DIST, - // clang-format on }; +f32 eGM_scale_data[][2] = { + { 0.5f, 0.5f }, + { 0.5f, 1.2f }, + { 0.5f, 2.f }, + { 1.2f, 1.4f }, + { 2.f, 0.7f }, + { 1.5f, 0.8f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f }, + { 1.f, 1.f } +}; + +extern Gfx ef_gimonhu01_00_modelT[]; + +// clang-format on static void eGM_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { - // TODO + const float delta = 9.58738e-05f; // not sure about this constant, close to 1e-4, but not quite + xyz_t p = { 0.f, 15.f, 7.f }; + sMath_RotateY(&p, angle * delta); + pos.x += p.x; + pos.y += p.y; + eEC_CLIP->make_effect_proc(eEC_EFFECT_GIMONHU, pos, NULL, game, NULL, item_name, prio, 0, 0); } static void eGM_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) { - // TODO + effect->timer = EFFECT_LIFETIME; + effect->offset.x = effect->offset.y = effect->offset.z = 0.f; } static void eGM_mv(eEC_Effect_c* effect, GAME* game) { - // TODO + s16 currentFrame = EFFECT_LIFETIME - effect->timer; + if (currentFrame == 0) { + sAdo_OngenTrgStart(0X2F, &effect->position); + } } static void eGM_dw(eEC_Effect_c* effect, GAME* game) { - // TODO + s16 frameIndex; + s16 currentFrame = EFFECT_LIFETIME - effect->timer; + int v = (u8)eEC_CLIP->calc_adjust_proc(currentFrame, EFFECT_STAGE2, EFFECT_LIFETIME, 255.f, 0.f); + if (currentFrame > EFFECT_STAGE1) { + currentFrame = EFFECT_STAGE1; + } + frameIndex = currentFrame >> 1; + frameIndex = CLAMP(frameIndex, 0, EFFECT_STAGE1 / 2); + effect->scale.x = eGM_scale_data[frameIndex][0] * 0.008f; + effect->scale.y = eGM_scale_data[frameIndex][1] * 0.008f; + effect->scale.z = 0.008f; + OPEN_DISP(game->graph); + _texture_z_light_fog_prim_xlu(game->graph); + eEC_CLIP->auto_matrix_xlu_offset_proc(game, &effect->position, &effect->scale, &effect->offset); + gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, 255, 255, 255, v); + gSPDisplayList(NEXT_POLY_XLU_DISP, ef_gimonhu01_00_modelT); + CLOSE_DISP(game->graph); }