From 86940aa19a35c6591f53af9e98260ddda4d92fe2 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Mon, 3 Sep 2018 17:43:36 -0700
Subject: [PATCH] Don't poke Le Chat Mauve addresses on IIgs to avoid emulator
 crash. Fixes #85

---
 desktop/desktop_main.s | 11 +++++++----
 desktop/res/go.sh      | 17 -----------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s
index fee6944..ded6309 100644
--- a/desktop/desktop_main.s
+++ b/desktop/desktop_main.s
@@ -14380,15 +14380,19 @@ iigs_flag:                      ; High bit set if IIgs detected.
         sta     SET80VID
         sta     AN3_OFF
 
+        ;; IIgs ?
+        bit     iigs_flag
+        bmi     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
+        bmi     end
 
         ;; Force B&W mode on the IIgs
-        bit     iigs_flag
-        bpl     end
-        lda     NEWVIDEO
+iigs:   lda     NEWVIDEO
         ora     #(1<<5)         ; B&W
         sta     NEWVIDEO
         ;; fall through
@@ -15302,7 +15306,6 @@ config_toolkit:
         jmp     MGTK::MLI
 .endproc
 
-        .assert * = $0F60, error, "Segment length mismatch"
         PAD_TO $1000
 
 .endproc ; desktop_800
diff --git a/desktop/res/go.sh b/desktop/res/go.sh
index 12d1549..43c77cf 100755
--- a/desktop/res/go.sh
+++ b/desktop/res/go.sh
@@ -5,16 +5,6 @@
 set -e
 source "../res/util.sh"
 
-function verify {
-    diff "orig/$1" "out/$2" \
-        && (cecho green "diff $2 good" ) \
-        || (tput blink ; cecho red "DIFF $2 BAD" ; return 1)
-}
-
-function stats {
-    echo "$(printf '%-15s' $1)""$(../res/stats.pl < $1)"
-}
-
 #do_make clean
 do_make all
 
@@ -22,13 +12,6 @@ COMMON="loader mgtk"
 TARGETS="$COMMON desktop"
 SOURCES="$COMMON desktop_main desktop_res desktop_aux invoker ovl1 ovl1a ovl1b ovl1c ovl2 ovl3 ovl4 ovl5 ovl6 ovl7"
 
-# Verify original and output match
-echo "Verifying diffs:"
-for t in $TARGETS; do
-    verify "DESKTOP2_$t" "$t.built"
-done;
-verify "DESKTOP2.\$F1" "DESKTOP2.built"
-
 # Compute stats
 echo "Stats:"
 for t in $SOURCES; do