From 67ede14685ad6199cc84cdab6230603c9bfb71cf Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 6 Mar 2024 02:17:45 -0500
Subject: [PATCH 01/12] raindrop assets

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 095e91fb3..bd718379f 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 095e91fb33dad70a5b51e37542e335cedd025d09
+Subproject commit bd718379f18ea9562f5260a5e41e20720ebe9e9b

From 332a81ec72a36af65757bf66a640d38e88f4ae77 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 6 Mar 2024 17:22:11 -0500
Subject: [PATCH 02/12] No longer miss notes during ending cutscene

---
 source/funkin/play/PlayState.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index ab693ef46..a6e4b4632 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -1032,7 +1032,7 @@ class PlayState extends MusicBeatSubState
     if (isInCutscene && !disableKeys) handleCutsceneKeys(elapsed);
 
     // Moving notes into position is now done by Strumline.update().
-    processNotes(elapsed);
+    if (!isInCutscene) processNotes(elapsed);
 
     justUnpaused = false;
   }

From aff7bbb4e9bd6d8307e1d0ef79d88cee035c7a40 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 6 Mar 2024 17:22:22 -0500
Subject: [PATCH 03/12] Update assets submodule

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 095e91fb3..bf61ea3c9 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 095e91fb33dad70a5b51e37542e335cedd025d09
+Subproject commit bf61ea3c9b56bc82c36976d5aa8052bc16ff1b4e

From c385b7887f83d4bf5309c1aaa16ea32e4058b312 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 7 Mar 2024 15:41:00 -0500
Subject: [PATCH 04/12] Update assets submodule

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index bf61ea3c9..3510a2459 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit bf61ea3c9b56bc82c36976d5aa8052bc16ff1b4e
+Subproject commit 3510a245986914ff72736f121347cf4a11db0b35

From a6c44412c50e2dc8ef663f9349bf3e08fde13e38 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 7 Mar 2024 23:20:02 -0500
Subject: [PATCH 05/12] Exclude WAV files from builds.

---
 Project.xml | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Project.xml b/Project.xml
index c368dacef..99c46ef9f 100644
--- a/Project.xml
+++ b/Project.xml
@@ -22,8 +22,8 @@
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
 	<set name="BUILD_DIR" value="export/32bit" if="32bit" />
 	<classpath name="source" />
-	<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web" />
-	<assets path="assets/preload" rename="assets" exclude="*.mp3" unless="web" />
+	<assets path="assets/preload" rename="assets" exclude="*.ogg|*.wav" if="web" />
+	<assets path="assets/preload" rename="assets" exclude="*.mp3|*.wav" unless="web" />
 	<define name="PRELOAD_ALL" unless="web" />
 	<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL" />
 	<section if="PRELOAD_ALL">
@@ -53,28 +53,28 @@
 		<library name="weekend1" preload="false" />
 	</section>
 	<library name="art" preload="false" />
-	<assets path="assets/songs" library="songs" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/songs" library="songs" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/shared" library="shared" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/shared" library="shared" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/tutorial" library="tutorial" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/tutorial" library="tutorial" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/week1" library="week1" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/week1" library="week1" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/week2" library="week2" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/week2" library="week2" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/week3" library="week3" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/week3" library="week3" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/week4" library="week4" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/week4" library="week4" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/week5" library="week5" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/week5" library="week5" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/week6" library="week6" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/week6" library="week6" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/week7" library="week7" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/week7" library="week7" exclude="*.fla|*.mp3" unless="web" />
-	<assets path="assets/weekend1" library="weekend1" exclude="*.fla|*.ogg" if="web" />
-	<assets path="assets/weekend1" library="weekend1" exclude="*.fla|*.mp3" unless="web" />
+	<assets path="assets/songs" library="songs" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/songs" library="songs" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/shared" library="shared" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/shared" library="shared" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/tutorial" library="tutorial" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/tutorial" library="tutorial" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/week1" library="week1" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/week1" library="week1" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/week2" library="week2" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/week2" library="week2" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/week3" library="week3" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/week3" library="week3" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/week4" library="week4" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/week4" library="week4" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/week5" library="week5" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/week5" library="week5" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/week6" library="week6" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/week6" library="week6" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/week7" library="week7" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/week7" library="week7" exclude="*.fla|*.mp3|*.wav" unless="web" />
+	<assets path="assets/weekend1" library="weekend1" exclude="*.fla|*.ogg|*.wav" if="web" />
+	<assets path="assets/weekend1" library="weekend1" exclude="*.fla|*.mp3|*.wav" unless="web" />
 	<!-- <assets path='example_mods' rename='mods' embed='false'/> -->
 	<!--
 		AUTOMATICALLY MOVING EXAMPLE MODS INTO THE BUILD CAUSES ISSUES

From ab50b7b78ea3af1a2aa90812330dc8188ebc3980 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 7 Mar 2024 23:22:31 -0500
Subject: [PATCH 06/12] Lightning and rain SFX

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 3510a2459..49c409b4c 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 3510a245986914ff72736f121347cf4a11db0b35
+Subproject commit 49c409b4c8321d8cd317787a78c479aaa64cb517

From d02ccf9abf4734aca60c891bbf4ed6c0e7eb6fad Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Fri, 8 Mar 2024 15:05:58 -0500
Subject: [PATCH 07/12] Implement pico bonk sfx

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 095e91fb3..07b50c2a0 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 095e91fb33dad70a5b51e37542e335cedd025d09
+Subproject commit 07b50c2a0305bb23f663b7421b799e684bb35196

From b209e20fb4c08e20363df4d4039af8d047a4b9da Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 8 Mar 2024 16:47:33 -0500
Subject: [PATCH 08/12] asset submod

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 07b50c2a0..4ca17de92 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 07b50c2a0305bb23f663b7421b799e684bb35196
+Subproject commit 4ca17de923291b1b6886a0dbc6b9878bdbf92937

From 5ece2936aa8026f292d32f18decae571cb63b6fd Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 8 Mar 2024 17:03:29 -0500
Subject: [PATCH 09/12] assets submod, and gitignore for my lil vim todo lists
 i make lol

---
 .gitignore | 1 +
 assets     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 87fd97fc5..b6a415fe9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ export/
 RECOVER_*.fla
 shitAudio/
 .build_time
+.swp
diff --git a/assets b/assets
index bd718379f..d1f4f241a 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit bd718379f18ea9562f5260a5e41e20720ebe9e9b
+Subproject commit d1f4f241aa57ca8c9fa5045be989851b3f06f0a4

From 0cd7956b4fbc15f8570a2159ae0a374badaa589a Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 8 Mar 2024 17:42:34 -0500
Subject: [PATCH 10/12] asset submod

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index df8ca76ad..2d3db0cce 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit df8ca76ad94613e7e0a6ec7c27705adb5788007b
+Subproject commit 2d3db0cce9bd06cf280bbf6a0b10e57982f32fc3

From 9284f1495b84f6e0f553d5ff468d827e5f046cd7 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Fri, 8 Mar 2024 20:56:34 -0500
Subject: [PATCH 11/12] Fix default value for singTime to use correct unit.

---
 source/funkin/play/character/CharacterData.hx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/funkin/play/character/CharacterData.hx b/source/funkin/play/character/CharacterData.hx
index 56d7b7793..7d3d6cfb9 100644
--- a/source/funkin/play/character/CharacterData.hx
+++ b/source/funkin/play/character/CharacterData.hx
@@ -378,12 +378,12 @@ class CharacterDataParser
   }
 
   /**
-   * The default time the character should sing for, in beats.
+   * The default time the character should sing for, in steps.
    * Values that are too low will cause the character to stop singing between notes.
-   * Originally, this value was set to 1, but it was changed to 2 because that became
-   * too low after some other code changes.
+   * Values that are too high will cause the character to hold their singing pose for too long after they're done.
+   * @default `8 steps`
    */
-  static final DEFAULT_SINGTIME:Float = 2.0;
+  static final DEFAULT_SINGTIME:Float = 8.0;
 
   static final DEFAULT_DANCEEVERY:Int = 1;
   static final DEFAULT_FLIPX:Bool = false;

From 09029718aaf44d79c2e961e24c24abf2e16a7b42 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Fri, 8 Mar 2024 21:33:06 -0500
Subject: [PATCH 12/12] Fix an issue where story menu characters bop too fast

---
 source/funkin/play/stage/Bopper.hx  | 28 +++++++++++++++++-----------
 source/funkin/ui/story/LevelProp.hx |  3 +++
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/source/funkin/play/stage/Bopper.hx b/source/funkin/play/stage/Bopper.hx
index 3a57072e6..262aff7bc 100644
--- a/source/funkin/play/stage/Bopper.hx
+++ b/source/funkin/play/stage/Bopper.hx
@@ -167,10 +167,7 @@ class Bopper extends StageProp implements IPlayStateScriptedClass
 
   function update_shouldAlternate():Void
   {
-    if (hasAnimation('danceLeft'))
-    {
-      this.shouldAlternate = true;
-    }
+    this.shouldAlternate = hasAnimation('danceLeft');
   }
 
   /**
@@ -228,10 +225,11 @@ class Bopper extends StageProp implements IPlayStateScriptedClass
 
   /**
    * Ensure that a given animation exists before playing it.
-   * Will gracefully check for name, then name with stripped suffixes, then 'idle', then fail to play.
-   * @param name
+   * Will gracefully check for name, then name with stripped suffixes, then fail to play.
+   * @param name The animation name to attempt to correct.
+   * @param fallback Instead of failing to play, try to play this animation instead.
    */
-  function correctAnimationName(name:String):String
+  function correctAnimationName(name:String, ?fallback:String):String
   {
     // If the animation exists, we're good.
     if (hasAnimation(name)) return name;
@@ -247,14 +245,22 @@ class Bopper extends StageProp implements IPlayStateScriptedClass
     }
     else
     {
-      if (name != 'idle')
+      if (fallback != null)
       {
-        FlxG.log.warn('Bopper tried to play animation "$name" that does not exist, fallback to idle...');
-        return correctAnimationName('idle');
+        if (fallback == name)
+        {
+          FlxG.log.error('Bopper tried to play animation "$name" that does not exist! This is bad!');
+          return null;
+        }
+        else
+        {
+          FlxG.log.warn('Bopper tried to play animation "$name" that does not exist, fallback to idle...');
+          return correctAnimationName('idle');
+        }
       }
       else
       {
-        FlxG.log.error('Bopper tried to play animation "idle" that does not exist! This is bad!');
+        FlxG.log.error('Bopper tried to play animation "$name" that does not exist! This is bad!');
         return null;
       }
     }
diff --git a/source/funkin/ui/story/LevelProp.hx b/source/funkin/ui/story/LevelProp.hx
index b126f0243..d8eae9c77 100644
--- a/source/funkin/ui/story/LevelProp.hx
+++ b/source/funkin/ui/story/LevelProp.hx
@@ -45,6 +45,9 @@ class LevelProp extends Bopper
       this.visible = true;
     }
 
+    // Reset animation state.
+    this.shouldAlternate = null;
+
     var isAnimated:Bool = propData.animations.length > 0;
     if (isAnimated)
     {