DeskTop: More overlay resource identifiers

This commit is contained in:
Joshua Bell 2018-05-03 18:43:09 -07:00
parent 9ea7ac1a4e
commit 7bd4eec08b
6 changed files with 44 additions and 43 deletions

View File

@ -14673,7 +14673,7 @@ L0D09: .byte 0
L0D12: lda L0E33
asl a
tay
copy16 $DB00,y, $08
copy16 slot_drive_string_table,y, $08
ldy L0E33
lda DEVLST,y
pha

View File

@ -720,6 +720,7 @@ file_to_delete_label:
;;; ============================================================
slot_drive_string_table:
.addr sd0s, sd1s, sd2s, sd3s, sd4s, sd5s, sd6s
.addr sd7s, sd8s, sd9s, sd10s, sd11s, sd12s, sd13s

View File

@ -69,7 +69,7 @@ L085F: bit $D887
MGTK_RELAY_CALL MGTK::SetPenMode, pencopy
MGTK_RELAY_CALL MGTK::PaintRect, $AE6E
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::FrameRect, $D6AB
MGTK_RELAY_CALL MGTK::FrameRect, rect1
jsr LBD75
lda #$80
sta $D8E8
@ -209,7 +209,7 @@ L0A18: bit $D887
MGTK_RELAY_CALL MGTK::SetPenMode, pencopy
MGTK_RELAY_CALL MGTK::PaintRect, $AE6E
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::FrameRect, $D6AB
MGTK_RELAY_CALL MGTK::FrameRect, rect1
jsr LBD75
lda #$80
sta $D8E8
@ -486,13 +486,13 @@ L0D50: cmp #$04
ldx #$00
lda #$A0
bne L0D5A
L0D5A: stax $D6C3
L0D5A: stax dialog_label_pos
L0D60: lda L0D8C
asl a
tay
lda $DB01,y
lda slot_drive_string_table+1,y
tax
lda $DB00,y
lda slot_drive_string_table,y
pha
lda L0D8C
lsr a

View File

@ -434,20 +434,20 @@ L9390: MGTK_RELAY_CALL MGTK::OpenWindow, winfo_entry_picker
lda L938E
cmp #$02
bne L9417
addr_call L94F0, $D729
addr_call L94F0, edit_an_entry_label
rts
L9417: cmp #$03
bne L9423
addr_call L94F0, $D73B
addr_call L94F0, delete_an_entry_label
rts
L9423: addr_call L94F0, $D74F
L9423: addr_call L94F0, run_an_entry_label
rts
L942B: stx $07
sta $06
lda $D6C3
lda dialog_label_pos
sta L94A8
tya
pha
@ -471,10 +471,10 @@ L9448: ldx #$00
rol L94A7
clc
adc #$20
sta $D6C5
sta dialog_label_pos+2
lda L94A7
adc #$00
sta $D6C6
adc #0
sta dialog_label_pos+3
pla
cmp #$08
bcs L9471
@ -489,18 +489,18 @@ L9471: cmp #$10
L947B: ldax #$00DC
L947F: clc
adc #$0A
sta $D6C3
sta dialog_label_pos
txa
adc #$00
sta $D6C4
MGTK_RELAY_CALL MGTK::MoveTo, $D6C3
sta dialog_label_pos+1
MGTK_RELAY_CALL MGTK::MoveTo, dialog_label_pos
lda $06
ldx $07
jsr L94CB
lda L94A8
sta $D6C3
lda #$00
sta $D6C4
sta dialog_label_pos
lda #0
sta dialog_label_pos+1
rts
L94A7: .byte 0
@ -540,11 +540,11 @@ L94F0: stax $06
ror a
sec
sbc $09
sta $D6B7
sta pos_dialog_title
lda L9539
sbc $0A
sta $D6B8
MGTK_RELAY_CALL MGTK::MoveTo, $D6B7
sta pos_dialog_title+1
MGTK_RELAY_CALL MGTK::MoveTo, pos_dialog_title
MGTK_RELAY_CALL MGTK::DrawText, $06
rts

View File

@ -38,8 +38,8 @@ routine_table: .addr $7000, $7000, $7000
lda #0
sta L5027
sta L50A8
sta $D8EB
sta $D8EC
sta LD8EB
sta LD8EC
sta $D8F0
sta $D8F1
sta $D8F2
@ -73,7 +73,7 @@ L5105: .byte 0
;;; ============================================================
L5106: bit $D8EC
L5106: bit LD8EC
bpl :+
dec $D8E9
bne :+
@ -1651,7 +1651,7 @@ L61E6: inx
bne L61E6
stx $0220
addr_call L6129, $0220
MGTK_RELAY_CALL MGTK::MoveTo, $DA51
MGTK_RELAY_CALL MGTK::MoveTo, disk_label_pos
addr_call L5DED, disk_label
addr_call L5DED, $0220
MGTK_RELAY_CALL MGTK::InitPort, grafport3
@ -2011,15 +2011,15 @@ L658B: cmp #$09
stax $06
copy16 path_pos1+2, $08
MGTK_RELAY_CALL MGTK::MoveTo, $06
bit $D8EB
bit LD8EB
bpl L65C8
MGTK_RELAY_CALL MGTK::SetTextBG, textbg1
lda #$00
sta $D8EB
sta LD8EB
beq L65D6
L65C8: MGTK_RELAY_CALL MGTK::SetTextBG, textbg2
lda #$FF
sta $D8EB
sta LD8EB
L65D6: copy16 #$D8EF, $06
lda $D8EE
sta $08
@ -2033,16 +2033,16 @@ L65D6: copy16 #$D8EF, $06
stax $06
copy16 path_pos2+2, $08
MGTK_RELAY_CALL MGTK::MoveTo, $06
bit $D8EB
bit LD8EB
bpl L6626
MGTK_RELAY_CALL MGTK::SetTextBG, textbg1
lda #$00
sta $D8EB
sta LD8EB
jmp L6634
L6626: MGTK_RELAY_CALL MGTK::SetTextBG, textbg2
lda #$FF
sta $D8EB
sta LD8EB
L6634: copy16 #$D8EF, $06
lda $D8EE
sta $08
@ -2346,7 +2346,7 @@ L69D5: lda L6A17
ldx path_buf0
inx
sta path_buf0,x
sta $D8F7
sta str_1_char+1
jsr L6E45
inc path_buf0
stax $06
@ -2354,7 +2354,7 @@ L69D5: lda L6A17
lda winfo_entrydlg
jsr L62C8
MGTK_RELAY_CALL MGTK::MoveTo, $06
addr_call L5DED, $D8F6 ; null char
addr_call L5DED, str_1_char
addr_call L5DED, path_buf2
jsr L6EA3
rts
@ -2495,15 +2495,15 @@ L6B81: lda L6BC3
ldx path_buf1
inx
sta path_buf1,x
sta $D8F7
sta str_1_char+1
jsr L6E72
inc path_buf1
stax $06
copy16 $DAB4, $08
copy16 path_pos2+2, $08
lda winfo_entrydlg
jsr L62C8
MGTK_RELAY_CALL MGTK::MoveTo, $06
addr_call L5DED, $D8F6 ; null char
addr_call L5DED, str_1_char
addr_call L5DED, path_buf2
jsr L6E9F
rts
@ -2516,7 +2516,7 @@ L6BC3: .byte 0
L6BCA: dec path_buf1
jsr L6E72
stax $06
copy16 $DAB4, $08
copy16 path_pos2+2, $08
lda winfo_entrydlg
jsr L62C8
MGTK_RELAY_CALL MGTK::MoveTo, $06
@ -2544,7 +2544,7 @@ L6C17: ldx path_buf1
inc path_buf2
jsr L6E72
stax $06
copy16 $DAB4, $08
copy16 path_pos2+2, $08
lda winfo_entrydlg
jsr L62C8
MGTK_RELAY_CALL MGTK::MoveTo, $06

View File

@ -25,15 +25,15 @@ function verify {
}
function stats {
echo "$(printf '%-10s' $1)""$(../res/stats.pl < $1)"
echo "$(printf '%-15s' $1)""$(../res/stats.pl < $1)"
}
#do_make clean
do_make all
COMMON="loader mgtk desktop invoker ovl1 ovl1a ovl1b ovl1c ovl2"
TARGETS="$COMMON ovl34567"
SOURCES="sys $COMMON ovl3 ovl4 ovl5 ovl6 ovl7"
COMMON="loader mgtk invoker ovl1 ovl1a ovl1b ovl1c ovl2"
TARGETS="desktop $COMMON ovl34567"
SOURCES="sys desktop_main desktop_res desktop_aux $COMMON ovl3 ovl4 ovl5 ovl6 ovl7"
# Verify original and output match
echo "Verifying diffs:"