Win screen song! and fix to scroll speed, other tweaks

4 files changed, 13 insertions, 12 deletions

diff --git a/pico-bhell.p8 b/pico-bhell.p8
index 06be64f..85fce09 100644
--- a/pico-bhell.p8
+++ b/pico-bhell.p8
@@ -310,10 +310,10 @@ cf0a00000c6741f4730e676214730e676191730e6761617302070186600166015660050500d65000
 9e06000002613076132c0112c0510661107623076510661306653056232c0112c05107633076330864108623096430a6432c0112c0510c6130d6430e6110203312613136532c0112c051020231d6730304123673
 5e011d201137322373104730837310473103730c36308463063530464303353016530244301651014510065100451016510044101651014510065102451026410245101651024510163102421014530262301453
 d6061d000247101473026730147310473020730c37301063063530464303333016230242301621014110061100411016010041101601014010061102401026010240101611024010160102411014030260301403
-0101000010000107001100014700267001a00026700220002670028000260002c000260002f000267002670000000267000000000000000000000000000000000000000000000000000000000000000000000000
-0101000010000107001100014700267001a00026700220002670028000260002c000260002f000267002670000000267000000000000000000000000000000000000000000000000000000000000000000000000
-010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+471200001f0111f0121f0121f0121f0121f0121f0121f0122101121012210122101215012210122d0122d01321012210122101221012210122101221012210122301223012230122301223012230122301223012
+411200002201122012220122201222012220122201222012250112501225012250120d01219012250122501325012250122501225012250122501225012250122701227012270122701227012270122701227012
+41120000260112601226012260122601226012260122601228011280122801228012100121c012280122801328012280122801228012280122801228012280122a0112a0122a0122a0122a0122a0122a0122a012
+001208000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 d11c00081f011220161a0161f0162b0112e016260162b016000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -347,6 +347,7 @@ d10e0020214222442228422304022142224422284223040221422244222842230402214222442228
 41120000260112601226012260122601226012260122601228011280122801228012100121c01228012280132401224012240122401224012240122401224012260112601226012260120e0121a0122601226013
 5d1200000702213022070221302207022130220702213022090221502209022150220902215022090221502205022110220502211022050221102205022110220702213022070221302207022130220702213022
 5d120000100731302207022130221c675130220702213022100731502209022150221c675150220902215022100731102205022110221c675110220502211022100731302207022130221c675130220702213022
+5d120000100731302207022130221c675130220702213022100731502209022150221c675150220902215022100731502209022150221c6751502209022150220b0220b0220b0220b0220b0220b0220b0220b022
 __music__
 00 20616263
 00 20256263
@@ -383,8 +384,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/players.lua b/players.lua
index 1da8a55..f16937a 100644
--- a/players.lua
+++ b/players.lua
@@ -91,7 +91,7 @@ function addplayer(x, y, sprite, spriteup, spritedwn, bulletsprite)
             end
             player.x = mid(0, player.x, 120)
         else
-            player.x = lerp(player.x, 200, 0.01) --slides the ship offscreen duing the scorescreen
+            player.x += min(currentwavetime*2.25, 2) --slides the ship offscreen duing the scorescreen
         end
         player.y = mid(0, player.y, 120)
 
diff --git a/update.lua b/update.lua
index 79bbeb0..e2115aa 100644
--- a/update.lua
+++ b/update.lua
@@ -19,10 +19,10 @@ if gameover then
 elseif gamerunning then
     updatewaves() -- update the wave function
     local targetspeed = ft
-    if currentsong >= 8 then
+    if currentwave == 20 then
+        targetspeed /= 8 --slow scroll on score screen
+    elseif currentsong >= 8 then
         targetspeed /= 2 --half scroll speed when boss
-    elseif currentwave == 20 then
-        targetspeed /= 8
     end
     scrollspeed = lerp(scrollspeed, targetspeed, 0.03)
 end
diff --git a/waves.lua b/waves.lua
index 0a475a2..fd27cdb 100644
--- a/waves.lua
+++ b/waves.lua
@@ -281,7 +281,7 @@ wave[19] = {
 
 --ending score screen
 wave[20] = {
-    delay = 4,
+    delay = 5,
     start = function()
         menuscroll = 128 --so that the score menu can scroll in
         if not coopmode and highscore0 < currentscore then
@@ -292,7 +292,7 @@ wave[20] = {
     end,
     conditions = function()
     end,
-    song = 31,
+    song = 35,
 }
 
 foreach(wave, function(wave) if not wave.conditions then wave.conditions = function() if #enemies < 1 then return true end end end end) --if there are no conditons for a wave, give them one. look at all those ends!!!!