From f1cbdd0aef72c3320ef81f8eb93153fbd8938941 Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Wed, 2 Oct 2019 18:46:03 -0400
Subject: [PATCH] don't always clear keyboard strobe or reset OffscreenPage
 when entering SearchMode

allows hitting a key during a screenshot to start a search
---
 src/ui.attract.mode.a | 3 ++-
 src/ui.offscreen.a    | 2 +-
 src/ui.search.mode.a  | 6 ++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/ui.attract.mode.a b/src/ui.attract.mode.a
index 1797c0bbc..457b3cb8d 100644
--- a/src/ui.attract.mode.a
+++ b/src/ui.attract.mode.a
@@ -114,7 +114,8 @@ MiniAttractMode
          inc   @MiniAttractIndex
          lda   KBD
          bpl   @loop
-@exit    rts
+@exit    bit   CLEARKBD
+         rts
 
 ;------------------------------------------------------------------------------
 ; RunAttractModule
diff --git a/src/ui.offscreen.a b/src/ui.offscreen.a
index 77440fa77..a12abf21f 100644
--- a/src/ui.offscreen.a
+++ b/src/ui.offscreen.a
@@ -19,7 +19,7 @@
 ;
 
 OffscreenPage
-         !byte 1                     ; 0 = currently showing HGR page 2
+         !byte 0                     ; 0 = currently showing HGR page 2
                                      ;     (so offscreen is page 1 @ $2000)
                                      ; 1 = currently showing HGR page 1
                                      ;     (so offscreen is page 2 @ $4000)
diff --git a/src/ui.search.mode.a b/src/ui.search.mode.a
index 2b4b3ba1b..13f2393b6 100644
--- a/src/ui.search.mode.a
+++ b/src/ui.search.mode.a
@@ -37,12 +37,10 @@ SearchMode
          ldx   #$FF
          txs
          stx   gGameToLaunch         ; $FF = no game selected
-         inx
-         stx   OffscreenPage         ; $00 = currently showing HGR page 2
          jsr   Home                  ; clear screen (switches to text mode)
-         jsr   OnInputChanged        ; draw UI on HGR page 1
+         jsr   OnInputChanged        ; draw UI offscreen
          jsr   HGRMode               ; show HGR screen
-         bit   CLEARKBD
+         jsr   ResyncPage
 
 .SearchModeInputLoop
          jsr   WaitForKeyFor30Seconds