Allow for nullable asset and assign the label in loadEmbedded instead

Author: Raltyro

source/funkin/audio/FunkinSound.hx

@@ -105,6 +105,22 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
     super.update(elapsedSec);
   }
 
+  public override function loadEmbedded(asset:FlxSoundAsset, ?looped:Bool, ?loopTime:Float, ?endTime:Float, autoDestroy = false, ?onComplete:Void->Void):FunkinSound
+  {
+    if (asset is String)
+    {
+      this._label = asset;
+    }
+    else
+    {
+      this._label = 'unknown';
+    }
+
+    super.loadEmbedded(asset, looped, loopTime, endTime, autoDestroy, onComplete);
+
+    return this;
+  }
+
   public function togglePlayback():FunkinSound
   {
     if (this.playing)
@@ -407,13 +423,18 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
    * @param onLoad          Called when the sound finished loading.  Called immediately for succesfully loaded embedded sounds.
    * @return A `FunkinSound` object, or `null` if the sound could not be loaded.
    */
-  public static function load(embeddedSound:FlxSoundAsset, volume:Float = 1.0, looped:Bool = false, autoDestroy:Bool = false, autoPlay:Bool = false,
-      persist:Bool = false, ?onComplete:Void->Void, ?onLoad:Void->Void):Null<FunkinSound>
+  public static function load(embeddedSound:Null<FlxSoundAsset>, volume:Float = 1.0, looped:Bool = false, autoDestroy:Bool = false, autoPlay:Bool = false,
+      persist:Bool = false, ?onComplete:Void->Void, ?onLoad:Void->Void):FunkinSound
   {
     var sound:FunkinSound = pool.recycle(construct);
 
+    // Force it to be exists so it doesn't get claimed by FlxG.sound.load or pool.
+    sound.alive = true;
+    sound.exists = true;
+
     // Load the sound.
     // Sets `exists = true` as a side effect.
+    @:nullSafety(Off)
     sound.loadEmbedded(embeddedSound, looped, autoDestroy, onComplete);
     FlxG.sound.defaultSoundGroup.add(sound);
 
@@ -423,15 +444,6 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
     // it will get re-added (then if this was called by playMusic(), removed again)
     FlxG.sound.list.add(sound);
 
-    if (embeddedSound is String)
-    {
-      sound._label = embeddedSound;
-    }
-    else
-    {
-      sound._label = 'unknown';
-    }
-
     sound.volume = volume;
     sound.persist = persist;
     if (autoPlay) sound.play(true, 0);