diff --git a/Project.xml b/Project.xml index a827584..5b294ba 100644 --- a/Project.xml +++ b/Project.xml @@ -85,6 +85,11 @@ + + + + + @@ -92,12 +97,6 @@ - - - - - - diff --git a/assets/shared/images/healthBar.png b/assets/shared/images/UI/healthBar.png similarity index 100% rename from assets/shared/images/healthBar.png rename to assets/shared/images/UI/healthBar.png diff --git a/assets/shared/images/pixelUI/HURTNOTE_assets.png b/assets/shared/images/UI/pixel/notes/HURTNOTE_assets.png similarity index 100% rename from assets/shared/images/pixelUI/HURTNOTE_assets.png rename to assets/shared/images/UI/pixel/notes/HURTNOTE_assets.png diff --git a/assets/shared/images/pixelUI/HURTNOTE_assetsENDS.png b/assets/shared/images/UI/pixel/notes/HURTNOTE_assetsENDS.png similarity index 100% rename from assets/shared/images/pixelUI/HURTNOTE_assetsENDS.png rename to assets/shared/images/UI/pixel/notes/HURTNOTE_assetsENDS.png diff --git a/assets/shared/images/pixelUI/NOTE_assets.png b/assets/shared/images/UI/pixel/notes/NOTE_assets.png similarity index 100% rename from assets/shared/images/pixelUI/NOTE_assets.png rename to assets/shared/images/UI/pixel/notes/NOTE_assets.png diff --git a/assets/shared/images/pixelUI/NOTE_assetsENDS.png b/assets/shared/images/UI/pixel/notes/NOTE_assetsENDS.png similarity index 100% rename from assets/shared/images/pixelUI/NOTE_assetsENDS.png rename to assets/shared/images/UI/pixel/notes/NOTE_assetsENDS.png diff --git a/source/funkin/game/editors/CharacterEditorState.hx b/source/funkin/game/editors/CharacterEditorState.hx index 02746ba..4d2b08e 100644 --- a/source/funkin/game/editors/CharacterEditorState.hx +++ b/source/funkin/game/editors/CharacterEditorState.hx @@ -121,7 +121,7 @@ class CharacterEditorState extends MusicBeatState loadChar(!daAnim.startsWith('bf'), false); - healthBarBG = new FlxSprite(30, FlxG.height - 75).loadGraphic(Paths.image('healthBar')); + healthBarBG = new FlxSprite(30, FlxG.height - 75).loadGraphic(Paths.image('UI/healthBar')); healthBarBG.scrollFactor.set(); add(healthBarBG); healthBarBG.cameras = [camHUD]; diff --git a/source/funkin/game/objects/Note.hx b/source/funkin/game/objects/Note.hx index 713adda..18ab89a 100644 --- a/source/funkin/game/objects/Note.hx +++ b/source/funkin/game/objects/Note.hx @@ -279,16 +279,16 @@ class Note extends FlxSprite var blahblah:String = arraySkin.join('/'); if(PlayState.isPixelStage) { if(isSustainNote) { - loadGraphic(Paths.image('pixelUI/' + blahblah + 'ENDS')); + loadGraphic(Paths.image('UI/pixel/notes/' + blahblah + 'ENDS')); width = width / 4; height = height / 2; originalHeightForCalcs = height; - loadGraphic(Paths.image('pixelUI/' + blahblah + 'ENDS'), true, Math.floor(width), Math.floor(height)); + loadGraphic(Paths.image('UI/pixel/notes/' + blahblah + 'ENDS'), true, Math.floor(width), Math.floor(height)); } else { - loadGraphic(Paths.image('pixelUI/' + blahblah)); + loadGraphic(Paths.image('UI/pixel/notes/' + blahblah)); width = width / 4; height = height / 5; - loadGraphic(Paths.image('pixelUI/' + blahblah), true, Math.floor(width), Math.floor(height)); + loadGraphic(Paths.image('UI/pixel/notes/' + blahblah), true, Math.floor(width), Math.floor(height)); } setGraphicSize(Std.int(width * PlayState.daPixelZoom)); loadPixelNoteAnims(); diff --git a/source/funkin/game/objects/StrumNote.hx b/source/funkin/game/objects/StrumNote.hx index 5bd21c8..012d66a 100644 --- a/source/funkin/game/objects/StrumNote.hx +++ b/source/funkin/game/objects/StrumNote.hx @@ -52,10 +52,10 @@ class StrumNote extends FlxSprite if(PlayState.isPixelStage) { - loadGraphic(Paths.image('pixelUI/' + texture)); + loadGraphic(Paths.image('UI/pixel/notes/' + texture)); width = width / 4; height = height / 5; - loadGraphic(Paths.image('pixelUI/' + texture), true, Math.floor(width), Math.floor(height)); + loadGraphic(Paths.image('UI/pixel/notes/' + texture), true, Math.floor(width), Math.floor(height)); antialiasing = false; setGraphicSize(Std.int(width * PlayState.daPixelZoom)); diff --git a/source/funkin/game/states/PlayState.hx b/source/funkin/game/states/PlayState.hx index 46f3336..6bc00f6 100644 --- a/source/funkin/game/states/PlayState.hx +++ b/source/funkin/game/states/PlayState.hx @@ -1204,7 +1204,7 @@ class PlayState extends MusicBeatState FlxG.fixedTimestep = false; moveCameraSection(); - healthBarBG = new AttachedSprite('healthBar'); + healthBarBG = new AttachedSprite('UI/healthBar'); healthBarBG.y = FlxG.height * 0.89; healthBarBG.screenCenter(X); healthBarBG.scrollFactor.set();