From 51e1ea8a0cc6c329fd536d81fe8aa3dae6e12d05 Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Thu, 8 Apr 2021 16:22:30 -0400
Subject: [PATCH] even more string consolidation

---
 src/id/trace32.a       |  2 ++
 src/patchers/dakin5.a  |  1 +
 src/patchers/diskvol.a |  1 +
 src/patchers/jmpb660.a |  1 +
 src/patchers/jmpbcf0.a |  1 +
 src/patchers/jmpbeca.a |  1 +
 src/patchers/rol1e.a   |  1 +
 src/strings/en.a       | 14 +++++++-------
 8 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/id/trace32.a b/src/id/trace32.a
index 86ab9b4..b29ffbc 100644
--- a/src/id/trace32.a
+++ b/src/id/trace32.a
@@ -321,6 +321,8 @@ TraceDOS32d
          jsr   CompareMemory
          !byte $20,$DD
          bcs   +          ; passport-test-suite/Robotwar.woz [C=0] matches
+         lda   #$08
+         sta   gDisplayBytes
          lda   #s_muse
          jsr   PrintByID
 
diff --git a/src/patchers/dakin5.a b/src/patchers/dakin5.a
index bc84dbe..2c8a3ac 100644
--- a/src/patchers/dakin5.a
+++ b/src/patchers/dakin5.a
@@ -35,6 +35,7 @@
          JMP   $B6B3
          bcs   .exit      ; passport-test-suite/MIRV.woz [C=0] matches
          pha
+         sta   gDisplayBytes
          lda   #s_dakin5
          jsr   PrintByID
          pla
diff --git a/src/patchers/diskvol.a b/src/patchers/diskvol.a
index 316c1c5..a77de67 100755
--- a/src/patchers/diskvol.a
+++ b/src/patchers/diskvol.a
@@ -60,6 +60,7 @@
          bcs   .exit
 
 .veryyes
+         sta   gDisplayBytes
          lda   #s_diskvol
          jsr   PrintByID  ; preserves X
 
diff --git a/src/patchers/jmpb660.a b/src/patchers/jmpb660.a
index 774c9ef..3796f67 100755
--- a/src/patchers/jmpb660.a
+++ b/src/patchers/jmpb660.a
@@ -27,6 +27,7 @@ _jmpb660
          !byte $A0,$56
          !byte $4C,$60,$B6
          bcs   .exit      ; passport-test-suite/Analogies Tutorial.woz [C=0] matches
+         sta   gDisplayBytes
          lda   #s_jmpb660
          jsr   PrintByID
          lda   #$02
diff --git a/src/patchers/jmpbcf0.a b/src/patchers/jmpbcf0.a
index c568ddc..7e926ff 100755
--- a/src/patchers/jmpbcf0.a
+++ b/src/patchers/jmpbcf0.a
@@ -18,6 +18,7 @@ _jmpbcf0
          !byte $D0,$A9
          !byte $4C,$F0,$BC
          bcs   .exit      ; passport-test-suite/Easy as ABC.woz [C=0] matches
+         sta   gDisplayBytes
          lda   #s_jmpbcf0
          jsr   PrintByID
          lda   #$03
diff --git a/src/patchers/jmpbeca.a b/src/patchers/jmpbeca.a
index 985d2ed..245f24f 100755
--- a/src/patchers/jmpbeca.a
+++ b/src/patchers/jmpbeca.a
@@ -35,6 +35,7 @@
          bcs   .exit      ; passport-test-suite/Library Magic.woz [C=0] matches
 
 .yes
+         sta   gDisplayBytes
          lda   #s_jmpbeca ; passport-test-suite/Spelling Rules.woz [C=0] also reaches here
          jsr   PrintByID
          lda   #$02
diff --git a/src/patchers/rol1e.a b/src/patchers/rol1e.a
index fcf6f08..4b71333 100755
--- a/src/patchers/rol1e.a
+++ b/src/patchers/rol1e.a
@@ -30,6 +30,7 @@ _rol1e
          jsr   compare    ; and T00,S03,$64 ==
          !byte $A5,$1E
          bcs   .exit      ; passport-test-suite/Crypto Cube.woz [C=0] matches
+         sta   gDisplayBytes
          lda   #s_rol1e
          jsr   PrintByID
          lda   #$03
diff --git a/src/strings/en.a b/src/strings/en.a
index 61686ed..9cada14 100755
--- a/src/strings/en.a
+++ b/src/strings/en.a
@@ -463,11 +463,11 @@ StringTableHigh
 .a6bc95
          !text "@",s_found,"A6BC95 @",s_protectioncheck,$8D,$00
 .jmpbcf0
-         !text "T00,S03 RWTS requires a timing bit after"
+         !text "@",s_rwts,"requires a timing bit after"
          !text "the first data epilogue by jumping to",$8D
          !text "$BCF0.",$8D,$00
 .rol1e
-         !text "T00,S03 RWTS accumulates timing bits in",$8D
+         !text "@",s_rwts,"accumulates timing bits in",$8D
          !text "$1E and checks its value later.",$8D,$00
 .runhello
          !text "T%t,S%0 Startup program executes a",$8D
@@ -476,7 +476,7 @@ StringTableHigh
 .e7
          !text "@",s_found,"E7 bitstream",$8D,$00
 .jmpbeca
-         !text "T00,S02 RWTS requires extra nibbles and",$8D
+         !text "@",s_rwts,"requires extra nibbles and",$8D
          !text "timing bits after the data prologue by",$8D
          !text "jumping to $BECA.",$8D,$00
 .bb03
@@ -489,7 +489,7 @@ StringTableHigh
          !text "T00,S0D Disk calls a @",s_protectioncheck," at"
          !text "$AE8E after initializing DOS.",$8D,$00
 .diskvol
-         !text "T00,S08 RWTS requires a non-standard",$8D
+         !text "@",s_rwts,"requires a non-standard",$8D
          !text "disk volume number.",$8D,$00
 .d5d5f7
          !text "%",s_found,"D5D5F7 @",s_protectioncheck,$8D,$00
@@ -506,7 +506,7 @@ StringTableHigh
          !text "@",s_rwts,"accepts $DE or a timing bit"
          !text "for the first address epilogue nibble.",$8D,$00
 .jmpb660
-         !text "T00,S02 RWTS requires timing bits after",$8D
+         !text "@",s_rwts,"requires timing bits after",$8D
          !text "the data prologue by jumping to $B660.",$8D,$00
 .protdos
          !text "@",s_found,"encrypted RWTS, key=$%1",$8D,$00
@@ -593,12 +593,12 @@ StringTableHigh
 .sra
          !text "@",s_found,"SRA @",s_protectioncheck,$8D,$00
 .muse
-         !text "T00,S08 RWTS doubles every sector ID",$8D,$00
+         !text "@",s_rwts,"doubles every sector ID",$8D,$00
 .origin
          !text "@",s_rwts,"alters the sector ID if the"
          !text "address epilogue contains a timing bit.",$8D,$00
 .dakin5
-         !text "T00,S03 RWTS XORs every sector ID",$8D,$00
+         !text "@",s_rwts,"XORs every sector ID",$8D,$00
 .volumename
          !text "T%t,S%0 Volume name is ",$00
 .dinkeydos