From b7a1fb227fbb0781224af2652359e555478d3018 Mon Sep 17 00:00:00 2001 From: Tolik Trek Date: Thu, 14 May 2026 01:47:26 +1000 Subject: [PATCH] Updated CLP --- D2_FRAM.asm | 42 ++++++++++++++++++++---------------------- DOOM2.asm | 25 ++++++++++++------------- Shared_Includes | 2 +- 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/D2_FRAM.asm b/D2_FRAM.asm index 9f10066..157f474 100644 --- a/D2_FRAM.asm +++ b/D2_FRAM.asm @@ -1969,28 +1969,26 @@ SW_MONS: SAVE_PIC_PR: - PUSH AF - PUSH IX - PUSH HL - PUSH DE - PUSH BC - LD A,(FLAG) - AND A - JR NZ,NO_SAVE - - LD A,#FF - LD (FLAG),A - CALL SAVE_PIC - LD A,0 - LD (FLAG),A -NO_SAVE: - - POP BC - POP DE - POP HL - POP IX - POP AF - RET + PUSH AF + PUSH IX + PUSH HL + PUSH DE + PUSH BC +.flag+1: LD A,0 + AND A + JR NZ,NO_SAVE + ; A=0 + DEC A + LD (.flag),A + CALL SAVE_PIC + XOR A + LD (.flag),A +NO_SAVE: POP BC + POP DE + POP HL + POP IX + POP AF + RET SAVE_HL: DW 0 SAVE_P1: DW 0 diff --git a/DOOM2.asm b/DOOM2.asm index 943ec46..730af0f 100644 --- a/DOOM2.asm +++ b/DOOM2.asm @@ -70,7 +70,7 @@ MIN_VER: ; 1.70.887 org_addr EQU #8000+CLP_Buffer code_addr EQU BEGIN stack_point EQU #BFFF -program_start EQU BEGIN +program_start EQU START Loader_length EQU 0 ;----------------------------------------------------------------------- ; @@ -95,12 +95,20 @@ TABLE_W EQU #2000 ; тек ;[]-------------------------------------------------------------------[] +;[]-------------------------------------------------------------------[] +BEGIN: BLOCK #8100-$,0 ;ВЫРАВНИВАНИЕ +; тут выравнивание на 0 в младшем +; бите адреса +TABLE_MAIN: DS 37 ; буфер под страницы файла resurses.res +1 +TABLE_PIC: DS 6 +;[]-------------------------------------------------------------------[] + ;[]-------------------------------------------------------------------[] -BEGIN: DI +START: DI LD (CMD_Line),IX ; сохранить указатель на параметры запуска CMD_Line+1: - LD HL,#8080 + LD HL,#8080 CALL SET_HOME_PATH ;--------[загрузка ресурсов игры]------- CALL CHECK_SYSTEM @@ -340,7 +348,7 @@ SPSave2+1: ;----------------------------------------------------------------------; ; -FLAG: DB 0 +;FLAG: DB 0 ;SAVE_PORT_Y: DB 0 ; ; @@ -1008,15 +1016,6 @@ NEXT_HL_FFING: ; RET */ -;*************************************** - BLOCK #8700-$,0 ;ВЫРАВНИВАНИЕ -;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -; тут выравнивание на 0 в младшем -; бите адреса -TABLE_MAIN: DS 37 ; буфер под страницы файла resurses.res +1 -TABLE_PIC: DS 6 -;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - ;-------[загрузка ресурсов игры]-------- Load_Resources: in a,(SLOT3) diff --git a/Shared_Includes b/Shared_Includes index e1dc7ec..c1b9679 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit e1dc7ec10dc9c7e9153a05884e42973a57378a63 +Subproject commit c1b96797e8d7872943c17d5e32565d19c7947349