From 3673011f85017815b34f43ef8bfedf04393c0328 Mon Sep 17 00:00:00 2001
From: CyndaquilDAC <65635932+CyndaquilDAC@users.noreply.github.com>
Date: Sat, 10 Jul 2021 22:54:04 -0500
Subject: [PATCH 1/5] Add gf to customize gameplay screen

---
 source/GameplayCustomizeState.hx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx
index 7bcfa31..da52a68 100644
--- a/source/GameplayCustomizeState.hx
+++ b/source/GameplayCustomizeState.hx
@@ -33,6 +33,7 @@ class GameplayCustomizeState extends MusicBeatState
 
     var bf:Boyfriend;
     var dad:Character;
+    var gf:Character;
 
     var strumLine:FlxSprite;
     var strumLineNotes:FlxTypedGroup<FlxSprite>;
@@ -74,10 +75,14 @@ class GameplayCustomizeState extends MusicBeatState
 
         bf = new Boyfriend(770, 450, 'bf');
 
+        gf = new Character(400, 130, 'gf');
+
+
 		var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x + 400, dad.getGraphicMidpoint().y);
 
 		camFollow.setPosition(camPos.x, camPos.y);
 
+        add(gf);
         add(bf);
         add(dad);
 

From 7eac3fdca7ae2c9ad789484d0255d71e6cd64918 Mon Sep 17 00:00:00 2001
From: CyndaquilDAC <65635932+CyndaquilDAC@users.noreply.github.com>
Date: Sat, 10 Jul 2021 22:55:05 -0500
Subject: [PATCH 2/5] oops forgot the gf scroll factor

---
 source/GameplayCustomizeState.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx
index da52a68..2748e85 100644
--- a/source/GameplayCustomizeState.hx
+++ b/source/GameplayCustomizeState.hx
@@ -76,7 +76,7 @@ class GameplayCustomizeState extends MusicBeatState
         bf = new Boyfriend(770, 450, 'bf');
 
         gf = new Character(400, 130, 'gf');
-
+		gf.scrollFactor.set(0.95, 0.95);
 
 		var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x + 400, dad.getGraphicMidpoint().y);
 

From ab0c9bfeb4d3a6c72eb54b08df5e4ee8b702b184 Mon Sep 17 00:00:00 2001
From: Spel0 <75626813+Spel0@users.noreply.github.com>
Date: Sun, 11 Jul 2021 22:29:57 +0300
Subject: [PATCH 3/5] flip

---
 source/AnimationDebug.hx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/AnimationDebug.hx b/source/AnimationDebug.hx
index 05b40d6..46d2188 100644
--- a/source/AnimationDebug.hx
+++ b/source/AnimationDebug.hx
@@ -118,6 +118,9 @@ class AnimationDebug extends FlxState
 		if (FlxG.keys.justPressed.Q)
 			FlxG.camera.zoom -= 0.25;
 
+		if (FlxG.keys.justPressed.F)
+			char.flipX = !char.flipX;
+
 		if (FlxG.keys.pressed.I || FlxG.keys.pressed.J || FlxG.keys.pressed.K || FlxG.keys.pressed.L)
 		{
 			if (FlxG.keys.pressed.I)

From 999cd0c0241cf0ede189b03dd06cd8a059b110ed Mon Sep 17 00:00:00 2001
From: CuckyDev <regan_green27@hotmail.com>
Date: Mon, 12 Jul 2021 03:09:18 -0400
Subject: [PATCH 4/5] Fix sustains more

---
 source/Note.hx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/source/Note.hx b/source/Note.hx
index d591bbe..472dbd2 100644
--- a/source/Note.hx
+++ b/source/Note.hx
@@ -178,6 +178,8 @@ class Note extends FlxSprite
 		if (FlxG.save.data.downscroll && sustainNote) 
 			flipY = true;
 
+		var stepHeight = (0.45 * Conductor.stepCrochet * FlxMath.roundDecimal(PlayStateChangeables.scrollSpeed == 1 ? PlayState.SONG.speed : PlayStateChangeables.scrollSpeed, 2));
+
 		if (isSustainNote && prevNote != null)
 		{
 			noteScore * 0.2;
@@ -202,19 +204,13 @@ class Note extends FlxSprite
 				prevNote.animation.play(dataColor[prevNote.originColor] + 'hold');
 				prevNote.updateHitbox();
 
-				prevNote.noteYOff = 0;
-				prevNote.scale.y *= (0.45 * Conductor.stepCrochet * FlxMath.roundDecimal(PlayStateChangeables.scrollSpeed == 1 ? PlayState.SONG.speed : PlayStateChangeables.scrollSpeed, 2)) / prevNote.height * 1.01; //The 1.01 is so that there aren't odd 1 pixel gaps as the notes scroll
+				prevNote.scale.y *= (stepHeight + 1) / prevNote.height; // + 1 so that there's no odd gaps as the notes scroll
 				prevNote.updateHitbox();
+				prevNote.noteYOff = Math.round(-prevNote.offset.y);
 
 				// prevNote.setGraphicSize();
 
-				switch (noteTypeCheck)
-				{
-					case 'pixel':
-						noteYOff = -13;
-					default:
-						noteYOff = -23;
-				}
+				noteYOff = Math.round(-offset.y);
 			}
 		}
 	}

From 6b4fa7de7ec1045f1d20df9917cea04955a1d710 Mon Sep 17 00:00:00 2001
From: CuckyDev <regan_green27@hotmail.com>
Date: Mon, 12 Jul 2021 03:15:06 -0400
Subject: [PATCH 5/5] Fix regular sustain offset

---
 source/PlayState.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/PlayState.hx b/source/PlayState.hx
index b985df0..5192b16 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -2825,9 +2825,9 @@ class PlayState extends MusicBeatState
 
 				if (daNote.isSustainNote)
 				{
-					daNote.x += daNote.width / 2 + 17;
+					daNote.x += daNote.width / 2 + 20;
 					if (PlayState.curStage.startsWith('school'))
-						daNote.x -= 8;
+						daNote.x -= 11;
 				}
 
 				// trace(daNote.y);