From b57070fabc31e2b112a52ec19cea3e335e8ca4b2 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Thu, 3 May 2018 19:08:30 -0700
Subject: [PATCH] DeskTop: More overlay resource identifiers

---
 desktop/desktop_res.s | 65 +++++++++++++++++++++++-------
 desktop/ovl3.s        | 16 ++++----
 desktop/ovl4.s        | 92 +++++++++++++++++++++----------------------
 desktop/ovl7.s        | 18 ++++-----
 4 files changed, 113 insertions(+), 78 deletions(-)

diff --git a/desktop/desktop_res.s b/desktop/desktop_res.s
index 1d2cf11..f0ecc0f 100644
--- a/desktop/desktop_res.s
+++ b/desktop/desktop_res.s
@@ -530,7 +530,13 @@ dialog_label_pos:
 .endproc
 
         ;; ???
-        .byte   $00,$04,$00,$02,$00,$5A,$01,$6C,$00,$05,$00,$03,$00,$59,$01,$6B,$00,$06,$00,$16,$00,$58,$01,$16,$00,$06,$00,$59,$00,$58,$01,$59,$00,$D2,$00,$5C,$00,$36,$01,$67,$00,$28,$00,$5C,$00,$8C,$00,$67,$00,$D7,$00,$66,$00,$2D,$00,$66,$00,$82,$00,$07,$00,$DC,$00,$13,$00
+        .byte   $00,$04,$00,$02,$00,$5A,$01,$6C,$00,$05,$00,$03,$00,$59,$01,$6B,$00,$06,$00,$16,$00,$58,$01,$16,$00,$06,$00,$59,$00,$58,$01,$59,$00,$D2,$00,$5C,$00,$36,$01,$67,$00
+
+rect_D700:
+        DEFINE_RECT 40,92,140,103
+
+        .word   215,102,45,102
+        .word   130,7,220,19
 
 add_an_entry_label:
         PASCAL_STRING "Add an Entry ..."
@@ -632,25 +638,54 @@ str_folder:
         .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
-        .byte   $5A,$01,$29,$00,$E0,$01,$30,$00
-        .byte   $5A,$01,$31,$00,$E0,$01,$37,$00
-        .byte   $5A,$01,$4C,$00,$E0,$01,$53,$00
-        .byte   $5A,$01,$54,$00,$E0,$01,$5B,$00
-        .byte   $5A,$01,$5C,$00,$E0,$01,$63,$00
+
+rect_D966:
+        DEFINE_RECT 346,41,480,48
+
+rect_D96E:
+        DEFINE_RECT 346,49,480,55
+
+rect_D976:
+        DEFINE_RECT 346,76,480,83
+
+rect_D97E:
+        DEFINE_RECT 346,84,480,91
+
+rect_D986:
+        DEFINE_RECT 346,92,480,99
+
+rect_D98E:
+        DEFINE_RECT 0,0,0,0
+
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
-        .byte   $00,$00,$00,$00,$00,$00,$00,$00
-        .byte   $00,$00,$04,$00,$02,$00,$F0,$01
-        .byte   $97,$00,$1B,$00,$10,$00,$AE,$00
-        .byte   $1A,$00,$C1,$00,$3A,$00,$25,$01
-        .byte   $45,$00,$C1,$00,$59,$00,$25,$01
-        .byte   $64,$00,$C1,$00,$2C,$00,$25,$01
-        .byte   $37,$00,$C1,$00,$49,$00,$25,$01
-        .byte   $54,$00,$C1,$00,$1E,$00,$25,$01
-        .byte   $29,$00,$43,$01,$1E,$00,$43,$01
+        .byte   $00,$00
+
+rect_D9C0:
+        DEFINE_RECT 4,2,496,151
+
+rect_D9C8:
+        DEFINE_RECT 27,16,174,26
+
+rect_D9D0:
+        DEFINE_RECT 193,58,293,69
+
+
+rect_D9D8:
+        DEFINE_RECT 193,89,293,100
+
+rect_D9E0:
+        DEFINE_RECT 193,44,293,55
+
+rect_D9E8:
+        DEFINE_RECT 193,73,293,84
+
+rect_D9F0:  DEFINE_RECT 193,30,293,41
+
+        .byte   $43,$01,$1E,$00,$43,$01
         .byte   $64,$00,$81,$D3,$00
 
 ok_button_pos:
diff --git a/desktop/ovl3.s b/desktop/ovl3.s
index 32045ca..21d4e50 100644
--- a/desktop/ovl3.s
+++ b/desktop/ovl3.s
@@ -428,7 +428,7 @@ L9390:  MGTK_RELAY_CALL MGTK::OpenWindow, winfo_entry_picker
         MGTK_RELAY_CALL MGTK::SetPenMode, pencopy
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
         MGTK_RELAY_CALL MGTK::FrameRect, $D6F8
-        MGTK_RELAY_CALL MGTK::FrameRect, $D700
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D700
         jsr     L94A9
         jsr     L94BA
         lda     L938E
@@ -597,7 +597,7 @@ L95C5:  MGTK_RELAY_CALL MGTK::GetEvent, event_params
         sta     screentowindow_window_id
         MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
         MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx
-        MGTK_RELAY_CALL MGTK::InRect, $D700
+        MGTK_RELAY_CALL MGTK::InRect, rect_D700
         cmp     #MGTK::inrect_inside
         beq     L9602
         lda     L9645
@@ -609,7 +609,7 @@ L9602:  lda     L9645
         jmp     L95C5
 
 L960A:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D700
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D700
         lda     L9645
         clc
         adc     #$80
@@ -621,7 +621,7 @@ L9628:  lda     L9645
         return  #$FF
 
 L9630:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D700
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D700
         return  #$01
 
 L9645:  .byte   0
@@ -665,11 +665,11 @@ L9683:  lda     winfo_entry_picker
         lda     #$00
 L96C7:  rts
 
-L96C8:  MGTK_RELAY_CALL MGTK::InRect, $D700
+L96C8:  MGTK_RELAY_CALL MGTK::InRect, rect_D700
         cmp     #MGTK::inrect_inside
         bne     L96EF
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D700
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D700
         jsr     L95C0
         bmi     L96EE
         lda     #$01
@@ -835,9 +835,9 @@ L985E:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
         return  #$00
 
 L9885:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D700
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D700
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D700
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D700
         return  #$01
 
 L98AC:  lda     L938B
diff --git a/desktop/ovl4.s b/desktop/ovl4.s
index 85b3c40..36eef2d 100644
--- a/desktop/ovl4.s
+++ b/desktop/ovl4.s
@@ -147,7 +147,7 @@ L51D2:  lda     winfo_entrydlg
         sta     screentowindow_window_id
         MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
         MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx
-        MGTK_RELAY_CALL MGTK::InRect, $D9E0
+        MGTK_RELAY_CALL MGTK::InRect, rect_D9E0
         cmp     #MGTK::inrect_inside
         beq     L5200
         jmp     L5239
@@ -166,13 +166,13 @@ L5213:  jmp     L5308
 L5216:  lda     winfo_entrydlg
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E0
         jsr     L5888
         bmi     L5213
         jsr     L5607
         jmp     L5308
 
-L5239:  MGTK_RELAY_CALL MGTK::InRect, $D9F0
+L5239:  MGTK_RELAY_CALL MGTK::InRect, rect_D9F0
         cmp     #MGTK::inrect_inside
         beq     L5249
         jmp     L526B
@@ -180,13 +180,13 @@ L5239:  MGTK_RELAY_CALL MGTK::InRect, $D9F0
 L5249:  bit     L5105
         bmi     L5268
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9F0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9F0
         jsr     L590E
         bmi     L5268
         jsr     L565C
 L5268:  jmp     L5308
 
-L526B:  MGTK_RELAY_CALL MGTK::InRect, $D9D0
+L526B:  MGTK_RELAY_CALL MGTK::InRect, rect_D9D0
         cmp     #MGTK::inrect_inside
         beq     L527B
         jmp     L529D
@@ -194,32 +194,32 @@ L526B:  MGTK_RELAY_CALL MGTK::InRect, $D9D0
 L527B:  bit     L5105
         bmi     L529A
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D0
         jsr     L577C
         bmi     L529A
         jsr     L567F
 L529A:  jmp     L5308
 
-L529D:  MGTK_RELAY_CALL MGTK::InRect, $D9D8
+L529D:  MGTK_RELAY_CALL MGTK::InRect, rect_D9D8
         cmp     #MGTK::inrect_inside
         beq     L52AD
         jmp     L52CD
 
 L52AD:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D8
         jsr     L56F6
         bmi     L52CA
         jsr     L6D42
         jsr     L6D1E
 L52CA:  jmp     L5308
 
-L52CD:  MGTK_RELAY_CALL MGTK::InRect, $D9E8
+L52CD:  MGTK_RELAY_CALL MGTK::InRect, rect_D9E8
         cmp     #MGTK::inrect_inside
         beq     L52DD
         jmp     L52FA
 
 L52DD:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E8
         jsr     L5802
         bmi     L52F7
         jsr     L6D21
@@ -275,8 +275,8 @@ L5386:  ldx     $D920
         lda     winfo_entrydlg
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D8
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D8
         jsr     L6D1E
         jmp     L5340
 
@@ -285,8 +285,8 @@ L53B5:  and     #$7F
         lda     winfo_entrydlg
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E0
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E0
         lda     #$00
         sta     L542E
         copy16  #$1800, $08
@@ -622,7 +622,7 @@ L56FB:  MGTK_RELAY_CALL MGTK::GetEvent, event_params
         sta     screentowindow_window_id
         MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
         MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx
-        MGTK_RELAY_CALL MGTK::InRect, $D9D8
+        MGTK_RELAY_CALL MGTK::InRect, rect_D9D8
         cmp     #MGTK::inrect_inside
         beq     L5738
         lda     L577B
@@ -634,7 +634,7 @@ L5738:  lda     L577B
         jmp     L56FB
 
 L5740:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D8
         lda     L577B
         clc
         adc     #$80
@@ -646,7 +646,7 @@ L575E:  lda     L577B
         return  #$FF
 
 L5766:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D8
         return  #$00
 
 L577B:  .byte   0
@@ -660,7 +660,7 @@ L5781:  MGTK_RELAY_CALL MGTK::GetEvent, event_params
         sta     screentowindow_window_id
         MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
         MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx
-        MGTK_RELAY_CALL MGTK::InRect, $D9D0
+        MGTK_RELAY_CALL MGTK::InRect, rect_D9D0
         cmp     #MGTK::inrect_inside
         beq     L57BE
         lda     L5801
@@ -672,7 +672,7 @@ L57BE:  lda     L5801
         jmp     L5781
 
 L57C6:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D0
         lda     L5801
         clc
         adc     #$80
@@ -684,7 +684,7 @@ L57E4:  lda     L5801
         return  #$FF
 
 L57EC:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D0
         return  #$00
 
 L5801:  .byte   0
@@ -698,7 +698,7 @@ L5807:  MGTK_RELAY_CALL MGTK::GetEvent, event_params
         sta     screentowindow_window_id
         MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
         MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx
-        MGTK_RELAY_CALL MGTK::InRect, $D9E8
+        MGTK_RELAY_CALL MGTK::InRect, rect_D9E8
         cmp     #MGTK::inrect_inside
         beq     L5844
         lda     L5887
@@ -710,7 +710,7 @@ L5844:  lda     L5887
         jmp     L5807
 
 L584C:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E8
         lda     L5887
         clc
         adc     #$80
@@ -722,7 +722,7 @@ L586A:  lda     L5887
         return  #$FF
 
 L5872:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E8
         return  #$01
 
 L5887:  .byte   0
@@ -736,7 +736,7 @@ L588D:  MGTK_RELAY_CALL MGTK::GetEvent, event_params
         sta     screentowindow_window_id
         MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
         MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx
-        MGTK_RELAY_CALL MGTK::InRect, $D9E0
+        MGTK_RELAY_CALL MGTK::InRect, rect_D9E0
         cmp     #MGTK::inrect_inside
         beq     L58CA
         lda     L590D
@@ -748,7 +748,7 @@ L58CA:  lda     L590D
         jmp     L588D
 
 L58D2:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E0
         lda     L590D
         clc
         adc     #$80
@@ -760,7 +760,7 @@ L58F0:  lda     L590D
         return  #$FF
 
 L58F8:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E0
         return  #$00
 
 L590D:  .byte   0
@@ -774,7 +774,7 @@ L5913:  MGTK_RELAY_CALL MGTK::GetEvent, event_params
         sta     screentowindow_window_id
         MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
         MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx
-        MGTK_RELAY_CALL MGTK::InRect, $D9F0
+        MGTK_RELAY_CALL MGTK::InRect, rect_D9F0
         cmp     #MGTK::inrect_inside
         beq     L5950
         lda     L5993
@@ -786,7 +786,7 @@ L5950:  lda     L5993
         jmp     L5913
 
 L5958:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9F0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9F0
         lda     L5993
         clc
         adc     #$80
@@ -798,7 +798,7 @@ L5976:  lda     L5993
         return  #$FF
 
 L597E:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9F0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9F0
         return  #$01
 
 L5993:  .byte   0
@@ -887,8 +887,8 @@ L5A27:  cmp     #CHAR_TAB
         lda     winfo_entrydlg
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9F0
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9F0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9F0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9F0
         jsr     L565C
 L5A4F:  jmp     L5AC8
 
@@ -904,8 +904,8 @@ L5A52:  cmp     #$0F
 L5A64:  lda     winfo_entrydlg
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E0
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E0
         jsr     L5607
         jmp     L5AC8
 
@@ -914,8 +914,8 @@ L5A8B:  cmp     #$03
         lda     winfo_entrydlg
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D0
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D0
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D0
         jsr     L567F
         jmp     L5AC8
 
@@ -936,8 +936,8 @@ L5AC8:  jsr     L56E3
 L5ACC:  lda     winfo_entrydlg
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D8
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9D8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9D8
         jsr     L6D42
         jsr     L6D1E
         jsr     L56E3
@@ -946,8 +946,8 @@ L5ACC:  lda     winfo_entrydlg
 L5AF7:  lda     winfo_entrydlg
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E8
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9E8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9E8
         jsr     L6D21
         jsr     L56E3
         rts
@@ -1180,12 +1180,12 @@ L5CF7:  MGTK_RELAY_CALL MGTK::OpenWindow, winfo_entrydlg
         lda     winfo_entrydlg
         jsr     L62C8
         MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::FrameRect, $D9C0
-        MGTK_RELAY_CALL MGTK::FrameRect, $D9D8
-        MGTK_RELAY_CALL MGTK::FrameRect, $D9E0
-        MGTK_RELAY_CALL MGTK::FrameRect, $D9D0
-        MGTK_RELAY_CALL MGTK::FrameRect, $D9E8
-        MGTK_RELAY_CALL MGTK::FrameRect, $D9F0
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D9C0
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D9D8
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D9E0
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D9D0
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D9E8
+        MGTK_RELAY_CALL MGTK::FrameRect, rect_D9F0
         jsr     L5D82
         jsr     L5D93
         jsr     L5DA4
@@ -1626,7 +1626,7 @@ L61B0:  .byte   0
 
 L61B1:  lda     winfo_entrydlg
         jsr     L62C8
-        MGTK_RELAY_CALL MGTK::PaintRect, $D9C8
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D9C8
         copy16  #path_buf, $06
         ldy     #$00
         lda     ($06),y
diff --git a/desktop/ovl7.s b/desktop/ovl7.s
index 590ee09..8962e64 100644
--- a/desktop/ovl7.s
+++ b/desktop/ovl7.s
@@ -285,27 +285,27 @@ L737C:  lda     L7207+1,x
 L73A9:  .byte   0
 L73AA:  .byte   0
 
-        MGTK_RELAY_CALL MGTK::InRect, $D966
+        MGTK_RELAY_CALL MGTK::InRect, rect_D966
         cmp     #MGTK::inrect_inside
         bne     L73BB
         jmp     L73FE
 
-L73BB:  MGTK_RELAY_CALL MGTK::InRect, $D96E
+L73BB:  MGTK_RELAY_CALL MGTK::InRect, rect_D96E
         cmp     #MGTK::inrect_inside
         bne     L73CB
         jmp     L7413
 
-L73CB:  MGTK_RELAY_CALL MGTK::InRect, $D976
+L73CB:  MGTK_RELAY_CALL MGTK::InRect, rect_D976
         cmp     #MGTK::inrect_inside
         bne     L73DB
         jmp     L7428
 
-L73DB:  MGTK_RELAY_CALL MGTK::InRect, $D97E
+L73DB:  MGTK_RELAY_CALL MGTK::InRect, rect_D97E
         cmp     #MGTK::inrect_inside
         bne     L73EB
         jmp     L743D
 
-L73EB:  MGTK_RELAY_CALL MGTK::InRect, $D986
+L73EB:  MGTK_RELAY_CALL MGTK::InRect, rect_D986
         cmp     #MGTK::inrect_inside
         bne     L73FB
         jmp     L7452
@@ -381,13 +381,13 @@ L7493:  addr_call L749B, $D95E
 L749B:  stax    $06
         ldy     #7
 L74A1:  lda     ($06),y
-        sta     $D98E,y
+        sta     rect_D98E,y
         dey
         bpl     L74A1
-        lda     $D98E
+        lda     rect_D98E
         clc
         adc     #2
-        sta     $D98E
+        sta     rect_D98E
         bcc     L74B7
         inc     $D98F
 L74B7:  lda     $D990
@@ -409,7 +409,7 @@ L74D3:  lda     $D994
         bcs     L74E1
         dec     $D995
 L74E1:  MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
-        MGTK_RELAY_CALL MGTK::PaintRect, $D98E
+        MGTK_RELAY_CALL MGTK::PaintRect, rect_D98E
         rts
 
         lda     winfo_entrydlg