From 6620b2e83c2be26a01ff21f4f72f7a8c5ac38f16 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 2 May 2024 23:02:47 -0400
Subject: [PATCH] actual merch fix stuff

---
 source/funkin/ui/freeplay/FreeplayState.hx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index a030f6a76..9180fb6b1 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -146,13 +146,14 @@ class FreeplayState extends MusicBeatSubState
     }
 
     super(FlxColor.TRANSPARENT);
-    FlxG.state.persistentUpdate = false;
   }
 
   override function create():Void
   {
     super.create();
 
+    FlxG.state.persistentUpdate = false;
+
     FlxTransitionableState.skipNextTransIn = true;
 
     if (stickerSubState != null)
@@ -189,7 +190,7 @@ class FreeplayState extends MusicBeatSubState
     displayedVariations = (currentCharacter == 'bf') ? [Constants.DEFAULT_VARIATION, 'erect'] : [currentCharacter];
 
     // programmatically adds the songs via LevelRegistry and SongRegistry
-    for (levelId in LevelRegistry.instance.listBaseGameLevelIds())
+    for (levelId in LevelRegistry.instance.listSortedLevelIds())
     {
       for (songId in LevelRegistry.instance.parseEntryData(levelId).songs)
       {