From 41be0d85e2abdf5880dfc49030ef5972c3621f1d Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Wed, 2 May 2018 12:13:36 -0700
Subject: [PATCH] cleanup

---
 src/onbeyond/z4/z4.s   | 3 ---
 src/onbeyond/z5/z5.s   | 7 +++++--
 src/onbeyond/z5u/z5u.s | 7 +++++--
 src/zinfo/z1/z1.s      | 4 ----
 src/zinfo/z2/z2.s      | 4 ----
 src/zinfo/z3/z3.s      | 4 ----
 6 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/onbeyond/z4/z4.s b/src/onbeyond/z4/z4.s
index d033b29..cf16785 100644
--- a/src/onbeyond/z4/z4.s
+++ b/src/onbeyond/z4/z4.s
@@ -352,7 +352,6 @@ slot            lda     $cfff
                 sta     $300	;80-cols
                 ldx     #1
                 stx     $301	;lowercase
-                stx     $305	;warn about missing .sav
                 dex
                 dex
                 stx     $302	;no load
@@ -515,8 +514,6 @@ brand           jsr     $dbda
                 ldx     #<brandtext
                 ldy     #(brandtext_e-brandtext)
                 jsr     $dbda
-                lda     $305
-                beq     +
                 lda     $300
                 cmp     #$38
                 bne     +
diff --git a/src/onbeyond/z5/z5.s b/src/onbeyond/z5/z5.s
index b26812f..4f06c62 100644
--- a/src/onbeyond/z5/z5.s
+++ b/src/onbeyond/z5/z5.s
@@ -444,9 +444,10 @@ skipupper
 
                 ;skip suffix handling if not present
 
+                ldx     #0
                 ldy     $2006
                 lda     $2006-2,y
-                cmp     '.'
+                cmp     #'.'
                 bne     ++
                 inc     $2006
                 lda     #'V'
@@ -476,7 +477,9 @@ skipupper
                 sta     $2006,y
                 lda     #'Z'
                 sta     $2006-1,y
-++              jsr     hddopendir
+                ldx     $305
+++              stx     $305
+                jsr     hddopendir
                 jmp     entry
 
 call80          jsr     $c300
diff --git a/src/onbeyond/z5u/z5u.s b/src/onbeyond/z5u/z5u.s
index 2ed723a..717eef8 100644
--- a/src/onbeyond/z5u/z5u.s
+++ b/src/onbeyond/z5u/z5u.s
@@ -444,9 +444,10 @@ skipupper
 
                 ;skip suffix handling if not present
 
+                ldx     #0
                 ldy     $2006
                 lda     $2006-2,y
-                cmp     '.'
+                cmp     #'.'
                 bne     ++
                 inc     $2006
                 lda     #'V'
@@ -476,7 +477,9 @@ skipupper
                 sta     $2006,y
                 lda     #'Z'
                 sta     $2006-1,y
-++              jsr     hddopendir
+                ldx     $305
+++              stx     $305
+                jsr     hddopendir
                 jmp     entry
 
 call80          jsr     $c300
diff --git a/src/zinfo/z1/z1.s b/src/zinfo/z1/z1.s
index 4f1042a..fe1eb71 100644
--- a/src/zinfo/z1/z1.s
+++ b/src/zinfo/z1/z1.s
@@ -59,11 +59,7 @@ zp_E7    =    $E7
 zero_info
     ldy    #name_offset
     sty    zpage_ptr
-    !if name_offset=0 {
     tya
-    } else {
-    lda    #0
-    }
     sta    (zpage_info),y
     clc
     lda    zpage_info
diff --git a/src/zinfo/z2/z2.s b/src/zinfo/z2/z2.s
index a88747d..3001325 100644
--- a/src/zinfo/z2/z2.s
+++ b/src/zinfo/z2/z2.s
@@ -61,11 +61,7 @@ zp_E9    =    $e9
 zero_info
     ldy    #name_offset
     sty    zpage_ptr
-    !if name_offset=0 {
     tya
-    } else {
-    lda    #0
-    }
     sta    (zpage_info),y
     clc
     lda    zpage_info
diff --git a/src/zinfo/z3/z3.s b/src/zinfo/z3/z3.s
index 3d35f0f..b27af1b 100644
--- a/src/zinfo/z3/z3.s
+++ b/src/zinfo/z3/z3.s
@@ -68,11 +68,7 @@ zp_DC    =    $dc
 zero_info
     ldy    #name_offset
     sty    zpage_ptr
-    !if name_offset=0 {
     tya
-    } else {
-    lda    #0
-    }
     sta    (zpage_info),y
     clc
     lda    zpage_info