e

Author: Yuta12342

source/archipelago/APAdvancedSettingsState.hx

@@ -1995,9 +1995,13 @@ class APAdvancedSettingsState extends MusicBeatState {
         Reflect.setField(yamlThing, "include_vanilla", includeVanilla);
         if (startingSong != null) {
             Reflect.setField(yamlThing, "starting_song", startingSong);
+        } else {
+            Reflect.deleteField(yamlThing, "starting_song");
         }
         if (victorySong != null) {
             Reflect.setField(yamlThing, "victory_song", victorySong);
+        } else {
+            Reflect.deleteField(yamlThing, "victory_song");
         }
 
         // Generate and compress Python script for CustomAPLogic (ALWAYS compressed as Base64)

source/archipelago/ArchPopup.hx

@@ -192,11 +192,11 @@ class ArchPopup extends openfl.display.Sprite {
 		{
 			var songName = daSong.song;
 			var modName = daSong.mod;
-			
+
 			// Hide song name if unknownSongs is true
 			var displaySongName = archipelago.APItem.unknownSongs ? "Unknown Song" : songName;
 			var displayModName = archipelago.APItem.unknownSongs ? "" : modName;
-			
+
 			var title = (displayModName != null && displayModName != "")
 				? '$displaySongName (from $displayModName)'
 				: displaySongName;

source/states/freeplay/OsuFreeplayState.hx

@@ -736,12 +736,12 @@ class OsuFreeplayState extends MusicBeatState
 			var text:FlxText = new FlxText(0, 0, 500, '', 20);
 			var displayName = (APEntryState.inArchipelagoMode && archipelago.APItem.unknownSongs) ? "Unknown" : fpManager.songList[i].songName;
 			var displayArtist = "Unknown";
-			
+
 			// Only show real artist if songs are not hidden
 			if (!archipelago.APItem.unknownSongs && metadata != null) {
 				displayArtist = metadata.song.artist;
 			}
-			
+
 			text.text = displayName + '\nBy ${displayArtist}';
 			text.alignment = 'left';
 			text.ID = i;
@@ -817,12 +817,12 @@ class OsuFreeplayState extends MusicBeatState
 			var text:FlxText = new FlxText(0, 0, 500, '', 20);
 			var displayName = (APEntryState.inArchipelagoMode && archipelago.APItem.unknownSongs) ? "Unknown" : fpManager.songList[i].songName;
 			var displayArtist = "Unknown";
-			
+
 			// Only show real artist if songs are not hidden
 			if (!archipelago.APItem.unknownSongs && metadata != null) {
 				displayArtist = metadata.song.artist;
 			}
-			
+
 			text.text = displayName + '\nBy ${displayArtist}';
 			text.alignment = 'left';
 			text.ID = i + trueInt;

source/yutautil/CollectionUtils.hx

@@ -751,7 +751,7 @@ class CollectionUtils
 		return false;
 	}
 
-	public static function arrayRemoveDuplicates<T>(arr:Array<T>):Array<T>
+	public static function arrayRemoveDuplicateObjects<T>(arr:Array<T>):Array<T>
 	{
 		var result = new Array<T>();
 		for (item in arr)