From b24f707ecb2780773b68fd17cea54b0365361227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= <159546+serprex@users.noreply.github.com> Date: Sat, 10 Oct 2026 17:10:35 +0000 Subject: [PATCH] Fix child link model blipping after ledge climb when interpolating (#7360) --- soh/src/overlays/actors/ovl_player_actor/z_player.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 6dc2e125db..09dfb52004 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -23,8 +23,6 @@ #include #include "soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h" #include "soh/Enhancements/item-tables/ItemTableTypes.h" -#include "soh/Enhancements/cosmetics/cosmeticsTypes.h" -#include "soh/Enhancements/enhancementTypes.h" #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/Enhancements/randomizer/randomizer_entrance.h" @@ -1611,6 +1609,10 @@ void Player_AnimPlayOnceAdjusted(PlayState* play, Player* this, LinkAnimationHea } void Player_ApplyYawFromAnim(Player* this) { + // Blending big turn squishes model, skip it + if (ABS(this->skelAnime.jointTable[1].y) > 0x4000) { + FrameInterpolation_DontInterpolateChild(&this->actor); + } this->actor.shape.rot.y += this->skelAnime.jointTable[1].y; this->skelAnime.jointTable[1].y = 0; }