diff --git a/assets/music/Blammed_Inst.ogg b/assets/music/Blammed_Inst.ogg new file mode 100644 index 000000000..83778844d Binary files /dev/null and b/assets/music/Blammed_Inst.ogg differ diff --git a/assets/music/Blammed_Voices.ogg b/assets/music/Blammed_Voices.ogg new file mode 100644 index 000000000..bd4d223fa Binary files /dev/null and b/assets/music/Blammed_Voices.ogg differ diff --git a/assets/music/Pico_Inst.ogg b/assets/music/Pico_Inst.ogg new file mode 100644 index 000000000..1b5daa3b8 Binary files /dev/null and b/assets/music/Pico_Inst.ogg differ diff --git a/assets/music/Pico_Voices.ogg b/assets/music/Pico_Voices.ogg new file mode 100644 index 000000000..25406db8f Binary files /dev/null and b/assets/music/Pico_Voices.ogg differ diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 795091ffa..9db9c9a84 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -12,7 +12,7 @@ import lime.utils.Assets; class FreeplayState extends MusicBeatState { - var songs:Array = ["Bopeebo", "Dadbattle", "Fresh", "Tutorial"]; + var songs:Array = ["Pico", "Bopeebo", "Dadbattle", "Fresh", "Tutorial"]; var selector:FlxText; var curSelected:Int = 0; diff --git a/source/PlayState.hx b/source/PlayState.hx index 773bdd136..eb1380261 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -578,9 +578,9 @@ class PlayState extends MusicBeatState { if (FlxG.sound.music != null) { - vocals.time = Conductor.songPosition; - FlxG.sound.music.play(); + Conductor.songPosition = FlxG.sound.music.time; + vocals.time = Conductor.songPosition; vocals.play(); }