diff --git a/assets/data/characters/.foldercontent b/assets/data/characters/.foldercontent
index b40ec66b..75791fc6 100644
--- a/assets/data/characters/.foldercontent
+++ b/assets/data/characters/.foldercontent
@@ -1 +1,8 @@
-bf.xml
\ No newline at end of file
+bf.xml
+gf.xml
+dad.xml
+gf.xml
+mom-car.xml
+monster.xml
+pico.xml
+spooky.xml
\ No newline at end of file
diff --git a/assets/data/characters/bf.json b/assets/data/characters/bf.json
deleted file mode 100644
index f14ba329..00000000
--- a/assets/data/characters/bf.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "isPlayer": true,
- "flipX": true,
- "anims": [
- {
- "name": "idle",
- "animation": "BF idle dance",
- "fps": 24,
- "loop": false,
- "x": 0,
- "y": -5
- },
- {
- "name": "singUP",
- "animation": "BF NOTE UP0",
- "fps": 24,
- "loop": false,
- "x": -29,
- "y": 27
- },
- {
- "name": "singLEFT",
- "animation": "BF NOTE LEFT0",
- "fps": 24,
- "loop": false,
- "x": 12,
- "y": -6
- },
- {
- "name": "singRIGHT",
- "animation": "BF NOTE RIGHT0",
- "fps": 24,
- "loop": false,
- "x": -38,
- "y": -7
- },
- {
- "name": "singDOWN",
- "animation": "BF NOTE DOWN0",
- "fps": 24,
- "loop": false,
- "x": -10,
- "y": -50
- },
- {
- "name": "singUPmiss",
- "animation": "BF NOTE UP MISS",
- "fps": 24,
- "loop": false,
- "x": -29,
- "y": 27
- },
- {
- "name": "singLEFTmiss",
- "animation": "BF NOTE LEFT MISS",
- "fps": 24,
- "loop": false,
- "x": 12,
- "y": 24
- },
- {
- "name": "singRIGHTmiss",
- "animation": "BF NOTE RIGHT MISS",
- "fps": 24,
- "loop": false,
- "x": -30,
- "y": 21
- },
- {
- "name": "singDOWNmiss",
- "animation": "BF NOTE DOWN MISS",
- "fps": 24,
- "loop": false,
- "x": -11,
- "y": -19
- },
- {
- "name": "hey",
- "animation": "BF HEY",
- "fps": 24,
- "loop": false,
- "x": 7,
- "y": 4
- },
- {
- "name": "scared",
- "animation": "BF idle shaking",
- "fps": 24,
- "loop": true,
- "x": -4,
- "y": 0
- }
- ]
-}
\ No newline at end of file
diff --git a/assets/data/characters/dad.xml b/assets/data/characters/dad.xml
new file mode 100644
index 00000000..82ce5b8f
--- /dev/null
+++ b/assets/data/characters/dad.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/data/characters/monster.xml b/assets/data/characters/monster.xml
new file mode 100644
index 00000000..9adebb63
--- /dev/null
+++ b/assets/data/characters/monster.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/data/characters/pico.xml b/assets/data/characters/pico.xml
new file mode 100644
index 00000000..ef905d98
--- /dev/null
+++ b/assets/data/characters/pico.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/data/characters/spooky.xml b/assets/data/characters/spooky.xml
new file mode 100644
index 00000000..8d4b3d04
--- /dev/null
+++ b/assets/data/characters/spooky.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/week2/images/Monster_Assets.png b/assets/images/characters/monster.png
similarity index 100%
rename from assets/week2/images/Monster_Assets.png
rename to assets/images/characters/monster.png
diff --git a/assets/week2/images/Monster_Assets.xml b/assets/images/characters/monster.xml
similarity index 100%
rename from assets/week2/images/Monster_Assets.xml
rename to assets/images/characters/monster.xml
diff --git a/assets/week3/images/Pico_FNF_assetss.png b/assets/images/characters/pico.png
similarity index 100%
rename from assets/week3/images/Pico_FNF_assetss.png
rename to assets/images/characters/pico.png
diff --git a/assets/week3/images/Pico_FNF_assetss.xml b/assets/images/characters/pico.xml
similarity index 100%
rename from assets/week3/images/Pico_FNF_assetss.xml
rename to assets/images/characters/pico.xml
diff --git a/assets/week2/images/spooky_kids_assets.png b/assets/images/characters/spooky.png
similarity index 100%
rename from assets/week2/images/spooky_kids_assets.png
rename to assets/images/characters/spooky.png
diff --git a/assets/week2/images/spooky_kids_assets.xml b/assets/images/characters/spooky.xml
similarity index 100%
rename from assets/week2/images/spooky_kids_assets.xml
rename to assets/images/characters/spooky.xml
diff --git a/assets/images/stage_light.png b/assets/images/stages/default/stage_light.png
similarity index 100%
rename from assets/images/stage_light.png
rename to assets/images/stages/default/stage_light.png
diff --git a/assets/images/stageback.png b/assets/images/stages/default/stageback.png
similarity index 100%
rename from assets/images/stageback.png
rename to assets/images/stages/default/stageback.png
diff --git a/assets/images/stagecurtains.png b/assets/images/stages/default/stagecurtains.png
similarity index 100%
rename from assets/images/stagecurtains.png
rename to assets/images/stages/default/stagecurtains.png
diff --git a/assets/images/stagefront.png b/assets/images/stages/default/stagefront.png
similarity index 100%
rename from assets/images/stagefront.png
rename to assets/images/stages/default/stagefront.png
diff --git a/assets/week2/images/halloween_bg.png b/assets/images/stages/halloween/halloween_bg.png
similarity index 100%
rename from assets/week2/images/halloween_bg.png
rename to assets/images/stages/halloween/halloween_bg.png
diff --git a/assets/week2/images/halloween_bg.xml b/assets/images/stages/halloween/halloween_bg.xml
similarity index 100%
rename from assets/week2/images/halloween_bg.xml
rename to assets/images/stages/halloween/halloween_bg.xml
diff --git a/assets/week3/images/philly/behindTrain.png b/assets/images/stages/philly/behindTrain.png
similarity index 100%
rename from assets/week3/images/philly/behindTrain.png
rename to assets/images/stages/philly/behindTrain.png
diff --git a/assets/week3/images/philly/city.png b/assets/images/stages/philly/city.png
similarity index 100%
rename from assets/week3/images/philly/city.png
rename to assets/images/stages/philly/city.png
diff --git a/assets/week3/images/philly/sky.png b/assets/images/stages/philly/sky.png
similarity index 100%
rename from assets/week3/images/philly/sky.png
rename to assets/images/stages/philly/sky.png
diff --git a/assets/week3/images/philly/street.png b/assets/images/stages/philly/street.png
similarity index 100%
rename from assets/week3/images/philly/street.png
rename to assets/images/stages/philly/street.png
diff --git a/assets/week3/images/philly/train.png b/assets/images/stages/philly/train.png
similarity index 100%
rename from assets/week3/images/philly/train.png
rename to assets/images/stages/philly/train.png
diff --git a/assets/week3/images/philly/win0.png b/assets/images/stages/philly/win0.png
similarity index 100%
rename from assets/week3/images/philly/win0.png
rename to assets/images/stages/philly/win0.png
diff --git a/assets/week3/images/philly/win1.png b/assets/images/stages/philly/win1.png
similarity index 100%
rename from assets/week3/images/philly/win1.png
rename to assets/images/stages/philly/win1.png
diff --git a/assets/week3/images/philly/win2.png b/assets/images/stages/philly/win2.png
similarity index 100%
rename from assets/week3/images/philly/win2.png
rename to assets/images/stages/philly/win2.png
diff --git a/assets/week3/images/philly/win3.png b/assets/images/stages/philly/win3.png
similarity index 100%
rename from assets/week3/images/philly/win3.png
rename to assets/images/stages/philly/win3.png
diff --git a/assets/week3/images/philly/win4.png b/assets/images/stages/philly/win4.png
similarity index 100%
rename from assets/week3/images/philly/win4.png
rename to assets/images/stages/philly/win4.png
diff --git a/assets/tutorial/tutorial_stuff_here.txt b/assets/tutorial/tutorial_stuff_here.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/assets/week1/week1_stuff_here.txt b/assets/week1/week1_stuff_here.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/assets/week2/week2_stuff_here.txt b/assets/week2/week2_stuff_here.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/buildnumber.txt b/buildnumber.txt
index 50f0bcd3..70e1a64c 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-135
\ No newline at end of file
+144
\ No newline at end of file
diff --git a/source/AnimationDebug.hx b/source/AnimationDebug.hx
index 05b40d63..4d44f52b 100644
--- a/source/AnimationDebug.hx
+++ b/source/AnimationDebug.hx
@@ -1,5 +1,6 @@
package;
+import funkin.game.Character;
import flixel.FlxG;
import flixel.FlxObject;
import flixel.FlxSprite;
@@ -14,7 +15,7 @@ import flixel.util.FlxColor;
*/
class AnimationDebug extends FlxState
{
- var bf:Boyfriend;
+ var bf:Character;
var dad:Character;
var char:Character;
var textAnim:FlxText;
@@ -54,7 +55,7 @@ class AnimationDebug extends FlxState
}
else
{
- bf = new Boyfriend(0, 0);
+ bf = new Character(0, 0, daAnim, true);
bf.screenCenter();
bf.debugMode = true;
add(bf);
diff --git a/source/Main.hx b/source/Main.hx
index 4f509255..14f539e5 100644
--- a/source/Main.hx
+++ b/source/Main.hx
@@ -17,7 +17,7 @@ import flixel.math.FlxPoint;
import flixel.math.FlxRect;
// TODO: REMOVE TEST
-import modsfolder.ModsFolder;
+import funkin.mods.ModsFolder;
@:build(funkin.macros.BuildCounterMacro.build())
class Main extends Sprite
@@ -94,8 +94,8 @@ class Main extends Sprite
FlxG.save.bind('Save');
Highscore.load();
- ModsFolder.loadMod("B-Sides");
- ModsFolder.currentModFolder = "B-Sides";
+ // ModsFolder.loadMod("B-Sides");
+ // ModsFolder.currentModFolder = "B-Sides";
FlxG.fixedTimestep = false;
FlxG.autoPause = false;
diff --git a/source/Paths.hx b/source/Paths.hx
index bfcf83eb..81cb1537 100644
--- a/source/Paths.hx
+++ b/source/Paths.hx
@@ -4,7 +4,7 @@ import flixel.FlxG;
import flixel.graphics.frames.FlxAtlasFrames;
import openfl.utils.AssetType;
import openfl.utils.Assets as OpenFlAssets;
-import modsfolder.ModsFolder;
+import funkin.mods.ModsFolder;
using StringTools;
diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
index 19caba3c..e2f3dd91 100644
--- a/source/funkin/game/PlayState.hx
+++ b/source/funkin/game/PlayState.hx
@@ -754,10 +754,8 @@ class PlayState extends MusicBeatState
/* if (FlxG.keys.justPressed.NINE)
FlxG.switchState(new Charting()); */
- #if debug
if (FlxG.keys.justPressed.EIGHT)
FlxG.switchState(new AnimationDebug(SONG.player2));
- #end
if (startingSong)
{
diff --git a/source/modsfolder/ModsFolder.hx b/source/funkin/mods/ModsFolder.hx
similarity index 99%
rename from source/modsfolder/ModsFolder.hx
rename to source/funkin/mods/ModsFolder.hx
index b3c4f1e3..f591481b 100644
--- a/source/modsfolder/ModsFolder.hx
+++ b/source/funkin/mods/ModsFolder.hx
@@ -1,4 +1,4 @@
-package modsfolder;
+package funkin.mods;
import openfl.utils.AssetManifest;
import openfl.utils.AssetLibrary;