From 94ceaddf3b429344a7cb01ab4b6bcf0eee233637 Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Sun, 24 Jun 2018 23:13:44 -0400
Subject: [PATCH] FshVar Functions now catch Out Of Bounds Exceptions

---
 bin/FSHa.8xp        | Bin 1985 -> 2019 bytes
 includes/FshVar.asm |  13 +++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index d815cdea3e0a4ba76b29121d4cc960d1e98f3b98..deacd08d181e8b925316973ab123f39a6c3db496 100644
GIT binary patch
delta 947
zcmZ{iUr1AN6vyxGb>3~!<`vwZEZk)=W|BytjD(;+R`_6~5Lh4;6$C-7EGL1Z$LJ-!
z{XsH<9%62H_Znmh5olK*cHNJ5!1WNlT;vu^)OwQst<JsMTxH#dbIv{Idw##qIs9f_
zORhVuO$l}@HOf{W?m4=jGQUyw0lRjCglsgi*=Qbfq&ERhihLhFy`A5k0`iHa`N#Pz
z7td!&Bmq2n<#hs-;W#MM&mQfu9KfT<!*OVFSQ_%#<wpC}z!eQ<)AKpwI7_*@rBv+;
zoLDxi`bNnmtXZ04?j(>eap3Ed0GV6kpy@eoS1H&0TdqMY>UN41-Fiv)t*lFPcnrBY
z4r(w79JZTrC&t)j#_b|-C^uuL2)r;x4{{$dF@pmyp^(9`J_tdkiCf#0J<Hs-)C;SO
z#9tS|H>9O?W7Z&bnN$Ay9}`|x?TFP$py&Ae)-30dfZ%YTkqH|uA0gXt#eozQ+SI#f
z!|D^XE>%HmSFI8pi{@5NVfRZ2Ee^hQgx?f`Eek&uYWp&I5#}7&Jk8Prfhz9{ogbmH
zL#ws{P3cTQv_Pro_W8+kmez${YmK{-)%knYY!~jA_eg@D^|%p=L%1TCQH*H1(kX~m
z-^ry7a{WK#VKpKd%p+*+>SBo*`;hsa!JI>8Ajn&0oipfKh0oPKcdKNgqN_mZCR7aX
z+YE)mHj2b;ba65b(zy4WzS1)(mp42m|9it>^`LBUo<nO_pUTDEV&9*fUqvYV45f*)
zwAdK~mXU?yR&O06o3!XEv{OO@>-FHJn_;o5i}luK5Xg9mL<VJD1`DqXQMS>~Oqg#?
dc^`+4?(V(*L+3A?xpt|)-QN+t*iY3={sPfG={NuY

delta 903
zcmZ{iOK1~O6ox00$0WY$G}tDfm`fm}1Vn^tP!K9syRuNlg+kDUf*@FHOIn3gp$o;0
z_0lecV!KQ8nDK=Of;3DDX4<Pc;D{DMhB6?jFVKQrG<s&HA!>9M=kd=u_k8Da7n=%A
zx7uUZg^gTN@EkhY)xlX`QWy}vTwzf!&%9oqpvLxOU=zm{Mo(=e>+`_A3Ou=6DU0b!
znRRD?pjRd{pp2$L8NWZV%MsdMDKEA8E`|GaD3oS3hn*+F$Cs?!pd!Cx_<IJ}N*c&Y
z24MciH0XvVdb75+AzRm0*EBv?*R(b5ZLO{(;xX*nG^nmDh}dq$QH-(8ii0^2vD}J3
zW`WRW{E#?{!VIocz(OZ(TBKdhn8+H`5$8>ZNH@DAax4eIlwLB-i-~X-#HqjX%k;f#
z+wiwM7#bOOm&IkgFkB9FcF)VphuIIrapa-8TkS&|SFfUNQm4@R)Wtk>4{D!IV)s*s
zz8ZSHF8;C_**Uj5*PNJto`d2CY<?o}$*?Q%*dVvLa_X};sVmVu3|2W6-Tn}JB=APW
z9Gz;{?KI~8t->H<?(z}5YqFfDQ|{Il1QfB_hBSX()D0y{U$}!O3Q}zgMf&#^akX1A
z`Fqj&)CZEykA29$VDf9o4-DCB+(nbrPdhxpEq=+uMpuVY=%hQ)g5w&Q{B*(-NKm=P
zG$#L#iO43?0kl4KM7Ei*?@y*TIjH`OmTFuxCYNq;={6U-I@cKO5CW|@vXM)dXs-}x
y&LEEY{<1PCnhXx2&^tm~NJkl8nDQ<SojpB!LkG{CJw0%~e_yC`@LWF^e)tR9&fxz5

diff --git a/includes/FshVar.asm b/includes/FshVar.asm
index 8c5fb42..a7d7077 100644
--- a/includes/FshVar.asm
+++ b/includes/FshVar.asm
@@ -7,6 +7,9 @@ fshvarset:
  push bc
  push de
  push hl
+  ld bc, FshVarsSize / 2 + 1
+  call cpBCDE
+  jr nc, fshvarsetOOBException
   ld bc, FshVars
   ex de, hl
    add hl, hl
@@ -14,6 +17,7 @@ fshvarset:
   ld (hl), e
   inc hl
   ld (hl), d
+fshvarsetOOBException:
  pop hl
  pop de
  pop bc
@@ -28,6 +32,10 @@ fshvarset:
 fshvarget:
  push bc
  push de
+  ld hl, 0
+  ld bc, FshVarsSize / 2 + 1
+  call cpBCDE
+  jr nc, fshvargetOOBException
   ld bc, FshVars
   ex de, hl
    add hl, hl
@@ -36,6 +44,7 @@ fshvarget:
   inc hl
   ld d, (hl)
   ex de, hl
+fshvargetOOBException:
  pop de
  pop bc
  ret
@@ -49,6 +58,9 @@ fshvarcpy:
  push bc
  push de
  push hl
+  ld bc, FshVarsSize / 2 + 1
+  call cpBCDE
+  jr nc, fshvarcpyOOBException
   ld bc, FshVars
    add hl, hl
    add hl, bc
@@ -61,6 +73,7 @@ fshvarcpy:
    inc hl
   ld a, (de)
   ld (hl), a
+fshvarcpyOOBException:
  pop hl
  pop de
  pop bc