diff options
| author | RibbonCable <ambiguousmachine@gmail.com> | 2022-02-20 18:27:48 -0800 |
|---|---|---|
| committer | RibbonCable <ambiguousmachine@gmail.com> | 2022-02-20 18:27:48 -0800 |
| commit | 3a78f154f1fc147a8d7a21861d22083ef1c049ab (patch) | |
| tree | dd4b96c012c6d334b16715c456a7ef298c10d90a /musicplayer | |
| parent | ae91f49c0e637c9b47f8ce5537f4e3a14eea1b92 (diff) | |
scorescreen polish
Diffstat (limited to 'musicplayer')
| -rw-r--r-- | musicplayer/music.p8 | 43 | ||||
| -rw-r--r-- | musicplayer/objects_music.lua | 14 | ||||
| -rw-r--r-- | musicplayer/ui_music.lua | 4 | ||||
| -rw-r--r-- | musicplayer/update_music.lua | 2 |
4 files changed, 50 insertions, 13 deletions
diff --git a/musicplayer/music.p8 b/musicplayer/music.p8 index 5a160f4..8f665dd 100644 --- a/musicplayer/music.p8 +++ b/musicplayer/music.p8 @@ -337,7 +337,11 @@ d10e0020214222442228422304022142224422284223040221422244222842230402214222442228 5d1c0008100530723413232072321c655072341323207242100001330007300093001c60013300184000e300100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200 5d1c1000100000723413232072321c6000723413232072321000007234132321f2321c600072341f23213232100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200 5d381000072440724213242072421c675072441c6751f242072440724213242072421c675072001c6001f200100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200 -2138000022100221002910029100291002910029100291001b1001b10028100281002810004100101001c1001d1001d1002110021100211001d10021100291001f1001f100221002210022100221002210000000 +471200001f0111f0121f0121f0121f0121f0121f0121f0122101121012210122101215012210122d0122d0131d0121d0121d0121d0121d0121d0121d0121d0121f0111f0121f0121f012130121f0122b0122b013 +411200002201122012220122201222012220122201222012250112501225012250120d01219012250122501321012210122101221012210122101221012210122201122012220122201216012220122e0122e013 +41120000260112601226012260122601226012260122601228011280122801228012100121c01228012280132401224012240122401224012240122401224012260112601226012260120e0121a0122601226013 +5d1200000702213022070221302207022130220702213022090221502209022150220902215022090221502205022110220502211022050221102205022110220702213022070221302207022130220702213022 +5d120000100731302207022130221c675130220702213022100731502209022150221c675150220902215022100731102205022110221c675110220502211022100731302207022130221c675130220702213022 __music__ 00 20616263 00 20256263 @@ -368,6 +372,39 @@ __music__ 00 35346161 00 35366161 02 35236161 -00 35346161 -00 35366161 +01 7a3d7d7d +00 3a3d3c3b +00 413e657e +00 3a3e3c3b +00 413e657e +02 3a3d3c3b +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +00 41424344 +04 05191514 diff --git a/musicplayer/objects_music.lua b/musicplayer/objects_music.lua index 09895b3..fcb96da 100644 --- a/musicplayer/objects_music.lua +++ b/musicplayer/objects_music.lua @@ -31,7 +31,7 @@ function selectmusic() if tracknumber == -1 then tracknumber = 0 elseif tracknumber == 0 then - playsong(-1,0) + playsong(31) elseif tracknumber == 1 then playsong(0) elseif tracknumber == 2 then @@ -39,21 +39,21 @@ function selectmusic() elseif tracknumber == 3 then playsong(17) elseif tracknumber == 4 then - playsong(-1,0) + playsong(17) end end function updatetracktitlepos() if tracknumber == 0 then - newtracktitleposition = -16 + newtracktitleposition = -4 elseif tracknumber == 1 then - newtracktitleposition = 145 + newtracktitleposition = 167 elseif tracknumber == 2 then - newtracktitleposition = 313 + newtracktitleposition = 336 elseif tracknumber == 3 then - newtracktitleposition = 493 + newtracktitleposition = 517 elseif tracknumber == 4 then - newtracktitleposition = 685 + newtracktitleposition = 660 end end diff --git a/musicplayer/ui_music.lua b/musicplayer/ui_music.lua index 7252881..387b174 100644 --- a/musicplayer/ui_music.lua +++ b/musicplayer/ui_music.lua @@ -51,10 +51,10 @@ function mainmenutext(x,y,currentlyplaying) -- y = 62 x -= 1 - printdropshadow("(\139) track selection (\145)\n",x,y,9,2) + printdropshadow("(\139) track selection (\145)",x,y,9,2) poke(0x5f58, 0x9 | 0x4) --makes score BIG - printdropshadow("mENU mUSE bATTLE bASS bOSSY bEATS fISSURE fINALE vICTORY vESSLE",x-tracktitleposition+circletimex,y+18+circletimey,11,3) + printdropshadow("iDLE iNERTIA bATTLE bEATS pADRONE pANIC fISSURE fINALE vICTORY vESSLE",x-tracktitleposition+circletimex,y+18+circletimey,11,3) poke(0x5f58) end diff --git a/musicplayer/update_music.lua b/musicplayer/update_music.lua index 0f5e236..3e79211 100644 --- a/musicplayer/update_music.lua +++ b/musicplayer/update_music.lua @@ -48,4 +48,4 @@ 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 +tracktitleposition = lerp(tracktitleposition,newtracktitleposition,0.03)
\ No newline at end of file |