again conflict

.gitignore

@@ -1,2 +1,3 @@
 export/
 .vscode/
+assets/preload/data/milf/modchart.lua

README.md

@@ -21,7 +21,7 @@ Links: **[GameBanana mod page](https://gamebanana.com/gamefiles/16761) ⋅ [play
 ## Website ([KadeDev.github.io/kade-engine/](https://KadeDev.github.io/Kade-Engine/))
 If you're looking for documentation, changelogs, or guides, you can find those on the Kade Engine website.
 
-# Screenshots ([skip](#features))
+# Previews ([skip](#features))
 
 ![Tutorial (Hard) on Downscroll](https://user-images.githubusercontent.com/15311104/113989685-fa5aea80-9850-11eb-9180-f5819a774c79.gif) ![Milf (Hard) on Downscroll](https://user-images.githubusercontent.com/15311104/113990845-2c208100-9852-11eb-8e6d-f1c9e8439871.gif)
 

assets/preload/data/freeplaySonglist.txt

@@ -1,19 +1,19 @@
 Tutorial:gf:1
 Bopeebo:dad:1
 Fresh:dad:1
-Dadbattle:dad:1
+Dad Battle:dad:1
 Spookeez:spooky:2
 South:spooky:2
 Monster:monster:2
 Pico:pico:3
-Philly:pico:3
+Philly Nice:pico:3
 Blammed:pico:3
-Satin-Panties:mom:4
+Satin Panties:mom:4
 High:mom:4
 Milf:mom:4
 Cocoa:parents-christmas:5
 Eggnog:parents-christmas:5
-Winter-Horrorland:monster-christmas:5
+Winter Horrorland:monster-christmas:5
 Senpai:senpai:6
 Roses:senpai:6
 Thorns:spirit:6

source/Alphabet.hx

@@ -238,7 +238,7 @@ class AlphaCharacter extends FlxSprite
 
 	public static var numbers:String = "1234567890";
 
-	public static var symbols:String = "|~#$%()*+-:;<=>@[]^_.,'!?";
+	public static var symbols:String = "|~#$%()*+-:;<=>@[]^_.,'!? ";
 
 	public var row:Int = 0;
 
@@ -302,6 +302,48 @@ class AlphaCharacter extends FlxSprite
 			case "!":
 				animation.addByPrefix(letter, 'exclamation point', 24);
 				animation.play(letter);
+			case '_':
+				animation.addByPrefix(letter, '_', 24);
+				animation.play(letter);
+				y += 50;
+			case "#":
+				animation.addByPrefix(letter, '#', 24);
+				animation.play(letter);
+			case "$":
+				animation.addByPrefix(letter, '$', 24);
+				animation.play(letter);
+			case "%":
+				animation.addByPrefix(letter, '%', 24);
+				animation.play(letter);
+			case "&":
+				animation.addByPrefix(letter, '&', 24);
+				animation.play(letter);
+			case "(":
+				animation.addByPrefix(letter, '(', 24);
+				animation.play(letter);
+			case ")":
+				animation.addByPrefix(letter, ')', 24);
+				animation.play(letter);
+			case "+":
+				animation.addByPrefix(letter, '+', 24);
+				animation.play(letter);
+			case "-":
+				animation.addByPrefix(letter, '-', 24);
+				animation.play(letter);
+			case '"':
+				animation.addByPrefix(letter, '"', 24);
+				animation.play(letter);
+				y -= 0;
+			case '@':
+				animation.addByPrefix(letter, '@', 24);
+				animation.play(letter);
+			case "^":
+				animation.addByPrefix(letter, '^', 24);
+				animation.play(letter);
+				y -= 0;
+			case ' ':
+				animation.addByPrefix(letter, 'space', 24);
+				animation.play(letter);
 		}
 
 		updateHitbox();

source/ChartingState.hx

@@ -55,7 +55,7 @@ class ChartingState extends MusicBeatState
 	var bpmTxt:FlxText;
 
 	var strumLine:FlxSprite;
-	var curSong:String = 'Dadbattle';
+	var curSong:String = 'Dad Battle';
 	var amountSteps:Int = 0;
 	var bullshitUI:FlxGroup;
 	var writingNotesText:FlxText;

source/FreeplayState.hx

@@ -149,7 +149,7 @@ class FreeplayState extends MusicBeatState
 	public function addWeek(songs:Array<String>, weekNum:Int, ?songCharacters:Array<String>)
 	{
 		if (songCharacters == null)
-			songCharacters = ['bf'];
+			songCharacters = ['dad'];
 
 		var num:Int = 0;
 		for (song in songs)

source/KadeEngineData.hx

@@ -65,6 +65,9 @@ class KadeEngineData
 
 		if (FlxG.save.data.flashing == null)
 			FlxG.save.data.flashing = true;
+
+		if (FlxG.save.data.resetButton == null)
+			FlxG.save.data.resetButton = false;
 
 		if (FlxG.save.data.botplay == null)
 			FlxG.save.data.botplay = false;