Lots of updates to the music player. Other than track titles and final songs, it's p much done. Also made some sprint non-flipped to save on tokens.

6 files changed, 219 insertions, 145 deletions

diff --git a/musicplayer/background_music.lua b/musicplayer/background_music.lua
index e8d6f5a..dbf2df6 100644
--- a/musicplayer/background_music.lua
+++ b/musicplayer/background_music.lua
@@ -18,9 +18,8 @@ function bgplanetmegasprite(x,y)
 
     palt(0,false)
     palt(13,true)
-        spr(194,x+10,y+0,7,2)
-        spr(201,x+10,y+16,7,2)
-        spr(234,x+2,y+32,6,2)
+        spr(200,x,y,7,4)
+        spr(194,x-8,y+32,6,2)
     palt()
 end
 
@@ -33,9 +32,9 @@ function drawbg()
     end
 
     --galaxies
-    spr(120, 20, 30, 1, 1)
-    spr(104, 108, 40, 1, 1)
-    spr(104, 42, 74, 1, 1, true, true)
+    spr(239, 20, 30, 1, 1)
+    spr(255, 108, 40, 1, 1)
+    spr(255, 42, 74, 1, 1, true, true)
 
     --ringed planet
     bgplanetmegasprite(150-(gt*10)%300,50)
@@ -43,22 +42,22 @@ function drawbg()
     --clouds
     scrollingcircles(-9, 24, 22, 22, 2)
     --small clouds
-    scrollingsprite(88, 60, 10, 1, 1, 28)
-    scrollingsprite(88, 120, 10, 1, 1, 28)
-    scrollingsprite(88, 130, 12, 1, 1, 29)
-    scrollingsprite(88, 160, 15, 1, 1, 30)--
-    scrollingsprite(72, 145, 15, 1, 1, 30)--
-    scrollingsprite(72, 20, 10, 1, 1, 28)
-    scrollingsprite(72, 100, 10, 1, 1, 28)
-    scrollingsprite(72, 170, 15, 1, 1, 30)
+    scrollingsprite(207, 60, 10, 1, 1, 28)
+    scrollingsprite(207, 120, 10, 1, 1, 28)
+    scrollingsprite(207, 130, 12, 1, 1, 29)
+    scrollingsprite(207, 160, 15, 1, 1, 30)--
+    scrollingsprite(223, 145, 15, 1, 1, 30)--
+    scrollingsprite(223, 20, 10, 1, 1, 28)
+    scrollingsprite(223, 100, 10, 1, 1, 28)
+    scrollingsprite(223, 170, 15, 1, 1, 30)
     --large clouds
-    scrollingsprite(248, 40, 5, 2, 1, 35)
-    scrollingsprite(248, 80, 5, 2, 1, 35)
-    scrollingsprite(248, 180, 9, 2, 1, 38)
-    scrollingsprite(248, 260, 9, 2, 1, 38)--
-    scrollingsprite(232, 120, 7, 2, 1, 36)--
-    scrollingsprite(232, 160, 7, 2, 1, 36)
-    scrollingsprite(232, 240, 9, 2, 1, 38)
+    scrollingsprite(35, 80, 5, 2, 1, 35)
+    scrollingsprite(35, 180, 9, 2, 1, 38)
+    scrollingsprite(35, 260, 9, 2, 1, 38)--
+    scrollingsprite(51, 40, 5, 2, 1, 35)
+    scrollingsprite(51, 120, 7, 2, 1, 36)--
+    scrollingsprite(51, 160, 7, 2, 1, 36)
+    scrollingsprite(51, 240, 9, 2, 1, 38)
     --fg clouds
     scrollingcircles(-11, 40, 25, 20, 2)
     scrollingcircles(-12, 40, 25, 20, 4)
diff --git a/musicplayer/draw_music.lua b/musicplayer/draw_music.lua
index 118d461..36d5328 100644
--- a/musicplayer/draw_music.lua
+++ b/musicplayer/draw_music.lua
@@ -4,8 +4,6 @@ pal({1,2,131,141,5,6,7,136,9,137,139,12,133,3,140,130}, 1) --don't ask me why, b
 
 
 drawbg()
-drawobjs()
-
 menushipscroll += ft
 
 for i = 1, 3, 1 do
@@ -17,13 +15,16 @@ if t() < 1 then
 else
     drawlogo(24,26)
 end
+credits(40,116)
 
---main screen items
-mainmenutext(15,74)
-credits(10,108)
+if not hideui then
+    --main screen items
+    mainmenutext(15,74)
 
---intro acid transtition
-acidcounter+=ft
-acidtransition()
+    --intro acid transtition
+    acidcounter+=ft
+    acidtransition()
+    drawobjs() --only used for acid trans here
+end
 
--- print(tracknumber,0,0)
\ No newline at end of file
+-- print(autoplay,0,0,7)
\ No newline at end of file
diff --git a/musicplayer/music.p8 b/musicplayer/music.p8
index 880bf46..73dd0c0 100644
--- a/musicplayer/music.p8
+++ b/musicplayer/music.p8
@@ -2,9 +2,10 @@ pico-8 cartridge // http://www.pico-8.com
 version 35
 __lua__
 --▶  toxic invaders soundtrack  ◀
---▶ WIP       1029chris         ◀
+--▶ WIP      1029chris          ◀
 
---    0-31 SLOTS ARE FOR SFX
+--    0-27 SLOTS RESERVED FOR SFX
+--     SPRITEWORK BY RIBBONCABLE
 
 #include objects_music.lua
 #include particles_music.lua
@@ -35,54 +36,54 @@ __gfx__
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003eb900000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ebea00000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007ebbbe3000000000
+00000000000000000000000000444000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000044444000044440000000000000000000000000000000000000000000000000000000000000000000000000000ebbbe900000000
+000000000000000000000000444444004444444000000000000000000000000000000000000000000000000000000000000000000000000003bbe30000000000
+00000000000000000000000044044004444004440000000000000000000000000000000000000000000000000000000000000000000000007e3b300000000000
+00000000000000000000000044400444400040440000000000000000000000000000000000000000000000000000000000000000000000007e3b300000000000
+000000000000000000000000444444440000444400000000000000000000000000000000000000000000000000000000000000000000000003bbe30000000000
+000000000000000000000000044444400000044000000000000000000000000000000000000000000000000000000000000000000000000000ebbbe900000000
+00000000000000000000000000444400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000444444400004400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000004444444440044440000000000000000000000000000000000000000000000000000000000000000000000000033bb3000000000
+00000000000000000000000044440004444040440000000000000000000000000000000000000000000000000000000000000000000000007ebe33e900000000
+000000000000000000000000444044404444044400000000000000000000000000000000000000000000000000000000000000000000000000e3bbe000000000
+000000000000000000000000444044440444444000000000000000000000000000000000000000000000000000000000000000000000000000e3bbe000000000
+00000000000000000000000044440444004444000000000000000000000000000000000000000000000000000000000000000000000000007ebe33e900000000
+00000000000000000000000004444444000000000000000000000000000000000000000000000000000000000000000000000000000000000033bb3000000000
+00000000000000000000000000444440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ebbbe900000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003bbe30000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007e3b300000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007e3b300000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003bbe30000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ebbbe900000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000033bb3000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007ebe33e900000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3bbe000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3bbe000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007ebe33e900000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000033bb3000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000222200000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002200020000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002022002000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002222020000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000222000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002202200000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002220220200000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000222022000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000044440000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000440004000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004044400400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004440440400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000404400400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000404400000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000040400000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004004440000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004044044000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004044440400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000440400400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000040400000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -115,38 +116,38 @@ __gfx__
 0000000000000000000000000000000000000000000000000000000000000000dfcc060d28228222bdd9ad220000003b303b33b30aa999990aaaaaaa3b3b3333
 00000000000000000000000000000000000000000000000000000000000000002d0000d288822282ea9999220000003e303eeee300aa999900aaaaaa3e3eeee3
 00000000000000000000000000000000000000000000000000000000000000002220d222282222222ea999920000003330333333000aa99a000aaaa033333333
-0000000000000000ddddddddddddddddddddddddddddddddddddddddddddddddddddddddd00002222222222222200000000222222222dddddd2222222d222ddd
-0288888888888200ddddddddddddddddddddddddddddddddddddddddddddddddddddddddd22220222220022222220000002222222222ddddd2222222d222dddd
-2888888888888820ddddddddddddddddddddddddddddddddddddddddddddddddd22222dd222222022202202222222222222222222222dddd2222222d222ddddd
-8822224442222880ddddddddddddddd022222222dddddddddddddddddddddd022222222d2220022022202022222222222222222222220dd2222222d222dddddd
-8822244422222880ddddddddddddd22222222222222ddddddddddddddddd0222222222222202002200222022222222222222222222200d2222222d222ddddddd
-8888888888888880dddddddddd0222222222222222222dddddddddddd00222222222222222220002222202222222222222222222220002222222d222dddddddd
-8820222222202880dd222dddd222222222222222222222ddddddddd002222220222222220220200000002222222222222222222220002222222d222ddddddddd
-2200282028200220d22222d022002222222222222222222ddddddd002220dddd02222222d00022000002222222222222222222220002222222d222dddddddddd
-0000222022200000d2200202202202222220000222222222dddd00220ddddddd02222222d0022222222222222222222222222220002222222d222ddddddddddd
-0002888888820000d22022022202022222022220222222222d0020dddddddddd22222222dd02222222222222222222222222220022222222d222dddddddddddd
-0028888888882000d22200002222022220222022022002222200ddddddddddd022222222dd0022222222222222222222222220022222222d222ddddddddddddd
-0288822222888200d0222222222022220022020202022022222dddddddddddd22222d222dd002222222222222222222222200022222222d222dddddddddddddd
-0288288888288200dd000000000222220022022202202022222ddddddddddd222222222dddd00222222222222222222222000222222202222ddddddddddddddd
-2888888888888820dd0000000222222200222000002220222220ddddddddd222222d222ddd00002222222222222222220002222222202222dddddddddddddddd
-2882882828828820d00222222222222200022222222202222222dddddddd222222d222ddd00000022222222222222200022222222202222ddddddddddddddddd
-2888888888888820d02222222222222220000222220022222222ddddddd2222222222ddd000dd00022222222222200022222222220222ddddddddddddddddddd
-28282848282828200002888888882000000000000000000022202220000080000044400000000000ddddddd000dddd000022222222000022222222202222dddd
-28288888888828200028822422288200000000002820000028222820000282000444440000444400dddddd000dddddd0000022200000222222222022222ddddd
-28284848282828200088888888888800000000282820000028888820000888004444440044444440ddddd022ddddddddd000000000222222222202222ddddddd
-28288888888828200022200000022200000000282828200022828222008888204404400444400444dddd022ddddddddddd0000002222222222022222dddddddd
-28284828282828200028200000028200000028282828200022828282082888804440044440004044ddd0222dddddddddddd0002222222222002222dddddddddd
-28288888888828200028288888828200000028282828200028888882008888824444444400004444dd0222dddddddddddddd2222222222002222dddddddddddd
-28282828284828200022888888882200000028282828200022828222088882880444444000000440d0222ddddddddddddd22222222220022222ddddddddddddd
-28288888888828200028282848488200000028282828200002828200288288020044440000000000d2222ddddddddddd22222222220022222ddddddddddddddd
-282228284822282000288888888882000000282828282000028282000028888000444444400004400222dddddddd2222222222222d22222ddddddddddddddddd
-282888888888282002882244422288200000028828820000028282000888888804444444440044442222dddddd2222222222222d22222ddddddddddddddddddd
-2828282828282820028824442222882000000028282000000282820082808828444400044440404422222222222222222222dd2222dddddddddddddddddddddd
-282888222888282002888888888888200000002882000000028282000088888044404440444404442222222222222222dddd2222dddddddddddddddddddddddd
-28282822282828200282888888282820000000282000000002828200082088204440444404444440222222222222ddd222222ddddddddddddddddddddddddddd
-2888882228888820028888282888882000000028200000000282820000022200444404440044440022222222dd222222222ddddddddddddddddddddddddddddd
-28882822282888200282882228282820000200282000200002828202000082000444444400000000d222222222222222dddddddddddddddddddddddddddddddd
-28888822288888222288882228888822020220282220202022828222000082000044444000000000dd22222222222ddddddddddddddddddddddddddddddddddd
+0000000000000000ddddddd000dddd000022222222000022222222202222dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd00000000
+0288888888888200dddddd000dddddd0000022200000222222222022222ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd00000000
+2888888888888820ddddd022ddddddddd000000000222222222202222dddddddddddddddddddddddddddddddddddddddddddddddddddddddd22222dd02222000
+8822224442222880dddd022ddddddddddd0000002222222222022222ddddddddddddddddddddddd022222222dddddddddddddddddddddd022222222d22000200
+8822244422222880ddd0222dddddddddddd0002222222222002222ddddddddddddddddddddddd22222222222222ddddddddddddddddd02222222222220220020
+8888888888888880dd0222dddddddddddddd2222222222002222dddddddddddddddddddddd0222222222222222222dddddddddddd00222222222222222220200
+8820222222202880d0222ddddddddddddd22222222220022222ddddddddddddddd222dddd222222222222222222222ddddddddd0022222202222222202200000
+2200282028200220d2222ddddddddddd22222222220022222dddddddddddddddd22222d022002222222222222222222ddddddd002220dddd0222222200000000
+00002220222000000222dddddddd2222222222222d22222dddddddddddddddddd2200202202202222220000222222222dddd00220ddddddd0222222200000000
+00028888888200002222dddddd2222222222222d22222dddddddddddddddddddd22022022202022222022220222222222d0020dddddddddd2222222200000000
+002888888888200022222222222222222222dd2222ddddddddddddddddddddddd22200002222022220222022022002222200ddddddddddd02222222202220000
+02888222228882002222222222222222dddd2222ddddddddddddddddddddddddd0222222222022220022020202022022222dddddddddddd22222d22222022000
+0288288888288200222222222222ddd222222ddddddddddddddddddddddddddddd000000000222220022022202202022222ddddddddddd222222222d22202202
+288888888888882022222222dd222222222ddddddddddddddddddddddddddddddd0000000222222200222000002220222220ddddddddd222222d222d02220220
+2882882828828820d222222222222222ddddddddddddddddddddddddddddddddd00222222222222200022222222202222222dddddddd222222d222dd00000000
+2888888888888820dd22222222222dddddddddddddddddddddddddddddddddddd02222222222222220000222220022222222ddddddd2222222222ddd00000000
+2828284828282820000288888888200000000000000000002220222000008000d00002222222222222200000000222222222dddddd2222222d222ddd00444400
+2828888888882820002882242228820000000000282000002822282000028200d22220222220022222220000002222222222ddddd2222222d222dddd04400040
+2828484828282820008888888888880000000028282000002888882000088800222222022202202222222222222222222222dddd2222222d222ddddd40444004
+28288888888828200022200000022200000000282828200022828222008888202220022022202022222222222222222222220dd2222222d222dddddd44404404
+28284828282828200028200000028200000028282828200022828282082888802202002200222022222222222222222222200d2222222d222ddddddd04044004
+282888888888282000282888888282000000282828282000288888820088888222220002222202222222222222222222220002222222d222dddddddd00000040
+28282828284828200022888888882200000028282828200022828222088882880220200000002222222222222222222220002222222d222ddddddddd40000000
+2828888888882820002828284848820000002828282820000282820028828802d00022000002222222222222222222220002222222d222dddddddddd04044000
+2822282848222820002888888888820000002828282820000282820000288880d0022222222222222222222222222220002222222d222ddddddddddd00404000
+2828888888882820028822444222882000000288288200000282820008888888dd02222222222222222222222222220022222222d222dddddddddddd00000000
+2828282828282820028824442222882000000028282000000282820082808828dd0022222222222222222222222220022222222d222ddddddddddddd40044400
+2828882228882820028888888888882000000028820000000282820000888880dd002222222222222222222222200022222222d222dddddddddddddd40440440
+2828282228282820028288888828282000000028200000000282820008208820ddd00222222222222222222222000222222202222ddddddddddddddd40444404
+2888882228888820028888282888882000000028200000000282820000022200dd00002222222222222222220002222222202222dddddddddddddddd04404004
+2888282228288820028288222828282000020028200020000282820200008200d00000022222222222222200022222222202222ddddddddddddddddd00000040
+2888882228888822228888222888882202022028222020202282822200008200000dd00022222222222200022222222220222ddddddddddddddddddd00404000
 __label__
 iiiiittttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
 iiiitttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
@@ -310,7 +311,7 @@ a008000022614286102d6103061033610356103661037610376103561034610326102e6102b61028
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-d01c00081f011220161a0161f0162b0112e016260162b016000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d11c00081f011220161a0161f0162b0112e016260162b016000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 490e00101000334615346253461510073346153462534615100033461534625346151007334615346253461500000000000000000000000000000000000000000000000000000000000000000000000000000000
 110e00080030207755077550775500700077550775507755000000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 09380000221212212229121291222912500100001000f1021b1211b1222812128122281250010000100281021d1211d1222112121122211250010000100211021f1211f122221212212222125221002210000000
@@ -325,11 +326,18 @@ d10e00201f42222422264222e4021f42222422264222e4021f42222422264222e4021f4222242226
 911c02042b311133212b3211331100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 490e000021600156002160021600216003960039600396002162515600216002160021625396003960039600156252160521625240002d625396053962500000156251560521625216052d625396253962539625
 5d0e0020100730715407252071521c675071440c1420a14210073071540a152091521c675071540c3520e152160730d1540d2510d253226750d154121521015216073160731607316073226750d3541946425474
-5d0e0020100730715407252071521c675071440c1420a14210073071540a152091521c675071540c3520e152100730715407251072531c675071540c1520a15210073071540a152091521c675071540035202452
-5d0e0020100730725407252072521c675073440c4420a34210073073540a452093521c675073540c4520e352100730725407251072531c675073540c4520a35210073073540a452093521c675073540045202352
-5d0e0020100730725407252072521c675073440c4420a34210073073540a452093521c675073540c4520e352160730d2540d2510d253226750d3541245210352160730d354104520f352226750d3540645208352
-5d0e0020120730925409252092521e675093440e4420c34212073093540c4520b3521e675093540e45210352180730f2540f2510f253246750f3541445212352180730f3541245211352246750f354084520a352
+5d0e0020100730713407242071321c675071340c1320a13210073071340a132091321c675071340c3420e132100730713407251072531c675071340c1320a13210073071340a132091321c675071340035202452
+5d0e0020100730727407252072521c675073440c4420a34210073073440a442093421c675073440c4420e342100730725407251072531c675073440c4420a34210073073440a442093421c675073440044202342
+5d0e0020100730725407252072521c675073440c4420a34210073073440a442093421c675073440c4420e342160730d2440d2410d243226750d3441244210342160730d344104420f342226750d3440644208342
+5d0e0020120730925409252092521e675093440e4420c34212073093440c4420b3421e675093440e44210342180730f2540f2510f253246750f3441444212342180730f3441244211342246750f344084420a342
 d10e002021422244222842230402214222442228422304022142224422284223040221422244222842230402274222a4222e4222a402274222a4222e4222a402274222a4222e4222a402274222a4222e42236402
+5d0e0020100730724413242072421c6751f2442b2421f24210073133441f340093421c67513344184420e342100730d244192410d243226750d2441e44210342100730d344104420f34222675193442b2422b243
+490e0010100633461534625346151e665346151006334615100633461534625346151e66534615346253461500000000000000000000000000000000000000000000000000000000000000000000000000000000
+5d0e0020120731524421242152421e67515244212422124312073093440c4420b3421e6751e6751e6751e675180730f2441b2410f243246750f2442c2421e242180730f3441244211342246750f3442044222342
+5d1c0008100530723413232072321c655072341323207242100001330007300093001c60013300184000e300100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200
+5d1c1000100000723413232072321c6000723413232072321000007234132321f2321c600072341f23213232100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200
+5d381000072440724213242072421c675072441c6751f242072440724213242072421c675072001c6001f200100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200
+2138000022100221002910029100291002910029100291001b1001b10028100281002810004100101001c1001d1001d1002110021100211001d10021100291001f1001f100221002210022100221002210000000
 __music__
 00 20616263
 00 20256263
@@ -347,14 +355,19 @@ __music__
 00 2d2e6161
 01 21316161
 02 21326161
-00 41424344
-00 41424344
-00 41424344
-00 41424344
-00 41424344
-00 5b5c4344
-01 5b5c5844
-00 5b5c4044
-00 5a5c4344
-02 5a5c4344
+01 37756161
+01 37756161
+00 37356161
+01 21316161
+00 21326161
+00 35316161
+00 35326161
+00 35396161
+00 21346161
+00 21366161
+00 35346161
+00 35366161
+02 35236161
+00 35346161
+00 35366161
 
diff --git a/musicplayer/objects_music.lua b/musicplayer/objects_music.lua
index 2760b05..ea3705b 100644
--- a/musicplayer/objects_music.lua
+++ b/musicplayer/objects_music.lua
@@ -4,43 +4,67 @@ ft = 1/60 --frametime
 scrollspeed = 0
 menushipscroll = 0
 acidcounter = 0
+hideui = false
+autoplay = false
+autoplaytimer = 90
 tracknumber = 0
-tracktext = ""
+currentsong = -1
+fadeouttimer = 1
+tracktitleposition = -200
+newtracktitleposition = 0
 cartdata("toxicinvaderssoundtrack_by1029chris")
 
+function playsong(song, fade)
+    fade = fade or 0
+    if song ~= currentsong then
+        music(song, fade)
+        currentsong = song
+    end
+end
+
+function fadeoutsong()
+    fadeouttimer = 1
+    playsong(-1,1000) --fades out currentsong
+end
+
+function selectmusic()
+    if tracknumber == -1 then
+        tracknumber = 0
+    elseif tracknumber == 0 then
+        playsong(-1,0)
+    elseif tracknumber == 1 then
+        playsong(0)
+    elseif tracknumber == 2 then
+        playsong(8)
+    elseif tracknumber == 3 then
+        playsong(17)
+    elseif tracknumber == 4 then
+        playsong(-1,0)
+    end
+end
 
-function playmusic()
+function updatetracktitlepos()
     if tracknumber == 0 then
-        tracktext = " mENU"
-        music(-1,0,3)
-       elseif tracknumber == 1 then
-        tracktext = "fORWARD"
-        music(2,0,3)
-       elseif tracknumber == 2 then
-        tracktext = " bOSSY"
-        music(8, 0, 3)
-       elseif tracknumber == 3 then
-        tracktext = " pORTAL"
-        music(-1,0,3)
-       end
+        newtracktitleposition = -16
+    elseif tracknumber == 1 then
+        newtracktitleposition = 145
+    elseif tracknumber == 2 then
+        newtracktitleposition = 313
+    elseif tracknumber == 3 then
+        newtracktitleposition = 493
+    elseif tracknumber == 4 then
+        newtracktitleposition = 685
     end
+end
 
 function updateobjs()
-    foreach(players, function(obj) obj:update() end)
-    foreach(enemies, function(obj) obj:update() end)
     foreach(obj, function(obj) obj:update() end)
-    despawnallbullets = false
 end
 
 function drawobjs()
     foreach(obj, function(obj) obj:draw() end)
-    foreach(enemies, function(obj) obj:draw() end)
-    clip() --for the final boss
-    foreach(players, function(obj) obj:draw() end)
 end
 
 function lerp(start, destination, amount)
     return start + amount * (destination - start);
-end
-
-playmusic()
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/musicplayer/ui_music.lua b/musicplayer/ui_music.lua
index ce709cb..7252881 100644
--- a/musicplayer/ui_music.lua
+++ b/musicplayer/ui_music.lua
@@ -54,7 +54,7 @@ function mainmenutext(x,y,currentlyplaying)
     printdropshadow("(\139) track selection (\145)\n",x,y,9,2)
 
     poke(0x5f58, 0x9 | 0x4) --makes score BIG
-    printdropshadow(tracktext,x+24+circletimex,y+18+circletimey,11,3)
+    printdropshadow("mENU mUSE          bATTLE bASS          bOSSY bEATS          fISSURE fINALE          vICTORY vESSLE",x-tracktitleposition+circletimex,y+18+circletimey,11,3)
     poke(0x5f58)
 end
 
@@ -67,9 +67,9 @@ function credits(x,y)
 
     palt(2,true)
     palt(0,false)
-    spr(186,x+30,y+7+sintimecredits,1,1,timemodcredits) --duck
+    spr(186,x,y+sintimecredits,1,1,timemodcredits) --duck
     palt()
-    printdropshadow("1029chris",x+42,y+9,9,2)
+    printdropshadow("1029chris",x+11,y+2,9,2)
 end
 
 --intro/ending acid effect
@@ -86,4 +86,5 @@ end
 --sfx for the intro transition
 sfx(0,3,3)
 
-menuitem(1, "(❎ ⁙ 🅾️) to end", function() music(-1,3000,3) end)
\ No newline at end of file
+menuitem(1, "(\152) hide ui", function() hideui = not hideui end)
+menuitem(3, "(❎ ⁙ 🅾️) to end", function() music(-1,3000,3) end)
\ No newline at end of file
diff --git a/musicplayer/update_music.lua b/musicplayer/update_music.lua
index e52c663..f0987ae 100644
--- a/musicplayer/update_music.lua
+++ b/musicplayer/update_music.lua
@@ -4,10 +4,46 @@ circletimex = sin(t())*3 -- for elements that move in a circle (respawn timer)
 circletimey = cos(t())*3
 
 gt += scrollspeed + 1/600
+fadeouttimer -= ft
 
 updateobjs() --update all objects
 
-if btnp(0) then tracknumber-=1 playmusic() elseif btnp(1) then tracknumber+=1 playmusic() end
-if btnp(4) and btnp(5) then music(-1,3000,3) end
+if tracknumber < 0 then
+    tracknumber = 4
+elseif tracknumber > 4 then
+    tracknumber = 0
+end
 
-if tracknumber < 0 then tracknumber = 0 elseif tracknumber > 3 then tracknumber = 3 end
\ No newline at end of file
+if btnp(0) then
+    tracknumber-=1
+    updatetracktitlepos()
+    fadeoutsong()
+elseif btnp(1) then
+    tracknumber+=1
+    updatetracktitlepos()
+    fadeoutsong()
+end
+
+if fadeouttimer <= 0 then
+    fadeouttimer = 0
+    selectmusic()
+    updatetracktitlepos()
+end
+
+if autoplay then
+    autoplaytimer -= ft
+    if autoplaytimer <= 0 then
+        autoplaytimer = 90
+        tracknumber+=1
+        fadeoutsong()
+    end
+    autoplaymenutext = "(♪) autoplay"
+else 
+    autoplaymenutext = "(◆) autoplay"
+end
+menuitem(2, autoplaymenutext, function() autoplay = not autoplay end)
+
+
+if btnp(4) and btnp(5) then music(-1,3000) end
+
+tracktitleposition = lerp(tracktitleposition,newtracktitleposition,.03)
\ No newline at end of file