This commit is contained in:
Joshua Bell 2018-01-23 21:52:53 -08:00
parent d6f6fde998
commit 51f7c083ee

View File

@ -3467,7 +3467,7 @@ label_rename_icon:
.addr saddr .addr saddr
.endmacro .endmacro
.macro DEFINE_MENU_SEPARATOR .macro DEFINE_MENU_SEPARATOR
.addr $0040, $0013, 0 .word 64, 19, 0
.endmacro .endmacro
desktop_menu: desktop_menu:
@ -4978,8 +4978,9 @@ watch_cursor:
.byte px(%0000000),px(%0000000) .byte px(%0000000),px(%0000000)
.byte 5, 5 .byte 5, 5
LD343: .res 256, 0 LD343: .res 191, 0
path_buf0: .res 65, 0
path_buf1: .res 65, 0 path_buf1: .res 65, 0
path_buf2: .res 65, 0 path_buf2: .res 65, 0
@ -6819,14 +6820,14 @@ L463A: .byte $01
.byte 0 .byte 0
L463E: .res 16, 0 L463E: .res 16, 0
L464E: lda $D343 L464E: lda LD343
beq L465E beq L465E
bit $D344 bit LD343+1
bmi L4666 bmi L4666
jsr L67AB jsr L67AB
jmp L4666 jmp L4666
L465E: bit $D344 L465E: bit LD343+1
bmi L4666 bmi L4666
jsr L67A3 jsr L67A3
L4666: lda is_file_selected L4666: lda is_file_selected
@ -6975,7 +6976,7 @@ L477F: lda $D345,x
sta INVOKER_FILENAME,x sta INVOKER_FILENAME,x
dex dex
bpl L477F bpl L477F
addr_call L4842, $0280 addr_call L4842, $280
addr_call L4842, $220 addr_call L4842, $220
jsr L48BE jsr L48BE
lda #<INVOKER lda #<INVOKER
@ -7181,8 +7182,8 @@ done: jsr set_pointer_cursor
rts rts
L4968: jsr L4AAD L4968: jsr L4AAD
ldx $0840 ldx $840
L496E: lda $0840,x L496E: lda $840,x
sta $D355,x sta $D355,x
dex dex
bpl L496E bpl L496E
@ -7321,7 +7322,7 @@ L4A5A: lda ($06),y
lda ($08),y lda ($08),y
tay tay
L4A6F: lda ($08),y L4A6F: lda ($08),y
sta $0840,y sta $840,y
dey dey
bpl L4A6F bpl L4A6F
L4A77: ldy L0800 L4A77: ldy L0800
@ -7332,21 +7333,21 @@ L4A7A: lda L0800,y
bne L4A7A bne L4A7A
L4A84: dey L4A84: dey
sty L0800 sty L0800
ldy $0840 ldy $840
L4A8B: lda $0840,y L4A8B: lda $840,y
cmp #$2F cmp #$2F
beq L4A95 beq L4A95
dey dey
bne L4A8B bne L4A8B
L4A95: dey L4A95: dey
sty $0840 sty $840
lda #$00 lda #$00
sta $06 sta $06
lda #$08 lda #$08
sta $06+1 sta $06+1
lda #<$0840 lda #<$840
sta $08 sta $08
lda #>$0840 lda #>$840
sta $08+1 sta $08+1
jsr L4D19 jsr L4D19
rts rts
@ -7356,7 +7357,7 @@ L4AB0: lda $D355,y
sta L0800,y sta L0800,y
dey dey
bpl L4AB0 bpl L4AB0
addr_call L4B15, $0840 addr_call L4B15, $840
ldy L0800 ldy L0800
L4AC3: lda L0800,y L4AC3: lda L0800,y
cmp #$2F cmp #$2F
@ -7370,11 +7371,11 @@ L4ACE: lda L0800,y
dey dey
bne L4ACE bne L4ACE
L4AD8: dey L4AD8: dey
ldx $0840 ldx $840
L4ADC: iny L4ADC: iny
inx inx
lda L0800,y lda L0800,y
sta $0840,x sta $840,x
cpy L0800 cpy L0800
bne L4ADC bne L4ADC
rts rts
@ -7833,7 +7834,7 @@ L4E34: lda ($06),y
dex dex
dey dey
L4E51: lda ($06),y L4E51: lda ($06),y
sta $D344,x sta LD343+1,x
dey dey
dex dex
bne L4E51 bne L4E51
@ -9732,7 +9733,7 @@ L5E3A: lda ($06),y
dex dex
dey dey
L5E57: lda ($06),y L5E57: lda ($06),y
sta $D344,x sta LD343+1,x
dey dey
dex dex
bne L5E57 bne L5E57
@ -10711,7 +10712,7 @@ L67B0: lda #$03
lda #$04 lda #$04
jsr L67CA jsr L67CA
lda #$80 lda #$80
sta $D344 sta LD343+1
rts rts
L67CA: sta $E26D L67CA: sta $E26D
@ -16622,7 +16623,7 @@ L9931: .addr L9B36
.addr L9B33 .addr L9B33
.addr rts2 .addr rts2
L9937: .byte $00 L9937: .byte 0
L9938: .addr 0 L9938: .addr 0
.addr $220 .addr $220
.addr $1FC0 .addr $1FC0
@ -16661,11 +16662,11 @@ L997C: lda #$05
L9984: lda #$00 L9984: lda #$00
sta L9937 sta L9937
lda #<$99A7 lda #<$99A7 ; ???
sta L917D sta L917D
lda #>$99A7 lda #>$99A7
sta L917D+1 sta L917D+1
lda #<$99DC lda #<$99DC ; ???
sta L9180 sta L9180
lda #>$99DC lda #>$99DC
sta L9180+1 sta L9180+1
@ -17179,11 +17180,11 @@ L9E7B: .byte 0
.byte $20 .byte $20
.byte $02 .byte $02
L9E7E: sta L9E79 L9E7E: sta L9E79
lda #<$9EB1 lda #<$9EB1 ; ???
sta L9183 sta L9183
lda #>$9EB1 lda #>$9EB1
sta L9183+1 sta L9183+1
lda #<$9EA3 lda #<$9EA3 ; ???
sta L917D sta L917D
lda #>$9EA3 lda #>$9EA3
sta L917D+1 sta L917D+1
@ -18410,7 +18411,7 @@ LA9E6: ldy #$01
stx $06 stx $06
jsr LBE63 jsr LBE63
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E
addr_call draw_text1, $D402 addr_call draw_text1, path_buf0
jsr LB3BF jsr LB3BF
ldy #$05 ldy #$05
lda ($06),y lda ($06),y
@ -18422,7 +18423,7 @@ LA9E6: ldy #$01
jsr LBE78 jsr LBE78
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE82 A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE82
addr_call draw_text1, path_buf1 addr_call draw_text1, path_buf1
yax_call A2D_RELAY, $E, $B0BA yax_call A2D_RELAY, A2D_SET_POS, desktop_aux::LB0BA
addr_call draw_text1, str_7_spaces addr_call draw_text1, str_7_spaces
rts rts
@ -18535,7 +18536,7 @@ LAB69: ldy #$01
stx $06 stx $06
jsr LBE63 jsr LBE63
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E
addr_call draw_text1, $D402 addr_call draw_text1, path_buf0
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LB0BA A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LB0BA
addr_call draw_text1, str_7_spaces addr_call draw_text1, str_7_spaces
rts rts
@ -18726,7 +18727,7 @@ LAD6C: ldy #$01
stx $06 stx $06
jsr LBE63 jsr LBE63
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E
addr_call draw_text1, $D402 addr_call draw_text1, path_buf0
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LB16E A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LB16E
addr_call draw_text1, str_7_spaces addr_call draw_text1, str_7_spaces
rts rts
@ -18806,7 +18807,7 @@ LAE70: lda #$80
lda ($08),y lda ($08),y
tay tay
LAE90: lda ($08),y LAE90: lda ($08),y
sta $D402,y sta path_buf0,y
dey dey
bpl LAE90 bpl LAE90
lda winF lda winF
@ -18814,7 +18815,7 @@ LAE90: lda ($08),y
yax_call draw_dialog_label, $02, desktop_aux::str_in_colon yax_call draw_dialog_label, $02, desktop_aux::str_in_colon
lda #$37 lda #$37
sta dialog_label_pos sta dialog_label_pos
yax_call draw_dialog_label, $02, $D402 yax_call draw_dialog_label, $02, path_buf0
lda #$28 lda #$28
sta dialog_label_pos sta dialog_label_pos
yax_call draw_dialog_label, $04, desktop_aux::str_enter_folder_name yax_call draw_dialog_label, $04, desktop_aux::str_enter_folder_name
@ -18831,26 +18832,26 @@ LAED6: lda #$FB
jsr LB961 jsr LB961
jmp LAEC6 jmp LAEC6
LAEE1: lda $D402 LAEE1: lda path_buf0
clc clc
adc path_buf1 adc path_buf1
clc clc
adc #$01 adc #$01
cmp #$41 cmp #$41
bcs LAED6 bcs LAED6
inc $D402 inc path_buf0
ldx $D402 ldx path_buf0
lda #'/' lda #'/'
sta $D402,x sta path_buf0,x
ldx $D402 ldx path_buf0
ldy #$00 ldy #$00
LAEFF: inx LAEFF: inx
iny iny
lda path_buf1,y lda path_buf1,y
sta $D402,x sta path_buf0,x
cpy path_buf1 cpy path_buf1
bne LAEFF bne LAEFF
stx $D402 stx path_buf0
ldy #$02 ldy #$02
ldx #$D4 ldx #$D4
lda #$00 lda #$00
@ -19036,7 +19037,7 @@ LB0A2: ldy #$01
stx $06 stx $06
jsr LBE63 jsr LBE63
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E
addr_call draw_text1, $D402 addr_call draw_text1, path_buf0
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LB241 A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LB241
addr_call draw_text1, str_7_spaces addr_call draw_text1, str_7_spaces
rts rts
@ -19128,7 +19129,7 @@ LB1C0: ldy #$01
stx $06 stx $06
jsr LBE63 jsr LBE63
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LAE7E
addr_call draw_text1, $D402 addr_call draw_text1, path_buf0
A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LB23D A2D_RELAY_CALL A2D_SET_POS, desktop_aux::LB23D
addr_call draw_text1, str_7_spaces addr_call draw_text1, str_7_spaces
rts rts
@ -20420,7 +20421,7 @@ LBE63: ldy #$00
lda ($06),y lda ($06),y
tay tay
LBE68: lda ($06),y LBE68: lda ($06),y
sta $D402,y sta path_buf0,y
dey dey
bpl LBE68 bpl LBE68
lda #$02 lda #$02
@ -20723,9 +20724,9 @@ L0A03: A2D_RELAY_CALL $29
lda $1400 lda $1400
clc clc
adc $1401 adc $1401
sta $D343 sta LD343
lda #$00 lda #$00
sta $D344 sta LD343+1
lda $1400 lda $1400
sta L0A93 sta L0A93
L0A3B: lda L0A92 L0A3B: lda L0A92