diff --git a/Shared_Includes b/Shared_Includes index 7c28687..cb37592 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 7c28687c26b1f684f87b55512dffeb6e527ba6e0 +Subproject commit cb37592f1a06f495e0396611d9ffde0c04406c89 diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm index c80d557..0a6b99a 100644 --- a/src/bios/exp/EXP.asm +++ b/src/bios/exp/EXP.asm @@ -780,40 +780,37 @@ start: push af ;----[перехват soft reset #EE port]----- Check_EE_Port: - LD A,ACEX.RET_PORT LD B,0 LD C,BIOS.SET_PORTS CALL @ToBIOS_3D13 ; переустановить внутр. порт #EE LD A,B AND A - jr z,Check_Spec_Page + JR Z,Check_Spec_Page DI OUT (SLOT3),A ; Set restart page .After_Hard_Rst: - - LD HL,(#FFF4) ; prog address - ld a,(#FFF0) ; PAGE0 + LD HL,(Spec_Page.RET_addr) ; prog address + ld A,(Spec_Page.page_0) ; PAGE0 OUT (SLOT0),A - LD A,(#FFF1) ; PAGE1 + LD A,(Spec_Page.page_1) ; PAGE1 OUT (SLOT1),A - LD A,(#FFF2) ; PAGE2 + LD A,(Spec_Page.page_2) ; PAGE2 OUT (SLOT2),A - LD A,(#FFF3) ; PAGE3 + LD A,(Spec_Page.page_3) ; PAGE3 OUT (SLOT3),A - - jp (HL) + JP (HL) ; ;--[перехват soft/hard reset #41 page]-- Check_Spec_Page: LD A,Spec_Page OUT (SLOT3),A - LD A,(#FFFE) + LD A,(.flag_Z) CP 'Z' JR NZ,No_Reset_handlers - LD A,(#FFFF) + LD A,(.flag_X) CP 'X' JR NZ,No_Reset_handlers diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG index 666c9e3..40cd935 100755 Binary files a/src/bios/shared/RECOVERY.IMG and b/src/bios/shared/RECOVERY.IMG differ