diff --git a/D2_FRAM.asm b/D2_FRAM.asm index 8a83e4a..1222b0d 100644 --- a/D2_FRAM.asm +++ b/D2_FRAM.asm @@ -788,7 +788,7 @@ MAP_LOOP_2: LD BC,#0100 OUT (C),C ; МАСШТАБ 1:1 - IF NORM_ACC +; IF NORM_ACC LD B,16 LD A,184 @@ -814,55 +814,55 @@ MAP_LOOP_1: DJNZ MAP_LOOP_1 - ELSE +; ELSE - LD B,16 - LD A,184 +; LD B,16 +; LD A,184 -MAP_LOOP_1: +; MAP_LOOP_1: - ACC_SetBlockSize - LD C,#40 - ACC_CopyBlock - LD C,(HL) - ACC_Off +; ACC_SetBlockSize +; LD C,#40 +; ACC_CopyBlock +; LD C,(HL) +; ACC_Off - OUT (RGADR),A - ACC_CopyBlock - LD (DE),A - ACC_Off - INC A - LD L,64 - ACC_CopyBlock - LD C,(HL) - ACC_Off - OUT (RGADR),A - ACC_CopyBlock - LD (DE),A - ACC_Off - INC A - LD L,64*2 - ACC_CopyBlock - LD C,(HL) - ACC_Off - OUT (RGADR),A - ACC_CopyBlock - LD (DE),A - ACC_Off - INC A - LD L,64*3 - ACC_CopyBlock - LD C,(HL) - ACC_Off - OUT (RGADR),A - ACC_CopyBlock - LD (DE),A - ACC_Off - INC A - INC H - LD L,0 - DJNZ MAP_LOOP_1 - ENDIF +; OUT (RGADR),A +; ACC_CopyBlock +; LD (DE),A +; ACC_Off +; INC A +; LD L,64 +; ACC_CopyBlock +; LD C,(HL) +; ACC_Off +; OUT (RGADR),A +; ACC_CopyBlock +; LD (DE),A +; ACC_Off +; INC A +; LD L,64*2 +; ACC_CopyBlock +; LD C,(HL) +; ACC_Off +; OUT (RGADR),A +; ACC_CopyBlock +; LD (DE),A +; ACC_Off +; INC A +; LD L,64*3 +; ACC_CopyBlock +; LD C,(HL) +; ACC_Off +; OUT (RGADR),A +; ACC_CopyBlock +; LD (DE),A +; ACC_Off +; INC A +; INC H +; LD L,0 +; DJNZ MAP_LOOP_1 +; ENDIF LD BC,240 EX DE,HL diff --git a/DOOM2.asm b/DOOM2.asm index b025c17..b364b3a 100644 --- a/DOOM2.asm +++ b/DOOM2.asm @@ -8,38 +8,38 @@ ; ;---------------------------[Defines section]--------------------------- - IFNDEF HARDWARE : IFNDEF ZXMAK2 : IFNDEF MAME : DEFINE HARDWARE 1 : ENDIF : ENDIF : ENDIF +; IFNDEF HARDWARE : IFNDEF ZXMAK2 : IFNDEF MAME : DEFINE HARDWARE 1 : ENDIF : ENDIF : ENDIF - IFDEF HARDWARE - DEFINE NORM_ACC 1 - DEFINE NORM_syncPORT 1 - DEFINE NORM_FastRAM 1 - ENDIF - IFDEF ZXMAK2 - DEFINE NORM_ACC 0 - DEFINE NORM_syncPORT 0 - DEFINE NORM_FastRAM 0 - ENDIF - IFDEF MAME - DEFINE NORM_ACC 1 - DEFINE NORM_syncPORT 0 - DEFINE NORM_FastRAM 1 - ENDIF +; IFDEF HARDWARE +; DEFINE NORM_ACC 1 +; DEFINE NORM_syncPORT 1 +; DEFINE NORM_FastRAM 1 +; ENDIF +; IFDEF ZXMAK2 +; DEFINE NORM_ACC 0 +; DEFINE NORM_syncPORT 0 +; DEFINE NORM_FastRAM 0 +; ENDIF +; IFDEF MAME +; DEFINE NORM_ACC 1 +; DEFINE NORM_syncPORT 0 +; DEFINE NORM_FastRAM 1 +; ENDIF IFNDEF YesSound : DEFINE YesSound 0 : ENDIF DEFINE EXE_HEADER 1 ; DEFINE NEED_LOADER 1 - IFDEF HARDWARE - DISPLAY "[]------[ Compilation target: Sprinter 2000 ]------[]" - ENDIF - IFDEF ZXMAK2 - DISPLAY "[]------[ Compilation target: emulator ZXMAK2 ]------[]" - ENDIF - IFDEF MAME - DISPLAY "[]------[ Compilation target: emulator MAME ]------[]" - ENDIF +; IFDEF HARDWARE +; DISPLAY "[]------[ Compilation target: Sprinter 2000 ]------[]" +; ENDIF +; IFDEF ZXMAK2 +; DISPLAY "[]------[ Compilation target: emulator ZXMAK2 ]------[]" +; ENDIF +; IFDEF MAME +; DISPLAY "[]------[ Compilation target: emulator MAME ]------[]" +; ENDIF ;----------------------------------------------------------------------- ; @@ -207,12 +207,12 @@ Loader_length EQU 0 EXX ; - IFN NORM_syncPORT - DI - LD A, +(high im_handler_emulator) - LD I,A -; IM 2 - пока не включаем, процедура прерывания прыгает в кэш, а он не вставлен и не прогружен - ENDIF +; IFN NORM_syncPORT +; DI +; LD A, +(high im_handler_emulator) +; LD I,A +; ; IM 2 - пока не включаем, процедура прерывания прыгает в кэш, а он не вставлен и не прогружен +; ENDIF CALL MAIN @@ -245,12 +245,12 @@ SP_SAVE1: ;-----------[EXIT Procedure]------------; Сделать!!! RETURN_POINT: ; точка возврата - полный сброс DI - LD A,10h - LD BC,1FFDh + LD A,#10 + LD BC,#1FFD OUT (C),A - LD A,0A0h ; Reset page. Работает ли?!!!!!!!!! + LD A,RESET_PAGE OUT (SLOT3),A - LD (0C000h),HL + LD (#C000),HL HALT_L: DI HALT @@ -341,7 +341,59 @@ MemPatch_SPSave2 EQU $+1 POP AF OUT (SLOT3),A RET -;--------------------------------------- + + +;----------------------------------------------------------------------; +; FOR ZX-ROM in SLOT0 +; _2L_PRIKOL: +; LD A,7 +; OUT (BorderColor),A +; XOR A +; OUT (RGADR),A + +; LD A,2 +; LD HL,#4000 +; LD B,27 +; CALL .pause_loop + +; LD A,0 +; LD HL#4000 +; LD B,27 +; CALL .pause_loop + +; CALL #0D6B ; CLS +; LD HL,.TXT_SP +; CALL PRINT_LOOP +; RET + +; .pause_loop: +; LD (HL),A +; INC L +; PUSH DE +; POP DE +; JR NZ,.pause_loop +; INC H +; DJNZ .pause_loop +; ; +; LD HL,#8000 +; .loop: PUSH HL +; POP HL +; DEC HL +; LD A,H +; OR L +; JR NZ,.loop +; RET + +; .PRINT_LOOP: +; LD A,(HL) +; INC HL +; CP #FF +; RET Z +; RST #10 +; JR .PRINT_LOOP + +; .TXT_SP: DB #7F," 1982 Sinclair Research Ltd.",#FF +;----------------------------------------------------------------------; ; FLAG: DB 0 @@ -526,9 +578,9 @@ MemPatch_D2_FRAM_page equ $-1 ld (MemPatch_DOOM2_SndPage),a ENDIF - IFN NORM_syncPORT - IM 2 ; вот теперь можно включать - ENDIF +; IFN NORM_syncPORT +; IM 2 ; вот теперь можно включать +; ENDIF POP AF OUT (SLOT3),A @@ -726,7 +778,7 @@ DM_LOOP: CALL CLEAR_Z_BUFER LOOP_SCR: - IF NORM_syncPORT +; IF NORM_syncPORT IN A,(SCR_SyncPort) BIT 5,A JR NZ,CONT_WORK @@ -739,10 +791,10 @@ LOOP_SCR: JR LOOP_SCR - ELSE - EI - HALT - ENDIF +; ELSE +; EI +; HALT +; ENDIF CONT_WORK: CALL SCR_SWITCH @@ -771,7 +823,7 @@ SET_1: PAUSE_INT: CALL SOUND1 - IF NORM_syncPORT +; IF NORM_syncPORT IN A,(SCR_SyncPort) BIT 5,A JR NZ,PAUSE_INT @@ -782,11 +834,11 @@ PAUSE_INT1: BIT 5,A RET NZ JR PAUSE_INT1 - ELSE - EI - HALT - ret - ENDIF +; ELSE +; EI +; HALT +; ret +; ENDIF PAUSE_SNDC: JP SOUND @@ -1843,19 +1895,19 @@ NAME9: DB "_ENI511CCBL " ; - IFN NORM_syncPORT +; IFN NORM_syncPORT -im_handler_emul_proc_address: - di - push af - call KBD_INT - pop af - reti +; im_handler_emul_proc_address: +; di +; push af +; call KBD_INT +; pop af +; reti - BLOCK +(#FF - low $) -im_handler_emulator: - dw im_handler_emul_proc_address - ENDIF +; BLOCK +(#FF - low $) +; im_handler_emulator: +; dw im_handler_emul_proc_address +; ENDIF ; OUTEND ; конец файла doom2.exe ; diff --git a/Shared_Includes b/Shared_Includes index d83a663..a15861c 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit d83a6638743aa3cb68a6adf85402fabb54c61c34 +Subproject commit a15861c07cab60eaf09c28226d0c7761b4fd8235