From bb209a8ed48a3092290f06bda654fae349c04b53 Mon Sep 17 00:00:00 2001 From: Norgesnerd <5824576+Norgesnerd@users.noreply.github.com> Date: Sun, 15 Jun 2025 16:54:37 +0200 Subject: [PATCH] Implement & link ef_reset_hole --- configure.py | 2 +- src/effect/ef_reset_hole.c | 102 +++++++++++++++++++++++++++++++++++-- 2 files changed, 99 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index 82b79d88..e12a2589 100644 --- a/configure.py +++ b/configure.py @@ -1309,7 +1309,7 @@ config.libs = [ Object(Matching, "effect/ef_pun.c"), Object(Matching, "effect/ef_pun_sekimen.c"), Object(Matching, "effect/ef_pun_yuge.c"), - Object(NonMatching, "effect/ef_reset_hole.c"), + Object(Matching, "effect/ef_reset_hole.c"), Object(Matching, "effect/ef_room_sunshine.c"), Object(Matching, "effect/ef_room_sunshine_minsect.c"), Object(Matching, "effect/ef_room_sunshine_museum.c"), diff --git a/src/effect/ef_reset_hole.c b/src/effect/ef_reset_hole.c index 670936c0..57382e78 100644 --- a/src/effect/ef_reset_hole.c +++ b/src/effect/ef_reset_hole.c @@ -1,5 +1,12 @@ #include "ef_effect_control.h" +#include "m_common_data.h" +#include "m_debug.h" +#include "m_rcp.h" +#include "sys_matrix.h" + +extern Gfx ef_reset_hole_modelT[]; + 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); @@ -18,17 +25,104 @@ eEC_PROFILE_c iam_ef_reset_hole = { }; static void eReset_Hole_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) { - // TODO + pos.y += 1.0f; + + eEC_CLIP->make_effect_proc(eEC_EFFECT_RESET_HOLE, pos, NULL, game, &angle, item_name, prio, arg0, arg1); } static void eReset_Hole_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) { - // TODO + effect->timer = 16; + + if (effect->arg0 == 1) { + if (effect->arg1 == 0) { + effect->scale.x = effect->scale.y = effect->scale.z = 0.01f; + } else { + effect->scale.x = effect->scale.y = effect->scale.z = (GETREG(TAKREG, 0x32) * 0.01f + 0.93f) * 0.01f; + } + } else { + effect->scale = ZeroVec; + } + + effect->effect_specific[0] = *(s16*)ct_arg; } static void eReset_Hole_mv(eEC_Effect_c* effect, GAME* game) { - // TODO + s16 angle; + f32 scale; + int i; + + eEC_CLIP->set_continious_env_proc(effect, 16, 120); + + if ((effect->state == eEC_STATE_NORMAL) && (effect->arg0 != 1)) { + if (effect->arg1 == 0) { + scale = 0.01f; + } else { + scale = (GETREG(TAKREG, 0x32) * 0.01f + 0.93f) * 0.01f; + } + effect->scale.x = effect->scale.y = effect->scale.z = + eEC_CLIP->calc_adjust_proc(effect->timer, 0, 16, scale, 0.0f); + + if ((effect->timer & 7) == 0) { + for (i = 0; i < 3; i++) { + static s16 angle_tbl[] = { DEG2SHORT_ANGLE(0.0f), DEG2SHORT_ANGLE(135.0f), DEG2SHORT_ANGLE(270.0f) }; + xyz_t pos = effect->position; + + angle = angle_tbl[i]; + if ((effect->timer & 15) == 0) { + angle += DEG2SHORT_ANGLE2(180.0f); + } + + eEC_CLIP->effect_make_proc(eEC_EFFECT_DIG_MUD, pos, effect->prio, angle, game, effect->item_name, + effect->arg0, DEG2SHORT_ANGLE(-179.965f)); + } + } + } else if (effect->state == eEC_STATE_FINISHED) { + if (effect->arg1 == 0) { + scale = 0.01f; + } else { + scale = (GETREG(TAKREG, 0x32) * 0.01f + 0.93f) * 0.01f; + } + effect->scale.x = effect->scale.y = effect->scale.z = + eEC_CLIP->calc_adjust_proc(effect->timer, 0, 24, 0.0f, scale); + + if (((effect->timer & 7) == 0) && (effect->timer > 8)) { + for (i = 0; i < 3; i++) { + static s16 angle_tbl[] = { DEG2SHORT_ANGLE(0.0f), DEG2SHORT_ANGLE(135.0f), DEG2SHORT_ANGLE(270.0f) }; + xyz_t pos = effect->position; + + angle = angle_tbl[i]; + if ((effect->timer & 15) == 0) { + angle += DEG2SHORT_ANGLE2(180.0f); + } + + eEC_CLIP->effect_make_proc(eEC_EFFECT_DIG_MUD, pos, effect->prio, angle, game, effect->item_name, + effect->arg0, DEG2SHORT_ANGLE(-179.965f)); + } + } + } else { + if (effect->arg1 == 0) { + scale = 0.01f; + } else { + scale = (GETREG(TAKREG, 0x32) * 0.01f + 0.93f) * 0.01f; + } + effect->scale.x = effect->scale.y = effect->scale.z = scale; + } } static void eReset_Hole_dw(eEC_Effect_c* effect, GAME* game) { - // TODO + f32 scale; + + OPEN_DISP(game->graph); + + _texture_z_light_fog_prim_xlu(game->graph); + + Matrix_translate(effect->position.x, effect->position.y, effect->position.z, FALSE); + + scale = GETREG(MYKREG, 0x1b) * 0.01f + 1.0f; + Matrix_scale(effect->scale.x * scale, effect->scale.y * scale, effect->scale.z * scale, TRUE); + + gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(NEXT_POLY_XLU_DISP, ef_reset_hole_modelT); + + CLOSE_DISP(game->graph); }