Skip to content

Commit

Permalink
Merge branch 'FNF-CNE-Devs:main' into cne-pr
Browse files Browse the repository at this point in the history
  • Loading branch information
mcagabe19 authored Oct 31, 2024
2 parents b618014 + 0261223 commit c59eac3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion source/funkin/menus/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class MainMenuState extends MusicBeatState

var event = event("onSelectItem", EventManager.get(NameEvent).recycle(daChoice));
if (event.cancelled) return;
switch (daChoice)
switch (event.name)
{
case 'story mode': FlxG.switchState(new StoryMenuState());
case 'freeplay': FlxG.switchState(new FreeplayState());
Expand Down
4 changes: 2 additions & 2 deletions source/funkin/menus/StoryMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,13 @@ class StoryMenuState extends MusicBeatState {
if (char.animation.exists("confirm"))
char.animation.play("confirm");

PlayState.loadWeek(weeks[curWeek], weeks[curWeek].difficulties[curDifficulty]);
PlayState.loadWeek(event.week, event.difficulty);

new FlxTimer().start(1, function(tmr:FlxTimer)
{
FlxG.switchState(new PlayState());
});
weekSprites.members[curWeek].startFlashing();
weekSprites.members[event.weekID].startFlashing();
}
}

Expand Down

0 comments on commit c59eac3

Please sign in to comment.