From caf65684c32bbb0723d604d5253fc6e84b050cd5 Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Sat, 23 Jun 2018 22:17:19 -0400
Subject: [PATCH] SET now uses arguments renamed arguments in define

---
 bin/FSHa.8xp              | Bin 1806 -> 1854 bytes
 includes/commands/SET.asm |  26 ++++++++++++++++++++++++++
 includes/define.inc       |   8 ++++----
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index 3edf07376c26b6661009dccea81e936331f0edd9..8355ea7a15ce7df396a3798d35eb83a9dc566efa 100644
GIT binary patch
delta 856
zcmZ{hPiPZC6vlVA$)-`PT~TQdfsBEegOwr}LXn^s+g>bM5Jegf-YuS5p>2wI^3YmW
zJt)<KLbGQ7SnNR*OTmI<(joi6^&ogy=ps~#B0UvceY5FW)5bl#H#6^j^M2p#RNG?P
z-IE8Sv3<gZET0|hJ0k?&hWvA;zf1fuGm;iB%s(lKiE0_xW(kO023WbHf$KTSv#ql^
z^_q0#5LVbN4d~Z0D05ruH|is)r%1FlTfut^sf*uuX7@BmX7au4bxg8OJdD~z#r~z3
zM5a;Of(?@<u%jCA=Bo}Vui5`fA(?X6k5Kx!xfBR$hne^S*sD}aR3z;>bWXSxkDsT7
zVP$B?KCAXe5|=CkJcl5XGH(DwpWw2Wt&-Kt7Ia|mbnvtExB-5Sp2E1F4q=Sbrv?m+
zI_p<Z{T4DGZ+_a7tNH2f>aXg7!pdzOmY=JOk;Cy-9Y%eDuIlQ9+)@0y1CKn2+UM{^
z2@X|ocztj_8R0L~zPYo&+i$qud%Phluu`j(PqKxW<U$3#368fuIBteEiujVvY~*ru
zugM)8!x*R6&AI~=qJz)efrAc!Aw7o}NkuxAIeg6s;A=);1=BV>j%p6yPzd2sx*MLe
z4_G1ldFwyywC78}?g#9rtvWjj8`<yU@A{pog#1gKe^worJ1@_g0Y0W}e4N%Czo8J~
QqjWbuDX8D&gw!|o2a}<<mjD0&

delta 791
zcmZ{hO-LI-6vsDX+%?6oEmiaobQDrADI!#YV89-1d#DO}Pztr6w<01fL@$cclhC3p
zw$OrlOvrv%3@8X9Z7vy|)(376dT|eXw0IU>`*!0h(Kv@UJM-S#|L^~1yYh48!qZ2l
zSRrIZvAh38m*B0e_;c}PH1KsX5eYQ?SWX7Q-_yX)l0a9}0DJQ(uxwL)e|48oMo3c)
zX82qR*hU)U#MSq_@{M%FjkYhP`*Z~Fb|gZFF<&AGyiW)II0Z5a4x9W`BKfj+x69U_
zmDC34aT@BUt(;A<JR*$CQMK?aDpSGm;EV>gNl{In)qo==SbVLF7|;1f75FC=oOb45
zjInYJoGKQ@7-HiZ^iG;5ud#azS`McEK8XEsBCWd@yAR*&4XBX)p!^HghB7KlIs(h6
ziZ0g8T%W+EOQrigI1q}WGK%Mg<BdVSDUs^4+X=UP!m@wiAKC?;EF<woo{@+JId}G^
zebWC*_igmzkc!!e#n_SO;M{W%*Yggr5gi=54oq|a9O+$%M02n%>%y;S9{h^tS;6fF
z9;J%I7bJXmY`qKbvNsq$J2mcMXC0dEPX9N?5UV!w?ATbyK8g=@*^=}5cU=B4MHB0X
e#&i!Kw;Oy^D~?}~@bR(rE<SytG)Q66`Sw34L6hJB

diff --git a/includes/commands/SET.asm b/includes/commands/SET.asm
index 36af490..e724379 100644
--- a/includes/commands/SET.asm
+++ b/includes/commands/SET.asm
@@ -2,6 +2,19 @@ fshcmdSET:  .db "SET", 0
 fshcmdSETo: .db $01
 fshcmdSETu: .db "Sets a value in FSH memory", 0
 fshcmdSETf:
+fshcmdSETfArg0: 
+ ld hl, FshCmdArg0
+ ld de, 0
+ ld e, (hl)
+ inc hl
+ ld d, (hl)
+ ex de, hl
+ ld de, 0
+ call cpHLDE
+ jr nz, fshcmdSETfArg1
+fshcmdSETfArg0Get:
+ ld a, 'G'
+ call _PutC
  xor a
  ld (CurCol), a
  ld hl, fshcmdSETfDIndex
@@ -12,6 +25,18 @@ fshcmdSETf:
  call strtob
  ld de, 0
  ld e, a
+fshcmdSETfArg1:
+ push de
+  ld hl, FshCmdArg1
+  ld e, (hl)
+  inc hl
+  ld d, (hl)
+  ex de, hl
+  ld de, 0
+  call cpHLDE
+ pop de
+ jr nz, fshcmdSETfExe
+fshcmdSETfArg1Get:
  push de
   call _NewLine
   xor a
@@ -23,6 +48,7 @@ fshcmdSETf:
   call inputnumstr
   call strtob
  pop de
+fshcmdSETfExe:
  ld hl, 0
  ld l, a
  call fshvarset
diff --git a/includes/define.inc b/includes/define.inc
index 4274022..6694cf2 100644
--- a/includes/define.inc
+++ b/includes/define.inc
@@ -19,7 +19,7 @@ FshPrgm       equ FshCmd + FshCmdSize
 
 FshCmdNull    equ FshCmd  + FshCmdInptSize
 FshCmdOP      equ FshCmdNull + 1
-FshCmdArg1    equ FshCmdNull + 2
-FshCmdArg2    equ FshCmdNull + 4
-FshCmdArg3    equ FshCmdNull + 6
-FshCmdArg4    equ FshCmdNull + 8
+FshCmdArg0    equ FshCmdOP + 1
+FshCmdArg1    equ FshCmdOP + 3
+FshCmdArg2    equ FshCmdOP + 5
+FshCmdArg3    equ FshCmdOP + 7