From 753a4747dd6fd900655d0736ce184ec2dada68cf Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Thu, 28 Jun 2018 23:22:27 -0400
Subject: [PATCH] restructured commands

---
 FSHa.asm                                   |   8 ++---
 bin/FSHa.8xp                               | Bin 2857 -> 2826 bytes
 includes/Command.asm                       |  36 +++++++++++++++++++++
 includes/FshCmd.asm                        |  26 +--------------
 includes/{ => FshCommands}/FshCommands.inc |   0
 5 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 includes/Command.asm
 rename includes/{ => FshCommands}/FshCommands.inc (100%)

diff --git a/FSHa.asm b/FSHa.asm
index 2121a43..e5d5ccf 100644
--- a/FSHa.asm
+++ b/FSHa.asm
@@ -12,8 +12,8 @@ Setup:
  CALL fshvarreset
 
 Input:
- LD   C, $00
- CALL fshcmdfill
+ LD   A, $00
+ CALL commandfill
 
  LD   HL, PS1
  CALL printprompt 
@@ -27,7 +27,7 @@ Input:
 Decode:
  LD   HL, FshCmd
  LD   DE, FshCmdOP
- CALL fshcmddecode
+ CALL commanddecode
 
 Route:
  LD   HL, FshCmdOP
@@ -59,7 +59,7 @@ FshFlags: .DB %00000000
 #include "includes/Cursor.asm"
 #include "includes/Print.asm"
 
-#include "includes/FshCmd.asm"
+#include "includes/Command.asm"
 #include "includes/Err.asm"
 #include "includes/String.asm"
 
diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index 96aaca57f7147c34ecf5382e7a69f4d5c3643eca..d2b10ee000c8e13a974738bdef64a0540cf87ca5 100644
GIT binary patch
literal 2826
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
ZBhbVEvy5N^i5bmP#2JByhZz;^_!qQ|V@?17

literal 2857
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
PG)oa@1Rfq|WZ(J^HG5(e

diff --git a/includes/Command.asm b/includes/Command.asm
new file mode 100644
index 0000000..ffb3549
--- /dev/null
+++ b/includes/Command.asm
@@ -0,0 +1,36 @@
+;;Commanddecode
+;;Decodes all commands.
+;;Inputs:
+;; HL: Cmd String mem loc
+;; DE: Op code mem loc
+;;Output:
+;; Sets (DE) with command op code
+commanddecode:
+ ;add more
+ call fshcmddecode
+ ret
+
+; commandfill
+;;  fills command mem with byte a
+commandfill:
+ push hl
+  push bc
+   push de
+    ld b, 0
+    ld de, 0
+    ld c, a
+    ld hl, FshCmd
+commandfillLoop:
+    ld (hl), c
+    inc hl
+    inc b
+    inc de
+    ld a, b
+    cp FshCmdSize
+    jr c, commandfillLoop
+   pop de
+  pop bc
+ pop hl
+ ret
+
+#include "includes/FshCmd.asm"
diff --git a/includes/FshCmd.asm b/includes/FshCmd.asm
index 870c674..e169512 100644
--- a/includes/FshCmd.asm
+++ b/includes/FshCmd.asm
@@ -98,28 +98,4 @@ fshcmdroute:
  ld (hl), $01
  jp Err
 
-; fshvarfill
-;;  fills fshcmd with byte
-;; Inputs:
-;;  C: byte
-fshcmdfill:
- push hl
-  push bc
-   push de
-    ld b, 0
-    ld de, 0
-    ld hl, FshCmd
-fshcmdfillLoop:
-    ld (hl), c
-    inc hl
-    inc b
-    inc de
-    ld a, b
-    cp FshCmdSize
-    jr c, fshcmdfillLoop
-   pop de
-  pop bc
- pop hl
- ret
-
-#include "includes/FshCommands.inc"
+#include "includes/FshCommands/FshCommands.inc"
diff --git a/includes/FshCommands.inc b/includes/FshCommands/FshCommands.inc
similarity index 100%
rename from includes/FshCommands.inc
rename to includes/FshCommands/FshCommands.inc