From 716b19ee2f72bce33f916119904c1b5415fdda60 Mon Sep 17 00:00:00 2001 From: Super <38338700+superpowers04@users.noreply.github.com> Date: Fri, 15 Aug 2025 20:33:49 -0400 Subject: [PATCH 1/3] Ctrl+Shift+F1 to force main menu state switch --- source/funkin/backend/MusicBeatState.hx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/funkin/backend/MusicBeatState.hx b/source/funkin/backend/MusicBeatState.hx index 74d953664..38e99cbca 100644 --- a/source/funkin/backend/MusicBeatState.hx +++ b/source/funkin/backend/MusicBeatState.hx @@ -12,6 +12,7 @@ import funkin.backend.system.GraphicCacheSprite; import funkin.backend.system.framerate.Framerate; import funkin.backend.system.interfaces.IBeatReceiver; import funkin.backend.system.interfaces.IBeatCancellableReceiver; +import funkin.menus.MainMenuState; import funkin.options.PlayerSettings; /** @@ -166,6 +167,11 @@ class MusicBeatState extends FlxState implements IBeatCancellableReceiver FlxG.resetState(); } + if (FlxG.keys.justPressed.F1 && FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.SHIFT) { + Logs.trace("Returning to Main Menu...", INFO, YELLOW); + FlxG.switchState(new MainMenuState()); + } + if (subState != null) subState.tryUpdate(elapsed); } From e96bb50df665cd5394fe5d3b7791c9e04a82be00 Mon Sep 17 00:00:00 2001 From: Super <38338700+superpowers04@users.noreply.github.com> Date: Mon, 25 Aug 2025 21:48:30 -0400 Subject: [PATCH 2/3] Don't run substate update upon ctrl+shift+f1 --- source/funkin/backend/MusicBeatState.hx | 1 + 1 file changed, 1 insertion(+) diff --git a/source/funkin/backend/MusicBeatState.hx b/source/funkin/backend/MusicBeatState.hx index 38e99cbca..cd8488509 100644 --- a/source/funkin/backend/MusicBeatState.hx +++ b/source/funkin/backend/MusicBeatState.hx @@ -170,6 +170,7 @@ class MusicBeatState extends FlxState implements IBeatCancellableReceiver if (FlxG.keys.justPressed.F1 && FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.SHIFT) { Logs.trace("Returning to Main Menu...", INFO, YELLOW); FlxG.switchState(new MainMenuState()); + return; } if (subState != null) From 4c2bf80661dafe58f3f40e6bdf2cd3fe1448509e Mon Sep 17 00:00:00 2001 From: Super <38338700+superpowers04@users.noreply.github.com> Date: Mon, 25 Aug 2025 21:48:40 -0400 Subject: [PATCH 3/3] Add ctrl+shift+f1 to substate just in case --- source/funkin/backend/MusicBeatSubstate.hx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/funkin/backend/MusicBeatSubstate.hx b/source/funkin/backend/MusicBeatSubstate.hx index 78157efd1..b5660966a 100644 --- a/source/funkin/backend/MusicBeatSubstate.hx +++ b/source/funkin/backend/MusicBeatSubstate.hx @@ -11,6 +11,7 @@ import funkin.backend.system.Controls; import funkin.backend.system.interfaces.IBeatReceiver; import funkin.backend.system.interfaces.IBeatCancellableReceiver; import funkin.options.PlayerSettings; +import funkin.menus.MainMenuState; /** * Base class for all the sub states. @@ -153,6 +154,13 @@ class MusicBeatSubstate extends FlxSubState implements IBeatCancellableReceiver resetSubState(); } + + if (FlxG.keys.justPressed.F1 && FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.SHIFT) { + Logs.trace("Returning to Main Menu...", INFO, YELLOW); + FlxG.switchState(new MainMenuState()); + return; + } + if (subState != null) subState.tryUpdate(elapsed); }