From 3d3e2bd3786b858143d214caf55be2ee3e9483fc Mon Sep 17 00:00:00 2001
From: Lasercar <64717068+Lasercar@users.noreply.github.com>
Date: Wed, 18 Jun 2025 14:03:44 +1000
Subject: [PATCH] Intro done right

---
 source/funkin/ui/freeplay/FreeplayState.hx | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index a77b9a80b..32d070b15 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -746,15 +746,6 @@ class FreeplayState extends MusicBeatSubState
       #end
     };
 
-    if (dj != null)
-    {
-      dj.onIntroDone.add(onDJIntroDone);
-    }
-    else
-    {
-      onDJIntroDone();
-    }
-
     allDifficulties = SongRegistry.instance.listAllDifficulties(currentCharacterId);
 
     // Generates song list with the starter params (who our current character is, last remembered difficulty, etc.)
@@ -797,6 +788,17 @@ class FreeplayState extends MusicBeatSubState
       enterFromCharSel();
       onDJIntroDone();
     }
+    else
+    {
+      if (dj != null)
+      {
+        dj.onIntroDone.add(onDJIntroDone);
+      }
+      else
+      {
+        onDJIntroDone();
+      }
+    }
   }
 
   override public function dispatchEvent(event:ScriptEvent)