SIF DA: Apply IIgs fixes

desk.acc/show.image.file.s

@@ -37,7 +37,7 @@ dst:    sta     start,y         ; self-modified
 call_main_trampoline   := $20 ; installed on ZP, turns off auxmem and calls...
 call_main_addr         := call_main_trampoline+7 ; address patched in here
 
-;;;  Copy the following "call_main_template" routine to $20
+;;; Copy the following "call_main_template" routine to $20
 .scope
         sta     RAMWRTON
         sta     RAMRDON
@@ -632,15 +632,19 @@ mode:   .byte   0               ; 0 = B&W, $80 = color
         lda     AN3_ON
         lda     AN3_OFF
 
+        ;; IIgs?
+        jsr     test_iigs
+        bcc     iigs
+
         ;; Le Chat Mauve - COL140 mode
         ;; (AN3 off, HR1 off, HR2 off, HR3 off)
+        ;; Skip on IIgs since emulators (KEGS/GSport/GSplus) crash.
         sta     HR2_OFF
         sta     HR3_OFF
+        bcs     done
 
         ;; Apple IIgs - DHR Color
-        jsr     test_iigs
-        bcs     done
-        lda     NEWVIDEO
+iigs:   lda     NEWVIDEO
         and     #<~(1<<5)        ; Color
         sta     NEWVIDEO
 
@@ -662,15 +666,19 @@ done:   rts
         sta     SET80VID
         lda     AN3_OFF
 
+        ;; IIgs?
+        jsr     test_iigs
+        bcc     iigs
+
         ;; Le Chat Mauve - BW560 mode
         ;; (AN3 off, HR1 off, HR2 on, HR3 on)
+        ;; Skip on IIgs since emulators (KEGS/GSport/GSplus) crash.
         sta     HR2_ON
         sta     HR3_ON
+        bcs     done
 
         ;; Apple IIgs - DHR B&W
-        jsr     test_iigs
-        bcs     done
-        lda     NEWVIDEO
+iigs:   lda     NEWVIDEO
         ora     #(1<<5)         ; B&W
         sta     NEWVIDEO
 
@@ -681,7 +689,7 @@ done:   rts
 .proc test_iigs
         lda     ROMIN2
         sec
-        jsr     $FE1F
+        jsr     ID_BYTE_FE1F
         lda     LCBANK1
         lda     LCBANK1
         rts

desk.acc/this.apple.s

@@ -539,7 +539,7 @@ iie_or_later:
         lda     #model::laser128
         bpl     done
 :       sec
-        jsr     $FE1F
+        jsr     ID_BYTE_FE1F
         bcs     :+
         lda     #model::iigs
         bpl     done

inc/apple2.inc

@@ -63,7 +63,7 @@ IRQ_VECTOR      := $3FE
 
 ID_BYTE_FBB3    := $FBB3        ; $06 = IIe or later
 ID_BYTE_FBC0    := $FBC0        ; $EA = IIe, $E0 = IIe enh/IIgs, $00 = IIc/IIc+
-ID_BYTE_FE1F    := $FE1F        ; RTS ($60) on pre-IIgs
+ID_BYTE_FE1F    := $FE1F        ; RTS ($60) on pre-IIgs, clears carry on IIgs
 
 
 ;;; ============================================================