From b23ea585610f3410d4914f5b0754c2b2b4733333 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Mon, 22 Apr 2024 21:24:15 -0400
Subject: [PATCH 1/5] Fix Weekend 1 audio issue

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

diff --git a/assets b/assets
index daf702a6e..5a743b52e 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit daf702a6ec8b60f1922261872cc74eb107fece06
+Subproject commit 5a743b52ed0a1e80c489b580a3af0470c31dcf9c

From 66b45b526f74f92a6711acccf75dfa00af8e2c7c Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Mon, 22 Apr 2024 21:24:44 -0400
Subject: [PATCH 2/5] Fix issue where controller couldn't switch difficulties
 in Story Menu

---
 source/funkin/ui/story/StoryMenuState.hx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/source/funkin/ui/story/StoryMenuState.hx b/source/funkin/ui/story/StoryMenuState.hx
index 5881ef624..d4ffa961d 100644
--- a/source/funkin/ui/story/StoryMenuState.hx
+++ b/source/funkin/ui/story/StoryMenuState.hx
@@ -344,6 +344,17 @@ class StoryMenuState extends MusicBeatState
           changeDifficulty(0);
         }
 
+        // TODO: Querying UI_RIGHT_P (justPressed) after UI_RIGHT always returns false. Fix it!
+        if (controls.UI_RIGHT_P)
+        {
+          changeDifficulty(1);
+        }
+
+        if (controls.UI_LEFT_P)
+        {
+          changeDifficulty(-1);
+        }
+
         if (controls.UI_RIGHT)
         {
           rightDifficultyArrow.animation.play('press');
@@ -362,16 +373,6 @@ class StoryMenuState extends MusicBeatState
           leftDifficultyArrow.animation.play('idle');
         }
 
-        if (controls.UI_RIGHT_P)
-        {
-          changeDifficulty(1);
-        }
-
-        if (controls.UI_LEFT_P)
-        {
-          changeDifficulty(-1);
-        }
-
         if (FlxG.keys.justPressed.TAB && modeText.visible)
         {
           switchMode(!displayingModdedLevels);

From 6edd9e8c6af01ce3985abb2a0f255108b4f08e85 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Mon, 22 Apr 2024 22:30:29 -0400
Subject: [PATCH 3/5] Make cars stop moving while the game is paused.

---
 assets                             |  2 +-
 source/funkin/util/FlxTweenUtil.hx | 36 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 source/funkin/util/FlxTweenUtil.hx

diff --git a/assets b/assets
index 5a743b52e..e1a3527e0 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 5a743b52ed0a1e80c489b580a3af0470c31dcf9c
+Subproject commit e1a3527e098910d34763b6a2f7f3f4242d13f2b9
diff --git a/source/funkin/util/FlxTweenUtil.hx b/source/funkin/util/FlxTweenUtil.hx
new file mode 100644
index 000000000..57c8f0cfe
--- /dev/null
+++ b/source/funkin/util/FlxTweenUtil.hx
@@ -0,0 +1,36 @@
+package funkin.util;
+
+import flixel.addons.plugin.taskManager.FlxTask;
+import flixel.tweens.FlxTween;
+import flixel.tweens.FlxEase;
+
+class FlxTweenUtil
+{
+  public static function pauseTween(tween:FlxTween):Void
+  {
+    if (tween != null)
+    {
+      tween.active = false;
+    }
+  }
+
+  public static function resumeTween(tween:FlxTween):Void
+  {
+    if (tween != null)
+    {
+      tween.active = true;
+    }
+  }
+
+  public static function pauseTweensOf(Object:Dynamic, ?FieldPaths:Array<String>):Void
+  {
+    @:privateAccess
+    FlxTween.globalManager.forEachTweensOf(Object, FieldPaths, pauseTween);
+  }
+
+  public static function resumeTweensOf(Object:Dynamic, ?FieldPaths:Array<String>):Void
+  {
+    @:privateAccess
+    FlxTween.globalManager.forEachTweensOf(Object, FieldPaths, resumeTween);
+  }
+}

From 1e5153f133f47cf705f6a3e8718933b7c13982c6 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Mon, 22 Apr 2024 23:04:57 -0400
Subject: [PATCH 4/5] Fix an issue where zooming in the camera would persist to
 results screen

---
 source/funkin/play/ResultState.hx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/funkin/play/ResultState.hx b/source/funkin/play/ResultState.hx
index 591020955..acce8645a 100644
--- a/source/funkin/play/ResultState.hx
+++ b/source/funkin/play/ResultState.hx
@@ -64,6 +64,9 @@ class ResultState extends MusicBeatSubState
         loop: resultsVariation != SHIT
       });
 
+    // Reset the camera zoom on the results screen.
+    FlxG.camera.zoom = 1.0;
+
     // TEMP-ish, just used to sorta "cache" the 3000x3000 image!
     var cacheBullShit:FlxSprite = new FlxSprite().loadGraphic(Paths.image("resultScreen/soundSystem"));
     add(cacheBullShit);

From 46f2dec67213c96a728b020ff9caf922c527af9f Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Tue, 23 Apr 2024 04:08:00 -0400
Subject: [PATCH 5/5] assets submod

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

diff --git a/assets b/assets
index e1a3527e0..9676d4941 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit e1a3527e098910d34763b6a2f7f3f4242d13f2b9
+Subproject commit 9676d494146008bb99cd718fadffa3610a659ad4