Merge pull request #4227 from Lasercar/main-menu-not-remembering-freeplay-menu-selection-fix

EliteMasterEric · web-flow · commit 05b9d68645b7 · 2025-05-02T14:29:29.000-04:00
Main menu not remembering freeplay menu selection fix
diff --git a/source/funkin/ui/mainmenu/MainMenuState.hx b/source/funkin/ui/mainmenu/MainMenuState.hx
@@ -99,6 +99,7 @@ class MainMenuState extends MusicBeatState
     createMenuItem('freeplay', 'mainmenu/freeplay', function() {
       persistentDraw = true;
       persistentUpdate = false;
+      rememberedSelectedIndex = menuItems.selectedIndex;
       // Freeplay has its own custom transition
       FlxTransitionableState.skipNextTransIn = true;
       FlxTransitionableState.skipNextTransOut = true;
@@ -413,6 +414,7 @@ class MainMenuState extends MusicBeatState
 
     if (controls.BACK && menuItems.enabled && !menuItems.busy)
     {
+      rememberedSelectedIndex = menuItems.selectedIndex;
       FlxG.switchState(() -> new TitleState());
       FunkinSound.playOnce(Paths.sound('cancelMenu'));
     }

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ class MainMenuState extends MusicBeatState`
`99`	`99`	`createMenuItem('freeplay', 'mainmenu/freeplay', function() {`
`100`	`100`	`persistentDraw = true;`
`101`	`101`	`persistentUpdate = false;`
	`102`	`+ rememberedSelectedIndex = menuItems.selectedIndex;`
`102`	`103`	`// Freeplay has its own custom transition`
`103`	`104`	`FlxTransitionableState.skipNextTransIn = true;`
`104`	`105`	`FlxTransitionableState.skipNextTransOut = true;`
`@@ -413,6 +414,7 @@ class MainMenuState extends MusicBeatState`
`413`	`414`
`414`	`415`	`if (controls.BACK && menuItems.enabled && !menuItems.busy)`
`415`	`416`	`{`
	`417`	`+ rememberedSelectedIndex = menuItems.selectedIndex;`
`416`	`418`	`FlxG.switchState(() -> new TitleState());`
`417`	`419`	`FunkinSound.playOnce(Paths.sound('cancelMenu'));`
`418`	`420`	`}`