From 26d3d39ba2bb07864dac3dbc38667cbeb589069f Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Thu, 22 Feb 2018 15:18:28 -0800
Subject: [PATCH] branding

---
 src/onbeyond/z4/z4.s   | 47 ++++++++++++++++++++++++-----------
 src/onbeyond/z5/z5.s   | 56 +++++++++++++++++++++++++++---------------
 src/onbeyond/z5u/z5u.s | 56 +++++++++++++++++++++++++++---------------
 3 files changed, 104 insertions(+), 55 deletions(-)

diff --git a/src/onbeyond/z4/z4.s b/src/onbeyond/z4/z4.s
index c46839e..48cbb7a 100644
--- a/src/onbeyond/z4/z4.s
+++ b/src/onbeyond/z4/z4.s
@@ -12,6 +12,8 @@ ver_02 = 1
 !to "build/ONBEYONDZ4",plain
 *=$3000
 
+!macro version {!text "1/180221"}
+
 xsechi=$b1
 xseclo=$b0
 xside=$e7
@@ -369,12 +371,12 @@ slot            lda     $cfff
 skip80
                 lda     #$2c
                 sta     call80
-                lda     #$88
-                sta     bspace+1
                 lda     #$df
                 sta     inversemask+1
                 lda     #7
                 sta     $dde0
+                lda     #$28
+                sta     $f433
 
 okay80
                 lda     $301
@@ -416,6 +418,11 @@ skipupper
                 dey
                 bne     -
 
+                lda     #<brand
+                sta     $ddf0
+                lda     #>brand
+                sta     $ddf1
+
                 ldy     $2006
                 inc     $2006
                 lda     #'V'
@@ -449,6 +456,22 @@ call80          jsr     $c300
                 sta     $37
                 rts
 
+brand           jsr     $dbda
+                lda     #$17
+                sta     $25
+                lda     #0
+                sta     $24
+                sta     $57b
+                jsr     $fc22
+                lda     #>brandtext
+                ldx     #<brandtext
+                ldy     #(brandtext_e-brandtext)
+                jmp     $dbda
+
+brandtext       !text   "On Beyond Z-Machine! revision "
+                +version
+brandtext_e
+
 !if load_aux = 1 {
                 sta     CLRAUXWR + (load_banked * 4) ;CLRAUXWR or CLRAUXZP
 } ;load_aux
@@ -1460,27 +1483,21 @@ unrentry = unrelochdd + (* + 1 - reloc)
                 jmp     $d1d1
 
 casemap
-        cmp     #8
-        beq     bspace
+        ora     #$80
         cmp     #$e1
-        bcc     +
+        bcc     printchar
         cmp     #$fb
-        bcs     +
+        bcs     printchar
 normalmask
         and     #$ff
-+       ldy     $32
+        sty     $35
+        ldy     $32
         bmi     +
-        cmp     #$e1
-        bcc     +
-        cmp     #$fb
-        bcs     +
 inversemask
         and     #$ff
-        !byte   $2c
-bspace
-        lda     #8
++       ldy     $35
 printchar
-+       jmp     $d1d1
+        jmp     $d1d1
 
 hddcodeend
   !if swap_zp = 1 {
diff --git a/src/onbeyond/z5/z5.s b/src/onbeyond/z5/z5.s
index 6b95642..0dfc64a 100644
--- a/src/onbeyond/z5/z5.s
+++ b/src/onbeyond/z5/z5.s
@@ -12,6 +12,8 @@ ver_02 = 1
 !to "build/ONBEYONDZ5",plain
 *=$3000
 
+!macro version {!text "1/180221"}
+
 xsechi=$b7
 xseclo=$b6
 xside=$eb
@@ -364,12 +366,12 @@ slot            lda     $cfff
 skip80
                 lda     #$2c
                 sta     call80
-                lda     #$88
-                sta     bspace+1
                 lda     #$df
                 sta     inversemask+1
                 lda     #7
                 sta     $dda6
+                lda     #$28
+                sta     $ded0
 
 okay80
                 lda     $301
@@ -411,6 +413,11 @@ skipupper
                 dey
                 bne     -
 
+                lda     #<brand
+                sta     $ddb6
+                lda     #>brand
+                sta     $ddb7
+
                 ldy     $2006
                 inc     $2006
                 lda     #'V'
@@ -444,6 +451,22 @@ call80          jsr     $c300
                 sta     $37
                 rts
 
+brand           jsr     $db5b
+                lda     #$17
+                sta     $25
+                lda     #0
+                sta     $24
+                sta     $57b
+                jsr     $8a9
+                lda     #>brandtext
+                ldx     #<brandtext
+                ldy     #(brandtext_e-brandtext)
+                jmp     $db5b
+
+brandtext       !text   "On Beyond Z-Machine! revision "
+                +version
+brandtext_e
+
 !if load_aux = 1 {
                 sta     CLRAUXWR + (load_banked * 4) ;CLRAUXWR or CLRAUXZP
 } ;load_aux
@@ -1564,30 +1587,23 @@ hdddataend
   } ;verbose_info
 } ;PASS2
 
-xcasemap !pseudopc $2dc {;;-(callback_e-callback1) {
+xcasemap !pseudopc $2e7 {;;-(callback_e-callback1) {
 casemap
-        cmp     #8
-        beq     bspace
-        cmp     #$e1
-        bcc     +
-        cmp     #$fb
-        bcs     +
-normalmask
-        and     #$ff
-+       ldy     $32
-        bmi     +
         ora     #$80
         cmp     #$e1
-        bcc     +
+        bcc     printchar
         cmp     #$fb
-        bcs     +
+        bcs     printchar
+normalmask
+        and     #$ff
+        sty     $35
+        ldy     $32
+        bmi     +
 inversemask
         and     #$ff
-        !byte   $2c
-bspace
-        lda     #8
++       ldy     $35
 printchar
-+       jmp     $d1d1
+        jmp     $d1d1
 casemap_e
 }
 !if verbose_info = 1 {
@@ -1745,7 +1761,7 @@ readpart        lda     istree
 save_end
 
 hookkbd
-!pseudopc $2aa {;;-(callback_e-callback1) {
+!pseudopc $2b5 {;;-(callback_e-callback1) {
 callback1
                 ldx     #<callback2
                 lda     #$8d
diff --git a/src/onbeyond/z5u/z5u.s b/src/onbeyond/z5u/z5u.s
index 2b4292a..252be32 100644
--- a/src/onbeyond/z5u/z5u.s
+++ b/src/onbeyond/z5u/z5u.s
@@ -12,6 +12,8 @@ ver_02 = 1
 !to "build/ONBEYONDZ5U",plain
 *=$3000
 
+!macro version {!text "1/180221"}
+
 xsechi=$b6
 xseclo=$b5
 xside=$ec
@@ -364,12 +366,12 @@ slot            lda     $cfff
 skip80
                 lda     #$2c
                 sta     call80
-                lda     #$88
-                sta     bspace+1
                 lda     #$df
                 sta     inversemask+1
                 lda     #7
                 sta     $dd9e
+                lda     #$28
+                sta     $dea8
 
 okay80
                 lda     $301
@@ -411,6 +413,11 @@ skipupper
                 dey
                 bne     -
 
+                lda     #<brand
+                sta     $ddae
+                lda     #>brand
+                sta     $ddaf
+
                 ldy     $2006
                 inc     $2006
                 lda     #'V'
@@ -444,6 +451,22 @@ call80          jsr     $c300
                 sta     $37
                 rts
 
+brand           jsr     $db53
+                lda     #$17
+                sta     $25
+                lda     #0
+                sta     $24
+                sta     $57b
+                jsr     $8a9
+                lda     #>brandtext
+                ldx     #<brandtext
+                ldy     #(brandtext_e-brandtext)
+                jmp     $db53
+
+brandtext       !text   "On Beyond Z-Machine! revision "
+                +version
+brandtext_e
+
 !if load_aux = 1 {
                 sta     CLRAUXWR + (load_banked * 4) ;CLRAUXWR or CLRAUXZP
 } ;load_aux
@@ -1564,30 +1587,23 @@ hdddataend
   } ;verbose_info
 } ;PASS2
 
-xcasemap !pseudopc $2dc {;;-(callback_e-callback1) {
+xcasemap !pseudopc $2e7 {;;-(callback_e-callback1) {
 casemap
-        cmp     #8
-        beq     bspace
-        cmp     #$e1
-        bcc     +
-        cmp     #$fb
-        bcs     +
-normalmask
-        and     #$ff
-+       ldy     $32
-        bmi     +
         ora     #$80
         cmp     #$e1
-        bcc     +
+        bcc     printchar
         cmp     #$fb
-        bcs     +
+        bcs     printchar
+normalmask
+        and     #$ff
+        sty     $35
+        ldy     $32
+        bmi     +
 inversemask
         and     #$ff
-        !byte   $2c
-bspace
-        lda     #8
++       ldy     $35
 printchar
-+       jmp     $d1d1
+        jmp     $d1d1
 casemap_e
 }
 !if verbose_info = 1 {
@@ -1745,7 +1761,7 @@ readpart        lda     istree
 save_end
 
 hookkbd
-!pseudopc $2aa {;;-(callback_e-callback1) {
+!pseudopc $2b5 {;;-(callback_e-callback1) {
 callback1
                 ldx     #<callback2
                 lda     #$8d