From a9fdf2510a98d0b0e1ad72b4d70987257054f6ee Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 13 Nov 2020 14:37:58 -0800
Subject: [PATCH] moved the intro texts to a txt file

---
 CHANGELOG.md              |  1 +
 Project.xml               |  2 +-
 assets/data/introText.txt | 23 +++++++++++++++++++++++
 source/TitleState.hx      | 27 +++++++++++++++++----------
 4 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 assets/data/introText.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2944f1b8c..cdc98523c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Cleaned up some charting on South on hard mode
 - Fixed some animation timings, should feel both better to play, and watch.
+- Maaaybe fixed notes popping up randomly at the top of the screen for a frame or two? If this isn't fixed, uhh yall shout at me lolol
 
 ## [0.2.1.2] - 2020-11-06
 ### Fixed
diff --git a/Project.xml b/Project.xml
index e87c97ed4..e155283d0 100644
--- a/Project.xml
+++ b/Project.xml
@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.1.2" company="ninjamuffin99" />
+	<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.2" company="ninjamuffin99" />
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
 		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
diff --git a/assets/data/introText.txt b/assets/data/introText.txt
new file mode 100644
index 000000000..b075e53b6
--- /dev/null
+++ b/assets/data/introText.txt
@@ -0,0 +1,23 @@
+shoutouts to tom fulp--lmao
+Ludum dare--extraordinaire
+cyberzone--coming soon
+love to thriftman--swag
+ultimate rhythm gaming--probably
+dope ass game--playstation magazine
+in loving memory of--henryeyes
+dancin--forever
+funkin--forever
+ritz dx--rest in peace lol
+rate five--pls no blam
+rhythm gaming--ultimate
+game of the year--forever
+you already know--we really out here
+rise and grind--love to luis
+like parappa--but cooler
+album of the year--chuckie finster
+free gitaroo man--with love to wandaboy
+better than geometry dash--fight me robtop
+kiddbrute for president--vote now
+play dead estate--on newgrounds
+this is a god damn prototype--we workin on it okay
+women are real--this is official
\ No newline at end of file
diff --git a/source/TitleState.hx b/source/TitleState.hx
index f783a9b18..519d92bf2 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -20,6 +20,7 @@ import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxColor;
 import flixel.util.FlxTimer;
+import lime.utils.Assets;
 
 class TitleState extends MusicBeatState
 {
@@ -32,15 +33,6 @@ class TitleState extends MusicBeatState
 	var textGroup:FlxGroup;
 	var ngSpr:FlxSprite;
 
-	var wackyIntros:Array<Array<String>> = [
-		['Shoutouts to tom fulp', 'lmao'], ["Ludum dare", "extraordinaire"], ['Cyberzone', 'coming soon'], ['love to thriftman', 'swag'],
-		['ULTIMATE RHYTHM GAMING', 'probably'], ['DOPE ASS GAME', 'playstation magazine'], ['in loving memory of', 'henryeyes'], ['dancin', 'forever'],
-		['Ritz dx', 'rest in peace'], ['rate five', 'pls no blam'], ['rhythm gaming', 'ultimate'], ['game of the year', 'forever'],
-		['you already know', 'we really out here'], ['rise and grind', 'love to luis'], ['like parappa', 'but cooler'],
-		['album of the year', 'chuckie finster'], ["free gitaroo man", "with love to wandaboy"], ['better than geometry dash', 'fight me robtop'],
-		['kiddbrute for president', 'vote now'], ['play dead estate', 'on newgrounds'], ['this a god damn prototype', 'we workin on it okay'],
-		['WOMEN ARE real', 'this is official']];
-
 	var curWacky:Array<String> = [];
 
 	var wackyImage:FlxSprite;
@@ -53,7 +45,7 @@ class TitleState extends MusicBeatState
 
 		PlayerSettings.init();
 
-		curWacky = FlxG.random.getObject(wackyIntros);
+		curWacky = FlxG.random.getObject(getIntroTextShit());
 
 		// DEBUG BULLSHIT
 
@@ -193,6 +185,21 @@ class TitleState extends MusicBeatState
 		// credGroup.add(credTextShit);
 	}
 
+	function getIntroTextShit():Array<Array<String>>
+	{
+		var fullText:String = Assets.getText('assets/data/introText.txt');
+
+		var firstArray:Array<String> = fullText.split('\n');
+		var swagGoodArray:Array<Array<String>> = [];
+
+		for (i in firstArray)
+		{
+			swagGoodArray.push(i.split('--'));
+		}
+
+		return swagGoodArray;
+	}
+
 	var transitioning:Bool = false;
 
 	override function update(elapsed:Float)