Fixed syntax and missed definitions

basic.asm

@@ -12,7 +12,6 @@
     INCLUDE "monitor.inc"
     INCLUDE "ordos.inc"
     INCLUDE "ioports.inc"
-;    INCLUDE "resident.inc"
 
 
 ; --------------------------------------------------
@@ -37,11 +36,12 @@
 
 START:
 
-;    INCLUDE "main.asm"
+    INCLUDE "main.asm"
 
     OUTEND
 
-;    INCLUDE "data.asm"
+    INCLUDE "variables.inc"
+    INCLUDE "safe.inc"
 
 ; --------------------------------------------------
 

equates.inc

@@ -189,6 +189,11 @@ STRSIZ      EQU 4
 NUMTMP      EQU 3
 BUFLEN      EQU 37                                  ; but 130 = 0x82 can be used
 
+
+SCR_ADDR    EQU 0xC000
+SCR_WIDTH   EQU 384
+SCR_HEIGHT  EQU 256
+
 ; --------------------------------------------------
 ; Error codes
 ; --------------------------------------------------

ioports.inc

@@ -74,7 +74,7 @@ FDC_F708_SIDE  EQU 0xf708
 ;    bit 1 - color count 0 - 16 colors, 1 - 4 colors;
 ;    bit 2 - 0-mono, 1-color;
 ; --------------------------------------------------
-PORT_SYS1   EQU 0xF800
+PORT_SYS1   EQU 0xF8
 
 
 ; Write only system port mapped to RAM address.

ordos.inc

@@ -79,5 +79,8 @@ ORD_WFILE   EQU 0xbff7
 ;       SP+2 -> return to OS address
 ORD_RFILE   EQU 0xbffa
 
-; ORDOS Start. Entry point to ORDOS
-ORD_START   EQU 0xbffd
+; ORDOS Start. Entry point to ORDOS (JP)
+ORD_START   EQU 0xBFFD
+
+; Start sddress of ORDOS
+ORD_STADR   EQU 0xBFFE

safe.inc

@@ -21,6 +21,7 @@ ORI_SAFE_SET_ATTR EQU 0xF300
 ; --------------------------------------------------
 ORI_SCR_ANDOR EQU 0xF310
 
+ORI_SCR_OP2_1 EQU 0xF319
 
 ; --------------------------------------------------
 ; Mask by OR hi 4 bit of extended RAM byte:
@@ -31,6 +32,10 @@ ORI_SCR_ANDOR EQU 0xF310
 ; --------------------------------------------------
 ORI_MSK_HI_OR EQU 0xF31F
 
+CLRCLNXT      EQU 0xF32C
+CURCATR       EQU 0xF32F
+CLRCLUP       EQU 0xF330
+
 ; --------------------------------------------------
 ; Fill screen attributes
 ;  Inp: A - memory page
@@ -39,6 +44,8 @@ ORI_MSK_HI_OR EQU 0xF31F
 ; --------------------------------------------------
 ORI_SCR_FA  EQU 0xF32A
 
+CLRCLRT     EQU 0xF341
+
 ; Variable
 SAF_CURATR  EQU 0xF349
 
@@ -56,3 +63,9 @@ ORI_MON_TV2 EQU 0xF34B
 ; Buffer for filename (12 bytes)
 ; --------------------------------------------------
 FNAMBUF EQU 0xF354
+
+; --------------------------------------------------
+; Stack for safe call MONITOR subroutines
+; when one of extended RAM-page active
+; --------------------------------------------------
+SAFESTK EQU 0xF3C0

variables.inc

@@ -63,6 +63,4 @@ SPR_HEIGHT  DS 1
 SPR_WIDTH   DS 1
 SPR_BUFADR  DS 2
             DS 16
-SPR_TOP  $
-    
-    
+SPR_TOP     EQU $