From cc2f5ec57be6cc539f588ef62db2137c2b19ac7a Mon Sep 17 00:00:00 2001
From: Anatoliy Belyanskiy <tolik.trek@gmail.com>
Date: Mon, 26 Jun 2023 02:54:36 +1000
Subject: [PATCH] some refactoring

---
 SP_TRDOS.ASM       |  1 +
 Shared_Includes    |  2 +-
 TRDOS/TR_MSD_2.ASZ | 15 +++++++--------
 TRDOS/TR_MSD_3.ASZ |  8 ++++----
 TRDOS/TR_MSD_S.ASZ |  4 ++--
 TRDOS/TR_RMD_S.ASZ | 20 ++++++++++----------
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/SP_TRDOS.ASM b/SP_TRDOS.ASM
index b5105f3..cf9b774 100644
--- a/SP_TRDOS.ASM
+++ b/SP_TRDOS.ASM
@@ -3,6 +3,7 @@
 ;����������������������������������������������������������Ķ
 ;�      RE-SOURCE'd by Z80MU PROFESSIONAL version 5.2b      �
 ;����������������������������������������������������������ͼ
+;!TODO �ᯮ�짮���� ���譨� ����� #E0 � #E3 ��� ��࠭���� ॣ���஢ �� ���墠� ��直� #3D2F
 	DEVICE 	ZXSPECTRUM128
         ORG     0
 
diff --git a/Shared_Includes b/Shared_Includes
index 81f727c..fc7af6f 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit 81f727ca6ecd8fcaaac4f4e573fe1fd6578c1efa
+Subproject commit fc7af6fc40d61e9f8e626b39a8423d29a955afb2
diff --git a/TRDOS/TR_MSD_2.ASZ b/TRDOS/TR_MSD_2.ASZ
index 5677375..88e5175 100644
--- a/TRDOS/TR_MSD_2.ASZ
+++ b/TRDOS/TR_MSD_2.ASZ
@@ -261,8 +261,7 @@ CMD_EXE1:
 	LD L,A
 	CALL JP_HL
 	JP AUTO_03E1
-JP_HL:
-	JP (HL)
+JP_HL:	JP (HL)
 
 NEXT_WORD:
 	INC HL
@@ -568,8 +567,8 @@ WORDS:
 ;	CALL EXP_FNS
 ;	RET
 AY8910:
-	LD A,0EAH
-	LD C,0F3H
+	LD A,#EA
+	LD C,#F3	;!HARDCODE BIOS.SPRINTER_ALL
 	CALL EXP_FNS
 	EI
 	CALL AUTO_1D97
@@ -579,17 +578,17 @@ AY8910:
 SPR_1:
 	LD A,(DE)
 	INC DE
-	CP 20H
+	CP #20
 	JR Z,SPR_1
 	CP "1"
-	LD C,0F0H
+	LD C,#F0	;!HARDCODE BIOS.RST_CONF.SP97_1
 	JR Z,SP_1
 	CP "2"
 	SCF
 	RET NZ
-	LD C,0F1H
+	LD C,#F1	;!HARDCODE BIOS.RST_CONF.SP97_2
 SP_1:	LD A,(DE)
-	CP 21H
+	CP #21
 	CCF
 	RET C
 	CALL EXP_FNS
diff --git a/TRDOS/TR_MSD_3.ASZ b/TRDOS/TR_MSD_3.ASZ
index 4cc80f0..a2de075 100644
--- a/TRDOS/TR_MSD_3.ASZ
+++ b/TRDOS/TR_MSD_3.ASZ
@@ -1,6 +1,6 @@
 
 INIT_RMD:
-	LD C,9FH
+	LD C,#9F	;!HARDCODE BIOS.FullInit
 	CALL EXP_FNS
 	EI
 	RET
@@ -57,11 +57,11 @@ TB_ONOFF:
 	CP 'f'
 	JR Z,TB_OFF_EXE
 TB_ON_EXE:
-	LD C,8Fh
+	LD C,#8F	;!HARDCODE BIOS.FN_TURBO
 	LD A,4
 	JP EXP_FNS
 TB_OFF_EXE:
-	LD C,8Fh
+	LD C,#8F	;!HARDCODE BIOS.FN_TURBO
 	LD A,3
 	JP EXP_FNS
 ;
@@ -267,7 +267,7 @@ SKEEP_XX1:
 ;*****************************************
 MADE_next_blk:
 	PUSH BC
-	LD C,95h
+	LD C,#95	;!HARDCODE BIOS.GetMemPageNext (#C7)
 	CALL EXP_FNS
 	POP BC
 	INC L		; SET ZF, if END BLK !!!
diff --git a/TRDOS/TR_MSD_S.ASZ b/TRDOS/TR_MSD_S.ASZ
index bb1fed1..c101509 100644
--- a/TRDOS/TR_MSD_S.ASZ
+++ b/TRDOS/TR_MSD_S.ASZ
@@ -24,7 +24,7 @@ HDD_REDIR:
 MSD_R_W_UT:
 	PUSH AF
 	CALL DISK_REDIR
-	CP 40H
+	CP #40
 	JR NC,HDD_REDIR
 	POP AF
 	EX AF,AF'
@@ -417,7 +417,7 @@ SET_1440:
 
 READ_BPB:
 	CALL DISK_REDIR
-	CP 40H
+	CP #40
 	JR NC,HDD_REDIR2
 	CP 4
 	JP NC,ERROR_MSDOS
diff --git a/TRDOS/TR_RMD_S.ASZ b/TRDOS/TR_RMD_S.ASZ
index ef8d6b2..d4c67de 100644
--- a/TRDOS/TR_RMD_S.ASZ
+++ b/TRDOS/TR_RMD_S.ASZ
@@ -3,7 +3,7 @@ DISK_REDIR:
 	PUSH BC
 	LD A,(OPER_DISK)
 	AND 3
-	LD C,0CFH
+	LD C,#CF	;!HARDCODE BIOS.GET_DRV_ST
 	CALL EXP_FNS
 	EI
 	POP BC
@@ -40,7 +40,7 @@ RECALL_MSD:
 
 TEST_RAMD:
 	PUSH HL
-	LD C,0CEH
+	LD C,#CE	;!HARDCODE BIOS.GET_RAMD_ST
 	CALL EXP_FNS
 	EI
 	POP HL
@@ -266,14 +266,14 @@ PAGE_CALC2:
 	RRCA
 	RRCA
 	LD D,A
-	AND 0F0H
+	AND #F0
 	OR E
 	LD E,A
 	LD A,D
-	AND 0FH
+	AND #0F
 	LD D,A
 	PUSH HL
-	LD C,98h
+	LD C,#98	;!HARDCODE BIOS.RAMD_CALC_PAGE
 	CALL DISK_REDIR
 	SUB 4
 	CALL EXP_FNS	; ���᫥��� ���� � ��࠭��� RAM-Disk
@@ -392,7 +392,7 @@ CLEAR_RMD_A:
 	PUSH HL
 	PUSH DE
 	PUSH BC
-	LD C,93h	; ���⪠ RAM-Disk
+	LD C,#93	;!HARDCODE BIOS.FreeMemRMD
 	CALL EXP_FNS	; �맢��� �㭪��
 	EI
 	POP BC
@@ -403,7 +403,7 @@ CLEAR_RMD_A:
 ;*********************************************************
 GET_RMD_A:
 GET_RAM_BLK:		; B - ����� ��������� ������, A - ���� RAM-Disk
-	LD C,92h
+	LD C,#92	;!HARDCODE BIOS.GetMemRMD
 	CALL EXP_FNS	; A,L - ���� RAM-Disk - ����� ��ࢮ�� �����
 	EI
 	RET NC
@@ -419,7 +419,7 @@ READ_ONLY:
 FDD_SET:
 	LD A,(OPER_DISK)
 	LD B,A
-	LD C,0CCH
+	LD C,#CC	;!HARDCODE BIOS.FDD_TO_DRV
 	CALL EXP_FNS
 	EI
 	RET
@@ -432,7 +432,7 @@ HDD_SET:
 	LD A,(OPER_DISK)
 	LD B,A
 	LD A,0
-	LD C,0CDH
+	LD C,#CD	;!HARDCODE BIOS.HDD_TO_DRV
 	CALL EXP_FNS
 	EI
 	RET
@@ -445,7 +445,7 @@ RAMD_SET1:
 	LD A,(OPER_DISK)
 	LD B,A
 	POP AF
-	LD C,0CBH
+	LD C,#CB	;!HARDCODE BIOS.RAMD_TO_DRV
 	CALL EXP_FNS
 	EI
 	RET