From de07497ae3967b981cc026d26997d717443dc280 Mon Sep 17 00:00:00 2001
From: Kade <26305836+Kade-github@users.noreply.github.com>
Date: Tue, 17 Sep 2024 17:29:12 -0700
Subject: [PATCH 1/2] Make addCharacter actually set the characters type

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

diff --git a/source/funkin/play/stage/Stage.hx b/source/funkin/play/stage/Stage.hx
index c42e41cad..ad768769c 100644
--- a/source/funkin/play/stage/Stage.hx
+++ b/source/funkin/play/stage/Stage.hx
@@ -464,6 +464,9 @@ class Stage extends FlxSpriteGroup implements IPlayStateScriptedClass implements
       #end
     }
 
+    // Set the characters type
+    character.characterType = charType;
+
     // Add the character to the scene.
     this.add(character);
 

From b5ed7f40d4621006d5dc906020050095e2733e9c Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 05:24:57 -0400
Subject: [PATCH 2/2] Remove redundant character type assignment

---
 source/funkin/play/PlayState.hx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 0b2b8846d..b304381cc 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -1612,7 +1612,7 @@ class PlayState extends MusicBeatSubState
 
     if (girlfriend != null)
     {
-      girlfriend.characterType = CharacterType.GF;
+      // Don't need to do anything.
     }
     else if (currentCharacterData.girlfriend != '')
     {
@@ -1630,8 +1630,6 @@ class PlayState extends MusicBeatSubState
 
     if (dad != null)
     {
-      dad.characterType = CharacterType.DAD;
-
       //
       // OPPONENT HEALTH ICON
       //
@@ -1650,8 +1648,6 @@ class PlayState extends MusicBeatSubState
 
     if (boyfriend != null)
     {
-      boyfriend.characterType = CharacterType.BF;
-
       //
       // PLAYER HEALTH ICON
       //
@@ -1993,6 +1989,7 @@ class PlayState extends MusicBeatSubState
 
     // Skip this if the music is paused (GameOver, Pause menu, start-of-song offset, etc.)
     if (!(FlxG.sound.music?.playing ?? false)) return;
+
     var timeToPlayAt:Float = Conductor.instance.songPosition - Conductor.instance.instrumentalOffset;
     FlxG.sound.music.pause();
     vocals.pause();