Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2025-03-20 16:31:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/disasm'

Browse Source
This commit is contained in:
Joshua Bell 2018-12-15 18:17:06 -08:00
commit a7a672cc18
2 changed files with 20 additions and 17 deletions

17
desktop/desktop_aux.s

@ -2850,7 +2850,7 @@ textbg_white: .byte $7F
press_ok_to_rect: DEFINE_RECT 39,25,360,80
prompt_rect: DEFINE_RECT 40,60,360,80
LAE7E: DEFINE_POINT 65,43
current_target_file_pos: DEFINE_POINT 65,43
LAE82: DEFINE_POINT 65,51
LAE86: DEFINE_RECT 65,35,394,42
LAE8E: DEFINE_RECT 65,43,394,50
@ -2916,7 +2916,10 @@ str_delete_locked_file:
PASCAL_STRING "This file is locked, do you want to delete it anyway ?"
LB16A: DEFINE_POINT 145, 59
LB16E: DEFINE_POINT 204, 59
delete_remaining_count_pos:
DEFINE_POINT 204, 59
LB172: DEFINE_POINT 300, 59
;; "New Folder" dialog strings
@ -2958,12 +2961,12 @@ str_info_blocks:
str_colon:
PASCAL_STRING ": "
file_count_pos3: DEFINE_POINT 160,59
file_count_pos4: DEFINE_POINT 145,59
unlock_remaining_count_pos2: DEFINE_POINT 160,59
lock_remaining_count_pos2: DEFINE_POINT 145,59
files_pos: DEFINE_POINT 200,59
files_pos2: DEFINE_POINT 185,59
file_count_pos: DEFINE_POINT 205,59
file_count_pos2: DEFINE_POINT 195,59
unlock_remaining_count_pos: DEFINE_POINT 205,59
lock_remaining_count_pos: DEFINE_POINT 195,59
str_format_disk: PASCAL_STRING "Format a Disk ..."
str_select_format: PASCAL_STRING "Select the location where the disk is to be formatted"
@ -3002,7 +3005,7 @@ str_size_number:
str_size_blocks:
PASCAL_STRING "Blocks used on disk"
.byte $6E,$00,$23,$00,$6E,$00,$2B,$00
.word 110,35,110,43
str_download:
PASCAL_STRING "DownLoad ..."

20
desktop/desktop_main.s

@ -12208,7 +12208,7 @@ do2: ldy #1
sta ptr+1
stx ptr
jsr copy_name_to_buf0_adjust_case
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LAE7E
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
addr_call draw_text1, path_buf0
jsr copy_dialog_param_addr_to_ptr
ldy #$05
@ -12330,7 +12330,7 @@ do2: ldy #$01
sta ptr+1
stx ptr
jsr copy_name_to_buf0_adjust_case
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LAE7E
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
addr_call draw_text1, str_file_count
@ -12500,9 +12500,9 @@ do3: ldy #$01
sta $06+1
stx $06
jsr copy_name_to_buf0_adjust_case
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LAE7E
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
addr_call draw_text1, path_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LB16E
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::delete_remaining_count_pos
addr_call draw_text1, str_file_count
rts
@ -12759,7 +12759,7 @@ do1: ldy #$01
jsr compose_file_count_string
lda winfo_alert_dialog
jsr set_port_from_window_id
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::file_count_pos4
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::lock_remaining_count_pos2
addr_call draw_text1, str_file_count
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::files_pos2
addr_call draw_text1, str_files
@ -12781,9 +12781,9 @@ do3: ldy #$01
sta $06+1
stx $06
jsr copy_name_to_buf0_adjust_case
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LAE7E
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
addr_call draw_text1, path_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::file_count_pos2
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::lock_remaining_count_pos
addr_call draw_text1, str_file_count
rts
@ -12841,7 +12841,7 @@ do1: ldy #$01
jsr compose_file_count_string
lda winfo_alert_dialog
jsr set_port_from_window_id
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::file_count_pos3
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::unlock_remaining_count_pos2
addr_call draw_text1, str_file_count
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::files_pos
addr_call draw_text1, str_files
@ -12863,9 +12863,9 @@ do3: ldy #$01
sta $06+1
stx $06
jsr copy_name_to_buf0_adjust_case
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LAE7E
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
addr_call draw_text1, path_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::file_count_pos
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::unlock_remaining_count_pos
addr_call draw_text1, str_file_count
rts