From 434646559f5f926176bce14f1fff5c066d949d1b Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Sun, 21 Jan 2024 23:17:05 +0000 Subject: [PATCH] Fix footprints and deku link spin attack blur (#93) --- mm/src/code/z_eff_blure.c | 4 ++++ mm/src/code/z_eff_footmark.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/mm/src/code/z_eff_blure.c b/mm/src/code/z_eff_blure.c index 01f7bb1a6..5a8d00f73 100644 --- a/mm/src/code/z_eff_blure.c +++ b/mm/src/code/z_eff_blure.c @@ -645,8 +645,11 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) { MtxF sp9C; MtxF sp5C; Mtx* mtx; + static s32 interpolationEpoch = 0; + interpolationEpoch++; OPEN_DISPS(gfxCtx); + FrameInterpolation_RecordOpenChild(this, interpolationEpoch); if (this->numElements < 2) { return; @@ -688,6 +691,7 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) { } } + FrameInterpolation_RecordCloseChild(); CLOSE_DISPS(gfxCtx); } diff --git a/mm/src/code/z_eff_footmark.c b/mm/src/code/z_eff_footmark.c index 53d96f0c5..75f378135 100644 --- a/mm/src/code/z_eff_footmark.c +++ b/mm/src/code/z_eff_footmark.c @@ -2,6 +2,7 @@ #include "z64.h" #include "macros.h" #include "functions.h" +#include "2s2h/Enhancements/interpolation/frame_interpolation.h" #include "assets/code/eff_footmark/eff_footmark.h" @@ -111,6 +112,8 @@ void EffFootmark_Draw(PlayState* play) { for (footmark = play->footprintInfo, i = 0; i < ARRAY_COUNT(play->footprintInfo); i++, footmark++) { if (footmark->actor != NULL) { + FrameInterpolation_RecordOpenChild(footmark, i); + Matrix_Put(&footmark->mf); Matrix_Scale(footmark->size * (1.0f / 0x100) * 0.7f, 1, footmark->size * (1.0f / 0x100), MTXMODE_APPLY); @@ -120,6 +123,8 @@ void EffFootmark_Draw(PlayState* play) { footmark->alpha >> 8); gSPDisplayList(gfxCtx->polyXlu.p++, gEffFootprintModelDL); + + FrameInterpolation_RecordCloseChild(); } } }