diff --git a/Shared_Includes b/Shared_Includes index 4662474..aca9ce3 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 4662474034c70f4b2627ff8eca10ccdf4a7d3525 +Subproject commit aca9ce3f859bf53c76b0d710e108543226697f91 diff --git a/ZX_EXP/EXP_FN2.ASM b/ZX_EXP/EXP_FN2.ASM index ea1afb7..601d219 100644 --- a/ZX_EXP/EXP_FN2.ASM +++ b/ZX_EXP/EXP_FN2.ASM @@ -715,7 +715,7 @@ INIT_SYS_ALL: LD DE,CNF_0 LD (CONFIG_DE-4000h),DE - LD HL,TASK_DATA-4000h ; убить все задачи + LD HL,TASK_DATA-4000h ; убить все задачи ;SYS_PAGE.CURRENT_TASK LD DE,TASK_DATA+1-4000h LD BC,0FFH LD (HL),0 diff --git a/ZX_EXP/EXP_HDD.ASM b/ZX_EXP/EXP_HDD.ASM index eb89e41..f7903e6 100644 --- a/ZX_EXP/EXP_HDD.ASM +++ b/ZX_EXP/EXP_HDD.ASM @@ -220,7 +220,7 @@ HD_RD_CONT2: LD A,(HL) OUT (SLOT3),A EX AF,AF' - LD HL,0C000H + LD HL,#C000 JR HD_RD_L2 ;*********************************************** @@ -321,7 +321,7 @@ HD_WR_LOOP: OUT (SLOT3),A EX AF,AF' - LD HL,0C000H + LD HL,#C000 JR HD_WR_L2 ;******************************************************** diff --git a/ZX_EXP/EXP_SCR.ASM b/ZX_EXP/EXP_SCR.ASM index 7bbe1f7..76cb825 100644 --- a/ZX_EXP/EXP_SCR.ASM +++ b/ZX_EXP/EXP_SCR.ASM @@ -33,16 +33,15 @@ PIC_S MACRO pg,cnt,adr ALIGN 8 LP_SCR_MNU: ; -; LP_S 040h,14,040E7H -; -; LP_S 040h,14,04807H -; LP_S 040h,14,04827H -; LP_S 040h,14,04847H -; LP_S 040h,14,04867H -; LP_S 040h,14,04887H -; LP_S 040h,14,048A7H -; LP_S 040h,14,048C7H -; LP_S 040h,14,048E7H +; LP_S %0100'0000,14,#40E7 +; LP_S %0100'0000,14,#4807 +; LP_S %0100'0000,14,#4827 +; LP_S %0100'0000,14,#4847 +; LP_S %0100'0000,14,#4867 +; LP_S %0100'0000,14,#4887 +; LP_S %0100'0000,14,#48A7 +; LP_S %0100'0000,14,#48C7 +; LP_S %0100'0000,14,#48E7 ; ; DEFB 0FFh,0,0,0 @@ -50,43 +49,43 @@ LP_SCR_80: DB 40,32,0,0,1BH,0,0,0 DB 0,0,0,0,0,0,0,0 -; LP_S 01100010B,40,4000H -; LP_S 01100010B,40,4028H -; LP_S 01100010B,40,4050H -; LP_S 01100010B,40,4078H -; LP_S 01100010B,40,40A0H -; LP_S 01100010B,40,40C8H +; LP_S %0110'0010,40,4000H +; LP_S %0110'0010,40,4028H +; LP_S %0110'0010,40,4050H +; LP_S %0110'0010,40,4078H +; LP_S %0110'0010,40,40A0H +; LP_S %0110'0010,40,40C8H ; -; LP_S 01100010B,40,4800H -; LP_S 01100010B,40,4828H -; LP_S 01100010B,40,4850H -; LP_S 01100010B,40,4878H -; LP_S 01100010B,40,48A0H -; LP_S 01100010B,40,48C8H +; LP_S %0110'0010,40,4800H +; LP_S %0110'0010,40,4828H +; LP_S %0110'0010,40,4850H +; LP_S %0110'0010,40,4878H +; LP_S %0110'0010,40,48A0H +; LP_S %0110'0010,40,48C8H ; -; LP_S 01100010B,40,5000H -; LP_S 01100010B,40,5028H -; LP_S 01100010B,40,5050H -; LP_S 01100010B,40,5078H -; LP_S 01100010B,40,50A0H -; LP_S 01100010B,40,50C8H +; LP_S %0110'0010,40,5000H +; LP_S %0110'0010,40,5028H +; LP_S %0110'0010,40,5050H +; LP_S %0110'0010,40,5078H +; LP_S %0110'0010,40,50A0H +; LP_S %0110'0010,40,50C8H ; -; LP_S 01100100B,40,4000H -; LP_S 01100100B,40,4028H -; LP_S 01100100B,40,4050H -; LP_S 01100100B,40,4078H -; LP_S 01100100B,40,40A0H -; LP_S 01100100B,40,40C8H +; LP_S %0110'0100,40,4000H +; LP_S %0110'0100,40,4028H +; LP_S %0110'0100,40,4050H +; LP_S %0110'0100,40,4078H +; LP_S %0110'0100,40,40A0H +; LP_S %0110'0100,40,40C8H ; -; LP_S 01100100B,40,4800H -; LP_S 01100100B,40,4828H -; LP_S 01100100B,40,4850H -; LP_S 01100100B,40,4878H -; LP_S 01100100B,40,48A0H -; LP_S 01100100B,40,48C8H +; LP_S %0110'0100,40,4800H +; LP_S %0110'0100,40,4828H +; LP_S %0110'0100,40,4850H +; LP_S %0110'0100,40,4878H +; LP_S %0110'0100,40,48A0H +; LP_S %0110'0100,40,48C8H ; -; LP_S 01100100B,40,5000H -; LP_S 01100100B,40,5028H +; LP_S %0110'0100,40,5000H +; LP_S %0110'0100,40,5028H ; ; DEFB 0FFh,0,0,0 ; @@ -94,43 +93,43 @@ LP_SCR_40: DB 40,32,0,0,7BH,0,0,0 DB 0,0,0,0,0,0,0,0 ; -; LP_S 01000100B,40,5050H -; LP_S 01000100B,40,5078H -; LP_S 01000100B,40,50A0H -; LP_S 01000100B,40,50C8H +; LP_S %0100'0100,40,5050H +; LP_S %0100'0100,40,5078H +; LP_S %0100'0100,40,50A0H +; LP_S %0100'0100,40,50C8H ; -; LP_S 01000110B,40,4000H -; LP_S 01000110B,40,4028H -; LP_S 01000110B,40,4050H -; LP_S 01000110B,40,4078H -; LP_S 01000110B,40,40A0H -; LP_S 01000110B,40,40C8H +; LP_S %0100'0110,40,4000H +; LP_S %0100'0110,40,4028H +; LP_S %0100'0110,40,4050H +; LP_S %0100'0110,40,4078H +; LP_S %0100'0110,40,40A0H +; LP_S %0100'0110,40,40C8H ; -; LP_S 01000110B,40,4800H -; LP_S 01000110B,40,4828H -; LP_S 01000110B,40,4850H -; LP_S 01000110B,40,4878H -; LP_S 01000110B,40,48A0H -; LP_S 01000110B,40,48C8H +; LP_S %0100'0110,40,4800H +; LP_S %0100'0110,40,4828H +; LP_S %0100'0110,40,4850H +; LP_S %0100'0110,40,4878H +; LP_S %0100'0110,40,48A0H +; LP_S %0100'0110,40,48C8H ; -; LP_S 01000110B,40,5000H -; LP_S 01000110B,40,5028H -; LP_S 01000110B,40,5050H -; LP_S 01000110B,40,5078H -; LP_S 01000110B,40,50A0H -; LP_S 01000110B,40,50C8H +; LP_S %0100'0110,40,5000H +; LP_S %0100'0110,40,5028H +; LP_S %0100'0110,40,5050H +; LP_S %0100'0110,40,5078H +; LP_S %0100'0110,40,50A0H +; LP_S %0100'0110,40,50C8H ; -; LP_S 01001000B,40,4000H -; LP_S 01001000B,40,4028H -; LP_S 01001000B,40,4050H -; LP_S 01001000B,40,4078H -; LP_S 01001000B,40,40A0H -; LP_S 01001000B,40,40C8H +; LP_S %0100'1000,40,4000H +; LP_S %0100'1000,40,4028H +; LP_S %0100'1000,40,4050H +; LP_S %0100'1000,40,4078H +; LP_S %0100'1000,40,40A0H +; LP_S %0100'1000,40,40C8H ; -; LP_S 01001000B,40,4800H -; LP_S 01001000B,40,4828H -; LP_S 01001000B,40,4850H -; LP_S 01001000B,40,4878H +; LP_S %0100'1000,40,4800H +; LP_S %0100'1000,40,4828H +; LP_S %0100'1000,40,4850H +; LP_S %0100'1000,40,4878H ; ; DEFB 0FFh,0,0,0 ; @@ -138,68 +137,66 @@ LP_SCR_32: DB 32,24,4,4,30H,1,0,0 DB 0,0,0,0,0,0,0,0 ; -; LP_S 040h,32,04000H -; LP_S 040h,32,04020H -; LP_S 040h,32,04040H -; LP_S 040h,32,04060H -; LP_S 040h,32,04080H -; LP_S 040h,32,040A0H -; LP_S 040h,32,040C0H -; LP_S 040h,32,040E0H +; LP_S %040h',32,4000H +; LP_S %040h',32,4020H +; LP_S %040h',32,4040H +; LP_S %040h',32,4060H +; LP_S %040h',32,4080H +; LP_S %040h',32,40A0H +; LP_S %040h',32,40C0H +; LP_S %040h',32,40E0H ; -; LP_S 040h,32,04800H -; LP_S 040h,32,04820H -; LP_S 040h,32,04840H -; LP_S 040h,32,04860H -; LP_S 040h,32,04880H -; LP_S 040h,32,048A0H -; LP_S 040h,32,048C0H -; LP_S 040h,32,048E0H +; LP_S %040h',32,4800H +; LP_S %040h',32,4820H +; LP_S %040h',32,4840H +; LP_S %040h',32,4860H +; LP_S %040h',32,4880H +; LP_S %040h',32,48A0H +; LP_S %040h',32,48C0H +; LP_S %040h',32,48E0H ; -; LP_S 040h,32,05000H -; LP_S 040h,32,05020H -; LP_S 040h,32,05040H -; LP_S 040h,32,05060H -; LP_S 040h,32,05080H -; LP_S 040h,32,050A0H -; LP_S 040h,32,050C0H -; LP_S 040h,32,050E0H -; -; LP_S 0FFh,0,0 +; LP_S %040h',32,5000H +; LP_S %040h',32,5020H +; LP_S %040h',32,5040H +; LP_S %040h',32,5060H +; LP_S %040h',32,5080H +; LP_S %040h',32,50A0H +; LP_S %040h',32,50C0H +; LP_S %040h',32,50E0H ; +; LP_S %0FFh',0,0; LP_SCR_64: DB 32,24,4,4,9BH,0,0,0 DB 0,0,0,0,0,0,0,0 ; -; LP_S 06Ah,32,04000H -; LP_S 06Ah,32,04020H -; LP_S 06Ah,32,04040H -; LP_S 06Ah,32,04060H -; LP_S 06Ah,32,04080H -; LP_S 06Ah,32,040A0H -; LP_S 06Ah,32,040C0H -; LP_S 06Ah,32,040E0H +; LP_S %06Ah',32,4000H +; LP_S %06Ah',32,4020H +; LP_S %06Ah',32,4040H +; LP_S %06Ah',32,4060H +; LP_S %06Ah',32,4080H +; LP_S %06Ah',32,40A0H +; LP_S %06Ah',32,40C0H +; LP_S %06Ah',32,40E0H ; -; LP_S 06Ah,32,04800H -; LP_S 06Ah,32,04820H -; LP_S 06Ah,32,04840H -; LP_S 06Ah,32,04860H -; LP_S 06Ah,32,04880H -; LP_S 06Ah,32,048A0H -; LP_S 06Ah,32,048C0H -; LP_S 06Ah,32,048E0H +; LP_S %06Ah',32,4800H +; LP_S %06Ah',32,4820H +; LP_S %06Ah',32,4840H +; LP_S %06Ah',32,4860H +; LP_S %06Ah',32,4880H +; LP_S %06Ah',32,48A0H +; LP_S %06Ah',32,48C0H +; LP_S %06Ah',32,48E0H ; -; LP_S 06Ah,32,05000H -; LP_S 06Ah,32,05020H -; LP_S 06Ah,32,05040H -; LP_S 06Ah,32,05060H -; LP_S 06Ah,32,05080H -; LP_S 06Ah,32,050A0H -; LP_S 06Ah,32,050C0H -; LP_S 06Ah,32,050E0H +; LP_S %06Ah',32,5000H +; LP_S %06Ah',32,5020H +; LP_S %06Ah',32,5040H +; LP_S %06Ah',32,5060H +; LP_S %06Ah',32,5080H +; LP_S %06Ah',32,50A0H +; LP_S %06Ah',32,50C0H +; LP_S %06Ah',32,50E0H ; -; LP_S 0FFh,0,0 - +; LP_S %0FFh',0,0 PIC_320X256_1: DB 40,32,0,0,20H,0,8,0 DB 0,0,0,0,0,0,0,0