...

Shared_Includes

@@ -1 +1 @@
-Subproject commit 591d3212c9341f17d6dd034bf2b8da91bd2f6107
+Subproject commit 57f4969f09a1bfc005af0b60316f03f30ee815ba

bios/loader/loader.asm

@@ -157,7 +157,7 @@
 	DEFINE		Altera_Chip	altera_chip
         LUA
 	 local file_path        =       'Build/ACEX/'
-	 local file_ext         =       '.BIN'
+	 local file_ext         =       '.ACX'
 	 local altera_ver       =       sj.get_define("Altera_Chip")
 	 sj.insert_define("Altera_File", '"' .. file_path .. altera_ver .. file_ext .. '"')
         ENDLUA

bios/rom/SETUP/MAIN.asm

@@ -1624,9 +1624,6 @@ ElementsBuffer:
  INCLUDE	'KEY.asm'
 ;.......................................
 
-KEY:	EI 
-	JP	WAITKEY
-
 FindStringAddr:
 	LD	L,A
 	LD	H,0
@@ -1639,8 +1636,11 @@ FindStringAddr:
 	LD	L,A	
 	RET
 
+
 POSTLEN:
+	LD	A,E
 	CALL	FindStringAddr
+	PUSH	HL
 	LD	BC,#0100
 	XOR	A
 	CPIR 
@@ -1651,8 +1651,9 @@ POSTLEN:
 	LD	A,40
 	SUB	C
 	LD	E,A
-	;JP	ScreenPOS.LOCAT
+	CALL	LP_SET_PLACE
-        JP      LP_SET_PLACE
+	POP	HL
+	JP	PRINTZ
 
 SETLAND:
 	LD	A,#0E							; !HARDCODE CMOS ï祩ª  options
@@ -1698,14 +1699,18 @@ POSTMSC:	CALL    FindStringAddr
 		LD	A,E
 		JP	CPRINTZ
 ;
+
 //////////////////////////////////////////////////////////////////////
  INCLUDE	'IM2_INT.asm'
 //////////////////////////////////////////////////////////////////////
 
 POSTMSG:	CALL    FindStringAddr
 		JP	PRINTZ
+;
 
 
+KEY:	EI 
+	JP	WAITKEY
 
 ;----------------------------------------------------------------------[]
 ;—â® £à㧨âì ¢ v<>‡“ ¯à¨ áâ àâ¥. ‚ à¨ ­âë:

bios/rom/SETUP/SETTINGS.asm

@@ -1,6 +1,5 @@
 ;U_SETUP:
-SETTINGS:
+SETTINGS:	LD	A,CMOS_CELL.ScreenSET
-	LD	A,CMOS_CELL.ScreenSET
 		CALL	READCMS
 		AND	high CMOS_CELL.ScreenSET.Mask.ColorStyle
 		LD	L,A
@@ -12,21 +11,28 @@ SETTINGS:
 		CALL	LP_CLS_WIN
 
 
-	LD	A,msgStrings.setupBiosVer
+		LD	DE,#0100 + msgStrings.setupBiosVer	; ª®®à¤¨­ â  Y + áâப  ¤«ï ¢ë¢®¤ 
-	LD	DE,#0100                                                ; ?????
 		CALL	POSTLEN
-	LD	A,msgStrings.setupBiosVer
+		LD	DE,#0200 + msgStrings.setupCopyRight	; ª®®à¤¨­ â  Y + áâப  ¤«ï ¢ë¢®¤ 
-	CALL	POSTMSG
-	LD	A,msgStrings.setupCopyRight
-	LD	DE,#0200
 		CALL	POSTLEN
-	LD	A,msgStrings.setupCopyRight
+		LD	DE,#0500 + msgStrings.setupUtilityVer	; ª®®à¤¨­ â  Y + áâப  ¤«ï ¢ë¢®¤ 
-	CALL	POSTMSG
-	LD	A,msgStrings.setupUtilityVer
-	LD	DE,#0500
 		CALL	POSTLEN
-	LD	A,msgStrings.setupUtilityVer
+
-	CALL	POSTMSG
+		; LD	D,1					; ª®®à¤¨­ â  Y + áâப  ¤«ï ¢ë¢®¤ 
+		; LD	A,msgStrings.setupBiosVer
+		; CALL	POSTLEN
+		; LD	A,msgStrings.setupBiosVer
+		; CALL	POSTMSG
+		; LD	A,msgStrings.setupCopyRight
+		; LD	D,2					; áâப  ¤«ï ¢ë¢®¤ 
+		; CALL	POSTLEN
+		; LD	A,msgStrings.setupCopyRight
+		; CALL	POSTMSG
+		; LD	A,msgStrings.setupUtilityVer
+		; LD	D,5					; áâப  ¤«ï ¢ë¢®¤ 
+		; CALL	POSTLEN
+		; LD	A,msgStrings.setupUtilityVer
+		; CALL	POSTMSG
 
 		CALL	setFRAME.double
 
@@ -47,22 +53,18 @@ SETTINGS:
 		CALL	TLINEV
 
 		LD	DE,#1906
-	;CALL	ScreenPOS.LOCAT
 		CALL	LP_SET_PLACE
 		LD	A,msgStrings.setupHelpStr1
 		CALL	POSTMSG
 		LD	DE,#1A06
-	;CALL	ScreenPOS.LOCAT
 		CALL	LP_SET_PLACE
 		LD	A,msgStrings.setupHelpStr2
 		CALL	POSTMSG
 		LD	DE,#1B06
-	;CALL	ScreenPOS.LOCAT
 		CALL	LP_SET_PLACE
 		LD	A,msgStrings.setupHelpStr3
 		CALL	POSTMSG
 		LD	DE,#1C06
-	;CALL	ScreenPOS.LOCAT
 		CALL	LP_SET_PLACE
 		LD	A,msgStrings.setupHelpStr4
 		CALL	POSTMSG
@@ -70,7 +72,6 @@ SETTINGS:
 	
 
  IF NEW_FEATURE
-
 		; LD	HL,CurrentDateTime
 		; CALL	GETTIME
 
@@ -78,7 +79,6 @@ SETTINGS:
 
 		; LD	A,(HL)
 		; AND	#F0
-
  ENDIF
 
 
@@ -97,37 +97,37 @@ STT1:	LD	A,C
 AGAIN:		LD	HL,AGAIN
 		PUSH	HL
 		CALL	KEY
-; CURSOR DOWN
+		; CURSOR DOWN
 		LD	HL,#5200	
 		AND	A
 		SBC	HL,DE
 		JP	Z,INCITM
-; CURSOR UP
+		; CURSOR UP
 		LD	HL,#5800	
 		AND	A
 		SBC	HL,DE
 		JP	Z,DECITM
-; CURSOR RIGHT
+		; CURSOR RIGHT
 		LD	HL,#5600	
 		AND	A
 		SBC	HL,DE
 		JP	Z,ADDITM
-; CURSOR LEFT
+		; CURSOR LEFT
 		LD	HL,#5400	
 		AND	A
 		SBC	HL,DE
 		JP	Z,SUBITM
-; +
+		; +
 		LD	HL,#5300	
 		AND	A
 		SBC	HL,DE
 		JP	Z,INCVAL
-; -
+		; -
 		LD	HL,#5900	
 		AND	A
 		SBC	HL,DE
 		JP	Z,DECVAL
-; + or -
+		; + or -
 		LD	HL,#A400	
 		AND	A
 		SBC	HL,DE
@@ -138,39 +138,38 @@ AGAIN:	LD	HL,AGAIN
 		JP	Z,DECVAL
 
  IF NEW_FEATURE
-; ENTER
+		; ENTER
 		LD	HL,#280D	
 		AND	A
 		SBC	HL,DE
 		JP	Z,pressedEnter
  ENDIF
-
+		; F2
-; F2
 		LD	HL,#3C00	
 		AND	A
 		SBC	HL,DE
 		JP	Z,SAVEV
-; F3
+		; F3
 		LD	HL,#3D00	
 		AND	A
 		SBC	HL,DE
 		JP	Z,CCHANGE
-; F5
+		; F5
 		LD	HL,#3F00	
 		AND	A
 		SBC	HL,DE
 		JP	Z,OLD_VAL
-; F7
+		; F7
 		LD	HL,#4100	
 		AND	A
 		SBC	HL,DE
 		JP	Z,DEF_VAL
-; F10
+		; F10
 		LD	HL,#4400	
 		AND	A
 		SBC	HL,DE
 		JP	Z,SAVEXIT
-; ESC
+		; ESC
 		LD	HL,#011B	
 		AND	A
 		SBC	HL,DE
@@ -178,54 +177,45 @@ AGAIN:	LD	HL,AGAIN
 		POP	HL
 		RET 
 
-OLD_VAL:
+OLD_VAL:	CALL	READING
-	CALL    READING
 		JR	RestartSetup
 		RET 
 
-DEF_VAL:
+DEF_VAL:	CALL	SETDEF
-	CALL    SETDEF
 ;---------------------------------------
-RestartSetup:	
+RestartSetup:	;setXYpos
-;setXYpos
 		CALL	XY_SCREEN
-;setLang
+		;setLang
 		CALL	SETLAND
-;setVsinc
+		;setVsinc
 		CALL OnChangeAction.setVsinc
-;setInt - „®«¦­  ¡ëâì ¯®á«¥¤­¥©!!!
+		;setInt - „®«¦­  ¡ëâì ¯®á«¥¤­¥©!!!
 		JP OnChangeAction.setInt
 ;---------------------------------------
 
-SAVEXIT:
+SAVEXIT:	CALL	WRITING
-	CALL	WRITING
 		POP	HL
 		RET 
 
-SAVEV:
+SAVEV:		CALL	WRITING
-	CALL	WRITING
 		RET 
 
-SUBITM:
+SUBITM:		CALL	RCURSOR
-	CALL	RCURSOR
 		LD	A,(ITEM)
 		SUB	17							; !HARDCODE max items in column
 		JR	NC,GODITM2
 		XOR	A
-GODITM2:
+GODITM2:	LD	(ITEM),A
-	LD	(ITEM),A
 		JP	PCURSOR
 
-ADDITM:
+ADDITM:		CALL	RCURSOR
-	CALL	RCURSOR
 		LD	A,(ITEM)
 		ADD	A,17							; !HARDCODE max items in column
 		CP	SettingsItemsTabsAddrs.max
 		JR	C,GODITM
 		LD	A,SettingsItemsTabsAddrs.max
 		DEC	A
-GODITM:
+GODITM:		LD	(ITEM),A
-	LD	(ITEM),A
 		JP	PCURSOR
 
 INCITM:		CALL	RCURSOR
@@ -237,8 +227,7 @@ INCITM:	CALL	RCURSOR
 1:		LD	(ITEM),A
 		JP	PCURSOR
 
-DECITM:
+DECITM:		CALL	RCURSOR
-	CALL	RCURSOR
 		LD	A,(ITEM)
 		OR	A
 		JR	NZ,1F
@@ -247,8 +236,7 @@ DECITM:
 		LD	(ITEM),A
 		JP	PCURSOR
 
-CCHANGE:
+CCHANGE:	LD	A,CMOS_CELL.ScreenSET
-	LD	A,CMOS_CELL.ScreenSET
 		CALL	READCMS
 		INC	A
 		AND	high CMOS_CELL.ScreenSET.Mask.ColorStyle
@@ -284,14 +272,13 @@ STT2:	LD	A,C
 		CALL	PCURSOR
 		RET 
 
-PTEXT:	call    Get_Item_Address
+PTEXT:		CALL	Get_Item_Address
 		JP	PITEM
 
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[v]
  IF NEW_FEATURE
 ; New procedure with IY reg
-LocateCursor:
+LocateCursor:	call	Get_Item_Address
-	call    Get_Item_Address
 		LD	E,(IY+MenusItem.Column)
 		LD	D,(IY+MenusItem.Line)
 		ld	a,(IY+MenusItem.Name)
@@ -316,10 +303,8 @@ LocateCursor:
 		SUB	C
 		LD	B,A
 		ret
-
  ELSE
-LocateCursor:
+LocateCursor:	call	Get_Item_Address
-	call    Get_Item_Address
 		LD	E,(HL)
 		INC	HL
 		LD	D,(HL)
@@ -353,22 +338,18 @@ LocateCursor:
  ENDIF
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[^]
 
-PCURSOR:
+PCURSOR:	call	LocateCursor
-	call    LocateCursor
 		LD	A,(CURCLR)
 		JP	PRINTA
 
-RCURSOR:
+RCURSOR:	call	LocateCursor
-	call    LocateCursor
 		LD	A,(NORCLR)
 		JP	PRINTA
 
-FSCREEN:
+FSCREEN:	LD	DE,#0000
-	LD	DE,#0000
 		EI 
 		HALT 
-FSC1:
+FSC1:		PUSH	DE
-	PUSH	DE
 		CALL	LP_SET_PLACE
 
 		LD	A,(NORCLR)
@@ -445,15 +426,13 @@ OVERD:	OR     (IY+MenusItem.ValueMax)
 		JR OVER
 
 
-pressedEnter:
 ; !TODO New Feature
-        ld a,(iy+MenusItem.Type)
+pressedEnter:	ld a,(iy+MenusItem.Type)
 		and a
 		ret z
 		ld l,(iy+MenusItem.Action)
 		ld h,(iy+MenusItem.Action+1)
 		jp (HL)
-
  ELSE
 INCVAL:		call	Get_Item_Address
 		INC	HL
@@ -505,10 +484,8 @@ DECVAL:	call Get_Item_Address
 		CALL	ADDVAL
 		SUB	B
 		JR	OVER
-OVERD:
+OVERD:		OR	(HL)
-	OR	(HL)
 		JR OVER
-
  ENDIF
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[^]
 
@@ -555,16 +532,15 @@ PITEM:  LD      E,(IY+MenusItem.Column)                                 ; x-coor
 		JR	NC,.getParameterNum
 		RLCA 
 		OR	A
-	jr	Z,.printParameter                                       ; ¯¥à¢ë© ¯ à ¬¥âà ¢ë¢®¤¨¬?
+		JR	Z,.printParameter					; ¯¥à¢ë© ¯ à ¬¥âà ¢ë¢®¤¨¬?
 
-	ld c,a
+		LD	C,A
-	xor a
+		XOR	A
-	ld b,a
+		LD	B,A
-	add hl,bc                                                       ; ­ å®¤¨¬ ­®¬¥à ¯ à ¬¥âà 
+		ADD	HL,BC							; ­ å®¤¨¬ ­®¬¥à ¯ à ¬¥âà 
 .printParameter:
-	ld a,(hl)
+		LD	A,(HL)
-	jp POSTMSG
+		JP	POSTMSG
-
  ELSE
 ; ¢ë§®¢ë ¯à®æ¥¤ãà ¡¨®á  ­ ¤¥îâáï ­  â®, çâ® ­¥ª®â®àë¥ à¥£¨áâàë ­¥ ¯®àâïâáï
 ; HL - item's address
@@ -591,21 +567,20 @@ PITEM:	LD	E,(HL)                                                  ; x-coordinate
 		JR	NC,.getParameterNum
 		RLCA 
 		OR	A
-	jr	Z,.printParameter                                       ; ¯¥à¢ë© ¯ à ¬¥âà ¢ë¢®¤¨¬?
+		JR	Z,.printParameter					; ¯¥à¢ë© ¯ à ¬¥âà ¢ë¢®¤¨¬?
 
-	ld c,a
+		LD	C,A
-	xor a
+		XOR	A
-	ld b,a
+		LD	B,A
-	add hl,bc                                                       ; ­ å®¤¨¬ ­®¬¥à ¯ à ¬¥âà 
+		ADD	HL,BC							; ­ å®¤¨¬ ­®¬¥à ¯ à ¬¥âà 
 .printParameter:
-	ld a,(hl)
+		LD	A,(HL)
-	jp POSTMSG
+		JP	POSTMSG
  ENDIF
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[^]
 
 ; <20>¥ ¯®àâ¨â HL
-GET_CMOS_VALUE:
+GET_CMOS_VALUE:	PUSH	BC
-	PUSH	BC
 		LD	A,C
 		CALL	READCMS
 		POP	BC
@@ -620,27 +595,26 @@ GET_CMOS_VALUE:
 READCMS:	LD	D,high CMOSARE
 		LD	E,A
 		CP	CMOS.USED_MAX_ADDRESS+1
-		JR	NC,.error	
+		CCF
+		RET	C
+		;
 		LD	A,(DE)
 		RET
-		;
+
-.error:		SCF
-		RET 
 
 ; [x] ç⮡ ­¥ ¢«¥§«® ªã¤  ­¥ ­ ¤®
-WRITCMS:
+WRITCMS:	LD	D,high CMOSARE
-	LD	D,high CMOSARE
 		LD	E,A
 		CP	CMOS.USED_MAX_ADDRESS+1
-	JR	NC,.error
+		CCF
+		RET	C
+		;
 		LD	A,B
 		LD	(DE),A
 		RET
-.error:	SCF
-	RET 
 
-CHEKSUM:
+
-	LD	BC,DEFVAL.Size*256 + CMOS.USED_MIN_ADDRESS
+CHEKSUM:	LD	BC,DEFVAL.Size*256 + CMOS.USED_MIN_ADDRESS
 		LD	H,#DE			;!HARDCODE
 .loop:		LD	A,C
 		CALL	READCMS
@@ -654,28 +628,23 @@ CHEKSUM:
 		DJNZ	.loop
 		RET 
 
-TEST_CHECKSUM:
+TEST_CHECKSUM:	CALL	CHEKSUM
-	CALL	CHEKSUM
 		LD	A,CMOS_CELL.CheckSum
 		CALL	READCMS
 		CP	H
 		RET 
 
-; TSTCMOS:
+; TSTCMOS:	LD	C,BIOS.CMOS_TEST
-; 	LD	C,BIOS.CMOS_TEST
 ; 		JP_to_BIOS
 
 
-; RDCMOS:
+; RDCMOS:	LD	C,BIOS.CMOS_RD
-; 	LD	C,BIOS.CMOS_RD
 ; 		JP_to_BIOS
 
-; WRCMOS:
+; WRCMOS: 	LD	C,BIOS.CMOS_WR
-; 	LD	C,BIOS.CMOS_WR
 ; 		JP_to_BIOS
 
-READING:
+READING:	LD	D,CMOS.USED_MIN_ADDRESS
-	LD	D,CMOS.USED_MIN_ADDRESS
 .loop:		PUSH	DE
 		CALL	CMOS_RD
 			POP	DE
@@ -705,18 +674,16 @@ WRITING:	CALL	CHEKSUM
 		JR	NZ,.loop
 		RET 
 
-SETDEFX:
+SETDEFX:	LD	A,#FF
-	LD	A,#FF
 		LD	(ERRSUM),A
 		CALL	SETDEF
 		JP	WRITING
 
-SETDEF:							;!TODO ¬®¦¥â ¡ å­ãâì LDIR®¬? ¯®á¬®âà¥âì
+;!TODO ¬®¦¥â ¡ å­ãâì LDIR®¬? ¯®á¬®âà¥âì
-	LD	HL,DEFVAL
+SETDEF:		LD	HL,DEFVAL
 		LD	C,DEFVAL.Size
 		LD	A,CMOS.USED_MIN_ADDRESS
-.loop:
+.loop:		LD	B,(HL)
-	LD	B,(HL)
 		INC	HL
 		PUSH	AF
 		CALL	WRITCMS
@@ -776,14 +743,12 @@ Get_Item_Address:
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[^]
 ;
  MODULE	OnChangeAction
-nothing:
+nothing:	RET
-        ret
 
  ; !TODO New Feature
  ; !TODO § ¬ãâ¨âì çâ®-⮠⨯  API ¤«ï à¨á®¢ ­¨ï ¢á¯«ë¢ îé¨å ®ª®­
  IF NEW_FEATURE
-SetTime:
+SetTime:	xor	a
-         xor     a
 		ld	hl,#050E
 		ld	de,#0C20
 		ld	ix,memBUFFER.Shared
@@ -819,11 +784,9 @@ SetTime:
 		JP	WIN_RESTORE
  ENDIF
 
-setXYpos:
+setXYpos:	JP	XY_SCREEN
-        JP XY_SCREEN
 
-setVsinc:
+setVsinc:	ld	a,CMOS_CELL.ScreenSET
-        ld a,CMOS_CELL.ScreenSET
 		call	READCMS
 		and	high CMOS_CELL.ScreenSET.Mask.Sinc
 		SCF
@@ -834,8 +797,7 @@ setVsinc:
 		dec	a							;320
 .set:		jp	FN_SYNC
 
-setLang:
+setLang:	CALL	SETLAND
-        CALL SETLAND
 		ld	a,(ITEM)
 		ld	(ITEM_Restore),a
 		pop	hl							; delete return adress from stack
@@ -928,83 +890,82 @@ REBOOTM         EQU     #02
 HDDWP		EQU	#01
 ;-----------------------------------------------------------------------;
 
-STYLES:
+STYLES:		; Color	Style 0
-; Color	Style 0
 		DB	COLORS.CGA.PAPER.BLUE		+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.BLUE		+ COLORS.CGA.INK.YELLOW
 		DB	COLORS.CGA.PAPER.RED		+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.BLUE		+ COLORS.CGA.INK.WHITE
-; Color	Style 1
+		; Color	Style 1
 		DB	COLORS.CGA.PAPER.BLUE		+ COLORS.CGA.INK.LGREEN
 		DB	COLORS.CGA.PAPER.BLUE		+ COLORS.CGA.INK.LMAGENT
 		DB	COLORS.CGA.PAPER.MAGENTA	+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.BLUE		+ COLORS.CGA.INK.WHITE
-; Color	Style 2
+		; Color	Style 2
 		DB	COLORS.CGA.PAPER.GREEN		+ COLORS.CGA.INK.LCYAN
 		DB	COLORS.CGA.PAPER.GREEN		+ COLORS.CGA.INK.YELLOW
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.BLACK
 		DB	COLORS.CGA.PAPER.GREEN		+ COLORS.CGA.INK.BLACK
-; Color	Style 3
+		; Color	Style 3
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.BLACK
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.YELLOW
 		DB	COLORS.CGA.PAPER.GREEN		+ COLORS.CGA.INK.BLACK
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.LGREEN
-; Color	Style 4
+		; Color	Style 4
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.BLACK
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.BLUE
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.YELLOW
-; Color	Style 5
+		; Color	Style 5
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.BLACK
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.BROWN
 		DB	COLORS.CGA.PAPER.BROWN		+ COLORS.CGA.INK.LGRAY
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.WHITE
-; Color	Style 6
+		; Color	Style 6
 		DB	COLORS.CGA.PAPER.RED		+ COLORS.CGA.INK.YELLOW
 		DB	COLORS.CGA.PAPER.RED		+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.BLACK		+ COLORS.CGA.INK.GREEN
 		DB	COLORS.CGA.PAPER.RED		+ COLORS.CGA.INK.GREEN
-; Color	Style 7
+		; Color	Style 7
 		DB	COLORS.CGA.PAPER.RED		+ COLORS.CGA.INK.LGRAY
 		DB	COLORS.CGA.PAPER.RED		+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.BLUE		+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.RED		+ COLORS.CGA.INK.WHITE
-; Color	Style 8
+		; Color	Style 8
 		DB	COLORS.CGA.PAPER.MAGENTA	+ COLORS.CGA.INK.LCYAN
 		DB	COLORS.CGA.PAPER.MAGENTA	+ COLORS.CGA.INK.LGREEN
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.BLACK
 		DB	COLORS.CGA.PAPER.MAGENTA	+ COLORS.CGA.INK.WHITE
-; Color	Style 9
+		; Color	Style 9
 		DB	COLORS.CGA.PAPER.MAGENTA	+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.MAGENTA	+ COLORS.CGA.INK.YELLOW
 		DB	COLORS.CGA.PAPER.GREEN		+ COLORS.CGA.INK.BLUE
 		DB	COLORS.CGA.PAPER.MAGENTA	+ COLORS.CGA.INK.LRED
-; Color	Style 10
+		; Color	Style 10
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.BLACK
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.RED
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.WHITE
-; Color	Style 11
+		; Color	Style 11
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.BLUE
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.YELLOW
 		DB	COLORS.CGA.PAPER.MAGENTA	+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.WHITE
-; Color	Style 12
+		; Color	Style 12
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.LGREEN
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.LCYAN
 		DB	COLORS.CGA.PAPER.GREEN		+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.WHITE
-; Color	Style 13
+		; Color	Style 13
 		DB	COLORS.CGA.PAPER.BLACK		+ COLORS.CGA.INK.LGREEN
 		DB	COLORS.CGA.PAPER.BLACK		+ COLORS.CGA.INK.LCYAN
 		DB	COLORS.CGA.PAPER.CYAN		+ COLORS.CGA.INK.YELLOW
 		DB	COLORS.CGA.PAPER.BLACK		+ COLORS.CGA.INK.YELLOW
-; Color	Style 14 (Mono)
+		; Color	Style 14 (Mono)
 		DB	COLORS.CGA.PAPER.BLACK		+ COLORS.CGA.INK.LGRAY
 		DB	COLORS.CGA.PAPER.BLACK		+ COLORS.CGA.INK.WHITE
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.BLACK
 		DB	COLORS.CGA.PAPER.BLACK		+ COLORS.CGA.INK.LGRAY
-; Color	Style 15
+		; Color	Style 15
 		DB	COLORS.CGA.PAPER.BLACK		+ COLORS.CGA.INK.LMAGENT
 		DB	COLORS.CGA.PAPER.BLACK		+ COLORS.CGA.INK.LGREEN
 		DB	COLORS.CGA.PAPER.LGRAY		+ COLORS.CGA.INK.RED
@@ -1034,8 +995,7 @@ DEFVAL: DB	SAVERAM + SETBOOTSOUND + SDELAY1			;#0E - OPTIONS
 
 ;!FIXIT à á¯¨á âì âãâ ï祩ª¨ ª¬®á  ¨ í⮠ᬥ饭¨¥ ¬¥âª®© ¯à¨¢ï§ âì ¢¬¥áâ® #0E ¢ SETDEF
 		_mInfoALIGN 256,0							; ¢ëà ¢­¨¢ ­¨¥ ­   ¤à¥á #XX00
-CMOSARE:
+CMOSARE:	DS	14
-	DS	14
 		;
 		DB	SAVERAM + SETBOOTSOUND + SDELAY1				;#0E - OPTIONS
 		DB	TDL250+TRATE30							;#0F - KEYBOARD