From 8fea7eb73427994bda74e04b3193feb11a3d6389 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Tue, 19 Dec 2023 01:57:39 -0500
Subject: [PATCH 1/3] Fix a bug where the background of the game over screen is
 pink

---
 source/funkin/play/GameOverSubState.hx | 16 +++++++++++++---
 source/funkin/play/PlayState.hx        |  5 ++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/source/funkin/play/GameOverSubState.hx b/source/funkin/play/GameOverSubState.hx
index 6eb53e2d5..dce2229e1 100644
--- a/source/funkin/play/GameOverSubState.hx
+++ b/source/funkin/play/GameOverSubState.hx
@@ -64,9 +64,13 @@ class GameOverSubState extends MusicBeatSubState
    */
   var isEnding:Bool = false;
 
-  public function new()
+  var transparent:Bool;
+
+  public function new(params:GameOverParams)
   {
     super();
+
+    transparent = params.transparent;
   }
 
   /**
@@ -87,9 +91,10 @@ class GameOverSubState extends MusicBeatSubState
     //
 
     // Add a black background to the screen.
-    // We make this transparent so that we can see the stage underneath during debugging.
     var bg = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
-    bg.alpha = 0.25;
+    // We make this transparent so that we can see the stage underneath during debugging,
+    // but it's normally opaque.
+    bg.alpha = transparent ? 0.25 : 1.0;
     bg.scrollFactor.set();
     add(bg);
 
@@ -307,3 +312,8 @@ class GameOverSubState extends MusicBeatSubState
     });
   }
 }
+
+typedef GameOverParams =
+{
+  var transparent:Bool;
+}
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index e0932e756..85f60be4e 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -922,7 +922,10 @@ class PlayState extends MusicBeatSubState
         }
         #end
 
-        var gameOverSubState = new GameOverSubState();
+        var gameOverSubState = new GameOverSubState(
+          {
+            transparent: persistentDraw,
+          });
         FlxTransitionableSubState.skipNextTransIn = true;
         FlxTransitionableSubState.skipNextTransOut = true;
         openSubState(gameOverSubState);

From 711253a2023046c97698f8ff7c893574b1513d8c Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Tue, 19 Dec 2023 16:12:25 -0500
Subject: [PATCH 2/3] Update HaxeUI to latest

---
 hmm.json                                              | 4 ++--
 source/funkin/ui/haxeui/components/CharacterPlayer.hx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hmm.json b/hmm.json
index 96ee75bc1..e31a405ae 100644
--- a/hmm.json
+++ b/hmm.json
@@ -54,14 +54,14 @@
       "name": "haxeui-core",
       "type": "git",
       "dir": null,
-      "ref": "7021f1fbab928268d9196a73e7f47461ca3c3e4d",
+      "ref": "c8e0cbfef33b955f009023c27c28b161e894b65e",
       "url": "https://github.com/haxeui/haxeui-core"
     },
     {
       "name": "haxeui-flixel",
       "type": "git",
       "dir": null,
-      "ref": "26b6bb132c92dfa9b77b4a61eaeda8f9a9efda98",
+      "ref": "9a1abf4b450118e5222d7456024db31cc3b9f8d1",
       "url": "https://github.com/haxeui/haxeui-flixel"
     },
     {
diff --git a/source/funkin/ui/haxeui/components/CharacterPlayer.hx b/source/funkin/ui/haxeui/components/CharacterPlayer.hx
index 66b94bfa2..c7171fac7 100644
--- a/source/funkin/ui/haxeui/components/CharacterPlayer.hx
+++ b/source/funkin/ui/haxeui/components/CharacterPlayer.hx
@@ -35,7 +35,7 @@ class CharacterPlayer extends Box
   public function new(defaultToBf:Bool = true)
   {
     super();
-    _overrideSkipTransformChildren = false;
+    // _overrideSkipTransformChildren = false;
 
     if (defaultToBf)
     {

From a4c993f733859ac0d48336aaee2fdfad495fc219 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sat, 23 Dec 2023 16:25:50 -0500
Subject: [PATCH 3/3] Update HaxeUI and Flixel

---
 hmm.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hmm.json b/hmm.json
index e31a405ae..ddaf375c6 100644
--- a/hmm.json
+++ b/hmm.json
@@ -11,7 +11,7 @@
       "name": "flixel",
       "type": "git",
       "dir": null,
-      "ref": "9bdea914f3d0485b9b3ec158f28875b5ac95d476",
+      "ref": "a83738673e7edbf8acba3a1426af284dfe6719fe",
       "url": "https://github.com/FunkinCrew/flixel"
     },
     {
@@ -54,14 +54,14 @@
       "name": "haxeui-core",
       "type": "git",
       "dir": null,
-      "ref": "c8e0cbfef33b955f009023c27c28b161e894b65e",
+      "ref": "e765a3e0b7a653823e8dec765e04623f27f573f8",
       "url": "https://github.com/haxeui/haxeui-core"
     },
     {
       "name": "haxeui-flixel",
       "type": "git",
       "dir": null,
-      "ref": "9a1abf4b450118e5222d7456024db31cc3b9f8d1",
+      "ref": "7a517d561eff49d8123c128bf9f5c1123b84d014",
       "url": "https://github.com/haxeui/haxeui-flixel"
     },
     {