From e8403d72a115acd3800da5e05343cbf124aabba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=8D=9A=7ENex?=
 <87421482+NexIsDumb@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:45:51 +0100
Subject: [PATCH] last fix for freezing animations (i hope)

---
 assets/data/stages/limo.xml     | 10 +++++-----
 assets/data/stages/mall.xml     |  6 +++---
 source/funkin/game/Character.hx |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/data/stages/limo.xml b/assets/data/stages/limo.xml
index b223b357..a0dafd89 100644
--- a/assets/data/stages/limo.xml
+++ b/assets/data/stages/limo.xml
@@ -7,23 +7,23 @@
 	<!-- ONLY FOR INSTANCES WITH LOW MEMORY MODE DISABLED -->
 	<high-memory>
 		<!-- DANCERS !-->
-		<sprite name="dancer1" x="130" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer1" x="130" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer2" x="500" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer2" x="500" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer3" x="870" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer3" x="870" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer4" x="1240" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer4" x="1240" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer5" x="1610" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer5" x="1610" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
diff --git a/assets/data/stages/mall.xml b/assets/data/stages/mall.xml
index 0edfa942..3552cf27 100644
--- a/assets/data/stages/mall.xml
+++ b/assets/data/stages/mall.xml
@@ -3,15 +3,15 @@
 	<sprite name="bg" x="-1000" y="-500" sprite="bgWalls" scroll="0.2"/>
 
 	<high-memory>
-		<sprite name="upperBoppers" x="-240" y="-90" sprite="upperBop" scroll="0.2" type="onbeat"/>
+		<sprite name="upperBoppers" x="-240" y="-90" sprite="upperBop" scroll="0.2" type="onbeat" beatInterval="1"/>
 	</high-memory>
 	<sprite name="bgEscalator" x="-1100" y="-600" sprite="bgEscalator" scroll="0.3" scale="0.9" updateHitbox="true"/>
 	<sprite name="tree" x="370" y="-250" sprite="christmasTree" scroll="0.4"/>
-	<sprite name="bottomBoppers" x="-300" y="140" sprite="bottomBop" scroll="0.9" type="onbeat" />
+	<sprite name="bottomBoppers" x="-300" y="140" sprite="bottomBop" scroll="0.9" type="onbeat" beatInterval="1"/>
 	<sprite name="fgSnow" x="-600" y="700" sprite="fgSnow"/>
 
 	<high-memory>
-		<sprite name="santa" x="-840" y="150" sprite="santa" type="onbeat"/>
+		<sprite name="santa" x="-840" y="150" sprite="santa" type="onbeat" beatInterval="1"/>
 	</high-memory>
 
 
diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx
index b5c793b9..68cfa627 100644
--- a/source/funkin/game/Character.hx
+++ b/source/funkin/game/Character.hx
@@ -190,7 +190,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 				stunned = false;
 		}
 
-		if (!__lockAnimThisFrame && (lastAnimContext == SING || lastAnimContext == MISS))
+		if (!__lockAnimThisFrame && lastAnimContext != DANCE)
 			tryDance();
 
 		__lockAnimThisFrame = false;