AAGAJGAJGJ

source/funkin/options/categories/AppearanceOptions.hx

@@ -43,18 +43,6 @@ class AppearanceOptions extends OptionsScreen {
 				"gpuOnlyBitmaps"));
 		}
 		#end
-		add(new Checkbox(
-			getName("streamedMusic"),
-			getDesc("streamedMusic"),
-			"streamedMusic"));
-		add(new Checkbox(
-			getName("streamedVocals"),
-			getDesc("streamedVocals"),
-			"streamedVocals"));
-		add(new Checkbox(
-			getName("autoPause"),
-			getDesc("autoPause"),
-			"autoPause"));
 	}
 
 	private function __changeFPS(change:Float) {

source/funkin/options/categories/GameplayOptions.hx

@@ -18,14 +18,6 @@ class GameplayOptions extends OptionsScreen {
 			getName("ghostTapping"),
 			getDesc("ghostTapping"),
 			"ghostTapping"));
-		add(offsetSetting = new NumOption(
-			getName("songOffset"),
-			getDesc("songOffset"),
-			-999, // minimum
-			999, // maximum
-			1, // change
-			"songOffset", // save name or smth
-			__changeOffset)); // callback
 		add(new Checkbox(
 			getName("naughtyness"),
 			getDesc("naughtyness"),
@@ -34,6 +26,10 @@ class GameplayOptions extends OptionsScreen {
 			getName("camZoomOnBeat"),
 			getDesc("camZoomOnBeat"),
 			"camZoomOnBeat"));
+		add(new Checkbox(
+			getName("autoPause"),
+			getDesc("autoPause"),
+			"autoPause"));
 		add(new MeterOption(
 			getName("volumeSFX"),
 			getDesc("volumeSFX"),
@@ -41,6 +37,16 @@ class GameplayOptions extends OptionsScreen {
 			1, // maximum
 			0.1, // change
 			"volumeSFX"));
+		add(offsetSetting = new NumOption(
+			getName("songOffset"),
+			getDesc("songOffset"),
+			-999, // minimum
+			999, // maximum
+			1, // change
+			"songOffset", // save name or smth
+			__changeOffset)); // callback
+		add(new TextOption('optionsMenu.advanced', 'optionsTree.gameplay.advanced-desc', ' >', () ->
+			parent.add(new AdvancedGameplayOptions('optionsMenu.advanced', 'optionsTree.gameplay.advanced-desc'))));
 	}
 
 	private function __changeOffset(offset)
@@ -66,15 +72,27 @@ class GameplayOptions extends OptionsScreen {
 				__lastSongBeat = beat;
 			}
 		}
-		else FlxG.sound.music.volume = 1;
+		else
+			FlxG.sound.music.volume = 1;
 	}
 
-	public override function close() {
-		// To remove this timer move super.update(elapsed); to the end, but im afraid it will cause stuff to break
-		new FlxTimer().start(0.0000001, (_) -> {
-			FlxG.camera.zoom = 1;
-			FlxG.sound.music.volume = 1;
-		});
+	override function close() {
+		FlxG.camera.zoom = 1;
+		FlxG.sound.music.volume = 1;
 		super.close();
 	}
-}
+}
+
+class AdvancedGameplayOptions extends OptionsScreen {
+	public override function new(title:String, desc:String) {
+		super(title, desc, "GameplayOptions.Advanced.");
+		add(new Checkbox(
+			getName("streamedMusic"),
+			getDesc("streamedMusic"),
+			"streamedMusic"));
+		add(new Checkbox(
+			getName("streamedVocals"),
+			getDesc("streamedVocals"),
+			"streamedVocals"));
+	}
+}