diff --git a/art b/art index 1656bea53..bfb99631f 160000 --- a/art +++ b/art @@ -1 +1 @@ -Subproject commit 1656bea5370c65879aaeb323e329f403c78071c5 +Subproject commit bfb99631f899493b599e1dee49a029b8ec18f16a diff --git a/source/funkin/FreeplayState.hx b/source/funkin/FreeplayState.hx index 9d0b346b3..7aedb5ae2 100644 --- a/source/funkin/FreeplayState.hx +++ b/source/funkin/FreeplayState.hx @@ -355,6 +355,28 @@ class FreeplayState extends MusicBeatSubState txtCompletion.visible = false; add(txtCompletion); + var letterSort:LetterSort = new LetterSort(400, 75); + add(letterSort); + letterSort.visible = false; + + exitMovers.set([letterSort], + { + y: -100, + speed: 0.3 + }); + + letterSort.changeSelectionCallback = (str) -> { + switch (str) + { + case "fav": + generateSongList({filterType: FAVORITE}, true); + case "ALL": + // generateSongList(null, true); + default: + generateSongList({filterType: REGEXP, filterData: str}, true); + } + }; + exitMovers.set([fp, txtCompletion, fnfHighscoreSpr], { x: FlxG.width, @@ -370,33 +392,14 @@ class FreeplayState extends MusicBeatSubState add(diffSelLeft); add(diffSelRight); + letterSort.visible = true; + exitMovers.set([diffSelLeft, diffSelRight], { x: -diffSelLeft.width * 2, speed: 0.26 }); - var letterSort:LetterSort = new LetterSort(400, 75); - add(letterSort); - - exitMovers.set([letterSort], - { - y: -100, - speed: 0.3 - }); - - letterSort.changeSelectionCallback = (str) -> { - switch (str) - { - case "fav": - generateSongList({filterType: FAVORITE}, true); - case "ALL": - generateSongList(null, true); - default: - generateSongList({filterType: REGEXP, filterData: str}, true); - } - }; - new FlxTimer().start(1 / 24, function(handShit) { fnfHighscoreSpr.visible = true; fnfFreeplay.visible = true; @@ -413,7 +416,6 @@ class FreeplayState extends MusicBeatSubState }); pinkBack.color = 0xFFffd863; - // fnfFreeplay.visible = true; bgDad.visible = true; orangeBackShit.visible = true; alsoOrangeLOL.visible = true;