diff options
| -rw-r--r-- | musicplayer/music.p8 | 7 | ||||
| -rw-r--r-- | musicplayer/objects_music.lua | 7 | ||||
| -rw-r--r-- | pico-bhell.p8 | 27 |
3 files changed, 28 insertions, 13 deletions
diff --git a/musicplayer/music.p8 b/musicplayer/music.p8 index 8f665dd..e681342 100644 --- a/musicplayer/music.p8 +++ b/musicplayer/music.p8 @@ -2,7 +2,7 @@ pico-8 cartridge // http://www.pico-8.com version 35 __lua__ --▶ toxic invaders soundtrack ◀ ---▶ WIP 1029chris ◀ +--▶ 1029chris ◀ -- 0-26 SLOTS RESERVED FOR SFX -- SPRITEWORK BY RIBBONCABLE @@ -342,6 +342,7 @@ d10e0020214222442228422304022142224422284223040221422244222842230402214222442228 41120000260112601226012260122601226012260122601228011280122801228012100121c01228012280132401224012240122401224012240122401224012260112601226012260120e0121a0122601226013 5d1200000702213022070221302207022130220702213022090221502209022150220902215022090221502205022110220502211022050221102205022110220702213022070221302207022130220702213022 5d120000100731302207022130221c675130220702213022100731502209022150221c675150220902215022100731102205022110221c675110220502211022100731302207022130221c675130220702213022 +5d120000100731302207022130221c675130220702213022100731502209022150221c675150220902215022100731502209022150221c6751502209022150220b0220b0220b0220b0220b0220b0220b0220b022 __music__ 00 20616263 00 20256263 @@ -378,8 +379,8 @@ __music__ 00 3a3e3c3b 00 413e657e 02 3a3d3c3b -00 41424344 -00 41424344 +00 1b1a1c3f +02 1d424344 00 41424344 00 41424344 00 41424344 diff --git a/musicplayer/objects_music.lua b/musicplayer/objects_music.lua index fcb96da..acd6db1 100644 --- a/musicplayer/objects_music.lua +++ b/musicplayer/objects_music.lua @@ -12,7 +12,6 @@ currentsong = -1 fadeouttimer = 1 tracktitleposition = -200 newtracktitleposition = 0 --- cartdata("toxicinvaderssoundtrack_by1029chris") function playsong(song, fade) fade = fade or 0 @@ -39,7 +38,7 @@ function selectmusic() elseif tracknumber == 3 then playsong(17) elseif tracknumber == 4 then - playsong(17) + playsong(35) end end @@ -47,13 +46,13 @@ function updatetracktitlepos() if tracknumber == 0 then newtracktitleposition = -4 elseif tracknumber == 1 then - newtracktitleposition = 167 + newtracktitleposition = 164 elseif tracknumber == 2 then newtracktitleposition = 336 elseif tracknumber == 3 then newtracktitleposition = 517 elseif tracknumber == 4 then - newtracktitleposition = 660 + newtracktitleposition = 700 end end diff --git a/pico-bhell.p8 b/pico-bhell.p8 index 85fce09..97351ff 100644 --- a/pico-bhell.p8 +++ b/pico-bhell.p8 @@ -282,13 +282,28 @@ iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii3333333333333333333333333333333333333333 __gff__ 0000000000000000000000080000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000008080800000000000000000000000000080808000000000000000000000000000808080000000000000000000000000008080800000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +__map__ +2400000000cf0000000000000000df0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000333400000000000000232400003300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000fec8c9cacbcccdce000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000fed8d9dadbdcddde000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00ef00fee8e9eaebecedee00003f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000fef8f9fafbfcfdfe000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000c2c3c4c5c6c7fefe000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000d2d3d4d5d6fefefe000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000030300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000110003000000030300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +c0c10000000200020000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +d0d1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +e0e1e6e2e300e7e2e3e6e7e4e500e2e300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +f0f1f6f2f300f7f2f3f6f7f4f500f2f300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 __sfx__ a008000022614286102d6103061033610356103661037610376103561034610326102e6102b610286102661022610206101d610186101661013610116100f6100c61009610066100461003610016100161000615 -a1050e0010034107421104214752267521a05226752220522675228052260522c042260322f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002 -a5040e0010014107121101214722267121a03226732220322673228032260322c032260122f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002 +a0050e0010034107421104214752267521a05226752220522675228052260522c042260322f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002 +a4040e0010014107121101214722267121a03226732220322673228032260322c032260122f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002 94070000356610d2711b671306710f26125661286511b6511e65110641136310a63115621086210461103611016110d6010b6010a6010a6000000000000000000000000000000000000000000000000000000000 -cf0d0000220732e5760a0732e57620073191730e6761617302070186600166015660050500d650006300511000421026230261306601006110260101613076010161306603016130660107603006130060301611 +ce0d0000220732e5760a0732e57620073191730e6761617302070186600166015660050500d650006300511000421026230261306601006110260101613076010161306603016130660107603006130060301611 9c081d0029667220732c6771d07320673165531c54300673016731a0730065310043006430765326033086531a043026531103304043016130104300613000330011300613012030020300613001030010300103 9c091800396722a67334673250730e6721e073096731307306373010730337311063024630805301443006330d043026530503304043016130104300613000330010000600012000020000600001000010000100 a008020020011200510760007600066000760006600056002c0002c0000360006600066000460006600066002c0002c0000560005600056000660003600026002c0002c000066000660007600086000860008600 @@ -305,8 +320,8 @@ c00217002f0103202034021360313703138031390313a0313b0313b0313b0313b0313b0313a0313a 90031300153311052112341185311033117541143411d53114321215211533120511193112151109511065110451102511005110e5012d0012b0012a00127001220011e001180011600114001130011300113001 900516000c373093730637305373053630536305353043530335302353013430033300323003230031300313003130031300303003130030300313003030030301303013030230302303023032e3030000300003 92051d002e6732f673306732c66320553165331c54300673016730807300653060430064307653190330864315043026430f03304023016130101300613000130010300613012030020300613001030010300103 -cf0a00000c6741f4730e676214730e676191730e6761617302070186600166015660050500d650006300511000421026230261306601006110260101613076010161306603016130660107603006130060301611 -9d0e0008100531307013071346051c65513070130711c6003f60020600000000050000500070000050007000100003460010000346001c6000700000500070000050007000130001300000500070000000000000 +ce0a00000c6741f4730e676214730e676191730e6761617302070186600166015660050500d650006300511000421026230261306601006110260101613076010161306603016130660107603006130060301611 +9c0e0008100531307013071346051c65513070130711c6003f60020600000000050000500070000050007000100003460010000346001c6000700000500070000050007000130001300000500070000000000000 9e06000002613076132c0112c0510661107623076510661306653056232c0112c05107633076330864108623096430a6432c0112c0510c6130d6430e6110203312613136532c0112c051020231d6730304123673 5e011d201137322373104730837310473103730c36308463063530464303353016530244301651014510065100451016510044101651014510065102451026410245101651024510163102421014530262301453 d6061d000247101473026730147310473020730c37301063063530464303333016230242301621014110061100411016010041101601014010061102401026010240101611024010160102411014030260301403 |