shave some bytes

src/id/datasoft.a

@@ -12,10 +12,11 @@
 ; - Tomahawk
 ; - Video Title Shop
 ;-------------------------------
-IDDatasoft
+!macro IDDatasoft {
          lda   #$00
          tax
          ldy   #$08
          jsr   compare
          !byte $01,$4C,$7E,$08,$04,$8A,$0C,$B8
-         rts              ; passport-test-suite/Tomahawk.woz [C=0] matches
+                          ; passport-test-suite/Tomahawk.woz [C=0] matches
+}

src/id/daviddos.a

@@ -9,8 +9,7 @@
 ;      all registers clobbered
 ;      all other flags clobbered
 ;-------------------------------
-!zone {
-IDDavid
+!macro IDDavid {
          lda   #$00
          ldx   #$01
          ldy   #$06
@@ -18,14 +17,11 @@ IDDavid
          !byte $A5,$27    ; LDA $27
          !byte $C9,$09    ; CMP #$09
          !byte $D0,$17    ; BNE +$17
-         bcs   .exit
+         bcs   @notDavid
          ldx   #$4A
-         ldy   #$0B
          jsr   compare    ; and T00,S00,$4A ==
          !byte $A2,WILDCARD    ; LDX #$**
          !byte $BD,WILDCARD,$08; LDA $08**,X
-         !byte $9D,WILDCARD,$04; STA $04**,X
-         !byte $CA        ; DEX
-         !byte $10,$F7    ; BPL -
-.exit    rts              ; passport-test-suite/Horses.woz [C=0] matches
+         !byte $9D
+@notDavid                 ; passport-test-suite/Horses.woz [C=0] matches
 }

src/id/inspect0.a

@@ -257,7 +257,8 @@ IDBootloader
 ;
 ; David-DOS II
 ;
-+        jsr   IDDavid
++
+         +IDDavid
          bcs   +
          jsr   PrintByID
          !byte s_daviddos
@@ -266,7 +267,8 @@ IDBootloader
 ;
 ; Encrypted Datasoft bootloader
 ;
-+        jsr   IDDatasoft
++
+         +IDDatasoft
          bcs   +
          jsr   PrintByID
          !byte s_datasoftb0