various shit

poec987 · Jul 19, 2024 · 8d47872 · 8d47872
1 parent f52bd6d
commit 8d47872
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
@@ -56,7 +56,7 @@ class FreeplayState extends MusicBeatState
 			newSong("Monster", "Monster", 2, "monster"),
 
 			newSong("Pico", "Pico", 3, "pico"),
-			newSong("Philly", "Philly Nice", 3, "pico"),
+			newSong("Philly", "Philly", 3, "pico"),
 			newSong("Blammed", "Blammed", 3, "pico"),
 
 			newSong("Satin-Panties", "Satin Panties", 4, "mom"),

diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx
@@ -203,7 +203,7 @@ class OptionsMenu extends MusicBeatState
 				}
 
 
-			if (controls.ACCEPT)
+			if (FlxG.keys.justPressed.ENTER)
 			{
 				changeOption(options[curSelected], curSelected);
 			}
@@ -259,6 +259,7 @@ class OptionsMenu extends MusicBeatState
 
 				if (update) {
 					var cur = values.indexOf(curValue)+1;
+					trace(values[cur] == null ? values[0] : values[cur]);
 					option[2] = values[cur] == null ? values[0] : values[cur];
 
 					SaveManagement.setOption(name, option[2]);

diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx
@@ -105,7 +105,7 @@ class PauseSubState extends MusicBeatSubstate
 				case "Restart Song":
 					FlxG.resetState();
 				case "Exit to menu":
-					if (comingFromFreeplay)
+					if (comingFromFreeplay && FlxG.save.data.unlockedFreeplay)
 						returnToFreeplay();
 					else
 						FlxG.switchState(new MainMenuState());

diff --git a/source/SongCard.hx b/source/SongCard.hx
@@ -78,7 +78,7 @@ class SongCard extends FlxTypedGroup<FlxSprite>{
             case 'pico':
                 setName("Pico V3", "thomicfee");
             case 'philly':
-                setName("Philly Nice V3", "Didgie");
+                setName("Philly V3", "Didgie");
             case 'blammed':
                 setName("Blammed V3", "x8c8r");
             // Week 4
@@ -87,7 +87,7 @@ class SongCard extends FlxTypedGroup<FlxSprite>{
             case 'high':
                 setName("High V3", "jo560hs");
             case 'milf':
-                setName("M.I.L.F. V3", "Xarion");
+                setName("MILF V3", "Xarion");
             // Week 5
             case 'cocoa':
                 setName("Cocoa V3", "Didgie");
@@ -119,7 +119,7 @@ class SongCard extends FlxTypedGroup<FlxSprite>{
             case 'dotdotdot':
                 setName("Dotdotdot", "Didgie");
             case 'do-you-get-the-refrance':
-                setName("do you get the refrance", "x8c8r");
+                setName("Do You Get The Refrance?", "x8c8r");
             case 'stop-right-there-criminal-scum':
                 setName("Stop right there criminal scum", "PoeDev");
 			case 'bopcityfansong':