From 3ede16be16def08cf108bcfc8c0aa36ce191b199 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Sat, 10 Feb 2024 00:50:07 -0500 Subject: [PATCH 1/4] Fix issue where Freeplay could be silent sometimes --- source/funkin/ui/freeplay/FreeplayState.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index b23ca6e54..3c6b52c6f 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -164,9 +164,9 @@ class FreeplayState extends MusicBeatSubState isDebug = true; #end - if (FlxG.sound.music != null) + if (FlxG.sound.music == null || (FlxG.sound.music != null && !FlxG.sound.music.playing)) { - if (!FlxG.sound.music.playing) FlxG.sound.playMusic(Paths.music('freakyMenu/freakyMenu')); + FlxG.sound.playMusic(Paths.music('freakyMenu/freakyMenu')); } // Add a null entry that represents the RANDOM option From bb0b1764698407902f8fce32c8967dcd335b8094 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Sat, 10 Feb 2024 00:51:02 -0500 Subject: [PATCH 2/4] Fix bug with building specifically for freeplay. --- source/funkin/InitState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/InitState.hx b/source/funkin/InitState.hx index 23bc255f1..4e6f12eed 100644 --- a/source/funkin/InitState.hx +++ b/source/funkin/InitState.hx @@ -240,7 +240,7 @@ class InitState extends FlxState #elseif LEVEL // -DLEVEL=week1 -DDIFFICULTY=hard startLevel(defineLevel(), defineDifficulty()); #elseif FREEPLAY // -DFREEPLAY - FlxG.switchState(new FreeplayState()); + FlxG.switchState(new funkin.ui.freeplay.FreeplayState()); #elseif ANIMATE // -DANIMATE FlxG.switchState(new funkin.ui.debug.anim.FlxAnimateTest()); #elseif WAVEFORM // -DWAVEFORM From aaeea320e5ef188a71eaa69ba7b901be1d9c94e1 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Sat, 10 Feb 2024 00:51:53 -0500 Subject: [PATCH 3/4] Fix darnell's animations being flipped --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 8378b838b..ec284b57d 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 8378b838bae80739eacd9a0316f9b49f888185f6 +Subproject commit ec284b57dec8903ad79c5d90bac063cbbc327705 From f3630dfff97d74400774d86dcb63fdcd079e8f0b Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Sat, 10 Feb 2024 02:17:07 -0500 Subject: [PATCH 4/4] assets submod --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index ec284b57d..590db1448 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit ec284b57dec8903ad79c5d90bac063cbbc327705 +Subproject commit 590db1448fb132a29160540b4656b2474f22f727