diff --git a/sonic-bluestreak.love/assets/artworks/back.png b/sonic-bluestreak.love/assets/artworks/back.png
new file mode 100644
index 0000000..5e6fb02
Binary files /dev/null and b/sonic-bluestreak.love/assets/artworks/back.png differ
diff --git a/sonic-bluestreak.love/assets/backgrounds/options.png b/sonic-bluestreak.love/assets/backgrounds/options.png
new file mode 100644
index 0000000..20941e8
Binary files /dev/null and b/sonic-bluestreak.love/assets/backgrounds/options.png differ
diff --git a/sonic-bluestreak.love/assets/battle.lua b/sonic-bluestreak.love/assets/battle.lua
new file mode 100644
index 0000000..c0dc80c
--- /dev/null
+++ b/sonic-bluestreak.love/assets/battle.lua
@@ -0,0 +1,32 @@
+return {
+  ["tilesets"] = {
+    {"charicons",     "assets/sprites/characters/charicons"},
+    {"normaltiles",   "assets/backgrounds/normaltile"},
+    {"sptiles",       "assets/backgrounds/specialtile"},
+    {"borders",       "assets/backgrounds/borders"},
+    {"ranks",         "assets/gui/ranks"},
+    {"qtebtn",        "assets/gui/qtebtn"}
+  },
+  ["textures"] = {
+    {"expbar",     "assets/gui/expbar.png"},
+    {"actorsShadow",  "assets/sprites/shadow.png"},
+    {"emptytile",     "assets/backgrounds/tilemask.png"},
+
+    {"badnicsIcon",     "assets/sprites/characters/badnics.png"},
+
+    {"hudturn",     "assets/gui/strings/hudturn.png"},
+    {"battlecompleted", "assets/gui/strings/battle_completed.png" },
+    {"egghead", "assets/gui/egghead.png"},
+
+    {"crown", "assets/gui/crown.png"}
+  },
+  ["sfx"] = {
+    {"hit", "assets/sfx/hit.wav"},
+    {"hitconnect", "assets/sfx/hitconnect.wav"},
+    {"jump", "assets/sfx/jump.wav"},
+    {"woosh", "assets/sfx/woosh.wav"},
+    {"spincharge", "assets/sfx/spincharge.wav"},
+    {"spinrelease", "assets/sfx/spinrelease.wav"},
+    {"badnicsBoom", "assets/sfx/badnicsDestroyed.wav"}
+  }
+}
diff --git a/sonic-bluestreak.love/assets/commons.lua b/sonic-bluestreak.love/assets/commons.lua
new file mode 100644
index 0000000..0697474
--- /dev/null
+++ b/sonic-bluestreak.love/assets/commons.lua
@@ -0,0 +1,37 @@
+return {
+  ["sprites"]  = {
+    {"cursorground",  "assets/gui/cursor/ground"}
+  },
+  ["tilesets"] = {
+    {"itembox", "assets/gui/itembox"}
+  },
+  ["textures"] = {
+    {"menucursor",    "assets/gui/cursor-menulist.png"},
+    {"statusbar",     "assets/gui/status_bar.png"},
+    {"cursorpeak",    "assets/gui/cursor/peak.png"},
+
+    {"e_speedster", "assets/gui/emblem_speedster.png"},
+    {"e_technic",   "assets/gui/emblem_technic.png"},
+    {"e_power",     "assets/gui/emblem_power.png"},
+
+    {"m_speedster", "assets/gui/emblem_speedster_mask.png"},
+    {"m_technic",   "assets/gui/emblem_technic_mask.png"},
+    {"m_power",     "assets/gui/emblem_power_mask.png"},
+
+    {"background",    "assets/artworks/back.png"}
+  },
+  ["fonts"]    = {
+    {"small",         "assets/gui/fonts/PixelOperator.ttf", 16}
+  },
+  ["imagefonts"]    = {
+    {"hudnbrs",       "assets/gui/fonts/hudnumbers"},
+    {"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"},
+    {"SA2font", "assets/gui/fonts/SA2font"},
+  },
+  ["sfx"] = {
+    {"mBack", "assets/sfx/menus/back.wav"},
+    {"mBeep", "assets/sfx/menus/beep.wav"},
+    {"mSelect", "assets/sfx/menus/select.wav"},
+    {"mError", "assets/sfx/menus/error.wav"},
+  }
+}
diff --git a/sonic-bluestreak.love/assets/debug.lua b/sonic-bluestreak.love/assets/debug.lua
new file mode 100644
index 0000000..d528b73
--- /dev/null
+++ b/sonic-bluestreak.love/assets/debug.lua
@@ -0,0 +1,28 @@
+return {
+  ["tilesets"] = {
+    {"charicons",     "assets/sprites/characters/charicons"},
+    {"normaltiles",   "assets/backgrounds/normaltile"},
+    {"sptiles",       "assets/backgrounds/specialtile"},
+    {"borders",       "assets/backgrounds/borders"},
+  },
+  ["sprites"]  = {
+    {"cursorground",  "assets/gui/cursor/ground"},
+    {"hitGFX",        "assets/sprites/gfx/hit1"},
+  },
+  ["textures"] = {
+    {"statusbar",     "assets/gui/status_bar.png"},
+    {"actorsShadow",  "assets/sprites/shadow.png"},
+    {"emptytile",     "assets/backgrounds/tilemask.png"},
+
+    {"hudturn",     "assets/gui/strings/hudturn.png"},
+    {"battlecompleted", "assets/gui/strings/battle_completed.png" }
+  },
+  ["sfx"] = {
+    {"hit", "assets/sfx/hit.wav"},
+    {"hitconnect", "assets/sfx/hitconnect.wav"},
+    {"jump", "assets/sfx/jump.wav"},
+    {"woosh", "assets/sfx/woosh.wav"},
+    {"spincharge", "assets/sfx/spincharge.wav"},
+    {"spinrelease", "assets/sfx/spinrelease.wav"}
+  }
+}
diff --git a/sonic-bluestreak.love/assets/fonts/Pokemon DPPt.ttf b/sonic-bluestreak.love/assets/fonts/Pokemon DPPt.ttf
deleted file mode 100644
index f7a5fab..0000000
Binary files a/sonic-bluestreak.love/assets/fonts/Pokemon DPPt.ttf and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/fonts/RussoOne-Regular.ttf b/sonic-bluestreak.love/assets/fonts/RussoOne-Regular.ttf
deleted file mode 100644
index ba83727..0000000
Binary files a/sonic-bluestreak.love/assets/fonts/RussoOne-Regular.ttf and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/fonts/Teko-Bold.ttf b/sonic-bluestreak.love/assets/fonts/Teko-Bold.ttf
deleted file mode 100644
index d061824..0000000
Binary files a/sonic-bluestreak.love/assets/fonts/Teko-Bold.ttf and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/fonts/kimberley bl.ttf b/sonic-bluestreak.love/assets/fonts/kimberley bl.ttf
deleted file mode 100644
index 09a597a..0000000
Binary files a/sonic-bluestreak.love/assets/fonts/kimberley bl.ttf and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/fonts/sadv.png b/sonic-bluestreak.love/assets/fonts/sadv.png
deleted file mode 100644
index 7520004..0000000
Binary files a/sonic-bluestreak.love/assets/fonts/sadv.png and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/fonts/vipnagorgialla.ttf b/sonic-bluestreak.love/assets/fonts/vipnagorgialla.ttf
deleted file mode 100644
index 674ebd8..0000000
Binary files a/sonic-bluestreak.love/assets/fonts/vipnagorgialla.ttf and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/gui/animals.png b/sonic-bluestreak.love/assets/gui/animals.png
new file mode 100644
index 0000000..ba34081
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/animals.png differ
diff --git a/sonic-bluestreak.love/assets/gui/attacklist.png b/sonic-bluestreak.love/assets/gui/attacklist.png
new file mode 100644
index 0000000..c2b2f96
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/attacklist.png differ
diff --git a/sonic-bluestreak.love/assets/gui/back/background.png b/sonic-bluestreak.love/assets/gui/back/background.png
new file mode 100644
index 0000000..cf7606b
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/back/background.png differ
diff --git a/sonic-bluestreak.love/assets/gui/back/border.png b/sonic-bluestreak.love/assets/gui/back/border.png
new file mode 100644
index 0000000..923e422
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/back/border.png differ
diff --git a/sonic-bluestreak.love/assets/gui/back/emblem.png b/sonic-bluestreak.love/assets/gui/back/emblem.png
new file mode 100644
index 0000000..24c7a06
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/back/emblem.png differ
diff --git a/sonic-bluestreak.love/assets/gui/back/star.png b/sonic-bluestreak.love/assets/gui/back/star.png
new file mode 100644
index 0000000..121975f
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/back/star.png differ
diff --git a/sonic-bluestreak.love/assets/gui/barborder.png b/sonic-bluestreak.love/assets/gui/barborder.png
new file mode 100644
index 0000000..b6de2e0
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/barborder.png differ
diff --git a/sonic-bluestreak.love/assets/gui/battle/turnbar.png b/sonic-bluestreak.love/assets/gui/battle/turnbar.png
new file mode 100644
index 0000000..dfd4236
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/battle/turnbar.png differ
diff --git a/sonic-bluestreak.love/assets/gui/borders.png b/sonic-bluestreak.love/assets/gui/borders.png
new file mode 100644
index 0000000..90e4b98
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/borders.png differ
diff --git a/sonic-bluestreak.love/assets/gui/crown.png b/sonic-bluestreak.love/assets/gui/crown.png
new file mode 100644
index 0000000..8371f00
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/crown.png differ
diff --git a/sonic-bluestreak.love/assets/gui/dialogs/cursor-menulist.png b/sonic-bluestreak.love/assets/gui/cursor-menulist.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/dialogs/cursor-menulist.png
rename to sonic-bluestreak.love/assets/gui/cursor-menulist.png
diff --git a/sonic-bluestreak.love/assets/gui/cursor/ground.lua b/sonic-bluestreak.love/assets/gui/cursor/ground.lua
new file mode 100644
index 0000000..28e4e44
--- /dev/null
+++ b/sonic-bluestreak.love/assets/gui/cursor/ground.lua
@@ -0,0 +1,16 @@
+return {
+  metadata = {
+    width       = 28,
+    height      = 11,
+    defaultAnim = "default"
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 3,
+      loop        = 1,
+      speed       = 3,
+      pauseAtEnd  = false,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/gui/cursor/ground.png b/sonic-bluestreak.love/assets/gui/cursor/ground.png
new file mode 100644
index 0000000..e4bb4e5
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/cursor/ground.png differ
diff --git a/sonic-bluestreak.love/assets/gui/cursor/peak.png b/sonic-bluestreak.love/assets/gui/cursor/peak.png
new file mode 100644
index 0000000..bcb2e58
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/cursor/peak.png differ
diff --git a/sonic-bluestreak.love/assets/gui/dialogs/basic.lua b/sonic-bluestreak.love/assets/gui/dialogbox.lua
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/dialogs/basic.lua
rename to sonic-bluestreak.love/assets/gui/dialogbox.lua
diff --git a/sonic-bluestreak.love/assets/gui/dialogs/basic.png b/sonic-bluestreak.love/assets/gui/dialogbox.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/dialogs/basic.png
rename to sonic-bluestreak.love/assets/gui/dialogbox.png
diff --git a/sonic-bluestreak.love/assets/gui/egghead.png b/sonic-bluestreak.love/assets/gui/egghead.png
new file mode 100644
index 0000000..3a5e6b7
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/egghead.png differ
diff --git a/sonic-bluestreak.love/assets/gui/status/emblem_power.png b/sonic-bluestreak.love/assets/gui/emblem_power.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/status/emblem_power.png
rename to sonic-bluestreak.love/assets/gui/emblem_power.png
diff --git a/sonic-bluestreak.love/assets/gui/emblem_power_mask.png b/sonic-bluestreak.love/assets/gui/emblem_power_mask.png
new file mode 100644
index 0000000..0183788
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/emblem_power_mask.png differ
diff --git a/sonic-bluestreak.love/assets/gui/status/emblem_speedster.png b/sonic-bluestreak.love/assets/gui/emblem_speedster.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/status/emblem_speedster.png
rename to sonic-bluestreak.love/assets/gui/emblem_speedster.png
diff --git a/sonic-bluestreak.love/assets/gui/emblem_speedster_mask.png b/sonic-bluestreak.love/assets/gui/emblem_speedster_mask.png
new file mode 100644
index 0000000..0cb03b3
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/emblem_speedster_mask.png differ
diff --git a/sonic-bluestreak.love/assets/gui/status/emblem_technic.png b/sonic-bluestreak.love/assets/gui/emblem_technic.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/status/emblem_technic.png
rename to sonic-bluestreak.love/assets/gui/emblem_technic.png
diff --git a/sonic-bluestreak.love/assets/gui/emblem_technic_mask.png b/sonic-bluestreak.love/assets/gui/emblem_technic_mask.png
new file mode 100644
index 0000000..2fc1ab9
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/emblem_technic_mask.png differ
diff --git a/sonic-bluestreak.love/assets/gui/emeralds.png b/sonic-bluestreak.love/assets/gui/emeralds.png
new file mode 100644
index 0000000..6a603df
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/emeralds.png differ
diff --git a/sonic-bluestreak.love/assets/gui/expbar.png b/sonic-bluestreak.love/assets/gui/expbar.png
new file mode 100644
index 0000000..a41da66
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/expbar.png differ
diff --git a/sonic-bluestreak.love/assets/fonts/CREDITS.txt b/sonic-bluestreak.love/assets/gui/fonts/CREDITS.txt
similarity index 100%
rename from sonic-bluestreak.love/assets/fonts/CREDITS.txt
rename to sonic-bluestreak.love/assets/gui/fonts/CREDITS.txt
diff --git a/sonic-bluestreak.love/assets/fonts/PixelOperator.ttf b/sonic-bluestreak.love/assets/gui/fonts/PixelOperator.ttf
similarity index 100%
rename from sonic-bluestreak.love/assets/fonts/PixelOperator.ttf
rename to sonic-bluestreak.love/assets/gui/fonts/PixelOperator.ttf
diff --git a/sonic-bluestreak.love/assets/gui/fonts/SA2font.lua b/sonic-bluestreak.love/assets/gui/fonts/SA2font.lua
index 8b7e7ff..2d39dc8 100644
--- a/sonic-bluestreak.love/assets/gui/fonts/SA2font.lua
+++ b/sonic-bluestreak.love/assets/gui/fonts/SA2font.lua
@@ -1,4 +1,4 @@
 return {
-  glyphs = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZÇÂÄÀÆÉÊËÈÎÏÔÖŒÜÛÙ[\\]^_`abcdefghijklmnopqrstuvwxyzçâäàæéêëèïîôöœûüù{|}",
-  extraspacing = 0,
+  glyphs = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZÇÂÄÀÆÉÊËÈÎÏÔÖŒÜÛÙ[\\]^_`abcdefghijklmnopqrstuvwxyzçâäàæéêëèïîôöœûüù{|} ",
+  extraspacing = -1,
 }
diff --git a/sonic-bluestreak.love/assets/gui/fonts/SA2font.png b/sonic-bluestreak.love/assets/gui/fonts/SA2font.png
index f377f4c..f70711e 100644
Binary files a/sonic-bluestreak.love/assets/gui/fonts/SA2font.png and b/sonic-bluestreak.love/assets/gui/fonts/SA2font.png differ
diff --git a/sonic-bluestreak.love/assets/gui/fonts/numbers.lua b/sonic-bluestreak.love/assets/gui/fonts/hudnumbers.lua
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/fonts/numbers.lua
rename to sonic-bluestreak.love/assets/gui/fonts/hudnumbers.lua
diff --git a/sonic-bluestreak.love/assets/gui/fonts/numbers.png b/sonic-bluestreak.love/assets/gui/fonts/hudnumbers.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/fonts/numbers.png
rename to sonic-bluestreak.love/assets/gui/fonts/hudnumbers.png
diff --git a/sonic-bluestreak.love/assets/gui/fonts/hudsmallnumbers.lua b/sonic-bluestreak.love/assets/gui/fonts/hudsmallnumbers.lua
new file mode 100644
index 0000000..ab1c6b4
--- /dev/null
+++ b/sonic-bluestreak.love/assets/gui/fonts/hudsmallnumbers.lua
@@ -0,0 +1,4 @@
+return {
+  glyphs = " 0123456789/ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+  extraspacing = 0,
+}
diff --git a/sonic-bluestreak.love/assets/gui/fonts/hudsmallnumbers.png b/sonic-bluestreak.love/assets/gui/fonts/hudsmallnumbers.png
new file mode 100644
index 0000000..b1d90f6
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/fonts/hudsmallnumbers.png differ
diff --git a/sonic-bluestreak.love/assets/gui/fonts/smallnumbers.lua b/sonic-bluestreak.love/assets/gui/fonts/smallnumbers.lua
deleted file mode 100644
index 0ec9ebd..0000000
--- a/sonic-bluestreak.love/assets/gui/fonts/smallnumbers.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
-  glyphs = " 0123456789/%",
-  extraspacing = 0,
-}
diff --git a/sonic-bluestreak.love/assets/gui/fonts/smallnumbers.png b/sonic-bluestreak.love/assets/gui/fonts/smallnumbers.png
deleted file mode 100644
index 781cdc4..0000000
Binary files a/sonic-bluestreak.love/assets/gui/fonts/smallnumbers.png and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/gui/hpbar_back.png b/sonic-bluestreak.love/assets/gui/hpbar_back.png
new file mode 100644
index 0000000..3d35718
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/hpbar_back.png differ
diff --git a/sonic-bluestreak.love/assets/gui/hpbar_boss.png b/sonic-bluestreak.love/assets/gui/hpbar_boss.png
new file mode 100644
index 0000000..6686087
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/hpbar_boss.png differ
diff --git a/sonic-bluestreak.love/assets/gui/hpbar_fore.png b/sonic-bluestreak.love/assets/gui/hpbar_fore.png
new file mode 100644
index 0000000..461dae4
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/hpbar_fore.png differ
diff --git a/sonic-bluestreak.love/assets/gui/hud/progressbar.png b/sonic-bluestreak.love/assets/gui/hud/progressbar.png
deleted file mode 100644
index d9e53e7..0000000
Binary files a/sonic-bluestreak.love/assets/gui/hud/progressbar.png and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/gui/itembox.lua b/sonic-bluestreak.love/assets/gui/itembox.lua
new file mode 100644
index 0000000..fb8934f
--- /dev/null
+++ b/sonic-bluestreak.love/assets/gui/itembox.lua
@@ -0,0 +1,6 @@
+return {
+  metadata = {
+    width       = 28,
+    height      = 29,
+  }
+}
diff --git a/sonic-bluestreak.love/assets/gui/itembox.png b/sonic-bluestreak.love/assets/gui/itembox.png
new file mode 100644
index 0000000..e9bf9c1
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/itembox.png differ
diff --git a/sonic-bluestreak.love/assets/gui/qtebtn.lua b/sonic-bluestreak.love/assets/gui/qtebtn.lua
new file mode 100644
index 0000000..dfc5348
--- /dev/null
+++ b/sonic-bluestreak.love/assets/gui/qtebtn.lua
@@ -0,0 +1,6 @@
+return {
+  metadata = {
+    width       = 17,
+    height      = 17,
+  }
+}
diff --git a/sonic-bluestreak.love/assets/gui/qtebtn.png b/sonic-bluestreak.love/assets/gui/qtebtn.png
new file mode 100644
index 0000000..59bdab5
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/qtebtn.png differ
diff --git a/sonic-bluestreak.love/assets/gui/ranks.lua b/sonic-bluestreak.love/assets/gui/ranks.lua
new file mode 100644
index 0000000..31acefe
--- /dev/null
+++ b/sonic-bluestreak.love/assets/gui/ranks.lua
@@ -0,0 +1,6 @@
+return {
+  metadata = {
+    height      = 27,
+    width       = 27,
+  }
+}
diff --git a/sonic-bluestreak.love/assets/gui/ranks.png b/sonic-bluestreak.love/assets/gui/ranks.png
new file mode 100644
index 0000000..fc8dfec
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/ranks.png differ
diff --git a/sonic-bluestreak.love/assets/gui/hud/ring.png b/sonic-bluestreak.love/assets/gui/ring.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/hud/ring.png
rename to sonic-bluestreak.love/assets/gui/ring.png
diff --git a/sonic-bluestreak.love/assets/gui/status/barborder.png b/sonic-bluestreak.love/assets/gui/status/barborder.png
deleted file mode 100644
index 4e321ef..0000000
Binary files a/sonic-bluestreak.love/assets/gui/status/barborder.png and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/gui/status/status_bar.png b/sonic-bluestreak.love/assets/gui/status/status_bar.png
deleted file mode 100644
index 4c11ad6..0000000
Binary files a/sonic-bluestreak.love/assets/gui/status/status_bar.png and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/gui/status_bar.png b/sonic-bluestreak.love/assets/gui/status_bar.png
new file mode 100644
index 0000000..d2c0f3b
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/status_bar.png differ
diff --git a/sonic-bluestreak.love/assets/gui/status/status_bar.xcf b/sonic-bluestreak.love/assets/gui/status_bar.xcf
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/status/status_bar.xcf
rename to sonic-bluestreak.love/assets/gui/status_bar.xcf
diff --git a/sonic-bluestreak.love/assets/gui/statuses.lua b/sonic-bluestreak.love/assets/gui/statuses.lua
new file mode 100644
index 0000000..c995f6c
--- /dev/null
+++ b/sonic-bluestreak.love/assets/gui/statuses.lua
@@ -0,0 +1,6 @@
+return {
+  metadata = {
+    width       = 24,
+    height      = 24,
+  }
+}
diff --git a/sonic-bluestreak.love/assets/gui/statuses.png b/sonic-bluestreak.love/assets/gui/statuses.png
new file mode 100644
index 0000000..3b64230
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/statuses.png differ
diff --git a/sonic-bluestreak.love/assets/gui/strings/battle_completed.png b/sonic-bluestreak.love/assets/gui/strings/battle_completed.png
new file mode 100644
index 0000000..8157042
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/strings/battle_completed.png differ
diff --git a/sonic-bluestreak.love/assets/gui/strings/boss.png b/sonic-bluestreak.love/assets/gui/strings/boss.png
new file mode 100644
index 0000000..9ff15a4
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/strings/boss.png differ
diff --git a/sonic-bluestreak.love/assets/gui/strings/exp.png b/sonic-bluestreak.love/assets/gui/strings/exp.png
new file mode 100644
index 0000000..e95a6b2
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/strings/exp.png differ
diff --git a/sonic-bluestreak.love/assets/gui/hud/bonus.png b/sonic-bluestreak.love/assets/gui/strings/hudbonus.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/hud/bonus.png
rename to sonic-bluestreak.love/assets/gui/strings/hudbonus.png
diff --git a/sonic-bluestreak.love/assets/gui/hud/score.png b/sonic-bluestreak.love/assets/gui/strings/hudscore.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/hud/score.png
rename to sonic-bluestreak.love/assets/gui/strings/hudscore.png
diff --git a/sonic-bluestreak.love/assets/gui/hud/time.png b/sonic-bluestreak.love/assets/gui/strings/hudtime.png
similarity index 100%
rename from sonic-bluestreak.love/assets/gui/hud/time.png
rename to sonic-bluestreak.love/assets/gui/strings/hudtime.png
diff --git a/sonic-bluestreak.love/assets/gui/strings/hudturn.png b/sonic-bluestreak.love/assets/gui/strings/hudturn.png
new file mode 100644
index 0000000..5de4459
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/strings/hudturn.png differ
diff --git a/sonic-bluestreak.love/assets/gui/strings/lvl.png b/sonic-bluestreak.love/assets/gui/strings/lvl.png
new file mode 100644
index 0000000..32c73ae
Binary files /dev/null and b/sonic-bluestreak.love/assets/gui/strings/lvl.png differ
diff --git a/sonic-bluestreak.love/assets/music/battle1.mp3 b/sonic-bluestreak.love/assets/music/battle1.mp3
new file mode 100644
index 0000000..bd89da4
Binary files /dev/null and b/sonic-bluestreak.love/assets/music/battle1.mp3 differ
diff --git a/sonic-bluestreak.love/assets/music/battle2.mp3 b/sonic-bluestreak.love/assets/music/battle2.mp3
new file mode 100644
index 0000000..9360a30
Binary files /dev/null and b/sonic-bluestreak.love/assets/music/battle2.mp3 differ
diff --git a/sonic-bluestreak.love/assets/music/city.mp3 b/sonic-bluestreak.love/assets/music/city.mp3
deleted file mode 100644
index 454d462..0000000
Binary files a/sonic-bluestreak.love/assets/music/city.mp3 and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/music/desert.mp3 b/sonic-bluestreak.love/assets/music/desert.mp3
deleted file mode 100644
index 80f2fe0..0000000
Binary files a/sonic-bluestreak.love/assets/music/desert.mp3 and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/music/options.ogg b/sonic-bluestreak.love/assets/music/options.ogg
deleted file mode 100644
index adbb613..0000000
Binary files a/sonic-bluestreak.love/assets/music/options.ogg and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/music/testmap.mp3 b/sonic-bluestreak.love/assets/music/testmap.mp3
new file mode 100644
index 0000000..3c4296e
Binary files /dev/null and b/sonic-bluestreak.love/assets/music/testmap.mp3 differ
diff --git a/sonic-bluestreak.love/assets/music/testmap2.mp3 b/sonic-bluestreak.love/assets/music/testmap2.mp3
new file mode 100644
index 0000000..7aff3c5
Binary files /dev/null and b/sonic-bluestreak.love/assets/music/testmap2.mp3 differ
diff --git a/sonic-bluestreak.love/assets/music/victory.mp3 b/sonic-bluestreak.love/assets/music/victory.mp3
new file mode 100644
index 0000000..c65ab31
Binary files /dev/null and b/sonic-bluestreak.love/assets/music/victory.mp3 differ
diff --git a/sonic-bluestreak.love/assets/overworld.lua b/sonic-bluestreak.love/assets/overworld.lua
new file mode 100644
index 0000000..740098d
--- /dev/null
+++ b/sonic-bluestreak.love/assets/overworld.lua
@@ -0,0 +1,41 @@
+return {
+  ["tilesets"] = {
+    {"charicons",     "assets/sprites/characters/charicons"},
+    {"normaltiles",   "assets/backgrounds/normaltile"},
+    {"sptiles",       "assets/backgrounds/specialtile"},
+    {"borders",       "assets/backgrounds/borders"},
+  },
+  ["sprites"]  = {
+    {"cursorground",  "assets/gui/cursor/ground"},
+    {"hitGFX",        "assets/sprites/gfx/hit1"},
+    {"encounter",        "assets/sprites/encounter"},
+    {"punch",        "assets/sprites/gfx/punch"},
+    {"dash",        "assets/sprites/gfx/dash"},
+    {"smallsmoke",        "assets/sprites/gfx/smallsmoke"},
+    {"sparkles",        "assets/sprites/gfx/sparkles"},
+  },
+  ["textures"] = {
+    {"statusbar",     "assets/gui/status_bar.png"},
+    {"actorsShadow",  "assets/sprites/shadow.png"},
+
+    {"guiRing",     "assets/gui/ring.png"},
+    {"lvl",     "assets/gui/strings/lvl.png"},
+    {"exp",     "assets/gui/strings/exp.png"},
+
+    {"itembox", "assets/gui/itembox.png"},
+    {"shadow", "assets/sprites/owshadow.png"},
+  },
+  ["sfx"] = {
+    {"hit", "assets/sfx/sommersault.wav"},
+    {"jump", "assets/sfx/woosh.wav"},
+    {"fly", "assets/sfx/flight.wav"},
+    {"dash", "assets/sfx/dash.wav"},
+    {"woosh", "assets/sfx/woosh.wav"},
+    {"spincharge", "assets/sfx/spincharge.wav"},
+    {"spinrelease", "assets/sfx/spinrelease.wav"},
+    {"ring", "assets/sfx/ring.wav"},
+    {"pop", "assets/sfx/pop.wav"},
+    {"fall", "assets/sfx/fall.wav"},
+    {"splash", "assets/sfx/splash.wav"}
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sfx/badnicsDestroyed.wav b/sonic-bluestreak.love/assets/sfx/badnicsDestroyed.wav
new file mode 100644
index 0000000..57c72ca
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/badnicsDestroyed.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/dash.wav b/sonic-bluestreak.love/assets/sfx/dash.wav
new file mode 100644
index 0000000..4b2b2e5
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/dash.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/fall.wav b/sonic-bluestreak.love/assets/sfx/fall.wav
new file mode 100644
index 0000000..dd238f4
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/fall.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/flight.wav b/sonic-bluestreak.love/assets/sfx/flight.wav
new file mode 100644
index 0000000..d452690
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/flight.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_008_fst_wlk_drt_1_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_008_fst_wlk_drt_1_aif.wav
deleted file mode 100644
index 0830a60..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_008_fst_wlk_drt_1_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_008_fst_wlk_drt_2_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_008_fst_wlk_drt_2_aif.wav
deleted file mode 100644
index 54b5360..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_008_fst_wlk_drt_2_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_008_fst_wlk_drt_3_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_008_fst_wlk_drt_3_aif.wav
deleted file mode 100644
index 0eac257..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_008_fst_wlk_drt_3_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_011_fst_lnd_drt_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_011_fst_lnd_drt_aif.wav
deleted file mode 100644
index 4f2e543..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/dirt/Synth_2000000_player_2001000_PLY_SNC_CL_2001_011_fst_lnd_drt_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/brake.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/brake.wav
deleted file mode 100644
index 2f12c09..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/brake.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/land.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/land.wav
deleted file mode 100644
index b697ef3..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/land.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/step1.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/step1.wav
deleted file mode 100644
index af522fb..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/step1.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/step2.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/step2.wav
deleted file mode 100644
index 6a6d351..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/step2.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/step3.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/step3.wav
deleted file mode 100644
index 06796fa..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/glass/step3.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_016_fst_wlk_grs_1_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_016_fst_wlk_grs_1_aif.wav
deleted file mode 100644
index 357da8f..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_016_fst_wlk_grs_1_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_016_fst_wlk_grs_2_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_016_fst_wlk_grs_2_aif.wav
deleted file mode 100644
index e161cda..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_016_fst_wlk_grs_2_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_016_fst_wlk_grs_3_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_016_fst_wlk_grs_3_aif.wav
deleted file mode 100644
index 8bac057..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_016_fst_wlk_grs_3_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_019_fst_lnd_grs_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_019_fst_lnd_grs_aif.wav
deleted file mode 100644
index e045c1e..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/grass/Synth_2000000_player_2001000_PLY_SNC_CL_2001_019_fst_lnd_grs_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/land.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/land.wav
deleted file mode 100644
index 91ed7d3..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/land.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/step1.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/step1.wav
deleted file mode 100644
index e811e93..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/step1.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/step2.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/step2.wav
deleted file mode 100644
index 882b16f..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/step2.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/step3.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/step3.wav
deleted file mode 100644
index 49819e4..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/metal/step3.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/land.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/land.wav
deleted file mode 100644
index ab04ea8..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/land.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/step1.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/step1.wav
deleted file mode 100644
index bb8c621..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/step1.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/step2.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/step2.wav
deleted file mode 100644
index 1f0b9f6..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/step2.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/step3.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/step3.wav
deleted file mode 100644
index 58ddcaa..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/stone/step3.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_012_fst_wlk_wod_1_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_012_fst_wlk_wod_1_aif.wav
deleted file mode 100644
index 7e10a56..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_012_fst_wlk_wod_1_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_012_fst_wlk_wod_2_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_012_fst_wlk_wod_2_aif.wav
deleted file mode 100644
index a49325c..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_012_fst_wlk_wod_2_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_012_fst_wlk_wod_3_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_012_fst_wlk_wod_3_aif.wav
deleted file mode 100644
index b26a29a..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_012_fst_wlk_wod_3_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_015_fst_lnd_wod_aif.wav b/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_015_fst_lnd_wod_aif.wav
deleted file mode 100644
index a055551..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/materials/wood/Synth_2000000_player_2001000_PLY_SNC_CL_2001_015_fst_lnd_wod_aif.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/objects/airbooster.wav b/sonic-bluestreak.love/assets/sfx/gameplay/objects/airbooster.wav
deleted file mode 100644
index c49c59c..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/objects/airbooster.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/objects/ballon.wav b/sonic-bluestreak.love/assets/sfx/gameplay/objects/ballon.wav
deleted file mode 100644
index b817506..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/objects/ballon.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/objects/booster.wav b/sonic-bluestreak.love/assets/sfx/gameplay/objects/booster.wav
deleted file mode 100644
index d06bfda..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/objects/booster.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/objects/jumpboard.wav b/sonic-bluestreak.love/assets/sfx/gameplay/objects/jumpboard.wav
deleted file mode 100644
index 465d36a..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/objects/jumpboard.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/objects/ring.wav b/sonic-bluestreak.love/assets/sfx/gameplay/objects/ring.wav
deleted file mode 100644
index ff6da05..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/objects/ring.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/objects/ringspread.wav b/sonic-bluestreak.love/assets/sfx/gameplay/objects/ringspread.wav
deleted file mode 100644
index e8a10ca..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/objects/ringspread.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/objects/spring.wav b/sonic-bluestreak.love/assets/sfx/gameplay/objects/spring.wav
deleted file mode 100644
index c4916f8..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/objects/spring.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/gameplay/objects/super-ring.wav b/sonic-bluestreak.love/assets/sfx/gameplay/objects/super-ring.wav
deleted file mode 100644
index f6b0acd..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/gameplay/objects/super-ring.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/hit.wav b/sonic-bluestreak.love/assets/sfx/hit.wav
new file mode 100644
index 0000000..ca8a156
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/hit.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/hitconnect.wav b/sonic-bluestreak.love/assets/sfx/hitconnect.wav
new file mode 100644
index 0000000..27a8a81
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/hitconnect.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/jump.wav b/sonic-bluestreak.love/assets/sfx/jump.wav
new file mode 100644
index 0000000..37ce876
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/jump.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/menu/Synth_S4EP2FX_003_SHSY05_32_wav.wav b/sonic-bluestreak.love/assets/sfx/menu/Synth_S4EP2FX_003_SHSY05_32_wav.wav
deleted file mode 100644
index 65cc045..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/menu/Synth_S4EP2FX_003_SHSY05_32_wav.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/menu/Synth_S4EP2FX_004_SHSY10_22_wav.wav b/sonic-bluestreak.love/assets/sfx/menu/Synth_S4EP2FX_004_SHSY10_22_wav.wav
deleted file mode 100644
index 9ce8d08..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/menu/Synth_S4EP2FX_004_SHSY10_22_wav.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/menu/cancel.wav b/sonic-bluestreak.love/assets/sfx/menu/cancel.wav
deleted file mode 100644
index 7a62bce..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/menu/cancel.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/menu/select.wav b/sonic-bluestreak.love/assets/sfx/menu/select.wav
deleted file mode 100644
index 28f214a..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/menu/select.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/menu/validate.wav b/sonic-bluestreak.love/assets/sfx/menu/validate.wav
deleted file mode 100644
index e26b2fd..0000000
Binary files a/sonic-bluestreak.love/assets/sfx/menu/validate.wav and /dev/null differ
diff --git a/sonic-bluestreak.love/assets/sfx/menus/back.wav b/sonic-bluestreak.love/assets/sfx/menus/back.wav
new file mode 100644
index 0000000..4e44af5
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/menus/back.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/menus/beep.wav b/sonic-bluestreak.love/assets/sfx/menus/beep.wav
new file mode 100644
index 0000000..0d66039
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/menus/beep.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/menus/error.wav b/sonic-bluestreak.love/assets/sfx/menus/error.wav
new file mode 100644
index 0000000..f8da311
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/menus/error.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/menus/select.wav b/sonic-bluestreak.love/assets/sfx/menus/select.wav
new file mode 100644
index 0000000..fc4e272
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/menus/select.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/pop.wav b/sonic-bluestreak.love/assets/sfx/pop.wav
new file mode 100644
index 0000000..0f9ff3f
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/pop.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/ring.wav b/sonic-bluestreak.love/assets/sfx/ring.wav
new file mode 100644
index 0000000..736a513
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/ring.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/sommersault.wav b/sonic-bluestreak.love/assets/sfx/sommersault.wav
new file mode 100644
index 0000000..cd140f5
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/sommersault.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/spincharge.wav b/sonic-bluestreak.love/assets/sfx/spincharge.wav
new file mode 100644
index 0000000..cab8702
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/spincharge.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/spinrelease.wav b/sonic-bluestreak.love/assets/sfx/spinrelease.wav
new file mode 100644
index 0000000..55bb46b
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/spinrelease.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/splash.wav b/sonic-bluestreak.love/assets/sfx/splash.wav
new file mode 100644
index 0000000..518af5e
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/splash.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/talk.wav b/sonic-bluestreak.love/assets/sfx/talk.wav
new file mode 100644
index 0000000..d4d178f
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/talk.wav differ
diff --git a/sonic-bluestreak.love/assets/sfx/woosh.wav b/sonic-bluestreak.love/assets/sfx/woosh.wav
new file mode 100644
index 0000000..db000cf
Binary files /dev/null and b/sonic-bluestreak.love/assets/sfx/woosh.wav differ
diff --git a/sonic-bluestreak.love/assets/sprites/characters/badnics.png b/sonic-bluestreak.love/assets/sprites/characters/badnics.png
new file mode 100644
index 0000000..cfa82dc
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/characters/badnics.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/characters/character-base.xcf b/sonic-bluestreak.love/assets/sprites/characters/character-base.xcf
new file mode 100644
index 0000000..48f25fa
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/characters/character-base.xcf differ
diff --git a/sonic-bluestreak.love/assets/sprites/charset/item1.png b/sonic-bluestreak.love/assets/sprites/charset/item1.png
new file mode 100644
index 0000000..6d8303e
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/charset/item1.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/charset/perso-flight.png b/sonic-bluestreak.love/assets/sprites/charset/perso-flight.png
new file mode 100644
index 0000000..abae62e
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/charset/perso-flight.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/charset/perso-jump.png b/sonic-bluestreak.love/assets/sprites/charset/perso-jump.png
new file mode 100644
index 0000000..3d029fd
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/charset/perso-jump.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/charset/perso-punch.png b/sonic-bluestreak.love/assets/sprites/charset/perso-punch.png
new file mode 100644
index 0000000..4092617
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/charset/perso-punch.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/charset/perso.png b/sonic-bluestreak.love/assets/sprites/charset/perso.png
new file mode 100644
index 0000000..f027c9e
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/charset/perso.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/charset/perso2.png b/sonic-bluestreak.love/assets/sprites/charset/perso2.png
new file mode 100644
index 0000000..8b5af23
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/charset/perso2.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/encounter.lua b/sonic-bluestreak.love/assets/sprites/encounter.lua
new file mode 100644
index 0000000..5ec1c03
--- /dev/null
+++ b/sonic-bluestreak.love/assets/sprites/encounter.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    height      = 25,
+    width       = 32,
+    defaultAnim = "default",
+    ox = 8,
+    oy = 25
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 2,
+      loop        = 1,
+      speed       = 4,
+      pauseAtEnd  = false,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sprites/encounter.png b/sonic-bluestreak.love/assets/sprites/encounter.png
new file mode 100644
index 0000000..471374c
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/encounter.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/boom1.lua b/sonic-bluestreak.love/assets/sprites/gfx/boom1.lua
new file mode 100644
index 0000000..d9ec909
--- /dev/null
+++ b/sonic-bluestreak.love/assets/sprites/gfx/boom1.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    height      = 32,
+    width       = 32,
+    defaultAnim = "default",
+    ox          = 16,
+    oy          = 32,
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 3,
+      loop        = 1,
+      speed       = 15,
+      pauseAtEnd  = false,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/boom1.png b/sonic-bluestreak.love/assets/sprites/gfx/boom1.png
new file mode 100644
index 0000000..40fe6a1
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/gfx/boom1.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/dash.lua b/sonic-bluestreak.love/assets/sprites/gfx/dash.lua
new file mode 100644
index 0000000..41713d7
--- /dev/null
+++ b/sonic-bluestreak.love/assets/sprites/gfx/dash.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    width       = 26,
+    height      = 44,
+    defaultAnim = "default",
+    ox          = 0,
+    oy          = 22,
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 4,
+      loop        = 1,
+      speed       = 15,
+      pauseAtEnd  = false,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/dash.png b/sonic-bluestreak.love/assets/sprites/gfx/dash.png
new file mode 100644
index 0000000..3ac30c7
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/gfx/dash.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/hit1.lua b/sonic-bluestreak.love/assets/sprites/gfx/hit1.lua
new file mode 100644
index 0000000..522cd88
--- /dev/null
+++ b/sonic-bluestreak.love/assets/sprites/gfx/hit1.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    height      = 32,
+    width       = 32,
+    defaultAnim = "default",
+    ox          = 16,
+    oy          = 32,
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 5,
+      loop        = 1,
+      speed       = 15,
+      pauseAtEnd  = false,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/hit1.png b/sonic-bluestreak.love/assets/sprites/gfx/hit1.png
new file mode 100644
index 0000000..6b0bcf9
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/gfx/hit1.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/homming.lua b/sonic-bluestreak.love/assets/sprites/gfx/homming.lua
new file mode 100644
index 0000000..7d00906
--- /dev/null
+++ b/sonic-bluestreak.love/assets/sprites/gfx/homming.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    width       = 33,
+    height      = 44,
+    defaultAnim = "default",
+    ox          = 16,
+    oy          = 22,
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 7,
+      loop        = 1,
+      speed       = 15,
+      pauseAtEnd  = false,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/homming.png b/sonic-bluestreak.love/assets/sprites/gfx/homming.png
new file mode 100644
index 0000000..ea42fb1
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/gfx/homming.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/punch.lua b/sonic-bluestreak.love/assets/sprites/gfx/punch.lua
new file mode 100644
index 0000000..1b21bc1
--- /dev/null
+++ b/sonic-bluestreak.love/assets/sprites/gfx/punch.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    width       = 32,
+    height      = 28,
+    defaultAnim = "default",
+    ox          = 0,
+    oy          = 14,
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 4,
+      loop        = 1,
+      speed       = 15,
+      pauseAtEnd  = false,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/punch.png b/sonic-bluestreak.love/assets/sprites/gfx/punch.png
new file mode 100644
index 0000000..3b1362b
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/gfx/punch.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/smallsmoke.lua b/sonic-bluestreak.love/assets/sprites/gfx/smallsmoke.lua
new file mode 100644
index 0000000..f03c073
--- /dev/null
+++ b/sonic-bluestreak.love/assets/sprites/gfx/smallsmoke.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    width       = 18,
+    height      = 22,
+    defaultAnim = "default",
+    ox          = 9,
+    oy          = 11,
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 5,
+      loop        = 1,
+      speed       = 15,
+      pauseAtEnd  = true,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/smallsmoke.png b/sonic-bluestreak.love/assets/sprites/gfx/smallsmoke.png
new file mode 100644
index 0000000..36be9e7
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/gfx/smallsmoke.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/sparkles.lua b/sonic-bluestreak.love/assets/sprites/gfx/sparkles.lua
new file mode 100644
index 0000000..bf392eb
--- /dev/null
+++ b/sonic-bluestreak.love/assets/sprites/gfx/sparkles.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    width       = 16,
+    height      = 16,
+    defaultAnim = "default",
+    ox          = 8,
+    oy          = 8,
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 4,
+      loop        = 1,
+      speed       = 20,
+      pauseAtEnd  = true,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/sparkles.png b/sonic-bluestreak.love/assets/sprites/gfx/sparkles.png
new file mode 100644
index 0000000..4415eb1
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/gfx/sparkles.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/tornado.lua b/sonic-bluestreak.love/assets/sprites/gfx/tornado.lua
new file mode 100644
index 0000000..c1d863f
--- /dev/null
+++ b/sonic-bluestreak.love/assets/sprites/gfx/tornado.lua
@@ -0,0 +1,18 @@
+return {
+  metadata = {
+    width       = 64,
+    height      = 54,
+    defaultAnim = "default",
+    ox          = 32,
+    oy          = 48,
+  },
+  animations = {
+    ["default"] = {
+      startAt     = 1,
+      endAt       = 15,
+      loop        = 1,
+      speed       = 30,
+      pauseAtEnd  = false,
+    },
+  }
+}
diff --git a/sonic-bluestreak.love/assets/sprites/gfx/tornado.png b/sonic-bluestreak.love/assets/sprites/gfx/tornado.png
new file mode 100644
index 0000000..ae5d581
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/gfx/tornado.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/owshadow.png b/sonic-bluestreak.love/assets/sprites/owshadow.png
new file mode 100644
index 0000000..072529a
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/owshadow.png differ
diff --git a/sonic-bluestreak.love/assets/sprites/punch.png b/sonic-bluestreak.love/assets/sprites/punch.png
new file mode 100644
index 0000000..c9cdcce
Binary files /dev/null and b/sonic-bluestreak.love/assets/sprites/punch.png differ
diff --git a/sonic-bluestreak.love/assets/subgames.lua b/sonic-bluestreak.love/assets/subgames.lua
new file mode 100644
index 0000000..04afc43
--- /dev/null
+++ b/sonic-bluestreak.love/assets/subgames.lua
@@ -0,0 +1,21 @@
+return {
+  ["textures"] = {
+    {"shadow", "assets/sprites/shadow.png"}
+  },
+  ["sprites"] = {
+    {"ring",      "assets/sprites/items/ring"}
+  },
+  ["imagefonts"] = {
+    {"menu",    "assets/gui/fonts/SA2font"},
+    {"numbers",    "assets/gui/fonts/hudnumbers"},
+    {"smallnumbers",    "assets/gui/fonts/hudsmallnumbers"},
+  },
+  ["sfx"] = {
+    {"navigate",  "assets/sfx/menus/beep.wav"},
+    {"confirm",   "assets/sfx/menus/select.wav"},
+    {"cancel",    "assets/sfx/menus/back.wav"},
+  },
+  ["tilesets"] = {
+    {"sptiles", "assets/backgrounds/specialtile"}
+  }
+}
diff --git a/sonic-bluestreak.love/assets/transitions/border.png b/sonic-bluestreak.love/assets/transitions/border.png
new file mode 100644
index 0000000..93cc110
Binary files /dev/null and b/sonic-bluestreak.love/assets/transitions/border.png differ
diff --git a/sonic-bluestreak.love/assets/transitions/eggdecal.png b/sonic-bluestreak.love/assets/transitions/eggdecal.png
new file mode 100644
index 0000000..5f94fd7
Binary files /dev/null and b/sonic-bluestreak.love/assets/transitions/eggdecal.png differ
diff --git a/sonic-bluestreak.love/assets/transitions/sonicdecal.png b/sonic-bluestreak.love/assets/transitions/sonicdecal.png
new file mode 100644
index 0000000..f5f3039
Binary files /dev/null and b/sonic-bluestreak.love/assets/transitions/sonicdecal.png differ