refact: use sysvars and SCREEN ptrs

Author: boriel

src/arch/zx48k/library-asm/attr.asm

@@ -4,8 +4,7 @@
 #include once <sposn.asm>
 #include once <error.asm>
 #include once <in_screen.asm>
-#include once <const.asm>
-#include once <cls.asm>
+#include once <sysvars.asm>
 
     push namespace core
 
@@ -14,20 +13,18 @@ __ATTR_ADDR:
     ; Contributed by Santiago Romero at http://www.speccy.org
     ld h, 0                     ;  7 T-States
     ld a, d                     ;  4 T-States
+    ld d, h
     add a, a     ; a * 2        ;  4 T-States
     add a, a     ; a * 4        ;  4 T-States
     ld l, a      ; HL = A * 4   ;  4 T-States
 
     add hl, hl   ; HL = A * 8   ; 15 T-States
     add hl, hl   ; HL = A * 16  ; 15 T-States
     add hl, hl   ; HL = A * 32  ; 15 T-States
-
-    ld d, 18h ; DE = 6144 + E. Note: 6144 is the screen size (before attr zone)
     add hl, de
 
-    ld de, (SCREEN_ADDR)    ; Adds the screen address
+    ld de, (SCREEN_ATTR_ADDR)    ; Adds the screen address
     add hl, de
-
     ; Return current screen address in HL
     ret
 
@@ -74,9 +71,9 @@ SET_PIXEL_ADDR_ATTR:
     rrca
     rrca
     and 3
-    or 18h
+
     ld h, a
-    ld de, (SCREEN_ADDR)
+    ld de, (SCREEN_ATTR_ADDR)
     add hl, de  ;; Final screen addr
     jp __SET_ATTR2
 

src/arch/zx48k/library-asm/bright.asm

@@ -1,7 +1,7 @@
 ; Sets bright flag in ATTR_P permanently
 ; Parameter: Paper color in A register
 
-#include once <const.asm>
+#include once <sysvars.asm>
 
     push namespace core
 

src/arch/zx48k/library-asm/cls.asm

@@ -1,28 +1,18 @@
-; JUMPS directly to spectrum CLS
-; This routine does not clear lower screen
-
-;CLS	EQU	0DAFh
-
-; Our faster implementation
+;; Clears the user screen (24 rows)
 
 #include once <sposn.asm>
+#include once <sysvars.asm>
 
     push namespace core
 
 CLS:
     PROC
 
-    LOCAL COORDS
-    LOCAL __CLS_SCR
-    LOCAL ATTR_P
-    LOCAL SCREEN
-
     ld hl, 0
     ld (COORDS), hl
     ld hl, 1821h
     ld (S_POSN), hl
-__CLS_SCR:
-    ld hl, SCREEN
+    ld hl, (SCREEN_ADDR)
     ld (hl), 0
     ld d, h
     ld e, l
@@ -32,19 +22,16 @@ __CLS_SCR:
 
     ; Now clear attributes
 
+    ld hl, (SCREEN_ATTR_ADDR)
+    ld d, h
+    ld e, l
+    inc de
     ld a, (ATTR_P)
     ld (hl), a
     ld bc, 767
     ldir
     ret
 
-COORDS	EQU	23677
-SCREEN	EQU 16384 ; Default start of the screen (can be changed)
-ATTR_P	EQU 23693
-;you can poke (SCREEN_SCRADDR) to change CLS, DRAW & PRINTing address
-
-SCREEN_ADDR EQU (__CLS_SCR + 1) ; Address used by print and other screen routines
-    ; to get the start of the screen
     ENDP
 
     pop namespace

src/arch/zx48k/library-asm/const.asm

@@ -2,7 +2,7 @@
 #include once <print.asm>
 #endif
 
-#include once <const.asm>
+#include once <sysvars.asm>
 
     push namespace core
 

src/arch/zx48k/library-asm/copy_attr.asm

@@ -1,7 +1,7 @@
 ; Sets flash flag in ATTR_P permanently
 ; Parameter: Paper color in A register
 
-#include once <const.asm>
+#include once <sysvars.asm>
 
     push namespace core
 

src/arch/zx48k/library-asm/flash.asm

@@ -1,7 +1,7 @@
 ; Sets ink color in ATTR_P permanently
 ; Parameter: Paper color in A register
 
-#include once <const.asm>
+#include once <sysvars.asm>
 
     push namespace core
 

src/arch/zx48k/library-asm/ink.asm

@@ -1,7 +1,7 @@
 ; Sets OVER flag in P_FLAG permanently
 ; Parameter: OVER flag in bit 0 of A register
 #include once <copy_attr.asm>
-#include once <const.asm>
+#include once <sysvars.asm>
 
     push namespace core
 

src/arch/zx48k/library-asm/over.asm

@@ -1,7 +1,7 @@
 ; Sets paper color in ATTR_P permanently
 ; Parameter: Paper color in A register
 
-#include once <const.asm>
+#include once <sysvars.asm>
 
     push namespace core
 

src/arch/zx48k/library-asm/paper.asm

@@ -1,10 +1,8 @@
 ; vim:ts=4:sw=4:et:
-; vim:ts=4:sw=4:et:
 ; PRINT command routine
 ; Does not print attribute. Use PRINT_STR or PRINT_NUM for that
 
 #include once <sposn.asm>
-#include once <cls.asm>
 #include once <in_screen.asm>
 #include once <table_jump.asm>
 #include once <ink.asm>
@@ -15,7 +13,7 @@
 #include once <inverse.asm>
 #include once <bold.asm>
 #include once <italic.asm>
-#include once <const.asm>
+#include once <sysvars.asm>
 #include once <attr.asm>
 
 ; Putting a comment starting with @INIT <address>
@@ -54,10 +52,8 @@ __PRINTCHAR: ; Print character store in accumulator (A register)
     LOCAL __PRGRAPH
     LOCAL __PRINT_START
     LOCAL __ROM_SCROLL_SCR
-    LOCAL __TVFLAGS
 
     __ROM_SCROLL_SCR EQU 0DFEh
-    __TVFLAGS EQU 5C3Ch
 
 PRINT_JUMP_STATE EQU __PRINT_JUMP + 1
 
@@ -67,11 +63,11 @@ __PRINT_JUMP:
 #ifndef DISABLE_SCROLL
     LOCAL __SCROLL
 __SCROLL:  ; Scroll?
-    ld hl, __TVFLAGS
+    ld hl, TVFLAGS
     bit 1, (hl)
     ret z
     call __ROM_SCROLL_SCR
-    ld hl, __TVFLAGS
+    ld hl, TVFLAGS
     res 1, (hl)
     ret
 #endif
@@ -220,7 +216,7 @@ __PRINT_AT1_END:
     cp l
     jr c, __PRINT_EOL_END    ; Carry if (MAXY) < d
 #ifndef DISABLE_SCROLL
-    ld hl, __TVFLAGS
+    ld hl, TVFLAGS
     set 1, (hl)
     dec a
 #else
@@ -479,7 +475,7 @@ PRINT_AT: ; Changes cursor to ROW, COL
     call __IN_SCREEN
     ret nc    ; Return if out of screen
 #ifndef DISABLE_SCROLL
-    ld hl, __TVFLAGS
+    ld hl, TVFLAGS
     res 1, (hl)
 #endif
     jp __SAVE_S_POSN