From 9e7fcdf9eaa9c7dbbe762bca216602f8ab588f9e Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Thu, 11 Jul 2019 15:08:14 -0700
Subject: [PATCH] Key Caps DA: Fix IIc+ test

---
 desk.acc/key.caps.s | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/desk.acc/key.caps.s b/desk.acc/key.caps.s
index f2350f7..97f5a91 100644
--- a/desk.acc/key.caps.s
+++ b/desk.acc/key.caps.s
@@ -803,14 +803,21 @@ char:   .byte   0
         rts
 :
 
-        ;; Is IIgs?
+        ;; Bank in ROM and do check
         lda     ROMIN2
-        sec
+        jsr     check
+        lda     LCBANK1
+        lda     LCBANK1
+        rts
+
+        ;; --------------------------------------------------
+        ;; Do the check (with ROM banked in)
+
+        ;; Is IIgs?
+check:  sec
         jsr     ID_BYTE_FE1F    ; Clears carry if IIgs
-        lda     LCBANK1
-        lda     LCBANK1
         bcs     :+              ; No, carry still set
-        sec
+        sec                     ; Yes, is a IIgs
         rts
 
         ;; Is IIc+?
@@ -819,10 +826,10 @@ char:   .byte   0
         lda     ID_BYTE_FBBF    ; $05 = IIc Plus
         cmp     #$05
         bne     done
-        sec
+        sec                     ; Yes, is a IIc+
         rts
 
-done:   clc
+done:   clc                     ; No - older layout
         rts
 .endproc