From f6002a149c84f9b97f9a0838c3977cff2e443d07 Mon Sep 17 00:00:00 2001
From: jede <jede@oric.org>
Date: Sat, 25 Feb 2017 21:32:06 +0100
Subject: [PATCH 1/5] adding gotoxy.s

---
 asminc/telestrat.inc      |  5 +++++
 libsrc/telestrat/gotoxy.s | 15 +++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 libsrc/telestrat/gotoxy.s

diff --git a/asminc/telestrat.inc b/asminc/telestrat.inc
index 2c3502ba8..ab209e520 100644
--- a/asminc/telestrat.inc
+++ b/asminc/telestrat.inc
@@ -107,6 +107,7 @@ XWR0             = $10
 XWSTR0           = $14 
 XTEXT            = $19
 XHIRES           = $1A
+XFILLM           = $1C
 XMINMA           = $1F
 XFREAD           = $27          ; only in TELEMON 3.0
 XOPEN            = $30          ; only in TELEMON 3.0
@@ -128,6 +129,10 @@ XINK             = $93
 XEXPLO           = $9C 
 XPING            = $9D
 
+; ---------------------------------------------------------------------------
+; Page $200
+SCRX             := $220
+SCRY             := $224
 
 ; ---------------------------------------------------------------------------
 ; Page $500
diff --git a/libsrc/telestrat/gotoxy.s b/libsrc/telestrat/gotoxy.s
new file mode 100644
index 000000000..18e010ae2
--- /dev/null
+++ b/libsrc/telestrat/gotoxy.s
@@ -0,0 +1,15 @@
+    .export    _gotoxy
+	
+    .import    popa
+	
+    .importzp  sp,tmp2,tmp3,tmp1
+
+    .include   "telestrat.inc"
+
+
+.proc _gotoxy
+   sta SCRY
+   jsr popa
+   sta SCRX
+   rts
+.endproc	

From 4f1d007fb4cfbd20b7bf45e1bf14f41fcabd08ab Mon Sep 17 00:00:00 2001
From: jede <jede@oric.org>
Date: Sat, 25 Feb 2017 21:32:42 +0100
Subject: [PATCH 2/5] Correcting typo

---
 doc/telestrat.sgml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/telestrat.sgml b/doc/telestrat.sgml
index 9032156ee..fda4dee86 100644
--- a/doc/telestrat.sgml
+++ b/doc/telestrat.sgml
@@ -141,7 +141,7 @@ Telestrat manages also mouse, but it had been no handled yet in this version.
 
 Telestrat has a RS232 port, but it's not used
 
-</descrip><
+</descrip>
 
 <sect>Limitations<label id="limitations"><p>
 

From 1497330cc06512aff6a6708ba2d9e053b38ca7e1 Mon Sep 17 00:00:00 2001
From: jede <jede@oric.org>
Date: Sat, 25 Feb 2017 22:10:13 +0100
Subject: [PATCH 3/5] adding clrscr.s

---
 asminc/telestrat.inc      |  3 +++
 libsrc/telestrat/clrscr.s | 31 +++++++++++++++++++++++++++++++
 libsrc/telestrat/gotoxy.s |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 libsrc/telestrat/clrscr.s

diff --git a/asminc/telestrat.inc b/asminc/telestrat.inc
index ab209e520..8a51e1c32 100644
--- a/asminc/telestrat.inc
+++ b/asminc/telestrat.inc
@@ -133,6 +133,9 @@ XPING            = $9D
 ; Page $200
 SCRX             := $220
 SCRY             := $224
+ADSCRL           := $218
+ADSCRH           := $21C
+
 
 ; ---------------------------------------------------------------------------
 ; Page $500
diff --git a/libsrc/telestrat/clrscr.s b/libsrc/telestrat/clrscr.s
new file mode 100644
index 000000000..8c45aeeec
--- /dev/null
+++ b/libsrc/telestrat/clrscr.s
@@ -0,0 +1,31 @@
+    .export    _clrscr
+	
+    .importzp  sp
+	
+    .include   "telestrat.inc"
+
+.proc _clrscr
+    lda     #<SCREEN
+	ldy     #>SCREEN
+    sta     RES
+    sty     RES+1
+
+    ldy     #<(SCREEN+SCREEN_XSIZE*SCREEN_YSIZE)
+    ldx     #>(SCREEN+SCREEN_XSIZE*SCREEN_YSIZE)
+    lda     #' '
+    BRK_TELEMON XFILLM
+	
+	
+	; reset prompt position
+    lda     #<(SCREEN+40)
+    sta     ADSCRL
+    lda     #>(SCREEN+40)
+    sta     ADSCRH
+	
+	; reset display position
+	lda     #$01
+    sta     SCRY
+    lda     #$02
+    sta     SCRX	
+    rts
+.endproc	
diff --git a/libsrc/telestrat/gotoxy.s b/libsrc/telestrat/gotoxy.s
index 18e010ae2..fb659d968 100644
--- a/libsrc/telestrat/gotoxy.s
+++ b/libsrc/telestrat/gotoxy.s
@@ -8,6 +8,8 @@
 
 
 .proc _gotoxy
+   ; This function move only cursor for display, it does not move the prompt position
+   ; in telemon, there is position for prompt, and another for the cursor
    sta SCRY
    jsr popa
    sta SCRX

From 7bc3bff83f682f9c511e272e30ae3736ca3681aa Mon Sep 17 00:00:00 2001
From: jede <jede@oric.org>
Date: Sat, 25 Feb 2017 22:20:17 +0100
Subject: [PATCH 4/5] adding gotox.s gotoy.s wherex.s wherey.s

---
 libsrc/telestrat/clrscr.s |  6 +++++-
 libsrc/telestrat/gotox.s  | 16 ++++++++++++++++
 libsrc/telestrat/gotoxy.s |  9 ++++++---
 libsrc/telestrat/gotoy.s  | 14 ++++++++++++++
 libsrc/telestrat/wherex.s | 15 +++++++++++++++
 libsrc/telestrat/wherey.s | 15 +++++++++++++++
 6 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 libsrc/telestrat/gotox.s
 create mode 100644 libsrc/telestrat/gotoy.s
 create mode 100644 libsrc/telestrat/wherex.s
 create mode 100644 libsrc/telestrat/wherey.s

diff --git a/libsrc/telestrat/clrscr.s b/libsrc/telestrat/clrscr.s
index 8c45aeeec..891c4162d 100644
--- a/libsrc/telestrat/clrscr.s
+++ b/libsrc/telestrat/clrscr.s
@@ -1,3 +1,7 @@
+;
+; jede jede@oric.org 2017-02-25
+; 
+
     .export    _clrscr
 	
     .importzp  sp
@@ -25,7 +29,7 @@
 	; reset display position
 	lda     #$01
     sta     SCRY
-    lda     #$02
+    lda     #$00
     sta     SCRX	
     rts
 .endproc	
diff --git a/libsrc/telestrat/gotox.s b/libsrc/telestrat/gotox.s
new file mode 100644
index 000000000..d6af0e4dd
--- /dev/null
+++ b/libsrc/telestrat/gotox.s
@@ -0,0 +1,16 @@
+;
+; jede jede@oric.org 2017-02-25
+;
+    .export    _gotox
+	
+    .import    popa
+	
+    .importzp  sp
+
+    .include   "telestrat.inc"
+
+
+.proc _gotox
+   sta    SCRX
+   rts
+.endproc	
diff --git a/libsrc/telestrat/gotoxy.s b/libsrc/telestrat/gotoxy.s
index fb659d968..7aa83b71d 100644
--- a/libsrc/telestrat/gotoxy.s
+++ b/libsrc/telestrat/gotoxy.s
@@ -1,3 +1,6 @@
+;
+; jede jede@oric.org 2017-02-25
+;
     .export    _gotoxy
 	
     .import    popa
@@ -10,8 +13,8 @@
 .proc _gotoxy
    ; This function move only cursor for display, it does not move the prompt position
    ; in telemon, there is position for prompt, and another for the cursor
-   sta SCRY
-   jsr popa
-   sta SCRX
+   sta    SCRY
+   jsr    popa
+   sta    SCRX
    rts
 .endproc	
diff --git a/libsrc/telestrat/gotoy.s b/libsrc/telestrat/gotoy.s
new file mode 100644
index 000000000..d71570f10
--- /dev/null
+++ b/libsrc/telestrat/gotoy.s
@@ -0,0 +1,14 @@
+;
+; jede jede@oric.org 2017-02-25
+;
+    .export    _gotoy
+
+    .importzp  sp
+
+    .include   "telestrat.inc"
+
+
+.proc _gotoy
+   sta     SCRY
+   rts
+.endproc	
diff --git a/libsrc/telestrat/wherex.s b/libsrc/telestrat/wherex.s
new file mode 100644
index 000000000..6d9587ba8
--- /dev/null
+++ b/libsrc/telestrat/wherex.s
@@ -0,0 +1,15 @@
+;
+; jede jede@oric.org 2017-02-25
+;
+    .export    _wherex
+	
+    .importzp  sp
+
+    .include   "telestrat.inc"
+
+
+.proc _wherex
+    ldx    #$00
+    lda    SCRX
+    rts
+.endproc	
diff --git a/libsrc/telestrat/wherey.s b/libsrc/telestrat/wherey.s
new file mode 100644
index 000000000..e211ed5b9
--- /dev/null
+++ b/libsrc/telestrat/wherey.s
@@ -0,0 +1,15 @@
+;
+; jede jede@oric.org 2017-02-25
+; 
+    .export    _wherey
+	
+    .importzp  sp
+
+    .include   "telestrat.inc"
+
+
+.proc _wherey
+    ldx    #$00
+    lda    SCRY
+    rts
+.endproc	

From b0e035ba2b654891c98d7bf0de912e8d4da68798 Mon Sep 17 00:00:00 2001
From: jede <jede@oric.org>
Date: Sat, 25 Feb 2017 22:23:46 +0100
Subject: [PATCH 5/5] Cleaning

---
 libsrc/telestrat/clrscr.s | 8 ++++----
 libsrc/telestrat/gotoxy.s | 3 +--
 libsrc/telestrat/gotoy.s  | 1 -
 libsrc/telestrat/wherex.s | 1 -
 libsrc/telestrat/wherey.s | 1 -
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libsrc/telestrat/clrscr.s b/libsrc/telestrat/clrscr.s
index 891c4162d..f2b8fafc1 100644
--- a/libsrc/telestrat/clrscr.s
+++ b/libsrc/telestrat/clrscr.s
@@ -10,7 +10,7 @@
 
 .proc _clrscr
     lda     #<SCREEN
-	ldy     #>SCREEN
+    ldy     #>SCREEN
     sta     RES
     sty     RES+1
 
@@ -20,14 +20,14 @@
     BRK_TELEMON XFILLM
 	
 	
-	; reset prompt position
+    ; reset prompt position
     lda     #<(SCREEN+40)
     sta     ADSCRL
     lda     #>(SCREEN+40)
     sta     ADSCRH
 	
-	; reset display position
-	lda     #$01
+    ; reset display position
+    lda     #$01
     sta     SCRY
     lda     #$00
     sta     SCRX	
diff --git a/libsrc/telestrat/gotoxy.s b/libsrc/telestrat/gotoxy.s
index 7aa83b71d..e0c8154e3 100644
--- a/libsrc/telestrat/gotoxy.s
+++ b/libsrc/telestrat/gotoxy.s
@@ -5,11 +5,10 @@
 	
     .import    popa
 	
-    .importzp  sp,tmp2,tmp3,tmp1
+    .importzp  sp
 
     .include   "telestrat.inc"
 
-
 .proc _gotoxy
    ; This function move only cursor for display, it does not move the prompt position
    ; in telemon, there is position for prompt, and another for the cursor
diff --git a/libsrc/telestrat/gotoy.s b/libsrc/telestrat/gotoy.s
index d71570f10..ed7101c80 100644
--- a/libsrc/telestrat/gotoy.s
+++ b/libsrc/telestrat/gotoy.s
@@ -7,7 +7,6 @@
 
     .include   "telestrat.inc"
 
-
 .proc _gotoy
    sta     SCRY
    rts
diff --git a/libsrc/telestrat/wherex.s b/libsrc/telestrat/wherex.s
index 6d9587ba8..0dd5139e1 100644
--- a/libsrc/telestrat/wherex.s
+++ b/libsrc/telestrat/wherex.s
@@ -7,7 +7,6 @@
 
     .include   "telestrat.inc"
 
-
 .proc _wherex
     ldx    #$00
     lda    SCRX
diff --git a/libsrc/telestrat/wherey.s b/libsrc/telestrat/wherey.s
index e211ed5b9..4958f10cf 100644
--- a/libsrc/telestrat/wherey.s
+++ b/libsrc/telestrat/wherey.s
@@ -7,7 +7,6 @@
 
     .include   "telestrat.inc"
 
-
 .proc _wherey
     ldx    #$00
     lda    SCRY