From b924d9d52e710e6fd156b0475484ea58594584c6 Mon Sep 17 00:00:00 2001
From: Vortex <73261680+Vortex2Oblivion@users.noreply.github.com>
Date: Sat, 7 Dec 2024 15:16:25 -0500
Subject: [PATCH] oopsie

---
 source/game/Note.hx        |  6 +++---
 source/states/PlayState.hx | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/source/game/Note.hx b/source/game/Note.hx
index 564ff72baf..ee0fb50077 100644
--- a/source/game/Note.hx
+++ b/source/game/Note.hx
@@ -235,9 +235,6 @@ class Note extends FlxSkewedSprite {
 					prevNote.animation.play("hold");
 
 
-				if (Options.getData("useCustomScrollSpeed"))
-					speed = Options.getData("customScrollSpeed") / PlayState.songMultiplier;
-
 				prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * speed;
 				prevNote.updateHitbox();
 				prevNote.sustainScaleY = prevNote.scale.y;
@@ -336,6 +333,9 @@ class Note extends FlxSkewedSprite {
 	}
 
 	@:noCompletion function set_speed(speed:Float):Float {
+		if(Options.getData("useCustomScrollSpeed")){
+			speed = Options.getData("customScrollSpeed") / PlayState.songMultiplier;
+		}
 		if(isSustainNote && !inEditor && animation != null && !animation?.curAnim?.name?.endsWith('end')){
 			scale.y = Std.parseFloat(PlayState.instance.ui_settings[0]) * (Std.parseFloat(PlayState.instance.ui_settings[2])
 			- (Std.parseFloat(PlayState.instance.mania_size[3])));
diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
index d04248d3c6..ecad248796 100644
--- a/source/states/PlayState.hx
+++ b/source/states/PlayState.hx
@@ -695,7 +695,7 @@ class PlayState extends MusicBeatState {
 		if (SONG.speed < 0)
 			SONG.speed = 0;
 
-		speed = Options.getData("useCustomScrollSpeed") ? Options.getData("customScrollSpeed") / songMultiplier : SONG.speed;
+		speed = SONG.speed;
 
 		Conductor.recalculateStuff(songMultiplier);
 		Conductor.safeZoneOffset *= songMultiplier; // makes the game more fair
@@ -1676,16 +1676,17 @@ class PlayState extends MusicBeatState {
 				for (susNote in 0...Math.floor(swagNote.sustainLength / Std.int(Conductor.stepCrochet))) {
 					oldNote = unspawnNotes[unspawnNotes.length - 1];
 
-					var sustainNote:Note = new Note(daStrumTime + (Conductor.stepCrochet * susNote) + (Conductor.stepCrochet / FlxMath.roundDecimal(speed,
-						2)), noteData, oldNote, true,
+					var sustainNote:Note = new Note(daStrumTime + (Conductor.stepCrochet * susNote) + (Conductor.stepCrochet / (Options.getData("downscroll") ? 1 :FlxMath.roundDecimal(speed,
+						2))), noteData, oldNote, true,
 						char, songNotes[4], null, chars, gottaHitNote);
-					sustainNote.scrollFactor.set();
-					unspawnNotes.push(sustainNote);
-
-					sustainNote.mustPress = gottaHitNote;
-
-					sustainGroup.push(sustainNote);
-					sustainNote.sustains = sustainGroup;
+						sustainNote.scrollFactor.set();
+						unspawnNotes.push(sustainNote);
+						
+						sustainNote.mustPress = gottaHitNote;
+						
+						sustainGroup.push(sustainNote);
+						sustainNote.sustains = sustainGroup;
+					}
 				}
 
 				swagNote.sustains = sustainGroup;
@@ -4388,6 +4389,9 @@ class PlayState extends MusicBeatState {
 	}
 
 	@:noCompletion function set_speed(speed:Float):Float {
+		if(Options.getData("useCustomScrollSpeed")){
+			speed = Options.getData("customScrollSpeed") / songMultiplier;
+		}
 		if (notes?.members != null && unspawnNotes != null) {
 			for (note in notes.members) {
 				note.speed = speed;