From 72e4a7b6bf307b3d4224c1f8a97baa173153d908 Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Sat, 31 Mar 2018 11:25:42 -0400
Subject: [PATCH] .

---
 Makefile           | 12 ++++++------
 src/WeeGUI_MLI.s   |  1 +
 src/ui.main.keys.a | 40 +++++++++++++++++-----------------------
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 7feada6..627e05a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,6 @@ ACME=acme
 # https://github.com/mach-kernel/cadius
 CADIUS=cadius
 
-md:
-	mkdir -p build
-
-clean:
-	rm -rf build/
-
 asm: md
 	$(ACME) -r build/grue.system.lst src/grue.system.s
 	$(ACME) -r build/pitchdark.lst src/pitchdark.a
@@ -63,4 +57,10 @@ artwork: dsk
 mount: dsk
 	osascript bin/V2Make.scpt "`pwd`" bin/pitchdark.vii build/"$(DISK)"
 
+md:
+	mkdir -p build
+
+clean:
+	rm -rf build/
+
 all: clean asm dsk txt artwork mount
diff --git a/src/WeeGUI_MLI.s b/src/WeeGUI_MLI.s
index 543d8f4..3481ad9 100644
--- a/src/WeeGUI_MLI.s
+++ b/src/WeeGUI_MLI.s
@@ -75,4 +75,5 @@ WGStrokeRoundRect		= 82
 WGCreateRadio			= 84
 WGReset					= 86
 WGGetState				= 88
+WGPendingClick			= 90
 
diff --git a/src/ui.main.keys.a b/src/ui.main.keys.a
index d1e9318..d0a1fe7 100644
--- a/src/ui.main.keys.a
+++ b/src/ui.main.keys.a
@@ -215,19 +215,8 @@ callback_next
 callback_versions
          rts
 
-callback_options
-         jmp   OptionsDialog
-
 !zone {
 callback_boxart
-         jsr   ResetPath
-         +LDADDR kArtworkRootDirectory
-         jsr   AddToPath
-         jsr   okvs_get
-         !word gGlobalPrefsStore
-         !word kLastPlayed
-         jsr   AddToPath
-
          lda   #0                    ; set Z flag always
 !cpu 65816
          rep   #2                    ; clear Z flag on 65816 only
@@ -236,6 +225,15 @@ callback_boxart
          lda   $C029
          and   #$1F
          sta   $C029                 ; set GS NEWVIDEO mode to turn off linearize
++
+         jsr   ResetPath
+         +LDADDR kArtworkRootDirectory
+         jsr   AddToPath
+
+         jsr   okvs_get
+         !word gGlobalPrefsStore
+         !word kLastPlayed
+         jsr   AddToPath             ; gPathname = 'ARTWORK/<game shortname>'
 
 +        jsr   LoadDHRFile           ; load artwork from file
          !word gPathname
@@ -245,25 +243,21 @@ callback_boxart
          sta   $C000                 ; display double hi-res page 1
          sta   $C00D
          sta   $C05E
+         sta   $C001
          sta   $C057
          sta   $C052
          sta   $C054
          sta   $C050
-
-         bit   $c010
--        lda   $c000
+         bit   $C010
+-        lda   $C000
          bpl   -
-         bit   $c010
-
-         sta   $C001                 ; back to text
-         sta   $C051
++        bit   $C010
+         sta   $C051                 ; back to text
          rts
 .boxartError
          jmp   SoftBell
 }
 
-callback_clues
-         jmp   LaunchInterpreterWithHints
-
-callback_play
-         jmp   LaunchInterpreterWithGame
+callback_options = OptionsDialog
+callback_clues = LaunchInterpreterWithHints
+callback_play  = LaunchInterpreterWithGame