Skip to content

Commit

Permalink
z
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesisfeline committed Sep 28, 2024
1 parent a6752f0 commit 0fcea63
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
12 changes: 3 additions & 9 deletions source/funkin/ui/title/TitleState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -271,23 +271,17 @@ class TitleState extends MusicBeatState
#end

#if desktop
if (FlxG.keys.justPressed.ESCAPE)
{
Sys.exit(0);
}
if (FlxG.keys.justPressed.ESCAPE) Sys.exit(0);
#end

if (Save.instance.charactersSeen.contains("pico"))
if (Save.instance.charactersSeen.contains("pico") && false) // this fix doesnt really matter cuz the save data just doesnt work lol
{
Save.instance.charactersSeen.remove("pico");
Save.instance.oldChar = false;
}
Conductor.instance.update();

if (FlxG.keys.justPressed.I)
{
FlxTween.tween(outlineShaderShit, {funnyX: 50, funnyY: 50}, 0.6, {ease: FlxEase.quartOut});
}
if (FlxG.keys.justPressed.I) FlxTween.tween(outlineShaderShit, {funnyX: 50, funnyY: 50}, 0.6, {ease: FlxEase.quartOut});
if (FlxG.keys.pressed.D) outlineShaderShit.funnyX += 1;
// outlineShaderShit.xPos.value[0] += 1;

Expand Down
7 changes: 6 additions & 1 deletion source/funkin/ui/transition/LoadingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class LoadingState extends MusicBeatSubState
params.targetVariation ?? Constants.DEFAULT_VARIATION);

var daStage = funkin.data.stage.StageRegistry.instance.fetchEntry(daChart.stage);
stageDirectory = daStage?._data?.directory ?? "shared";
stageDirectory = daStage?._data?.directory ?? "shared";
Paths.setCurrentLevel(stageDirectory);

var playStateCtor:() -> PlayState = function() {
Expand Down Expand Up @@ -327,6 +327,11 @@ class LoadingState extends MusicBeatSubState
FunkinSprite.cacheTexture(Paths.image('noteStrumline', 'shared'));
FunkinSprite.cacheTexture(Paths.image('NOTE_hold_assets'));

FunkinSprite.cacheTexture(Paths.image('holdCoverRed', 'shared')); // you forgot hold covers
FunkinSprite.cacheTexture(Paths.image('holdCoverPurple', 'shared'));
FunkinSprite.cacheTexture(Paths.image('holdCoverGreen', 'shared'));
FunkinSprite.cacheTexture(Paths.image('holdCoverBlue', 'shared'));

FunkinSprite.cacheTexture(Paths.image('ui/countdown/funkin/ready', 'shared'));
FunkinSprite.cacheTexture(Paths.image('ui/countdown/funkin/set', 'shared'));
FunkinSprite.cacheTexture(Paths.image('ui/countdown/funkin/go', 'shared'));
Expand Down

0 comments on commit 0fcea63

Please sign in to comment.