diff --git a/assets/editors/layouts/stage/characterEditScreen.xml b/assets/data/editors/layouts/stage/characterEditScreen.xml similarity index 100% rename from assets/editors/layouts/stage/characterEditScreen.xml rename to assets/data/editors/layouts/stage/characterEditScreen.xml diff --git a/assets/editors/layouts/stage/spriteEditScreen.xml b/assets/data/editors/layouts/stage/spriteEditScreen.xml similarity index 100% rename from assets/editors/layouts/stage/spriteEditScreen.xml rename to assets/data/editors/layouts/stage/spriteEditScreen.xml diff --git a/assets/editors/layouts/stage/unknownEditScreen.xml b/assets/data/editors/layouts/stage/unknownEditScreen.xml similarity index 100% rename from assets/editors/layouts/stage/unknownEditScreen.xml rename to assets/data/editors/layouts/stage/unknownEditScreen.xml diff --git a/source/funkin/editors/stage/elements/StageCharacterButton.hx b/source/funkin/editors/stage/elements/StageCharacterButton.hx index 14d510a8..9a97f306 100644 --- a/source/funkin/editors/stage/elements/StageCharacterButton.hx +++ b/source/funkin/editors/stage/elements/StageCharacterButton.hx @@ -79,7 +79,7 @@ class StageCharacterEditScreen extends UISoftcodedWindow { this.button = button; this.char = button.char; this.charPos = button.charPos; - super("layouts/stage/characterEditScreen.xml", [ + super("layouts/stage/characterEditScreen", [ "stage" => StageEditor.instance.stage, "char" => char, "charPos" => charPos, diff --git a/source/funkin/editors/stage/elements/StageSpriteButton.hx b/source/funkin/editors/stage/elements/StageSpriteButton.hx index 79fad780..264bba05 100644 --- a/source/funkin/editors/stage/elements/StageSpriteButton.hx +++ b/source/funkin/editors/stage/elements/StageSpriteButton.hx @@ -73,7 +73,7 @@ class StageSpriteEditScreen extends UISoftcodedWindow { public function new(button:StageSpriteButton) { this.button = button; this.sprite = button.getSprite(); - super("layouts/stage/spriteEditScreen.xml", [ + super("layouts/stage/spriteEditScreen", [ "stage" => StageEditor.instance.stage, "sprite" => sprite, "button" => button, diff --git a/source/funkin/editors/stage/elements/StageUnknownButton.hx b/source/funkin/editors/stage/elements/StageUnknownButton.hx index 6844fd18..371ba403 100644 --- a/source/funkin/editors/stage/elements/StageUnknownButton.hx +++ b/source/funkin/editors/stage/elements/StageUnknownButton.hx @@ -84,7 +84,7 @@ class StageUnknownEditScreen extends UISoftcodedWindow { public function new(button:StageUnknownButton) { this.button = button; - super("layouts/stage/unknownEditScreen.xml", [ + super("layouts/stage/unknownEditScreen", [ "stage" => StageEditor.instance.stage, "button" => button, "xml" => button.xml, diff --git a/source/funkin/editors/ui/UISoftcodedWindow.hx b/source/funkin/editors/ui/UISoftcodedWindow.hx index 8bf0faca..e791f883 100644 --- a/source/funkin/editors/ui/UISoftcodedWindow.hx +++ b/source/funkin/editors/ui/UISoftcodedWindow.hx @@ -103,7 +103,7 @@ class UISoftcodedWindow extends UISubstateWindow { } public override function create() { - var layout = new Access(Xml.parse(Assets.getText('assets/editors/' + xmlPath)).firstElement()); + var layout = new Access(Xml.parse(Assets.getText(Paths.xml("editors/" + xmlPath))).firstElement()); for(k=>e in Script.getDefaultVariables()) { set(k, e);