shave some bytes

src/passport.a

@@ -283,34 +283,19 @@ AnalyzeTrack
          ; only run these modules in crack mode
          !source "patchers/universale7.a"
          !source "patchers/c9ff.a"
-         !source "patchers/a6bc95.a"            ; gIsPascal only
-         !source "patchers/a5count.a"           ; gIsPascal only
          !source "patchers/d5d5f7.a"            ; gIsPascal || (gIsBoot0 && gPossibleD5D5F7) only
-         !source "patchers/prodosrwts.a"        ; gIsProDOS only
-         !source "patchers/prodos6a.a"          ; gIsProDOS only
-         !source "patchers/prodosmecc.a"        ; gIsProDOS only
-         !source "patchers/bbf9.a"              ; gIsProDOS only
-         !source "patchers/memory.config.a"     ; gIsProDOS only
-         !source "patchers/origin.a"            ; gIsProDOS only
          !source "patchers/rwtsswapmecc.a"      ; gMECCFastloadType || gPossibleMECCSwapper only
          !source "patchers/meccdqc.a"           ; gMECCFastloadType==1 && gT07 only
          !source "patchers/rwtsswappenguin.a"   ; T01 only
          !source "patchers/protecteddos.a"      ; gIsProtDOS only
          !source "patchers/fbff.a"
-         !source "patchers/fbffencrypted.a"     ; gIsProDOS only
-         !source "patchers/fbffpascal.a"        ; gIsPascal only
-         !source "patchers/polarware.a"         ; gIsProDOS only
-         !source "patchers/sierra.a"            ; gIsBoot0 only
          !source "patchers/corrupter.a"         ; T13 only
          !source "patchers/ea.a"                ; gIsEA || gIsBoot0 only
          !source "patchers/gamco.a"             ; gPossibleGamco only
          !source "patchers/optimum.a"           ; gIsOptimum only
          !source "patchers/bootcounter.a"       ; T01 only
-         !source "patchers/jmpb412.a"           ; T02 only
          !source "patchers/jmp2012.a"           ; T02 only
-         !source "patchers/jmpb400.a"           ; T02 && gIsBoot0 only
          !source "patchers/advint.a"            ; gAdventureInternational only
-         !source "patchers/jsr8635.a"           ; gIsBoot0 only
          !source "patchers/jmpb4bb.a"           ; T02 only
          !source "patchers/dos32muse.a"         ; T01 && gIsDOS32 only
          !source "patchers/sra.a"               ; gIsDOS32 || gIsBoot0 only
@@ -325,20 +310,65 @@ AnalyzeTrack
          !source "patchers/ssi.a"               ; gIsRDOS13 only
          !source "patchers/rdosfmt.a"           ; gIsRDOS13 only
          !source "patchers/aacount.a"
-         !source "patchers/hallabs.a"           ; T01 only
          !source "patchers/holle.a"             ; gIsHolle only
          !source "patchers/zoomgrafix.a"        ; gIsPhoenix only
          !source "patchers/e7everywhere.a"      ; gIsBoot0 || gIsProDOS only
          !source "patchers/choplifter.a"        ; gIsChoplifter only
-         !source "patchers/pdi.a"               ; gIsDiversi only
-         !source "patchers/harvey.a"            ; T01 only
          !source "patchers/tsr.a"               ; T04 && gIsTSR only
          !source "patchers/woodbury.a"          ; gPossibleWoodbury only
-         !source "patchers/leisure.a"           ; gIsProDOS && T22 only
          !source "patchers/b4bbbasic.a"         ; gPossibleB4BBBasic only
          !source "patchers/errord51.a"          ; gIsLowDOS only
-         !source "patchers/sigcheck.a"          ; gIsDiversi only
          !source "patchers/555.a"               ; gIs555 only
+         ;
+         ; DOS 3.3-specific patchers
+         ;
+         lda   gIsBoot0
+         beq   +
+         jmp   _endDOS33Patchers
++
+         !source "patchers/hallabs.a"           ; gIsBoot0 && T01 only
+         !source "patchers/harvey.a"            ; gIsBoot0 && T01 only
+         !source "patchers/jmpb400.a"           ; gIsBoot0 && T02 only
+         !source "patchers/jmpb412.a"           ; gIsBoot0 && T02 only
+         !source "patchers/jsr8635.a"           ; gIsBoot0 only
+         !source "patchers/sierra.a"            ; gIsBoot0 only
+_endDOS33Patchers
+         ;
+         ; Diversi-DOS-specific patchers
+         ;
+         lda   gIsDiversi
+         bne   _endDiversiPatchers
+         !source "patchers/pdi.a"               ; gIsDiversi only
+         !source "patchers/sigcheck.a"          ; gIsDiversi only
+_endDiversiPatchers
+         ;
+         ; ProDOS-specific patchers
+         ;
+         lda   gIsProDOS
+         beq   +
+         jmp   _endProDOSPatchers
++
+         !source "patchers/bbf9.a"              ; gIsProDOS only
+         !source "patchers/fbffencrypted.a"     ; gIsProDOS only
+         !source "patchers/leisure.a"           ; gIsProDOS && T22 only
+         !source "patchers/memory.config.a"     ; gIsProDOS only
+         !source "patchers/origin.a"            ; gIsProDOS only
+         !source "patchers/polarware.a"         ; gIsProDOS only
+         !source "patchers/prodos6a.a"          ; gIsProDOS only
+         !source "patchers/prodosmecc.a"        ; gIsProDOS only
+         !source "patchers/prodosrwts.a"        ; gIsProDOS only
+_endProDOSPatchers
+         ;
+         ; Pascal-specific patchers
+         ;
+         lda   gIsPascal
+         beq   +
+         jmp   _endPascalPatchers
++
+         !source "patchers/a5count.a"           ; gIsPascal only
+         !source "patchers/a6bc95.a"            ; gIsPascal only
+         !source "patchers/fbffpascal.a"        ; gIsPascal only
+_endPascalPatchers
 
 _checkPatchCount
          lda   gPatchCount

src/patchers/a5count.a

@@ -5,8 +5,8 @@
 ; e.g. Game Frame One, Game Frame Two
 ;-------------------------------
 !zone {
-         lda   gIsPascal  ; only ever seen this protection
+         ; gIsPascal is TRUE here
-         bne   .exit      ; on Pascal disks
+         ; (only ever seen this protection on Pascal disks)
 
          ldy   #$0A
          jsr   SearchTrack

src/patchers/a6bc95.a

@@ -4,8 +4,8 @@
 ; e.g. The Secrets of Science Island
 ;-------------------------------
 !zone {
-         lda   gIsPascal  ; only ever seen this protection
+         ; gIsPascal is TRUE here
-         bne   .exit      ; on Pascal disks
+         ; (only ever seen this protection on Pascal disks)
 
          ldy   #$09
          jsr   SearchTrack

src/patchers/bbf9.a

@@ -16,8 +16,8 @@
 ; 1-2-3 Sequence Me (1991)
 ;-------------------------------
 !zone {
-         lda   gIsProDOS
+         ; gIsProDOS is TRUE here
-         bne   .exit
+
          ldy   #$08
          jsr   SearchTrack
          !byte $8E,$C0

src/patchers/fbffencrypted.a

@@ -22,8 +22,9 @@
 ;
 ;-------------------------------
 !zone {
-         lda   gIsProDOS             ; only seen this protection on ProDOS disks
+         ; gIsProDOS is TRUE here
-         bne   .exit
+         ; (only ever seen this protection on ProDOS disks)
+
          ldy   #$06
          jsr   SearchTrack           ; (all bytes are XOR #$FF)
          !byte $39,$FD               ; DEC $02

src/patchers/fbffpascal.a

@@ -1,5 +1,5 @@
 ;-------------------------------
-; #FBFF
+; #FBFFPASCAL
 ; a variant of Activision's Timing Bit Detection
 ; linked as an Apple Pascal module
 ; (soft switches are hard-coded to slot 6)
@@ -12,8 +12,8 @@
 ; Power Up! The Typewriter
 ;-------------------------------
 !zone {
-         lda   gIsPascal  ; only seen this protection on Pascal disks
+         ; gIsPascal is TRUE here
-         bne   .exit
+
          ldy   #$14
          jsr   SearchTrack
          !byte $AD,$E9,$C0; LDA $C0E9

src/patchers/hallabs.a

@@ -7,8 +7,8 @@
 ; Super Taxman II (HAL Labs)
 ;-------------------------------
 !zone {
-         lda   gIsBoot0
+         ; gIsBoot0 is TRUE here
-         bne   .exit
+
          ldx   gTrack
          dex
          bne   .exit

src/patchers/harvey.a

@@ -7,8 +7,6 @@
 ; Harvey by Primes (Queue)
 ;-------------------------------
 !zone {
-         lda   gIsBoot0
-         bne   .exit
          ldx   gTrack
          dex
          bne   .exit

src/patchers/jmpb400.a

@@ -14,8 +14,8 @@
 ; Success With Math - Multiplying and Dividing Fractions (1984, Mindscape)
 ;-------------------------------
 !zone {
-         lda   gIsBoot0
+         ; gIsBoot0 is TRUE here
-         bne   .exit
+
          lda   gTrack
          cmp   #$02
          bne   .exit

src/patchers/jmpb412.a

@@ -11,6 +11,8 @@
 ; America Coast to Coast (Mindscape release)
 ;-------------------------------
 !zone {
+         ; gIsBoot0 is TRUE here
+
          lda   gTrack
          cmp   #$02
          bne   .exit

src/patchers/jsr8635.a

@@ -12,8 +12,8 @@
 ; First Steps to Reading: Phonics II (1985, Grolier)
 ;-------------------------------
 !zone {
-         lda   gIsBoot0
+         ; gIsBoot0 is TRUE here
-         bne   .exit
+
          lda   #$0F
          sta   .sector+1
 .sector  lda   #$FF       ; modified at runtime

src/patchers/leisure.a

@@ -7,8 +7,8 @@
 ; - Risk v1.4 (Leisure Genius)
 ;-------------------------------
 !zone {
-         lda   gIsProDOS
+         ; gIsProDOS is TRUE here
-         bne   .exit
+
          lda   gTrack
          cmp   #$22
          bne   .exit

src/patchers/memory.config.a

@@ -18,8 +18,8 @@
 ; GeoWhiz (1990, Silver Burdett and Ginn)
 ;-------------------------------
 !zone {
-         lda   gIsProDOS  ; only if ProDOS
+         ; gIsProDOS is TRUE here
-         bne   .exit
+
          ldy   #$0C
          jsr   SearchTrack
          !byte $AE,$C3,$CF,$CE,$C6,$C9,$C7      ; ".CONFIG"

src/patchers/origin.a

@@ -12,8 +12,8 @@
 ; - Ultima V
 ;-------------------------------
 !zone {
-         lda   gIsProDOS  ; only if ProDOS
+         ; gIsProDOS is TRUE here
-         bne   .exit
+
          lda   #$0F
          sta   .sector+1
 .sector  lda   #$FF       ; modified at runtime

src/patchers/pdi.a

@@ -11,8 +11,9 @@
 ; - Leadsheeter Utilities
 ;-------------------------------
 !zone {
-         lda   gIsDiversi  ; only seen this protection on Diversi-DOS disks
+         ; gIsDiversi is TRUE here
-         bne   .exit
+         ; (only ever seen this protection on Diversi-DOS disks)
+
          ldy   #14
          jsr   SearchTrack
          !byte $A0,$0F     ; LDY #$0F

src/patchers/polarware.a

@@ -15,8 +15,8 @@
 ;
 ;-------------------------------
 !zone {
-         lda   gIsProDOS             ; only seen this protection on ProDOS disks
+         ; gIsProDOS is TRUE here
-         bne   .exit
+
          ldy   #$06
          jsr   SearchTrack           ; (all bytes are XOR #$EF)
          !byte $29,$6D               ; DEC $82

src/patchers/prodos6a.a

@@ -7,8 +7,8 @@
 ; so we get a nice CRACK COMPLETE message)
 ;-------------------------------
 !zone {
-         lda   gIsProDOS  ; only if ProDOS (separate check for DOS)
+         ; gIsProDOS is TRUE here
-         bne   .exit
+
          lda   #$0F
          sta   .sector+1
 .sector  lda   #$FF       ; modified at runtime

src/patchers/prodosmecc.a

@@ -5,10 +5,8 @@
 ; [thanks LoGo]
 ;-------------------------------
 !zone {
-         lda   gIsProDOS
+         ; gIsProDOS is TRUE here
-         beq   +
+
-         jmp   .exit
-+
          ldy   #$0E
          jsr   SearchTrack
          !byte $50,$54,$58,$5C,$60,$64,$68,$00

src/patchers/prodosrwts.a

@@ -5,8 +5,8 @@
 ;-------------------------------
 !zone {
 _prodosrwts
-         lda   gIsProDOS
+         ; gIsProDOS is TRUE here
-         bne   .exit
+
          ldy   #$14
          jsr   SearchTrack
          !byte $29,$FC

src/patchers/sierra.a

@@ -377,8 +377,8 @@
          jmp   .exit
 
 .dosearch
-         lda   gIsBoot0
+         ; gIsBoot0 is TRUE here
-         bne   .jmpexit
+
          ldy   #15
          jsr   SearchTrack
          !byte $CE,WILDCARD,WILDCARD ;DEC $xxxx

src/patchers/sigcheck.a

@@ -8,8 +8,8 @@
 ; - Projectile and Circular Motion
 ;-------------------------------
 !zone {
-         lda   gIsDiversi ; only ever seen this protection
+         ; gIsDiversi is TRUE here
-         bne   .exit      ; on Diversi-DOS disks
+         ; (only ever seen this protection on Diversi-DOS disks)
 
          ldy   #$0A
          jsr   SearchTrack

src/patchers/t02volumename.a

@@ -3,11 +3,11 @@
 ; print disk volume name and number after reading track 2
 ;-------------------------------
 !zone {
+         ; gIsBoot0 is TRUE here
+
          lda   gTrack
          cmp   #$02
          bne   .exit
-         lda   gIsBoot0
-         bne   .exit
          lda   #$00                  ; look for volume name on T02,S00 (Pronto-DOS)
          jsr   .findVolumeName
          bcc   +                     ; passport-test-suite/America Coast to Coast.woz [C=0] matches

src/strings/en.a

@@ -341,7 +341,7 @@ StringTableHigh
 .passport
          !text "Passport ",$00
 .header
-         !text "@",s_passport,"by 4am@",s_space7,"@",s_space7," 2021-06-14",$00
+         !text "@",s_passport,"by 4am@",s_space7,"@",s_space7," 2021-06-16",$00
 .bar9
          !text "_________",$00
 .bar18