vacation.p8

@@ -245,15 +245,7 @@ function _init()
  poke(0x5f34, 1)
 
  awakener_hold_frames = 0
- -- debug mode: skip splahes
- -- mainview = ao_splash.new()
- arm_awakener()
- mainview=newtitle()
-end
-
-function arm_awakener()
- awakener_hold_frames=0
- awakener_armed=true
+ mainview = ao_splash.new()
 end
 
 function _update60()
@@ -1305,7 +1297,7 @@ end
 -- 1: black (for sprites)
 -- 2: dolphin shading
 -- 3: azure water, maybe score display? (140)
--- 4, 5: keep default in sky layer (for emergency awakener)
+-- 4, 5: unassigned, layer-specific
 -- 6: dolphin specular highlights
 -- 7: dolphin white paint
 -- 8, 9: unassigned, layer specific
@@ -1378,24 +1370,6 @@ function sea:draw()
  rectfill(0, 125+(w>>3), 128, 128, 0x1001)
 end
 
-spark = {
- x=0,
- y=0,
- dx=0,
- dy=0,
- f=-1,
-}
-mknew(spark)
-function spark:update()
- self.f += 1
- if (self.f >= 12) return true
- self.x += self.dx
- self.y += self.dy
-end
-function spark:draw()
- spr(48+self.f\2, self.x, self.y)
-end
-
 arcade_level = {
  score=0,
  max_score=999,
@@ -1481,8 +1455,7 @@ end
 function arcade_level:word_hit(word)
  self.score += 1
  -- TODO: sfx
- self.bg:push_back(spark.new{x=word.x-1, y=word.y-1, dx=-2})
- self.bg:push_back(spark.new{x=word.x+word.w, y=word.y-1, dx=1})
+ -- TODO: sparkle
 end
 
 function arcade_level:draw()
@@ -1643,19 +1616,19 @@ __gfx__
 000000007000000000000000000000070000000000000000000000007000022ee220000700000000000000000000000000000000000000000000000000000000
 00000000700000000000000000000007000000000000000000000000700000222220000700000000000000000000000000000000000000000000000000000000
 000000007000000000000000000000070000000000000000000000007000022eee20000700000000000000000000000000000000000000000000000000000000
-00000000700000000000000000000007000000000000000000000000700002e22e20000700000000000000000000000000000000000000000000000000000000
-00000000700000000000000000000007000000000000000000000000700002eeee200007000000000222e0000000000000000000022270000000000000000000
-0000000070000000000000000000000700000000000000000000000070000222222000070000000000222e000000000000000000002227000000000000000000
-000000007000000000000000000000070000000000000000000000007000000000000007000000000002222e0000000000000000000222270000000000000000
-000000007777777777777777777777770000000000000000000000007777777777777777022000000022e222ee20000002200000002272227720000000000000
-000000000000000000000000a00aa00a000aa00000a00a0000000000000000000000000022e200002ee222222222200022720000277222222222200000000000
-00000000000aa0000f0aa0f0000ff00000a00a000000000000000000000000000000000002ee22222222222227772e2002772222222222222777272000000000
-000aa0000000000000affa0000a00a000a0000a0a000000a000000000000000000000000022e22ee2222222227c122e20e2722772222222227c1227200000000
-00aaaa000a0ff0a00afaafa0af0000faa000000a000000000000000000000000000000002222227772222222227772e2222222eee222222222eee27200000000
-00aaaa000a0ff0a00afaafa0af0000faa000000a00000000000000000000000000000000222777777777722227777770222eeeeeeeeee2222eeeeee000000000
-000aa0000000000000affa0000a00a000a0000a0a000000a00000000000000000000000027770000777722e2777770002eee0000eeee2272eeeee00000000000
-00000000000aa0000f0aa0f0000ff00000a00a0000000000000000000000000000000000770000000002222e00000000ee000000000222270000000000000000
-000000000000000000000000a00aa00a000aa00000a00a00000000000000000000000000000000000222770000000000000000000222ee000000000000000000
+000000007000000000000000000000070000000000ee000000000000700002e22e20000700000000000000000000000000000000000000000000000000000000
+000000007000000000000000000000070000000000e7e00000000000700002eeee200007000000000222e0000000000000000000022270000000000000000000
+0000000070000000000000000000000700e00000002e7e000000000070000222222000070000000000222e000000000000000000002227000000000000000000
+000000007000000000000000000000070eee0000000ee7ee000000007000000000000007000000000002222e0000000000000000000222270000000000000000
+000000007777777777777777777777770e7e0000002ee7e77ee000007777777777777777022000000022e222ee20000002200000002272227720000000000000
+0000000000000000000000000000000002e7ee0002ee7eeeeeeee000000000000000000022e200002ee222222222200022720000277222222222200000000000
+00000000000000000000000000000000eeeee7eeee777eeee777e7e0000000000000000002ee22222222222227772e2002772222222222222777272000000000
+00000000000000000000000000000000eee22e77eeeeeeeee7c1ee7e0000000000000000022e22ee2222222227c122e20e2722772222222227c1227200000000
+00000000000000000000000000000000220022222eeeeeeeee222e7e00000000000000002222227772222222227772e2222222eee222222222eee27200000000
+000000000000000000000000000000000000002222222eeee22222200000000000000000222777777777722227777770222eeeeeeeeee2222eeeeee000000000
+00000000000000000000000000000000000000002222ee7e22222000000000000000000027770000777722e2777770002eee0000eeee2272eeeee00000000000
+0000000000000000000000000000000000000000000eeee7000000000000000000000000770000000002222e00000000ee000000000222270000000000000000
+00000000000000000000000000000000000000000eee2200000000000000000000000000000000000222770000000000000000000222ee000000000000000000
 00000000000066000000000000000000000002200000000000000000000002200000000000000000000000000000000000000000000000000000000000000000
 0000000000022260000000000000000000222662000000000000000000222662000000000000000000000000000070220000000000220e220000000000000000
 00000000002222e000000000000000006227222e00000000000000002227222e0000000000000000000000000222026200000000022262220000000000000000
@@ -1691,19 +1664,19 @@ __gfx__
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000ee00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000e7e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000026000000000000000e00000002e7e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-0000000002260000000000000eee0000000ee7ee0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000002e2260000000000000e7e0000002ee7e77ee0000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000022222200000000000002e7ee0002ee7eeeeeeee00000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000ee66222200000200000eeeee7eeee777eeee777e7e000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000eeee222260000260000eee22e77eeeeeeeee7c1ee7e00000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000ee6226200260000220022222eeeeeeeee222e7e00000000000000000000000000000000000000000000000000000000000000000000000000000000
-0000000000ee2222222260000000002222222eeee222222000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000ee22222222000000000002222ee7e2222200000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000ee222266200000000000000eeee70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000ee2226222000000000000eee22000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000022600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000002e22600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000022222200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000ee6622220000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000eeee22226000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000ee622620026000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0000000000ee22222222600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000ee2222222200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000ee222266200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000ee222622200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 0000000000000ee22222660000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000222662222220000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000e22222227722000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000