cover fade on esc

src/fx/fx.cover.fade.a

@@ -35,9 +35,7 @@ TMP      = $FC                       ; 4 bytes
 
          lda   #74
          sta   COUNTER
--        lda   $C000
-         bmi   @done
-         ldx   COUNTER
+-        ldx   COUNTER
          ldy   Order,x
          lda   TransformHi,y
          sta   @j+2
@@ -45,10 +43,16 @@ TMP      = $FC                       ; 4 bytes
          sta   @j+1
 @j       jsr   $FDFD                 ; SMC
          lda   #80
-         jsr   WaitForKeyWithTimeout
+         sec
+@wait1   pha
+@wait2   sbc   #1
+         bne   @wait2
+         pla
+         sbc   #1
+         bne   @wait1
          dec   COUNTER
          bpl   -
-@done    rts
+         rts
 
 InitPRNG
          lda   $4E

src/ui.search.mode.a

@@ -48,10 +48,10 @@ _SearchModeInputLoop
          bne   -                     ; on every keypress (whether or not
          dec   $52                   ; the key leads to an action)
          bne   -
-         jsr   _CoverFade
          lda   #kAttractMode         ; no input for ~30 seconds
          sta   Mode                  ; switch to attract mode
-         rts
+         jmp   _CoverFade
+
 @gotKey
          jsr   _ResetInputTimeout
 
@@ -115,7 +115,7 @@ InputDispatch
 OnClear
          ldx   InputLength
          bne   +
-         jsr   BlankHGR
+         jsr   _CoverFade
          pla                         ; Esc with no input exits search mode
          pla                         ; and switches to attract mode
          rts