From ca1f232c1f3937b269c0d50455259dd26f1640ee Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Tue, 29 Jan 2019 08:24:23 -0800
Subject: [PATCH] disasm: Sort Dir DA stack fun; copy dialog resources/proc

---
 desk.acc/sort.directory.s |  4 ++--
 desktop/desktop_aux.s     |  6 ++++--
 desktop/desktop_main.s    | 17 ++++++++---------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/desk.acc/sort.directory.s b/desk.acc/sort.directory.s
index 9849ff7..ce6d2b3 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
diff --git a/desktop/desktop_aux.s b/desktop/desktop_aux.s
index d3d56aa..ddb78a0 100644
--- a/desktop/desktop_aux.s
+++ b/desktop/desktop_aux.s
@@ -3084,8 +3084,10 @@ str_exists_prompt:
 str_large_prompt:
         PASCAL_STRING "This file is too large to copy, click OK to continue."
 
-LB0B6:  DEFINE_POINT 110, 35
-LB0BA:  DEFINE_POINT 170, 59
+copy_file_count_pos:
+        DEFINE_POINT 110, 35
+copy_file_count_pos2:
+        DEFINE_POINT 170, 59
 
         ;; "Delete" dialog strings
 str_delete_title:
diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s
index 447c7dd..941abaf 100644
--- a/desktop/desktop_main.s
+++ b/desktop/desktop_main.s
@@ -9473,7 +9473,7 @@ do_run:
         tsx
         stx     stack_stash
         jsr     prep_callbacks_for_size_or_count_clear_system_bitmap
-        jsr     L9984
+        jsr     do_download_dialog_phase
         jsr     size_or_count_process_selected_file
         jsr     L99BC
         jmp     do_run2
@@ -10781,14 +10781,13 @@ count:  .addr   0
         jmp     run_copy_dialog_proc
 .endproc
 
-;;; --------------------------------------------------
-;;; "Run" ???
-
-L9984:  copy    #CopyDialogLifecycle::open, copy_dialog_params::phase
+.proc do_download_dialog_phase
+        copy    #CopyDialogLifecycle::open, copy_dialog_params::phase
         copy16  #copy_dialog_phase0_callback2, dialog_phase0_callback
         copy16  #copy_dialog_phase1_callback2, dialog_phase1_callback
         yax_call invoke_dialog_proc, index_download_dialog, copy_dialog_params
         rts
+.endproc
 
 .proc copy_dialog_phase0_callback2
         stax    copy_dialog_params::count
@@ -12745,7 +12744,7 @@ do1:    ldy     #1
         jsr     compose_file_count_string
         lda     winfo_alert_dialog
         jsr     set_port_from_window_id
-        MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LB0B6
+        MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::copy_file_count_pos
         addr_call draw_text1, str_file_count
         addr_call draw_text1, str_files
         rts
@@ -12781,7 +12780,7 @@ do2:    ldy     #1
         jsr     copy_name_to_buf1_adjust_case
         MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LAE82
         addr_call draw_text1, path_buf1
-        yax_call MGTK_RELAY, MGTK::MoveTo, desktop_aux::LB0BA
+        yax_call MGTK_RELAY, MGTK::MoveTo, desktop_aux::copy_file_count_pos2
         addr_call draw_text1, str_file_count
         rts
 
@@ -12872,7 +12871,7 @@ do1:    ldy     #1
         jsr     compose_file_count_string
         lda     winfo_alert_dialog
         jsr     set_port_from_window_id
-        MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LB0B6
+        MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::copy_file_count_pos
         addr_call draw_text1, str_file_count
         addr_call draw_text1, str_files
         rts
@@ -12895,7 +12894,7 @@ do2:    ldy     #1
         jsr     copy_name_to_buf0_adjust_case
         MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
         addr_call draw_text1, path_buf0
-        MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LB0BA
+        MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::copy_file_count_pos2
         addr_call draw_text1, str_file_count
         rts