Merge remote-tracking branch 'origin/disasm'

This commit is contained in:
Joshua Bell 2019-01-29 08:25:06 -08:00
commit 5238769934
2 changed files with 12 additions and 11 deletions

View File

@ -3267,8 +3267,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:

View File

@ -9555,7 +9555,7 @@ do_run:
tsx
stx stack_stash
jsr prep_callbacks_for_size_or_count
jsr L9984
jsr do_download_dialog_phase
jsr size_or_count_process_selected_file
jsr L99BC
jmp do_run2
@ -10892,14 +10892,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
@ -12874,7 +12873,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
@ -12910,7 +12909,7 @@ do2: ldy #1
jsr copy_name_to_buf1
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
@ -12988,7 +12987,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
@ -13011,7 +13010,7 @@ do2: ldy #1
jsr copy_name_to_buf0
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