im tired

MaybeMaru · Dec 20, 2023 · 4de0b5f · 4de0b5f
1 parent d781f8d
commit 4de0b5f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/art/flashFiles/UI/NOTE_assets_small.fla b/art/flashFiles/UI/NOTE_assets_small.fla
diff --git a/assets/shared/images/skins/default/watermark.png b/assets/shared/images/skins/default/watermark.png
diff --git a/source/funkin/objects/note/BasicNote.hx b/source/funkin/objects/note/BasicNote.hx
@@ -46,6 +46,7 @@ class BasicNote extends SmartSprite implements INoteData {
         this.strumTime = strumTime;
         this.skin = skin;
         approachAngle = Preferences.getPref('downscroll') ? 180 : 0;
+        moves = false; // Save on velocity calculation
     }
 
     override function update(elapsed:Float) {

diff --git a/source/funkin/objects/note/NoteSplash.hx b/source/funkin/objects/note/NoteSplash.hx
@@ -29,6 +29,7 @@ class NoteSplash extends FlxSpriteExt implements INoteData {
         loadSkin();
         alpha = 0.6;
         setupNoteSplash(x,y,noteData);
+        moves = false;
 	}
 
 	public function setupNoteSplash(X:Float, Y:Float, noteData:Int = 0, ?note:Note):Void {

diff --git a/source/funkin/states/editors/chart/ChartStrumLine.hx b/source/funkin/states/editors/chart/ChartStrumLine.hx
@@ -31,7 +31,7 @@ class ChartStrumLine extends FlxTypedSpriteGroup<Dynamic> {
         updateWithData();
     }
 
-    var midX = GRID_SIZE * 2;
+    static final midX = GRID_SIZE * 2;
 
     // Caching shit
     var charIcons:Map<String, String> = [];
@@ -58,8 +58,8 @@ class ChartStrumLine extends FlxTypedSpriteGroup<Dynamic> {
             i.updateHitbox();
         }
 
-        iconP1.setPosition(x + (midX - (iconP1.width * 0.5)) + (mustHit ? 0 : midX * 2), y - 60);
-        iconP2.setPosition(x + (midX - (iconP2.width * 0.5)) + (mustHit ? midX * 2 : 0), y - 60);
+        iconP1.setPosition(x + (midX - (iconP1.width * 0.5)) + (mustHit ? 0 : midX * 2), y - iconP1.height);
+        iconP2.setPosition(x + (midX - (iconP2.width * 0.5)) + (mustHit ? midX * 2 : 0), y - iconP2.height);
     }
 
     public function pressStrum(data:Int = 0) {

diff --git a/source/funkin/states/menus/TitleState.hx b/source/funkin/states/menus/TitleState.hx
@@ -66,9 +66,13 @@ class TitleState extends MusicBeatState {
 		titleText.screenCenter(X);
 		titleGroup.add(titleText);
 
-		blackScreen = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
-		add(blackScreen);
+		blackScreen = new FlxSprite().makeGraphic(1, 1, FlxColor.BLACK);
+		blackScreen.scale.set(FlxG.width,FlxG.height);
+		blackScreen.updateHitbox();
+		blackScreen.antialiasing = false;
+		blackScreen.active = false;
 		blackScreen.visible = !initialized;
+		add(blackScreen);
 
 		textSprite = new Alphabet(FlxG.width * 0.5, FlxG.height * 0.25,'');
 		textSprite.alignment = CENTER;

diff --git a/source/funkin/substates/PauseSubState.hx b/source/funkin/substates/PauseSubState.hx
@@ -33,6 +33,7 @@ class PauseSubState extends MusicBeatSubstate {
 		bg.antialiasing = false;
 		bg.scale.set(FlxG.width, FlxG.height);
 		bg.updateHitbox();
+		bg.active = false;
 		add(bg);
 
 		final levelInfo:FunkinText = new FunkinText(20,15,PlayState.SONG.song,32);