add an import alias for FlxAtlasSprite

assets

@@ -1 +1 @@
-Subproject commit 77a5ce80204ee9c8c500f959412134b4f777bf88
+Subproject commit fc5d7452ecb4770ab8e6bd4f4e51d655231b41c5

source/funkin/graphics/FunkinSprite.hx

@@ -305,8 +305,8 @@ class FunkinSprite extends FlxAnimate
 
     this.applyStageMatrix = validatedSettings.applyStageMatrix ?? false;
 
-    frames = FlxAnimateFrames.fromAnimate(graphicKey, validatedSettings.spritemaps, validatedSettings.metadataJson, validatedSettings.cacheKey,
-      validatedSettings.uniqueInCache, {
+    frames = FlxAnimateFrames.fromAnimate(funkin.Assets.getPath(graphicKey), validatedSettings.spritemaps, validatedSettings.metadataJson,
+      validatedSettings.cacheKey, validatedSettings.uniqueInCache, {
         swfMode: validatedSettings.swfMode,
         cacheOnLoad: validatedSettings.cacheOnLoad,
         filterQuality: validatedSettings.filterQuality,

source/funkin/modding/PolymodHandler.hx

@@ -272,6 +272,11 @@ class PolymodHandler
     Polymod.addImportAlias('funkin.data.dialogue.dialoguebox.DialogueBoxRegistry', funkin.data.dialogue.DialogueBoxRegistry);
     Polymod.addImportAlias('funkin.data.dialogue.speaker.SpeakerRegistry', funkin.data.dialogue.SpeakerRegistry);
 
+    // `FlxAtlasSprite` was merged into `FunkinSprite` and then removed.
+    // We add the import alias here so mods don't error out as much.
+    Polymod.addImportAlias('funkin.graphics.adobeanimate.FlxAtlasSprite', funkin.graphics.FunkinSprite);
+    Polymod.addImportAlias('funkin.modding.base.ScriptedFlxAtlasSprite', funkin.graphics.ScriptedFunkinSprite);
+
     // `funkin.util.FileUtil` has unrestricted access to the file system.
     Polymod.addImportAlias('funkin.util.FileUtil', funkin.util.FileUtilSandboxed);
 

source/funkin/play/ResultState.hx

@@ -191,7 +191,7 @@ class ResultState extends MusicBeatSubState
     add(soundSystem);
 
     // Fetch playable character data. Default to BF on the results screen if we can't find it.
-    playerCharacterId = PlayerRegistry.instance.getCharacterOwnerId(params.characterId);
+    playerCharacterId = PlayerRegistry.instance.getCharacterOwnerId(params.characterId) ?? params.characterId;
     playerCharacter = PlayerRegistry.instance.fetchEntry(playerCharacterId ?? 'bf');
 
     trace('Got playable character: ${playerCharacter?.getName()}');

source/funkin/ui/debug/anim/DebugBoundingState.hx

@@ -187,10 +187,6 @@ class DebugBoundingState extends FlxState
     offsetView.add(txtOffsetShit);
 
     var characters:Array<String> = CharacterDataParser.listCharacterIds();
-    characters = characters.filter(function(charId:String) {
-      var char = CharacterDataParser.fetchCharacterData(charId);
-      return char.renderType != AnimateAtlas;
-    });
     characters.sort(SortUtil.alphabetically);
 
     var charDropdown:DropDown = offsetEditorDialog.findComponent('characterDropdown', DropDown);

source/funkin/ui/debug/results/ResultsDebugSubState.hx

@@ -54,7 +54,7 @@ class ResultsDebugSubState extends MusicBeatSubState
           FlxG.switchState(() -> new funkin.play.ResultState(resultsParams));
       });
     });
-    createToggleListItem("Character", PlayerRegistry.instance.listBaseGameEntryIds(), function(result:String) {
+    createToggleListItem("Character", PlayerRegistry.instance.listEntryIds(), function(result:String) {
       resultsParams.characterId = result;
     });
     createToggleListItem("Results Mode", ["Debug", "Story", "Freeplay"], function(result:String) {