Include "extzp.inc" instead of using direct imports of symbols.

diff --git a/libsrc/osic1p/clrscr.s b/libsrc/osic1p/clrscr.s
index 48fb5d4f24f5f3867617709d260115c101dad33c..d2346659b49c1240eba830340b0205beb3b493a2 100644 (file)
--- a/libsrc/osic1p/clrscr.s
+++ b/libsrc/osic1p/clrscr.s
@@ -3,7 +3,7 @@
 ;\r
         .export         _clrscr\r
         .import         plot\r
-        .importzp       CURS_X, CURS_Y\r
+        .include        "extzp.inc"\r
         .include        "osic1p.inc"\r
 \r
 ; Adapted from the Challenger Character Graphics\r

diff --git a/libsrc/osic1p/gotox.s b/libsrc/osic1p/gotox.s
index fb84975d188914aaa5a0de4b76436efd1962eeac..0dea72b9aba0d7f7d8dd5bdf1c090d6c8b63e897 100644 (file)
--- a/libsrc/osic1p/gotox.s
+++ b/libsrc/osic1p/gotox.s
@@ -6,8 +6,8 @@
 ; void gotox (unsigned char x);
 ;
         .export         _gotox
-        .import         plot           
-        .importzp       CURS_X
+        .import         plot
+        .include        "extzp.inc"
 
 _gotox: sta     CURS_X          ; Set new position
         jmp     plot            ; And activate it

diff --git a/libsrc/osic1p/gotoxy.s b/libsrc/osic1p/gotoxy.s
index 32d1f1df27ea3930ffde1843402a661195666aaa..f76537349d16266ba9565b4120b2abcbd5975b85 100644 (file)
--- a/libsrc/osic1p/gotoxy.s
+++ b/libsrc/osic1p/gotoxy.s
@@ -8,7 +8,7 @@
 ;
         .export         _gotoxy
         .import         popa, plot
-        .importzp       CURS_X, CURS_Y
+        .include        "extzp.inc"
 
 _gotoxy:
         sta     CURS_Y          ; Set Y

diff --git a/libsrc/osic1p/gotoy.s b/libsrc/osic1p/gotoy.s
index fcd60dd3115ff1edf6e5af7a2faf94b40d6a7b5a..693863d94ccb744be2fa0aae6a5b0c9225187db1 100644 (file)
--- a/libsrc/osic1p/gotoy.s
+++ b/libsrc/osic1p/gotoy.s
@@ -7,7 +7,7 @@
 ;
         .export         _gotoy
         .import         plot
-        .importzp       CURS_Y
+        .include        "extzp.inc"
 
 _gotoy: sta     CURS_Y          ; Set the new position
         jmp     plot            ; And activate it

diff --git a/libsrc/osic1p/wherex.s b/libsrc/osic1p/wherex.s
index 7c772a5a2ea25eb6699880d81dfc150a4d3e2190..1155a8abda9fac2c6158bc0b6e43e6e29adb6fb6 100644 (file)
--- a/libsrc/osic1p/wherex.s
+++ b/libsrc/osic1p/wherex.s
@@ -5,7 +5,7 @@
 ; unsigned char wherex (void);
 ;
         .export         _wherex
-        .import         CURS_X: zp
+        .include        "extzp.inc"
 
 .proc   _wherex
         lda     CURS_X

diff --git a/libsrc/osic1p/wherey.s b/libsrc/osic1p/wherey.s
index 7449c1ceba223e2ed1fcff3c0e113a2c97f8ff2a..632cf4a159f135de76860f8d883f044401f7f1de 100644 (file)
--- a/libsrc/osic1p/wherey.s
+++ b/libsrc/osic1p/wherey.s
@@ -5,7 +5,7 @@
 ; unsigned char wherey (void);
 ;
         .export         _wherey
-        .import         CURS_Y: zp
+        .include        "extzp.inc"
 
 .proc   _wherey
         lda     CURS_Y