From 811da31399c7f013e61a1cd7ab17d4c987cfe30f Mon Sep 17 00:00:00 2001
From: Anatoliy Belyanskiy <tolik.trek@gmail.com>
Date: Thu, 3 Aug 2023 00:17:17 +1000
Subject: [PATCH] ref

---
 Shared_Includes                 |  2 +-
 src/bios/exp/EXP.asm            |  2 +-
 src/bios/exp/FUNC_LOW_PRINT.ASM | 38 ++++++++++++++++-----------------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/Shared_Includes b/Shared_Includes
index 53e49fa..4059f40 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit 53e49fa3cc457e2d7a8977d6166246b8457cb5ce
+Subproject commit 4059f40bf7d86c8ba20a2026d6e0f454ec1572c7
diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm
index 5470998..5a17c28 100644
--- a/src/bios/exp/EXP.asm
+++ b/src/bios/exp/EXP.asm
@@ -529,7 +529,7 @@ POST_2_ADRESS_BUS:
 	JR OUT_C_BYTE						; вывести старший байт с запятой
 .TSAB_3:
 	LD C,E
-	LD B,0FFh
+	LD B,#FF
 	LD IX,.TSAB_4
 	JR OUT_C_BYTE						; вывести младший без запятой
 
diff --git a/src/bios/exp/FUNC_LOW_PRINT.ASM b/src/bios/exp/FUNC_LOW_PRINT.ASM
index cfc0cb9..976831c 100644
--- a/src/bios/exp/FUNC_LOW_PRINT.ASM
+++ b/src/bios/exp/FUNC_LOW_PRINT.ASM
@@ -184,7 +184,6 @@ LP_PRINT_AL1:
 	RET
 
 LP_PRINT_SYM:
-
 	CALL LP_BEG_P
 	EXX
 	LD C,A
@@ -756,9 +755,8 @@ LP_AT_D:		; !!!!! 
 	EXX
 	LD A,D
 	EXX
-LP_AT_DX:
-	SUB L
-	JR NC,LP_AT_DX
+.loop:	SUB L
+	JR NC,.loop
 ;	JR Z,LP_AT_DX
 	ADD A,L
 
@@ -791,7 +789,8 @@ LP_TAB_EX:
 	ADD A,D
 	LD D,A
 	LD A,(SYS_PAGE.WIN_MAP_IX+WIN_MODE)
-	BIT 5,A
+	;BIT 5,A
+	AND %0010'0000
 	JR Z,LP_NO_ADD_A
 
 	LD A,D
@@ -825,7 +824,7 @@ LP_NEXT_HL:
 	LD A,(SYS_PAGE.WIN_MAP_IX+WIN_V_BEG)
 	LD L,A
 	INC L
-	LD H,0C3H
+	LD H,#C3
 
 LP_NEXT_HL1:
 	LD A,(SYS_PAGE.WIN_MAP_IX+WIN_H_BEG)
@@ -1069,19 +1068,19 @@ LP_SET_32X:
 	JR LP_SET_MODE
 
 LP_SET_64:
-	LD HL,4104H
+	LD HL,#4104
 LP_SET_64X:
 	LD IX,LP_SCR_64
 	JR LP_SET_MODE
 
 LP_SET_40:
-	LD HL,4000H
+	LD HL,#4000
 LP_SET_40X:
 	LD IX,LP_SCR_40
 	JR LP_SET_MODE
 
 LP_SET_80:
-	LD HL,4000H
+	LD HL,#4000
 LP_SET_80X:
 	LD IX,LP_SCR_80
 	JR LP_SET_MODE
@@ -1862,13 +1861,13 @@ WIN_MOVE:
 	RET NZ
 	PUSH IX
 	PUSH HL
-	LD B,#FF
-	LD IX,#C000
+	LD B,SHARED_PAGE
+	LD IX,SLOT3.MEM_ADDR
 	CALL WIN_COPY_WIN1
 	POP HL
 	POP DE
-	LD B,0FFH
-	LD IX,0C000H
+	LD B,SHARED_PAGE
+	LD IX,SLOT3.MEM_ADDR
 	CALL WIN_REST_WIN1
 	AND A
 	RET
@@ -1903,7 +1902,7 @@ WIN_COPY_WIN1:
 	LD C,D
 	EXX
 
-LP_COPY_L2:
+.COPY_loop2:
 	LD A,L
 	EXX
 	LD B,A
@@ -1911,16 +1910,15 @@ LP_COPY_L2:
 	ADD A,A
 	ADD A,XL
 	LD XL,A
-	JR NC,LP_NO_INC_IX1
+	JR NC,.NO_INC_XH
 	INC XH
-LP_NO_INC_IX1:
-
+.NO_INC_XH:
 	LD SP,IX
 
 	LD A,C
 	ADD A,B
 
-LP_COPY_L1:
+.COPY_loop:
 	DEC A
 	OUT (RGADR),A
 	LD E,(HL)
@@ -1928,7 +1926,7 @@ LP_COPY_L1:
 	LD D,(HL)
 	DEC L
 	PUSH DE
-	DJNZ LP_COPY_L1
+	DJNZ .COPY_loop
 
 	INC HL
 	INC HL
@@ -1938,7 +1936,7 @@ LP_COPY_L1:
 	EXX
 
 	DEC H
-	JR NZ,LP_COPY_L2
+	JR NZ,.COPY_loop2
 
 	LD A,SYS_PAGE
 	OUT (SLOT3),A