From 9903d809da340baf08168a01f17eaefb10c12476 Mon Sep 17 00:00:00 2001 From: roeming Date: Sun, 1 Jun 2025 13:08:09 -0400 Subject: [PATCH] link ef_hanabi_hoshi --- configure.py | 2 +- src/effect/ef_hanabi_hoshi.c | 89 ++++++++++++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index bc167cb2..3bb908a9 100644 --- a/configure.py +++ b/configure.py @@ -1262,7 +1262,7 @@ config.libs = [ Object(Matching, "effect/ef_hanabi_botan1.c"), Object(Matching, "effect/ef_hanabi_botan2.c"), Object(Matching, "effect/ef_hanabi_dummy.c"), - Object(NonMatching, "effect/ef_hanabi_hoshi.c"), + Object(Matching, "effect/ef_hanabi_hoshi.c"), Object(NonMatching, "effect/ef_hanabi_set.c"), Object(NonMatching, "effect/ef_hanabi_switch.c"), Object(NonMatching, "effect/ef_hanabi_yanagi.c"), diff --git a/src/effect/ef_hanabi_hoshi.c b/src/effect/ef_hanabi_hoshi.c index 67e6907f..74231e0b 100644 --- a/src/effect/ef_hanabi_hoshi.c +++ b/src/effect/ef_hanabi_hoshi.c @@ -1,10 +1,17 @@ #include "ef_effect_control.h" +#include "m_common_data.h" +#include "m_rcp.h" +#include "sys_matrix.h" +#include "m_debug.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); +#define CALC_EASE(x) (1.0f - sqrtf(1.0f - (x))) +#define EFFECT_LIFETIME 80 + eEC_PROFILE_c iam_ef_hanabi_hoshi = { // clang-format off &eHanabiHoshi_init, @@ -18,17 +25,91 @@ eEC_PROFILE_c iam_ef_hanabi_hoshi = { }; static void eHanabiHoshi_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_HANABI_HOSHI, pos, NULL, game, NULL, item_name, prio, arg0, arg1); } static void eHanabiHoshi_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) { - // TODO + effect->timer = EFFECT_LIFETIME; + effect->scale.x = 0.01f; + effect->scale.y = 0.01f; + effect->scale.z = 0.01f; + effect->effect_specific[0] = 0; + effect->effect_specific[1] = 0; + effect->effect_specific[2] = 0; + effect->offset.x = 0.f; + effect->offset.y = 0.f; + effect->offset.z = 0.f; + effect->effect_specific[3] = (u16)RANDOM_F(10.f) & 1; } static void eHanabiHoshi_mv(eEC_Effect_c* effect, GAME* game) { - // TODO + s16 framesAlive = EFFECT_LIFETIME - effect->timer; + effect->effect_specific[0] += 0x300; + effect->effect_specific[1] += 0x100; + effect->effect_specific[2] += 0x80; + effect->offset.x = sin_s(effect->effect_specific[1]) * 2.f; + effect->offset.z = sin_s(-effect->effect_specific[1]) * 2.f; + add_calc2(&effect->scale.x, 0.024999999f, CALC_EASE(0.2f), 5.f); + effect->scale.y = effect->scale.x; + effect->scale.z = effect->scale.x; + if (framesAlive == 10) { + static rgba_t hoshi_light[] = { { 0x3c, 0x1e, 0x1e, 255 }, { 0x1e, 0x3c, 0x1e, 255 } }; + rgba_t resultColor; + eEC_CLIP->decide_light_power_proc(&resultColor, hoshi_light[effect->effect_specific[3]], effect->position, game, + 2.f, 0.f, 480.f); + if (effect->arg0) { + // `resultColor.r *= (4.f/3.f);` does not match + resultColor.r = resultColor.r * (4.f / 3.f); + resultColor.g = resultColor.g * (4.f / 3.f); + resultColor.b = resultColor.b * (4.f / 3.f); + } + eEC_CLIP->regist_effect_light(resultColor, 20, 50, TRUE); + } + if (framesAlive == 72) { + xyz_t p = effect->position; + p.y += 200.f; + sAdo_OngenTrgStart(NA_SE_HANABI2, &p); + } } +eEC_morph_data_c eHanabiHoshi_morph_data1[] = { + { 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 200.f, 200.f }, { 0, 0, FALSE, 200.f, 200.f }, + { 29, 39, TRUE, 150.f, 0.f }, { 10, 24, TRUE, 0.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f }, + { 0, 0, FALSE, 0.f, 0.f }, { 0, 0, FALSE, 100.f, 100.f }, { 0, 0, FALSE, 255.f, 255.f }, +}; + +eEC_morph_data_c eHanabiHoshi_morph_data2[] = { + { 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 255.f, 255.f }, + { 29, 39, TRUE, 150.f, 0.f }, { 10, 24, TRUE, 0.f, 255.f }, { 0, 0, FALSE, 0.f, 0.f }, + { 0, 0, FALSE, 255.f, 255.f }, { 0, 0, FALSE, 0.f, 0.f }, { 0, 0, FALSE, 255.f, 255.f }, +}; + +eEC_morph_data_c* eHanabiHoshi_morph_table[] = { eHanabiHoshi_morph_data1, eHanabiHoshi_morph_data2 }; + +extern Gfx ef_hanabi_h_00_modelT[]; + static void eHanabiHoshi_dw(eEC_Effect_c* effect, GAME* game) { - // TODO + u8 result[9]; + f32 v2, v; + s16 index; + s16 active_frames = EFFECT_LIFETIME - effect->timer; + v = (sin_s(effect->effect_specific[0]) + 1.f) * 0.5f * 0.14000005f + 0.93f; + index = effect->effect_specific[3]; + v2 = eEC_CLIP->calc_adjust_proc(active_frames, 0, EFFECT_LIFETIME - 1, 0.0f, 0.01f) + effect->scale.x; + eEC_CLIP->morph_combine_proc(result, eHanabiHoshi_morph_table[index], active_frames); + OPEN_DISP(game->graph); + _texture_z_light_fog_prim_xlu(game->graph); + Matrix_translate(effect->position.x + effect->offset.x, effect->position.y + effect->offset.y, + effect->position.z + effect->offset.z, FALSE); + Matrix_RotateX(DEG2SHORT_ANGLE2(270), TRUE); + Matrix_RotateZ(-effect->effect_specific[1], TRUE); + Matrix_scale(v, 1.f, 1.f, TRUE); + Matrix_RotateZ(effect->effect_specific[1], TRUE); + Matrix_scale(v2 * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), v2 * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), + v2 * (GETREG(MYKREG, 0x1b) * 0.01f + 1.f), TRUE); + 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, result[4], result[0], result[1], result[2], result[3]); + gDPSetEnvColor(NEXT_POLY_XLU_DISP, result[5], result[6], result[7], 255); + gSPDisplayList(NEXT_POLY_XLU_DISP, ef_hanabi_h_00_modelT); + CLOSE_DISP(game->graph); }