Merge branch 'rewrite/master' into feature/2hot-cutscenes-eric

hmm.json

@@ -37,7 +37,7 @@
       "name": "flxanimate",
       "type": "git",
       "dir": null,
-      "ref": "9bacdd6",
+      "ref": "17e0d59",
       "url": "https://github.com/FunkinCrew/flxanimate"
     },
     {

source/funkin/ui/mainmenu/MainMenuState.hx

@@ -328,6 +328,31 @@ class MainMenuState extends MusicBeatState
       FlxG.state.openSubState(new DebugMenuSubState());
     }
 
+    #if (debug || FORCE_DEBUG_VERSION)
+    if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.ALT && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.W)
+    {
+      // Give the user a score of 1 point on Weekend 1 story mode.
+      // This makes the level count as cleared and 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,
+            },
+          accuracy: 0,
+        });
+    }
+    #end
+
     if (FlxG.sound.music.volume < 0.8)
     {
       FlxG.sound.music.volume += 0.5 * elapsed;

source/funkin/ui/title/TitleState.hx

@@ -188,6 +188,7 @@ class TitleState extends MusicBeatState
       ngSpr.animation.add('idle', [0, 1], 4);
       ngSpr.animation.play('idle');
       ngSpr.setGraphicSize(Std.int(ngSpr.width * 0.55));
+      ngSpr.y += 25;
     }
     else
     {