From 968c5b7a5087d4b9d78e3ca5e42986e9af11fcab Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 5 Jan 2023 23:37:08 -0500
Subject: [PATCH] can spin wahoo! also merge fixes hehe

---
 source/funkin/FreeplayState.hx                        |  8 +++++---
 source/funkin/play/PlayState.hx                       |  5 +++--
 .../funkin/ui/stageBuildShit/StageOffsetSubstate.hx   | 11 -----------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/source/funkin/FreeplayState.hx b/source/funkin/FreeplayState.hx
index 60d8f71c6..57231dd20 100644
--- a/source/funkin/FreeplayState.hx
+++ b/source/funkin/FreeplayState.hx
@@ -411,19 +411,21 @@ class FreeplayState extends MusicBeatSubstate
 
 			// fp.updateScore(0);
 
-			new FlxTimer().start((1 / 24) * i, function(doShit)
+			var maxTimer:Float = Math.min(i, 4);
+
+			new FlxTimer().start((1 / 24) * maxTimer, function(doShit)
 			{
 				funnyMenu.doJumpIn = true;
 			});
 
-			new FlxTimer().start((0.09 * i) + 0.85, function(lerpTmr)
+			new FlxTimer().start((0.09 * maxTimer) + 0.85, function(lerpTmr)
 			{
 				funnyMenu.doLerp = true;
 			});
 
 			if (!force)
 			{
-				new FlxTimer().start(((0.20 * i) / (1 + i)) + 0.75, function(swagShi)
+				new FlxTimer().start(((0.20 * maxTimer) / (1 + maxTimer)) + 0.75, function(swagShi)
 				{
 					funnyMenu.songText.visible = true;
 					funnyMenu.alpha = 1;
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index f5fff3cf5..e846c9b43 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -1820,7 +1820,7 @@ class PlayState extends MusicBeatState
 
 		var daBPM:Float = currentSong.bpm;
 		var daPos:Float = 0;
-		for (i in 0...(Std.int(curStep / 16 + sec)))
+		for (i in 0...(Std.int(Conductor.currentStep / 16 + sec)))
 		{
 			var section = SongLoad.getSong()[i];
 			if (section == null)
@@ -1833,7 +1833,8 @@ class PlayState extends MusicBeatState
 		}
 		Conductor.songPosition = FlxG.sound.music.time = daPos;
 		Conductor.songPosition += Conductor.offset;
-		updateCurStep();
+		// updateCurStep();
+		Conductor.update(Conductor.songPosition);
 		resyncVocals();
 	}
 	#end
diff --git a/source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx b/source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx
index a7c8cff5f..c5c67f472 100644
--- a/source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx
+++ b/source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx
@@ -2,21 +2,10 @@ package funkin.ui.stageBuildShit;
 
 import flixel.FlxSprite;
 import flixel.input.mouse.FlxMouseEvent;
-<<<<<<< HEAD
-import flixel.input.mouse.FlxMouseEventManager;
-=======
->>>>>>> origin/feature/week-4-gameplay
 import flixel.math.FlxPoint;
 import funkin.play.PlayState;
-<<<<<<< HEAD
-import funkin.play.stage.StageData.StageDataParser;
 import funkin.play.stage.StageData;
 import haxe.ui.RuntimeComponentBuilder;
-import haxe.ui.containers.VBox;
-=======
-import funkin.play.stage.StageData;
-import haxe.ui.RuntimeComponentBuilder;
->>>>>>> origin/feature/week-4-gameplay
 import haxe.ui.core.Component;
 import openfl.events.Event;
 import openfl.events.IOErrorEvent;