shave some bytes

src/id/d5d5f7.a

@@ -16,21 +16,19 @@
 ;      X,Y preserved
 ;      all other flags and registers clobbered
 ;-------------------------------
-!zone {
-IDD5D5F7
+!macro IDD5D5F7 {
          lda   #$08
          cmp   $08F2
-         beq   .yes       ; passport-test-suite/Trivia Fever (BB03 variant 3).woz [Z=1] matches
+         beq   @d5yes     ; passport-test-suite/Trivia Fever (BB03 variant 3).woz [Z=1] matches
          cmp   $084C
-         bne   .no
+         bne   @d5no
          lda   $08B0
          cmp   #$B6
-         bne   .no
+         bne   @d5no
          lda   $08D0
          cmp   #$20
-         bne   .no
-.yes     clc
-         !byte $24
-.no      sec
-         rts              ; passport-test-suite/RoboMath.woz [C=0] matches
+         bne   @d5no
+@d5yes   lda   #TRUE
+         sta   gPossibleD5D5F7 ; passport-test-suite/RoboMath.woz [Z=1] matches
+@d5no
 }

src/id/diversidos.a

@@ -10,17 +10,14 @@
 ;      all registers clobbered
 ;      all other flags clobbered
 ;-------------------------------
-!zone {
-IDDiversi
+!macro IDDiversi {
          lda   #$00
          ldx   #$F1
          ldy   #$0B
          jsr   compare    ; if T00,S00,$F1 ==
          !byte $B3,$A3,$A0,$D2,$CF,$D2,$D2,$C5,$8D,$87,$8D
-         bcs   .no
+         bcs   +          ; passport-test-suite/Moon Bingo.woz [C=0] matches
          ;lda   #TRUE
          sta   gIsDiversi
-
-.no
-         rts              ; passport-test-suite/Moon Bingo.woz [C=0] matches
++
 }

src/id/inspect0.a

@@ -85,14 +85,11 @@ IDBootloader
          bcs   .notdos33
          lda   #TRUE
          sta   gIsBoot0
-         jsr   IDD5D5F7
-         bcs   +
-         lda   #TRUE
-         sta   gPossibleD5D5F7
-+        jsr   IDDiversi
+         +IDD5D5F7
+         +IDDiversi
          lda   #s_diversidos
          bcc   .printdos
-         jsr   IDPronto
+         +IDPronto
          lda   #s_prontodos
          bcc   .printdos
          lda   #s_dosb0

src/id/prontodos.a

@@ -10,8 +10,7 @@
 ;      all registers clobbered
 ;      all other flags clobbered
 ;-------------------------------
-!zone {
-IDPronto
+!macro IDPronto {
          lda   #$00
          ldx   #$5E
          ldy   #$07
@@ -19,5 +18,5 @@ IDPronto
          !byte $B0,$50    ; BCS +$50
          !byte $AD,$CB,$B5; LDA $B5CB
          !byte $85,$42    ; STA $42
-         rts              ; passport-test-suite/America Coast to Coast.woz [C=0] matches
+                          ; passport-test-suite/America Coast to Coast.woz [C=0] matches
 }

src/passport.a

@@ -46,7 +46,6 @@ Relocatable
 NonRelocatable
          !source "apidefs.a"
          !source "strings/en.a"
-         !source "id/inspect0.a"
          !source "id/precheck.a"
          !source "id/trace.a"
          !source "id/trace33.a"
@@ -79,9 +78,10 @@ NonRelocatable
          !source "id/panglosdos.a"
          !source "id/davidson.a"
          !source "id/holle.a"
+         !source "id/bootfailure.a"
          !source "id/phoenix.a"
          !source "id/555.a"
-         !source "id/bootfailure.a"
+         !source "id/inspect0.a"
          !source "print.a"
          !source "compare.a"
          !source "modify.a"