From 9aed40be6fe80502657b8655cbaf3d560475bbba Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Thu, 28 Jun 2018 18:21:16 -0400
Subject: [PATCH] added Print.asm added printprompt cleaned up command code

---
 FSHa.asm                      |  5 ++---
 includes/FshCommands/COPY.asm | 12 +++---------
 includes/FshCommands/MOVE.asm | 10 ++--------
 includes/FshCommands/SET.asm  | 10 ++--------
 includes/FshCommands/VARS.asm |  4 ++--
 includes/Print.asm            | 11 +++++++++++
 6 files changed, 22 insertions(+), 30 deletions(-)
 create mode 100644 includes/Print.asm

diff --git a/FSHa.asm b/FSHa.asm
index 7528235..2121a43 100644
--- a/FSHa.asm
+++ b/FSHa.asm
@@ -15,10 +15,8 @@ Input:
  LD   C, $00
  CALL fshcmdfill
 
- XOR  A
- LD   (CurCol), A
  LD   HL, PS1
- CALL _PutS 
+ CALL printprompt 
 
  LD   HL, FshCmd
  LD   DE, FshCmdInptSize
@@ -59,6 +57,7 @@ FshFlags: .DB %00000000
 #include "includes/Byte.asm"
 #include "includes/Char.asm"
 #include "includes/Cursor.asm"
+#include "includes/Print.asm"
 
 #include "includes/FshCmd.asm"
 #include "includes/Err.asm"
diff --git a/includes/FshCommands/COPY.asm b/includes/FshCommands/COPY.asm
index d96f129..88162b3 100644
--- a/includes/FshCommands/COPY.asm
+++ b/includes/FshCommands/COPY.asm
@@ -13,12 +13,8 @@ fshcmdCOPYfArg0:
  call cpHLDE
  jr nz, fshcmdCOPYfArg1
 fshcmdCOPYfArg0Get:
- ld a, 'G'
- call _PutC
- xor a
- ld (CurCol), a
  ld hl, fshcmdCOPYfDSource
- call _PutS
+ call printprompt
  ld hl, fshcmdCOPYfInputBuffer
  ld de, 3
  call inputnumstr
@@ -37,10 +33,8 @@ fshcmdCOPYfArg1:
  call cpHLDE
  jr nz, fshcmdCOPYfExe
 fshcmdCOPYfArg1Get:
- xor a
- ld (CurCol), a
  ld hl, fshcmdCOPYfDDestination
- call _PutS
+ call printprompt
  ld hl, fshcmdCOPYfInputBuffer
  ld de, 3
  call inputnumstr
@@ -62,6 +56,6 @@ fshcmdCOPYfExe:
  call _NewLine
  jp ErrCatch 
 
-fshcmdCOPYfInputBuffer: .db $00, $00, $00, $00, $00, $00
+fshcmdCOPYfInputBuffer: .db $00, $00, $00, $00
 fshcmdCOPYfDSource: .db "Source= ", 0
 fshcmdCOPYfDDestination: .db "Destination= ", 0
diff --git a/includes/FshCommands/MOVE.asm b/includes/FshCommands/MOVE.asm
index ee8c80e..30c5fca 100644
--- a/includes/FshCommands/MOVE.asm
+++ b/includes/FshCommands/MOVE.asm
@@ -13,12 +13,8 @@ fshcmdMOVEfArg0:
  call cpHLDE
  jr nz, fshcmdMOVEfArg1
 fshcmdMOVEfArg0Get:
- ld a, 'G'
- call _PutC
- xor a
- ld (CurCol), a
  ld hl, fshcmdMOVEfDSource
- call _PutS
+ call printprompt
  ld hl, fshcmdMOVEfInputBuffer
  ld de, 3
  call inputnumstr
@@ -37,10 +33,8 @@ fshcmdMOVEfArg1:
  call cpHLDE
  jr nz, fshcmdMOVEfExe
 fshcmdMOVEfArg1Get:
- xor a
- ld (CurCol), a
  ld hl, fshcmdMOVEfDDestination
- call _PutS
+ call printprompt
  ld hl, fshcmdMOVEfInputBuffer
  ld de, 3
  call inputnumstr
diff --git a/includes/FshCommands/SET.asm b/includes/FshCommands/SET.asm
index 47cbd84..893fb68 100644
--- a/includes/FshCommands/SET.asm
+++ b/includes/FshCommands/SET.asm
@@ -13,12 +13,8 @@ fshcmdSETfArg0:
  call cpHLDE
  jr nz, fshcmdSETfArg1
 fshcmdSETfArg0Get:
- ld a, 'G'
- call _PutC
- xor a
- ld (CurCol), a
  ld hl, fshcmdSETfDIndex
- call _PutS
+ call printprompt
  ld hl, fshcmdSETfInputBuffer
  ld de, 3
  call inputnumstr
@@ -37,10 +33,8 @@ fshcmdSETfArg1:
  call cpHLDE
  jr nz, fshcmdSETfExe
 fshcmdSETfArg1Get:
- xor a
- ld (CurCol), a
  ld hl, fshcmdSETfDValue
- call _PutS
+ call printprompt
  ld hl, fshcmdSETfInputBuffer
  ld de, 5
  call inputnumstr
diff --git a/includes/FshCommands/VARS.asm b/includes/FshCommands/VARS.asm
index 7f1afe5..2792fe0 100644
--- a/includes/FshCommands/VARS.asm
+++ b/includes/FshCommands/VARS.asm
@@ -23,11 +23,11 @@ fshcmdVARSfLoop:
    pop bc
   pop hl
   ld c, 0
-  jr fshcmdVARSfLoopBack
+  jr fshcmdVARSfLoopEnd
 fshcmdVARSfLoopU:
   ld a, '_'
   call _PutC
-fshcmdVARSfLoopBack:  
+fshcmdVARSfLoopEnd:
   inc b
   inc de
   ld a, b
diff --git a/includes/Print.asm b/includes/Print.asm
new file mode 100644
index 0000000..9391baf
--- /dev/null
+++ b/includes/Print.asm
@@ -0,0 +1,11 @@
+;;printprompt
+;;Sets curcol to 0 and prints prompt
+;;Inputs:
+;; HL: Prompt String Location
+printprompt:
+ push hl
+  xor a
+  ld (CurCol), a
+  call _PutS
+ pop hl
+ ret