From a0c4499b03bb7c14fc2bf9bb0d78313617a54c28 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 17 Jan 2024 23:12:59 -0500
Subject: [PATCH 1/3] Fix a bug where replaying a level makes a pink screen

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

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 20f19f714..cc9debf13 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -1354,6 +1354,7 @@ class PlayState extends MusicBeatSubState
   function loadStage(id:String):Void
   {
     currentStage = StageRegistry.instance.fetchEntry(id);
+    currentStage.revive(); // Stages are killed and props destroyed when the PlayState is destroyed to save memory.
 
     if (currentStage != null)
     {

From 26b761066303aa0fb1ab2e71689235ce9456baaa Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 17 Jan 2024 23:14:28 -0500
Subject: [PATCH 2/3] Fix an error with playable Pico death

---
 assets                                 |  2 +-
 source/funkin/play/GameOverSubState.hx | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/assets b/assets
index 9e385784b..d6be0e084 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 9e385784b1d2f4332de0d696b1df655cfa269da0
+Subproject commit d6be0e084e4fda0416eca9ec7fe406af9b626e5c
diff --git a/source/funkin/play/GameOverSubState.hx b/source/funkin/play/GameOverSubState.hx
index 88d9be7d4..36f72237e 100644
--- a/source/funkin/play/GameOverSubState.hx
+++ b/source/funkin/play/GameOverSubState.hx
@@ -23,6 +23,12 @@ import funkin.play.character.BaseCharacter;
  */
 class GameOverSubState extends MusicBeatSubState
 {
+  /**
+   * The currently active GameOverSubState.
+   * There should be only one GameOverSubState in existance at a time, we can use a singleton.
+   */
+  public static var instance:GameOverSubState = null;
+
   /**
    * Which alternate animation on the character to use.
    * You can set this via script.
@@ -88,6 +94,13 @@ class GameOverSubState extends MusicBeatSubState
 
   override public function create()
   {
+    if (instance != null)
+    {
+      // TODO: Do something in this case? IDK.
+      trace('WARNING: GameOverSubState instance already exists. This should not happen.');
+    }
+    instance = this;
+
     super.create();
 
     //
@@ -283,10 +296,10 @@ class GameOverSubState extends MusicBeatSubState
    */
   function startDeathMusic(?startingVolume:Float = 1, force:Bool = false):Void
   {
-    var musicPath = Paths.music('gameOver' + musicSuffix);
+    var musicPath = Paths.music('gameplay/gameover/gameOver' + musicSuffix);
     if (isEnding)
     {
-      musicPath = Paths.music('gameOverEnd' + musicSuffix);
+      musicPath = Paths.music('gameplay/gameover/gameOverEnd' + musicSuffix);
     }
     if (!gameOverMusic.playing || force)
     {
@@ -306,7 +319,7 @@ class GameOverSubState extends MusicBeatSubState
   public static function playBlueBalledSFX()
   {
     blueballed = true;
-    FlxG.sound.play(Paths.sound('fnf_loss_sfx' + blueBallSuffix));
+    FlxG.sound.play(Paths.sound('gameplay/gameover/fnf_loss_sfx' + blueBallSuffix));
   }
 
   var playingJeffQuote:Bool = false;
@@ -329,6 +342,11 @@ class GameOverSubState extends MusicBeatSubState
       }
     });
   }
+
+  public override function toString():String
+  {
+    return "GameOverSubState";
+  }
 }
 
 typedef GameOverParams =

From 4919d893c80a377faf67ff9a7b620c8d30af8533 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 18 Jan 2024 00:53:06 -0500
Subject: [PATCH 3/3] submod merg

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

diff --git a/assets b/assets
index d6be0e084..5d28d3631 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit d6be0e084e4fda0416eca9ec7fe406af9b626e5c
+Subproject commit 5d28d36311d95d17ec9bddaca479b0f8db088a7c