yeah

assets/data/fridayText.txt

@@ -4,4 +4,5 @@ sex--sex
 ohhhh--i wont let you goooo
 thursday--oh no
 you lookin like a uhhhh--hrrrnnngghh
-i dont give a--phoque
+i dont give a--phoque
+week 69--sex lmfao

assets/data/introText.txt

@@ -87,4 +87,14 @@ bepis--bepis
 black pencil, green pencil--big banana pencil
 chamba machamba, chamba huiamba--amerima, minety
 domain expansion--cancerous cell multiplication
-very beautiful, very powerful
+very beautiful--very powerful
+imaginary technique--scope him like jfk
+hollow--nut
+eyyy caraaa--voceee chegouuuu
+snepis--snepis
+i wanna see--the pop zey
+two faces--two faces
+be the future--ride on, ride on
+haiyaaa--fuiyooo
+vsc--please spare me
+domain expansion--overdose on pepto bismol

source/backend/Localization.hx

@@ -110,7 +110,7 @@ class Localization
 
         var languageData:Dynamic = loadLanguageData(newLanguage);
 
-         if (languageData != null) {
+        if (languageData != null) {
             trace("yay! successfully loaded data for: " + newLanguage);
             currentLanguage = newLanguage;
             data.set(newLanguage, languageData);

source/debug/FPS.hx

@@ -19,7 +19,7 @@ class FPS extends TextField
 
 		addEventListener(openfl.events.Event.ENTER_FRAME, (_) ->
 		{
-			final now:Float = haxe.Timer.stamp() * 1000;
+			final now:Float = Timer.stamp() * 1000;
 			times.push(now);
 			while (times[0] < now - 1000) times.shift();
 

source/meta/data/ClientPrefs.hx

@@ -77,6 +77,7 @@ class ClientPrefs {
 	public static var sickWindow:Int = 45;
 	public static var goodWindow:Int = 90;
 	public static var badWindow:Int = 135;
+	public static var shitWindow:Int = 205;
 	public static var safeFrames:Float = 10;
 
 	//Every key has two binds, add your key bind down here and then add your control on options/ControlsSubState.hx and Controls.hx
@@ -139,6 +140,7 @@ class ClientPrefs {
 		FlxG.save.data.sickWindow = sickWindow;
 		FlxG.save.data.goodWindow = goodWindow;
 		FlxG.save.data.badWindow = badWindow;
+		FlxG.save.data.shitWindow = shitWindow;
 		FlxG.save.data.safeFrames = safeFrames;
 		FlxG.save.data.enableArtemis = enableArtemis;
 		FlxG.save.data.gameplaySettings = gameplaySettings;
@@ -276,6 +278,9 @@ class ClientPrefs {
 		if(FlxG.save.data.badWindow != null) {
 			badWindow = FlxG.save.data.badWindow;
 		}
+		if(FlxG.save.data.shitWindow != null) {
+			shitWindow = FlxG.save.data.shitWindow;
+		}
 		if(FlxG.save.data.safeFrames != null) {
 			safeFrames = FlxG.save.data.safeFrames;
 		}

source/meta/data/alphabet/Alphabet.hx

@@ -28,6 +28,7 @@ class Alphabet extends FlxTypedSpriteGroup<AlphaCharacter>
 	public var targetX:Float = 0;
 	public var changeX:Bool = true;
 	public var changeY:Bool = true;
+	public var disableX:Bool = false;
 	public var yMult:Float = 120;
 	public var xAdd:Float = 0;
 	public var yAdd:Float = 0;
@@ -47,6 +48,8 @@ class Alphabet extends FlxTypedSpriteGroup<AlphaCharacter>
 
 	public static var alphabet:Alphabet = null;
 
+	public var xTo:Int = 100;
+
 	public function new(x:Float, y:Float, text:String = "", ?bold:Bool = true, image:String = 'alphabet')
 	{
 		super(x, y);
@@ -196,6 +199,8 @@ class Alphabet extends FlxTypedSpriteGroup<AlphaCharacter>
 						x = FlxMath.lerp((targetY * distancePerItem.x) + startPosition.x, x, lerpVal);
 					if(changeY)
 						y = FlxMath.lerp((targetY * 1.3 * distancePerItem.y) + startPosition.y, y, lerpVal);
+
+					x = (!disableX) ? FlxMath.lerp(x, (targetY * 20) + 90, elapsed * 6) : FlxMath.lerp(x, xTo, elapsed * 6);
 			}
 
 			if (isMenuItemCentered)

source/meta/data/options/OptionsSubState.hx

@@ -3,8 +3,6 @@ package meta.data.options;
 import objects.shaders.*;
 import objects.userinterface.menu.*;
 
-import flixel.ui.FlxButton;
-
 class ControlsSubState extends MusicBeatSubstate {
 	private static var curSelected:Int = 1;
 	private static var curAlt:Bool = false;
@@ -644,7 +642,7 @@ class GameplaySubState extends BaseOptionsMenu
 		addOption(option);
 
 		var option:Option = new Option('Noteskin:',
-			"What should your notes look like?",
+			"What should your notes look like?\n(NOT ACTUALLY IMPLEMENTED FOR SOME REASON!!)",
 			'noteSkin',
 			'string',
 			'Default',
@@ -835,6 +833,15 @@ class GameplaySubState extends BaseOptionsMenu
 		addOption(option);
 
 		super();
+
+		windowBar = new FlxSprite((FlxG.width / 4) * 3 - 40, FlxG.height / 4 - 100).makeGraphic(80, 220, 0x00ffffff);
+		windowBar.visible = false;
+		windowBar.setGraphicSize(80, 440);
+		windowBar.updateHitbox();
+		windowBar.antialiasing = false;
+		insert(members.indexOf(descBox) - 1, windowBar);
+
+		changeOption('Sick Hit Window:');
 	}
 
 	override function changeSelection(change:Int = 0) {

source/meta/state/FlashingState.hx

@@ -10,7 +10,7 @@ class FlashingState extends MusicBeatState
 	{
 		super.create();
 
-		bg = new FlxSprite().loadGraphic(Paths.image('warning'));
+		bg = new FlxSprite().loadGraphic(Localization.getLocalizedImage('warning', ClientPrefs.lang));
 		add(bg);
 	}
 

source/meta/state/TitleState.hx

@@ -1,8 +1,6 @@
 package meta.state;
 
-import flixel.graphics.frames.FlxAtlasFrames;
 import flixel.graphics.frames.FlxFrame;
-
 import objects.shaders.*;
 
 typedef TitleData = 

source/minigames/FunkyMemory.hx

@@ -8,7 +8,7 @@ import flixel.input.mouse.FlxMouseEvent;
 
 class FunkyMemory extends MusicBeatState
 {
-	static inline final READY = "Ready to play";
+	static inline final READY = "Pick a card to start.";
 
 	private var NUMBER_OF_CARDS:Int = 24;
 	private var CARDS_PER_ROW:Int = 8;
@@ -24,13 +24,15 @@ class FunkyMemory extends MusicBeatState
 	{
 		super.create();
 
+		FlxG.mouse.visible = true;
         FlxG.sound.playMusic(Paths.music('breakfast'));
 
+		var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('stages/stage/stageback'));
+        bg.screenCenter();
+        add(bg);
+
 		for (i in 0...NUMBER_OF_CARDS)
-		{
 			cards.push(Math.floor(i / 2) + 1);
-		}
-		trace("My cards: " + cards);
 
 		var i:Int = NUMBER_OF_CARDS;
 		var swap:Int, tmp:Int;
@@ -41,7 +43,6 @@ class FunkyMemory extends MusicBeatState
 			cards[i] = cards[swap];
 			cards[swap] = tmp;
 		}
-		trace("My shuffled cards: " + cards);
 
 		for (i in 0...NUMBER_OF_CARDS)
 		{
@@ -68,21 +69,22 @@ class FunkyMemory extends MusicBeatState
 	{
 		super.update(elapsed);
 
-		if (((FlxG.mouse.justPressed) && (canResetGame)) || (controls.RESET))
+		if ((FlxG.mouse.justPressed && canResetGame) || controls.RESET)
 		{
 			MusicBeatState.resetState();
 		}
 
         if (controls.BACK)
         {
+			FlxG.mouse.visible = false;
+			FlxG.sound.playMusic(Paths.music('freakyMenu'));
             MusicBeatState.switchState(new MinigamesState());
-            FlxG.sound.playMusic(Paths.music('freakyMenu'));
         }
 	}
 
 	private function onMouseDown(picked:Card)
 	{
-		statusText.text = "You picked a " + minigames.C.color[picked.index] + " card";
+		statusText.text = "You picked a " + minigames.C.color[picked.index] + " card.";
 
 		if (canPick)
 		{
@@ -97,7 +99,7 @@ class FunkyMemory extends MusicBeatState
 				canPick = false;
 				if (pickedCards[0].index == pickedCards[1].index)
 				{
-					statusText.text = "Cards match!!!!";
+					statusText.text = "Cards match!";
 					FlxMouseEvent.remove(pickedCards[0]);
 					FlxMouseEvent.remove(pickedCards[1]);
 					canPick = true;
@@ -116,7 +118,7 @@ class FunkyMemory extends MusicBeatState
 				else
 				{
                     FlxG.sound.play(Paths.sound('cancelMenu'));
-					statusText.text = "Cards do not match";
+					statusText.text = "Oops! Cards don't match!";
 
 					Timer.delay(function()
 					{