fixes

Author: TechnikTil

src/funkin/macros/ZProperty.hx

@@ -35,26 +35,24 @@ class ZProperty
 	{
 		var fields:Array<Field> = Context.getBuildFields();
 
-		var todo:Function = {
-			args: []
-		};
-
-		todo.expr = macro
-			{
-				this.sort((i:Int, basic1:flixel.FlxBasic, basic2:flixel.FlxBasic) ->
-				{
-					return flixel.util.FlxSort.byValues(i, basic1.z, basic2.z);
-				}, flixel.util.FlxSort.ASCENDING);
-			};
-		todo.ret = macro :Void;
-
 		fields.push({
-			name: "rearrange",
-			pos: Context.currentPos(),
-			kind: FFun(todo),
-			access: [Access.APublic],
+			name: 'rearrange',
 			doc: 'Rearranges all FlxBasic objects by their Z value.',
-			meta: [],
+			access: [APublic],
+			meta: null,
+			pos: Context.currentPos(),
+			kind: FFun({
+				args: [],
+				params: null,
+				ret: macro :Void,
+				expr: macro
+				{
+					this.sort((i:Int, basic1:flixel.FlxBasic, basic2:flixel.FlxBasic) ->
+					{
+						return flixel.util.FlxSort.byValues(i, basic1.z, basic2.z);
+					}, flixel.util.FlxSort.ASCENDING);
+				},
+			})
 		});
 
 		return fields;

src/funkin/states/ui/FreeplayState.hx

@@ -351,7 +351,7 @@ class FreeplayState extends FunkinState
 	 */
 	public function changeDifficulty(?index:Int = 0):Void
 	{
-		var difficulties:Array<String> = filteredSongs[curSelected - 1]?.getDifficulties(null) ?? difficultiesAvailable;
+		var difficulties:Array<String> = filteredSongs[curSelected]?.getDifficulties(null) ?? difficultiesAvailable;
 		var curIndex:Int = difficulties.indexOf(curDifficulty);
 
 		curIndex = FlxMath.wrap(curIndex + index, 0, difficulties.length - 1);