From 4bedffd8adeaee245594e4875e2c09e8cec943e4 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Sun, 16 Mar 2025 23:37:04 +1000
Subject: [PATCH] ...

---
 src/bios/exp/FUNC_LOW_PRINT.ASM |  5 +++--
 src/bios/exp/FUNC_SCREEN 2.ASM  | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/bios/exp/FUNC_LOW_PRINT.ASM b/src/bios/exp/FUNC_LOW_PRINT.ASM
index 70ac35e..d4d2d5f 100644
--- a/src/bios/exp/FUNC_LOW_PRINT.ASM
+++ b/src/bios/exp/FUNC_LOW_PRINT.ASM
@@ -93,6 +93,7 @@
 	LD (SYS_PAGE.COPY_RGADR),A
  ENDM
 
+; не должен влиять на флаги и трогать регистры кроме A
  MACRO LP_CLOSE_PG
         LD A,(SYS_PAGE.COPY_RGADR)
         OUT (PORT_Y),A
@@ -658,7 +659,7 @@ LP_SIZE:                   ; 
 	LP_OPEN_PG
 	LD DE,(WIN_ID_0.USER.SIZE_H)
 	LD A,(WIN_ID_0.USER.MODE)
-	BIT 5,A
+	AND	%0010'0000
 	LP_CLOSE_PG
 	RET NZ
 	LD A,E
@@ -773,7 +774,7 @@ LP_INI_P:
 	CP #C0
 	JR NC,LP_INI_NO_ZG			; открытие бордера...
 	LD A,(WIN_ID_0.USER.MODE_S)
-	BIT 0,A
+	AND	%0000'0001
 	JR NZ,LP_INI_NO_ZG			; открытие Spectrum-Screen
 
 	LD A,(WIN_ID_0.USER.MODE)
diff --git a/src/bios/exp/FUNC_SCREEN 2.ASM b/src/bios/exp/FUNC_SCREEN 2.ASM
index e7cc857..69f8c51 100644
--- a/src/bios/exp/FUNC_SCREEN 2.ASM	
+++ b/src/bios/exp/FUNC_SCREEN 2.ASM	
@@ -1110,33 +1110,33 @@ SCREEN_TABLES:
 ;
 ;текстовое окно 80x32
 LP_SCR_80:
-	DB 40,32,0,0,27,0,0,0
-	DB  0, 0,0,0, 0,0,0,0
+	DB	40,32,0,0,%0001'1011,0,0,0
+	BLOCK	8,0
 
 ;текстовое окно 40x32
 LP_SCR_40:
-	DB 40,32,0,0,123,0,0,0
-	DB  0, 0,0,0,  0,0,0,0
+	DB	40,32,0,0,%0111'1011,0,0,0
+	BLOCK	8,0
 
 ;спектрумовское окно 32x24
 LP_SCR_32:
-	DB 32,24,4,4,48,1,0,0
-	DB  0, 0,0,0, 0,0,0,0
+	DB	32,24,4,4,%0011'0000,1,0,0
+	BLOCK	8,0
 
 ;текстовое окно 64x24
 LP_SCR_64:
-	DB 32,24,4,4,155,0,0,0
-	DB  0, 0,0,0,  0,0,0,0
+	DB	32,24,4,4,%1001'1011,0,0,0
+	BLOCK	8,0
 
 ;графическое окно 0
 PIC_320X256_1:
-	DB 40,32,0,0,32,0,8,0
-	DB  0, 0,0,0, 0,0,0,0
+	DB	40,32,0,0,%0010'0000,0,8,0
+	BLOCK	8,0
 
 ;графическое окно 1
 PIC_320X256_2:
-	DB 40,32,0,0,96,0,48,0
-	DB  0, 0,0,0, 0,0, 0,0
+	DB	40,32,0,0,%0110'0000,0,48,0
+	BLOCK	8,0
 
 ;************************************
 ;