From d6ae4d352b8377363a07cd61c6f7921e65d1aec9 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Mon, 17 Dec 2018 20:22:29 -0800 Subject: [PATCH] overlay handlers --- desktop/ovl4.s | 42 +++++++++++++++++++++--------------------- desktop/ovl5.s | 16 ++++++++-------- desktop/ovl6.s | 6 +++--- desktop/ovl7.s | 16 ++++++++-------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/desktop/ovl4.s b/desktop/ovl4.s index ce4e932..5adf9eb 100644 --- a/desktop/ovl4.s +++ b/desktop/ovl4.s @@ -344,8 +344,8 @@ L5446: lda screentowindow_windowy sta LD920 bit LD8F0 bpl L5457 - jsr jt_06 - jsr jt_03 + jsr jt_prep_path + jsr jt_redraw_input L5457: lda LD920 jsr L6274 jsr jt_05 @@ -527,7 +527,7 @@ L5607: ldx LD920 pha bit LD8F0 bpl L5618 - jsr jt_06 + jsr jt_prep_path L5618: lda #$00 sta L565B copy16 #$1800, $08 @@ -569,8 +569,8 @@ L565C: lda #$FF jsr L6227 jsr L61B1 jsr L606D - jsr jt_06 - jsr jt_03 + jsr jt_prep_path + jsr jt_redraw_input rts L567F: lda #$00 @@ -612,8 +612,8 @@ L56A2: jsr L5F49 jsr jt_04 jmp L56DC -L56D6: jsr jt_06 - jsr jt_03 +L56D6: jsr jt_prep_path + jsr jt_redraw_input L56DC: lda #$FF sta LD920 L56E1: rts @@ -1173,7 +1173,7 @@ L5C27: ldx $177F copy #1, path_buf2 copy #' ', path_buf2+1 - jsr jt_03 + jsr jt_redraw_input rts .endproc @@ -2366,7 +2366,7 @@ L6838: lda LD3C1,y bpl L6838 lda $08 sta path_buf0 -L6846: jsr jt_03 +L6846: jsr jt_redraw_input jsr L6EA3 rts @@ -2499,7 +2499,7 @@ L69AF: lda LD3C1,y bpl L69AF lda $08 sta path_buf1 -L69BD: jsr jt_03 +L69BD: jsr jt_redraw_input jsr L6E9F rts @@ -2652,7 +2652,7 @@ L6B23: lda path_buf0,y sta path_buf2+1 lda #$00 sta path_buf0 - jsr jt_03 + jsr jt_redraw_input jsr L6EA3 rts .endproc @@ -2676,7 +2676,7 @@ L6B51: inx sty path_buf0 copy #1, path_buf2 copy #GLYPH_INSPT, path_buf2+1 - jsr jt_03 + jsr jt_redraw_input jsr L6EA3 rts .endproc @@ -2827,7 +2827,7 @@ L6CCF: lda path_buf1,y sta path_buf2+1 lda #$00 sta path_buf1 - jsr jt_03 + jsr jt_redraw_input jsr L6E9F rts .endproc @@ -2851,7 +2851,7 @@ L6CFD: inx sty path_buf1 copy #1, path_buf2 copy #GLYPH_INSPT, path_buf2+1 - jsr jt_03 + jsr jt_redraw_input jsr L6E9F rts .endproc @@ -2864,10 +2864,10 @@ jump_table: jt_handle_ok: jmp 0 jt_handle_cancel: jmp 0 jt_blink_ip: jmp 0 -jt_03: jmp 0 +jt_redraw_input: jmp 0 jt_04: jmp 0 jt_05: jmp 0 -jt_06: jmp 0 +jt_prep_path: jmp 0 jt_handle_other_key: jmp 0 jt_handle_delete_key: jmp 0 jt_handle_left_key: jmp 0 @@ -2944,7 +2944,7 @@ L6DC1: rts .proc jt_handle_f1_tbd04 jsr L6D9E - jsr jt_03 + jsr jt_redraw_input rts .endproc @@ -2952,7 +2952,7 @@ L6DC1: rts .proc jt_handle_f2_tbd04 jsr L6DB0 - jsr jt_03 + jsr jt_redraw_input rts .endproc @@ -2993,7 +2993,7 @@ L6DD6: sta L6E1C jmp L6E17 L6E14: jsr L6D48 -L6E17: jsr jt_03 +L6E17: jsr jt_redraw_input rts L6E1B: .byte 0 @@ -3001,7 +3001,7 @@ L6E1C: .byte 0 ;;; ============================================================ -.proc jt_handle_f1_tbd06 +.proc prep_path_buf0 COPY_STRING path_buf, path_buf0 addr_call adjust_filename_case, path_buf0 rts @@ -3009,7 +3009,7 @@ L6E1C: .byte 0 ;;; ============================================================ -.proc jt_handle_f2_tbd06 +.proc prep_path_buf1 COPY_STRING path_buf, path_buf1 addr_call adjust_filename_case, path_buf1 rts diff --git a/desktop/ovl5.s b/desktop/ovl5.s index 2e41c62..d4e848f 100644 --- a/desktop/ovl5.s +++ b/desktop/ovl5.s @@ -13,8 +13,8 @@ L7000: jsr common_overlay::create_common_dialog jsr common_overlay::L61B1 jsr common_overlay::L606D jsr L7026 - jsr common_overlay::jt_06 - jsr common_overlay::jt_03 + jsr common_overlay::jt_prep_path + jsr common_overlay::jt_redraw_input copy #$FF, LD8EC jmp common_overlay::L5106 @@ -58,7 +58,7 @@ jt_source_filename: jump_table_entry common_overlay::redraw_f1 jump_table_entry common_overlay::jt_handle_f1_tbd04 jump_table_entry common_overlay::jt_handle_f1_tbd05 - jump_table_entry common_overlay::jt_handle_f1_tbd06 + jump_table_entry common_overlay::prep_path_buf0 jump_table_entry common_overlay::handle_f1_other_key jump_table_entry common_overlay::handle_f1_delete_key jump_table_entry common_overlay::handle_f1_left_key @@ -75,7 +75,7 @@ jt_destination_entries: jump_table_entry common_overlay::redraw_f2 jump_table_entry common_overlay::jt_handle_f2_tbd04 jump_table_entry common_overlay::jt_handle_f2_tbd05 - jump_table_entry common_overlay::jt_handle_f2_tbd06 + jump_table_entry common_overlay::prep_path_buf1 jump_table_entry common_overlay::handle_f2_other_key jump_table_entry common_overlay::handle_f2_delete_key jump_table_entry common_overlay::handle_f2_left_key @@ -90,7 +90,7 @@ L70F1: lda #1 sta path_buf2 lda #$20 sta path_buf2+1 - jsr common_overlay::jt_03 + jsr common_overlay::jt_redraw_input ldx jt_destination_entries : lda jt_destination_entries+1,x @@ -144,7 +144,7 @@ L7165: cpx path_buf0 iny jmp L7165 -L7178: jsr common_overlay::jt_03 +L7178: jsr common_overlay::jt_redraw_input lda LD8F0 sta LD8F1 lda LD8F2 @@ -193,7 +193,7 @@ L71F9: lda #1 sta path_buf2 lda #' ' sta path_buf2+1 - jsr common_overlay::jt_03 + jsr common_overlay::jt_redraw_input ldx jt_source_filename L7209: lda jt_source_filename+1,x sta common_overlay::jump_table,x @@ -234,7 +234,7 @@ L7209: lda jt_source_filename+1,x jsr common_overlay::L6161 jsr common_overlay::L61B1 jsr common_overlay::L606D - jsr common_overlay::jt_03 + jsr common_overlay::jt_redraw_input jmp L7295 L726D: lda common_overlay::path_buf diff --git a/desktop/ovl6.s b/desktop/ovl6.s index ba96e5f..68b48ca 100644 --- a/desktop/ovl6.s +++ b/desktop/ovl6.s @@ -13,8 +13,8 @@ L7000: jsr common_overlay::create_common_dialog jsr common_overlay::L61B1 jsr common_overlay::L606D jsr L7026 - jsr common_overlay::jt_06 - jsr common_overlay::jt_03 + jsr common_overlay::jt_prep_path + jsr common_overlay::jt_redraw_input lda #$FF sta LD8EC jmp common_overlay::L5106 @@ -55,7 +55,7 @@ jt_filename: jump_table_entry common_overlay::redraw_f1 jump_table_entry common_overlay::jt_handle_f1_tbd04 jump_table_entry common_overlay::jt_handle_f1_tbd05 - jump_table_entry common_overlay::jt_handle_f1_tbd06 + jump_table_entry common_overlay::prep_path_buf0 jump_table_entry common_overlay::handle_f1_other_key jump_table_entry common_overlay::handle_f1_delete_key jump_table_entry common_overlay::handle_f1_left_key diff --git a/desktop/ovl7.s b/desktop/ovl7.s index 239108a..722716d 100644 --- a/desktop/ovl7.s +++ b/desktop/ovl7.s @@ -50,10 +50,10 @@ L706A: jsr common_overlay::L6163 jsr common_overlay::L606D lda path_buf0 bne L707B - jsr common_overlay::jt_06 + jsr common_overlay::jt_prep_path L707B: copy #1, path_buf2 copy #' ', path_buf2+1 - jsr common_overlay::jt_03 + jsr common_overlay::jt_redraw_input jsr common_overlay::redraw_f2 copy #1, path_buf2 copy #' ', path_buf2+1 @@ -144,7 +144,7 @@ jt_pathname: .byte $29 jump_table_entry common_overlay::redraw_f1 jump_table_entry common_overlay::jt_handle_f1_tbd04 jump_table_entry common_overlay::jt_handle_f1_tbd05 - jump_table_entry common_overlay::jt_handle_f1_tbd06 + jump_table_entry common_overlay::prep_path_buf0 jump_table_entry common_overlay::handle_f1_other_key jump_table_entry common_overlay::handle_f1_delete_key jump_table_entry common_overlay::handle_f1_left_key @@ -160,7 +160,7 @@ jt_entry_name: .byte $29 jump_table_entry common_overlay::redraw_f2 jump_table_entry common_overlay::jt_handle_f2_tbd04 jump_table_entry common_overlay::jt_handle_f2_tbd05 - jump_table_entry common_overlay::jt_handle_f2_tbd06 + jump_table_entry common_overlay::prep_path_buf1 jump_table_entry common_overlay::handle_f2_other_key jump_table_entry common_overlay::handle_f2_delete_key jump_table_entry common_overlay::handle_f2_left_key @@ -173,7 +173,7 @@ jt_entry_name: .byte $29 L725D: copy #1, path_buf2 copy #' ', path_buf2+1 - jsr common_overlay::jt_03 + jsr common_overlay::jt_redraw_input ldx jt_entry_name L726D: lda jt_entry_name+1,x sta common_overlay::jump_table,x @@ -213,7 +213,7 @@ L72AF: iny sty path_buf1 L72BF: copy #1, path_buf2 copy #GLYPH_INSPT, path_buf2+1 - jsr common_overlay::jt_03 + jsr common_overlay::jt_redraw_input rts L72CD: addr_call common_overlay::L647C, path_buf0 @@ -259,7 +259,7 @@ L732F: MGTK_RELAY_CALL MGTK::InitPort, grafport3 L736C: copy #1, path_buf2 copy #' ', path_buf2+1 - jsr common_overlay::jt_03 + jsr common_overlay::jt_redraw_input ldx jt_pathname L737C: lda jt_pathname+1,x sta common_overlay::jump_table,x @@ -271,7 +271,7 @@ L737C: lda jt_pathname+1,x bpl L737C copy #1, path_buf2 copy #GLYPH_INSPT, path_buf2+1 - jsr common_overlay::jt_03 + jsr common_overlay::jt_redraw_input lda #$00 sta common_overlay::L5105 sta common_overlay::L51AE