diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f39c89b3..84ecd5f0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [UNRELEASED] ### Fixed +- Crash when playing Week 3 and then playing a non-week 3 song - When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48)) - IDK i think backing out of song menu should play main menu songs again hehe ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48)) diff --git a/assets/images/lucky_guitar_assets.png b/assets/images/lucky_guitar_assets.png deleted file mode 100644 index d966134a2..000000000 Binary files a/assets/images/lucky_guitar_assets.png and /dev/null differ diff --git a/assets/images/lucky_guitar_assets.xml b/assets/images/lucky_guitar_assets.xml deleted file mode 100644 index 41b7d07e2..000000000 --- a/assets/images/lucky_guitar_assets.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/PlayState.hx b/source/PlayState.hx index 1a58bc483..408948235 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -135,6 +135,7 @@ class PlayState extends MusicBeatState if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south') { + curState = "spooky"; halloweenLevel = true; var hallowTex = FlxAtlasFrames.fromSparrow(AssetPaths.halloween_bg__png, AssetPaths.halloween_bg__xml); @@ -192,6 +193,7 @@ class PlayState extends MusicBeatState } else { + curStage = 'stage'; var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(AssetPaths.stageback__png); // bg.setGraphicSize(Std.int(bg.width * 2.5)); // bg.updateHitbox(); @@ -974,6 +976,7 @@ class PlayState extends MusicBeatState trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty); PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + difficulty, PlayState.storyPlaylist[0]); + FlxG.sound.music.stop(); FlxG.switchState(new PlayState()); } }