From 63a7bf730d1c2b8cc8e4869784283ef7e445e915 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Sat, 19 Jan 2019 14:37:27 -0800
Subject: [PATCH] disasm: labels for window/icon tables

---
 desktop.inc            |  4 ++++
 desktop/desktop_main.s | 10 +++++-----
 desktop/desktop_res.s  |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/desktop.inc b/desktop.inc
index 726c8ee..f888101 100644
--- a/desktop.inc
+++ b/desktop.inc
@@ -23,6 +23,10 @@ DA_MAX_SIZE     = DA_IO_BUFFER - DA_LOAD_ADDRESS
         ;; Can't load DA past I/O Buffer at MAIN $1C00,
         ;; but icon tables start at AUX $1B00 so can't clone there.
 
+;;; Memory in AUX - $80 bytes for desktop and 8 windows. First byte is a
+;;; count, up to 127 icon entries. $1F80-$1FFF is a map of used/free icon
+;;; numbers.
+WINDOW_ICON_TABLES := $1B00
 
         ;; Quit routine signature/data
         copied_to_ramcard_flag := $D3FF
diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s
index 71ab7de..447c7dd 100644
--- a/desktop/desktop_main.s
+++ b/desktop/desktop_main.s
@@ -15088,11 +15088,11 @@ end:
         sta     RAMWRTON
         lda     #$00
         tax
-loop:   sta     $1F00,x         ; window 8, icon use map
-        sta     $1E00,x         ; window 6, 7
-        sta     $1D00,x         ; window 4, 5
-        sta     $1C00,x         ; window 2, 3
-        sta     $1B00,x         ; window 0, 1 (0=desktop)
+loop:   sta     WINDOW_ICON_TABLES + $400,x         ; window 8, icon use map
+        sta     WINDOW_ICON_TABLES + $300,x         ; window 6, 7
+        sta     WINDOW_ICON_TABLES + $200,x         ; window 4, 5
+        sta     WINDOW_ICON_TABLES + $100,x         ; window 2, 3
+        sta     WINDOW_ICON_TABLES + $000,x         ; window 0, 1 (0=desktop)
         inx
         bne     loop
         sta     RAMWRTOFF
diff --git a/desktop/desktop_res.s b/desktop/desktop_res.s
index c789a77..b74ff8a 100644
--- a/desktop/desktop_res.s
+++ b/desktop/desktop_res.s
@@ -1368,12 +1368,12 @@ saved_event_coords: DEFINE_POINT 0, 0
 
 window_icon_count_table:
         .repeat 9,i
-        .addr   $1B00 + $80 * i
+        .addr   WINDOW_ICON_TABLES + $80 * i
         .endrepeat
 
 window_icon_list_table:
         .repeat 9,i
-        .addr   $1B00 + $80 * i + 1
+        .addr   WINDOW_ICON_TABLES + $80 * i + 1
         .endrepeat
 
 active_window_id: