diff --git a/Shared_Includes b/Shared_Includes index 3fa91af..3a3a4fe 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 3fa91af2db4f96a96f3342d7291deb4d63a90591 +Subproject commit 3a3a4fe44981e0a75f4925234aa2609ee81b96b4 diff --git a/ZX_EXP.ASM b/ZX_EXP.ASM index 839670d..2056ff0 100644 --- a/ZX_EXP.ASM +++ b/ZX_EXP.ASM @@ -11,7 +11,7 @@ ORG 0 SPRIN2 EQU 2 ; 1 - включение Sprinter-1 первой прошивкой - ; 2 - включение Sprinter-2 первой прошивкой + ; 2 - включение Sprinter-2 первой прошивкой INCLUDE 'INC/SPRINT00.INC' ; константы, макросы.. INCLUDE 'shared_includes/constants/zx_char_codes.inc' @@ -661,20 +661,21 @@ NO_CONFIG_: POP HL ; конфигурация LD A,H - CP 0FFH + CP #FF JR NZ,NO_SETUP_1 LD A,L - IF SPRIN2 EQ 2 - CP 0FDH + IF SPRIN2 = 2 + CP #FD ; LD BC,0FFFDH ; Конфигурация Sprinter-2 -PG_SP1 equ 0ECH -PG_SP2 equ 0EEH -PG_AY equ 0EAH -ELSE +PG_SP1 EQU #EC +PG_SP2 EQU #EE +PG_AY EQU #EA + + ELSE ; LD BC,0FFFEH ; Конфигурация Sprinter-1 - CP 0FEH - PG_AY equ 0EAH + CP #FE +PG_AY EQU #EA ENDIF JR NZ,NO_SETUP_2 ; AND A @@ -737,7 +738,7 @@ NO_SETUP_2: NO_SETUP_1: - LD A,(0A8h) + LD A,(TABLE_X + 8) OUT (LPT1_D),A LD A,0FEh ; ACC-off