From c823bba3d18c14d4c18dba50c2013bb79fa0b595 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Thu, 1 May 2025 22:03:50 -0400 Subject: [PATCH] Fix some merge conflict issues --- source/funkin/ui/freeplay/CapsuleOptionsMenu.hx | 4 ---- source/funkin/ui/freeplay/FreeplayState.hx | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx b/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx index 095f6352f..31b803982 100644 --- a/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx +++ b/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx @@ -29,10 +29,6 @@ class CapsuleOptionsMenu extends FlxSpriteGroup var leftArrow:InstrumentalSelector; var rightArrow:InstrumentalSelector; - var leftArrow:InstrumentalSelector; - - var rightArrow:InstrumentalSelector; - public function new(parent:FreeplayState, x:Float = 0, y:Float = 0, instIds:Array):Void { super(x, y); diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index c58fcb0d7..29be0f703 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -2387,7 +2387,7 @@ class FreeplayState extends MusicBeatSubState capsule.selected = false; capsule.forceHighlight = index == curSelected + 1; - capsule.targetPos.y = capsule.intendedY(index - curSelectedFloat); + capsule.targetPos.y = capsule.intendedY(index - curSelected); capsule.targetPos.x = (270 + (60 * (Math.sin(index - curSelectedFloat)))) + (CUTOUT_WIDTH * SONGS_POS_MULTI); }