From de06a51d057e8a82ad0213285aac69ca36f8d0fa Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Tue, 29 Apr 2025 03:41:02 +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

---
 For_4x.asm      |  4 ++--
 Shared_Includes |  2 +-
 spectrum.asm    | 49 +++++++++++++++++++++++++++++++++++--------------
 version.inc     |  5 +++--
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/For_4x.asm b/For_4x.asm
index ee5af6e..f9c8c48 100644
--- a/For_4x.asm
+++ b/For_4x.asm
@@ -185,10 +185,10 @@ BPB_SetUp:	LD	A,SYS_PAGE
 		DEC	D
 		JR	NZ,.NEXT_ADD3
 
-		LD	(SYS_PAGE.CLASTER_LEN),HL
+		LD	(SYS_PAGE.CLUSTER_LEN),HL
 		LD	B,E
 		LD	C,A
-		LD	(SYS_PAGE.CLASTER_LEN2),BC
+		LD	(SYS_PAGE.CLUSTER_LEN2),BC
 		;
 		; DE=0
 		EX	DE,HL	;LD HL,0
diff --git a/Shared_Includes b/Shared_Includes
index e0dd54c..68e156a 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit e0dd54cb5615a23ea55bd217578aab57481fcf77
+Subproject commit 68e156a69e848e7b01656cdf67122022999d75ee
diff --git a/spectrum.asm b/spectrum.asm
index ad566a4..939da65 100644
--- a/spectrum.asm
+++ b/spectrum.asm
@@ -77,6 +77,16 @@
 ;***************************************
 ;
 
+ DEFINE	EXEinfoMACRO
+ MACRO _mEXEinfo
+	BLOCK   10,' '	; Выравнивание для красивого отображения в HEX  
+	BYTE    'Spectrum launcher'
+	BYTE    ' by Ivan Mak and '
+	BYTE    '    Anatoliy    '
+	BYTE    '   Belyanskiy,  '
+	BYTE    ' Sprinter Team  '
+ ENDM
+
 ;
 ; Standart EQU section
 ;***************************************
@@ -175,6 +185,7 @@ BEGIN:		LD	(LINE_X),IX
 		CALL	READ_CNF_FILE
 	; SetUp ZX
 		CALL	PARSE_PARAMETERS
+		CALL	SHOW_MESSAGE_ZXMODE
 		CALL	COUNT_vROM_PAGES
 		PUSH	AF
 		; Очищаем память, если ROM_BIN > 0
@@ -296,7 +307,7 @@ READ_IMAGE:	LD	DE,ONE_FILE
 		 LD	BC,Dss.EX_Path.GET_ALL
 		 RST	ToDSS
 		 JR	C,.no_change_Disk
-		 AND	8
+		 AND	8			;!HARDCODE В строке указано имя диска
 		 JR	Z,.currentDisk
 		 ;
 		 LD	C,Dss.CurDisk
@@ -1179,19 +1190,31 @@ LOADING_PALETTE:
 
 
 ;░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░;
-SHOW_MESSAGE_OK_CFG_NAME:
-		;	файлы считаны
-		LD	HL,MSG_NORMAL
+SHOW_MESSAGE_ZXMODE:
+		LD	HL,MSG_MODE
 		LD	C,Dss.PChars
 		RST	ToDSS
 		;
 		LD	HL,(ADDRESS_LINES + (CFG_FILE_LINES.NAME-1)*2)
 		LD	C,Dss.PChars
 		RST	ToDSS
-		;
 		LD	HL,CR_LINE
 		LD	C,Dss.PChars
+		RST	ToDSS	
+		RET
+SHOW_MESSAGE_OK_CFG_NAME:
+		;	файлы считаны
+		LD	HL,MSG_NORMAL
+		LD	C,Dss.PChars
 		RST	ToDSS
+		;
+		; LD	HL,(ADDRESS_LINES + (CFG_FILE_LINES.NAME-1)*2)
+		; LD	C,Dss.PChars
+		; RST	ToDSS
+		; ;
+		; LD	HL,CR_LINE
+		; LD	C,Dss.PChars
+		; RST	ToDSS
 		LD	A,(SAVE_SLOT3)
 		OUT	(SLOT3),A
 		RET
@@ -1470,11 +1493,9 @@ LEN_LINE_ZX		EQU	$-LINE_ZX
 MSG_EXIT1:		DB 13,10,	"EXIT without run",13,10,0
 ;MSG_EXIT2:		DB 13,10,	"Выход без запуска"
 CR_LINE:		DB 13,10,0
-START_MSG:		DB 13,10,	'SPECTRUM launcher v',SP_VERSION,'.'
-			DB 13,10,	'(c) Sprinter Team.'
-			DB 13,10,	'Written by Ivan Mak.'
-			DB 13,10,	'Modified by Anatoliy Belyanskiy.'
-			DB 13,10,BUILD_DATE,' - ',__TIME__,13,10,0
+START_MSG:		DB 13,10,	'SPECTRUM launcher v',SP_VERSION,'. (c) Sprinter Team.'
+			DB 13,10,BUILD_DATE,' - ',__TIME__
+			DB 13,10,	'Keys: ',0
 ERROR_FILE_MSG_X:	DB 13,10,	"Error in file: ",0
 ;ERROR_FILE2_MSG_X:	DB 13,10,	"Ошибка в файле: ",0
 ERROR_FILE_MSG:		DB 13,10,	"Unable to work.",0
@@ -1485,9 +1506,9 @@ NO_MEM_MSG:		DB 13,10,	"Not enough free memory pages for ZX mode."
 			DB 13,10,	"Clear the memory and restart spectrum.exe again.",0
 ;NO_MEM_MSG2:		DB 13,10,	"Специальные страницы уже заняты."
 ;			DB 13,10,	"Очистите память и перезапустите spectrum.exe снова.",0
-MSG_NORMAL:		DB 13,10,	"All files has been read successfully.",13,10
-			DB 		"MODE: ",0
-;MSG_NORMAL2:		DB 13,10,	"Все файлы считаны нормально.",13,10
+MSG_NORMAL:		DB 13,10,	"All files has been read successfully.\r\n",0
+;MSG_NORMAL2:		DB 13,10,	"Все файлы считаны нормально.\r\n\r\n",0
+MSG_MODE:		DB 		"\r\nMODE: ",0
 ;			DB 		"Конфигурация: ",0
 MSG_NO_MEM:		DB 13,10,	"No memory space for image or",0
 ;MSG_NO_MEM2:		DB 13,10,	"Не хватает памяти для образа или",0
@@ -1498,7 +1519,7 @@ MSG_ZX_EXIT:		DB 13,10,	"EXIT from Spectrum mode",13,10,0
 ;MSG_ZX_EXIT2:		DB 13,10,	"EXIT from ZX mode",0
 MSG_NO_ZX_FLAG:		DB 13,10,	'Error: Necessary ROM images are missing in the CNF file and in RAM!!!'
 			DB 13,10,	'       Run "spectrum.exe norun.zx" with the required set of ZX ROMs.',13,10,0
-MSG_OLD_DSS:		DB 13,10,	'To run this version of SPECTRUM launcher you need DSS v1.70.998 or higher.',13,10,0
+MSG_OLD_DSS:		DB 13,10,	'To run this version of SPECTRUM launcher you need DSS v',NEED_MIN_DSS_VERSION,' or higher.',13,10,0
 PROGRES_IND:		DB '░',0						; 176
 PROGRES_100:		DB ' 100%',13,10,0
 
diff --git a/version.inc b/version.inc
index 1fa0715..c1c80ef 100644
--- a/version.inc
+++ b/version.inc
@@ -6,8 +6,9 @@
 
 	DEFINE SP_VERSION "2.03 beta build"
 ;
+ 	DEFINE NEED_MIN_DSS_VERSION '1.71.36'
 DSS_MIN_VERS:
 .vers			EQU	1
-.modf			EQU	70
-.build			EQU	998
+.modf			EQU	71
+.build			EQU	36
 ;
\ No newline at end of file