Merge branch 'master' into pr-5565/SrtHero278/pointer-fixes

hmm.json

@@ -59,7 +59,7 @@
       "name": "flxanimate",
       "type": "git",
       "dir": null,
-      "ref": "39c1572add28869c558b218fffed13df1b64f376",
+      "ref": "b1faf19885dad06c899cb71ffe07b4e40b8c6d0c",
       "url": "https://github.com/FunkinCrew/flxanimate"
     },
     {
@@ -219,7 +219,7 @@
       "name": "polymod",
       "type": "git",
       "dir": null,
-      "ref": "866f19edbcd872b3358f9a41f2f6a24c71c191d1",
+      "ref": "d4142dd15a3b57ed4eb149f9f6a2c3ad9935bf7b",
       "url": "https://github.com/larsiusprime/polymod"
     },
     {

source/funkin/ui/credits/CreditsDataHandler.hx

@@ -15,6 +15,7 @@ class CreditsDataHandler
   static final CREDITS_DATA_PATH:String = "assets/data/credits.json";
   #end
 
+  #if macro
   public static function debugPrint(data:Null<CreditsData>):Void
   {
     if (data == null)
@@ -38,6 +39,7 @@ class CreditsDataHandler
 
     Sys.println('[INFO] CreditsData($entryCount entries containing $lineCount lines)');
   }
+  #end
 
   /**
    * If for some reason the full credits won't load,

source/funkin/ui/freeplay/FreeplayDJ.hx

@@ -81,8 +81,6 @@ class FreeplayDJ extends FlxAtlasSprite
 
   public override function update(elapsed:Float):Void
   {
-    super.update(elapsed);
-
     switch (currentState)
     {
       case Intro:
@@ -185,6 +183,8 @@ class FreeplayDJ extends FlxAtlasSprite
       default:
         // I shit myself.
     }
+
+    super.update(elapsed);
   }
 
   function onFinishAnim(name:String):Void

source/funkin/ui/freeplay/FreeplayState.hx

@@ -175,17 +175,6 @@ class FreeplayState extends MusicBeatSubState
     return grpCapsules.members[curSelected];
   }
 
-  var coolColors:Array<Int> = [
-    0xFF9271FD,
-    0xFF9271FD,
-    0xFF223344,
-    0xFF941653,
-    0xFFFC96D7,
-    0xFFA0D1FF,
-    0xFFFF78BF,
-    0xFFF6B604
-  ];
-
   var grpCapsules:FlxTypedGroup<SongMenuItem>;
 
   var dj:Null<FreeplayDJ> = null;