From 49fb7c72dd06f4481fbc1fc83f314c6f98d4ec75 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Tue, 1 Jan 2019 11:47:03 -0800
Subject: [PATCH 1/2] disasm: Fix icon/mask rows

---
 desktop/desktop_res.s | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/desktop_res.s b/desktop/desktop_res.s
index 9c2334e..207b8f6 100644
--- a/desktop/desktop_res.s
+++ b/desktop/desktop_res.s
@@ -1551,9 +1551,9 @@ binary_icon:
         .byte   px(%0000000),px(%0000110),px(%0110000),px(%0000000)
         .byte   px(%0000000),PX(%0000001),px(%1000000),px(%0000000)
         .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
-        .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
 
 binary_mask:
+        .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
         .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
         .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
         .byte   px(%0000000),PX(%0000001),px(%1000000),px(%0000000)
@@ -1676,9 +1676,9 @@ basic_icon:
         .byte   px(%0000000),px(%0000110),px(%0110000),px(%0000000)
         .byte   px(%0000000),PX(%0000001),px(%1000000),px(%0000000)
         .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
-        .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
 
 basic_mask:
+        .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
         .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
         .byte   px(%0000000),px(%0000000),px(%0000000),px(%0000000)
         .byte   px(%0000000),PX(%0000001),px(%1000000),px(%0000000)

From 53230b59676e9ed98b3460ed6d88431b2d23e5b5 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Fri, 4 Jan 2019 19:20:20 -0800
Subject: [PATCH 2/2] disasm: various labels

---
 desktop.inc            | 14 +++++++-------
 desktop/desktop_main.s | 10 +++++-----
 desktop/desktop_res.s  |  9 ++++++++-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/desktop.inc b/desktop.inc
index 902c051..726c8ee 100644
--- a/desktop.inc
+++ b/desktop.inc
@@ -38,8 +38,8 @@ JUMP_TABLE_MAIN_LOOP    := $4000 ; Enter DeskTop main loop
 JUMP_TABLE_MGTK_RELAY   := $4003 ; MGTK relay call (main>aux)
 JUMP_TABLE_SIZE_STRING  := $4006 ; Compose "nnn Blocks" string into internal buffer
 JUMP_TABLE_DATE_STRING  := $4009 ; Compose date string into internal buffer
-JUMP_TABLE_0C           := $400C ; ???
-JUMP_TABLE_0F           := $400F ; Auxload
+JUMP_TABLE_SELECT_WINDOW:= $400C ; Select and refresh given window
+JUMP_TABLE_AUXLOAD      := $400F ; Auxload
 JUMP_TABLE_EJECT        := $4012 ; Eject command
 JUMP_TABLE_REDRAW_ALL   := $4015 ; Redraw all windows (e.g. after a drag) *
 JUMP_TABLE_DESKTOP_RELAY:= $4018 ; DESKTOP relay call (main>aux)
@@ -49,7 +49,7 @@ JUMP_TABLE_MLI          := $4021 ; ProDOS MLI call (Y=call, X,A=params addr) *
 JUMP_TABLE_COPY_TO_BUF  := $4024 ; Copy to buffer
 JUMP_TABLE_COPY_FROM_BUF:= $4027 ; Copy from buffer
 JUMP_TABLE_NOOP         := $402A ; No-Op command (RTS)
-JUMP_TABLE_2D           := $402D ; ??? (Draw type/size/date in non-icon views?)
+JUMP_TABLE_FILE_TYPE_STRING := $402D ; Compose file type string into internal buffer
 JUMP_TABLE_ALERT_0      := $4030 ; Show alert (A=err code, default options)
 JUMP_TABLE_ALERT_X      := $4033 ; Show alert X (A=err code, X=options)
 JUMP_TABLE_LAUNCH_FILE  := $4036 ; Launch file
@@ -210,10 +210,10 @@ icon_entry_open_mask    = %10000000
 icon_entry_type_mask    = %01110000
 icon_entry_winid_mask   = %00001111
 icon_entry_type_dir     = %00000000
-icon_entry_type_sys     = %00010000
-icon_entry_type_bin     = %00100000
-icon_entry_type_bas     = %00110000
-icon_entry_type_txt     = %01010000
+icon_entry_type_system  = %00010000
+icon_entry_type_binary  = %00100000
+icon_entry_type_basic   = %00110000
+icon_entry_type_generic = %01010000
 icon_entry_type_trash   = %01110000
 
 ;;; ============================================================
diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s
index 19e1a77..cf19732 100644
--- a/desktop/desktop_main.s
+++ b/desktop/desktop_main.s
@@ -3888,11 +3888,11 @@ handle_double_click:
         ldy     #IconEntry::win_type
         lda     ($06),y
         and     #icon_entry_type_mask
-        cmp     #icon_entry_type_sys
+        cmp     #icon_entry_type_system
         beq     L5E28
-        cmp     #icon_entry_type_bin
+        cmp     #icon_entry_type_binary
         beq     L5E28
-        cmp     #icon_entry_type_bas
+        cmp     #icon_entry_type_basic
         beq     L5E28
         cmp     #icon_entry_type_dir
         bne     :+
@@ -8383,7 +8383,7 @@ L8745:  copy    #4, str_file_type
         adc     #'0'            ; 0-9
         bne     L8767
 L8764:  clc
-        adc     #'7'            ; A-F
+        adc     #'A' - $A       ; A-F
 L8767:  sta     str_file_type+3
         lda     L877F
         and     #$0F
@@ -8393,7 +8393,7 @@ L8767:  sta     str_file_type+3
         adc     #'0'            ; 0-9
         bne     L877B
 L8778:  clc
-        adc     #'7'            ; A-F
+        adc     #'A' - $A       ; A-F
 L877B:  sta     path_buf4
         rts
 
diff --git a/desktop/desktop_res.s b/desktop/desktop_res.s
index 207b8f6..c49f3b4 100644
--- a/desktop/desktop_res.s
+++ b/desktop/desktop_res.s
@@ -1416,7 +1416,14 @@ type_table:
 
 icon_type_table:
         .byte   $60             ; unused?
-        .byte   $50,$50,$50,$20,$00,$10,$30,$10
+        .byte   icon_entry_type_generic
+        .byte   icon_entry_type_generic
+        .byte   icon_entry_type_generic
+        .byte   icon_entry_type_binary
+        .byte   icon_entry_type_dir
+        .byte   icon_entry_type_system
+        .byte   icon_entry_type_basic
+        .byte   icon_entry_type_system
 
 type_names:
         .byte   " ???"