From e07e59a288778decf9775fa46588f6a716212fcc Mon Sep 17 00:00:00 2001
From: Hundrec <hundrecard@gmail.com>
Date: Thu, 19 Mar 2026 23:10:11 -0600
Subject: [PATCH] Undo No Animation hold timer change

It was making animations behave differently after a change to hold timers
---
 source/funkin/play/character/BaseCharacter.hx | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/source/funkin/play/character/BaseCharacter.hx b/source/funkin/play/character/BaseCharacter.hx
index d36c7e649..c125812ad 100644
--- a/source/funkin/play/character/BaseCharacter.hx
+++ b/source/funkin/play/character/BaseCharacter.hx
@@ -371,11 +371,7 @@ class BaseCharacter extends Bopper
     // Reset hold timer for each note pressed.
     if (justPressedNote() && this.characterType == BF)
     {
-      // If the note kind has `noanim` do not reset holdTimer.
-      if (curNoteKind != null && !curNoteKind.noanim)
-      {
-        holdTimer = 0;
-      }
+      holdTimer = 0;
     }
 
     if (isDead)
@@ -534,21 +530,39 @@ 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)
     {
-      this.playSingAnimation(event.note.noteData.getDirection(), false, curNoteKind?.suffix ?? '');
-      holdTimer = 0;
+      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;
+      }
     }
     else if (!event.note.noteData.getMustHitNote() && characterType == DAD)
     {
-      this.playSingAnimation(event.note.noteData.getDirection(), false, curNoteKind?.suffix ?? '');
-      holdTimer = 0;
+      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;
+      }
     }
     else if (characterType == GF && event.note.noteData.getMustHitNote())
     {
@@ -577,7 +591,6 @@ 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)
     {