merge conflict fixins

assets

@@ -1 +1 @@
-Subproject commit 8558bc906ecd48ba5d7b1c213982f15b5d033227
+Subproject commit b7f132a4e6c528c2d55831f88a11781df0149fd5

source/Main.hx

@@ -26,7 +26,7 @@ class Main extends Sprite
   var framerate:Int = 60; // How many frames per second the game should run at.
   #else
   // TODO: This should probably be in the options menu?
-  var framerate:Int = 60; // How many frames per second the game should run at.
+  var framerate:Int = 144; // How many frames per second the game should run at.
   #end
   var skipSplash:Bool = true; // Whether to skip the flixel splash screen that appears in release mode.
   var startFullscreen:Bool = false; // Whether to start the game in fullscreen on desktop targets

source/funkin/ui/charSelect/CharSelectGF.hx

@@ -22,7 +22,6 @@ class CharSelectGF extends FlxAtlasSprite
   var intendedYPos:Float = 0;
   var intendedAlpha:Float = 0;
   var list:Array<String> = [];
-  var char:String = "gf";
 
   var analyzer:SpectralAnalyzer;
 
@@ -76,7 +75,7 @@ class CharSelectGF extends FlxAtlasSprite
 
   function drawFFT()
   {
-    if (char == "nene")
+    if (curGF == NENE)
     {
       var levels = analyzer.getLevels();
       var frame = anim.curSymbol.timeline.get("VIZ_bars").get(anim.curFrame);

source/funkin/ui/charSelect/CharSelectSubState.hx

@@ -309,7 +309,7 @@ class CharSelectSubState extends MusicBeatSubState
   var grpXSpread(default, set):Float = 107;
   var grpYSpread(default, set):Float = 127;
 
-  function initLocks()
+  function initLocks():Void
   {
     grpIcons = new FlxSpriteGroup();
     add(grpIcons);