DeskTop: More overlay resource identifiers

This commit is contained in:
Joshua Bell 2018-05-06 10:09:31 -07:00
parent e894207778
commit a1c6736df2
3 changed files with 39 additions and 50 deletions

View File

@ -17,6 +17,7 @@
;;; Entry points in desktop_main ;;; Entry points in desktop_main
prompt_input_loop := $A567 prompt_input_loop := $A567
jump_relay := $A899
bell := $AACE bell := $AACE
set_cursor_watch := $B3E7 set_cursor_watch := $B3E7
set_cursor_pointer := $B403 set_cursor_pointer := $B403
@ -48,13 +49,13 @@ L080C: lda #$00
jsr L0D31 jsr L0D31
lda #$FF lda #$FF
sta $D887 sta $D887
L0832: copy16 #$0B48, $A89A L0832: copy16 #L0B48, jump_relay+1
lda #$80 lda #$80
sta $D8ED sta $D8ED
L0841: jsr prompt_input_loop L0841: jsr prompt_input_loop
bmi L0841 bmi L0841
pha pha
copy16 #$B8F4, $A89A copy16 #$B8F4, jump_relay+1
lda #$00 lda #$00
sta $D8F3 sta $D8F3
sta $D8ED sta $D8ED
@ -193,7 +194,7 @@ L09D9: lda #$00
jsr L0D31 jsr L0D31
lda #$FF lda #$FF
sta $D887 sta $D887
copy16 #$0B48, $A89A copy16 #L0B48, jump_relay+1
lda #$80 lda #$80
sta $D8ED sta $D8ED
L0A0E: jsr prompt_input_loop L0A0E: jsr prompt_input_loop
@ -203,7 +204,7 @@ L0A0E: jsr prompt_input_loop
L0A18: bit $D887 L0A18: bit $D887
bmi L0A0E bmi L0A0E
copy16 #$A898, $A89A copy16 #$A898, jump_relay+1
lda winfo_alert_dialog lda winfo_alert_dialog
jsr set_port_from_window_id jsr set_port_from_window_id
MGTK_RELAY_CALL MGTK::SetPenMode, pencopy MGTK_RELAY_CALL MGTK::SetPenMode, pencopy
@ -289,45 +290,45 @@ L0B31: pha
L0B46: .byte 0 L0B46: .byte 0
L0B47: .byte 0 L0B47: .byte 0
cmp16 $D20D, #$0028
bpl L0B57
return #$FF
L0B57: cmp16 $D20D, #$0168 ;;; ============================================================
bcc L0B66
return #$FF
L0B66: lda $D20F L0B48: cmp16 screentowindow_windowx, #40
bpl :+
return #$FF
: cmp16 screentowindow_windowx, #360
bcc :+
return #$FF
: lda screentowindow_windowy
sec sec
sbc #$2B sbc #43
sta $D20F sta screentowindow_windowy
lda $D210 lda screentowindow_windowy+1
sbc #$00 sbc #0
bpl L0B79 bpl :+
return #$FF return #$FF
: sta screentowindow_windowy+1
L0B79: sta $D210 lsr16 screentowindow_windowy
lsr16 $D20F lsr16 screentowindow_windowy
lsr16 $D20F lsr16 screentowindow_windowy
lsr16 $D20F lda screentowindow_windowy
lda $D20F
cmp #$04 cmp #$04
bcc L0B98 bcc L0B98
return #$FF return #$FF
L0B98: lda #$02 L0B98: lda #$02
sta L0C1F sta L0C1F
cmp16 $D20D, #$0118 cmp16 screentowindow_windowx, #280
bcs L0BBB bcs L0BBB
dec L0C1F dec L0C1F
cmp16 $D20D, #$00A0 cmp16 screentowindow_windowx, #160
bcs L0BBB bcs L0BBB
dec L0C1F dec L0C1F
L0BBB: lda L0C1F L0BBB: lda L0C1F
asl a asl a
asl a asl a
clc clc
adc $D20F adc screentowindow_windowy
cmp $D890 cmp $D890
bcc L0BDC bcc L0BDC
lda $D887 lda $D887

View File

@ -675,26 +675,14 @@ L96C8: MGTK_RELAY_CALL MGTK::InRect, rect_D700
lda #$01 lda #$01
L96EE: rts L96EE: rts
L96EF: lda $D20D L96EF: sub16 screentowindow_windowx, #10, screentowindow_windowx
sec sub16 screentowindow_windowy, #25, screentowindow_windowy
sbc #$0A
sta $D20D
lda $D20E
sbc #$00
sta $D20E
lda $D20F
sec
sbc #$19
sta $D20F
lda $D210
sbc #$00
sta $D210
bpl L9716 bpl L9716
return #$FF return #$FF
L9716: cmp16 $D20D, #$006E L9716: cmp16 screentowindow_windowx, #110
bmi L9736 bmi L9736
cmp16 $D20D, #$00DC cmp16 screentowindow_windowx, #220
bmi L9732 bmi L9732
lda #$02 lda #$02
bne L9738 bne L9738
@ -702,11 +690,11 @@ L9732: lda #$01
bne L9738 bne L9738
L9736: lda #$00 L9736: lda #$00
L9738: pha L9738: pha
lsr16 $D20F lsr16 screentowindow_windowy
lsr16 $D20F lsr16 screentowindow_windowy
lsr16 $D20F lsr16 screentowindow_windowy
lda $D20F lda screentowindow_windowy
cmp #$08 cmp #8
bcc L9756 bcc L9756
pla pla
return #$FF return #$FF
@ -716,7 +704,7 @@ L9756: pla
asl a asl a
asl a asl a
clc clc
adc $D20F adc screentowindow_windowy
sta L979C sta L979C
cmp #$08 cmp #$08
bcs L9782 bcs L9782

View File

@ -412,13 +412,13 @@ L74E1: MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::PaintRect, rect_D98E MGTK_RELAY_CALL MGTK::PaintRect, rect_D98E
rts rts
lda winfo_entrydlg L74F4: lda winfo_entrydlg
jsr common_overlay::L62C8 jsr common_overlay::L62C8
lda $D20A lda event_modifiers
bne L7500 bne L7500
rts rts
L7500: lda $D209 L7500: lda event_key
and #$7F and #$7F
cmp #'1' cmp #'1'
bne L750C bne L750C