From 3f99d8f14cb8a78fd75951b742c6095213fe84fe Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Mon, 12 Apr 2021 17:38:08 -0400
Subject: [PATCH] further refactoring (Trace33P should actually do what I want
 now)

---
 src/id/precheck.a | 17 +++++++++++++----
 src/id/trace33.a  | 12 ------------
 src/id/trace33p.a |  3 ++-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/id/precheck.a b/src/id/precheck.a
index f7be3a6..cc414b4 100644
--- a/src/id/precheck.a
+++ b/src/id/precheck.a
@@ -1,3 +1,15 @@
+precheck_sectors
+         ; This list is (re)initialized in IDBootloader,
+         ; then potentially altered in IDDOS33 and elsewhere.
+         ; Values are logical sector numbers.
+         ; There are always 16 (0x10) values in this list.
+         ; Negative values are ignored.
+         ; Positive values are treated as logical
+         ; sector numbers and read from track $00.
+         ; Sectors are read in the order listed here.
+         !byte $09,$08,$07,$06,$05,$04,$03,$02,$01
+         !byte $00,$FF,$FE,$FD,$FC,$FB,$FA,$F9,$F8
+
 ;-------------------------------
 ; PreCheckT00
 ;
@@ -7,10 +19,7 @@
 ; the sectors we're about to trace are actually readable.
 ;
 ; Before calling this function, you need to set all 16
-; bytes of the precheck_sectors array to a positive
-; number (check that sector) or a negative number (don't
-; check that sector). The array is ordered by logical
-; sectors, regardless of the type of disk.
+; bytes of the precheck_sectors array (see above for format).
 ;
 ; If all required sectors are readable by Passport's own
 ; sector read routine, this exits gracefully with all
diff --git a/src/id/trace33.a b/src/id/trace33.a
index 780c74b..17e11d2 100755
--- a/src/id/trace33.a
+++ b/src/id/trace33.a
@@ -13,18 +13,6 @@ TraceDOS33
          ldx   #>TraceDOS33b
          jmp   Trace
 
-precheck_sectors
-         ; This list is (re)initialized in IDBootloader,
-         ; then potentially altered in IDDOS33.
-         ; Values are logical sector numbers.
-         ; There are always 16 (0x10) values in this list.
-         ; Negative values are ignored.
-         ; Positive values are treated as logical
-         ; sector numbers and read from track $00.
-         ; Sectors are read in the order listed here.
-         !byte $09,$08,$07,$06,$05,$04,$03,$02,$01
-         !byte $00,$FF,$FE,$FD,$FC,$FB,$FA,$F9,$F8
-
 ;-------------------------------
 ; TraceDOS33b
 ; set up 2nd boot trace at $084A
diff --git a/src/id/trace33p.a b/src/id/trace33p.a
index d0de372..8a5226a 100755
--- a/src/id/trace33p.a
+++ b/src/id/trace33p.a
@@ -38,7 +38,8 @@ TraceSpecDel
          dex
          bpl   -
          inc   precheck_sectors
-         inc   precheck_sectors+7
+         lda   #$07
+         inc   precheck_sectors+1
          jsr   PreCheckT00
 
          jsr   ClearTSBuffer