diff --git a/desk.acc/README.md b/desk.acc/README.md index 3c271ac..242b7b3 100644 --- a/desk.acc/README.md +++ b/desk.acc/README.md @@ -67,6 +67,6 @@ Tips: * You can use the Sort Directory DA to order the files, which controls the menu order: * Open the `A2.DESKTOP\DESK.ACC` folder - * Press Open-Apple and click on the each file in the desired order + * Press Open-Apple and click on each file in the desired order * Select Sort Directory from the Apple menu, and verify the order * Restart diff --git a/desktop/desktop.s b/desktop/desktop.s index 3a78c65..ed99098 100644 --- a/desktop/desktop.s +++ b/desktop/desktop.s @@ -3735,11 +3735,8 @@ str_on_system_disk: PASCAL_STRING "on the system disk ?" - .byte $00,$00,$00,$00,$00,$00,$00,$00 - .byte $00,$00,$00,$00,$00,$00,$00,$00 - .byte $00,$00,$00,$00,$00,$00,$00,$00 - .byte $00,$00,$00,$00,$00,$00,$00,$00 - .byte $00,$00,$00,$00,$00,$00,$00 + .assert * = $B5D9, error, "Segment length mismatch" + PAD_TO $B600 ;;; ================================================== @@ -3790,14 +3787,14 @@ alert_inner_frame_rect1: alert_inner_frame_rect2: DEFINE_RECT 5, 3, 415, 52 -LB6D3: .byte $41 -LB6D4: .byte $00 -LB6D5: .byte $57 -LB6D6: .byte $00,$00,$20,$80,$00,$00,$00,$00 +LB6D3: .word $41 +LB6D5: .word $57 + + .byte $00,$20,$80,$00,$00,$00,$00 .byte $00 -LB6DF: .byte $A4 -LB6E0: .byte $01 -LB6E1: .byte $37,$00 + +LB6DF: .word $1A4 +LB6E1: .word $37 ;;; ================================================== @@ -3908,7 +3905,7 @@ LBA0B: sta state2_left,x sta state2_height+1 A2D_RELAY2_CALL A2D_SET_STATE, state2 lda LB6D3 - ldx LB6D4 + ldx LB6D3+1 jsr LBF8B sty LBFCA sta LBFCD @@ -3916,8 +3913,8 @@ LBA0B: sta state2_left,x clc adc LB6DF pha - lda LB6D4 - adc LB6E0 + lda LB6D3+1 + adc LB6DF+1 tax pla jsr LBF8B @@ -4190,14 +4187,14 @@ LBDE1: lda input_params_xcoord sbc LB6D3 sta input_params_xcoord lda input_params_xcoord+1 - sbc LB6D4 + sbc LB6D3+1 sta input_params_xcoord+1 lda input_params_ycoord sec sbc LB6D5 sta input_params_ycoord lda input_params_ycoord+1 - sbc LB6D6 + sbc LB6D5+1 sta input_params_ycoord+1 rts diff --git a/keyboard.md b/keyboard.md index c252a81..25c4b4a 100644 --- a/keyboard.md +++ b/keyboard.md @@ -1,18 +1,19 @@ # Keyboard Control -OA = Open Apple +△ = Open Apple +▲ = Closed Apple ## Windows -* OA-W - Activate window; Left/Right Arrows to navigate -* OA-G - Resize window; Arrows to resize, Return to finish -* OA-M - Move window; Arrows to move, Return to finish -* OA-X - Scroll contents; Arrows to scroll, Esc or Return when done +* △-W - Activate window; Left/Right Arrows to navigate +* △-G - Resize window; Arrows to resize, Return to finish +* △-M - Move window; Arrows to move, Return to finish +* △-X - Scroll contents; Arrows to scroll, Esc or Return when done ## Icons -* OA-H - Highlight icon; Left/Right Arrows to navigate, Esc or Return when done -* OA-A - Select all icons +* △-H - Highlight icon; Left/Right Arrows to navigate, Esc or Return when done +* △-A - Select all icons ## Menus @@ -20,25 +21,25 @@ OA = Open Apple ## Shortcuts -* OA-F - New Folder -* OA-O - Open -* OA-C - Close -* OA-B - Close All -* OA-A - Select All -* OA-Y - Copy a File -* OA-D - Delete a File -* OA-E - Eject -* OA-Q - Quit +* △-F - New Folder +* △-O - Open +* △-C - Close +* △-B - Close All +* △-A - Select All +* △-Y - Copy a File +* △-D - Delete a File +* △-E - Eject +* △-Q - Quit -* OA-J - View By Icon -* OA-N - View By Name -* OA-T - View By Date -* OA-K - View By Size -* OA-L - View By Type +* △-J - View By Icon +* △-N - View By Name +* △-T - View By Date +* △-K - View By Size +* △-L - View By Type -* OA-S - Format a Disk -* OA-Z - Erase a Disk -* OA-I - Get Info +* △-S - Format a Disk +* △-Z - Erase a Disk +* △-I - Get Info -* OA-0 - Run Selector -* OA-1-9 - Selector Entries +* △-0 - Run Selector +* △-1-9 - Selector Entries