From e0fe7cb1ebed863111b7fffca389e9e603b47e3c Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Sat, 25 May 2024 01:11:34 +0200
Subject: [PATCH 01/66] add fps option

---
 source/Main.hx                              |   9 +-
 source/funkin/Preferences.hx                |  29 +++
 source/funkin/save/Save.hx                  |  10 +-
 source/funkin/ui/options/PreferencesMenu.hx | 211 ++++++++++++++++----
 4 files changed, 207 insertions(+), 52 deletions(-)

diff --git a/source/Main.hx b/source/Main.hx
index add5bbc67..8105e6c4f 100644
--- a/source/Main.hx
+++ b/source/Main.hx
@@ -2,6 +2,7 @@ package;
 
 import flixel.FlxGame;
 import flixel.FlxState;
+import funkin.Preferences;
 import funkin.util.logging.CrashHandler;
 import funkin.ui.debug.MemoryCounter;
 import funkin.save.Save;
@@ -22,12 +23,6 @@ class Main extends Sprite
   var gameHeight:Int = 720; // Height of the game in pixels (might be less / more in actual pixels depending on your zoom).
   var initialState:Class<FlxState> = funkin.InitState; // The FlxState the game starts with.
   var zoom:Float = -1; // If -1, zoom is automatically calculated to fit the window dimensions.
-  #if web
-  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 = 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
 
@@ -103,7 +98,7 @@ class Main extends Sprite
 
     // George recommends binding the save before FlxGame is created.
     Save.load();
-    var game:FlxGame = new FlxGame(gameWidth, gameHeight, initialState, framerate, framerate, skipSplash, startFullscreen);
+    var game:FlxGame = new FlxGame(gameWidth, gameHeight, initialState, Preferences.framerate, Preferences.framerate, skipSplash, startFullscreen);
 
     // FlxG.game._customSoundTray wants just the class, it calls new from
     // create() in there, which gets called when it's added to stage
diff --git a/source/funkin/Preferences.hx b/source/funkin/Preferences.hx
index b2050c6a2..7a322283d 100644
--- a/source/funkin/Preferences.hx
+++ b/source/funkin/Preferences.hx
@@ -7,6 +7,35 @@ import funkin.save.Save;
  */
 class Preferences
 {
+  /**
+   * FPS
+   * @default `60`
+   */
+  public static var framerate(get, set):Int;
+
+  static function get_framerate():Int
+  {
+    #if web
+    return 60;
+    #else
+    return Save?.instance?.options?.framerate ?? 60;
+    #end
+  }
+
+  static function set_framerate(value:Int):Int
+  {
+    #if web
+    return 60;
+    #else
+    var save:Save = Save.instance;
+    save.options.framerate = value;
+    save.flush();
+    FlxG.updateFramerate = value;
+    FlxG.drawFramerate = value;
+    return value;
+    #end
+  }
+
   /**
    * Whether some particularly fowl language is displayed.
    * @default `true`
diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx
index acbe59edd..3600e9741 100644
--- a/source/funkin/save/Save.hx
+++ b/source/funkin/save/Save.hx
@@ -53,7 +53,8 @@ class Save
   public function new(?data:RawSaveData)
   {
     if (data == null) this.data = Save.getDefault();
-    else this.data = data;
+    else
+      this.data = data;
   }
 
   public static function getDefault():RawSaveData
@@ -80,6 +81,7 @@ class Save
       options:
         {
           // Reasonable defaults.
+          framerate: 60,
           naughtyness: true,
           downscroll: false,
           flashingLights: true,
@@ -835,6 +837,12 @@ typedef SaveScoreTallyData =
  */
 typedef SaveDataOptions =
 {
+  /**
+   * FPS
+   * @default `60`
+   */
+  var framerate:Int;
+
   /**
    * Whether some particularly fowl language is displayed.
    * @default `true`
diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index 783aef0ba..cf7296584 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -3,16 +3,16 @@ package funkin.ui.options;
 import flixel.FlxCamera;
 import flixel.FlxObject;
 import flixel.FlxSprite;
+import flixel.math.FlxMath;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
 import funkin.ui.AtlasText.AtlasFont;
 import funkin.ui.options.OptionsState.Page;
 import funkin.graphics.FunkinCamera;
-import funkin.ui.TextMenuList.TextMenuItem;
 
 class PreferencesMenu extends Page
 {
-  var items:TextMenuList;
-  var preferenceItems:FlxTypedSpriteGroup<FlxSprite>;
+  var curSelected:Int = 0;
+  var prefs:FlxTypedSpriteGroup<PreferenceItem>;
 
   var menuCamera:FlxCamera;
   var camFollow:FlxObject;
@@ -26,22 +26,27 @@ class PreferencesMenu extends Page
     menuCamera.bgColor = 0x0;
     camera = menuCamera;
 
-    add(items = new TextMenuList());
-    add(preferenceItems = new FlxTypedSpriteGroup<FlxSprite>());
+    prefs = new FlxTypedSpriteGroup<PreferenceItem>();
+    add(prefs);
 
     createPrefItems();
 
     camFollow = new FlxObject(FlxG.width / 2, 0, 140, 70);
-    if (items != null) camFollow.y = items.selectedItem.y;
 
     menuCamera.follow(camFollow, null, 0.06);
     var margin = 160;
     menuCamera.deadzone.set(0, margin, menuCamera.width, 40);
     menuCamera.minScrollY = 0;
 
-    items.onChange.add(function(selected) {
-      camFollow.y = selected.y;
-    });
+    changeSelection(0);
+  }
+
+  function addPref(pref:PreferenceItem):Void
+  {
+    pref.x = 0;
+    pref.y = 120 * prefs.length;
+    pref.ID = prefs.length;
+    prefs.add(pref);
   }
 
   /**
@@ -49,50 +54,168 @@ class PreferencesMenu extends Page
    */
   function createPrefItems():Void
   {
-    createPrefItemCheckbox('Naughtyness', 'Toggle displaying raunchy content', function(value:Bool):Void {
-      Preferences.naughtyness = value;
-    }, Preferences.naughtyness);
-    createPrefItemCheckbox('Downscroll', 'Enable to make notes move downwards', function(value:Bool):Void {
-      Preferences.downscroll = value;
-    }, Preferences.downscroll);
-    createPrefItemCheckbox('Flashing Lights', 'Disable to dampen flashing effects', function(value:Bool):Void {
-      Preferences.flashingLights = value;
-    }, Preferences.flashingLights);
-    createPrefItemCheckbox('Camera Zooming on Beat', 'Disable to stop the camera bouncing to the song', function(value:Bool):Void {
-      Preferences.zoomCamera = value;
-    }, Preferences.zoomCamera);
-    createPrefItemCheckbox('Debug Display', 'Enable to show FPS and other debug stats', function(value:Bool):Void {
-      Preferences.debugDisplay = value;
-    }, Preferences.debugDisplay);
-    createPrefItemCheckbox('Auto Pause', 'Automatically pause the game when it loses focus', function(value:Bool):Void {
-      Preferences.autoPause = value;
-    }, Preferences.autoPause);
+    #if !web
+    var pref:NumberedPreferenceItem = new NumberedPreferenceItem("FPS", "The framerate that the game is running on", Preferences.framerate,
+      function(value:Float):Void {
+        Preferences.framerate = Std.int(value);
+      });
+    pref.minValue = 60;
+    pref.maxValue = 360;
+    pref.changeRate = 1;
+    pref.changeSpeed = 0.05;
+    addPref(pref);
+    #end
+
+    // TODO: add these back
+    // createPrefItemCheckbox('Naughtyness', 'Toggle displaying raunchy content', function(value:Bool):Void {
+    //   Preferences.naughtyness = value;
+    // }, Preferences.naughtyness);
+    // createPrefItemCheckbox('Downscroll', 'Enable to make notes move downwards', function(value:Bool):Void {
+    //   Preferences.downscroll = value;
+    // }, Preferences.downscroll);
+    // createPrefItemCheckbox('Flashing Lights', 'Disable to dampen flashing effects', function(value:Bool):Void {
+    //   Preferences.flashingLights = value;
+    // }, Preferences.flashingLights);
+    // createPrefItemCheckbox('Camera Zooming on Beat', 'Disable to stop the camera bouncing to the song', function(value:Bool):Void {
+    //   Preferences.zoomCamera = value;
+    // }, Preferences.zoomCamera);
+    // createPrefItemCheckbox('Debug Display', 'Enable to show FPS and other debug stats', function(value:Bool):Void {
+    //   Preferences.debugDisplay = value;
+    // }, Preferences.debugDisplay);
+    // createPrefItemCheckbox('Auto Pause', 'Automatically pause the game when it loses focus', function(value:Bool):Void {
+    //   Preferences.autoPause = value;
+    // }, Preferences.autoPause);
   }
 
-  function createPrefItemCheckbox(prefName:String, prefDesc:String, onChange:Bool->Void, defaultValue:Bool):Void
+  function changeSelection(change:Int):Void
   {
-    var checkbox:CheckboxPreferenceItem = new CheckboxPreferenceItem(0, 120 * (items.length - 1 + 1), defaultValue);
+    curSelected += change;
+    if (curSelected < 0)
+    {
+      curSelected = prefs.length - 1;
+    }
+    else if (curSelected >= prefs.length)
+    {
+      curSelected = 0;
+    }
 
-    items.createItem(120, (120 * items.length) + 30, prefName, AtlasFont.BOLD, function() {
-      var value = !checkbox.currentValue;
-      onChange(value);
-      checkbox.currentValue = value;
-    });
-
-    preferenceItems.add(checkbox);
+    for (pref in prefs)
+    {
+      pref.x = 0;
+      if (pref.ID == curSelected)
+      {
+        pref.x = 20;
+        camFollow.y = pref.y;
+      }
+    }
   }
 
-  override function update(elapsed:Float)
+  override function update(elapsed:Float):Void
   {
     super.update(elapsed);
 
-    // Indent the selected item.
-    // TODO: Only do this on menu change?
-    items.forEach(function(daItem:TextMenuItem) {
-      if (items.selectedItem == daItem) daItem.x = 150;
-      else
-        daItem.x = 120;
-    });
+    if (controls.UI_DOWN_P)
+    {
+      changeSelection(1);
+    }
+    else if (controls.UI_UP_P)
+    {
+      changeSelection(-1);
+    }
+
+    var selectedPref:PreferenceItem = prefs.members[curSelected];
+    selectedPref.handleInput(elapsed);
+  }
+}
+
+class PreferenceItem extends FlxTypedSpriteGroup<FlxSprite>
+{
+  public var name:String = "";
+  public var description:String = "";
+
+  public function handleInput(deltaTime:Float):Void {}
+}
+
+class NumberedPreferenceItem extends PreferenceItem
+{
+  public var onChange:Float->Void;
+  public var changeRate:Float = 1.0;
+  public var changeSpeed:Float = 0.1;
+
+  public var minValue(default, set):Null<Float>;
+
+  function set_minValue(value:Float):Float
+  {
+    minValue = value;
+    currentValue = currentValue;
+    return value;
+  }
+
+  public var maxValue(default, set):Null<Float>;
+
+  function set_maxValue(value:Float):Float
+  {
+    maxValue = value;
+    currentValue = currentValue;
+    return value;
+  }
+
+  public var currentValue(default, set):Float;
+
+  function set_currentValue(value:Float):Float
+  {
+    currentValue = FlxMath.bound(value, minValue, maxValue);
+    onChange(currentValue);
+    updateText();
+    return currentValue;
+  }
+
+  var valueText:AtlasText;
+  var preferenceText:AtlasText;
+
+  public function new(name:String, description:String, defaultValue:Float, onChange:Float->Void)
+  {
+    super();
+
+    this.valueText = new AtlasText(0, 0, '$defaultValue', AtlasFont.DEFAULT);
+    add(this.valueText);
+
+    this.preferenceText = new AtlasText(this.valueText.width + 30, 0, '$name', AtlasFont.BOLD);
+    add(this.preferenceText);
+
+    this.name = name;
+    this.description = description;
+    this.onChange = onChange;
+    this.currentValue = defaultValue;
+  }
+
+  var timeToWait:Float = 0;
+
+  public override function handleInput(deltaTime:Float):Void
+  {
+    timeToWait -= deltaTime;
+
+    if (timeToWait > 0)
+    {
+      return;
+    }
+
+    if (PlayerSettings.player1.controls.UI_RIGHT)
+    {
+      currentValue += changeRate;
+      timeToWait = changeSpeed;
+    }
+    else if (PlayerSettings.player1.controls.UI_LEFT)
+    {
+      currentValue -= changeRate;
+      timeToWait = changeSpeed;
+    }
+  }
+
+  function updateText():Void
+  {
+    valueText.text = '$currentValue';
+    preferenceText.x = valueText.width + 30;
   }
 }
 

From dd6d12de2340563bcbe254b36977d119085a06aa Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Sat, 25 May 2024 01:20:10 +0200
Subject: [PATCH 02/66] rename vars

---
 source/funkin/ui/options/PreferencesMenu.hx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index cf7296584..87917ad70 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -62,7 +62,7 @@ class PreferencesMenu extends Page
     pref.minValue = 60;
     pref.maxValue = 360;
     pref.changeRate = 1;
-    pref.changeSpeed = 0.05;
+    pref.changeDelay = 0.05;
     addPref(pref);
     #end
 
@@ -133,14 +133,14 @@ class PreferenceItem extends FlxTypedSpriteGroup<FlxSprite>
   public var name:String = "";
   public var description:String = "";
 
-  public function handleInput(deltaTime:Float):Void {}
+  public function handleInput(elapsed:Float):Void {}
 }
 
 class NumberedPreferenceItem extends PreferenceItem
 {
   public var onChange:Float->Void;
   public var changeRate:Float = 1.0;
-  public var changeSpeed:Float = 0.1;
+  public var changeDelay:Float = 0.1;
 
   public var minValue(default, set):Null<Float>;
 
@@ -191,9 +191,9 @@ class NumberedPreferenceItem extends PreferenceItem
 
   var timeToWait:Float = 0;
 
-  public override function handleInput(deltaTime:Float):Void
+  public override function handleInput(elapsed:Float):Void
   {
-    timeToWait -= deltaTime;
+    timeToWait -= elapsed;
 
     if (timeToWait > 0)
     {
@@ -203,12 +203,12 @@ class NumberedPreferenceItem extends PreferenceItem
     if (PlayerSettings.player1.controls.UI_RIGHT)
     {
       currentValue += changeRate;
-      timeToWait = changeSpeed;
+      timeToWait = changeDelay;
     }
     else if (PlayerSettings.player1.controls.UI_LEFT)
     {
       currentValue -= changeRate;
-      timeToWait = changeSpeed;
+      timeToWait = changeDelay;
     }
   }
 

From b75f6e58532534dd94cef1c93c24270e1f56425e Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Sat, 25 May 2024 02:19:11 +0200
Subject: [PATCH 03/66] Update PreferencesMenu.hx

---
 source/funkin/ui/options/PreferencesMenu.hx | 136 ++++++++++++--------
 1 file changed, 81 insertions(+), 55 deletions(-)

diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index 87917ad70..acbb57525 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -66,25 +66,41 @@ class PreferencesMenu extends Page
     addPref(pref);
     #end
 
-    // TODO: add these back
-    // createPrefItemCheckbox('Naughtyness', 'Toggle displaying raunchy content', function(value:Bool):Void {
-    //   Preferences.naughtyness = value;
-    // }, Preferences.naughtyness);
-    // createPrefItemCheckbox('Downscroll', 'Enable to make notes move downwards', function(value:Bool):Void {
-    //   Preferences.downscroll = value;
-    // }, Preferences.downscroll);
-    // createPrefItemCheckbox('Flashing Lights', 'Disable to dampen flashing effects', function(value:Bool):Void {
-    //   Preferences.flashingLights = value;
-    // }, Preferences.flashingLights);
-    // createPrefItemCheckbox('Camera Zooming on Beat', 'Disable to stop the camera bouncing to the song', function(value:Bool):Void {
-    //   Preferences.zoomCamera = value;
-    // }, Preferences.zoomCamera);
-    // createPrefItemCheckbox('Debug Display', 'Enable to show FPS and other debug stats', function(value:Bool):Void {
-    //   Preferences.debugDisplay = value;
-    // }, Preferences.debugDisplay);
-    // createPrefItemCheckbox('Auto Pause', 'Automatically pause the game when it loses focus', function(value:Bool):Void {
-    //   Preferences.autoPause = value;
-    // }, Preferences.autoPause);
+    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Naughtyness', 'Toggle displaying raunchy content', Preferences.naughtyness,
+      function(value:Bool):Void {
+        Preferences.naughtyness = value;
+      });
+    addPref(pref);
+
+    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Downscroll', 'Enable to make notes move downwards', Preferences.downscroll,
+      function(value:Bool):Void {
+        Preferences.downscroll = value;
+      });
+    addPref(pref);
+
+    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Flashing Lights', 'Disable to dampen flashing effects', Preferences.flashingLights,
+      function(value:Bool):Void {
+        Preferences.flashingLights = value;
+      });
+    addPref(pref);
+
+    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Camera Zooming on Beat', 'Disable to stop the camera bouncing to the song',
+      Preferences.zoomCamera, function(value:Bool):Void {
+        Preferences.zoomCamera = value;
+    });
+    addPref(pref);
+
+    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Debug Display', 'Enable to show FPS and other debug stats', Preferences.debugDisplay,
+      function(value:Bool):Void {
+        Preferences.debugDisplay = value;
+      });
+    addPref(pref);
+
+    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Auto Pause', 'Automatically pause the game when it loses focus', Preferences.autoPause,
+      function(value:Bool):Void {
+        Preferences.autoPause = value;
+      });
+    addPref(pref);
   }
 
   function changeSelection(change:Int):Void
@@ -104,7 +120,7 @@ class PreferencesMenu extends Page
       pref.x = 0;
       if (pref.ID == curSelected)
       {
-        pref.x = 20;
+        pref.x = 30;
         camFollow.y = pref.y;
       }
     }
@@ -124,7 +140,7 @@ class PreferencesMenu extends Page
     }
 
     var selectedPref:PreferenceItem = prefs.members[curSelected];
-    selectedPref.handleInput(elapsed);
+    selectedPref?.handleInput(elapsed);
   }
 }
 
@@ -177,10 +193,10 @@ class NumberedPreferenceItem extends PreferenceItem
   {
     super();
 
-    this.valueText = new AtlasText(0, 0, '$defaultValue', AtlasFont.DEFAULT);
+    this.valueText = new AtlasText(20, 30, '$defaultValue', AtlasFont.DEFAULT);
     add(this.valueText);
 
-    this.preferenceText = new AtlasText(this.valueText.width + 30, 0, '$name', AtlasFont.BOLD);
+    this.preferenceText = new AtlasText(this.valueText.x + this.valueText.width + 30, 30, '$name', AtlasFont.BOLD);
     add(this.preferenceText);
 
     this.name = name;
@@ -215,52 +231,62 @@ class NumberedPreferenceItem extends PreferenceItem
   function updateText():Void
   {
     valueText.text = '$currentValue';
-    preferenceText.x = valueText.width + 30;
+    preferenceText.x = valueText.x + valueText.width + 30;
   }
 }
 
-class CheckboxPreferenceItem extends FlxSprite
+class CheckboxPreferenceItem extends PreferenceItem
 {
+  public var onChange:Bool->Void;
+
   public var currentValue(default, set):Bool;
 
-  public function new(x:Float, y:Float, defaultValue:Bool = false)
-  {
-    super(x, y);
-
-    frames = Paths.getSparrowAtlas('checkboxThingie');
-    animation.addByPrefix('static', 'Check Box unselected', 24, false);
-    animation.addByPrefix('checked', 'Check Box selecting animation', 24, false);
-
-    setGraphicSize(Std.int(width * 0.7));
-    updateHitbox();
-
-    this.currentValue = defaultValue;
-  }
-
-  override function update(elapsed:Float)
-  {
-    super.update(elapsed);
-
-    switch (animation.curAnim.name)
-    {
-      case 'static':
-        offset.set();
-      case 'checked':
-        offset.set(17, 70);
-    }
-  }
-
   function set_currentValue(value:Bool):Bool
   {
     if (value)
     {
-      animation.play('checked', true);
+      checkBox.animation.play('checked', true);
+      checkBox.offset.set(17, 70);
     }
     else
     {
-      animation.play('static');
+      checkBox.animation.play('static');
+      checkBox.offset.set();
     }
+    currentValue = value;
+    onChange(value);
+    return value;
+  }
 
-    return currentValue = value;
+  var checkBox:FlxSprite;
+  var preferenceText:AtlasText;
+
+  public function new(name:String, description:String, defaultValue:Bool, onChange:Bool->Void)
+  {
+    super();
+
+    this.checkBox = new FlxSprite();
+    this.checkBox.frames = Paths.getSparrowAtlas('checkboxThingie');
+    this.checkBox.animation.addByPrefix('static', 'Check Box unselected', 24, false);
+    this.checkBox.animation.addByPrefix('checked', 'Check Box selecting animation', 24, false);
+    this.checkBox.setGraphicSize(Std.int(this.checkBox.width * 0.7));
+    this.checkBox.updateHitbox();
+    add(this.checkBox);
+
+    this.preferenceText = new AtlasText(120, 30, '$name', AtlasFont.BOLD);
+    add(this.preferenceText);
+
+    this.name = name;
+    this.description = description;
+    this.onChange = onChange;
+    this.currentValue = defaultValue;
+  }
+
+  public override function handleInput(elapsed:Float):Void
+  {
+    if (PlayerSettings.player1.controls.ACCEPT)
+    {
+      currentValue = !currentValue;
+    }
   }
 }

From 814d72cb3f241c61896adda8e6f84435ff056f4a Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Sat, 25 May 2024 03:06:27 +0200
Subject: [PATCH 04/66] sounds

---
 source/funkin/ui/options/PreferencesMenu.hx | 28 ++++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index acbb57525..75bc0fdb3 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -4,13 +4,20 @@ import flixel.FlxCamera;
 import flixel.FlxObject;
 import flixel.FlxSprite;
 import flixel.math.FlxMath;
+import flixel.effects.FlxFlicker;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
 import funkin.ui.AtlasText.AtlasFont;
 import funkin.ui.options.OptionsState.Page;
 import funkin.graphics.FunkinCamera;
+import funkin.audio.FunkinSound;
 
 class PreferencesMenu extends Page
 {
+  /**
+   * Wether you can selected a different option
+   */
+  public static var allowScrolling:Bool = true;
+
   var curSelected:Int = 0;
   var prefs:FlxTypedSpriteGroup<PreferenceItem>;
 
@@ -130,12 +137,14 @@ class PreferencesMenu extends Page
   {
     super.update(elapsed);
 
-    if (controls.UI_DOWN_P)
+    if (controls.UI_DOWN_P && allowScrolling)
     {
+      FunkinSound.playOnce(Paths.sound('scrollMenu'));
       changeSelection(1);
     }
-    else if (controls.UI_UP_P)
+    else if (controls.UI_UP_P && allowScrolling)
     {
+      FunkinSound.playOnce(Paths.sound('scrollMenu'));
       changeSelection(-1);
     }
 
@@ -220,11 +229,13 @@ class NumberedPreferenceItem extends PreferenceItem
     {
       currentValue += changeRate;
       timeToWait = changeDelay;
+      // FunkinSound.playOnce(Paths.sound('scrollMenu'));
     }
     else if (PlayerSettings.player1.controls.UI_LEFT)
     {
       currentValue -= changeRate;
       timeToWait = changeDelay;
+      // FunkinSound.playOnce(Paths.sound('scrollMenu'));
     }
   }
 
@@ -282,11 +293,20 @@ class CheckboxPreferenceItem extends PreferenceItem
     this.currentValue = defaultValue;
   }
 
+  var isAccepting:Bool = false;
+
   public override function handleInput(elapsed:Float):Void
   {
-    if (PlayerSettings.player1.controls.ACCEPT)
+    if (PlayerSettings.player1.controls.ACCEPT && !isAccepting)
     {
-      currentValue = !currentValue;
+      isAccepting = true;
+      PreferencesMenu.allowScrolling = false;
+      FunkinSound.playOnce(Paths.sound('confirmMenu'));
+      FlxFlicker.flicker(preferenceText, 1, 0.06, true, false, function(_) {
+        isAccepting = false;
+        PreferencesMenu.allowScrolling = true;
+        currentValue = !currentValue;
+      });
     }
   }
 }

From 267fd0eadcaceedc69bae06bf3d3344f4251bfdc Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Sat, 25 May 2024 16:30:08 +0200
Subject: [PATCH 05/66] alpha stuff and correct text positioning

---
 source/funkin/ui/options/PreferencesMenu.hx | 42 +++++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index 75bc0fdb3..4e9e0bca8 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -124,12 +124,15 @@ class PreferencesMenu extends Page
 
     for (pref in prefs)
     {
-      pref.x = 0;
       if (pref.ID == curSelected)
       {
-        pref.x = 30;
+        pref.onSelect(true);
         camFollow.y = pref.y;
       }
+      else
+      {
+        pref.onSelect(false);
+      }
     }
   }
 
@@ -159,6 +162,8 @@ class PreferenceItem extends FlxTypedSpriteGroup<FlxSprite>
   public var description:String = "";
 
   public function handleInput(elapsed:Float):Void {}
+
+  public function onSelect(isSelected:Bool):Void {}
 }
 
 class NumberedPreferenceItem extends PreferenceItem
@@ -239,10 +244,27 @@ class NumberedPreferenceItem extends PreferenceItem
     }
   }
 
+  var isSelected:Bool = false;
+
+  public override function onSelect(isSelected:Bool):Void
+  {
+    this.isSelected = isSelected;
+    if (isSelected)
+    {
+      preferenceText.x = valueText.x + valueText.width + 60;
+      preferenceText.alpha = 1.0;
+    }
+    else
+    {
+      preferenceText.x = valueText.x + valueText.width + 30;
+      preferenceText.alpha = 0.6;
+    }
+  }
+
   function updateText():Void
   {
     valueText.text = '$currentValue';
-    preferenceText.x = valueText.x + valueText.width + 30;
+    preferenceText.x = valueText.x + valueText.width + (isSelected ? 60 : 30);
   }
 }
 
@@ -309,4 +331,18 @@ class CheckboxPreferenceItem extends PreferenceItem
       });
     }
   }
+
+  public override function onSelect(isSelected:Bool):Void
+  {
+    if (isSelected)
+    {
+      preferenceText.x = 150;
+      preferenceText.alpha = 1.0;
+    }
+    else
+    {
+      preferenceText.alpha = 0.6;
+      preferenceText.x = 120;
+    }
+  }
 }

From 4a531888b550f10564f058b8d2155645d33a7867 Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Thu, 30 May 2024 00:22:10 +0200
Subject: [PATCH 06/66] Update PreferencesMenu.hx

---
 source/funkin/ui/options/PreferencesMenu.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index 4e9e0bca8..205ef1809 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -14,7 +14,7 @@ import funkin.audio.FunkinSound;
 class PreferencesMenu extends Page
 {
   /**
-   * Wether you can selected a different option
+   * Wether you can select a different option
    */
   public static var allowScrolling:Bool = true;
 

From 3b3b9d97ba08d8e315df0bcd755d79d1e6e27a81 Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Sun, 23 Jun 2024 21:03:30 +0200
Subject: [PATCH 07/66] use different implementation

---
 source/funkin/ui/AtlasText.hx                 |  26 ++
 source/funkin/ui/options/PreferencesMenu.hx   | 371 ++++--------------
 .../options/items/CheckboxPreferenceItem.hx   |  49 +++
 .../ui/options/items/NumberPreferenceItem.hx  | 107 +++++
 4 files changed, 258 insertions(+), 295 deletions(-)
 create mode 100644 source/funkin/ui/options/items/CheckboxPreferenceItem.hx
 create mode 100644 source/funkin/ui/options/items/NumberPreferenceItem.hx

diff --git a/source/funkin/ui/AtlasText.hx b/source/funkin/ui/AtlasText.hx
index 186d87c2a..ef74abc1e 100644
--- a/source/funkin/ui/AtlasText.hx
+++ b/source/funkin/ui/AtlasText.hx
@@ -152,6 +152,32 @@ class AtlasText extends FlxTypedSpriteGroup<AtlasChar>
     }
   }
 
+  public function getWidth():Int
+  {
+    var width = 0;
+    for (char in this.text.split(""))
+    {
+      switch (char)
+      {
+        case " ":
+          {
+            width += 40;
+          }
+        case "\n":
+          {}
+        case char:
+          {
+            var sprite = new AtlasChar(atlas, char);
+            sprite.revive();
+            sprite.char = char;
+            sprite.alpha = 1;
+            width += Std.int(sprite.width);
+          }
+      }
+    }
+    return width;
+  }
+
   override function toString()
   {
     return "InputItem, " + FlxStringUtil.getDebugString([
diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index 205ef1809..d03fe9073 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -3,23 +3,18 @@ package funkin.ui.options;
 import flixel.FlxCamera;
 import flixel.FlxObject;
 import flixel.FlxSprite;
-import flixel.math.FlxMath;
-import flixel.effects.FlxFlicker;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
 import funkin.ui.AtlasText.AtlasFont;
 import funkin.ui.options.OptionsState.Page;
+import funkin.ui.options.items.CheckboxPreferenceItem;
+import funkin.ui.options.items.NumberPreferenceItem;
 import funkin.graphics.FunkinCamera;
-import funkin.audio.FunkinSound;
+import funkin.ui.TextMenuList.TextMenuItem;
 
 class PreferencesMenu extends Page
 {
-  /**
-   * Wether you can select a different option
-   */
-  public static var allowScrolling:Bool = true;
-
-  var curSelected:Int = 0;
-  var prefs:FlxTypedSpriteGroup<PreferenceItem>;
+  var items:TextMenuList;
+  var preferenceItems:FlxTypedSpriteGroup<FlxSprite>;
 
   var menuCamera:FlxCamera;
   var camFollow:FlxObject;
@@ -33,27 +28,22 @@ class PreferencesMenu extends Page
     menuCamera.bgColor = 0x0;
     camera = menuCamera;
 
-    prefs = new FlxTypedSpriteGroup<PreferenceItem>();
-    add(prefs);
+    add(items = new TextMenuList());
+    add(preferenceItems = new FlxTypedSpriteGroup<FlxSprite>());
 
     createPrefItems();
 
     camFollow = new FlxObject(FlxG.width / 2, 0, 140, 70);
+    if (items != null) camFollow.y = items.selectedItem.y;
 
     menuCamera.follow(camFollow, null, 0.06);
     var margin = 160;
     menuCamera.deadzone.set(0, margin, menuCamera.width, 40);
     menuCamera.minScrollY = 0;
 
-    changeSelection(0);
-  }
-
-  function addPref(pref:PreferenceItem):Void
-  {
-    pref.x = 0;
-    pref.y = 120 * prefs.length;
-    pref.ID = prefs.length;
-    prefs.add(pref);
+    items.onChange.add(function(selected) {
+      camFollow.y = selected.y;
+    });
   }
 
   /**
@@ -62,287 +52,78 @@ class PreferencesMenu extends Page
   function createPrefItems():Void
   {
     #if !web
-    var pref:NumberedPreferenceItem = new NumberedPreferenceItem("FPS", "The framerate that the game is running on", Preferences.framerate,
-      function(value:Float):Void {
-        Preferences.framerate = Std.int(value);
-      });
-    pref.minValue = 60;
-    pref.maxValue = 360;
-    pref.changeRate = 1;
-    pref.changeDelay = 0.05;
-    addPref(pref);
+    createPrefItemNumber('FPS', 'The framerate that the game is running on', function(value:Float) {
+      Preferences.framerate = Std.int(value);
+    }, Preferences.framerate, 60, 360, 1, 0);
     #end
-
-    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Naughtyness', 'Toggle displaying raunchy content', Preferences.naughtyness,
-      function(value:Bool):Void {
-        Preferences.naughtyness = value;
-      });
-    addPref(pref);
-
-    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Downscroll', 'Enable to make notes move downwards', Preferences.downscroll,
-      function(value:Bool):Void {
-        Preferences.downscroll = value;
-      });
-    addPref(pref);
-
-    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Flashing Lights', 'Disable to dampen flashing effects', Preferences.flashingLights,
-      function(value:Bool):Void {
-        Preferences.flashingLights = value;
-      });
-    addPref(pref);
-
-    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Camera Zooming on Beat', 'Disable to stop the camera bouncing to the song',
-      Preferences.zoomCamera, function(value:Bool):Void {
-        Preferences.zoomCamera = value;
-    });
-    addPref(pref);
-
-    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Debug Display', 'Enable to show FPS and other debug stats', Preferences.debugDisplay,
-      function(value:Bool):Void {
-        Preferences.debugDisplay = value;
-      });
-    addPref(pref);
-
-    var pref:CheckboxPreferenceItem = new CheckboxPreferenceItem('Auto Pause', 'Automatically pause the game when it loses focus', Preferences.autoPause,
-      function(value:Bool):Void {
-        Preferences.autoPause = value;
-      });
-    addPref(pref);
-  }
-
-  function changeSelection(change:Int):Void
-  {
-    curSelected += change;
-    if (curSelected < 0)
-    {
-      curSelected = prefs.length - 1;
-    }
-    else if (curSelected >= prefs.length)
-    {
-      curSelected = 0;
-    }
-
-    for (pref in prefs)
-    {
-      if (pref.ID == curSelected)
-      {
-        pref.onSelect(true);
-        camFollow.y = pref.y;
-      }
-      else
-      {
-        pref.onSelect(false);
-      }
-    }
+    createPrefItemCheckbox('Naughtyness', 'Toggle displaying raunchy content', function(value:Bool):Void {
+      Preferences.naughtyness = value;
+    }, Preferences.naughtyness);
+    createPrefItemCheckbox('Downscroll', 'Enable to make notes move downwards', function(value:Bool):Void {
+      Preferences.downscroll = value;
+    }, Preferences.downscroll);
+    createPrefItemCheckbox('Flashing Lights', 'Disable to dampen flashing effects', function(value:Bool):Void {
+      Preferences.flashingLights = value;
+    }, Preferences.flashingLights);
+    createPrefItemCheckbox('Camera Zooming on Beat', 'Disable to stop the camera bouncing to the song', function(value:Bool):Void {
+      Preferences.zoomCamera = value;
+    }, Preferences.zoomCamera);
+    createPrefItemCheckbox('Debug Display', 'Enable to show FPS and other debug stats', function(value:Bool):Void {
+      Preferences.debugDisplay = value;
+    }, Preferences.debugDisplay);
+    createPrefItemCheckbox('Auto Pause', 'Automatically pause the game when it loses focus', function(value:Bool):Void {
+      Preferences.autoPause = value;
+    }, Preferences.autoPause);
   }
 
   override function update(elapsed:Float):Void
   {
     super.update(elapsed);
 
-    if (controls.UI_DOWN_P && allowScrolling)
-    {
-      FunkinSound.playOnce(Paths.sound('scrollMenu'));
-      changeSelection(1);
-    }
-    else if (controls.UI_UP_P && allowScrolling)
-    {
-      FunkinSound.playOnce(Paths.sound('scrollMenu'));
-      changeSelection(-1);
-    }
+    // Indent the selected item.
+    // TODO: Only do this on menu change?
+    items.forEach(function(daItem:TextMenuItem) {
+      var thyOffset:Int = 0;
+      if (Std.isOfType(daItem, NumberPreferenceItem)) thyOffset = cast(daItem, NumberPreferenceItem).lefthandText.getWidth();
 
-    var selectedPref:PreferenceItem = prefs.members[curSelected];
-    selectedPref?.handleInput(elapsed);
-  }
-}
-
-class PreferenceItem extends FlxTypedSpriteGroup<FlxSprite>
-{
-  public var name:String = "";
-  public var description:String = "";
-
-  public function handleInput(elapsed:Float):Void {}
-
-  public function onSelect(isSelected:Bool):Void {}
-}
-
-class NumberedPreferenceItem extends PreferenceItem
-{
-  public var onChange:Float->Void;
-  public var changeRate:Float = 1.0;
-  public var changeDelay:Float = 0.1;
-
-  public var minValue(default, set):Null<Float>;
-
-  function set_minValue(value:Float):Float
-  {
-    minValue = value;
-    currentValue = currentValue;
-    return value;
-  }
-
-  public var maxValue(default, set):Null<Float>;
-
-  function set_maxValue(value:Float):Float
-  {
-    maxValue = value;
-    currentValue = currentValue;
-    return value;
-  }
-
-  public var currentValue(default, set):Float;
-
-  function set_currentValue(value:Float):Float
-  {
-    currentValue = FlxMath.bound(value, minValue, maxValue);
-    onChange(currentValue);
-    updateText();
-    return currentValue;
-  }
-
-  var valueText:AtlasText;
-  var preferenceText:AtlasText;
-
-  public function new(name:String, description:String, defaultValue:Float, onChange:Float->Void)
-  {
-    super();
-
-    this.valueText = new AtlasText(20, 30, '$defaultValue', AtlasFont.DEFAULT);
-    add(this.valueText);
-
-    this.preferenceText = new AtlasText(this.valueText.x + this.valueText.width + 30, 30, '$name', AtlasFont.BOLD);
-    add(this.preferenceText);
-
-    this.name = name;
-    this.description = description;
-    this.onChange = onChange;
-    this.currentValue = defaultValue;
-  }
-
-  var timeToWait:Float = 0;
-
-  public override function handleInput(elapsed:Float):Void
-  {
-    timeToWait -= elapsed;
-
-    if (timeToWait > 0)
-    {
-      return;
-    }
-
-    if (PlayerSettings.player1.controls.UI_RIGHT)
-    {
-      currentValue += changeRate;
-      timeToWait = changeDelay;
-      // FunkinSound.playOnce(Paths.sound('scrollMenu'));
-    }
-    else if (PlayerSettings.player1.controls.UI_LEFT)
-    {
-      currentValue -= changeRate;
-      timeToWait = changeDelay;
-      // FunkinSound.playOnce(Paths.sound('scrollMenu'));
-    }
-  }
-
-  var isSelected:Bool = false;
-
-  public override function onSelect(isSelected:Bool):Void
-  {
-    this.isSelected = isSelected;
-    if (isSelected)
-    {
-      preferenceText.x = valueText.x + valueText.width + 60;
-      preferenceText.alpha = 1.0;
-    }
-    else
-    {
-      preferenceText.x = valueText.x + valueText.width + 30;
-      preferenceText.alpha = 0.6;
-    }
-  }
-
-  function updateText():Void
-  {
-    valueText.text = '$currentValue';
-    preferenceText.x = valueText.x + valueText.width + (isSelected ? 60 : 30);
-  }
-}
-
-class CheckboxPreferenceItem extends PreferenceItem
-{
-  public var onChange:Bool->Void;
-
-  public var currentValue(default, set):Bool;
-
-  function set_currentValue(value:Bool):Bool
-  {
-    if (value)
-    {
-      checkBox.animation.play('checked', true);
-      checkBox.offset.set(17, 70);
-    }
-    else
-    {
-      checkBox.animation.play('static');
-      checkBox.offset.set();
-    }
-    currentValue = value;
-    onChange(value);
-    return value;
-  }
-
-  var checkBox:FlxSprite;
-  var preferenceText:AtlasText;
-
-  public function new(name:String, description:String, defaultValue:Bool, onChange:Bool->Void)
-  {
-    super();
-
-    this.checkBox = new FlxSprite();
-    this.checkBox.frames = Paths.getSparrowAtlas('checkboxThingie');
-    this.checkBox.animation.addByPrefix('static', 'Check Box unselected', 24, false);
-    this.checkBox.animation.addByPrefix('checked', 'Check Box selecting animation', 24, false);
-    this.checkBox.setGraphicSize(Std.int(this.checkBox.width * 0.7));
-    this.checkBox.updateHitbox();
-    add(this.checkBox);
-
-    this.preferenceText = new AtlasText(120, 30, '$name', AtlasFont.BOLD);
-    add(this.preferenceText);
-
-    this.name = name;
-    this.description = description;
-    this.onChange = onChange;
-    this.currentValue = defaultValue;
-  }
-
-  var isAccepting:Bool = false;
-
-  public override function handleInput(elapsed:Float):Void
-  {
-    if (PlayerSettings.player1.controls.ACCEPT && !isAccepting)
-    {
-      isAccepting = true;
-      PreferencesMenu.allowScrolling = false;
-      FunkinSound.playOnce(Paths.sound('confirmMenu'));
-      FlxFlicker.flicker(preferenceText, 1, 0.06, true, false, function(_) {
-        isAccepting = false;
-        PreferencesMenu.allowScrolling = true;
-        currentValue = !currentValue;
-      });
-    }
-  }
-
-  public override function onSelect(isSelected:Bool):Void
-  {
-    if (isSelected)
-    {
-      preferenceText.x = 150;
-      preferenceText.alpha = 1.0;
-    }
-    else
-    {
-      preferenceText.alpha = 0.6;
-      preferenceText.x = 120;
-    }
+      // Very messy but it works
+      if (thyOffset == 0)
+      {
+        if (items.selectedItem == daItem) thyOffset += 150;
+        else
+          thyOffset += 120;
+      }
+      else if (items.selectedItem == daItem)
+      {
+        thyOffset += 70;
+      }
+      else
+      {
+        thyOffset += 25;
+      }
+
+      daItem.x = thyOffset;
+    });
+  }
+
+  function createPrefItemCheckbox(prefName:String, prefDesc:String, onChange:Bool->Void, defaultValue:Bool):Void
+  {
+    var checkbox:CheckboxPreferenceItem = new CheckboxPreferenceItem(0, 120 * (items.length - 1 + 1), defaultValue);
+
+    items.createItem(120, (120 * items.length) + 30, prefName, AtlasFont.BOLD, function() {
+      var value = !checkbox.currentValue;
+      onChange(value);
+      checkbox.currentValue = value;
+    });
+
+    preferenceItems.add(checkbox);
+  }
+
+  function createPrefItemNumber(prefName:String, prefDesc:String, onChange:Float->Void, defaultValue:Float, min:Float, max:Float, step:Float,
+      precision:Int):Void
+  {
+    var item = new NumberPreferenceItem(145, (120 * items.length) + 30, prefName, defaultValue, min, max, step, precision, onChange);
+    items.addItem(prefName, item);
+    preferenceItems.add(item.lefthandText);
   }
 }
diff --git a/source/funkin/ui/options/items/CheckboxPreferenceItem.hx b/source/funkin/ui/options/items/CheckboxPreferenceItem.hx
new file mode 100644
index 000000000..88c4fb6b0
--- /dev/null
+++ b/source/funkin/ui/options/items/CheckboxPreferenceItem.hx
@@ -0,0 +1,49 @@
+package funkin.ui.options.items;
+
+import flixel.FlxSprite.FlxSprite;
+
+class CheckboxPreferenceItem extends FlxSprite
+{
+  public var currentValue(default, set):Bool;
+
+  public function new(x:Float, y:Float, defaultValue:Bool = false)
+  {
+    super(x, y);
+
+    frames = Paths.getSparrowAtlas('checkboxThingie');
+    animation.addByPrefix('static', 'Check Box unselected', 24, false);
+    animation.addByPrefix('checked', 'Check Box selecting animation', 24, false);
+
+    setGraphicSize(Std.int(width * 0.7));
+    updateHitbox();
+
+    this.currentValue = defaultValue;
+  }
+
+  override function update(elapsed:Float)
+  {
+    super.update(elapsed);
+
+    switch (animation.curAnim.name)
+    {
+      case 'static':
+        offset.set();
+      case 'checked':
+        offset.set(17, 70);
+    }
+  }
+
+  function set_currentValue(value:Bool):Bool
+  {
+    if (value)
+    {
+      animation.play('checked', true);
+    }
+    else
+    {
+      animation.play('static');
+    }
+
+    return currentValue = value;
+  }
+}
diff --git a/source/funkin/ui/options/items/NumberPreferenceItem.hx b/source/funkin/ui/options/items/NumberPreferenceItem.hx
new file mode 100644
index 000000000..795b6c994
--- /dev/null
+++ b/source/funkin/ui/options/items/NumberPreferenceItem.hx
@@ -0,0 +1,107 @@
+package funkin.ui.options.items;
+
+import funkin.ui.TextMenuList;
+import funkin.ui.AtlasText;
+import funkin.input.Controls;
+
+/**
+ * Preference item that allows the player to pick a value between min and max
+ */
+class NumberPreferenceItem extends TextMenuItem
+{
+  function controls():Controls
+  {
+    return PlayerSettings.player1.controls;
+  }
+
+  public var lefthandText:AtlasText;
+
+  public var currentValue:Float;
+  public var min:Float;
+  public var max:Float;
+  public var step:Float;
+  public var precision:Int;
+  public var onChangeCallback:Null<Float->Void>;
+
+  public function new(x:Float, y:Float, name:String, defaultValue:Float, min:Float, max:Float, step:Float, precision:Int, ?callback:Float->Void):Void
+  {
+    super(x, y, name, function() {
+      callback(this.currentValue);
+    });
+    lefthandText = new AtlasText(20, y, formatted(defaultValue), AtlasFont.DEFAULT);
+
+    updateHitbox();
+
+    this.currentValue = defaultValue;
+    this.min = min;
+    this.max = max;
+    this.step = step;
+    this.precision = precision;
+    this.onChangeCallback = callback;
+  }
+
+  static final HOLD_DELAY:Float = 0.5; // seconds
+  static final CHANGE_RATE:Float = 0.02; // seconds
+
+  var holdDelayTimer:Float = HOLD_DELAY; // seconds
+  var changeRateTimer:Float = 0.0; // seconds
+
+  override function update(elapsed:Float):Void
+  {
+    super.update(elapsed);
+
+    // var fancyTextFancyColor:Color;
+    if (selected)
+    {
+      holdDelayTimer -= elapsed;
+      if (holdDelayTimer <= 0.0)
+      {
+        changeRateTimer -= elapsed;
+      }
+
+      var jpLeft:Bool = controls().UI_LEFT_P;
+      var jpRight:Bool = controls().UI_RIGHT_P;
+
+      if (jpLeft || jpRight)
+      {
+        holdDelayTimer = HOLD_DELAY;
+        changeRateTimer = 0.0;
+      }
+
+      var shouldDecrease:Bool = jpLeft;
+      var shouldIncrease:Bool = jpRight;
+
+      if (controls().UI_LEFT && holdDelayTimer <= 0.0 && changeRateTimer <= 0.0)
+      {
+        shouldDecrease = true;
+        changeRateTimer = CHANGE_RATE;
+      }
+      else if (controls().UI_RIGHT && holdDelayTimer <= 0.0 && changeRateTimer <= 0.0)
+      {
+        shouldIncrease = true;
+        changeRateTimer = CHANGE_RATE;
+      }
+
+      if (shouldDecrease) currentValue -= step;
+      else if (shouldIncrease) currentValue += step;
+      currentValue = currentValue.clamp(min, max);
+      if (onChangeCallback != null && (shouldIncrease || shouldDecrease))
+      {
+        onChangeCallback(currentValue);
+      }
+    }
+
+    lefthandText.text = formatted(currentValue);
+  }
+
+  function formatted(value:Float):String
+  {
+    return '${toFixed(value)}';
+  }
+
+  function toFixed(value:Float):Float
+  {
+    var multiplier:Float = Math.pow(10, precision);
+    return Math.floor(value * multiplier) / multiplier;
+  }
+}

From f3e04114ebd7418bee7eeada80a57704a13a3cbb Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Tue, 25 Jun 2024 17:05:15 +0200
Subject: [PATCH 08/66] use new offsets

---
 source/funkin/ui/options/PreferencesMenu.hx   | 23 ++++++++++---------
 .../ui/options/items/NumberPreferenceItem.hx  |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index d03fe9073..d004a46c7 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -84,22 +84,23 @@ class PreferencesMenu extends Page
     // TODO: Only do this on menu change?
     items.forEach(function(daItem:TextMenuItem) {
       var thyOffset:Int = 0;
-      if (Std.isOfType(daItem, NumberPreferenceItem)) thyOffset = cast(daItem, NumberPreferenceItem).lefthandText.getWidth();
+      // Initializing thy text width (if thou text present)
+      var thyTextWidth:Int = 0;
+      if (Std.isOfType(daItem, NumberPreferenceItem)) thyTextWidth = cast(daItem, NumberPreferenceItem).lefthandText.getWidth();
 
-      // Very messy but it works
-      if (thyOffset == 0)
+      if (thyTextWidth != 0)
       {
-        if (items.selectedItem == daItem) thyOffset += 150;
-        else
-          thyOffset += 120;
+        // Magic number because of the weird offset thats being added by default
+        thyOffset += thyTextWidth - 75;
       }
-      else if (items.selectedItem == daItem)
+
+      if (items.selectedItem == daItem)
       {
-        thyOffset += 70;
+        thyOffset += 150;
       }
       else
       {
-        thyOffset += 25;
+        thyOffset += 120;
       }
 
       daItem.x = thyOffset;
@@ -110,7 +111,7 @@ class PreferencesMenu extends Page
   {
     var checkbox:CheckboxPreferenceItem = new CheckboxPreferenceItem(0, 120 * (items.length - 1 + 1), defaultValue);
 
-    items.createItem(120, (120 * items.length) + 30, prefName, AtlasFont.BOLD, function() {
+    items.createItem(0, (120 * items.length) + 30, prefName, AtlasFont.BOLD, function() {
       var value = !checkbox.currentValue;
       onChange(value);
       checkbox.currentValue = value;
@@ -122,7 +123,7 @@ class PreferencesMenu extends Page
   function createPrefItemNumber(prefName:String, prefDesc:String, onChange:Float->Void, defaultValue:Float, min:Float, max:Float, step:Float,
       precision:Int):Void
   {
-    var item = new NumberPreferenceItem(145, (120 * items.length) + 30, prefName, defaultValue, min, max, step, precision, onChange);
+    var item = new NumberPreferenceItem(0, (120 * items.length) + 30, prefName, defaultValue, min, max, step, precision, onChange);
     items.addItem(prefName, item);
     preferenceItems.add(item.lefthandText);
   }
diff --git a/source/funkin/ui/options/items/NumberPreferenceItem.hx b/source/funkin/ui/options/items/NumberPreferenceItem.hx
index 795b6c994..eeea3112e 100644
--- a/source/funkin/ui/options/items/NumberPreferenceItem.hx
+++ b/source/funkin/ui/options/items/NumberPreferenceItem.hx
@@ -28,7 +28,7 @@ class NumberPreferenceItem extends TextMenuItem
     super(x, y, name, function() {
       callback(this.currentValue);
     });
-    lefthandText = new AtlasText(20, y, formatted(defaultValue), AtlasFont.DEFAULT);
+    lefthandText = new AtlasText(15, y, formatted(defaultValue), AtlasFont.DEFAULT);
 
     updateHitbox();
 

From 927e37b35bda92888f0c0b47256884a0285cadd3 Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Tue, 2 Jul 2024 17:18:46 +0200
Subject: [PATCH 09/66] use new numberpreferenceitem

---
 source/funkin/ui/options/PreferencesMenu.hx   |  8 +--
 .../ui/options/items/NumberPreferenceItem.hx  | 55 ++++++++++++++-----
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index d004a46c7..80dad0241 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -54,7 +54,7 @@ class PreferencesMenu extends Page
     #if !web
     createPrefItemNumber('FPS', 'The framerate that the game is running on', function(value:Float) {
       Preferences.framerate = Std.int(value);
-    }, Preferences.framerate, 60, 360, 1, 0);
+    }, null, Preferences.framerate, 60, 360, 1, 0);
     #end
     createPrefItemCheckbox('Naughtyness', 'Toggle displaying raunchy content', function(value:Bool):Void {
       Preferences.naughtyness = value;
@@ -120,10 +120,10 @@ class PreferencesMenu extends Page
     preferenceItems.add(checkbox);
   }
 
-  function createPrefItemNumber(prefName:String, prefDesc:String, onChange:Float->Void, defaultValue:Float, min:Float, max:Float, step:Float,
-      precision:Int):Void
+  function createPrefItemNumber(prefName:String, prefDesc:String, onChange:Float->Void, ?valueFormatter:Float->String, defaultValue:Int, min:Int, max:Int,
+      step:Float = 0.1, precision:Int):Void
   {
-    var item = new NumberPreferenceItem(0, (120 * items.length) + 30, prefName, defaultValue, min, max, step, precision, onChange);
+    var item = new NumberPreferenceItem(0, (120 * items.length) + 30, prefName, defaultValue, min, max, step, precision, onChange, valueFormatter);
     items.addItem(prefName, item);
     preferenceItems.add(item.lefthandText);
   }
diff --git a/source/funkin/ui/options/items/NumberPreferenceItem.hx b/source/funkin/ui/options/items/NumberPreferenceItem.hx
index eeea3112e..f3cd3cd46 100644
--- a/source/funkin/ui/options/items/NumberPreferenceItem.hx
+++ b/source/funkin/ui/options/items/NumberPreferenceItem.hx
@@ -14,16 +14,35 @@ class NumberPreferenceItem extends TextMenuItem
     return PlayerSettings.player1.controls;
   }
 
+  // Widgets
   public var lefthandText:AtlasText;
 
+  // Constants
+  static final HOLD_DELAY:Float = 0.3; // seconds
+  static final CHANGE_RATE:Float = 0.08; // seconds
+
+  // Constructor-initialized variables
   public var currentValue:Float;
   public var min:Float;
   public var max:Float;
   public var step:Float;
   public var precision:Int;
   public var onChangeCallback:Null<Float->Void>;
+  public var valueFormatter:Null<Float->String>;
 
-  public function new(x:Float, y:Float, name:String, defaultValue:Float, min:Float, max:Float, step:Float, precision:Int, ?callback:Float->Void):Void
+  // Variables
+  var holdDelayTimer:Float = HOLD_DELAY; // seconds
+  var changeRateTimer:Float = 0.0; // seconds
+
+  /**
+   * @param min Minimum value (example: 0)
+   * @param max Maximum value (example: 100)
+   * @param step The value to increment/decrement by (example: 10)
+   * @param callback Will get called every time the user changes the setting; use this to apply/save the setting.
+   * @param valueFormatter Will get called every time the game needs to display the float value; use this to change how the displayed string looks
+   */
+  public function new(x:Float, y:Float, name:String, defaultValue:Float, min:Float, max:Float, step:Float, precision:Int, ?callback:Float->Void,
+      ?valueFormatter:Float->String):Void
   {
     super(x, y, name, function() {
       callback(this.currentValue);
@@ -38,14 +57,9 @@ class NumberPreferenceItem extends TextMenuItem
     this.step = step;
     this.precision = precision;
     this.onChangeCallback = callback;
+    this.valueFormatter = valueFormatter;
   }
 
-  static final HOLD_DELAY:Float = 0.5; // seconds
-  static final CHANGE_RATE:Float = 0.02; // seconds
-
-  var holdDelayTimer:Float = HOLD_DELAY; // seconds
-  var changeRateTimer:Float = 0.0; // seconds
-
   override function update(elapsed:Float):Void
   {
     super.update(elapsed);
@@ -82,21 +96,36 @@ class NumberPreferenceItem extends TextMenuItem
         changeRateTimer = CHANGE_RATE;
       }
 
-      if (shouldDecrease) currentValue -= step;
-      else if (shouldIncrease) currentValue += step;
-      currentValue = currentValue.clamp(min, max);
-      if (onChangeCallback != null && (shouldIncrease || shouldDecrease))
+      // Actually increasing/decreasing the value
+      if (shouldDecrease)
       {
-        onChangeCallback(currentValue);
+        var isBelowMin:Bool = currentValue - step < min;
+        currentValue = (currentValue - step).clamp(min, max);
+        if (onChangeCallback != null && !isBelowMin) onChangeCallback(currentValue);
+      }
+      else if (shouldIncrease)
+      {
+        var isAboveMax:Bool = currentValue + step > max;
+        currentValue = (currentValue + step).clamp(min, max);
+        if (onChangeCallback != null && !isAboveMax) onChangeCallback(currentValue);
       }
     }
 
     lefthandText.text = formatted(currentValue);
   }
 
+  /** Turns the float into a string */
   function formatted(value:Float):String
   {
-    return '${toFixed(value)}';
+    var float:Float = toFixed(value);
+    if (valueFormatter != null)
+    {
+      return valueFormatter(float);
+    }
+    else
+    {
+      return '${float}';
+    }
   }
 
   function toFixed(value:Float):Float

From 77346696f834fa7e628c19c50e0f5e9d974cff33 Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Sat, 7 Sep 2024 19:49:08 +0200
Subject: [PATCH 10/66] Update MusicBeatSubState.hx

---
 source/funkin/ui/MusicBeatSubState.hx | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/source/funkin/ui/MusicBeatSubState.hx b/source/funkin/ui/MusicBeatSubState.hx
index 9035d12ff..614961d70 100644
--- a/source/funkin/ui/MusicBeatSubState.hx
+++ b/source/funkin/ui/MusicBeatSubState.hx
@@ -37,17 +37,25 @@ class MusicBeatSubState extends FlxSubState implements IEventHandler
     return _conductorInUse = value;
   }
 
-  public function new(bgColor:FlxColor = FlxColor.TRANSPARENT)
-  {
-    super();
-    this.bgColor = bgColor;
-  }
-
   var controls(get, never):Controls;
 
   inline function get_controls():Controls
     return PlayerSettings.player1.controls;
 
+  public function new(bgColor:FlxColor = FlxColor.TRANSPARENT)
+  {
+    super();
+    this.bgColor = bgColor;
+
+    initCallbacks();
+  }
+
+  function initCallbacks()
+  {
+    subStateOpened.add(onOpenSubStateComplete);
+    subStateClosed.add(onCloseSubStateComplete);
+  }
+
   override function create():Void
   {
     super.create();

From 178389ea0bd00bb7d1822abaff2aa3524f3f3f61 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 12 Sep 2024 23:28:43 -0400
Subject: [PATCH 11/66] Fix two song credits

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index bc7009b42..c3041be56 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit bc7009b4242691faa5c4552f7ca8a2f28e8cb1d2
+Subproject commit c3041be56396cda92f87d071f74d36113ed25e1f

From 3fba55a4229139de0f64925f2bfc77ce1f689b0f Mon Sep 17 00:00:00 2001
From: FabsTheFabs <flamingkitty24@gmail.com>
Date: Fri, 13 Sep 2024 21:36:20 +0100
Subject: [PATCH 12/66] assets submod

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 8762fd51c..eaab81b1a 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 8762fd51c26abdc9a45657eab9018aa48e972cd6
+Subproject commit eaab81b1a76d18f356cf0a38f3feed463aed28cb

From 517984d1200f0fe43a7a7bec4bd62cd6032a8997 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Fri, 13 Sep 2024 18:46:49 -0400
Subject: [PATCH 13/66] Fix a bug where Shit judgement would always display
 with anti-aliasing.

---
 source/funkin/play/notes/notestyle/NoteStyle.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/play/notes/notestyle/NoteStyle.hx b/source/funkin/play/notes/notestyle/NoteStyle.hx
index ee07703f1..83aae6fcf 100644
--- a/source/funkin/play/notes/notestyle/NoteStyle.hx
+++ b/source/funkin/play/notes/notestyle/NoteStyle.hx
@@ -575,7 +575,7 @@ class NoteStyle implements IRegistryEntry<NoteStyleData>
         var result = _data.assets.judgementBad?.isPixel;
         if (result == null && fallback != null) result = fallback.isJudgementSpritePixel(rating);
         return result ?? false;
-      case "GO":
+      case "shit":
         var result = _data.assets.judgementShit?.isPixel;
         if (result == null && fallback != null) result = fallback.isJudgementSpritePixel(rating);
         return result ?? false;

From df87d677e1b155049bc254904a965989b53fa160 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sat, 14 Sep 2024 17:00:41 -0400
Subject: [PATCH 14/66] Typo lol

---
 source/funkin/modding/PolymodHandler.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/modding/PolymodHandler.hx b/source/funkin/modding/PolymodHandler.hx
index 75c69e506..e0b27e744 100644
--- a/source/funkin/modding/PolymodHandler.hx
+++ b/source/funkin/modding/PolymodHandler.hx
@@ -258,7 +258,7 @@ class PolymodHandler
     Polymod.blacklistImport('cpp.Lib');
 
     // `Unserializer`
-    // Unserializerr.DEFAULT_RESOLVER.resolveClass() can access blacklisted packages
+    // Unserializer.DEFAULT_RESOLVER.resolveClass() can access blacklisted packages
     Polymod.blacklistImport('Unserializer');
 
     // `lime.system.CFFI`

From 688abb557134d6b786628c206db126cfcba6d579 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sat, 14 Sep 2024 20:25:45 -0400
Subject: [PATCH 15/66] Update example mod's API version so it actually loads.

---
 example_mods/introMod/_polymod_meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example_mods/introMod/_polymod_meta.json b/example_mods/introMod/_polymod_meta.json
index 4dc0cd804..74c4a2504 100644
--- a/example_mods/introMod/_polymod_meta.json
+++ b/example_mods/introMod/_polymod_meta.json
@@ -6,7 +6,7 @@
       "name": "EliteMasterEric"
     }
   ],
-  "api_version": "0.1.0",
+  "api_version": "0.5.0",
   "mod_version": "1.0.0",
   "license": "Apache-2.0"
 }

From d5c7e4ffdb0076d1c54ee9e9703fb0a3a682fd96 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sat, 14 Sep 2024 20:26:19 -0400
Subject: [PATCH 16/66] Fix bug where Pico would become locked on every game
 restart.

---
 source/funkin/save/Save.hx                 | 20 +++++++---
 source/funkin/save/changelog.md            |  6 +++
 source/funkin/ui/mainmenu/MainMenuState.hx | 43 ++++++++++++----------
 source/funkin/ui/title/TitleState.hx       |  5 ---
 4 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx
index 2bbda15c0..eb9f6005e 100644
--- a/source/funkin/save/Save.hx
+++ b/source/funkin/save/Save.hx
@@ -17,7 +17,7 @@ import thx.semver.Version;
 @:nullSafety
 class Save
 {
-  public static final SAVE_DATA_VERSION:thx.semver.Version = "2.0.5";
+  public static final SAVE_DATA_VERSION:thx.semver.Version = "2.0.4";
   public static final SAVE_DATA_VERSION_RULE:thx.semver.VersionRule = "2.0.x";
 
   // We load this version's saves from a new save path, to maintain SOME level of backwards compatibility.
@@ -34,19 +34,19 @@ class Save
   {
     if (_instance == null)
     {
-      _instance = new Save(FlxG.save.data);
+      return _instance = load();
     }
     return _instance;
   }
 
   var data:RawSaveData;
 
-  public static function load():Void
+  public static function load():Save
   {
     trace("[SAVE] Loading save...");
 
     // Bind save data.
-    loadFromSlot(1);
+    return loadFromSlot(1);
   }
 
   /**
@@ -65,7 +65,9 @@ class Save
   public static function getDefault():RawSaveData
   {
     return {
-      version: Save.SAVE_DATA_VERSION,
+      // Version number is an abstract(Array) internally.
+      // This means it copies by reference, so merging save data overides the version number lol.
+      version: thx.Dynamics.clone(Save.SAVE_DATA_VERSION),
 
       volume: 1.0,
       mute: false,
@@ -433,7 +435,9 @@ class Save
   {
     if (!data.unlocks.charactersSeen.contains(character))
     {
+      trace('Character seen: ' + character);
       data.unlocks.charactersSeen.push(character);
+      trace('New characters seen list: ' + data.unlocks.charactersSeen);
       flush();
     }
   }
@@ -832,7 +836,7 @@ class Save
    * If you set slot to `2`, it will load an independe
    * @param slot
    */
-  static function loadFromSlot(slot:Int):Void
+  static function loadFromSlot(slot:Int):Save
   {
     trace("[SAVE] Loading save from slot " + slot + "...");
 
@@ -850,12 +854,14 @@ class Save
         trace('[SAVE] Found legacy save data, converting...');
         var gameSave = SaveDataMigrator.migrateFromLegacy(legacySaveData);
         FlxG.save.mergeData(gameSave.data, true);
+        return gameSave;
       }
       else
       {
         trace('[SAVE] No legacy save data found.');
         var gameSave = new Save();
         FlxG.save.mergeData(gameSave.data, true);
+        return gameSave;
       }
     }
     else
@@ -863,6 +869,8 @@ class Save
       trace('[SAVE] Found existing save data.');
       var gameSave = SaveDataMigrator.migrate(FlxG.save.data);
       FlxG.save.mergeData(gameSave.data, true);
+
+      return gameSave;
     }
   }
 
diff --git a/source/funkin/save/changelog.md b/source/funkin/save/changelog.md
index e3038373d..41d6e68ae 100644
--- a/source/funkin/save/changelog.md
+++ b/source/funkin/save/changelog.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.4] - 2024-09-12
+Note to self: Only update to 2.1.0 when migration is needed.
+### Added
+- `unlocks.charactersSeen:Array<String>` to `Save`
+- `unlocks.oldChar:Bool` to `Save`
+
 ## [2.0.5] - 2024-05-21
 ### Fixed
 - Resolved an issue where HTML5 wouldn't store the semantic version properly, causing the game to fail to load the save.
diff --git a/source/funkin/ui/mainmenu/MainMenuState.hx b/source/funkin/ui/mainmenu/MainMenuState.hx
index 13d68da6d..a436848d2 100644
--- a/source/funkin/ui/mainmenu/MainMenuState.hx
+++ b/source/funkin/ui/mainmenu/MainMenuState.hx
@@ -356,7 +356,7 @@ class MainMenuState extends MusicBeatState
     #if FEATURE_DEBUG_FUNCTIONS
     // Ctrl+Alt+Shift+P = Character Unlock screen
     // Ctrl+Alt+Shift+W = Meet requirements for Pico Unlock
-    // Ctrl+Alt+Shift+L = Revoke requirements for Pico Unlock
+    // Ctrl+Alt+Shift+M = Revoke requirements for Pico Unlock
     // Ctrl+Alt+Shift+R = Score/Rank conflict test
     // Ctrl+Alt+Shift+N = Mark all characters as not seen
     // Ctrl+Alt+Shift+E = Dump save data
@@ -369,7 +369,7 @@ class MainMenuState extends MusicBeatState
     if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.ALT && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.W)
     {
       FunkinSound.playOnce(Paths.sound('confirmMenu'));
-      // Give the user a score of 1 point on Weekend 1 story mode.
+      // Give the user a score of 1 point on Weekend 1 story mode (Easy difficulty).
       // This makes the level count as cleared and displays the songs in Freeplay.
       funkin.save.Save.instance.setLevelScore('weekend1', 'easy',
         {
@@ -389,27 +389,30 @@ class MainMenuState extends MusicBeatState
         });
     }
 
-    if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.ALT && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.L)
+    if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.ALT && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.M)
     {
       FunkinSound.playOnce(Paths.sound('confirmMenu'));
-      // Give the user a score of 0 points on Weekend 1 story mode.
+      // Give the user a score of 0 points on Weekend 1 story mode (all difficulties).
       // This makes the level count as uncleared and no longer displays the songs in Freeplay.
-      funkin.save.Save.instance.setLevelScore('weekend1', 'easy',
-        {
-          score: 1,
-          tallies:
-            {
-              sick: 0,
-              good: 0,
-              bad: 0,
-              shit: 0,
-              missed: 0,
-              combo: 0,
-              maxCombo: 0,
-              totalNotesHit: 0,
-              totalNotes: 0,
-            }
-        });
+      for (diff in ['easy', 'normal', 'hard'])
+      {
+        funkin.save.Save.instance.setLevelScore('weekend1', diff,
+          {
+            score: 0,
+            tallies:
+              {
+                sick: 0,
+                good: 0,
+                bad: 0,
+                shit: 0,
+                missed: 0,
+                combo: 0,
+                maxCombo: 0,
+                totalNotesHit: 0,
+                totalNotes: 0,
+              }
+          });
+      }
     }
 
     if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.ALT && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.R)
diff --git a/source/funkin/ui/title/TitleState.hx b/source/funkin/ui/title/TitleState.hx
index f5c641d0c..10e7dfaae 100644
--- a/source/funkin/ui/title/TitleState.hx
+++ b/source/funkin/ui/title/TitleState.hx
@@ -273,11 +273,6 @@ class TitleState extends MusicBeatState
     }
     #end
 
-    if (Save.instance.charactersSeen.contains("pico"))
-    {
-      Save.instance.charactersSeen.remove("pico");
-      Save.instance.oldChar = false;
-    }
     Conductor.instance.update();
 
     /* if (FlxG.onMobile)

From fd6ca6e267d5ffbbb63f9e01e7ca92935a6785f4 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sat, 14 Sep 2024 20:26:33 -0400
Subject: [PATCH 17/66] Remove some spammy log traces.

---
 source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx | 2 +-
 source/funkin/ui/charSelect/CharSelectPlayer.hx       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx
index 952fa8b71..7ea97e39b 100644
--- a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx
+++ b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx
@@ -184,7 +184,7 @@ class FlxAtlasSprite extends FlxAnimate
 
     // Move to the first frame of the animation.
     // goToFrameLabel(id);
-    trace('Playing animation $id');
+    // trace('Playing animation $id');
     if ((id == null || id == "") || this.anim.symbolDictionary.exists(id) || (this.anim.getByName(id) != null))
     {
       this.anim.play(id, restart, false, startFrame);
diff --git a/source/funkin/ui/charSelect/CharSelectPlayer.hx b/source/funkin/ui/charSelect/CharSelectPlayer.hx
index b6319f16d..1eef52bed 100644
--- a/source/funkin/ui/charSelect/CharSelectPlayer.hx
+++ b/source/funkin/ui/charSelect/CharSelectPlayer.hx
@@ -47,7 +47,6 @@ class CharSelectPlayer extends FlxAtlasSprite implements IBPMSyncedScriptedClass
     //
     if (getCurrentAnimation() == "idle")
     {
-      trace('Player beat hit');
       playAnimation("idle", true, false, false);
     }
   };

From e23a85682a89c049c41cd0b67e434fcce6cc0b29 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sat, 14 Sep 2024 20:26:39 -0400
Subject: [PATCH 18/66] Update some script files.

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index bc7009b42..616551146 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit bc7009b4242691faa5c4552f7ca8a2f28e8cb1d2
+Subproject commit 61655114603807b651109af282c2e2aefa9dccf2

From 9f3af1ab944d41ba56edc7336b6b795fdae89c32 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sat, 14 Sep 2024 20:56:21 -0400
Subject: [PATCH 19/66] Add a separate Gold Perfect animation for modders

---
 assets                                                    | 2 +-
 source/funkin/data/freeplay/player/PlayerData.hx          | 1 +
 source/funkin/ui/freeplay/charselect/PlayableCharacter.hx | 4 +++-
 source/funkin/util/Constants.hx                           | 4 ----
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/assets b/assets
index bc7009b42..ef7386d74 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit bc7009b4242691faa5c4552f7ca8a2f28e8cb1d2
+Subproject commit ef7386d741e715bd809c913a7d50dfa7b8176e2d
diff --git a/source/funkin/data/freeplay/player/PlayerData.hx b/source/funkin/data/freeplay/player/PlayerData.hx
index de293c24e..867fe7113 100644
--- a/source/funkin/data/freeplay/player/PlayerData.hx
+++ b/source/funkin/data/freeplay/player/PlayerData.hx
@@ -270,6 +270,7 @@ typedef PlayerResultsData =
 {
   var music:PlayerResultsMusicData;
 
+  var perfectGold:Array<PlayerResultsAnimationData>;
   var perfect:Array<PlayerResultsAnimationData>;
   var excellent:Array<PlayerResultsAnimationData>;
   var great:Array<PlayerResultsAnimationData>;
diff --git a/source/funkin/ui/freeplay/charselect/PlayableCharacter.hx b/source/funkin/ui/freeplay/charselect/PlayableCharacter.hx
index 93d643ae4..408a91672 100644
--- a/source/funkin/ui/freeplay/charselect/PlayableCharacter.hx
+++ b/source/funkin/ui/freeplay/charselect/PlayableCharacter.hx
@@ -113,7 +113,9 @@ class PlayableCharacter implements IRegistryEntry<PlayerData>
 
     switch (rank)
     {
-      case PERFECT | PERFECT_GOLD:
+      case PERFECT_GOLD:
+        return _data.results.perfectGold;
+      case PERFECT:
         return _data.results.perfect;
       case EXCELLENT:
         return _data.results.excellent;
diff --git a/source/funkin/util/Constants.hx b/source/funkin/util/Constants.hx
index 57fc484b8..cf58d191a 100644
--- a/source/funkin/util/Constants.hx
+++ b/source/funkin/util/Constants.hx
@@ -481,10 +481,6 @@ class Constants
   public static final JUDGEMENT_BAD_COMBO_BREAK:Bool = true;
   public static final JUDGEMENT_SHIT_COMBO_BREAK:Bool = true;
 
-  // % Sick
-  public static final RANK_PERFECT_PLAT_THRESHOLD:Float = 1.0; // % Sick
-  public static final RANK_PERFECT_GOLD_THRESHOLD:Float = 0.85; // % Sick
-
   // % Hit
   public static final RANK_PERFECT_THRESHOLD:Float = 1.00;
   public static final RANK_EXCELLENT_THRESHOLD:Float = 0.90;

From 16aff6e7c35152c4b3fd86ec73fc798b75847016 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sat, 14 Sep 2024 21:37:02 -0400
Subject: [PATCH 20/66] Fix bugs with highscore display in Freeplay

---
 source/funkin/ui/freeplay/FreeplayState.hx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index af0a9b841..15633ff9d 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -586,13 +586,13 @@ class FreeplayState extends MusicBeatSubState
       }
     };
 
-    exitMovers.set([fp, txtCompletion, fnfHighscoreSpr, txtCompletion, clearBoxSprite],
+    exitMovers.set([fp, txtCompletion, fnfHighscoreSpr, clearBoxSprite],
       {
         x: FlxG.width,
         speed: 0.3
       });
 
-    exitMoversCharSel.set([fp, txtCompletion, fnfHighscoreSpr, txtCompletion, clearBoxSprite],
+    exitMoversCharSel.set([fp, txtCompletion, fnfHighscoreSpr, clearBoxSprite],
       {
         y: -270,
         speed: 0.8,
@@ -1376,7 +1376,7 @@ class FreeplayState extends MusicBeatSubState
     #if FEATURE_DEBUG_FUNCTIONS
     if (FlxG.keys.justPressed.P)
     {
-      FlxG.switchState(FreeplayState.build(
+      FlxG.switchState(() -> FreeplayState.build(
         {
           {
             character: currentCharacterId == "pico" ? Constants.DEFAULT_CHARACTER : "pico",
@@ -1777,12 +1777,13 @@ class FreeplayState extends MusicBeatSubState
         FlxG.log.warn('WARN: could not find song with id (${daSong.songId})');
         return;
       }
-      var targetVariation:String = targetSong.getFirstValidVariation(currentDifficulty) ?? '';
+      var targetVariation:String = targetSong.getFirstValidVariation(currentDifficulty, currentCharacter) ?? '';
 
       // TODO: This line of code makes me sad, but you can't really fix it without a breaking migration.
       var suffixedDifficulty = (targetVariation != Constants.DEFAULT_VARIATION
         && targetVariation != 'erect') ? '$currentDifficulty-${targetVariation}' : currentDifficulty;
       var songScore:Null<SaveScoreData> = Save.instance.getSongScore(daSong.songId, suffixedDifficulty);
+      trace(songScore);
       intendedScore = songScore?.score ?? 0;
       intendedCompletion = songScore == null ? 0.0 : ((songScore.tallies.sick + songScore.tallies.good) / songScore.tallies.totalNotes);
       rememberedDifficulty = suffixedDifficulty;

From 367e3e90083f95a13a5b4e76339f2d4eac534203 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Mon, 16 Sep 2024 17:18:42 -0400
Subject: [PATCH 21/66] priv modules

---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index be5e0aaa8..ad8099e60 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "assets"]
 	path = assets
-	url = https://github.com/FunkinCrew/funkin.assets
+	url = https://github.com/FunkinCrew/Funkin-assets-secret
 [submodule "art"]
 	path = art
-	url = https://github.com/FunkinCrew/funkin.art
+	url = https://github.com/FunkinCrew/Funkin-art-secret

From 0b531c5b21931bc690ebe9f46d7111800e23704f Mon Sep 17 00:00:00 2001
From: Abnormal <86753001+AbnormalPoof@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:13:16 +0000
Subject: [PATCH 22/66] add getPath

---
 source/funkin/Assets.hx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/funkin/Assets.hx b/source/funkin/Assets.hx
index 5351676d4..05423c572 100644
--- a/source/funkin/Assets.hx
+++ b/source/funkin/Assets.hx
@@ -11,6 +11,11 @@ class Assets
     return openfl.utils.Assets.getText(path);
   }
 
+  public static function getPath(path:String):String
+  {
+    return openfl.utils.Assets.getPath(path);
+  }
+
   public static function getMusic(path:String):openfl.media.Sound
   {
     return openfl.utils.Assets.getMusic(path);

From 80fc0cd526d9dc22fe7c6afd141ee5c6814a3b84 Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Tue, 17 Sep 2024 00:16:27 +0200
Subject: [PATCH 23/66] Update Preferences.hx

---
 source/funkin/Preferences.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/funkin/Preferences.hx b/source/funkin/Preferences.hx
index 7a322283d..25bc32163 100644
--- a/source/funkin/Preferences.hx
+++ b/source/funkin/Preferences.hx
@@ -15,7 +15,7 @@ class Preferences
 
   static function get_framerate():Int
   {
-    #if web
+    #if (web || CHEEMS)
     return 60;
     #else
     return Save?.instance?.options?.framerate ?? 60;
@@ -24,7 +24,7 @@ class Preferences
 
   static function set_framerate(value:Int):Int
   {
-    #if web
+    #if (web || CHEEMS)
     return 60;
     #else
     var save:Save = Save.instance;

From 224d930ae6e7b41f8c79b19f842a9175374f87c9 Mon Sep 17 00:00:00 2001
From: lemz <ismael.amjad07@gmail.com>
Date: Tue, 17 Sep 2024 00:17:56 +0200
Subject: [PATCH 24/66] Update PreferencesMenu.hx

---
 source/funkin/ui/options/PreferencesMenu.hx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index ca18c45be..adbe1d356 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -6,8 +6,6 @@ import flixel.FlxSprite;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
 import funkin.ui.AtlasText.AtlasFont;
 import funkin.ui.options.OptionsState.Page;
-import funkin.ui.options.items.CheckboxPreferenceItem;
-import funkin.ui.options.items.NumberPreferenceItem;
 import funkin.graphics.FunkinCamera;
 import funkin.ui.TextMenuList.TextMenuItem;
 import funkin.audio.FunkinSound;

From 535ac0e5283ecd83866907920cac52444fcd0e9c Mon Sep 17 00:00:00 2001
From: Kade <26305836+Kade-github@users.noreply.github.com>
Date: Mon, 16 Sep 2024 15:25:13 -0700
Subject: [PATCH 25/66] add milliseconds to the playbar in charting state

remove laggy redundant traces

Revert "remove laggy redundant traces"

This reverts commit 204113840473dd5069f5d508d50e15e21104b45a.
---
 source/funkin/ui/debug/charting/ChartEditorState.hx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 811e08e5d..f778b11f3 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -5139,10 +5139,11 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     }
 
     var songPos:Float = Conductor.instance.songPosition + Conductor.instance.instrumentalOffset;
+    var songPosMilliseconds:String = Std.string(Math.floor(Math.abs(songPos) % 1000)).lpad('0', 2);
     var songPosSeconds:String = Std.string(Math.floor((Math.abs(songPos) / 1000) % 60)).lpad('0', 2);
     var songPosMinutes:String = Std.string(Math.floor((Math.abs(songPos) / 1000) / 60)).lpad('0', 2);
     if (songPos < 0) songPosMinutes = '-' + songPosMinutes;
-    var songPosString:String = '${songPosMinutes}:${songPosSeconds}';
+    var songPosString:String = '${songPosMinutes}:${songPosSeconds}:${songPosMilliseconds}';
 
     if (playbarSongPos.value != songPosString) playbarSongPos.value = songPosString;
 

From 5a877a14a0d468d0592be6edfaa21b05dc8b3ebf Mon Sep 17 00:00:00 2001
From: Kade <26305836+Kade-github@users.noreply.github.com>
Date: Mon, 16 Sep 2024 15:39:56 -0700
Subject: [PATCH 26/66] only show last two digits

digit
---
 source/funkin/ui/debug/charting/ChartEditorState.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index f778b11f3..024de8ec6 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -5139,7 +5139,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     }
 
     var songPos:Float = Conductor.instance.songPosition + Conductor.instance.instrumentalOffset;
-    var songPosMilliseconds:String = Std.string(Math.floor(Math.abs(songPos) % 1000)).lpad('0', 2);
+    var songPosMilliseconds:String = Std.string(Math.floor(Math.abs(songPos) % 1000)).lpad('0', 2).substr(0, 2);
     var songPosSeconds:String = Std.string(Math.floor((Math.abs(songPos) / 1000) % 60)).lpad('0', 2);
     var songPosMinutes:String = Std.string(Math.floor((Math.abs(songPos) / 1000) / 60)).lpad('0', 2);
     if (songPos < 0) songPosMinutes = '-' + songPosMinutes;

From 7d2b946e9c1f885af6ccc9a937ed5af4774d9599 Mon Sep 17 00:00:00 2001
From: Kade <26305836+Kade-github@users.noreply.github.com>
Date: Mon, 16 Sep 2024 16:42:53 -0700
Subject: [PATCH 27/66] depreciated screen X/Y to view X/Y

---
 .../ui/debug/charting/ChartEditorState.hx     | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 024de8ec6..c0c2e6309 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -700,7 +700,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
 
   function get_isCursorOverHaxeUI():Bool
   {
-    return Screen.instance.hasSolidComponentUnderPoint(FlxG.mouse.screenX, FlxG.mouse.screenY);
+    return Screen.instance.hasSolidComponentUnderPoint(FlxG.mouse.viewX, FlxG.mouse.viewY);
   }
 
   /**
@@ -3830,7 +3830,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
   function handleScrollKeybinds():Void
   {
     // Don't scroll when the user is interacting with the UI, unless a playbar button (the << >> ones) is pressed.
-    if ((isHaxeUIFocused || isCursorOverHaxeUI) && playbarButtonPressed == null) return;
+    if ((isHaxeUIFocused || isHaxeUIDialogOpen) && playbarButtonPressed == null) return;
 
     var scrollAmount:Float = 0; // Amount to scroll the grid.
     var playheadAmount:Float = 0; // Amount to scroll the playhead relative to the grid.
@@ -3840,7 +3840,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     // Handle scroll anchor
     if (scrollAnchorScreenPos != null)
     {
-      var currentScreenPos = new FlxPoint(FlxG.mouse.screenX, FlxG.mouse.screenY);
+      var currentScreenPos = new FlxPoint(FlxG.mouse.viewX, FlxG.mouse.viewX);
       var distance = currentScreenPos - scrollAnchorScreenPos;
 
       var verticalDistance = distance.y;
@@ -4121,8 +4121,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
       var overlapsRenderedEvents:Bool = FlxG.mouse.overlaps(renderedEvents);
 
       // Cursor position relative to the grid.
-      var cursorX:Float = FlxG.mouse.screenX - gridTiledSprite.x;
-      var cursorY:Float = FlxG.mouse.screenY - gridTiledSprite.y;
+      var cursorX:Float = FlxG.mouse.viewX - gridTiledSprite.x;
+      var cursorY:Float = FlxG.mouse.viewY - gridTiledSprite.y;
 
       var overlapsSelectionBorder:Bool = overlapsGrid
         && ((cursorX % 40) < (GRID_SELECTION_BORDER_WIDTH / 2)
@@ -4137,7 +4137,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
       {
         if (scrollAnchorScreenPos == null)
         {
-          scrollAnchorScreenPos = new FlxPoint(FlxG.mouse.screenX, FlxG.mouse.screenY);
+          scrollAnchorScreenPos = new FlxPoint(FlxG.mouse.viewX, FlxG.mouse.viewY);
           selectionBoxStartPos = null;
         }
         else
@@ -4159,11 +4159,11 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
         else if (notePreview != null && FlxG.mouse.overlaps(notePreview) && !isCursorOverHaxeUI)
         {
           // Clicked note preview
-          notePreviewScrollAreaStartPos = new FlxPoint(FlxG.mouse.screenX, FlxG.mouse.screenY);
+          notePreviewScrollAreaStartPos = new FlxPoint(FlxG.mouse.viewX, FlxG.mouse.viewY);
         }
         else if (!isCursorOverHaxeUI && (!overlapsGrid || overlapsSelectionBorder))
         {
-          selectionBoxStartPos = new FlxPoint(FlxG.mouse.screenX, FlxG.mouse.screenY);
+          selectionBoxStartPos = new FlxPoint(FlxG.mouse.viewX, FlxG.mouse.viewY);
           // Drawing selection box.
           targetCursorMode = Crosshair;
         }
@@ -4188,7 +4188,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
       {
         // Clicked on the playhead scroll area.
         // Move the playhead to the cursor position.
-        this.playheadPositionInPixels = FlxG.mouse.screenY - (GRID_INITIAL_Y_POS);
+        this.playheadPositionInPixels = FlxG.mouse.viewY - (GRID_INITIAL_Y_POS);
         moveSongToScrollPosition();
 
         // Cursor should be a grabby hand.
@@ -4313,27 +4313,27 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
             // Clicking and dragging.
 
             // Scroll the screen if the mouse is above or below the grid.
-            if (FlxG.mouse.screenY < MENU_BAR_HEIGHT)
+            if (FlxG.mouse.viewY < MENU_BAR_HEIGHT)
             {
               // Scroll up.
-              var diff:Float = MENU_BAR_HEIGHT - FlxG.mouse.screenY;
+              var diff:Float = MENU_BAR_HEIGHT - FlxG.mouse.viewY;
               scrollPositionInPixels -= diff * 0.5; // Too fast!
               moveSongToScrollPosition();
             }
-            else if (FlxG.mouse.screenY > (playbarHeadLayout?.y ?? 0.0))
+            else if (FlxG.mouse.viewY > (playbarHeadLayout?.y ?? 0.0))
             {
               // Scroll down.
-              var diff:Float = FlxG.mouse.screenY - (playbarHeadLayout?.y ?? 0.0);
+              var diff:Float = FlxG.mouse.viewY - (playbarHeadLayout?.y ?? 0.0);
               scrollPositionInPixels += diff * 0.5; // Too fast!
               moveSongToScrollPosition();
             }
 
             // Render the selection box.
             var selectionRect:FlxRect = new FlxRect();
-            selectionRect.x = Math.min(FlxG.mouse.screenX, selectionBoxStartPos.x);
-            selectionRect.y = Math.min(FlxG.mouse.screenY, selectionBoxStartPos.y);
-            selectionRect.width = Math.abs(FlxG.mouse.screenX - selectionBoxStartPos.x);
-            selectionRect.height = Math.abs(FlxG.mouse.screenY - selectionBoxStartPos.y);
+            selectionRect.x = Math.min(FlxG.mouse.viewX, selectionBoxStartPos.x);
+            selectionRect.y = Math.min(FlxG.mouse.viewY, selectionBoxStartPos.y);
+            selectionRect.width = Math.abs(FlxG.mouse.viewX - selectionBoxStartPos.x);
+            selectionRect.height = Math.abs(FlxG.mouse.viewY - selectionBoxStartPos.y);
             setSelectionBoxBounds(selectionRect);
 
             targetCursorMode = Crosshair;
@@ -4461,8 +4461,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
         // Player is clicking and holding on note preview to scrub around.
         targetCursorMode = Grabbing;
 
-        var clickedPosInPixels:Float = FlxMath.remapToRange(FlxG.mouse.screenY, (notePreview?.y ?? 0.0),
-          (notePreview?.y ?? 0.0) + (notePreview?.height ?? 0.0), 0, songLengthInPixels);
+        var clickedPosInPixels:Float = FlxMath.remapToRange(FlxG.mouse.viewY, (notePreview?.y ?? 0.0), (notePreview?.y ?? 0.0) + (notePreview?.height ?? 0.0),
+          0, songLengthInPixels);
 
         scrollPositionInPixels = clickedPosInPixels;
         moveSongToScrollPosition();
@@ -4520,17 +4520,17 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
           targetCursorMode = Grabbing;
 
           // Scroll the screen if the mouse is above or below the grid.
-          if (FlxG.mouse.screenY < MENU_BAR_HEIGHT)
+          if (FlxG.mouse.viewY < MENU_BAR_HEIGHT)
           {
             // Scroll up.
-            var diff:Float = MENU_BAR_HEIGHT - FlxG.mouse.screenY;
+            var diff:Float = MENU_BAR_HEIGHT - FlxG.mouse.viewY;
             scrollPositionInPixels -= diff * 0.5; // Too fast!
             moveSongToScrollPosition();
           }
-          else if (FlxG.mouse.screenY > (playbarHeadLayout?.y ?? 0.0))
+          else if (FlxG.mouse.viewY > (playbarHeadLayout?.y ?? 0.0))
           {
             // Scroll down.
-            var diff:Float = FlxG.mouse.screenY - (playbarHeadLayout?.y ?? 0.0);
+            var diff:Float = FlxG.mouse.viewY - (playbarHeadLayout?.y ?? 0.0);
             scrollPositionInPixels += diff * 0.5; // Too fast!
             moveSongToScrollPosition();
           }
@@ -4811,11 +4811,11 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
               // Show the context menu connected to the note.
               if (useSingleNoteContextMenu)
               {
-                this.openNoteContextMenu(FlxG.mouse.screenX, FlxG.mouse.screenY, highlightedNote.noteData);
+                this.openNoteContextMenu(FlxG.mouse.viewX, FlxG.mouse.viewY, highlightedNote.noteData);
               }
               else
               {
-                this.openSelectionContextMenu(FlxG.mouse.screenX, FlxG.mouse.screenY);
+                this.openSelectionContextMenu(FlxG.mouse.viewX, FlxG.mouse.viewY);
               }
             }
             else
@@ -4835,11 +4835,11 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
                 || (isHighlightedEventSelected && currentEventSelection.length == 1);
               if (useSingleEventContextMenu)
               {
-                this.openEventContextMenu(FlxG.mouse.screenX, FlxG.mouse.screenY, highlightedEvent.eventData);
+                this.openEventContextMenu(FlxG.mouse.viewX, FlxG.mouse.viewY, highlightedEvent.eventData);
               }
               else
               {
-                this.openSelectionContextMenu(FlxG.mouse.screenX, FlxG.mouse.screenY);
+                this.openSelectionContextMenu(FlxG.mouse.viewX, FlxG.mouse.viewY);
               }
             }
             else
@@ -4860,11 +4860,11 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
               // Show the context menu connected to the note.
               if (useSingleNoteContextMenu)
               {
-                this.openHoldNoteContextMenu(FlxG.mouse.screenX, FlxG.mouse.screenY, highlightedHoldNote.noteData);
+                this.openHoldNoteContextMenu(FlxG.mouse.viewX, FlxG.mouse.viewY, highlightedHoldNote.noteData);
               }
               else
               {
-                this.openSelectionContextMenu(FlxG.mouse.screenX, FlxG.mouse.screenY);
+                this.openSelectionContextMenu(FlxG.mouse.viewX, FlxG.mouse.viewY);
               }
             }
             else

From 9624b57e4447925a3f7764ffae8442585221bde3 Mon Sep 17 00:00:00 2001
From: Kade <26305836+Kade-github@users.noreply.github.com>
Date: Mon, 16 Sep 2024 17:23:49 -0700
Subject: [PATCH 28/66] This does fix it now

---
 source/funkin/ui/debug/charting/ChartEditorState.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index c0c2e6309..922138a10 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -3830,7 +3830,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
   function handleScrollKeybinds():Void
   {
     // Don't scroll when the user is interacting with the UI, unless a playbar button (the << >> ones) is pressed.
-    if ((isHaxeUIFocused || isHaxeUIDialogOpen) && playbarButtonPressed == null) return;
+    if ((isHaxeUIFocused || isCursorOverHaxeUI) && playbarButtonPressed == null) return;
 
     var scrollAmount:Float = 0; // Amount to scroll the grid.
     var playheadAmount:Float = 0; // Amount to scroll the playhead relative to the grid.

From d710318830c73d333fdaf347c8250169dc856857 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Mon, 16 Sep 2024 21:54:24 -0400
Subject: [PATCH 29/66] Update HaxeUI

---
 hmm.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hmm.json b/hmm.json
index d967a69b3..edc0529aa 100644
--- a/hmm.json
+++ b/hmm.json
@@ -77,14 +77,14 @@
       "name": "haxeui-core",
       "type": "git",
       "dir": null,
-      "ref": "22f7c5a8ffca90d4677cffd6e570f53761709fbc",
+      "ref": "c9d96b168ea2a19274ad7c766ab1a34b57baa793",
       "url": "https://github.com/haxeui/haxeui-core"
     },
     {
       "name": "haxeui-flixel",
       "type": "git",
       "dir": null,
-      "ref": "28bb710d0ae5d94b5108787593052165be43b980",
+      "ref": "013b9d4e56bfe9a034e028a8d685f0b274cb73c4",
       "url": "https://github.com/haxeui/haxeui-flixel"
     },
     {

From 811caf6b704674ffd0c9dd31ed6be5f8575c1b1f Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Mon, 16 Sep 2024 21:54:33 -0400
Subject: [PATCH 30/66] Suppress a spammy log trace

---
 source/funkin/ui/debug/charting/ChartEditorState.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 922138a10..2e259d3f5 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -5615,7 +5615,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     }
     else
     {
-      trace('Ignoring keybinds for View menu items because we are in live input mode (${currentLiveInputStyle}).');
+      // trace('Ignoring keybinds for View menu items because we are in live input mode (${currentLiveInputStyle}).');
     }
   }
 

From b7c3f5ac9f3221efafc65196079a15b6fd435c3e Mon Sep 17 00:00:00 2001
From: Til Tjardes <til.tjardes@gmail.com>
Date: Mon, 16 Sep 2024 20:04:04 -0600
Subject: [PATCH 31/66] Chart Editor Icons are fixed now!

---
 source/funkin/play/character/CharacterData.hx | 78 ++++++++++++++-----
 .../ChartEditorCharacterIconSelectorMenu.hx   |  2 +-
 .../toolboxes/ChartEditorMetadataToolbox.hx   |  6 +-
 3 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/source/funkin/play/character/CharacterData.hx b/source/funkin/play/character/CharacterData.hx
index bac2c7141..40957818a 100644
--- a/source/funkin/play/character/CharacterData.hx
+++ b/source/funkin/play/character/CharacterData.hx
@@ -12,6 +12,7 @@ import funkin.util.assets.DataAssets;
 import funkin.util.VersionUtil;
 import haxe.Json;
 import openfl.utils.Assets;
+import flixel.graphics.frames.FlxFrame;
 
 class CharacterDataParser
 {
@@ -281,41 +282,78 @@ class CharacterDataParser
   }
 
   /**
-   * TODO: Hardcode this.
+   * Returns the idle frame of a character.
    */
-  public static function getCharPixelIconAsset(char:String):String
+  public static function getCharPixelIconAsset(char:String):FlxFrame
   {
-    var icon:String = char;
+    var charPath:String = "freeplay/icons/";
 
-    switch (icon)
+    // FunkinCrew please dont skin me alive for copying pixelated icon and changing it a tiny bit
+    switch (char)
     {
-      case "bf-christmas" | "bf-car" | "bf-pixel" | "bf-holding-gf":
-        icon = "bf";
+      case "bf-christmas" | "bf-car" | "bf-pixel" | "bf-holding-gf" | "bf-dark":
+        charPath += "bfpixel";
       case "monster-christmas":
-        icon = "monster";
+        charPath += "monsterpixel";
       case "mom" | "mom-car":
-        icon = "mommy";
+        charPath += "mommypixel";
       case "pico-blazin" | "pico-playable" | "pico-speaker":
-        icon = "pico";
-      case "gf-christmas" | "gf-car" | "gf-pixel" | "gf-tankmen":
-        icon = "gf";
+        charPath += "picopixel";
+      case "gf-christmas" | "gf-car" | "gf-pixel" | "gf-tankmen" | "gf-dark":
+        charPath += "gfpixel";
       case "dad":
-        icon = "daddy";
+        charPath += "dadpixel";
       case "darnell-blazin":
-        icon = "darnell";
+        charPath += "darnellpixel";
       case "senpai-angry":
-        icon = "senpai";
+        charPath += "senpaipixel";
       case "spooky-dark":
-        icon = "spooky";
+        charPath += "spookypixel";
       case "tankman-atlas":
-        icon = "tankman";
+        charPath += "tankmanpixel";
+      case "pico-christmas" | "pico-dark":
+        charPath += "picopixel";
+      default:
+        charPath += '${char}pixel';
     }
 
-    var path = Paths.image("freeplay/icons/" + icon + "pixel");
-    if (Assets.exists(path)) return path;
+    if (!Assets.exists(Paths.image(charPath)))
+    {
+      trace('[WARN] Character ${char} has no freeplay icon.');
+      return null;
+    }
 
-    // TODO: Hardcode some additional behavior or a fallback.
-    return null;
+    var isAnimated = Assets.exists(Paths.file('images/$charPath.xml'));
+    var frame:FlxFrame = null;
+
+    if (isAnimated)
+    {
+      var frames = Paths.getSparrowAtlas(charPath);
+
+      var idleFrame:FlxFrame = frames.frames.find(function(frame:FlxFrame):Bool {
+        return frame.name.startsWith('idle');
+      });
+
+      if (idleFrame == null)
+      {
+        trace('[WARN] Character ${char} has no idle in their freeplay icon.');
+        return null;
+      }
+
+      // so, haxe.ui.backend.AssetsImpl uses the parent width and height, which makes the image go crazy when rendered
+      // so this is a work around so that it uses the actual width and height
+      var imageGraphic = flixel.graphics.FlxGraphic.fromFrame(idleFrame, false, null, false);
+
+      var imageFrame = flixel.graphics.frames.FlxImageFrame.fromImage(imageGraphic);
+      frame = imageFrame.frame;
+    }
+    else
+    {
+      var imageFrame = flixel.graphics.frames.FlxImageFrame.fromImage(Paths.image(charPath));
+      frame = imageFrame.frame;
+    }
+
+    return frame;
   }
 
   /**
diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx
index 1edbb6c00..90d998a02 100644
--- a/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx
+++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx
@@ -95,7 +95,7 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
       }
 
       var LIMIT = 6;
-      charButton.icon = CharacterDataParser.getCharPixelIconAsset(charId);
+      charButton.icon = haxe.ui.util.Variant.fromImageData(CharacterDataParser.getCharPixelIconAsset(charId));
       charButton.text = charData.name.length > LIMIT ? '${charData.name.substr(0, LIMIT)}.' : '${charData.name}';
 
       charButton.onClick = _ -> {
diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorMetadataToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorMetadataToolbox.hx
index c97e8142d..f68776cab 100644
--- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorMetadataToolbox.hx
+++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorMetadataToolbox.hx
@@ -221,7 +221,7 @@ class ChartEditorMetadataToolbox extends ChartEditorBaseToolbox
     var charDataOpponent:Null<CharacterData> = CharacterDataParser.fetchCharacterData(chartEditorState.currentSongMetadata.playData.characters.opponent);
     if (charDataOpponent != null)
     {
-      buttonCharacterOpponent.icon = CharacterDataParser.getCharPixelIconAsset(chartEditorState.currentSongMetadata.playData.characters.opponent);
+      buttonCharacterOpponent.icon = haxe.ui.util.Variant.fromImageData(CharacterDataParser.getCharPixelIconAsset(chartEditorState.currentSongMetadata.playData.characters.opponent));
       buttonCharacterOpponent.text = charDataOpponent.name.length > LIMIT ? '${charDataOpponent.name.substr(0, LIMIT)}.' : '${charDataOpponent.name}';
     }
     else
@@ -233,7 +233,7 @@ class ChartEditorMetadataToolbox extends ChartEditorBaseToolbox
     var charDataGirlfriend:Null<CharacterData> = CharacterDataParser.fetchCharacterData(chartEditorState.currentSongMetadata.playData.characters.girlfriend);
     if (charDataGirlfriend != null)
     {
-      buttonCharacterGirlfriend.icon = CharacterDataParser.getCharPixelIconAsset(chartEditorState.currentSongMetadata.playData.characters.girlfriend);
+      buttonCharacterGirlfriend.icon = haxe.ui.util.Variant.fromImageData(CharacterDataParser.getCharPixelIconAsset(chartEditorState.currentSongMetadata.playData.characters.girlfriend));
       buttonCharacterGirlfriend.text = charDataGirlfriend.name.length > LIMIT ? '${charDataGirlfriend.name.substr(0, LIMIT)}.' : '${charDataGirlfriend.name}';
     }
     else
@@ -245,7 +245,7 @@ class ChartEditorMetadataToolbox extends ChartEditorBaseToolbox
     var charDataPlayer:Null<CharacterData> = CharacterDataParser.fetchCharacterData(chartEditorState.currentSongMetadata.playData.characters.player);
     if (charDataPlayer != null)
     {
-      buttonCharacterPlayer.icon = CharacterDataParser.getCharPixelIconAsset(chartEditorState.currentSongMetadata.playData.characters.player);
+      buttonCharacterPlayer.icon = haxe.ui.util.Variant.fromImageData(CharacterDataParser.getCharPixelIconAsset(chartEditorState.currentSongMetadata.playData.characters.player));
       buttonCharacterPlayer.text = charDataPlayer.name.length > LIMIT ? '${charDataPlayer.name.substr(0, LIMIT)}.' : '${charDataPlayer.name}';
     }
     else

From e6525d0129ae9e61ddd7941f50d9cd38904efe6e Mon Sep 17 00:00:00 2001
From: Til Tjardes <til.tjardes@gmail.com>
Date: Mon, 16 Sep 2024 20:44:29 -0600
Subject: [PATCH 32/66] stop being on the kickstarter crack me

---
 source/funkin/play/character/CharacterData.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/play/character/CharacterData.hx b/source/funkin/play/character/CharacterData.hx
index 40957818a..052310a7e 100644
--- a/source/funkin/play/character/CharacterData.hx
+++ b/source/funkin/play/character/CharacterData.hx
@@ -342,7 +342,7 @@ class CharacterDataParser
 
       // so, haxe.ui.backend.AssetsImpl uses the parent width and height, which makes the image go crazy when rendered
       // so this is a work around so that it uses the actual width and height
-      var imageGraphic = flixel.graphics.FlxGraphic.fromFrame(idleFrame, false, null, false);
+      var imageGraphic = flixel.graphics.FlxGraphic.fromFrame(idleFrame);
 
       var imageFrame = flixel.graphics.frames.FlxImageFrame.fromImage(imageGraphic);
       frame = imageFrame.frame;

From aae7dcdada565307a22c80a82666a8e4e1837d2e Mon Sep 17 00:00:00 2001
From: AbnormalPoof <userabnormal89@gmail.com>
Date: Mon, 16 Sep 2024 23:35:23 -0500
Subject: [PATCH 33/66] fix crash when opening urls

---
 source/funkin/ui/mainmenu/MainMenuState.hx | 4 ++--
 source/funkin/util/WindowUtil.hx           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/funkin/ui/mainmenu/MainMenuState.hx b/source/funkin/ui/mainmenu/MainMenuState.hx
index 13d68da6d..588e4cb29 100644
--- a/source/funkin/ui/mainmenu/MainMenuState.hx
+++ b/source/funkin/ui/mainmenu/MainMenuState.hx
@@ -123,7 +123,7 @@ class MainMenuState extends MusicBeatState
         }));
     });
 
-    #if CAN_OPEN_LINKS
+    #if FEATURE_OPEN_URL
     // In order to prevent popup blockers from triggering,
     // we need to open the link as an immediate result of a keypress event,
     // so we can't wait for the flicker animation to complete.
@@ -234,7 +234,7 @@ class MainMenuState extends MusicBeatState
     camFollow.setPosition(selected.getGraphicMidpoint().x, selected.getGraphicMidpoint().y);
   }
 
-  #if CAN_OPEN_LINKS
+  #if FEATURE_OPEN_URL
   function selectDonate()
   {
     WindowUtil.openURL(Constants.URL_ITCH);
diff --git a/source/funkin/util/WindowUtil.hx b/source/funkin/util/WindowUtil.hx
index 0fe63fe32..aabaa495b 100644
--- a/source/funkin/util/WindowUtil.hx
+++ b/source/funkin/util/WindowUtil.hx
@@ -22,7 +22,7 @@ class WindowUtil
    */
   public static function openURL(targetUrl:String):Void
   {
-    #if CAN_OPEN_LINKS
+    #if FEATURE_OPEN_URL
     #if linux
     Sys.command('/usr/bin/xdg-open $targetUrl &');
     #else
@@ -40,7 +40,7 @@ class WindowUtil
    */
   public static function openFolder(targetPath:String):Void
   {
-    #if CAN_OPEN_LINKS
+    #if FEATURE_OPEN_URL
     #if windows
     Sys.command('explorer', [targetPath.replace('/', '\\')]);
     #elseif mac
@@ -59,7 +59,7 @@ class WindowUtil
    */
   public static function openSelectFile(targetPath:String):Void
   {
-    #if CAN_OPEN_LINKS
+    #if FEATURE_OPEN_URL
     #if windows
     Sys.command('explorer', ['/select,' + targetPath.replace('/', '\\')]);
     #elseif mac

From 0706192cbe7863954351009a9825adf2bfbdd8c4 Mon Sep 17 00:00:00 2001
From: dombomb64 <49823019+dombomb64@users.noreply.github.com>
Date: Tue, 17 Sep 2024 13:50:59 -0400
Subject: [PATCH 34/66] Fix note scaling with one simple trick!

---
 source/funkin/play/notes/StrumlineNote.hx       | 2 +-
 source/funkin/play/notes/notestyle/NoteStyle.hx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/funkin/play/notes/StrumlineNote.hx b/source/funkin/play/notes/StrumlineNote.hx
index d8230aa28..c33c8b578 100644
--- a/source/funkin/play/notes/StrumlineNote.hx
+++ b/source/funkin/play/notes/StrumlineNote.hx
@@ -85,7 +85,7 @@ class StrumlineNote extends FlxSprite
     noteStyle.applyStrumlineFrames(this);
     noteStyle.applyStrumlineAnimations(this, this.direction);
 
-    this.setGraphicSize(Std.int(Strumline.STRUMLINE_SIZE * noteStyle.getStrumlineScale()));
+    this.scale.set(noteStyle.getStrumlineScale());
     this.updateHitbox();
     noteStyle.applyStrumlineOffsets(this);
 
diff --git a/source/funkin/play/notes/notestyle/NoteStyle.hx b/source/funkin/play/notes/notestyle/NoteStyle.hx
index ee07703f1..9079fee64 100644
--- a/source/funkin/play/notes/notestyle/NoteStyle.hx
+++ b/source/funkin/play/notes/notestyle/NoteStyle.hx
@@ -93,7 +93,7 @@ class NoteStyle implements IRegistryEntry<NoteStyleData>
     buildNoteAnimations(target);
 
     // Set the scale.
-    target.setGraphicSize(Strumline.STRUMLINE_SIZE * getNoteScale());
+    target.scale.set(getNoteScale());
     target.updateHitbox();
   }
 

From 6e33cac9ec0636333156a308b65438c311bc92be Mon Sep 17 00:00:00 2001
From: dombomb64 <49823019+dombomb64@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:47:16 -0400
Subject: [PATCH 35/66] ...Okay it wasn't that simple

---
 source/funkin/play/notes/StrumlineNote.hx     |  3 ++-
 source/funkin/play/notes/SustainTrail.hx      |  5 +++--
 .../funkin/play/notes/notestyle/NoteStyle.hx  | 19 +++++++++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/source/funkin/play/notes/StrumlineNote.hx b/source/funkin/play/notes/StrumlineNote.hx
index c33c8b578..16df9f502 100644
--- a/source/funkin/play/notes/StrumlineNote.hx
+++ b/source/funkin/play/notes/StrumlineNote.hx
@@ -85,7 +85,8 @@ class StrumlineNote extends FlxSprite
     noteStyle.applyStrumlineFrames(this);
     noteStyle.applyStrumlineAnimations(this, this.direction);
 
-    this.scale.set(noteStyle.getStrumlineScale());
+    var scale = noteStyle.getStrumlineScale();
+    this.scale.set(scale, scale);
     this.updateHitbox();
     noteStyle.applyStrumlineOffsets(this);
 
diff --git a/source/funkin/play/notes/SustainTrail.hx b/source/funkin/play/notes/SustainTrail.hx
index 90b36b009..a9af468b9 100644
--- a/source/funkin/play/notes/SustainTrail.hx
+++ b/source/funkin/play/notes/SustainTrail.hx
@@ -87,6 +87,7 @@ class SustainTrail extends FlxSprite
   public var bottomClip:Float = 0.9;
 
   public var isPixel:Bool;
+  public var noteStyleOffsets:Array<Float>;
 
   var graphicWidth:Float = 0;
   var graphicHeight:Float = 0;
@@ -107,6 +108,7 @@ class SustainTrail extends FlxSprite
     this.noteDirection = noteDirection;
 
     setupHoldNoteGraphic(noteStyle);
+    noteStyleOffsets = noteStyle.getHoldNoteOffsets();
 
     indices = new DrawData<Int>(12, true, TRIANGLE_VERTEX_INDICES);
 
@@ -137,7 +139,6 @@ class SustainTrail extends FlxSprite
 
     zoom = 1.0;
     zoom *= noteStyle.fetchHoldNoteScale();
-    zoom *= 0.7;
 
     // CALCULATE SIZE
     graphicWidth = graphic.width / 8 * zoom; // amount of notes * 2
@@ -202,7 +203,7 @@ class SustainTrail extends FlxSprite
   {
     width = graphicWidth;
     height = graphicHeight;
-    offset.set(0, 0);
+    offset.set(noteStyleOffsets[0], noteStyleOffsets[1]);
     origin.set(width * 0.5, height * 0.5);
   }
 
diff --git a/source/funkin/play/notes/notestyle/NoteStyle.hx b/source/funkin/play/notes/notestyle/NoteStyle.hx
index 9079fee64..a5ff19cba 100644
--- a/source/funkin/play/notes/notestyle/NoteStyle.hx
+++ b/source/funkin/play/notes/notestyle/NoteStyle.hx
@@ -93,7 +93,8 @@ class NoteStyle implements IRegistryEntry<NoteStyleData>
     buildNoteAnimations(target);
 
     // Set the scale.
-    target.scale.set(getNoteScale());
+    var scale = getNoteScale();
+    target.scale.set(scale, scale);
     target.updateHitbox();
   }
 
@@ -224,6 +225,13 @@ class NoteStyle implements IRegistryEntry<NoteStyleData>
     return data?.scale ?? 1.0;
   }
 
+  public function getHoldNoteOffsets():Array<Float>
+  {
+    var data = _data?.assets?.holdNote;
+    if (data == null && fallback != null) return fallback.getHoldNoteOffsets();
+    return data?.offsets ?? [0.0, 0.0];
+  }
+
   public function applyStrumlineFrames(target:StrumlineNote):Void
   {
     // TODO: Add support for multi-Sparrow.
@@ -304,9 +312,16 @@ class NoteStyle implements IRegistryEntry<NoteStyleData>
     return thx.Arrays.filterNull(result);
   }
 
+  public function getStrumlineOffsets():Array<Float>
+  {
+    var data = _data?.assets?.noteStrumline;
+    if (data == null && fallback != null) return fallback.getStrumlineOffsets();
+    return data?.offsets ?? [0.0, 0.0];
+  }
+
   public function applyStrumlineOffsets(target:StrumlineNote):Void
   {
-    var offsets = _data?.assets?.noteStrumline?.offsets ?? [0.0, 0.0];
+    var offsets = getStrumlineOffsets();
     target.x += offsets[0];
     target.y += offsets[1];
   }

From f2b3f47e73d4f29590fe1f4fd401a1c81cb9cb50 Mon Sep 17 00:00:00 2001
From: Michael <15317421+ActualMandM@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:46:47 -0700
Subject: [PATCH 36/66] Disable input in CharSelect until stayFunky plays

---
 source/funkin/ui/charSelect/CharSelectSubState.hx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/source/funkin/ui/charSelect/CharSelectSubState.hx b/source/funkin/ui/charSelect/CharSelectSubState.hx
index 3109dc8f1..c2dd18fd8 100644
--- a/source/funkin/ui/charSelect/CharSelectSubState.hx
+++ b/source/funkin/ui/charSelect/CharSelectSubState.hx
@@ -71,6 +71,7 @@ class CharSelectSubState extends MusicBeatSubState
   var availableChars:Map<Int, String> = new Map<Int, String>();
   var pressedSelect:Bool = false;
   var selectTimer:FlxTimer = new FlxTimer();
+  var allowInput:Bool = false;
 
   var selectSound:FunkinSound;
   var unlockSound:FunkinSound;
@@ -430,6 +431,8 @@ class CharSelectSubState extends MusicBeatSubState
           overrideExisting: true,
           restartTrack: true,
           onLoad: function() {
+            allowInput = true;
+
             @:privateAccess
             gfChill.analyzer = new SpectralAnalyzer(FlxG.sound.music._channel.__audioSource, 7, 0.1);
             #if desktop
@@ -573,6 +576,8 @@ class CharSelectSubState extends MusicBeatSubState
               overrideExisting: true,
               restartTrack: true,
               onLoad: function() {
+                allowInput = true;
+
                 @:privateAccess
                 gfChill.analyzer = new SpectralAnalyzer(FlxG.sound.music._channel.__audioSource, 7, 0.1);
                 #if desktop
@@ -642,6 +647,7 @@ class CharSelectSubState extends MusicBeatSubState
 
   function goToFreeplay():Void
   {
+    allowInput = false;
     autoFollow = false;
 
     FlxTween.tween(cursor, {alpha: 0}, 0.8, {ease: FlxEase.expoOut});
@@ -695,7 +701,7 @@ class CharSelectSubState extends MusicBeatSubState
 
     syncAudio(elapsed);
 
-    if (!pressedSelect)
+    if (allowInput && !pressedSelect)
     {
       if (controls.UI_UP) holdTmrUp += elapsed;
       if (controls.UI_UP_R)
@@ -789,7 +795,7 @@ class CharSelectSubState extends MusicBeatSubState
       gfChill.visible = true;
       curChar = availableChars.get(getCurrentSelected());
 
-      if (!pressedSelect && controls.ACCEPT)
+      if (allowInput && !pressedSelect && controls.ACCEPT)
       {
         cursorConfirmed.visible = true;
         cursorConfirmed.x = cursor.x - 2;
@@ -817,7 +823,7 @@ class CharSelectSubState extends MusicBeatSubState
         });
       }
 
-      if (pressedSelect && controls.BACK)
+      if (allowInput && pressedSelect && controls.BACK)
       {
         cursorConfirmed.visible = false;
         grpCursors.visible = true;
@@ -847,7 +853,7 @@ class CharSelectSubState extends MusicBeatSubState
 
       gfChill.visible = false;
 
-      if (controls.ACCEPT)
+      if (allowInput && controls.ACCEPT)
       {
         cursorDenied.visible = true;
         cursorDenied.x = cursor.x - 2;

From ea9dab4b73cec21ffa5585b4915d386e6497834c Mon Sep 17 00:00:00 2001
From: Lethrial <maxkoopakop@gmail.com>
Date: Wed, 18 Sep 2024 00:25:20 +0100
Subject: [PATCH 37/66] Update Main.hx

---
 source/Main.hx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source/Main.hx b/source/Main.hx
index 724b118f8..56634c86b 100644
--- a/source/Main.hx
+++ b/source/Main.hx
@@ -123,8 +123,6 @@ class Main extends Sprite
     game.debugger.interaction.addTool(new funkin.util.TrackerToolButtonUtil());
     #end
 
-    addChild(fpsCounter);
-
     #if hxcpp_debug_server
     trace('hxcpp_debug_server is enabled! You can now connect to the game with a debugger.');
     #else

From de07497ae3967b981cc026d26997d717443dc280 Mon Sep 17 00:00:00 2001
From: Kade <26305836+Kade-github@users.noreply.github.com>
Date: Tue, 17 Sep 2024 17:29:12 -0700
Subject: [PATCH 38/66] Make addCharacter actually set the characters type

---
 source/funkin/play/stage/Stage.hx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/funkin/play/stage/Stage.hx b/source/funkin/play/stage/Stage.hx
index c42e41cad..ad768769c 100644
--- a/source/funkin/play/stage/Stage.hx
+++ b/source/funkin/play/stage/Stage.hx
@@ -464,6 +464,9 @@ class Stage extends FlxSpriteGroup implements IPlayStateScriptedClass implements
       #end
     }
 
+    // Set the characters type
+    character.characterType = charType;
+
     // Add the character to the scene.
     this.add(character);
 

From 19e6029fb27ef0c52aeb632d8c0ce941cd133623 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 03:13:10 -0400
Subject: [PATCH 39/66] Fix some compilation errors

---
 source/funkin/play/PlayState.hx                   | 1 -
 source/funkin/play/components/PopUpStuff.hx       | 9 ---------
 source/funkin/ui/debug/anim/DebugBoundingState.hx | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index a25d3b231..1c82eb6b1 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -3046,7 +3046,6 @@ class PlayState extends MusicBeatSubState
     GameOverSubState.reset();
     PauseSubState.reset();
     Countdown.reset();
-    PopUpStuff.reset();
 
     // Clear the static reference to this state.
     instance = null;
diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx
index e5e9b4681..a02291e4e 100644
--- a/source/funkin/play/components/PopUpStuff.hx
+++ b/source/funkin/play/components/PopUpStuff.hx
@@ -125,13 +125,4 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
       daLoop++;
     }
   }
-
-  /**
-   * Reset the popup configuration to the default.
-   */
-  public static function reset()
-  {
-    noteStyle = NoteStyleRegistry.instance.fetchDefault();
-    isPixel = false;
-  }
 }
diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx
index 19391f8d9..d2a27999f 100644
--- a/source/funkin/ui/debug/anim/DebugBoundingState.hx
+++ b/source/funkin/ui/debug/anim/DebugBoundingState.hx
@@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
   {
     // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
     var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
-    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
+    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
   }
 
   override function create()

From 7b7d5deed5e56613b5ba10f2e2ad7dfe393a1a42 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 03:13:21 -0400
Subject: [PATCH 40/66] Tweaks to framerate preference

---
 source/funkin/Preferences.hx                | 4 ++--
 source/funkin/ui/options/PreferencesMenu.hx | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/source/funkin/Preferences.hx b/source/funkin/Preferences.hx
index 1eac9f47f..648880ad4 100644
--- a/source/funkin/Preferences.hx
+++ b/source/funkin/Preferences.hx
@@ -15,7 +15,7 @@ class Preferences
 
   static function get_framerate():Int
   {
-    #if (web || CHEEMS)
+    #if web
     return 60;
     #else
     return Save?.instance?.options?.framerate ?? 60;
@@ -24,7 +24,7 @@ class Preferences
 
   static function set_framerate(value:Int):Int
   {
-    #if (web || CHEEMS)
+    #if web
     return 60;
     #else
     var save:Save = Save.instance;
diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index adbe1d356..fb4980762 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -54,11 +54,6 @@ class PreferencesMenu extends Page
    */
   function createPrefItems():Void
   {
-    #if !web
-    createPrefItemNumber('FPS', 'The framerate that the game is running on', function(value:Float) {
-      Preferences.framerate = Std.int(value);
-    }, null, Preferences.framerate, 60, 360, 1, 0);
-    #end
     createPrefItemCheckbox('Naughtyness', 'Toggle displaying raunchy content', function(value:Bool):Void {
       Preferences.naughtyness = value;
     }, Preferences.naughtyness);
@@ -82,6 +77,10 @@ class PreferencesMenu extends Page
     createPrefItemCheckbox('Unlocked Framerate', 'Enable to unlock the framerate', function(value:Bool):Void {
       Preferences.unlockedFramerate = value;
     }, Preferences.unlockedFramerate);
+    #else
+    createPrefItemNumber('FPS', 'The maximum framerate that the game targets', function(value:Float) {
+      Preferences.framerate = Std.int(value);
+    }, null, Preferences.framerate, 30, 300, 5, 0);
     #end
   }
 

From d30fe61ca07d9565a2142d5a044f2cd4558e7aa6 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 05:03:04 -0400
Subject: [PATCH 41/66] Add a bunch of other functions to funkin.Assets, and
 add documentation

---
 source/funkin/Assets.hx | 150 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 134 insertions(+), 16 deletions(-)

diff --git a/source/funkin/Assets.hx b/source/funkin/Assets.hx
index 05423c572..967e4b0ca 100644
--- a/source/funkin/Assets.hx
+++ b/source/funkin/Assets.hx
@@ -1,43 +1,161 @@
 package funkin;
 
+import openfl.utils.Future;
+
 /**
  * A wrapper around `openfl.utils.Assets` which disallows access to the harmful functions.
  * Later we'll add Funkin-specific caching to this.
  */
 class Assets
 {
-  public static function getText(path:String):String
-  {
-    return openfl.utils.Assets.getText(path);
-  }
-
+  /**
+   * Get the file system path for an asset
+   * @param path The asset path to load from, relative to the assets folder
+   * @return The path to the asset on the file system
+   */
   public static function getPath(path:String):String
   {
     return openfl.utils.Assets.getPath(path);
   }
 
-  public static function getMusic(path:String):openfl.media.Sound
-  {
-    return openfl.utils.Assets.getMusic(path);
-  }
-
-  public static function getBitmapData(path:String):openfl.display.BitmapData
-  {
-    return openfl.utils.Assets.getBitmapData(path);
-  }
-
+  /**
+   * Load bytes from an asset
+   * May cause stutters or throw an error if the asset is not cached
+   * @param path The asset path to load from
+   * @return The byte contents of the file
+   */
   public static function getBytes(path:String):haxe.io.Bytes
   {
     return openfl.utils.Assets.getBytes(path);
   }
 
+  /**
+   * Load bytes from an asset asynchronously
+   * @param path The asset path to load from
+   * @return A future which promises to return the byte contents of the file
+   */
+  public static function loadBytes(path:String):Future<openfl.utils.ByteArray>
+  {
+    return openfl.utils.Assets.loadBytes(path);
+  }
+
+  /**
+   * Load text from an asset.
+   * May cause stutters or throw an error if the asset is not cached
+   * @param path The asset path to load from
+   * @return The text contents of the file
+   */
+  public static function getText(path:String):String
+  {
+    return openfl.utils.Assets.getText(path);
+  }
+
+  /**
+   * Load text from an asset asynchronously
+   * @param path The asset path to load from
+   * @return A future which promises to return the text contents of the file
+   */
+  public static function loadText(path:String):Future<String>
+  {
+    return openfl.utils.Assets.loadText(path);
+  }
+
+  /**
+   * Load a Sound file from an asset
+   * May cause stutters or throw an error if the asset is not cached
+   * @param path The asset path to load from
+   * @return The loaded sound
+   */
+  public static function getSound(path:String):openfl.media.Sound
+  {
+    return openfl.utils.Assets.getSound(path);
+  }
+
+  /**
+   * Load a Sound file from an asset asynchronously
+   * @param path The asset path to load from
+   * @return A future which promises to return the loaded sound
+   */
+  public static function loadSound(path:String):Future<openfl.media.Sound>
+  {
+    return openfl.utils.Assets.loadSound(path);
+  }
+
+  /**
+   * Load a Sound file from an asset, with optimizations specific to long-duration music
+   * May cause stutters or throw an error if the asset is not cached
+   * @param path The asset path to load from
+   * @return The loaded sound
+   */
+  public static function getMusic(path:String):openfl.media.Sound
+  {
+    return openfl.utils.Assets.getMusic(path);
+  }
+
+  /**
+   * Load a Sound file from an asset asynchronously, with optimizations specific to long-duration music
+   * @param path The asset path to load from
+   * @return A future which promises to return the loaded sound
+   */
+  public static function loadMusic(path:String):Future<openfl.media.Sound>
+  {
+    return openfl.utils.Assets.loadMusic(path);
+  }
+
+  /**
+   * Load a Bitmap from an asset
+   * May cause stutters or throw an error if the asset is not cached
+   * @param path The asset path to load from
+   * @return The loaded Bitmap image
+   */
+  public static function getBitmapData(path:String):openfl.display.BitmapData
+  {
+    return openfl.utils.Assets.getBitmapData(path);
+  }
+
+  /**
+   * Load a Bitmap from an asset asynchronously
+   * @param path The asset path to load from
+   * @return The future which promises to return the loaded Bitmap image
+   */
+  public static function loadBitmapData(path:String):Future<openfl.display.BitmapData>
+  {
+    return openfl.utils.Assets.loadBitmapData(path);
+  }
+
+  /**
+   * Determines whether the given asset of the given type exists.
+   * @param path The asset path to check
+   * @param type The asset type to check
+   * @return Whether the asset exists
+   */
   public static function exists(path:String, ?type:openfl.utils.AssetType):Bool
   {
     return openfl.utils.Assets.exists(path, type);
   }
 
-  public static function list(type:openfl.utils.AssetType):Array<String>
+  /**
+   * Retrieve a list of all assets of the given type
+   * @param type The asset type to check
+   * @return A list of asset paths
+   */
+  public static function list(?type:openfl.utils.AssetType):Array<String>
   {
     return openfl.utils.Assets.list(type);
   }
+
+  public static function hasLibrary(name:String):Bool
+  {
+    return openfl.utils.Assets.hasLibrary(name);
+  }
+
+  public static function getLibrary(name:String):lime.utils.AssetLibrary
+  {
+    return openfl.utils.Assets.getLibrary(name);
+  }
+
+  public static function loadLibrary(name:String):Future<openfl.utils.AssetLibrary>
+  {
+    return openfl.utils.Assets.loadLibrary(name);
+  }
 }

From b6b2248aa389143b855eab86c19c656f9edc4376 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 05:04:10 -0400
Subject: [PATCH 42/66] Make funkin.Assets and funkin.Paths default imports for
 all scripts

---
 assets                                  | 2 +-
 source/funkin/modding/PolymodHandler.hx | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/assets b/assets
index bc7009b42..16c1d3047 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit bc7009b4242691faa5c4552f7ca8a2f28e8cb1d2
+Subproject commit 16c1d30478875a5acbe92e4ec7d11234d1028286
diff --git a/source/funkin/modding/PolymodHandler.hx b/source/funkin/modding/PolymodHandler.hx
index 75c69e506..258491552 100644
--- a/source/funkin/modding/PolymodHandler.hx
+++ b/source/funkin/modding/PolymodHandler.hx
@@ -228,6 +228,8 @@ class PolymodHandler
   static function buildImports():Void
   {
     // Add default imports for common classes.
+    Polymod.addDefaultImport(funkin.Assets);
+    Polymod.addDefaultImport(funkin.Paths);
 
     // Add import aliases for certain classes.
     // NOTE: Scripted classes are automatically aliased to their parent class.

From 1beb21e57a2c0ac6d1a04df8fa699b25f1aee504 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 05:04:32 -0400
Subject: [PATCH 43/66] Replace all instances of openfl/lime Assets with
 funkin.Assets

---
 source/funkin/Paths.hx                             |  5 ++---
 .../funkin/graphics/adobeanimate/FlxAtlasSprite.hx |  1 -
 .../funkin/graphics/shaders/AdjustColorShader.hx   |  2 --
 source/funkin/graphics/shaders/BlendModesShader.hx |  2 --
 .../funkin/graphics/shaders/GaussianBlurShader.hx  |  2 --
 source/funkin/graphics/shaders/Grayscale.hx        |  2 --
 source/funkin/graphics/shaders/HSVShader.hx        |  2 --
 source/funkin/graphics/shaders/MosaicEffect.hx     |  2 --
 .../graphics/shaders/RuntimeCustomBlendShader.hx   |  1 -
 .../funkin/graphics/shaders/RuntimeRainShader.hx   |  1 -
 source/funkin/import.hx                            |  1 +
 source/funkin/input/Cursor.hx                      |  1 -
 source/funkin/play/Countdown.hx                    |  1 -
 source/funkin/play/GameOverSubState.hx             |  1 -
 source/funkin/play/character/CharacterData.hx      |  1 -
 source/funkin/play/components/HealthIcon.hx        |  1 -
 source/funkin/play/components/PopUpStuff.hx        |  1 -
 source/funkin/play/song/Song.hx                    |  1 -
 source/funkin/ui/debug/anim/DebugBoundingState.hx  |  1 -
 .../charting/components/ChartEditorEventSprite.hx  |  1 -
 .../charting/handlers/ChartEditorAudioHandler.hx   |  1 -
 source/funkin/ui/freeplay/AlbumRoll.hx             |  1 -
 source/funkin/ui/freeplay/FreeplayState.hx         |  3 +--
 source/funkin/ui/freeplay/backcards/BackingCard.hx |  1 -
 .../funkin/ui/freeplay/backcards/BoyfriendCard.hx  | 14 +++++++-------
 .../ui/freeplay/backcards/NewCharacterCard.hx      |  1 -
 source/funkin/ui/freeplay/backcards/PicoCard.hx    | 14 +++++++-------
 source/funkin/ui/options/FunkinSoundTray.hx        |  1 -
 source/funkin/ui/story/StoryMenuState.hx           |  1 -
 source/funkin/ui/transition/LoadingState.hx        |  9 ++++-----
 source/funkin/ui/transition/StickerSubState.hx     |  5 ++---
 31 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/source/funkin/Paths.hx b/source/funkin/Paths.hx
index 285af7ca2..ae77ac2da 100644
--- a/source/funkin/Paths.hx
+++ b/source/funkin/Paths.hx
@@ -2,7 +2,6 @@ package funkin;
 
 import flixel.graphics.frames.FlxAtlasFrames;
 import openfl.utils.AssetType;
-import openfl.utils.Assets as OpenFlAssets;
 
 /**
  * A core class which handles determining asset paths.
@@ -44,11 +43,11 @@ class Paths
     if (currentLevel != null)
     {
       var levelPath:String = getLibraryPathForce(file, currentLevel);
-      if (OpenFlAssets.exists(levelPath, type)) return levelPath;
+      if (Assets.exists(levelPath, type)) return levelPath;
     }
 
     var levelPath:String = getLibraryPathForce(file, 'shared');
-    if (OpenFlAssets.exists(levelPath, type)) return levelPath;
+    if (Assets.exists(levelPath, type)) return levelPath;
 
     return getPreloadPath(file);
   }
diff --git a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx
index 952fa8b71..8a51e8c8b 100644
--- a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx
+++ b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx
@@ -7,7 +7,6 @@ import flxanimate.frames.FlxAnimateFrames;
 import flixel.graphics.frames.FlxFrame;
 import flixel.system.FlxAssets.FlxGraphicAsset;
 import openfl.display.BitmapData;
-import openfl.utils.Assets;
 import flixel.math.FlxPoint;
 import flxanimate.animate.FlxKeyFrame;
 
diff --git a/source/funkin/graphics/shaders/AdjustColorShader.hx b/source/funkin/graphics/shaders/AdjustColorShader.hx
index 2b0970eeb..a6efc3e65 100644
--- a/source/funkin/graphics/shaders/AdjustColorShader.hx
+++ b/source/funkin/graphics/shaders/AdjustColorShader.hx
@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 
 class AdjustColorShader extends FlxRuntimeShader
 {
diff --git a/source/funkin/graphics/shaders/BlendModesShader.hx b/source/funkin/graphics/shaders/BlendModesShader.hx
index b7a405dd1..e6ae45dd7 100644
--- a/source/funkin/graphics/shaders/BlendModesShader.hx
+++ b/source/funkin/graphics/shaders/BlendModesShader.hx
@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 import openfl.display.BitmapData;
 import openfl.display.ShaderInput;
 
diff --git a/source/funkin/graphics/shaders/GaussianBlurShader.hx b/source/funkin/graphics/shaders/GaussianBlurShader.hx
index cecfdab80..023a66853 100644
--- a/source/funkin/graphics/shaders/GaussianBlurShader.hx
+++ b/source/funkin/graphics/shaders/GaussianBlurShader.hx
@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 
 /**
  * Note... not actually gaussian!
diff --git a/source/funkin/graphics/shaders/Grayscale.hx b/source/funkin/graphics/shaders/Grayscale.hx
index fbd0970e5..6fbdd1881 100644
--- a/source/funkin/graphics/shaders/Grayscale.hx
+++ b/source/funkin/graphics/shaders/Grayscale.hx
@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 
 class Grayscale extends FlxRuntimeShader
 {
diff --git a/source/funkin/graphics/shaders/HSVShader.hx b/source/funkin/graphics/shaders/HSVShader.hx
index 587008ce2..dda841ad9 100644
--- a/source/funkin/graphics/shaders/HSVShader.hx
+++ b/source/funkin/graphics/shaders/HSVShader.hx
@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import funkin.Paths;
-import openfl.utils.Assets;
 
 class HSVShader extends FlxRuntimeShader
 {
diff --git a/source/funkin/graphics/shaders/MosaicEffect.hx b/source/funkin/graphics/shaders/MosaicEffect.hx
index fc3737aff..76a6b6f3d 100644
--- a/source/funkin/graphics/shaders/MosaicEffect.hx
+++ b/source/funkin/graphics/shaders/MosaicEffect.hx
@@ -1,8 +1,6 @@
 package funkin.graphics.shaders;
 
 import flixel.addons.display.FlxRuntimeShader;
-import openfl.utils.Assets;
-import funkin.Paths;
 import flixel.math.FlxPoint;
 
 class MosaicEffect extends FlxRuntimeShader
diff --git a/source/funkin/graphics/shaders/RuntimeCustomBlendShader.hx b/source/funkin/graphics/shaders/RuntimeCustomBlendShader.hx
index 3e8dfedd3..74ce7f4ea 100644
--- a/source/funkin/graphics/shaders/RuntimeCustomBlendShader.hx
+++ b/source/funkin/graphics/shaders/RuntimeCustomBlendShader.hx
@@ -2,7 +2,6 @@ package funkin.graphics.shaders;
 
 import openfl.display.BitmapData;
 import openfl.display.BlendMode;
-import openfl.utils.Assets;
 
 class RuntimeCustomBlendShader extends RuntimePostEffectShader
 {
diff --git a/source/funkin/graphics/shaders/RuntimeRainShader.hx b/source/funkin/graphics/shaders/RuntimeRainShader.hx
index d0c036623..5d8df3f2c 100644
--- a/source/funkin/graphics/shaders/RuntimeRainShader.hx
+++ b/source/funkin/graphics/shaders/RuntimeRainShader.hx
@@ -5,7 +5,6 @@ import openfl.display.BitmapData;
 import openfl.display.ShaderParameter;
 import openfl.display.ShaderParameterType;
 import flixel.util.FlxColor;
-import openfl.utils.Assets;
 
 typedef Light =
 {
diff --git a/source/funkin/import.hx b/source/funkin/import.hx
index c8431be33..a29e19977 100644
--- a/source/funkin/import.hx
+++ b/source/funkin/import.hx
@@ -3,6 +3,7 @@ package;
 #if !macro
 // Only import these when we aren't in a macro.
 import funkin.util.Constants;
+import funkin.Assets;
 import funkin.Paths;
 import funkin.Preferences;
 import flixel.FlxG; // This one in particular causes a compile error if you're using macros.
diff --git a/source/funkin/input/Cursor.hx b/source/funkin/input/Cursor.hx
index 39f399465..554a6b2c1 100644
--- a/source/funkin/input/Cursor.hx
+++ b/source/funkin/input/Cursor.hx
@@ -1,7 +1,6 @@
 package funkin.input;
 
 import haxe.ui.backend.flixel.CursorHelper;
-import openfl.utils.Assets;
 import lime.app.Future;
 import openfl.display.BitmapData;
 
diff --git a/source/funkin/play/Countdown.hx b/source/funkin/play/Countdown.hx
index 643883a43..94a7548b9 100644
--- a/source/funkin/play/Countdown.hx
+++ b/source/funkin/play/Countdown.hx
@@ -11,7 +11,6 @@ import funkin.modding.events.ScriptEvent.CountdownScriptEvent;
 import flixel.util.FlxTimer;
 import funkin.util.EaseUtil;
 import funkin.audio.FunkinSound;
-import openfl.utils.Assets;
 import funkin.data.notestyle.NoteStyleRegistry;
 import funkin.play.notes.notestyle.NoteStyle;
 
diff --git a/source/funkin/play/GameOverSubState.hx b/source/funkin/play/GameOverSubState.hx
index f6a7148f8..bf8735647 100644
--- a/source/funkin/play/GameOverSubState.hx
+++ b/source/funkin/play/GameOverSubState.hx
@@ -15,7 +15,6 @@ import funkin.ui.freeplay.FreeplayState;
 import funkin.ui.MusicBeatSubState;
 import funkin.ui.story.StoryMenuState;
 import funkin.util.MathUtil;
-import openfl.utils.Assets;
 import funkin.effects.RetroCameraFade;
 import flixel.math.FlxPoint;
 
diff --git a/source/funkin/play/character/CharacterData.hx b/source/funkin/play/character/CharacterData.hx
index bac2c7141..3a790bcf2 100644
--- a/source/funkin/play/character/CharacterData.hx
+++ b/source/funkin/play/character/CharacterData.hx
@@ -11,7 +11,6 @@ import funkin.play.character.ScriptedCharacter.ScriptedSparrowCharacter;
 import funkin.util.assets.DataAssets;
 import funkin.util.VersionUtil;
 import haxe.Json;
-import openfl.utils.Assets;
 
 class CharacterDataParser
 {
diff --git a/source/funkin/play/components/HealthIcon.hx b/source/funkin/play/components/HealthIcon.hx
index c11850b2a..c7854871c 100644
--- a/source/funkin/play/components/HealthIcon.hx
+++ b/source/funkin/play/components/HealthIcon.hx
@@ -5,7 +5,6 @@ import flixel.FlxSprite;
 import flixel.math.FlxMath;
 import flixel.math.FlxPoint;
 import funkin.play.character.CharacterData.CharacterDataParser;
-import openfl.utils.Assets;
 import funkin.graphics.FunkinSprite;
 import funkin.util.MathUtil;
 
diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx
index a02291e4e..fbc97283f 100644
--- a/source/funkin/play/components/PopUpStuff.hx
+++ b/source/funkin/play/components/PopUpStuff.hx
@@ -8,7 +8,6 @@ import funkin.graphics.FunkinSprite;
 import funkin.play.PlayState;
 import funkin.util.TimerUtil;
 import funkin.util.EaseUtil;
-import openfl.utils.Assets;
 import funkin.data.notestyle.NoteStyleRegistry;
 import funkin.play.notes.notestyle.NoteStyle;
 
diff --git a/source/funkin/play/song/Song.hx b/source/funkin/play/song/Song.hx
index 9d35902b0..9023b872e 100644
--- a/source/funkin/play/song/Song.hx
+++ b/source/funkin/play/song/Song.hx
@@ -16,7 +16,6 @@ import funkin.modding.IScriptedClass.IPlayStateScriptedClass;
 import funkin.modding.events.ScriptEvent;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.util.SortUtil;
-import openfl.utils.Assets;
 
 /**
  * This is a data structure managing information about the current song.
diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx
index 7bb42c89e..5ed000e90 100644
--- a/source/funkin/ui/debug/anim/DebugBoundingState.hx
+++ b/source/funkin/ui/debug/anim/DebugBoundingState.hx
@@ -24,7 +24,6 @@ import haxe.ui.core.Screen;
 import haxe.ui.events.UIEvent;
 import haxe.ui.RuntimeComponentBuilder;
 import lime.utils.Assets as LimeAssets;
-import openfl.Assets;
 import openfl.events.Event;
 import openfl.events.IOErrorEvent;
 import openfl.geom.Rectangle;
diff --git a/source/funkin/ui/debug/charting/components/ChartEditorEventSprite.hx b/source/funkin/ui/debug/charting/components/ChartEditorEventSprite.hx
index c996079bc..4c4a8d200 100644
--- a/source/funkin/ui/debug/charting/components/ChartEditorEventSprite.hx
+++ b/source/funkin/ui/debug/charting/components/ChartEditorEventSprite.hx
@@ -3,7 +3,6 @@ package funkin.ui.debug.charting.components;
 import funkin.data.event.SongEventRegistry;
 import flixel.graphics.frames.FlxAtlasFrames;
 import openfl.display.BitmapData;
-import openfl.utils.Assets;
 import flixel.FlxObject;
 import flixel.FlxBasic;
 import flixel.FlxSprite;
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorAudioHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorAudioHandler.hx
index 26e246371..329873d68 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorAudioHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorAudioHandler.hx
@@ -13,7 +13,6 @@ import funkin.audio.waveform.WaveformSprite;
 import flixel.util.FlxColor;
 import haxe.io.Bytes;
 import haxe.io.Path;
-import openfl.utils.Assets;
 
 /**
  * Functions for loading audio for the chart editor.
diff --git a/source/funkin/ui/freeplay/AlbumRoll.hx b/source/funkin/ui/freeplay/AlbumRoll.hx
index 4107369d2..81a9fe858 100644
--- a/source/funkin/ui/freeplay/AlbumRoll.hx
+++ b/source/funkin/ui/freeplay/AlbumRoll.hx
@@ -11,7 +11,6 @@ import funkin.data.freeplay.album.AlbumRegistry;
 import funkin.util.assets.FlxAnimationUtil;
 import funkin.graphics.FunkinSprite;
 import funkin.util.SortUtil;
-import openfl.utils.Assets;
 
 /**
  * The graphic for the album roll in the FreeplayState.
diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index af0a9b841..c368c6632 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -51,7 +51,6 @@ import funkin.ui.transition.LoadingState;
 import funkin.ui.transition.StickerSubState;
 import funkin.util.MathUtil;
 import funkin.util.SortUtil;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import funkin.data.freeplay.style.FreeplayStyleRegistry;
 import funkin.data.song.SongData.SongMusicData;
@@ -1859,7 +1858,7 @@ class FreeplayState extends MusicBeatSubState
     albumRoll.setDifficultyStars(daSong?.difficultyRating);
   }
 
-  // Clears the cache of songs, frees up memory, they' ll have to be loaded in later tho function clearDaCache(actualSongTho:String)
+  // Clears the cache of songs to free up memory, they'll have to be loaded in later tho
   function clearDaCache(actualSongTho:String):Void
   {
     for (song in songs)
diff --git a/source/funkin/ui/freeplay/backcards/BackingCard.hx b/source/funkin/ui/freeplay/backcards/BackingCard.hx
index bb662cc8d..713b6edcf 100644
--- a/source/funkin/ui/freeplay/backcards/BackingCard.hx
+++ b/source/funkin/ui/freeplay/backcards/BackingCard.hx
@@ -18,7 +18,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.graphics.FunkinSprite;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.ui.MusicBeatSubState;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import flixel.group.FlxSpriteGroup;
 
diff --git a/source/funkin/ui/freeplay/backcards/BoyfriendCard.hx b/source/funkin/ui/freeplay/backcards/BoyfriendCard.hx
index 597fd1a34..a049c4f42 100644
--- a/source/funkin/ui/freeplay/backcards/BoyfriendCard.hx
+++ b/source/funkin/ui/freeplay/backcards/BoyfriendCard.hx
@@ -18,7 +18,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.graphics.FunkinSprite;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.ui.MusicBeatSubState;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import flixel.group.FlxSpriteGroup;
 
@@ -177,20 +176,21 @@ class BoyfriendCard extends BackingCard
   }
 
   var beatFreq:Int = 1;
-  var beatFreqList:Array<Int> = [1,2,4,8];
+  var beatFreqList:Array<Int> = [1, 2, 4, 8];
 
-  public override function beatHit():Void {
+  public override function beatHit():Void
+  {
     // increases the amount of beats that need to go by to pulse the glow because itd flash like craazy at high bpms.....
-    beatFreq = beatFreqList[Math.floor(Conductor.instance.bpm/140)];
+    beatFreq = beatFreqList[Math.floor(Conductor.instance.bpm / 140)];
 
-    if(Conductor.instance.currentBeat % beatFreq != 0) return;
+    if (Conductor.instance.currentBeat % beatFreq != 0) return;
     FlxTween.cancelTweensOf(glow);
     FlxTween.cancelTweensOf(glowDark);
 
     glow.alpha = 0.8;
-    FlxTween.tween(glow, {alpha: 0}, 16/24, {ease: FlxEase.quartOut});
+    FlxTween.tween(glow, {alpha: 0}, 16 / 24, {ease: FlxEase.quartOut});
     glowDark.alpha = 0;
-    FlxTween.tween(glowDark, {alpha: 0.6}, 18/24, {ease: FlxEase.quartOut});
+    FlxTween.tween(glowDark, {alpha: 0.6}, 18 / 24, {ease: FlxEase.quartOut});
   }
 
   public override function introDone():Void
diff --git a/source/funkin/ui/freeplay/backcards/NewCharacterCard.hx b/source/funkin/ui/freeplay/backcards/NewCharacterCard.hx
index a44ff88a6..1e3d81299 100644
--- a/source/funkin/ui/freeplay/backcards/NewCharacterCard.hx
+++ b/source/funkin/ui/freeplay/backcards/NewCharacterCard.hx
@@ -20,7 +20,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.graphics.FunkinSprite;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.ui.MusicBeatSubState;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import flixel.group.FlxSpriteGroup;
 import funkin.graphics.shaders.AdjustColorShader;
diff --git a/source/funkin/ui/freeplay/backcards/PicoCard.hx b/source/funkin/ui/freeplay/backcards/PicoCard.hx
index f5db1ccc3..8cfe7756e 100644
--- a/source/funkin/ui/freeplay/backcards/PicoCard.hx
+++ b/source/funkin/ui/freeplay/backcards/PicoCard.hx
@@ -20,7 +20,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.graphics.FunkinSprite;
 import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.ui.MusicBeatSubState;
-import lime.utils.Assets;
 import openfl.display.BlendMode;
 import flixel.group.FlxSpriteGroup;
 import funkin.graphics.shaders.AdjustColorShader;
@@ -233,20 +232,21 @@ class PicoCard extends BackingCard
   }
 
   var beatFreq:Int = 1;
-  var beatFreqList:Array<Int> = [1,2,4,8];
+  var beatFreqList:Array<Int> = [1, 2, 4, 8];
 
-  public override function beatHit():Void {
+  public override function beatHit():Void
+  {
     // increases the amount of beats that need to go by to pulse the glow because itd flash like craazy at high bpms.....
-    beatFreq = beatFreqList[Math.floor(Conductor.instance.bpm/140)];
+    beatFreq = beatFreqList[Math.floor(Conductor.instance.bpm / 140)];
 
-    if(Conductor.instance.currentBeat % beatFreq != 0) return;
+    if (Conductor.instance.currentBeat % beatFreq != 0) return;
     FlxTween.cancelTweensOf(glow);
     FlxTween.cancelTweensOf(glowDark);
 
     glow.alpha = 1;
-    FlxTween.tween(glow, {alpha: 0}, 16/24, {ease: FlxEase.quartOut});
+    FlxTween.tween(glow, {alpha: 0}, 16 / 24, {ease: FlxEase.quartOut});
     glowDark.alpha = 0;
-    FlxTween.tween(glowDark, {alpha: 1}, 18/24, {ease: FlxEase.quartOut});
+    FlxTween.tween(glowDark, {alpha: 1}, 18 / 24, {ease: FlxEase.quartOut});
   }
 
   public override function introDone():Void
diff --git a/source/funkin/ui/options/FunkinSoundTray.hx b/source/funkin/ui/options/FunkinSoundTray.hx
index 170ad8497..8ae53524a 100644
--- a/source/funkin/ui/options/FunkinSoundTray.hx
+++ b/source/funkin/ui/options/FunkinSoundTray.hx
@@ -6,7 +6,6 @@ import flixel.system.FlxAssets;
 import flixel.tweens.FlxEase;
 import openfl.display.Bitmap;
 import openfl.display.BitmapData;
-import openfl.utils.Assets;
 import funkin.util.MathUtil;
 
 /**
diff --git a/source/funkin/ui/story/StoryMenuState.hx b/source/funkin/ui/story/StoryMenuState.hx
index 18614d414..c0ed2712a 100644
--- a/source/funkin/ui/story/StoryMenuState.hx
+++ b/source/funkin/ui/story/StoryMenuState.hx
@@ -23,7 +23,6 @@ import funkin.ui.MusicBeatState;
 import funkin.ui.transition.LoadingState;
 import funkin.ui.transition.StickerSubState;
 import funkin.util.MathUtil;
-import openfl.utils.Assets;
 
 class StoryMenuState extends MusicBeatState
 {
diff --git a/source/funkin/ui/transition/LoadingState.hx b/source/funkin/ui/transition/LoadingState.hx
index 5b82cc741..ef95da6c9 100644
--- a/source/funkin/ui/transition/LoadingState.hx
+++ b/source/funkin/ui/transition/LoadingState.hx
@@ -3,24 +3,23 @@ package funkin.ui.transition;
 import flixel.FlxSprite;
 import flixel.math.FlxMath;
 import flixel.tweens.FlxEase;
-import funkin.graphics.FunkinSprite;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxTimer;
+import flixel.util.typeLimit.NextState;
+import funkin.graphics.FunkinSprite;
 import funkin.graphics.shaders.ScreenWipeShader;
 import funkin.play.PlayState;
 import funkin.play.PlayStatePlaylist;
 import funkin.play.song.Song.SongDifficulty;
 import funkin.ui.MusicBeatState;
 import haxe.io.Path;
-import funkin.graphics.FunkinSprite;
 import lime.app.Future;
 import lime.app.Promise;
 import lime.utils.AssetLibrary;
 import lime.utils.AssetManifest;
 import lime.utils.Assets as LimeAssets;
 import openfl.filters.ShaderFilter;
-import openfl.utils.Assets;
-import flixel.util.typeLimit.NextState;
+import openfl.utils.Assets as OpenFLAssets;
 
 class LoadingState extends MusicBeatSubState
 {
@@ -98,7 +97,7 @@ class LoadingState extends MusicBeatSubState
 
   function checkLoadSong(path:String):Void
   {
-    if (!Assets.cache.hasSound(path))
+    if (!OpenFLAssets.cache.hasSound(path))
     {
       var library = Assets.getLibrary('songs');
       var symbolPath = path.split(':').pop();
diff --git a/source/funkin/ui/transition/StickerSubState.hx b/source/funkin/ui/transition/StickerSubState.hx
index e5abef872..e8d6877d8 100644
--- a/source/funkin/ui/transition/StickerSubState.hx
+++ b/source/funkin/ui/transition/StickerSubState.hx
@@ -2,7 +2,6 @@ package funkin.ui.transition;
 
 import flixel.FlxSprite;
 import haxe.Json;
-import lime.utils.Assets;
 import funkin.graphics.FunkinSprite;
 // import flxtyped group
 import funkin.ui.MusicBeatSubState;
@@ -56,7 +55,7 @@ class StickerSubState extends MusicBeatSubState
     // make sure that ONLY plays mp3/ogg files
     // if there's no mp3/ogg file, then it regenerates/reloads the random folder
 
-    var assetsInList = openfl.utils.Assets.list();
+    var assetsInList = Assets.list();
 
     var soundFilterFunc = function(a:String) {
       return a.startsWith('assets/shared/sounds/stickersounds/');
@@ -84,7 +83,7 @@ class StickerSubState extends MusicBeatSubState
     var filterFunc = function(a:String) {
       return a.startsWith('assets/shared/sounds/stickersounds/' + soundSelection + '/');
     };
-    var assetsInList3 = openfl.utils.Assets.list();
+    var assetsInList3 = Assets.list();
     sounds = assetsInList3.filter(filterFunc);
     for (i in 0...sounds.length)
     {

From b28af79eb3246b7e540288230a59000654fe4aa5 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 05:18:16 -0400
Subject: [PATCH 44/66] Fix build issues

---
 source/funkin/play/PlayState.hx                   | 1 -
 source/funkin/play/components/PopUpStuff.hx       | 9 ---------
 source/funkin/ui/debug/anim/DebugBoundingState.hx | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index a25d3b231..1c82eb6b1 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -3046,7 +3046,6 @@ class PlayState extends MusicBeatSubState
     GameOverSubState.reset();
     PauseSubState.reset();
     Countdown.reset();
-    PopUpStuff.reset();
 
     // Clear the static reference to this state.
     instance = null;
diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx
index e5e9b4681..a02291e4e 100644
--- a/source/funkin/play/components/PopUpStuff.hx
+++ b/source/funkin/play/components/PopUpStuff.hx
@@ -125,13 +125,4 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
       daLoop++;
     }
   }
-
-  /**
-   * Reset the popup configuration to the default.
-   */
-  public static function reset()
-  {
-    noteStyle = NoteStyleRegistry.instance.fetchDefault();
-    isPixel = false;
-  }
 }
diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx
index 19391f8d9..d2a27999f 100644
--- a/source/funkin/ui/debug/anim/DebugBoundingState.hx
+++ b/source/funkin/ui/debug/anim/DebugBoundingState.hx
@@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
   {
     // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
     var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
-    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
+    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
   }
 
   override function create()

From b5ed7f40d4621006d5dc906020050095e2733e9c Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 05:24:57 -0400
Subject: [PATCH 45/66] Remove redundant character type assignment

---
 source/funkin/play/PlayState.hx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 0b2b8846d..b304381cc 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -1612,7 +1612,7 @@ class PlayState extends MusicBeatSubState
 
     if (girlfriend != null)
     {
-      girlfriend.characterType = CharacterType.GF;
+      // Don't need to do anything.
     }
     else if (currentCharacterData.girlfriend != '')
     {
@@ -1630,8 +1630,6 @@ class PlayState extends MusicBeatSubState
 
     if (dad != null)
     {
-      dad.characterType = CharacterType.DAD;
-
       //
       // OPPONENT HEALTH ICON
       //
@@ -1650,8 +1648,6 @@ class PlayState extends MusicBeatSubState
 
     if (boyfriend != null)
     {
-      boyfriend.characterType = CharacterType.BF;
-
       //
       // PLAYER HEALTH ICON
       //
@@ -1993,6 +1989,7 @@ class PlayState extends MusicBeatSubState
 
     // Skip this if the music is paused (GameOver, Pause menu, start-of-song offset, etc.)
     if (!(FlxG.sound.music?.playing ?? false)) return;
+
     var timeToPlayAt:Float = Conductor.instance.songPosition - Conductor.instance.instrumentalOffset;
     FlxG.sound.music.pause();
     vocals.pause();

From d54dc6179a305d05d33ebb360410076dcf03a566 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 06:02:13 -0400
Subject: [PATCH 46/66] Add several new Github Actions for issue management

---
 .github/label-actions.yml                     | 23 ++++++++
 .github/workflows/label-actions.yml           | 29 +++++++++++
 .github/workflows/label-issue.yml             | 52 +++++++++++++++++++
 .../{labeler.yml => label-pull-request.yml}   |  2 +
 4 files changed, 106 insertions(+)
 create mode 100644 .github/label-actions.yml
 create mode 100644 .github/workflows/label-actions.yml
 create mode 100644 .github/workflows/label-issue.yml
 rename .github/workflows/{labeler.yml => label-pull-request.yml} (84%)

diff --git a/.github/label-actions.yml b/.github/label-actions.yml
new file mode 100644
index 000000000..00fb390aa
--- /dev/null
+++ b/.github/label-actions.yml
@@ -0,0 +1,23 @@
+# Configuration for Label Actions - https://github.com/dessant/label-actions
+
+# Automatically close issues and pull requests when the `status: duplicate` label is applied
+'status: duplicate':
+  issues:
+    # Post a comment
+    comment: >
+      This issue is a duplicate. Please direct all discussion to the original issue.
+    # Close the issue
+    close: true
+    # Remove other status labels
+    unlabel:
+      - 'status: pending triage'
+    # Set a close reason
+    close-reason: 'not planned'
+  prs:
+    # Post a comment
+    comment: >
+      This pull request is a duplicate. Please direct all discussion to the original pull request.
+    # Close the pull request
+    close: true
+    # Set a close reason
+    close-reason: 'not planned'
diff --git a/.github/workflows/label-actions.yml b/.github/workflows/label-actions.yml
new file mode 100644
index 000000000..bc4cf0add
--- /dev/null
+++ b/.github/workflows/label-actions.yml
@@ -0,0 +1,29 @@
+# Perform actions when labels are applied to issues, discussions, or pull requests
+# See .github/label-actions.yml
+name: 'Label Actions'
+
+on:
+  issues:
+    types:
+      - labeled
+      - unlabeled
+  pull_request_target:
+    types:
+      - labeled
+      - unlabeled
+  discussion:
+    types:
+      - labeled
+      - unlabeled
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+  discussions: write
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/label-actions@v4
diff --git a/.github/workflows/label-issue.yml b/.github/workflows/label-issue.yml
new file mode 100644
index 000000000..eeb83350c
--- /dev/null
+++ b/.github/workflows/label-issue.yml
@@ -0,0 +1,52 @@
+name: "Issue Labeler"
+on:
+  issues:
+    types:
+      - opened
+      - reopened
+      - edited
+
+jobs:
+  # When an issue is opened, perform a similarity check for potential duplicates.
+  # If some are found, add a label and comment listing the potential duplicate issues.
+  potential-duplicate:
+    name: Detect potential duplicate issues
+    runs-on: ubuntu-latest
+    steps:
+      - uses: wow-actions/potential-duplicates@v1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Issue title filter work with anymatch https://www.npmjs.com/package/anymatch.
+          # Any matched issue will stop detection immediately.
+          # You can specify multi filters in each line.
+          filter: ''
+          # Exclude keywords in title before detecting.
+          exclude: ''
+          # Label to set, when potential duplicates are detected.
+          label: 'potential duplicate'
+          # Get issues with state to compare. Supported state: 'all', 'closed', 'open'.
+          state: all
+          # If similarity is higher than this threshold([0,1]), issue will be marked as duplicate.
+          # Turn this up if the detection is too sensitive
+          threshold: 0.6
+          # Reactions to be add to comment when potential duplicates are detected.
+          # Available reactions: "-1", "+1", "confused", "laugh", "heart", "hooray", "rocket", "eyes"
+          # reactions: '-1'
+          # Comment to post when potential duplicates are detected.
+          comment: >
+            Potential duplicates: {{#issues}}
+              - [#{{ number }}] {{ title }} ({{ accuracy }}%)
+            {{/issues}}
+  # When an issue is opened, detect if it has an empty body or incomplete issue form.
+  # If it does, close the issue immediately.
+  empty-issues:
+    name: Close empty issues
+    runs-on: ubuntu-latest
+    steps:
+    - name: Run empty issues closer action
+      uses: rickstaa/empty-issues-closer-action@v1
+      env:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        close_comment: Closing this issue because it appears to be empty. Please update the issue for it to be reopened.
+        open_comment: Reopening this issue because the author provided more information.
diff --git a/.github/workflows/labeler.yml b/.github/workflows/label-pull-request.yml
similarity index 84%
rename from .github/workflows/labeler.yml
rename to .github/workflows/label-pull-request.yml
index a861af578..525e1b5a6 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/label-pull-request.yml
@@ -3,6 +3,7 @@ on:
 - pull_request_target
 
 jobs:
+  # Apply labels to pull requests based on which files were edited
   labeler:
     permissions:
       contents: read
@@ -13,6 +14,7 @@ jobs:
       uses: actions/labeler@v5
       with:
         sync-labels: true
+  # Apply labels to pull requests based on how many lines were edited
   changed-lines-count-labeler:
     permissions:
       contents: read

From ba90a6abe04b15058a9c32a0ba1dd5338605c57a Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 06:08:18 -0400
Subject: [PATCH 47/66] Add behavior when setting status: rejected

---
 .github/label-actions.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.github/label-actions.yml b/.github/label-actions.yml
index 00fb390aa..1234d1526 100644
--- a/.github/label-actions.yml
+++ b/.github/label-actions.yml
@@ -17,7 +17,28 @@
     # Post a comment
     comment: >
       This pull request is a duplicate. Please direct all discussion to the original pull request.
+    # Remove other status labels
+    unlabel:
+      - 'status: pending triage'
     # Close the pull request
     close: true
     # Set a close reason
     close-reason: 'not planned'
+
+'status: rejected':
+  issues:
+    # Close the issue
+    close: true
+    # Remove other status labels
+    unlabel:
+      - 'status: pending triage'
+    # Set a close reason
+    close-reason: 'not planned'
+  prs:
+    # Close the pull request
+    close: true
+    # Remove other status labels
+    unlabel:
+      - 'status: pending triage'
+    # Set a close reason
+    close-reason: 'not planned'

From a469385cdba4288d166682874938b124fd2b7fcf Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 06:22:02 -0400
Subject: [PATCH 48/66] Resolve merge issues

---
 source/funkin/play/PlayState.hx                   | 1 -
 source/funkin/play/components/PopUpStuff.hx       | 9 ---------
 source/funkin/ui/debug/anim/DebugBoundingState.hx | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index a25d3b231..1c82eb6b1 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -3046,7 +3046,6 @@ class PlayState extends MusicBeatSubState
     GameOverSubState.reset();
     PauseSubState.reset();
     Countdown.reset();
-    PopUpStuff.reset();
 
     // Clear the static reference to this state.
     instance = null;
diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx
index e5e9b4681..a02291e4e 100644
--- a/source/funkin/play/components/PopUpStuff.hx
+++ b/source/funkin/play/components/PopUpStuff.hx
@@ -125,13 +125,4 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
       daLoop++;
     }
   }
-
-  /**
-   * Reset the popup configuration to the default.
-   */
-  public static function reset()
-  {
-    noteStyle = NoteStyleRegistry.instance.fetchDefault();
-    isPixel = false;
-  }
 }
diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx
index 19391f8d9..d2a27999f 100644
--- a/source/funkin/ui/debug/anim/DebugBoundingState.hx
+++ b/source/funkin/ui/debug/anim/DebugBoundingState.hx
@@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
   {
     // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
     var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
-    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
+    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
   }
 
   override function create()

From 5efbff044b1a04cd28006124e0305671d6b709e7 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 06:32:06 -0400
Subject: [PATCH 49/66] Resolve merge issues

---
 source/funkin/play/PlayState.hx                   | 1 -
 source/funkin/play/components/PopUpStuff.hx       | 9 ---------
 source/funkin/ui/debug/anim/DebugBoundingState.hx | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index a25d3b231..1c82eb6b1 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -3046,7 +3046,6 @@ class PlayState extends MusicBeatSubState
     GameOverSubState.reset();
     PauseSubState.reset();
     Countdown.reset();
-    PopUpStuff.reset();
 
     // Clear the static reference to this state.
     instance = null;
diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx
index e5e9b4681..a02291e4e 100644
--- a/source/funkin/play/components/PopUpStuff.hx
+++ b/source/funkin/play/components/PopUpStuff.hx
@@ -125,13 +125,4 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
       daLoop++;
     }
   }
-
-  /**
-   * Reset the popup configuration to the default.
-   */
-  public static function reset()
-  {
-    noteStyle = NoteStyleRegistry.instance.fetchDefault();
-    isPixel = false;
-  }
 }
diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx
index 19391f8d9..d2a27999f 100644
--- a/source/funkin/ui/debug/anim/DebugBoundingState.hx
+++ b/source/funkin/ui/debug/anim/DebugBoundingState.hx
@@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
   {
     // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
     var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
-    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
+    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
   }
 
   override function create()

From 9d5cde0bf1889be63b45016b4a292c69697befc8 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 18 Sep 2024 06:48:45 -0400
Subject: [PATCH 50/66] Update assets submodule

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index bc7009b42..68520d9eb 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit bc7009b4242691faa5c4552f7ca8a2f28e8cb1d2
+Subproject commit 68520d9eb9ff9a4e8aa52852eab1ef56db302b91

From a4b59d14bf34270bf04520320eabf3f11b5f2d29 Mon Sep 17 00:00:00 2001
From: Kolo <67389779+JustKolosaki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 13:40:02 +0200
Subject: [PATCH 51/66] applySongRank fix

fixes the bug with the percent being overriden when the song has the same letter rank but lower percent (eg. E Rank with 99% being overriden by E Rank with 93%)
---
 source/funkin/save/Save.hx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx
index 2bbda15c0..74af9994e 100644
--- a/source/funkin/save/Save.hx
+++ b/source/funkin/save/Save.hx
@@ -598,11 +598,15 @@ class Save
       return;
     }
 
+    //percent also accounts for different ranks
+    var oldPerc = (previousScoreData.tallies.sick + previousScoreData.tallies.good) / previousScoreData.tallies.totalNotes;
+    var newPerc = (newScoreData.tallies.sick + newScoreData.tallies.good) / newScoreData.tallies.totalNotes;
+
     // Set the high score and the high rank separately.
     var newScore:SaveScoreData =
       {
-        score: (previousScoreData.score > newScoreData.score) ? previousScoreData.score : newScoreData.score,
-        tallies: (previousRank > newRank) ? previousScoreData.tallies : newScoreData.tallies
+        score: Std.int(Math.max(previousScoreData.score, newScoreData.score)),
+        tallies: (oldPerc > newPerc ? previousScoreData.tallies : newScoreData.tallies)
       };
 
     song.set(difficultyId, newScore);

From 50a5304ad48b210cba62e8bc756b417b3c69cc96 Mon Sep 17 00:00:00 2001
From: Kolo <67389779+JustKolosaki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:30:23 +0200
Subject: [PATCH 52/66] Update PlayerData.hx

---
 source/funkin/data/freeplay/player/PlayerData.hx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/funkin/data/freeplay/player/PlayerData.hx b/source/funkin/data/freeplay/player/PlayerData.hx
index de293c24e..a5bf086f6 100644
--- a/source/funkin/data/freeplay/player/PlayerData.hx
+++ b/source/funkin/data/freeplay/player/PlayerData.hx
@@ -264,6 +264,12 @@ class PlayerCharSelectData
    */
   @:optional
   public var position:Null<Int>;
+
+  /**
+   * The GF name to assign for this character.
+   */
+  @:optional
+  public var assignedGF:Null<String>;
 }
 
 typedef PlayerResultsData =

From 3bb981adb03371e1be5034d7997dc5135a7d8f04 Mon Sep 17 00:00:00 2001
From: Kolo <67389779+JustKolosaki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:32:37 +0200
Subject: [PATCH 53/66] Update CharSelectGF.hx

---
 source/funkin/ui/charSelect/CharSelectGF.hx | 37 ++++++++++++---------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/source/funkin/ui/charSelect/CharSelectGF.hx b/source/funkin/ui/charSelect/CharSelectGF.hx
index e8eeded40..79cfb585c 100644
--- a/source/funkin/ui/charSelect/CharSelectGF.hx
+++ b/source/funkin/ui/charSelect/CharSelectGF.hx
@@ -11,6 +11,7 @@ import funkin.modding.IScriptedClass.IBPMSyncedScriptedClass;
 import flixel.math.FlxMath;
 import funkin.modding.events.ScriptEvent;
 import funkin.vis.dsp.SpectralAnalyzer;
+import funkin.data.freeplay.player.PlayerRegistry;
 
 class CharSelectGF extends FlxAtlasSprite implements IBPMSyncedScriptedClass
 {
@@ -27,7 +28,7 @@ class CharSelectGF extends FlxAtlasSprite implements IBPMSyncedScriptedClass
 
   var analyzer:SpectralAnalyzer;
 
-  var curGF:GFChar = GF;
+  var curGF:String = "gf";
 
   public function new()
   {
@@ -97,7 +98,7 @@ class CharSelectGF extends FlxAtlasSprite implements IBPMSyncedScriptedClass
 
   function drawFFT()
   {
-    if (curGF == NENE)
+    if (curGF == "nene")
     {
       var levels = analyzer.getLevels();
       var frame = anim.curSymbol.timeline.get("VIZ_bars").get(anim.curFrame);
@@ -172,16 +173,21 @@ class CharSelectGF extends FlxAtlasSprite implements IBPMSyncedScriptedClass
    */
   public function switchGF(bf:String):Void
   {
-    var prevGF:GFChar = curGF;
-    switch (bf)
-    {
-      case "pico":
-        curGF = NENE;
-      case "bf":
-        curGF = GF;
-      default:
-        curGF = GF;
-    }
+    var prevGF = curGF;
+
+    var bfObj = PlayerRegistry.instance.fetchEntry(bf);
+    curGF = bfObj?.getCharSelectData()?.assignedGF ?? "gf";
+
+    /*var prevGF:GFChar = curGF;
+      switch (bf)
+      {
+        case "pico":
+          curGF = NENE;
+        case "bf":
+          curGF = GF;
+        default:
+          curGF = GF;
+    }*/
 
     // We don't need to update any anims if we didn't change GF
     if (prevGF != curGF)
@@ -213,9 +219,8 @@ enum FadeStatus
   FADE_OUT;
   FADE_IN;
 }
-
-enum abstract GFChar(String) from String to String
-{
+/*enum abstract GFChar(String) from String to String
+  {
   var GF = "gf";
   var NENE = "nene";
-}
+}*/

From 99657da1f984ff5842d714b2cde398cca6785e06 Mon Sep 17 00:00:00 2001
From: Kolo <67389779+JustKolosaki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:46:13 +0200
Subject: [PATCH 54/66] accidentally also put the save changes oops

---
 source/funkin/save/Save.hx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx
index 74af9994e..2bbda15c0 100644
--- a/source/funkin/save/Save.hx
+++ b/source/funkin/save/Save.hx
@@ -598,15 +598,11 @@ class Save
       return;
     }
 
-    //percent also accounts for different ranks
-    var oldPerc = (previousScoreData.tallies.sick + previousScoreData.tallies.good) / previousScoreData.tallies.totalNotes;
-    var newPerc = (newScoreData.tallies.sick + newScoreData.tallies.good) / newScoreData.tallies.totalNotes;
-
     // Set the high score and the high rank separately.
     var newScore:SaveScoreData =
       {
-        score: Std.int(Math.max(previousScoreData.score, newScoreData.score)),
-        tallies: (oldPerc > newPerc ? previousScoreData.tallies : newScoreData.tallies)
+        score: (previousScoreData.score > newScoreData.score) ? previousScoreData.score : newScoreData.score,
+        tallies: (previousRank > newRank) ? previousScoreData.tallies : newScoreData.tallies
       };
 
     song.set(difficultyId, newScore);

From ab3b976f3c979d04e713b47de607335a58917db7 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 18 Sep 2024 15:07:15 -0400
Subject: [PATCH 55/66] fix rounding for sound results sfx

---
 source/funkin/play/ResultState.hx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/funkin/play/ResultState.hx b/source/funkin/play/ResultState.hx
index 739df167d..33f3587ea 100644
--- a/source/funkin/play/ResultState.hx
+++ b/source/funkin/play/ResultState.hx
@@ -472,9 +472,12 @@ class ResultState extends MusicBeatSubState
       {
         ease: FlxEase.quartOut,
         onUpdate: _ -> {
+          clearPercentLerp = Math.round(clearPercentLerp);
+          clearPercentCounter.curNumber = Math.round(clearPercentCounter.curNumber);
           // Only play the tick sound if the number increased.
           if (clearPercentLerp != clearPercentCounter.curNumber)
           {
+            trace('$clearPercentLerp and ${clearPercentCounter.curNumber}');
             clearPercentLerp = clearPercentCounter.curNumber;
             FunkinSound.playOnce(Paths.sound('scrollMenu'));
           }

From 62149aea39687fc84f79e7a7ce4edf636cef416e Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 18 Sep 2024 15:16:56 -0400
Subject: [PATCH 56/66] assets submod

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 616551146..da96dc519 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 61655114603807b651109af282c2e2aefa9dccf2
+Subproject commit da96dc519a00bb8eb24a164bae64a4c6c064e87d

From fc6e194d20968d010c5d4c22511cd8fd400d9058 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 18 Sep 2024 15:20:15 -0400
Subject: [PATCH 57/66] assets submod

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index ef7386d74..252d48f4c 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit ef7386d741e715bd809c913a7d50dfa7b8176e2d
+Subproject commit 252d48f4c996d5832cb981fb2f3ed945c020f289

From 472d41a893a3610ff6935844ecb50d44949e1851 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 18 Sep 2024 16:15:10 -0400
Subject: [PATCH 58/66] close sys.io.Process stuff when we're done with them

---
 project.hxp                           | 6 ++++++
 source/funkin/util/macro/GitCommit.hx | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/project.hxp b/project.hxp
index 1193a9cd4..ac047ff91 100644
--- a/project.hxp
+++ b/project.hxp
@@ -941,6 +941,8 @@ class Project extends HXProject {
 		var commitHash:String = process.stdout.readLine();
 		var commitHashSplice:String = commitHash.substr(0, 7);
 
+		process.close();
+
 		return commitHashSplice;
 	}
 
@@ -955,6 +957,8 @@ class Project extends HXProject {
 
 		var branchName:String = branchProcess.stdout.readLine();
 
+		branchProcess.close();
+
 		return branchName;
 	}
 
@@ -979,6 +983,8 @@ class Project extends HXProject {
 			}
 		}
 
+		branchProcess.close();
+
 		return output.length > 0;
 	}
 
diff --git a/source/funkin/util/macro/GitCommit.hx b/source/funkin/util/macro/GitCommit.hx
index 161856caa..9e3305c41 100644
--- a/source/funkin/util/macro/GitCommit.hx
+++ b/source/funkin/util/macro/GitCommit.hx
@@ -23,6 +23,8 @@ class GitCommit
     var commitHash:String = process.stdout.readLine();
     var commitHashSplice:String = commitHash.substr(0, 7);
 
+    process.close();
+
     trace('Git Commit ID: ${commitHashSplice}');
 
     // Generates a string expression
@@ -52,6 +54,7 @@ class GitCommit
     }
 
     var branchName:String = branchProcess.stdout.readLine();
+    branchProcess.close();
     trace('Git Branch Name: ${branchName}');
 
     // Generates a string expression
@@ -84,6 +87,7 @@ class GitCommit
     try
     {
       output = branchProcess.stdout.readLine();
+      branchProcess.close();
     }
     catch (e)
     {

From 9f0bc2bd521f274f8ad9d214966538d95894277a Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 19 Sep 2024 04:16:40 -0400
Subject: [PATCH 59/66] Refactor char select GF data handling.

---
 assets                                        |  2 +-
 .../funkin/data/freeplay/player/PlayerData.hx | 15 +++++-
 source/funkin/ui/charSelect/CharSelectGF.hx   | 46 +++++++++----------
 .../ui/charSelect/CharSelectSubState.hx       |  1 -
 4 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/assets b/assets
index bc7009b42..4f7e8bb5c 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit bc7009b4242691faa5c4552f7ca8a2f28e8cb1d2
+Subproject commit 4f7e8bb5cd2e9eb8f68d88c060e9cbe5bccc9e2f
diff --git a/source/funkin/data/freeplay/player/PlayerData.hx b/source/funkin/data/freeplay/player/PlayerData.hx
index a5bf086f6..9110854c8 100644
--- a/source/funkin/data/freeplay/player/PlayerData.hx
+++ b/source/funkin/data/freeplay/player/PlayerData.hx
@@ -269,7 +269,20 @@ class PlayerCharSelectData
    * The GF name to assign for this character.
    */
   @:optional
-  public var assignedGF:Null<String>;
+  public var gf:PlayerCharSelectGFData;
+}
+
+typedef PlayerCharSelectGFData =
+{
+  @:optional
+  public var assetPath:String;
+
+  @:optional
+  public var animInfoPath:String;
+
+  @:optional
+  @:default(false)
+  public var visualizer:Bool;
 }
 
 typedef PlayerResultsData =
diff --git a/source/funkin/ui/charSelect/CharSelectGF.hx b/source/funkin/ui/charSelect/CharSelectGF.hx
index 79cfb585c..89fc6deb0 100644
--- a/source/funkin/ui/charSelect/CharSelectGF.hx
+++ b/source/funkin/ui/charSelect/CharSelectGF.hx
@@ -28,7 +28,8 @@ class CharSelectGF extends FlxAtlasSprite implements IBPMSyncedScriptedClass
 
   var analyzer:SpectralAnalyzer;
 
-  var curGF:String = "gf";
+  var currentGFPath:Null<String>;
+  var enableVisualizer:Bool = false;
 
   public function new()
   {
@@ -98,7 +99,7 @@ class CharSelectGF extends FlxAtlasSprite implements IBPMSyncedScriptedClass
 
   function drawFFT()
   {
-    if (curGF == "nene")
+    if (enableVisualizer)
     {
       var levels = analyzer.getLevels();
       var frame = anim.curSymbol.timeline.get("VIZ_bars").get(anim.curFrame);
@@ -173,33 +174,33 @@ class CharSelectGF extends FlxAtlasSprite implements IBPMSyncedScriptedClass
    */
   public function switchGF(bf:String):Void
   {
-    var prevGF = curGF;
+    var previousGFPath = currentGFPath;
 
     var bfObj = PlayerRegistry.instance.fetchEntry(bf);
-    curGF = bfObj?.getCharSelectData()?.assignedGF ?? "gf";
-
-    /*var prevGF:GFChar = curGF;
-      switch (bf)
-      {
-        case "pico":
-          curGF = NENE;
-        case "bf":
-          curGF = GF;
-        default:
-          curGF = GF;
-    }*/
+    var gfData = bfObj?.getCharSelectData()?.gf;
+    currentGFPath = gfData?.assetPath != null ? Paths.animateAtlas(gfData?.assetPath) : null;
 
     // We don't need to update any anims if we didn't change GF
-    if (prevGF != curGF)
+    trace('currentGFPath(${currentGFPath})');
+    if (currentGFPath == null)
     {
-      loadAtlas(Paths.animateAtlas("charSelect/" + curGF + "Chill"));
+      this.visible = false;
+      return;
+    }
+    else if (previousGFPath != currentGFPath)
+    {
+      this.visible = true;
+      loadAtlas(currentGFPath);
 
-      animInInfo = FramesJSFLParser.parse(Paths.file("images/charSelect/" + curGF + "AnimInfo/" + curGF + "In.txt"));
-      animOutInfo = FramesJSFLParser.parse(Paths.file("images/charSelect/" + curGF + "AnimInfo/" + curGF + "Out.txt"));
+      enableVisualizer = gfData?.visualizer ?? false;
+
+      var animInfoPath = Paths.file('images/${gfData?.animInfoPath}');
+
+      animInInfo = FramesJSFLParser.parse(animInfoPath + '/In.txt');
+      animOutInfo = FramesJSFLParser.parse(animInfoPath + '/Out.txt');
     }
 
     playAnimation("idle", true, false, false);
-    // addFrameCallback(getNextFrameLabel("idle"), () -> playAnimation("idle", true, false, false));
 
     updateHitbox();
   }
@@ -219,8 +220,3 @@ enum FadeStatus
   FADE_OUT;
   FADE_IN;
 }
-/*enum abstract GFChar(String) from String to String
-  {
-  var GF = "gf";
-  var NENE = "nene";
-}*/
diff --git a/source/funkin/ui/charSelect/CharSelectSubState.hx b/source/funkin/ui/charSelect/CharSelectSubState.hx
index 3109dc8f1..e7a87ade6 100644
--- a/source/funkin/ui/charSelect/CharSelectSubState.hx
+++ b/source/funkin/ui/charSelect/CharSelectSubState.hx
@@ -786,7 +786,6 @@ class CharSelectSubState extends MusicBeatSubState
       && availableChars.exists(getCurrentSelected())
       && Save.instance.charactersSeen.contains(availableChars[getCurrentSelected()]))
     {
-      gfChill.visible = true;
       curChar = availableChars.get(getCurrentSelected());
 
       if (!pressedSelect && controls.ACCEPT)

From 25cafe7550304d20581da661948fc480ae82c39b Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 19 Sep 2024 04:22:05 -0400
Subject: [PATCH 60/66] Resolve merge issues.

---
 source/funkin/play/PlayState.hx                   | 1 -
 source/funkin/play/components/PopUpStuff.hx       | 9 ---------
 source/funkin/ui/debug/anim/DebugBoundingState.hx | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index a25d3b231..1c82eb6b1 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -3046,7 +3046,6 @@ class PlayState extends MusicBeatSubState
     GameOverSubState.reset();
     PauseSubState.reset();
     Countdown.reset();
-    PopUpStuff.reset();
 
     // Clear the static reference to this state.
     instance = null;
diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx
index e5e9b4681..a02291e4e 100644
--- a/source/funkin/play/components/PopUpStuff.hx
+++ b/source/funkin/play/components/PopUpStuff.hx
@@ -125,13 +125,4 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
       daLoop++;
     }
   }
-
-  /**
-   * Reset the popup configuration to the default.
-   */
-  public static function reset()
-  {
-    noteStyle = NoteStyleRegistry.instance.fetchDefault();
-    isPixel = false;
-  }
 }
diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx
index 19391f8d9..d2a27999f 100644
--- a/source/funkin/ui/debug/anim/DebugBoundingState.hx
+++ b/source/funkin/ui/debug/anim/DebugBoundingState.hx
@@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
   {
     // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
     var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
-    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
+    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
   }
 
   override function create()

From 3cbba8ba29dda790597e29e01c9e7d620953169d Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 19 Sep 2024 04:22:05 -0400
Subject: [PATCH 61/66] Resolve merge issues.

---
 source/funkin/play/PlayState.hx                   | 1 -
 source/funkin/play/components/PopUpStuff.hx       | 9 ---------
 source/funkin/ui/debug/anim/DebugBoundingState.hx | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index a25d3b231..1c82eb6b1 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -3046,7 +3046,6 @@ class PlayState extends MusicBeatSubState
     GameOverSubState.reset();
     PauseSubState.reset();
     Countdown.reset();
-    PopUpStuff.reset();
 
     // Clear the static reference to this state.
     instance = null;
diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx
index e5e9b4681..a02291e4e 100644
--- a/source/funkin/play/components/PopUpStuff.hx
+++ b/source/funkin/play/components/PopUpStuff.hx
@@ -125,13 +125,4 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
       daLoop++;
     }
   }
-
-  /**
-   * Reset the popup configuration to the default.
-   */
-  public static function reset()
-  {
-    noteStyle = NoteStyleRegistry.instance.fetchDefault();
-    isPixel = false;
-  }
 }
diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx
index 19391f8d9..d2a27999f 100644
--- a/source/funkin/ui/debug/anim/DebugBoundingState.hx
+++ b/source/funkin/ui/debug/anim/DebugBoundingState.hx
@@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
   {
     // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
     var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
-    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
+    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
   }
 
   override function create()

From 9045ae2d9c65b870bb8079f69e94209050c70127 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 20 Sep 2024 00:25:38 -0400
Subject: [PATCH 62/66] assets submod

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 252d48f4c..b029e0678 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 252d48f4c996d5832cb981fb2f3ed945c020f289
+Subproject commit b029e067835b80be35ee4de149ac3c6cf2bb4c4c

From 143ef88e6ff5a680328099e9f253e644ea9b81ac Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Fri, 20 Sep 2024 03:42:48 -0400
Subject: [PATCH 63/66] Update assets submodule

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 252d48f4c..2c9025b00 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 252d48f4c996d5832cb981fb2f3ed945c020f289
+Subproject commit 2c9025b007b3823807404b73a11035c41e032e50

From 5f64d89d0e47f7c062f746ed8880b6287748a351 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 20 Sep 2024 16:51:21 -0400
Subject: [PATCH 64/66] assets submod

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 2c9025b00..41980de1c 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 2c9025b007b3823807404b73a11035c41e032e50
+Subproject commit 41980de1c2ec851ce99a33cb397ba0550b68ea2d

From 78cde16af29f4f4ef5ef2cc3563592aeb1769528 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 20 Sep 2024 18:10:47 -0400
Subject: [PATCH 65/66] assets submod

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 4f7e8bb5c..2a0bc4f66 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 4f7e8bb5cd2e9eb8f68d88c060e9cbe5bccc9e2f
+Subproject commit 2a0bc4f66d79a6f590e7ed2c04884d8c1fa8c45e

From a41d3033d5e7f518b3db1cd5943105bb22260052 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 20 Sep 2024 18:20:40 -0400
Subject: [PATCH 66/66] small Assets -> OpenFLAssets fix

---
 source/funkin/ui/transition/LoadingState.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/ui/transition/LoadingState.hx b/source/funkin/ui/transition/LoadingState.hx
index 3b4661425..f3620c893 100644
--- a/source/funkin/ui/transition/LoadingState.hx
+++ b/source/funkin/ui/transition/LoadingState.hx
@@ -276,7 +276,7 @@ class LoadingState extends MusicBeatSubState
   #if NO_PRELOAD_ALL
   static function isSoundLoaded(path:String):Bool
   {
-    return Assets.cache.hasSound(path);
+    return OpenFLAssets.cache.hasSound(path);
   }
 
   static function isLibraryLoaded(library:String):Bool