From 34c91dae76c87e5821d661e409bcfdbf283c8f5a Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 7 Jun 2024 14:24:57 -0400
Subject: [PATCH] dadbattle hard/erect fix

---
 assets                                     | 2 +-
 source/funkin/ui/freeplay/FreeplayState.hx | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/assets b/assets
index 4427687c4..d5ab93cb0 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 4427687c487d643c6051f8c4610470326c87ea4d
+Subproject commit d5ab93cb024364404dbeb79d0d0228bb06602f13
diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index 607b7a353..a6cba9b13 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -285,7 +285,10 @@ class FreeplayState extends MusicBeatSubState
 
         // Only display songs which actually have available difficulties for the current character.
         var displayedVariations = song.getVariationsByCharId(currentCharacter);
+        trace(songId);
+        trace(displayedVariations);
         var availableDifficultiesForSong:Array<String> = song.listDifficulties(displayedVariations, false);
+        trace(availableDifficultiesForSong);
         if (availableDifficultiesForSong.length == 0) continue;
 
         songs.push(new FreeplaySongData(levelId, songId, song, displayedVariations));
@@ -2076,7 +2079,7 @@ class FreeplaySongData
     this.songDifficulties = song.listDifficulties(null, variations, false, false);
     if (!this.songDifficulties.contains(currentDifficulty)) currentDifficulty = Constants.DEFAULT_DIFFICULTY;
 
-    var songDifficulty:SongDifficulty = song.getDifficulty(currentDifficulty, variations);
+    var songDifficulty:SongDifficulty = song.getDifficulty(currentDifficulty, null, variations);
     if (songDifficulty == null) return;
     this.songStartingBpm = songDifficulty.getStartingBPM();
     this.songName = songDifficulty.songName;