diff options
| author | RibbonCable <ambiguousmachine@gmail.com> | 2022-02-20 15:19:09 -0800 |
|---|---|---|
| committer | RibbonCable <ambiguousmachine@gmail.com> | 2022-02-20 15:19:09 -0800 |
| commit | a6097b11affbbd8c93c40bfc575bf25146c0c8fb (patch) | |
| tree | adc2fe5dfe4ddbf8289e6c6dc2647dd00b8545c4 /musicplayer | |
| parent | acaa223a1a5060191fda5678b543d33e71684b3f (diff) | |
updated sfx
Diffstat (limited to 'musicplayer')
| -rw-r--r-- | musicplayer/draw_music.lua | 5 | ||||
| -rw-r--r-- | musicplayer/music.p8 | 2 | ||||
| -rw-r--r-- | musicplayer/objects_music.lua | 2 | ||||
| -rw-r--r-- | musicplayer/update_music.lua | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/musicplayer/draw_music.lua b/musicplayer/draw_music.lua index 36d5328..edc3bb6 100644 --- a/musicplayer/draw_music.lua +++ b/musicplayer/draw_music.lua @@ -2,10 +2,10 @@ pal({1,2,131,141,5,6,7,136,9,137,139,12,133,3,140,130}, 1) --don't ask me why, but this table of colors starts at 1, and 0 is the final color - drawbg() -menushipscroll += ft +drawobjs() --only used for acid trans here +menushipscroll += ft for i = 1, 3, 1 do spr(14+i*16, (-menushipscroll*(i*20)+(sin(i/3)*128)+8)%(128+8)-1*8, i*36+sin(menushipscroll*i/3)*i*2-20,1,1) end @@ -24,7 +24,6 @@ if not hideui then --intro acid transtition acidcounter+=ft acidtransition() - drawobjs() --only used for acid trans here end -- print(autoplay,0,0,7)
\ No newline at end of file diff --git a/musicplayer/music.p8 b/musicplayer/music.p8 index 73dd0c0..5a160f4 100644 --- a/musicplayer/music.p8 +++ b/musicplayer/music.p8 @@ -4,7 +4,7 @@ __lua__ --▶ toxic invaders soundtrack ◀ --▶ WIP 1029chris ◀ --- 0-27 SLOTS RESERVED FOR SFX +-- 0-26 SLOTS RESERVED FOR SFX -- SPRITEWORK BY RIBBONCABLE #include objects_music.lua diff --git a/musicplayer/objects_music.lua b/musicplayer/objects_music.lua index ea3705b..09895b3 100644 --- a/musicplayer/objects_music.lua +++ b/musicplayer/objects_music.lua @@ -12,7 +12,7 @@ currentsong = -1 fadeouttimer = 1 tracktitleposition = -200 newtracktitleposition = 0 -cartdata("toxicinvaderssoundtrack_by1029chris") +-- cartdata("toxicinvaderssoundtrack_by1029chris") function playsong(song, fade) fade = fade or 0 diff --git a/musicplayer/update_music.lua b/musicplayer/update_music.lua index f0987ae..0f5e236 100644 --- a/musicplayer/update_music.lua +++ b/musicplayer/update_music.lua @@ -6,7 +6,9 @@ circletimey = cos(t())*3 gt += scrollspeed + 1/600 fadeouttimer -= ft -updateobjs() --update all objects +if t() < 2 then -- weird if because of freezing bubbles in the menu + updateobjs() --update all objects +end if tracknumber < 0 then tracknumber = 4 |