From a1c6736df27447c4ee521659950385986cfdcba1 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Sun, 6 May 2018 10:09:31 -0700 Subject: [PATCH] DeskTop: More overlay resource identifiers --- desktop/ovl2.s | 51 +++++++++++++++++++++++++------------------------- desktop/ovl3.s | 32 ++++++++++--------------------- desktop/ovl7.s | 6 +++--- 3 files changed, 39 insertions(+), 50 deletions(-) diff --git a/desktop/ovl2.s b/desktop/ovl2.s index 9e2539a..adb47cf 100644 --- a/desktop/ovl2.s +++ b/desktop/ovl2.s @@ -17,6 +17,7 @@ ;;; Entry points in desktop_main prompt_input_loop := $A567 +jump_relay := $A899 bell := $AACE set_cursor_watch := $B3E7 set_cursor_pointer := $B403 @@ -48,13 +49,13 @@ L080C: lda #$00 jsr L0D31 lda #$FF sta $D887 -L0832: copy16 #$0B48, $A89A +L0832: copy16 #L0B48, jump_relay+1 lda #$80 sta $D8ED L0841: jsr prompt_input_loop bmi L0841 pha - copy16 #$B8F4, $A89A + copy16 #$B8F4, jump_relay+1 lda #$00 sta $D8F3 sta $D8ED @@ -193,7 +194,7 @@ L09D9: lda #$00 jsr L0D31 lda #$FF sta $D887 - copy16 #$0B48, $A89A + copy16 #L0B48, jump_relay+1 lda #$80 sta $D8ED L0A0E: jsr prompt_input_loop @@ -203,7 +204,7 @@ L0A0E: jsr prompt_input_loop L0A18: bit $D887 bmi L0A0E - copy16 #$A898, $A89A + copy16 #$A898, jump_relay+1 lda winfo_alert_dialog jsr set_port_from_window_id MGTK_RELAY_CALL MGTK::SetPenMode, pencopy @@ -289,45 +290,45 @@ L0B31: pha L0B46: .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 - sbc #$2B - sta $D20F - lda $D210 - sbc #$00 - bpl L0B79 + sbc #43 + sta screentowindow_windowy + lda screentowindow_windowy+1 + sbc #0 + bpl :+ return #$FF - -L0B79: sta $D210 - lsr16 $D20F - lsr16 $D20F - lsr16 $D20F - lda $D20F +: sta screentowindow_windowy+1 + lsr16 screentowindow_windowy + lsr16 screentowindow_windowy + lsr16 screentowindow_windowy + lda screentowindow_windowy cmp #$04 bcc L0B98 return #$FF L0B98: lda #$02 sta L0C1F - cmp16 $D20D, #$0118 + cmp16 screentowindow_windowx, #280 bcs L0BBB dec L0C1F - cmp16 $D20D, #$00A0 + cmp16 screentowindow_windowx, #160 bcs L0BBB dec L0C1F L0BBB: lda L0C1F asl a asl a clc - adc $D20F + adc screentowindow_windowy cmp $D890 bcc L0BDC lda $D887 diff --git a/desktop/ovl3.s b/desktop/ovl3.s index 009a204..e9f4b92 100644 --- a/desktop/ovl3.s +++ b/desktop/ovl3.s @@ -675,26 +675,14 @@ L96C8: MGTK_RELAY_CALL MGTK::InRect, rect_D700 lda #$01 L96EE: rts -L96EF: lda $D20D - sec - sbc #$0A - sta $D20D - lda $D20E - sbc #$00 - sta $D20E - lda $D20F - sec - sbc #$19 - sta $D20F - lda $D210 - sbc #$00 - sta $D210 +L96EF: sub16 screentowindow_windowx, #10, screentowindow_windowx + sub16 screentowindow_windowy, #25, screentowindow_windowy bpl L9716 return #$FF -L9716: cmp16 $D20D, #$006E +L9716: cmp16 screentowindow_windowx, #110 bmi L9736 - cmp16 $D20D, #$00DC + cmp16 screentowindow_windowx, #220 bmi L9732 lda #$02 bne L9738 @@ -702,11 +690,11 @@ L9732: lda #$01 bne L9738 L9736: lda #$00 L9738: pha - lsr16 $D20F - lsr16 $D20F - lsr16 $D20F - lda $D20F - cmp #$08 + lsr16 screentowindow_windowy + lsr16 screentowindow_windowy + lsr16 screentowindow_windowy + lda screentowindow_windowy + cmp #8 bcc L9756 pla return #$FF @@ -716,7 +704,7 @@ L9756: pla asl a asl a clc - adc $D20F + adc screentowindow_windowy sta L979C cmp #$08 bcs L9782 diff --git a/desktop/ovl7.s b/desktop/ovl7.s index 0b5a06f..a1cd8b0 100644 --- a/desktop/ovl7.s +++ b/desktop/ovl7.s @@ -412,13 +412,13 @@ L74E1: MGTK_RELAY_CALL MGTK::SetPenMode, penXOR MGTK_RELAY_CALL MGTK::PaintRect, rect_D98E rts - lda winfo_entrydlg +L74F4: lda winfo_entrydlg jsr common_overlay::L62C8 - lda $D20A + lda event_modifiers bne L7500 rts -L7500: lda $D209 +L7500: lda event_key and #$7F cmp #'1' bne L750C