Add ability to press back to exit Character Select

MrMadera · EliteMasterEric · commit 250d2188b9cb · 2025-09-05T13:23:51.000-04:00
diff --git a/source/funkin/ui/charSelect/CharSelectSubState.hx b/source/funkin/ui/charSelect/CharSelectSubState.hx
@@ -755,6 +755,11 @@ class CharSelectSubState extends MusicBeatSubState
       FlxTween.tween(member, {y: member.y + 300}, 0.8, {ease: FlxEase.backIn});
     }
     FlxG.camera.follow(camFollow, LOCKON);
+    // going to freeplay so fast makes the fade effects and the camera to bug, that's why we cancel the tweens
+    FlxTween.cancelTweensOf(transitionGradient);
+    FlxTween.cancelTweensOf(fadeShader);
+    FlxTween.cancelTweensOf(camFollow);
+
     FlxTween.tween(transitionGradient, {y: -150}, 0.8, {ease: FlxEase.backIn});
     fadeShader.fade(1.0, 0, 0.8, {ease: FlxEase.quadIn});
     FlxTween.tween(camFollow, {y: camFollow.y - 150}, 0.8,
@@ -764,7 +769,7 @@ class CharSelectSubState extends MusicBeatSubState
           FlxG.switchState(() -> FreeplayState.build(
             {
               {
-                character: curChar,
+                character: wentBackToFreeplay ? rememberedChar : curChar,
                 fromCharSelect: true
               }
             }));
@@ -784,6 +789,8 @@ class CharSelectSubState extends MusicBeatSubState
   var mobileDeny:Bool = false;
   var mobileAccept:Bool = false;
 
+  var wentBackToFreeplay:Bool = false;
+
   override public function update(elapsed:Float):Void
   {
     super.update(elapsed);
@@ -899,6 +906,14 @@ class CharSelectSubState extends MusicBeatSubState
         holdTmrRight = 0;
         selectSound.play(true);
       }
+
+      if (controls.BACK)
+      {
+        wentBackToFreeplay = true;
+        FunkinSound.playOnce(Paths.sound('cancelMenu'));
+        FlxTween.tween(FlxG.sound.music, {volume: 0.0}, 0.7, {ease: FlxEase.quadInOut});
+        goToFreeplay();
+      }
     }
 
     if (cursorX < -1)
