diff --git a/.prettierignore b/.prettierignore index 2e132c06f..ccf886f1a 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,3 +9,5 @@ assets/weekend1/images # Don't ignore data files # TODO: These don't work. !assets/preload/data/ + +assets/exclude/data/credits.json diff --git a/assets b/assets index 3f3977d7b..f9c94dfa6 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 3f3977d7bf82856106e9c74fa11433c67b160323 +Subproject commit f9c94dfa655b05d87fb37cbb71fe01aa798ec5b2 diff --git a/source/funkin/ui/credits/CreditsState.hx b/source/funkin/ui/credits/CreditsState.hx index d43e25114..6a15f1263 100644 --- a/source/funkin/ui/credits/CreditsState.hx +++ b/source/funkin/ui/credits/CreditsState.hx @@ -185,7 +185,7 @@ class CreditsState extends MusicBeatState } else if (controls.PAUSE) { - scrollPaused = !scrollPaused; + // scrollPaused = !scrollPaused; } } @@ -196,7 +196,7 @@ class CreditsState extends MusicBeatState function exit():Void { - FlxG.switchState(new funkin.ui.mainmenu.MainMenuState()); + FlxG.switchState(funkin.ui.mainmenu.MainMenuState.new); } public override function destroy():Void