diff --git a/desktop/desktop_aux.s b/desktop/desktop_aux.s index 114d495..88e8d20 100644 --- a/desktop/desktop_aux.s +++ b/desktop/desktop_aux.s @@ -2820,8 +2820,6 @@ special_menu: menu_item_id_unlock = 10 menu_item_id_get_size = 11 - .addr $0000,$0000 - PAD_TO $AE00 ;;; ============================================================ diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s index 9b6c2b5..66d5116 100644 --- a/desktop/desktop_main.s +++ b/desktop/desktop_main.s @@ -4619,26 +4619,19 @@ L66A0: .word 0 jmp check_menu_items disable_menu_items: - lda #MGTK::disablemenu_disable - sta disablemenu_params::disable + copy #MGTK::disablemenu_disable, disablemenu_params::disable MGTK_RELAY_CALL MGTK::DisableMenu, disablemenu_params - lda #MGTK::disableitem_disable - sta disableitem_params::disable - lda #menu_id_file - sta disableitem_params::menu_id - lda #desktop_aux::menu_item_id_new_folder - sta disableitem_params::menu_item + copy #MGTK::disableitem_disable, disableitem_params::disable + copy #menu_id_file, disableitem_params::menu_id + copy #desktop_aux::menu_item_id_new_folder, disableitem_params::menu_item MGTK_RELAY_CALL MGTK::DisableItem, disableitem_params - lda #desktop_aux::menu_item_id_close - sta disableitem_params::menu_item + copy #desktop_aux::menu_item_id_close, disableitem_params::menu_item MGTK_RELAY_CALL MGTK::DisableItem, disableitem_params - lda #desktop_aux::menu_item_id_close_all - sta disableitem_params::menu_item + copy #desktop_aux::menu_item_id_close_all, disableitem_params::menu_item MGTK_RELAY_CALL MGTK::DisableItem, disableitem_params - lda #0 - sta menu_dispatch_flag + copy #0, menu_dispatch_flag rts ;; Is this residue of a Windows menu??? @@ -4744,16 +4737,13 @@ disable_eject_menu_item := toggle_eject_menu_item::disable .proc toggle_selector_menu_items disable: - lda #MGTK::disableitem_disable - sta disableitem_params::disable + copy #MGTK::disableitem_disable, disableitem_params::disable jmp :+ enable: - lda #MGTK::disableitem_enable - sta disableitem_params::disable + copy #MGTK::disableitem_enable, disableitem_params::disable -: lda #menu_id_selector - sta disableitem_params::menu_id +: copy #menu_id_selector, disableitem_params::menu_id lda #menu_item_id_selector_edit jsr configure_menu_item lda #menu_item_id_selector_delete @@ -4810,20 +4800,16 @@ replace_selection: ;; Set selection to clicked icon set_selection: DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, findicon_which_icon - lda #1 - sta selected_icon_count - lda findicon_which_icon - sta selected_icon_list - lda #0 - sta selected_window_index + copy #1, selected_icon_count + copy findicon_which_icon, selected_icon_list + copy #0, selected_window_index L6834: bit double_click_flag bpl L6880 ;; Drag of volume icon - lda findicon_which_icon - sta drag_drop_param + copy findicon_which_icon, drag_drop_param DESKTOP_RELAY_CALL DT_DRAG_HIGHLIGHTED, drag_drop_param tax lda drag_drop_param @@ -4866,8 +4852,7 @@ L688F: ldx selected_icon_count dex L6893: txa pha - lda selected_icon_list,x - sta icon_param3 + copy selected_icon_list,x, icon_param3 DESKTOP_RELAY_CALL DT_REDRAW_ICON, icon_param3 pla tax @@ -4914,15 +4899,13 @@ L68F9: cpx cached_window_icon_count : txa pha - lda cached_window_icon_list,x - sta icon_param + copy cached_window_icon_list,x, icon_param DESKTOP_RELAY_CALL DT_ICON_IN_RECT, icon_param beq L692C DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param ldx selected_icon_count inc selected_icon_count - lda icon_param - sta selected_icon_list,x + copy icon_param, selected_icon_list,x L692C: pla tax inx diff --git a/desktop/desktop_res.s b/desktop/desktop_res.s index 8cde7ea..03bb040 100644 --- a/desktop/desktop_res.s +++ b/desktop/desktop_res.s @@ -1181,10 +1181,10 @@ selector_menu: DEFINE_MENU_ITEM run_list_entries + i * $10, .string(i+1), .string(i+1) .endrepeat - menu_item_id_selector_add = 1 - menu_item_id_selector_edit = 2 - menu_item_id_selector_delete = 3 - menu_item_id_selector_run = 4 + menu_item_id_selector_add = 1 + menu_item_id_selector_edit = 2 + menu_item_id_selector_delete = 3 + menu_item_id_selector_run = 4 label_add: PASCAL_STRING "Add an Entry ..."