From bbe9ff88964538767e22d17f6ce5cf50cc67dd7e Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Sat, 5 May 2018 23:40:37 -0700
Subject: [PATCH] DeskTop: More overlay resource identifiers

---
 desktop/desktop_res.s | 46 +++++++++++++++++++++++++++++++------------
 desktop/ovl3.s        | 16 +++++++--------
 desktop/ovl4.s        |  8 ++++----
 desktop/ovl7.s        | 10 +++++-----
 4 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/desktop/desktop_res.s b/desktop/desktop_res.s
index 42faf9d..e67dd63 100644
--- a/desktop/desktop_res.s
+++ b/desktop/desktop_res.s
@@ -592,9 +592,12 @@ never_label:
 enter_the_full_pathname_label2:
         PASCAL_STRING "Enter the full pathname of the run list file:"
 
-        .byte   $00,$00,$00,$00,$00,$00,$00
-        .byte   $00,$06,$00,$17,$00,$58,$01,$57
-        .byte   $00,$00
+rect_D877:
+        DEFINE_RECT 0,0,0,0
+
+rect_D87F:
+        DEFINE_RECT 6,23,344,87
+        .byte   0
 
 rect_D888:
         DEFINE_RECT 0,0,0,0
@@ -645,9 +648,11 @@ str_file_count:                 ; populated with number of files
 file_count:
         .word   0
 
-        .byte   $00,$00,$0D
-        .byte   $00,$00,$00,$00,$00,$7D,$00,$00
-        .byte   $00,$02,$00,$00,$00,$00,$00
+        .byte   $00,$00,$0D,$00
+
+rect_D90F:
+        DEFINE_RECT 0,0,125,0
+        .byte   $02,$00,$00,$00,$00,$00
 
 str_folder:
         PASCAL_STRING {GLYPH_FOLDERL,GLYPH_FOLDERR}
@@ -656,11 +661,21 @@ str_folder:
         .byte   $6B,$01,$30,$00,$6B,$01,$38,$00
         .byte   $57,$01,$4B,$00,$6B,$01,$53,$00
         .byte   $6B,$01,$5B,$00,$6B,$01,$63,$00
-        .byte   $5A,$01,$29,$00,$64,$01,$2F,$00
-        .byte   $5A,$01,$31,$00,$64,$01,$37,$00
-        .byte   $5A,$01,$4C,$00,$64,$01,$52,$00
-        .byte   $5A,$01,$54,$00,$64,$01,$5A,$00
-        .byte   $5A,$01,$5C,$00,$64,$01,$62,$00
+
+rect_D93E:
+        DEFINE_RECT 346,41,356,47
+
+rect_D946:
+        DEFINE_RECT 346,49,356,55
+
+rect_D94E:
+        DEFINE_RECT 346,76,356,82
+
+rect_D956:
+        DEFINE_RECT 346,84,356,90
+
+rect_D95E:
+        DEFINE_RECT 346,92,356,98
 
 rect_D966:
         DEFINE_RECT 346,41,480,48
@@ -708,8 +723,13 @@ rect_D9E8:
 
 rect_D9F0:  DEFINE_RECT 193,30,293,41
 
-        .byte   $43,$01,$1E,$00,$43,$01
-        .byte   $64,$00,$81,$D3,$00
+        ;; Endpoints of a line
+pos_D9F8:
+        DEFINE_POINT   323,30
+pos_D9FC:
+        DEFINE_POINT   323,100
+
+        .byte   $81,$D3,$00
 
 ok_button_pos:
         .word   198,99
diff --git a/desktop/ovl3.s b/desktop/ovl3.s
index 264947e..009a204 100644
--- a/desktop/ovl3.s
+++ b/desktop/ovl3.s
@@ -763,10 +763,10 @@ L97A0:  pha
 L97B2:  ldax    #$00D2
 L97B6:  clc
         adc     #$09
-        sta     $D877
+        sta     rect_D877
         txa
         adc     #$00
-        sta     $D878
+        sta     rect_D877+1
         pla
         cmp     #$08
         bcc     L97D4
@@ -783,14 +783,14 @@ L97D4:  asl     a
         asl     a
         clc
         adc     #$18
-        sta     $D879
+        sta     rect_D877+2
         lda     #$00
         adc     #$00
-        sta     $D87A
-        add16   $D877, #$006A, $D87B
-        add16   $D879, #$0007, $D87D
+        sta     rect_D877+3
+        add16   rect_D877, #106, rect_D877+4
+        add16   rect_D877+2, #7, rect_D877+6
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D877
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D877
         MGTK_RELAY_CALL MGTK::SetPenMode, pencopy
         rts
 
@@ -1011,7 +1011,7 @@ L99ED:  .byte   0
         .byte   0
         .byte   0
 L99F5:  MGTK_RELAY_CALL MGTK::SetPenMode, pencopy
-        MGTK_RELAY_CALL MGTK::PaintRect, $D87F
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D87F
         rts
 
         rts
diff --git a/desktop/ovl4.s b/desktop/ovl4.s
index 91bf423..572dbc4 100644
--- a/desktop/ovl4.s
+++ b/desktop/ovl4.s
@@ -1191,8 +1191,8 @@ L5CF7:  MGTK_RELAY_CALL MGTK::OpenWindow, winfo_entrydlg
         jsr     L5DA4
         jsr     L5DB5
         jsr     L5DC6
-        MGTK_RELAY_CALL MGTK::MoveTo, $D9F8
-        MGTK_RELAY_CALL MGTK::LineTo, $D9FC
+        MGTK_RELAY_CALL MGTK::MoveTo, pos_D9F8
+        MGTK_RELAY_CALL MGTK::LineTo, pos_D9FC
         MGTK_RELAY_CALL MGTK::InitPort, grafport3
         MGTK_RELAY_CALL MGTK::SetPort, grafport3
         rts
@@ -1495,7 +1495,7 @@ L606C:  .byte   0
 
 L606D:  lda     winfo_entrydlg_file_picker
         jsr     L62C8
-        MGTK_RELAY_CALL MGTK::PaintRect, $D60D
+        MGTK_RELAY_CALL MGTK::PaintRect, winfo_entrydlg_file_picker_cliprect
         lda     #$10
         sta     $D917
         lda     #$08
@@ -1719,7 +1719,7 @@ L6274:  ldx     #$00
         lda     winfo_entrydlg_file_picker
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D90F
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D90F
         MGTK_RELAY_CALL MGTK::InitPort, grafport3
         MGTK_RELAY_CALL MGTK::SetPort, grafport3
         rts
diff --git a/desktop/ovl7.s b/desktop/ovl7.s
index 8962e64..0b5a06f 100644
--- a/desktop/ovl7.s
+++ b/desktop/ovl7.s
@@ -131,11 +131,11 @@ L711D:  addr_call common_overlay::L5E6F, enter_the_full_pathname_label2
         MGTK_RELAY_CALL MGTK::MoveTo, $D93A
         addr_call common_overlay::L5DED, never_label
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::FrameRect, $D93E
-        MGTK_RELAY_CALL MGTK::FrameRect, $D946
-        MGTK_RELAY_CALL MGTK::FrameRect, $D94E
-        MGTK_RELAY_CALL MGTK::FrameRect, $D956
-        MGTK_RELAY_CALL MGTK::FrameRect, $D95E
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D93E
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D946
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D94E
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D956
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D95E
         MGTK_RELAY_CALL MGTK::InitPort, grafport3
         MGTK_RELAY_CALL MGTK::SetPort, grafport3
         rts