From 30532c316d592efd93338d456a61824deb1c6a70 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Mon, 28 Jan 2019 20:32:23 -0800
Subject: [PATCH] Don't monkey with ZP configuration when launching DA. Fixes
 #119

---
 desk.acc/screen.dump.s    | 18 +++++++++++++-----
 desk.acc/sort.directory.s |  6 +++---
 desktop/desktop_main.s    |  6 +++---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/desk.acc/screen.dump.s b/desk.acc/screen.dump.s
index 47de91d..97d9fc0 100644
--- a/desk.acc/screen.dump.s
+++ b/desk.acc/screen.dump.s
@@ -14,15 +14,23 @@
 ;;; ============================================================
 
         yax_call JUMP_TABLE_MGTK_RELAY, MGTK::HideCursor, 0
-        yax_call JUMP_TABLE_MGTK_RELAY, MGTK::HiliteMenu, menu_click_params
+        jsr     hilite_menu
         jsr     dump_screen
-        yax_call JUMP_TABLE_MGTK_RELAY, MGTK::HiliteMenu, menu_click_params
+        jsr     hilite_menu
         yax_call JUMP_TABLE_MGTK_RELAY, MGTK::ShowCursor, 0
         rts
 
-.proc menu_click_params
-menu_id:.byte   1               ; ID of Apple menu
-item_num:.byte  0
+;;; ============================================================
+
+.proc hilite_menu
+        ;; Use zero page, which is visible from MGTK
+        menu_click_menu_id  := $6
+
+        lda     #1              ; ID of Apple menu
+        sta     menu_click_menu_id
+        yax_call JUMP_TABLE_MGTK_RELAY, MGTK::HiliteMenu, menu_click_menu_id
+
+        rts
 .endproc
 
 ;;; ============================================================
diff --git a/desk.acc/sort.directory.s b/desk.acc/sort.directory.s
index 9849ff7..fd5ab57 100644
--- a/desk.acc/sort.directory.s
+++ b/desk.acc/sort.directory.s
@@ -39,9 +39,9 @@ start:  tsx
         bne     :+
         rts
 
-:       lda     #$40
+:       lda     #>(JUMP_TABLE_SELECT_WINDOW-1)
         pha
-        lda     #$0B
+        lda     #<(JUMP_TABLE_SELECT_WINDOW-1)
         pha
         lda     a:$0A
         rts
@@ -309,7 +309,7 @@ L0A4B:  jsr     L0B16
         jsr     write_block
         jmp     L0A4B
 
-L0A8E:  pla
+L0A8E:  pla                     ; WTF ???
 L0A8F:  jmp     exit
 
 dev_num:
diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s
index f5a99c5..893d407 100644
--- a/desktop/desktop_main.s
+++ b/desktop/desktop_main.s
@@ -1587,10 +1587,10 @@ nope:   dex
         ;; Invoke it
         jsr     set_pointer_cursor
         jsr     reset_grafport3
-        MGTK_RELAY_CALL MGTK::SetZP1, zp_use_flag0
-        MGTK_RELAY_CALL MGTK::SetZP1, zp_use_flag1
+        ;;         MGTK_RELAY_CALL MGTK::SetZP1, zp_use_flag0
+        ;;         MGTK_RELAY_CALL MGTK::SetZP1, zp_use_flag1
         jsr     DA_LOAD_ADDRESS
-        MGTK_RELAY_CALL MGTK::SetZP1, zp_use_flag0
+        ;;         MGTK_RELAY_CALL MGTK::SetZP1, zp_use_flag0
         lda     #0
         sta     running_da_flag