From 3e1451c00779803f44af8120d59b812b80411b3e Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Sun, 24 Jun 2018 22:42:15 -0400
Subject: [PATCH] Made VARS command newline every 8 words fixed bug where
 filling fshcmd only did half

---
 FSHa.asm                   |   2 +-
 bin/FSHa.8xp               | Bin 1967 -> 1985 bytes
 includes/FshCmd.asm        |   2 +-
 includes/commands/VARS.asm |  17 ++++++++++++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/FSHa.asm b/FSHa.asm
index 07010e9..5e23f86 100644
--- a/FSHa.asm
+++ b/FSHa.asm
@@ -9,7 +9,7 @@ Setup:
  CALL _homeup
  CALL _ClrLCDFull
 
- LD HL, $00
+ LD HL, 0
  CALL fshvarfill
 
 
diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index 9a96b84fc5161ebe933c44f81d34eadcd4d376db..d815cdea3e0a4ba76b29121d4cc960d1e98f3b98 100644
GIT binary patch
delta 691
zcmZ|LO=uHA6bJC#X_Dzyldz4Z8>Et@5Yn3<ErCL*9<*NCLp=zBf(K86A0SDkRtr7o
ztz}4W9(wCXc2{i=N-u_uV5ScCfh*!g2U+k^5TxM6)i(*XXmk$$;W6*=evFr{rx%8f
zJfKOfOcQ6O#!qRjQ>M2U&z&TPoW<GW`qGm}$B1sR=j58+V1=#`%qv~<Ln+O~W?`<u
zjCe-LT@}-ZBbrZzF9Y$F5~$0RW+g^1tCv`&5{;FB8L>J0d<}B5vKiVqU(l|b%YW5(
z*m|u0!Z!!Pz+Q^)n0pS0hpPZmJnkmmS@FFFLU$k<=C?3Q{61!yFJl_~vjdZrVD}<U
zZ$a_x^t+zYo2YPN`^R?grPr@&(D=gg@vKpFpb}}k=&(--EBm{G(5}XJCL}K2b6AS@
z-NW4`8ru8S<4qa**gvd^m2NVc7n_twXsT}u!riI5yN~wWf1^u$(pB6Wm<E69wz)Wm
z+z*NyAQuEu)wlJO2Vz!3Q8VmgBA3m$EjL~VQr~S!abc$v8#|>6%DjDO)%zdR_7wCq
zrordEHWcUngubsq^t0F$Nz^Lr3x$;mdsMcucpYG?EJ>{_?(DQmHbQf~Ysi^f1-|Zq
UA9$eKKD$Z>b;%ZJKN;Bg1qy{((f|Me

delta 701
zcmZ|MPe>F|90%~3ao4vS$u?G#i&QfRi`@iCmL#dj{v0aMQw8>q6$4QU%L!^_(Mu<@
zM^T5Mqt^UsBczDH7zuXlG5dqYLv$Hrx><JY(A4iaElXK*`2Kirem~x4-n`A&nLB&8
zT_;UKfixcJKXy=9e+uN%%<)d?yD?MTB~FzewMyb<`bruWpVM4JH|E8LsWur~nfwH9
zvX?}<#iQpO&%{<eI*<?98j)ygqNE)%AX^M7p@#iAVN{;}Ydu8YBz8^&CWO9rKUtMm
zOklU?00Q<bCD}*WX9L(*1EMbXya`d>9l^}F)0k-&OgN?ct7mcgHMD=YvAikoMY)cp
zA4|;x@8=CzT*hHEjkhIQ=0okSP%VB*jR%fmf*uJjmL8S8AW}$AC$}i|-B7!itey-|
zv|>_~>`)LTBQA#Vmsf(&QK*s3p0TZ(ylnkjo_F_K+&qApb{|`@8RyXak(+%q14D1k
zy2y1R{nnUOL~EUjrH(3F95sRGZA4*Xm%wIIQv78BRPf&YaJ9c=*PN5~|C||{J3BDb
z?o~T>;@qFkcla}YwpUow?~7gFSdU}3dodPE9Xm;PlNJTf+-UXa36gDofSl4CxDRb`
p92-QfOm(tH^>BNENY1BO=<Vy<ryed0Ubr?q)~)vHm&XME=`S@bVl4mw

diff --git a/includes/FshCmd.asm b/includes/FshCmd.asm
index 732e2a0..0593301 100644
--- a/includes/FshCmd.asm
+++ b/includes/FshCmd.asm
@@ -89,7 +89,7 @@ fshcmdfillLoop:
     inc b
     inc de
     ld a, b
-    cp FshCmdSize / 2
+    cp FshCmdSize
     jr c, fshcmdfillLoop
    pop de
   pop bc
diff --git a/includes/commands/VARS.asm b/includes/commands/VARS.asm
index 8ff01c3..7f1afe5 100644
--- a/includes/commands/VARS.asm
+++ b/includes/commands/VARS.asm
@@ -3,6 +3,7 @@ fshcmdVARSo: .db $12
 fshcmdVARSu: .db "Displays all Fsh Vars", 0
 fshcmdVARSf:
   ld b, 0
+  ld c, 0
   ld de, 0
 fshcmdVARSfLoop:
   call fshvarget
@@ -10,12 +11,26 @@ fshcmdVARSfLoop:
   call _PutC
   ld a, l
   call _PutC
+  ld a, c
+  inc c
+  cp 7
+  jr nz, fshcmdVARSfLoopU
+  push hl
+   push bc
+    push de
+     call _NewLine
+    pop de
+   pop bc
+  pop hl
+  ld c, 0
+  jr fshcmdVARSfLoopBack
+fshcmdVARSfLoopU:
   ld a, '_'
   call _PutC
+fshcmdVARSfLoopBack:  
   inc b
   inc de
   ld a, b
   cp FshVarsSize / 2
   jr c, fshcmdVARSfLoop 
-  call _NewLine
   jp Fin