From 2546f299d367caccbee655f1a247e5832b047f86 Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Sat, 23 Jun 2018 22:39:39 -0400
Subject: [PATCH] reset fshcmd in input also made SET use the args instead of
 just reading them

---
 FSHa.asm                  |   6 +++--
 bin/FSHa.8xp              | Bin 1854 -> 1907 bytes
 includes/FshCmd.asm       |  30 +++++++++++++++++++++++
 includes/commands/SET.asm |  50 ++++++++++++++++++++------------------
 4 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/FSHa.asm b/FSHa.asm
index dc6001c..f840b55 100644
--- a/FSHa.asm
+++ b/FSHa.asm
@@ -9,17 +9,19 @@ Setup:
  CALL _homeup      ;Put up home
  CALL _ClrLCDFull  ;Clear screen 
 
- LD HL, $FF
+ LD HL, $00
  CALL fshvarfill
 
 
 Input:
+ LD   HL, $00      ; fill fshcmd with $00
+ CALL fshcmdfill
+
  XOR  A
  LD   (CurCol), A
  LD   HL, PS1
  CALL _PutS 
 
- ;TODO: reset CmdFsh mem
  LD   HL, FshCmd
  LD   DE, 0
  LD   DE, FshCmdInptSize
diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index 8355ea7a15ce7df396a3798d35eb83a9dc566efa..dddae35ac6cbcc001bdc66b83008d887262ec5ff 100644
GIT binary patch
literal 1907
zcmZ{kVN6?96o4<Kr7crO;fK(e_-Ykfx<LmHE1Mk*T884Pv_sqivyP{b6}C~ZG~1di
zF*Ev0STxZ;`{AFqlvd5OGbYQLQnT0Y#olE_UF?sS`AlqOQxigBM(eq+?SKI<dH3FP
z?m6e4@7(iVLxZiy&|+>-RwDDLgQni2$LR_CBt1;M<EEUa?anc@`Dv3rj<nJWv-MC%
zVN)x8UV8s5tC5LVnM|YtCEM=D!kqTwQ1fS!q$=aZ>~*O~bvct%fPq2=Mh^m*{Tp=N
zOwx#4!WJyq0q})6>ht61j2A~g4B^#8`Hv*_Y61lrIM_%bw9JRPElXdAW-OOK>E6Np
z!|*9(SR=hgRj6xfmp$PFm}63WR_O|B#GqN>FyjepBv)^!YghI&v6Lr=;un4R3ADH;
z*JdbJ*WTmZx$;{BKI~a+GRSgmda?Sk+P`$3MZHCb*)M$f4w!>fQOO2;_<}{ZUN>CO
zxp73u<67x(I5oV~R|msEIm5p_3IfN(EElR)XCh3h5gkc9t1mmL)tA+6^AdF(W@2eR
z-6%`(q^h<-ZK5Vo{iMD!BEQQo9mUzZvGi^#6N#j`2$1n*PiK-@t=y@e;2@t^swfYs
z`?G>97-;2SqIA`$l`dk%$5IuDTn#JtV{y%NuHCSVBOK5uR{WS1`LODNALE;|KFon`
z$6P_Tb8bzC;690+B(SFYrD*qC$&OJ#81`cyj!WmT0^EhQ4%Xl%te*;C1(*x#`*S#&
z@?t(^8&vr+Ngz_Md!fjtfgT&mo2Ex6os`)*f}&|Jwwi3H%u0jCPQ7n;OwrWnI0aop
zjnQMLCftZbBBZ1q0x{ezwaeJeUX_Xp-FgF#C*8ULX_Z4sz71lw3CO_FCA93^77?B)
z_$IgU1sB)DlT{#@$z6_+a+8n*6J*pgK1@%)Ord^~ILw{BR#esLpzRY*YI208oF^t|
zdK{6jA=Lb-BuTz5;@jWRXGPUrqt4R~yBo+I4pI-QAN)}9VwHY;jxe4lgYh^S3m45l
zOyJGF*A5|c;8_0~z1;}49X;~;tL9Eby=Ak!VmgS>fc0=sSBGwQL(@<`f4rsjC2eFd
z-`Kp@pgDVfpMK8^FYcoD8_(q>s&@5r_4(ohX2J^0$V|+NJHjNibUiwyFa>a(2O5r)
zg~+py$R|tk=aOVA#W7j7w@j1`YgXVhU$Xu_4_%^yVkrKY$1HRy=Gd>GM&0b6&{zKk
zaIQ6eVjkxV@iQ>)jL*U-kKdlhmg&^eG4TEYYi_$2D-A#8>h+1$MD@_k?*n+@S8#?p
zxzys??|9WLN_y_eTwJtn9#6yn112NIUXhA;a<XSHSCDj)bq2f&Zs{<5Gb%_-0cM5d
zjFgxJuKMrM4Pt(V<4J^8#Cm0-LQMFPkoF*`-vmpjSD-JqLN&zOg9OqJqdfj)umA~u
z0C|T%rT`MN09b-sAUNXSb~vz8G+4ud!?(uSuu;N+2%B*T%?F_p&Bf4mG}R$O(*mPB
zJ{2m^fZs+M2JSeoVM;{TNy4|bC4!xz!5R@Hur<+!jS>+=*i59l1Q77+i1J=+>g#Kx
Ty6AW9Q;x}f6!}M?pFjE^1^AXE

delta 1131
zcmZ{jT}V@57{|}P&W=`V$Dp>0Vuz6pjI<&dR-)nOg{>?i3>Se$K`Ei(q}nRH>ZbHm
z5MdHY?Ry0hQ5436+R>No3C}JBFBTmlOO3J{p<~b498+26;{AA@=l`DH^MB9zZFpz6
zv+s~jzkyny>AGVL)l~XfpnuWxSBQ;K6NXW9OB6-yeu(V3uS;;By+B6wYHnyI!D2DX
zVDdx1XES@m51e-<5q<23XulVt&HYbXn%q7xP|4kLg<WGc%}Kqo=F<@$xRa%JMy@E+
zTGyL?l(>^+juIdPKA6IC+|h+(*atTpB`afXWSDPKee|gOpxxw>tL%T^eJUo2tmp@_
z=ml=d4={1d2PuqwTaL}Hh>Zs_b%{W(?#XiOSvD49@fdQ`2ZH1W7Uk)6K>%2kDeGe4
zD{inpop>F9DDgt=$;RW<QmyNJcbBEE>l_so`APL&4|Zg+Ro0VNdUeJ-9%YJmxA6!K
z`gT1GWQPwFA5V*1U?$<Tp7^fpl*Ykg70J)6^kIG}a9G_*&=jRqVZlAs*wNPRI><lJ
zl&T0H(`;82@$;H(xHf1#oG}PyH#(;%i>Xewb<Mt<4{Nu2A|a4O4lkU25dwm?LW(?R
z)RB5J5(M%#2y(fwD+ID#IDq3up%uphVJHL+mpFS0)o;Ky*_$l1$K~R(@xS9m&WXMt
zj18k0?dY*;O)n*GfJ(UMn4VPhOAuT#CE!$PAtQRV#G7ejO)e^N_jHNFc(WYRut=35
zs<dd8(~OI26H57|l!WK<k94M%YvF7&9&|ikGj?HJSZQM?js-$TIMW8|u#G9D4H4S_
z(wD;@Q-I@qwa#1<52fjG%5mb0@^h|AWI5v@{vy4_>4;=Gk4FB-Ii2Q|)0|b23@7SV
zbKb@KS+d2lR*x#IgS?S8y9UE)R-AII__F-0s}fmOl$KM(%cwI~m4X<4NSqUa@zah@
a<KNKSTw$qcKYQl#h3@?p<*%R`uKokVC{CdO

diff --git a/includes/FshCmd.asm b/includes/FshCmd.asm
index 692d696..d5ca43d 100644
--- a/includes/FshCmd.asm
+++ b/includes/FshCmd.asm
@@ -70,4 +70,34 @@ fshcmdroute:
 
  jp Fin
 
+; fshcmdfill
+;;  fills fshvars with word
+;; Inputs:
+;;  HL: 16b
+fshcmdfill:
+ push hl
+  push de
+   ld d, h
+   ld e, l
+   ld hl, FshCmdArg0
+   ld (hl), e
+   inc hl
+   ld (hl), d
+   inc hl
+   ld (hl), e
+   inc hl
+   ld (hl), d
+   inc hl
+   ld (hl), e
+   inc hl
+   ld (hl), d
+   inc hl
+   ld (hl), e
+   inc hl
+   ld (hl), d
+  pop de
+ pop hl
+ ret
+
+
 #include "includes/commands.inc"
diff --git a/includes/commands/SET.asm b/includes/commands/SET.asm
index e724379..25b646e 100644
--- a/includes/commands/SET.asm
+++ b/includes/commands/SET.asm
@@ -23,34 +23,38 @@ fshcmdSETfArg0Get:
  ld de, 3
  call inputnumstr
  call strtob
- ld de, 0
- ld e, a
+ ld hl, FshCmdArg0
+ ld (hl), a
+ call _NewLine
 fshcmdSETfArg1:
- push de
-  ld hl, FshCmdArg1
-  ld e, (hl)
-  inc hl
-  ld d, (hl)
-  ex de, hl
-  ld de, 0
-  call cpHLDE
- pop de
+ ld hl, FshCmdArg1
+ ld de, 0
+ ld e, (hl)
+ inc hl
+ ld d, (hl)
+ ex de, hl
+ ld de, 0
+ call cpHLDE
  jr nz, fshcmdSETfExe
 fshcmdSETfArg1Get:
- push de
-  call _NewLine
-  xor a
-  ld (CurCol), a
-  ld hl, fshcmdSETfDValue
-  call _PutS
-  ld hl, fshcmdSETfInputBuffer
-  ld de, 3
-  call inputnumstr
-  call strtob
- pop de
+ xor a
+ ld (CurCol), a
+ ld hl, fshcmdSETfDValue
+ call _PutS
+ ld hl, fshcmdSETfInputBuffer
+ ld de, 3
+ call inputnumstr
+ call strtob
+ ld hl, FshCmdArg1
+ ld (hl), a
 fshcmdSETfExe:
+ ld hl, FshCmdArg0
+ ld de, 0
+ ld e, (hl)
+ ld hl, FshCmdArg1
+ ld b, (hl)
  ld hl, 0
- ld l, a
+ ld l, b
  call fshvarset
  call _NewLine
  jp Fin