From f1811a8594c79f22447af3a62a81fdfb755a9217 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Wed, 27 Mar 2024 17:42:29 -0400 Subject: [PATCH 1/5] Implement Pico pause music --- assets | 2 +- source/funkin/play/PauseSubState.hx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets b/assets index 8013845e3..8ee8c3bd9 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 8013845e331015b40c4cc35230f6d02bd2148d52 +Subproject commit 8ee8c3bd9a828ced8e89c7c924842e859fea9a8c diff --git a/source/funkin/play/PauseSubState.hx b/source/funkin/play/PauseSubState.hx index f16aa00d8..ed847402a 100644 --- a/source/funkin/play/PauseSubState.hx +++ b/source/funkin/play/PauseSubState.hx @@ -230,7 +230,7 @@ class PauseSubState extends MusicBeatSubState */ function startPauseMusic():Void { - var pauseMusicPath:String = Paths.music('breakfast$musicSuffix'); + var pauseMusicPath:String = Paths.music('breakfast$musicSuffix/breakfast$musicSuffix'); pauseMusic = FunkinSound.load(pauseMusicPath, true, true); if (pauseMusic == null) From 195f366b6571b5a2dc99d6b2058a6b87b9c65a64 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Wed, 27 Mar 2024 17:43:15 -0400 Subject: [PATCH 2/5] Fix an issue where the Random button would crash Freeplay. --- source/funkin/audio/FunkinSound.hx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/funkin/audio/FunkinSound.hx b/source/funkin/audio/FunkinSound.hx index 6520ff27f..56b36d5df 100644 --- a/source/funkin/audio/FunkinSound.hx +++ b/source/funkin/audio/FunkinSound.hx @@ -399,10 +399,16 @@ class FunkinSound extends FlxSound implements ICloneable return sound; } + @:nullSafety(Off) public override function destroy():Void { // trace('[FunkinSound] Destroying sound "${this._label}"'); super.destroy(); + if (fadeTween != null) + { + fadeTween.cancel(); + fadeTween = null; + } FlxTween.cancelTweensOf(this); this._label = 'unknown'; } From f4dd11e2a976951355a047d97695d00be9f42b29 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Wed, 27 Mar 2024 18:44:59 -0400 Subject: [PATCH 3/5] Update more game audio. --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 8ee8c3bd9..46cbc7524 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 8ee8c3bd9a828ced8e89c7c924842e859fea9a8c +Subproject commit 46cbc752477fd973960efc658a3c62fd57007afe From 8fc7e82c61cbbcc3aa0b3957b53e449cf7e49e4d Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Wed, 27 Mar 2024 22:50:53 -0400 Subject: [PATCH 4/5] Update assets submodule --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 46cbc7524..be892870e 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 46cbc752477fd973960efc658a3c62fd57007afe +Subproject commit be892870e4d4397240d0b47275c4a8259583a942 From fe498b38e51babb076a1a94003be002dc17ac2fe Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Sat, 30 Mar 2024 03:32:17 -0400 Subject: [PATCH 5/5] assets submod --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 2a0afcd76..763c833cb 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 2a0afcd76a26251dbbebb6901df4651f25a92c23 +Subproject commit 763c833cbcde724d50ff31f5bac9f2ac3d5e61a7