vacation.p8

@@ -202,9 +202,9 @@ function _init()
 
  awakener_hold_frames = 0
  -- debug mode: skip splahes
- mainview = ao_splash.new()
- --arm_awakener()
- --mainview=newtitle()
+ -- mainview = ao_splash.new()
+ arm_awakener()
+ mainview=newtitle()
 end
 
 function arm_awakener()
@@ -1043,30 +1043,31 @@ end
 -->8
 -- consent screens
 
-ao_splash = {f=180}
+ao_splash = {
+ fwait = 180,
+}
 mknew(ao_splash, function(self)
  self.c = breather.new{
   colors={7,15,14,8,2},
   sep=3,
   f=15,
   on=true,
-  speed=240,
  }
  font_monogram()
 end)
 
 function ao_splash:u()
- if self.c.f < 96 then
+ if self.c.f < self.c.speed/2.5 then
   self.c:u()
   return
  end
- self.f -= 1
- if (self.f < 150 and (btnp() & 0xf > 0) and self.f > 0) self.f = 0
- if self.f == 0 then
+ self.fwait -= 1
+ if (self.fwait < ao_splash.fwait-30 and (btnp() & 0xf > 0) and self.fwait > 0) self.fwait = 0
+ if self.fwait == 0 then
   self.d = ditherer.new{di=1}
  end
  if (self.d) self.d:u()
- if self.f <= -32 then
+ if self.fwait <= -32 then
   mainview=consent_splash.new()
   mainview:u()
  end
@@ -1075,11 +1076,9 @@ end
 function ao_splash:draw()
  cls()
  self.c:draw()
- if self.f < 180 then
-  font_special()
+ if self.fwait < ao_splash.fwait then
   print("18+", 55, 60, 7)
   print("aDULTS ONLY", 30, 90, 15)
-  if (self.f == 179) psound(10)
  end
  if (self.d) self.d:draw()
 end
@@ -1096,26 +1095,15 @@ mknew(consent_splash, function(self)
 end)
 
 function consent_splash:u()
- local f = self.f + 1
- if (f < 0) f = 0x7fff
- if btnp(1) and f > 150 and self.d.di~=1 then
-  self.d.di = 1
-  psound(8,16,8,true)
- end
+ if (self.f < 0x7fff) self.f += 1
+ if (btnp(1) and self.f > 150) self.d.di = 1
  if self.d:u() and self.d.di > 0 then
   mainview=newtitle()
   mainview:u()
  end
- if (f == 1 or f==45 or f==90) psound(8,0,4)
- self.f=f
 end
 
 function consent_splash:draw()
- self:dtx()
- self.d:draw()
-end
-
-function consent_splash:dtx()
  cls()
  font_special()
  print("\^w\^twarning", 20, 2, 10)
@@ -1141,6 +1129,7 @@ function consent_splash:dtx()
  print("")
  print("")
  print("           consent and begin: \f7➡️")
+ self.d:draw()
 end
 
 -->8
@@ -1195,16 +1184,13 @@ end
 
 function title_screen:u()
  self.a.wordwait=999
- if btnp(1) and self.a.wordremain ~= 0 and not self.pp then
+ if btnp(1) and self.a.wordremain ~= 0 then
   self.a.wordremain=0
-  self.pp=true
   create_game()
-  psound(11,0,16)
  end
  self.a:u()
 end
 -->8
--->8
 -- dolphin sprite renderer
 
 phinstate_nrm = {
@@ -2441,6 +2427,3 @@ __sfx__
 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 010800002b5452b5002b5002b500005000050000500275001c535245351a50001500005000050000500005003055024555187301f730137301373013720137100750007500075000750000500005000050000500
-011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-480c00002b53518045305503054030530305203051000500005000050000500005000050000500005000050000500005000050000500005000050000500005000050000500005000050000500005000050000500
-290800000c5751f575245750c5551f555245550c5351f535245350c5151f515245150050500505005050050500505005050050500505005050050500505005050050500505005050050500505005050050500505