From aabd1aa9f7ac220e535a3d433720b2a52bee1eb2 Mon Sep 17 00:00:00 2001
From: AnimatingLegend <thesfmgod@gmail.com>
Date: Thu, 5 Mar 2026 12:07:17 -0500
Subject: [PATCH] fix: miss-animation timing in no-anim events

---
 source/funkin/play/character/BaseCharacter.hx | 41 +++++++------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/source/funkin/play/character/BaseCharacter.hx b/source/funkin/play/character/BaseCharacter.hx
index c125812ad..f139a0d93 100644
--- a/source/funkin/play/character/BaseCharacter.hx
+++ b/source/funkin/play/character/BaseCharacter.hx
@@ -371,7 +371,11 @@ class BaseCharacter extends Bopper
     // Reset hold timer for each note pressed.
     if (justPressedNote() && this.characterType == BF)
     {
-      holdTimer = 0;
+      // If the note kind has `noanim` do not reset holdTimer.
+      if (curNoteKind != null && !curNoteKind.noanim)
+      {
+        holdTimer = 0;
+      }
     }
 
     if (isDead)
@@ -530,39 +534,21 @@ class BaseCharacter extends Bopper
     super.onNoteHit(event);
     // If another script cancelled the event, don't do anything.
     if (event.eventCanceled) return;
+
     curNoteKind = NoteKindManager.getNoteKind(event.note.noteData.kind);
 
+    // Let the character naturally transition back to their idle/dance animation.
+    if (curNoteKind != null && curNoteKind.noanim) return;
+
     if (event.note.noteData.getMustHitNote() && characterType == BF)
     {
-      if (curNoteKind != null)
-      {
-        if (!curNoteKind.noanim)
-        {
-          this.playSingAnimation(event.note.noteData.getDirection(), false, curNoteKind?.suffix);
-          holdTimer = 0;
-        }
-      }
-      else
-      {
-        this.playSingAnimation(event.note.noteData.getDirection(), false);
-        holdTimer = 0;
-      }
+      this.playSingAnimation(event.note.noteData.getDirection(), false);
+      holdTimer = 0;
     }
     else if (!event.note.noteData.getMustHitNote() && characterType == DAD)
     {
-      if (curNoteKind != null)
-      {
-        if (!curNoteKind.noanim)
-        {
-          this.playSingAnimation(event.note.noteData.getDirection(), false, curNoteKind?.suffix);
-          holdTimer = 0;
-        }
-      }
-      else
-      {
-        this.playSingAnimation(event.note.noteData.getDirection(), false);
-        holdTimer = 0;
-      }
+      this.playSingAnimation(event.note.noteData.getDirection(), false);
+      holdTimer = 0;
     }
     else if (characterType == GF && event.note.noteData.getMustHitNote())
     {
@@ -591,6 +577,7 @@ class BaseCharacter extends Bopper
     {
       // If the note is from the same strumline, play the miss animation.
       this.playSingAnimation(event.note.noteData.getDirection(), true);
+      this.holdTimer = 0;
     }
     else if (!event.note.noteData.getMustHitNote() && characterType == DAD)
     {