moved flash files

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [UNRELEASED]
+### Added
+- Different icons depending on which character you are against
 ### Fixed
 - Crash when playing Week 3 and then playing a non-week 3 song
 - When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))

assets/data/high/high.json

@@ -0,0 +1 @@
+{"song":{"song":"High","notes":[{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[3840,0,0],[4320,0,0],[4560,3,0],[4800,2,0],[4920,0,0],[5160,3,0],[5520,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[5760,0,0],[6240,0,0],[6480,3,0],[6720,2,0],[6840,0,0],[7080,3,0],[7440,0,0],[7560,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[7680,0,0],[8160,0,0],[8400,3,0],[8640,2,0],[8760,3,0],[9000,0,0],[9360,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[9600,2,0],[9720,3,0],[9840,2,0],[9960,3,0],[10080,0,0],[10320,0,0],[10440,1,0],[10560,3,0],[10800,2,0],[11040,2,0],[11160,3,0],[11280,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[11520,0,0],[12000,0,0],[12240,3,0],[12480,2,0],[12600,0,0],[12840,3,0],[13200,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[13440,0,0],[13920,0,0],[14160,3,0],[14400,2,0],[14520,0,0],[14760,3,0],[15120,0,0],[15240,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[15360,0,0],[15840,0,0],[16080,3,0],[16320,2,0],[16440,3,0],[16680,0,0],[17040,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[17280,2,0],[17400,3,0],[17520,2,0],[17640,3,0],[17760,0,0],[18000,0,0],[18120,1,0],[18240,3,0],[18480,2,0],[18720,2,0],[18960,0,0],[17280,6,360],[17760,7,360],[18240,5,360],[18720,7,360]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[19200,2,0],[19440,1,0],[19560,0,0],[19680,3,0],[20040,1,0],[20160,3,0],[20520,3,0],[20760,3,0],[20880,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[21120,2,0],[21360,1,0],[21480,0,0],[21600,3,0],[21960,1,0],[22080,0,0],[22440,3,0],[22800,2,0],[22920,0,0],[22200,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[23280,0,0],[23400,2,0],[23520,3,0],[23880,3,0],[24000,2,0],[24360,2,0],[24720,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[24960,2,0],[25080,3,0],[25200,0,0],[25440,2,0],[25680,0,0],[25920,2,0],[26040,3,0],[26160,0,0],[26280,1,0],[26400,3,0],[26520,0,0],[26640,1,0],[26760,3,0],[24960,6,360],[25440,7,360],[25920,4,360],[26400,5,360]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[26880,2,0],[27120,1,0],[27240,0,0],[27360,3,0],[27720,1,0],[27840,3,0],[28200,3,0],[28440,3,0],[28560,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[28800,2,0],[29040,1,0],[29160,0,0],[29280,3,0],[29640,1,0],[29760,0,0],[30120,3,0],[30480,2,0],[30600,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[30960,0,0],[31080,2,0],[31200,3,0],[31560,3,0],[31680,2,0],[32040,2,0],[32400,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[32640,2,0],[32760,3,0],[32880,0,0],[33120,2,0],[33360,0,0],[33600,2,0],[33720,3,0],[33840,0,0],[33960,1,0],[34080,3,0],[34200,0,0],[34320,1,0],[34440,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":125,"changeBPM":false,"mustHitSecLine truncated

assets/data/milf/milf.json

@@ -1 +1 @@
-{"song":{"song":"Milf","notes":[{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[2666.6666666666665,1,0],[3000,1,0],[3333.333333333333,1,0],[3416.6666666666665,0,0],[3500,3,0],[3583.333333333333,2,157.89473684210526],[3833.333333333333,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[4166.666666666667,1,0],[4500,1,0],[4666.666666666666,3,0],[4833.333333333333,1,0],[5000,0,0],[5166.666666666666,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[5333.333333333333,1,0],[5666.666666666666,1,0],[6000,1,0],[6083.333333333333,0,0],[6166.666666666666,3,0],[6250,2,157.89473684210526],[6500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[6833.333333333334,1,0],[7166.666666666666,1,0],[7333.333333333332,3,0],[7500,1,0],[7666.666666666666,2,0],[7749.999999999999,3,0],[7833.333333333332,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[8000,1,0],[8333.333333333332,1,0],[8666.666666666666,1,0],[8750,0,0],[8833.333333333332,3,0],[8916.666666666666,2,157.89473684210526],[9166.666666666666,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[9500,1,0],[9833.333333333332,1,0],[10000,3,0],[10166.666666666666,1,0],[10333.333333333332,0,0],[10500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[10666.666666666666,1,0],[11000,1,0],[11333.333333333332,1,0],[11416.666666666666,0,0],[11500,3,0],[11583.333333333332,2,157.89473684210526],[11833.333333333332,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[12166.666666666668,1,0],[12500,1,0],[12666.666666666664,3,0],[12833.333333333332,1,0],[13000,2,0],[13083.333333333332,3,0],[13166.666666666664,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[13333.333333333332,2,666.6666666666666],[14333.333333333332,1,0],[14499.999999999998,3,416.6666666666667]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[15250,2,166.66666666666666],[15500,0,0],[15833.333333333332,1,249.99999999999997]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[16166.666666666666,0,0],[16250,3,0],[16333.333333333334,1,249.99999999999997],[16666.666666666668,2,333.3333333333333],[17000,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[17333.333333333332,3,0],[17500,3,0],[17583.333333333332,2,0],[17666.666666666664,0,0],[17833.333333333332,1,0],[18000,3,0],[18166.666666666664,2,0],[18333.333333333332,0,0],[18500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[18666.666666666664,2,666.6666666666666],[19666.666666666664,1,0],[19833.333333333332,3,416.6666666666667]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[20583.333333333332,2,166.66666666666666],[20833.333333333332,0,0],[21166.666666666664,1,249.99999999999997]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[21500,0,0],[21583.333333333332,3,0],[21666.666666666668,1,249.99999999999997],[22000,2,333.3333333333333],[22333.333333333332,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[22666.666666666664,3,0],[22833.333333333332,3,0],[22916.666666666664,2,0],[22999.999999999996,0,0],[23166.666666666664,1,0],[23333.333333333332,3,0],[23499.999999999996,2,0],[23666.666666666664,0,0],[23833.333333333332,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[24000,1,0],[24083.333333333332,3,0],[24166.666666666668,0,0],[24250,3,0],[24500,3,0],[25166.666666666668,0,0],[24666.666666666668,1,0],[24833.333333333332,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[25500,2,0],[25833.333333333332,1,0],[25666.666666666664,3,83.33333333333334],[26083.333333333332,1,0],[26250,1,0],[26500,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[26666.666666666668,1,0],[26750,3,0],[26833.333333333336,0,0],[26916.666666666668,3,0],[27166.666666666668,3,0],[27416.666666666664,1,0],[27583.333333333332,1,0],[27833.333333333332,2,249.99999999999997]],"typeOfSectioLine truncated
+{"song":{"song":"Milf","notes":[{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[2666.6666666666665,1,0],[3000,1,0],[3333.333333333333,1,0],[3416.6666666666665,0,0],[3500,3,0],[3583.333333333333,2,157.89473684210526],[3833.333333333333,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[4166.666666666667,1,0],[4500,1,0],[4666.666666666666,3,0],[4833.333333333333,1,0],[5000,0,0],[5166.666666666666,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[5333.333333333333,1,0],[5666.666666666666,1,0],[6000,1,0],[6083.333333333333,0,0],[6166.666666666666,3,0],[6250,2,157.89473684210526],[6500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[6833.333333333334,1,0],[7166.666666666666,1,0],[7333.333333333332,3,0],[7500,1,0],[7666.666666666666,2,0],[7749.999999999999,3,0],[7833.333333333332,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[8000,1,0],[8333.333333333332,1,0],[8666.666666666666,1,0],[8750,0,0],[8833.333333333332,3,0],[8916.666666666666,2,157.89473684210526],[9166.666666666666,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[9500,1,0],[9833.333333333332,1,0],[10000,3,0],[10166.666666666666,1,0],[10333.333333333332,0,0],[10500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[10666.666666666666,1,0],[11000,1,0],[11333.333333333332,1,0],[11416.666666666666,0,0],[11500,3,0],[11583.333333333332,2,157.89473684210526],[11833.333333333332,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[12166.666666666668,1,0],[12500,1,0],[12666.666666666664,3,0],[12833.333333333332,1,0],[13000,2,0],[13083.333333333332,3,0],[13166.666666666664,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[13333.333333333332,2,666.6666666666666],[14333.333333333332,1,0],[14499.999999999998,3,416.6666666666667]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[15250,2,166.66666666666666],[15500,0,0],[15833.333333333332,1,249.99999999999997]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[16166.666666666666,0,0],[16250,3,0],[16333.333333333334,1,249.99999999999997],[16666.666666666668,2,333.3333333333333],[17000,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[17333.333333333332,3,0],[17500,3,0],[17583.333333333332,2,0],[17666.666666666664,0,0],[17833.333333333332,1,0],[18000,3,0],[18166.666666666664,2,0],[18333.333333333332,0,0],[18500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[18666.666666666664,2,666.6666666666666],[19666.666666666664,1,0],[19833.333333333332,3,416.6666666666667]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[20583.333333333332,2,166.66666666666666],[20833.333333333332,0,0],[21166.666666666664,1,249.99999999999997]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[21500,0,0],[21583.333333333332,3,0],[21666.666666666668,1,249.99999999999997],[22000,2,333.3333333333333],[22333.333333333332,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[22666.666666666664,3,0],[22833.333333333332,3,0],[22916.666666666664,2,0],[22999.999999999996,0,0],[23166.666666666664,1,0],[23333.333333333332,3,0],[23499.999999999996,2,0],[23666.666666666664,0,0],[23833.333333333332,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[24000,1,0],[24083.333333333332,3,0],[24166.666666666668,0,0],[24250,3,0],[24500,3,0],[25166.666666666668,0,0],[24666.666666666668,1,0],[24833.333333333332,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[25500,2,0],[25833.333333333332,1,0],[25666.666666666664,3,83.33333333333334],[26083.333333333332,1,0],[26250,1,0],[26500,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":180,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[26666.666666666668,1,0],[26750,3,0],[26833.333333333336,0,0],[26916.666666666668,3,0],[27166.666666666668,3,0],[27416.666666666664,1,0],[27583.333333333332,1,0],[27833.333333333332,2,249.99999999999997]],"typeOfSectioLine truncated

source/FreeplayState.hx

@@ -12,7 +12,7 @@ import lime.utils.Assets;
 
 class FreeplayState extends MusicBeatState
 {
-	var songs:Array<String> = ["Bopeebo", "Dadbattle", "Fresh", "Tutorial"];
+	var songs:Array<String> = ["Milf", "Bopeebo", "Dadbattle", "Fresh", "Tutorial"];
 
 	var selector:FlxText;
 	var curSelected:Int = 0;

source/HealthIcon.hx

@@ -0,0 +1,25 @@
+package;
+
+import flixel.FlxSprite;
+
+class HealthIcon extends FlxSprite
+{
+	public function new(char:String = 'bf', isPlayer:Bool = false)
+	{
+		super();
+
+		loadGraphic(AssetPaths.iconGrid__png, true, 150, 150);
+
+		antialiasing = true;
+		animation.add('bf', [0, 1], 0, false, isPlayer);
+		animation.add('spooky', [2, 3], 0, false, isPlayer);
+		animation.add('pico', [4, 5], 0, false, isPlayer);
+		animation.add('mom', [6, 7], 0, false, isPlayer);
+		animation.add('tankman', [8, 9], 0, false, isPlayer);
+		animation.add('face', [10, 11], 0, false, isPlayer);
+		animation.add('dad', [12, 13], 0, false, isPlayer);
+		animation.add('bf-old', [14, 15], 0, false, isPlayer);
+		animation.play(char);
+		scrollFactor.set();
+	}
+}

source/PlayState.hx

@@ -73,7 +73,8 @@ class PlayState extends MusicBeatState
 	private var generatedMusic:Bool = false;
 	private var startingSong:Bool = false;
 
-	private var healthHeads:FlxSprite;
+	private var iconP1:HealthIcon;
+	private var iconP2:HealthIcon;
 	private var camHUD:FlxCamera;
 	private var camGame:FlxCamera;
 
@@ -309,17 +310,14 @@ class PlayState extends MusicBeatState
 		scoreTxt.scrollFactor.set();
 		add(scoreTxt);
 
-		healthHeads = new FlxSprite();
+		iconP1 = new HealthIcon(SONG.player1, true);
-		var headTex = FlxAtlasFrames.fromSparrow(AssetPaths.healthHeads__png, AssetPaths.healthHeads__xml);
+		iconP1.y = healthBar.y - (iconP1.height / 2);
-		healthHeads.frames = headTex;
+		add(iconP1);
-		healthHeads.animation.add('healthy', [0]);
+
-		healthHeads.animation.add('unhealthy', [1]);
+		iconP2 = new HealthIcon(SONG.player2, false);
-		healthHeads.y = healthBar.y - (healthHeads.height / 2);
+		iconP2.y = healthBar.y - (iconP2.height / 2);
-		healthHeads.scrollFactor.set();
+		add(iconP2);
-		healthHeads.antialiasing = true;
-		add(healthHeads);
 
-		// healthBar.visible = healthHeads.visible = healthBarBG.visible = false;
 		if (isStoryMode)
 		{
 			// TEMP for now, later get rid of startCountdown()
@@ -333,7 +331,8 @@ class PlayState extends MusicBeatState
 		notes.cameras = [camHUD];
 		healthBar.cameras = [camHUD];
 		healthBarBG.cameras = [camHUD];
-		healthHeads.cameras = [camHUD];
+		iconP1.cameras = [camHUD];
+		iconP2.cameras = [camHUD];
 		scoreTxt.cameras = [camHUD];
 		doof.cameras = [camHUD];
 
@@ -663,8 +662,10 @@ class PlayState extends MusicBeatState
 
 		if (FlxG.keys.justPressed.NINE)
 		{
-			perfectMode = !perfectMode;
+			if (iconP1.animation.curAnim.name == 'bf-old')
-			trace('PERFECT MODE! ' + perfectMode);
+				iconP1.animation.play(SONG.player1);
+			else
+				iconP1.animation.play('bf-old');
 		}
 
 		switch (curStage)
@@ -705,17 +706,24 @@ class PlayState extends MusicBeatState
 		// FlxG.watch.addQuick('VOL', vocals.amplitudeLeft);
 		// FlxG.watch.addQuick('VOLRight', vocals.amplitudeRight);
 
-		healthHeads.setGraphicSize(Std.int(FlxMath.lerp(150, healthHeads.width, 0.50)));
+		iconP1.setGraphicSize(Std.int(FlxMath.lerp(150, iconP1.width, 0.50)));
-		healthHeads.updateHitbox();
+		iconP2.setGraphicSize(Std.int(FlxMath.lerp(150, iconP2.width, 0.50)));
-		healthHeads.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 100, 0) * 0.01)) - (healthHeads.width / 2);
+
+		iconP1.updateHitbox();
+		iconP2.updateHitbox();
+
+		var iconOffset:Int = 26;
+
+		iconP1.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 100, 0) * 0.01) - iconOffset);
+		iconP2.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 100, 0) * 0.01)) - (iconP2.width - iconOffset);
 
 		if (health > 2)
 			health = 2;
 
 		if (healthBar.percent < 20)
-			healthHeads.animation.play('unhealthy');
+			iconP1.animation.curAnim.curFrame = 1;
 		else
-			healthHeads.animation.play('healthy');
+			iconP1.animation.curAnim.curFrame = 0;
 
 		/* if (FlxG.keys.justPressed.NINE)
 			FlxG.switchState(new Charting()); */
@@ -914,7 +922,7 @@ class PlayState extends MusicBeatState
 					daNote.destroy();
 				}
 
-				daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (0.45 * PlayState.SONG.speed));
+				daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(PlayState.SONG.speed, 2)));
 
 				// WIP interpolation shit? Need to fix the pause issue
 				// daNote.y = (strumLine.y - (songTime - daNote.strumTime) * (0.45 * PlayState.SONG.speed));
@@ -1526,8 +1534,11 @@ class PlayState extends MusicBeatState
 			camHUD.zoom += 0.03;
 		}
 
-		healthHeads.setGraphicSize(Std.int(healthHeads.width + 30));
+		iconP1.setGraphicSize(Std.int(iconP1.width + 30));
-		healthHeads.updateHitbox();
+		iconP2.setGraphicSize(Std.int(iconP2.width + 30));
+
+		iconP1.updateHitbox();
+		iconP2.updateHitbox();
 
 		if (totalBeats % gfSpeed == 0)
 		{