From bc1413f28dd632da03e2ca463a659ecfb634cd12 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Tue, 29 Apr 2025 03:41:19 +1000
Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B5=D0=BB=D0=BE=D1=87=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SP_TRDOS.ASM       |  2 +-
 Shared_Includes    |  2 +-
 TRDOS/TR_MSD_S.ASZ | 18 ++++++++----------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/SP_TRDOS.ASM b/SP_TRDOS.ASM
index 66cfe14..fe2fd16 100644
--- a/SP_TRDOS.ASM
+++ b/SP_TRDOS.ASM
@@ -6428,7 +6428,7 @@ READR_X:
 
 NEW_NAME:
         DB      22,1,3,	"* Sprinter TR-DOS v.7.03 *"
-        DB      22,3,6,   "(c) 2024 Sprinter Team"
+        DB      22,3,6,   "(c) 2025 Sprinter Team"
         DB      22,5,14,          "*R.F.*"
         DB      22,7,9,      "BETA 4Mb",0
 
diff --git a/Shared_Includes b/Shared_Includes
index 9143dcb..68e156a 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit 9143dcb7f8fd9cd3ae0bc179b94fced5efd8667f
+Subproject commit 68e156a69e848e7b01656cdf67122022999d75ee
diff --git a/TRDOS/TR_MSD_S.ASZ b/TRDOS/TR_MSD_S.ASZ
index c45bd2e..a7e7010 100644
--- a/TRDOS/TR_MSD_S.ASZ
+++ b/TRDOS/TR_MSD_S.ASZ
@@ -113,7 +113,9 @@ MSD_cmd5:
 	EX AF,AF'
 	JR MSD_RWU1
 MSD_cmd6:
-	LD A,255
+	; A=0
+	;LD A,255
+	DEC A
 	LD (ZX_VARS.RD_WR_COM),A
 	EX AF,AF'
 	JR MSD_RWU1
@@ -128,7 +130,7 @@ PREPARE1:
 	OUT (SLOT2),A
 
 	LD A,(SYS_PAGE.DS_1440-4000H)
-	AND BIT_MASK_1440
+	AND SYS_PAGE.DS_1440.IS_SET
 	SET 0,A
 	LD (SYS_PAGE.DS_1440-4000H),A
 	LD A,C
@@ -345,18 +347,14 @@ SWITCH_DT:
 	LD A,(SYS_PAGE.DS_1440-4000H)
 	BIT 0,A
 	JR Z,NO_SW_DT
-	XOR BIT_MASK_1440
+	XOR SYS_PAGE.DS_1440.IS_SET
 	LD (SYS_PAGE.DS_1440-4000H),A
-	AND BIT_MASK_1440
+	AND SYS_PAGE.DS_1440.IS_SET
 	LD A,C
 	OUT (SLOT2),A
 	EI
-	;!TEST
-	 ;CALL Z,RES_1440
-	 ;CALL NZ,SET_1440
-	 ;RET
-	 JR	Z,RES_1440
-	 JR	SET_1440
+	JR	Z,RES_1440
+	JR	SET_1440
 	;
 NO_SW_DT:
 	LD A,C