From 48f916240f5b7f2e0909a4db9d2d236ebbba1a3a Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Mon, 18 Dec 2023 21:33:29 -0500
Subject: [PATCH] playstate import fixes and asset update

---
 assets                          | 2 +-
 source/funkin/play/PlayState.hx | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/assets b/assets
index 200fa60df..2cba31629 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 200fa60dfb116bda6c438b0bb3e9ad541b2180ea
+Subproject commit 2cba3162990db807be054889b23cf214a1d8dd2d
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 9fa6929d9..5f53e9388 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -38,7 +38,7 @@ import openfl.geom.Rectangle;
 import funkin.audio.VoicesGroup;
 import funkin.save.Save;
 import funkin.Highscore.Tallies;
-import funkin.NoteSplash;
+import funkin.play.notes.NoteSplash;
 import funkin.audio.VoicesGroup;
 import funkin.data.notestyle.NoteStyleRegistry;
 import funkin.input.PreciseInputManager;
@@ -71,6 +71,8 @@ import funkin.ui.debug.stage.StageOffsetSubState;
 import funkin.ui.story.StoryMenuState;
 import funkin.util.SerializerUtil;
 import lime.ui.Haptic;
+import funkin.play.cutscene.dialogue.Conversation;
+import funkin.play.cutscene.dialogue.ConversationDataParser;
 #if discord_rpc
 import Discord.DiscordClient;
 #end