From cb41f1c25183ac9d009dc6c164375f7dff04bdbf Mon Sep 17 00:00:00 2001
From: fakuzatsu <abyerswilson@gmail.com>
Date: Mon, 22 Sep 2025 20:25:05 +0100
Subject: [PATCH] changes to early daycare zones

---
 data/layouts/DaycareEast/map.bin              | Bin 6862 -> 6862 bytes
 data/layouts/DaycareMountain/map.bin          | Bin 4576 -> 4576 bytes
 data/layouts/DaycarePond/map.bin              | Bin 6032 -> 3612 bytes
 data/layouts/DaycareTreehouse/map.bin         | Bin 3872 -> 2604 bytes
 data/layouts/DaycareWest/map.bin              |   2 +-
 data/layouts/daycarebase/map.bin              |  14 +-
 data/layouts/layouts.json                     |  10 +-
 data/maps/DaycareEast/map.json                |  22 +--
 data/maps/DaycareMountain/map.json            |   2 +-
 data/maps/DaycarePond/map.json                | 153 ++++++++++--------
 data/maps/DaycareTreehouse/map.json           |  38 ++---
 data/maps/DaycareWest/map.json                |  32 ++--
 data/maps/daycarebase/map.json                |  20 +--
 data/tilesets/primary/general/metatiles.bin   | Bin 12288 -> 12288 bytes
 .../mauville/metatile_attributes.bin          | Bin 1020 -> 1020 bytes
 .../tilesets/secondary/mauville/metatiles.bin | Bin 12240 -> 12240 bytes
 src/data/heal_locations.json                  |  10 +-
 17 files changed, 157 insertions(+), 146 deletions(-)

diff --git a/data/layouts/DaycareEast/map.bin b/data/layouts/DaycareEast/map.bin
index e44ccb063494a717b5347bfcd2660d6de053f972..b05c1c5eb49213908e316f66291ba0f6470e920f 100644
GIT binary patch
literal 6862
zcmd6qzi%8x6vsKqtwXlqOkwF(GE#^_?>_)VKw+Fz4%LhV(ke=%S>G9*?*}?8H<!w1
zI+~o)M5(C|NEXexJ0%DKrho)N!;k-g`R?0yGqW?dyE%h|o_1$;Zf55*-}mP2++57n
zU?m%?c5Ww9#i#LVZ}CUX#7uQwl4!2RYOBjUZAC;|-Bm4Bwlzgl9EgsZYx8;i7SPO;
zvWWWX%NES<yJCwNh@obh>3OQSn8qgR>vjD5L||&FreZE$+rx!wP>{3%jUno*i8dla
z&9;Zmll=?V$Bwtya|5jr8*_E?cRdy~7A#D{CF1C>6r^+YO$$bKx?>!Vw%hGGb_P?}
z<y_bXwxQTp*JQk~>k_Ik36~&3D~uwWpHQxgb<xn*x_GX&Z|42%9(YffNbfZr+iabT
zZ(pq?*W{a-U6*S~HPLSLQDo+8T122)&tjrTwu}fY!~w1Tmf!=CZPi43(fx>(V4g;<
z5;5W4aLASsF$c6Fy*jF=*SMBEmEUT8U{ypPMz^BR;|DQRV4kP)nI2D`BPI~Cfqog$
zxqvaxOlKzWfapj0Q%$0K(Va-eVB#4Y;<<bwf7L`qdsV<1I@?qeQ7pk@J`t^nqZ(x~
zvQ-SGu|rj)X=oOTwmL*Qn$)2-R>;<<TgXLB#F4WpPU2ndIi?zGGTV%H9Q}wWrI1}s
z&f_e|JB__XK1UQ?EWAdMglIC?R=1yV(j1$DJO?J<pdG2l`wi-KGX)-tVxF|MA%7u;
zpwNYm1Kx2;M=V`Tg|BMc$~2o|TPx+$m=@;38f<^6LY`zlkv0@TMTMYIL(oNJ@FS_j
ztHvzbnU!;$#vr2TCaxlpAz>Qgu@zcNKmae%b(q(PiL(r^o4B^ccj7Rh*=e35nhTxC
zdx&8&CSv~}k6bt&!!H~1#N+AfH-M4f<d<KyzVPhpmfz29VG@)~gG^$#Z)D#%Vq$%&
zc@Fb40i6uY-JRcmdZsmDgEmDPkhSu!?n$l+DO0WwW-=6Z&1Z01UT6kmt~R6-DHJcL
zY##e`;nvHE(AVWKPqueLb>ev^c{h14Au3i1{%fl9py52aTq8PfQARc-TnkZ{Hr8i1
zxs}|`iDLOie3XKxt@jIkUH$ukX0m-{>KKRq=<y^oW}y<Z{~`aBxC{wu8}jwVsckR0
zlYC$iA@B9le*Q*!uerk~Lp4b0Y+1bXIP@_2)70+jFYEX62Z_t3Vs$uvOnEbYE6X!S
zsbR2d?33f*d`j!fy~91urgznE@^|^O{3WBZ)v=?8iI~T%saWf!$jagMQ{RKh$CKhH
z^L$@{sUe^d$lxuW-St&0Z^k!reav{j_I9_5Xc&ExofG`AXgQk_6KER3jveNrvL20!
zAEoD7p^!#9@y_C_!e^HdQ#w6R=?FR*8sA&hzEbgL+Q0*%rsuVt_<e26w3nSaLp&-@
zr)Sf9nNCNFRdM%vJ$3dcuPL^s-q*#bwTa3U0+F^6>GbJ{s7(CSqrqCu4#G|<@}P(D
zTA4yNQ94RT4;DJrjbl>YU$x(2d{n;Ij7A{ZS2y&2BBQKh-s7&*ZTDA=mSt4EXi&1(
zT%t$HoymQ&V}XC!pR~1gg82nh_}%^$l;yj>NK~e1h^Uw1#JxNpBEF7Oa1fiXCa;al
zB2hWNiB62iJQUHPNah((f`i!X)^Hs}9sONI6s05b+A{wa-%!2Y;)puWAj00ai7-={
z_vpRVJ?hNw_X!c97re)FhBYhquRl}W7MzlXi?fp(5111)(9ETBpX$z4uU{&(<?$05
z!Lfppb~<)5w}wVswylcDet$38+UQ(;a`m_*zuEm)tG^7<QS@KaU=10OD9_cat##E=
g|34!7N77SQS|M9?otGJRMUc&23E5@dyz1D00N2H>O8@`>

literal 6862
zcmd6ry>Ht_7{(jGO9naSQe~?MI7k|#|3wkB9o(c-lIggyMGG8dyP##e5DX8MCo5fw
zE)lW>nL7n7V02N^4uaFk&Sdv5={<b;@;-PZuQCb*52Pbc_wl>ueeXznAr>sT_g-i&
zD#@)tqJ^Bu^&HxiQf?Na`{lkfX{s-@wnaA+Xy%H;CfW^LOHdTVUZs7}&crk>(d|5F
zrcmmN2V^$WvuccmG-+I-xr+C+rf0Ppx6Q<g7DrAyL|4Q_eP0MF5hqZXA2VumxviK$
z%|bu!&2?@$QTfLdX6X{ar=h%)#Fg$QU@>W2kNS#eShPVqs3&^jn)>v_h3qSFy;)*U
zm?V5%?R`E2R5?^5-bp?#bT{dVcB0$)LVlE+M16Tp@sL2(6QFX*nuw~sU!4N|f@mdW
zbrI3JHId0<Qn_TIM16GvjFd;<IZggfR?;paT0Ifrn%!wD5yvK?*8<W`5f6w?lk?<V
zCsAHz^QeeQ8wLM%L)=gi4I!eF5;;T;ohhP!I*C@xti1^G22_Z02oa*Sqr?$gNzV$0
zx}r8Oa~5+&X_Q`9iqaqBNvWe4byQC-X(F8T`pn}~c3wV3I9lvbI1#&Z-Qf5+mZg5F
zu@O;U=7j?<gnLe!-cYn?k8u`tdxVvfCz^wK%#zrSVj?2H@GYHFiQ)ujcz?Z3pz|_|
zhzNT~8lSv;`fsW_jCx#oVlw!ypB6-v-9+UQxhx>LG<a6ho5`{AcOrMI58tilsN*a_
z22mCvpO85_9?qvRofdt`IY-e$4wJMq#By2eFV1R2a8Nu?j%z%-B`1$mFMk{STGQ`?
zdON!Y=MKe)SSX7wluI}rHBqdbf=}!ZU)iJCcdrIM*=_1~F3lV9r}#^qj~9hkh*@08
zj2@BI$1`huJg+)Ex>Q+%bCC2#yj6NvJVQ`p@(`Kn)K2yG;l61sikxUBLVJ_lyk-_E
zPaAkXOFvJ)NSTTKnaI}-!aLlKY$BrfEjp1+7P<xrM@pTF4gNexAEsZGL~(K}KFC0Y
zz279f!}*E0A6mRDWK)6YtcVq|N6U`aqx5n5#2~^+Gs<?$5ouigjhO7qz3h*HPuveJ
zd?(g7l9<j7cYOJy^ZS1MNpa2`WSYUe;+PzI=ab4`ZtZVzG9xDKj^;75hl!ZSw>qjD
zWq3~b*H10Br{7PT`+q0FwC0VM9jiFGAKxqeX&w*J>>}Eaeu$b!IGGU>dt~PiI}=KS
zd76ke;*IL5@*sNH$dt{tWj5y65l=l@-LaDKPo+N1@y_H%Z6p3tiJ2Znk6VaNX5Usm
z(KF26>tV4PPCt~azS`Gr)|y0Z4#_y1DUHdeug3=xankt{MuS-C9fY0a@}Px|TAM>A
zQ8v!TM+FgOPdJT?>#MHU=v;2!YuY0a4dp$xpGb7-=yB|I+V%BSqo#>!6zw%;k?YZO
zY0qTenYqBf45yn)TT{L_OHko=^H)%|?|$2(=d#UFAJHho|0LX<rMZw_hZ#7Ct?s67
zOII#YJHO6O^u|1t(Y{PJX95SYnYI3F5N)aFBC;qOQ`DN`?~c&DUbjccJ&3UPO(M+H
z7CjobyG6+S^)@~tv_kZFPQPdE@vYAkT7$Qx{p#Jx&Iim18hB<?*>|CHg|*9sQkg%#
z9-J#EX{Td1bFHt(RqMKl%<)Ij`pvDimurVD=bPDnx$FNzbP)aDG+0AHB-+pF<<`1v
gulJ9L{xTWK)qzjTuJbDWRt0JPflpT%dD*`I0#1gZzW@LL

diff --git a/data/layouts/DaycareMountain/map.bin b/data/layouts/DaycareMountain/map.bin
index 77f377c0bb108ea613a50f7ca35bd364ab3ea2ab..a7cdd4ea74e22ba714c98c3494068dabe24df803 100644
GIT binary patch
delta 153
zcmaE${6KlbWOinODFTzHu_sy!uq22JV1*OJK@htfP}c*2$z2?>oBcUfF@g-+{D*Tt
z6PU4&N0ylvC{maJf|EfOz2Glr5|}bMQBYy>O#xmOkl5x)0*Z_rK*mFXVu9+3jH&=G
CS|x!1

delta 156
zcmaE${6KlbWOn9+DG8IOu_sy=uq22VV1*OJK@htfP}hTk$z2?>oBcUfF@g-+{D*Tt
z6PU4&N0ylvC{hT9lR*}};4f!wn9@)zFj;_8cJfUDUKWt>=1BsIj2uA5LxEy}>WPf1
E0JQ)#TL1t6

diff --git a/data/layouts/DaycarePond/map.bin b/data/layouts/DaycarePond/map.bin
index 704a3ae87080ceb95287c1a7cafbd69dfb0f59d2..89b50d1c2a9f16c19e1ff34675d78498d250c0b7 100644
GIT binary patch
literal 3612
zcmb7{&rTaL5XRX&0N9t@kjNWw>?8EpV~_g?E0hZn2QTV{Ti>K_5m64Ip%emYp{@E4
ziAb~xqADQO-+Vi<z1f9Uqy0B)|Mv6D*m1UO(F-=PNA`H(IJEC9j;41_zO5SboBeKa
zytg0bSKP;kwrRSa*>jsRx9z5Z?HGJNbD2|(@fChrUs|)zykD6zH3|dKh<;z}*F+<p
z;eS&el$m?Fl;yCOwh$Xwud{`@ZFh`nNwtzUE>FtOp7~6e>k-qBuZ3Ck2BL=CSSvh}
zikP|Q|Dm(!rAmWVjQXTJ^%`NF#D0_)<wH6_Mbs}HGRC+vmLJPcGHy~cx9j$VpE=~U
zJ)WAYqIctz&b%rqTqo|-Ge_lq3Eok8Ty|VPsn9^<-OMwCK|7SIF_YjyBgTDJp8L2o
zSCev5CcLo+-(W36BY4pHFmuDc^;tMf#u78}4b~)BI3CwIu<H&Mk7bdmV^*D`^1{|5
zdgEZ!5Hp)pLnrD1T-Ax#*7G!TcWZZRi_9j~TFG%d{k@+tZ4ukH%<>DV4P{=rpL64v
zr8X0tsI|6;#nDsdZ*yJQ)F>0<*ZQQ+SSh2XF^-v9om36lZ54IS0L>NRNzawL7yBhM
zO?AgiP}1k16AaCj>dc&u=#Q*&U?Tf7)PRvnz}eK85?89AvWi>jRApQ{Fh1rVH4q!r
zs!b)XR1sE_pi`OJzCO<24|h|Er>=`!O}IW$^}jIdRevja*BS+<TAylT4=U2w!LO^o
zRw(nXZ=&_7fk{12lC?v7LXGD0y3$Fds3F8M#FI1hzRF}g&x3NU`o%a^>(hK+!FX~m
zX(pSQi&Y<gFV)H46huj9Ml%zH#VC_2>u98tRlq2r1#5KEgjvXboCUm3&l`SqOLewY
zQ`)cSvG(g;Jfk9X4uOpt0JXl3HubIhppQmf)%qkcphw^9Rad8WQpamyHg?_X>X%+)
zpl`_5^OjxBSMyF{@D$N*%I|gL7k=W#-mrf_eS(WO<N22Yb7+QUS@v$+!7b<Tq)crM
z!hvV1PQ-NLPUMT&RlZu<U)nTN3&PNVx0~<zGoLT*$c&`TNOnGfiam+y6s<Yl^*xE2
zvb-zAt}rM0*i*ZPzM;RORo9RY_PXy40}Hvr(f8jTiMExwE-=tn#*v@;J8;y?r=XpC
z9hvVY(D)vsom2$$%kpX*a!*e<YoDRl3@X}Uw876iD5Wuu7>9aRavGmksu;5$sL;6~
zQCp;<XI(FR+LB~_(rY3AFPfQbLvB#0J=?Fv13E*m5QpGvzk6IK`!+?cjarz$C3PdS

literal 6032
zcmeHLy>8nu5S9(CY00T;{01KT2pv0iWZu9qvRKGK2VJuDP4X6j<Ds$BBDFKLX@>p)
zHP93-TqG$_o=#_;sFNlCG*fYqL{a2@{K)V4qYM2`Up&C|Nq^Q4aUJNMTF;JD!=erB
zX>@8%%`l>z{lMpuI?$cgdX{MNI<n(vY@9{I4Eb5qFkr8AC$&Ux181_p8Cyhpp5nB(
zhBNAq`{(_JokY`=&)A-)j9zS&&!|6jcIj{$&hNxbqp7`2ahf)?P5Nz;;#_AqZR60g
z@hLtx!MW;x>|ggoZAt3gL~n;KBEH$4dRarU>*#H6eH{E`X`fq6t%JjT^K{X>&-stj
zY4N_|Y3ik}e&eF&t=(t(*ml3&*c<yJiy<B{+s3(5ztn9ukFScubqsyO`--RG+nv)n
z#1$Bit2%r_U;Le?0cWOYl=9DQ;{YGY68&ZG>mJUnd4*u<xt*)9&HSCGp+-3$*n`mQ
z`rWC;8`S%0?|1Ka^DX4Qc^XQU^Lej7=s~s${&s5dhB$c)%$qCVDREuSXOgW>T#4XO
zinvY-7$VOi*X4Yu-$I;3w=GzhpVu~LyqwQ!I5JB_TZK<oH?z4(<|F4KP8A<i0`?E=
z%P@7QVZF>pcBe%+d3D~Tk+Yo7z~X+0ynD}~ZlTqLlUFA)S<c7pCsW1M8*h1EfJ~P2
zk#&vn;bVnjMv5Dn36}Gb_2y#);v_V#W=MNJk{%Nc^FbL-=xf=#A0OJ^bDbpV8LMHr
z-pHGz0s2;a&eE9??zEnAoe&>T!f+Ay$oy$;g)e%}=gbx}qr9HteC<vaZl@1=`;)e)
zY`)3+=5Mpb$|J9*G(Mm?z=3w%sxlmDj1ldwWF^I~G(M;V7&*`lMPf0Yq%p=7t1NN|
zhxh;zj-0%cpz_!vKE||SVF~$;d<Ky_!8$9pKddG7eON|%N4<^QnQ!P$t<^Y^k2-nC
z2XM|EPBRKmdwlO&$6r|)<THUYEHEmZ`?kd}(;J*&&E-GE0li5l%;V@R>ZwFEjW^iq
z)wz6)rlImMA9Pi0VmCewvy&PA%?R&x|2MUbH>v}C0EeUOq;DK$0Do@`l&y1ll=h+y
z^6^Z75l6r@jvuwH>KQNi#D>bkKe4XzI7JMfQ}_SbmFpki6q_qW{9_fXuG&|xMeC_!
zb7p$tH@QYW_ec?+*kL3N=|nW*B7d#U?Jz#TCJ|9iTz{ffdz4Fb7@w|V^QZ#nNy&HF
zyU)$@DeJWp^?0GZ^^ih7z6D`wGo-qF0M#RfZK!^)&xa#b`wdI1!UyWEt2)o;FKO;4
Ai~s-t

diff --git a/data/layouts/DaycareTreehouse/map.bin b/data/layouts/DaycareTreehouse/map.bin
index 0d5ac68c6e80aed39d65cf04ad284f0b32cf128b..0e073e1e2bccddc7cdd70b9f4b3f00ca570cfafd 100644
GIT binary patch
delta 294
zcmZ1=w?>4qXd+|qWC5lS0gnvN46lr1Q2KbnWCbRd$p@G?I07;PGlDXJ0vDJ>Ce|2n
zJ7ydgI3{ph07y?RWD=cNr8GH)SzvMjGZ%}a#4&-%b<AQcj0ubhlV>pN@EsE<mQayU
zl~9u?2FYDxcAKog5;D00h%W%K25ZRV238y9V2R_C*E5Sw{=mU9`3|cEM`A{>1PD%6
zU`v_Y!R9jg3cJAM2W%meE!aaQPXOW<>`sD=3Fi{eCnDj=_8iVkJ{dqwB9rHE*svr5
zy)*d%M*ySG<VFtR$p&mJlYKY?CNJO&0ki)A*#TS-_8P8$N!$=-40pif4Nx`@PXGYJ
CH(;^=

literal 3872
zcmeHJJ#*AB5XGGv2D#fG05p6R0j_|7@h~JIb73yInbdZ{jQjf&{$+9t4Rm}ozz={P
zJ+1dv*2y_Lp`c)Pd|s`kr>E7vO{}qdEURFc)y=SdsMh?)<sAKMdFcFI`}^K{;cZ@x
z?{V{{Icb2SUWm%|Q2QBk>TK1VHRpa6dtKE<^_*38Gat7zWy47DQk;Q$Iqt{eQxQMb
zlmsQ=>?H~N+jNKSy0|rKQe0~|j@g_Oet#~$6!Bxth6H6p%>EwTrw8<q9yw%2Wxiot
z)&M`|im^4A{m!F+N9l5XK#%E3{*)FZY#CSMx&v@yt{8_XIQPbJJfP?83uiCew?D-$
z+KcvC%kc&24&!_k1#5@vB@4n=am5?w`-%>|9T8VUXApUvAJS2OXLYmmm8fy`#`)q4
z%$mM}owugbe7(&sqq15~bD6JRI=`wkt_JL&=ZEKzyjplC`~tgf;K9=MAUu5q`}10}
zbSGCkCf2&_w!}`s-rtKKMf?CQ)SR3$e6NVL4qWWU-*^{vrJD)ktf6XIJ3U_IPA<0H
zx6g^s3iHjX_w|RQF)pe$#FaiFs={~Hh-jJbAgjLC-;&0-@h?|~s!C9^N@HNpy*c$8
zBl6f~+|`q+3S4=$#w5SDDqDB;&g0IXvNBKWS+&f#P~upf?ZaJ=oV0F4^^0DM(9D=F
zQn<J&RV#3rpT>BMwR8AlKC~3-8Ax#q^QQ9U8jjU0`3&FOIi~WJ>V>vKl-QSkG?lOR
zwYXDg&wwZQGL<h^uXYI6cj(0TFvNHym~-;${>r)P?QV#z^0WLrAC5xYseBn%SH}FI
zMg2Ox9{8_kxRU#lL~xqWrt=L~?fNn9)Oy%O8b*ff=j&~VmLB~oe((Gb1^(&T)1#@}
jA~qdicjg$^>+&7ria7SX>XWJiiCwnmb-oGy-+uoA0$2ZC

diff --git a/data/layouts/DaycareWest/map.bin b/data/layouts/DaycareWest/map.bin
index 7a92121efef6..0a113c55ad48 100644
--- a/data/layouts/DaycareWest/map.bin
+++ b/data/layouts/DaycareWest/map.bin
@@ -1 +1 @@
-ypypypypypypypypypypypypypypypyp}pq`q`q`q`��q`{pypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypyphx�`ixypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypyppx�`qxypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypypyp�`�pq`q`q`tpypypyp�q�q�q�q�q�q�q�q�q�q�q�q�q�q�q�q���������������p�`ppq`q`q`rptp�`�p������������������������������pp`xphx�`ixzprpppp������������������������������xpypyppx�`qxypzphxp�p
`����������������������������hhh�a�a�a�ahh
`xp�p�����������������������������a�a�a�a�a�a�ahh
`
`xpyp�p
`
`����������������������������h�a�a�ahh
`
`
`xp�p
`����������������������������h�a�a�ahhh
`
`
`xp�phh��������������������������hh�a�a�ahhhh
`
`xp|p�p��������������������������hh�a�a�ahhhhh
`
`
`xp�pxxhhhhh������������������hhh�a�a�ahhhhh
`
`
`xp|p|p|p|p|p|p|p������������������hhh�a�a�a�ahhhhh
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`hhhh�a�a�ahhhhhhhhhhhhhhh�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�ahhhhh�a�a�ahhhhhhhhhhhhhhh�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a
`
`
`
`
`
`
`
`�a�a�a�a
`
`
`�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a
`�a�a
`�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a��������
`
`
`
`����������������������h�a�ah����������
`
`
`
`����������������������hhhh����������
`
`
`h��������������������hhhh����������
`
`hh��������������������hhhhhh����������
`hhh����������������hhhhhh�����������a�ahhhh����������������hhhhhh�a�a������������hhhh����������hhhhhh��������������hhhhhh����������hhhhhhhh�a�a���������������a�ahhhhhhhhhhhh������������������hhhhhhhhhhhhhhhh�a�a�a�a�a�a������������������hhhhhhhhhhhhhhhh����������������������hhhhhhhhhhhhhh�a�a�������������������`�`�`�`�`hhhhhhhhhhhh��������������������hhh�`�`�`�`�`�`hhhhh�a�a�a�a�a�a�����������������`�`�`�`hhhhh�`�`�`�`�`hhhh�����������������������`�`�`�`�`�`hhh�`�`�`�`�`hhhh���������������������`�`�`�`�`�`�`�`�`hh�`�`�`�`�`hhhh���������������������`�`�`�`�`�`�`�`�`hhh�`�`�`�`�a�a�a�a���������������������`�`�`�`�`�`�`�`�`hhh�`�`�`�`�������������������������a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a������������������������
\ No newline at end of file
+yyyyyyyyyyyyyy}q`q`q`q`��q`{yyyyyyyyyyyyyyyyyyyyyyyyyyh�`iyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyp�`qyyyyyyyyyyyyyyyyyyyyyyyyyyyyy��q`q`q`q`t����������������������������pq`q`q`q`r��������������������������pxh�`iyz��������������������������xyyp�`q�
��������������������������hhhhhhx����������������������������a�ahhhhhxy�

������������������������h h"hhhh
`x�
������������������������h h!hhh
`
`
`x�
����������������������h h!hhh
`
`
`
`x|�����������������������h(h!h"hhh
`
`
`
`
`x�
��������������������hh h!hhh
`
`
`
`
`
`x||����|��������������hh h!h"hhh
`
`
`
`
`
`
`
`����
`����
`
`
`
`
`
`
`
`
`hhh!h!h!hhhh
`
`
`
`
`
`h����h�a�a�a�a�a�a�a�a
`
`
`
`hh!h!h)h)h!h!hhhhhhhhhhhhhhh�a�a�a�a�a�a�a"h
`
`
`
`h(h)h*hhh(h)h!h!hhhhhhhhhhhhh
`
`
`
`�a�a�a�ah
`
`
`
`hhhhhhh(h)h)h)h)h)h)h)h)h)h!h!h!h)h�a�a�a�a�a�a�a!h"h
`�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�a�ahh h!h*hh������
` h"h
`������������������hh!h*hhh������
` h"h
`������������������h h"hh�a�a������
` h"h
`����������������h(h*hh��������
`(h*h
`����������������hhhhhh��������
`
`
`h������������hhhhhh���������a�ahhhh������������hhh(h*hh�a�a����������hhhh������hhhhhhh������������h(h!hhhh������hhhhh!h*hh�a�a�������������a�a(h*hhhhhhhhh(h*hhh����������������hhhhhhhhhhhh�a�a�a�a�a�a����������������hhhhhhhhhhhh��������������������hhhhhhh(h)h)h*hh�a�a����������������h�`�`�`�`�`hhhhhhhh������������������hhh�`�`�`�`�`�`hhhhh�a�a�����������������`�`hhhhh�`�`�`�`�`hhhh�������������������`�`�`�`hhh�`�`�`�`�`hhhh�����������������`�`�`�`�`�`�`hh�`�`�`�`�`hhhh�����������������`�`�`�`�`�`�`hhh�`�`�`�`�a�a�a�a�����������������`�`�`�`�`�`�`hhh�`�`�`�`���������������������a�aAh:h9hBh�a�a�a�aAh:h9hBh��������������������
\ No newline at end of file
diff --git a/data/layouts/daycarebase/map.bin b/data/layouts/daycarebase/map.bin
index 7e85d3c24e1c..5adce5f946cb 100644
--- a/data/layouts/daycarebase/map.bin
+++ b/data/layouts/daycarebase/map.bin
@@ -1,11 +1,9 @@
-�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�``````````````````````````````````````````````````y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`|`|`|`|`|`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`|`|`|`|`|`�a�a�a�a�a�a�a�a�a�a�a�a�a�a�`�`�`�`�`�`�`�`�`�p�p�p�p�p�p�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a�a�a�a�a�a�a`````````5x6h6h6h6h7x`````�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a�a�a�a�a�a�atpyp�q�q�q�q�p
�
�ppq`q`q`q`rptpypypyp�p`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a�a�a�a�a
`tpzp
`�q�q�q�qpp
�
�ppq`q`q`q`rprp
`
`
`xp�p```�`�`�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a�a�a�a�atpzp
`
`�q�q�q�qpp
�
�xp|phx�`ixzprph
`
`
`xpypyp�p``�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a
`
`tpypzp
`
`hhh	h	hxpypypypyppx�`qxypzphh
`
`
`
`
`xpyp�p```�`�`�`�`�`�`�a�a�a�a�a�a�a�a
`tpzp
`
`
`hhaaaaaaaaaaaaaahh
`
`
`
`
`
`
`xpypyp�p`�`�`�`�`�`�a�a�a�a�a�ahtpypzp
`
`
`haa!a!a!a!a!a!a!a!a!a!a!a!a!a"ahhhhh
`
`
`
`
`
`
`xp�p`````�a�a�a�a�a�atpzp
`
`
`hha!a!a!a!a)a)a)a)a)a)a)a)a)a)a)a*ahhhhhhhhh
`
`
`
`xpypypypypyp
+�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�`�``````````````````````````````````````````````````y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`|`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`|`|`|`|`|`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`y`�`�`�`�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a�a�a�a�a�a�a�`�`�`�`�`�`�`�`�`�p�p�p�p�p�p�`�`�`�`�`�`�`�````�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a�a�a�a�a�a�a`````````5x6h6h6h6h7x`````�`�`�a�`�`�``````````�a�a�a�a�a�a�a�a�a�a�a�a�a�atpyp�q�q�q�q�p
�
�ppq`q`q`q`rptpypypyp�p`�`�`�`�`�a�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a�a�a�a�a
`tpzp
`�q�q�q�qpp
�
�ppq`q`q`q`rprp
`
`
`xp�p```�`�`�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a�a�a�a�atpzp
`
`�q�q�q�qxp�p
�xp|phx�`ixzprph
`
`
`xpypyp�p``�`�`�`�`�`�`�`�`�`�a�a�a�a�a�a�a�a
`
`tpypzp
`h
`
`h	h	hhxpypypyppx�`qxypzp
`
`
`
`
`
`
`xpyp�p```�`�`�`�`�`�`�a�a�a�a�a�a�a�a
`tpzp
`
`
`
`
`hhhhhhhhhhhh
`
`
`
`
`
`h
`
`
`
`xpypyp�p`�`�`�`�`�`�a�a�a�a�a�ahtpypzp
`h
`
`hhhaaaaaahhhhhh
`
`
`
`
`
`
`
`
`
`
`h
`xp�p`````�a�a�a�a�a�atpzp
`
`
`
`
`
`haa!a!a)a)a)a*ahhhhhhh
`
`
`h
`
`
`
`
`
`
`
`
`xpypypypypyp
 hhh
-htpypzp
`
`
`hha!a!a!a!a*ahhhhhhhhhhhhhhh�i�i�i�j�hhh
`
`
`
`
`
`
`
`
`ypypypypzp
`
`
`
`hha!a!a!a!a*ahhhhhhhhhhhhhhpipspq�q�q�upjphhhh
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`hhh a!a!a!a*ahhhhh!h!h)h)h)h)h!h!hhppq`{p|p�q|p}prphhhhhhhhhhhh
-hhhh
-hhhhhh a!a!a"ahhhhh!h)h*h	hhh	h(h!h"hppq`q`q`q`q`q`rphhhhhh�a�a�a�a�ahhhhhhhhhhh(a)a)a*ahhhh!h*h	h
+htpypzp
`
`
`
`
`
`hh a!a)a*ahhhhhhhhhhh
`
`h�i�i�i�j�h
`
`
`
`
`
`
`h
`
`
`ypypypypzp
`
`
`h
`
`
`
`ha!a"ahhhhhhhhhhhhhhpipspq�q�q�upjphhh
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`hh a!a*ahhhh!h!h)h)h)h)h!h!hhppq`{p|p�q|p}prphhhhhhhhhhhh
`
`
`
`
`
`
`
`
`
`hhh a"ahhh!h!h)h*hhhhh(h!h"hppq`q`q`q`q`q`rphhhhhh�a�a�a�a�ahhhhhhhhhhhhhh(a*ahh!h!h*hh
 hhh	hh
-h h"hppq`q`q`q`q`q`rphhhhhh!h�a�a�a�ahhhhhhhhhhhhhhhhhh!h"h	h
-hhh	h	hhh h"hxp�qypypypypypzphh!h!h)h)h�a�ahhh)h)h)h)h)h)h)h)h!h!hhhhhhhh!h!h"hhh	h	hh	h
-hh!h!hhhhhhhhh!h!h)h*hhhhhhhhhhhhhhhh(h)h)h)h)h)h)h)h)h!h!h"hh	hhh	hhh h!h!h!h!h!h!h!h!h!h)h)h*hhpi�i�i�i�i�i�jph�a�ahhhhhhhhhhhhhhh(h!h!hhhhhhhh!h!h!h!h!h!h!h)h)h*hhhhps`q�q�q�q�q�q�upi����a�ahh�a�ahhhhhhhhhh(h)h)h!h!h!h!h!h!h!h!h!h!h!h!h*hhhhhhp��s`q�q�q�q�q�q���mp�����a�a���a�ahhhhhhhhhhh h!h!h!h!h!h!h!h!h)h)h*hhhhpi�i�kpl�l�kpl`l`l`l`l`mp�������������a�ahhhhhhhhh(h)h!h!h!h!h!h!h*hhhhpi�i�kpl�l�q�q�kp�`q`q`q`q`q`upq��������������a�a�a�a�a�a�a�ahhh h!h!h!h)h*hhpi�i�q�kpl���kpl`l`l`�`q`q`q`q`q`q`�`mp���������������������a�ah h!h)h*hhhppq�kpl���kpl`�`� � � � q`q`q`q`q`q`q`up����������������������h h"hhhhpi�kpl���q�q�spq`q`� � � � q`q`q`q`q`q`q`up����������������������h h"hhhppq�spq�q�q�q�{p|p|p� � � � |p|p|p�pq`q`q`up����������������������h h"hhhppq�spq�tp|p|p|p|p|p� � � � |p|p�pspq`q`q`up����������������������h h!hhhppq�spq�uptpypypypyp� � � � yp�pspspq`q`q`up����������������������h(h!h"hhppq�{p|p}prp� � � � � � � � � ppsp{pypypyp}p����������������������hh h"hhppq�q�q�q�rp� � � � � � � � � ppspq�q�q�q�q�����������������������hh h"hhxp�pq�q�q�rp� � � � � � � � � pp{pypyp�pq�q�����������������������hh!h"hhhppq�q�tpzp� � � � � � � � � ppq�q`q`spq�q���������������������hhh h!h*hhhxp�pq�rp� � � � � � � � � � xpyp�pq`spq�q�����������````````hhh!h"hhhhhxpypzp� � � � � � � � � � 
`
`ppq`{pypyp��������``h
`
`
`
`hhhhh!h!h*hhhhhh� � � � � � � � � � � � 
`
`ppq`q`q`q`��������``h
`
`
`
`hhhhhh h!h*hhhhhhh� � � � � � � � � � � � 
`
`ppq`q`q`q`������``hh
`
`
`
`hhhhhhh!h"hhhhhhhh� � � � � � � � � � � � 
`
`ppq`q`q`q`����```h
`
`
`
`hhhhhhhh(h)h*hhhhhhh
`� � � � � � �``````
`
`ppq`q`q`q`�������`
`
`
`hhhhhhhhhhhhhhhhh
`
`
`
`
`
`
`
`
`
`ppq`q`q`q`��������`hhhhhhhhhhhhhhhhhhh
`
`������%%%%%%%%xpypypypyp���������``hhhhhhhhhhhhhhhhhh
`p�������������`````�����������hhhhhhhhhhh
`
`hhhhh
`
`p�������������������567h
h
`hh�`�`�`�``h
`
`
-hhhhhh
`
`p����������������� � ��hpspq`upi`jp`hh
h
`�`�`�`�`ph
`
`
`
`hhhh�`�`�`����������������� � � �pp{p|p}pq`rpph
`
`h�`�`�`�`
`hh`	`	`
+h h"hppq`q`q`q`q`tpzphhhhhh!h�a�a�a�ahhhhhhhhhhhhhhhhh h!h"h	h
+hhh	hhhh h"hxp�qypypypypzp
`hh!h!h)h)h�a�ahhh)h)h)h)h)h)h)h)h!h!hhhhhhhh!h!h"hhhh	hh	h
+hh!h!hhhhhhhhh!h!h)h*hhhhhhhhhh�a�ahhhh(h)h)h)h)h)h)h)h)h!h!h"hhhhh	hhh h!h!h!h!h!h!h!h!h!h)h)h*hhpi�i�i�i�i�i�jph�a�a���a�ahh�a�ahh�a�a�a�ah(h!h!hhhhhhhh!h!h!h!h!h!h!h)h)h*hh
`hps`q�q�q�q�q�q�upi��������a�a���a�a����hh(h)h)h!h!h!h!h!h!h!h!h!h!h!h!h*h
`
`h
`hp��s`q�q�q�q�q�q���mp�����������������a�ahhh h!h!h!h!h!h!h!h!h)h)h*hh
`hpi�i�kpl�l�kpl`l`l`l`l`mp��������������������hhh(h)h!h!h!h!h!h!h*hh
`hpi�i�kpl�l�q�q�kp�`q`q`q`q`q`upq��������������������a�ahhh h!h!h!h)h*hhpi�i�q�kpl���kpl`l`l`�`q`q`q`q`q`q`�`mp���������������������a�ah h!h)h*hhhppq�kpl���kpl`�`� � � � q`q`q`q`q`q`q`up����������������������h h"hhhhpi�kpl���q�q�spq`q`� � � � q`q`q`q`q`q`q`up����������������������h h"hhhppq�spq�q�q�q�{p|p|p� � � � |p|p|p�pq`q`q`up����������������������h h"hhhppq�spq�tp|p|p|p|p|p� � � � |p|p�pspq`q`q`up����������������������h h!hhhppq�spq�uptpypypypyp� � � � yp�pspspq`q`q`up����������������������h(h!h"hhppq�{p|p}prp� � � � � � � � � ppsp{pypypyp}p����������������������hh h"hhppq�q�q�q�rp� � � � � � � � � ppspq�q�q�q�q�����������������������hh h"hhxp�pq�q�q�rp� � � � � � � � � pp{pypyp�pq�q�����������������������hh!h"hhhppq�q�tpzp� � � � � � � � � ppq�q`q`spq�q���������������������hhh h!h*hhhxp�pq�rp� � � � � � � � � � xpyp�pq`spq�q�����������````````hhh!h"hhhhhxpypzp� � � � � � � � � � 
`
`ppq`{pypyp��������``h
`
`
`
`hhhhh!h!h*hhhhhh� � � � � � � � � � � � 
`
`ppq`q`q`q`��������``h
`
`
`
`
`
`hhhh h!h*hhhhhhh� � � � � � � � � � � � 
`
`ppq`q`q`q`������``hh
`
`
`
`
`
`
`hhhh!h"hhhhhhhh� � � � � � � � � � � � 
`
`ppq`q`q`q`����```h
`
`
`
`
`
`
`
`hhhh(h)h*hhhhhh
`
`� � � � � � �``````
`
`ppq`q`q`q`�������`
`
`
`
`
`
`
`hhhhhhhhhhhh
`
`
`�!- - - - �!
`
`
`
`
`
`
`
`ppq`q`q`q`��������`h
`
`
`hhhhhhhhhhhhhh
`
`
`������%%%%%%%%xpypypypyp���������``hhhhhhhhhhhhhhhh
`
`
`p�������������`````�����������hhhhhhhhhhhh
`hhhh
`
`
`p�������������������567h
h
`hh�`�`�`�``h
`
`
+hhhhh
`
`
`p����������������� � ��hpspq`upi`jp`hh
h
`�`�`�`�`ph
`
`
`
`hhhh�`�`�`����������������� � � �pp{p|p}pq`rpph
`
`h�`�`�`�`
`hh`	`	`
 `hh`�`�`�`����������������� � � � �ppq`q`tp�zph
`
``�`�`�`h
`hhhhhp�`�`�`����������������� � � � �xpypypzphh
`h
`p�`�`�`hhhhhhhh�`�`�`� � � � ����������������
`� !"����������������������� � � � 
`h
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
``� � � h
`
`
`aaaaaaaaaaaaaaa
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
````
`
`aa!a!a!a)axhyhxhyhxhyhxhyh!a!a!aaa
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`aaaaa!a!a!a!a*a
`��������(a)a!a!a!aaaa
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`(a)a!a!a!a!a!a!a*a
`�a���������a
`(a!a!a!a)a*a
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`(a)a!a!a!a"a
`
`����������
`
` a!a*a
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`
`(a!a!a"a
`
`����������
` a"a
`
`
`
`
`
```````````````````h
`
`
`
`
` a!a!aa
`��KaLqLqLqMa��
`
`a!a"a
`
`
````������������������� 
`
`
`
`
`(a!a!a"a
`��aaaaa��
`
` a!a*a
```���������������������
\ No newline at end of file
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 5ae41b860eb1..5f7399600ffb 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -4444,7 +4444,7 @@
     {
       "id": "LAYOUT_DAYCARE_WEST",
       "name": "DaycareWest_Layout",
-      "width": 40,
+      "width": 34,
       "height": 40,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Mauville",
@@ -4454,8 +4454,8 @@
     {
       "id": "LAYOUT_DAYCARE_TREEHOUSE",
       "name": "DaycareTreehouse_Layout",
-      "width": 44,
-      "height": 44,
+      "width": 42,
+      "height": 31,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Fortree",
       "border_filepath": "data/layouts/DaycareTreehouse/border.bin",
@@ -4504,8 +4504,8 @@
     {
       "id": "LAYOUT_DAYCARE_POND",
       "name": "DaycarePond_Layout",
-      "width": 52,
-      "height": 58,
+      "width": 42,
+      "height": 43,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Mauville",
       "border_filepath": "data/layouts/DaycarePond/border.bin",
diff --git a/data/maps/DaycareEast/map.json b/data/maps/DaycareEast/map.json
index acece82db684..cf6c68adb966 100644
--- a/data/maps/DaycareEast/map.json
+++ b/data/maps/DaycareEast/map.json
@@ -40,8 +40,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(KRABBY)",
-      "x": 19,
-      "y": 26,
+      "x": 17,
+      "y": 27,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
       "movement_range_x": 1,
@@ -53,7 +53,7 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(SHELLOS_EAST)",
-      "x": 13,
+      "x": 11,
       "y": 29,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
@@ -79,8 +79,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(EXEGGUTOR_ALOLA)",
-      "x": 13,
-      "y": 24,
+      "x": 14,
+      "y": 22,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -92,8 +92,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(TAILLOW)",
-      "x": 1,
-      "y": 12,
+      "x": 6,
+      "y": 10,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
@@ -106,7 +106,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(PIKIPEK)",
       "x": 31,
-      "y": 21,
+      "y": 22,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
@@ -118,7 +118,7 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(WINGULL)",
-      "x": 44,
+      "x": 39,
       "y": 16,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
@@ -198,8 +198,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(DITTO)",
-      "x": 19,
-      "y": 17,
+      "x": 20,
+      "y": 18,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
diff --git a/data/maps/DaycareMountain/map.json b/data/maps/DaycareMountain/map.json
index cba497ee7fd5..91d838f176da 100644
--- a/data/maps/DaycareMountain/map.json
+++ b/data/maps/DaycareMountain/map.json
@@ -15,7 +15,7 @@
   "connections": [
     {
       "map": "MAP_DAYCARE_WEST",
-      "offset": 0,
+      "offset": 2,
       "direction": "down"
     }
   ],
diff --git a/data/maps/DaycarePond/map.json b/data/maps/DaycarePond/map.json
index 60fb8ed9bb09..207bdf3366f6 100644
--- a/data/maps/DaycarePond/map.json
+++ b/data/maps/DaycarePond/map.json
@@ -23,7 +23,7 @@
     {
       "local_id": "Dragonair",
       "graphics_id": "OBJ_EVENT_GFX_DRAGONAIR",
-      "x": 48,
+      "x": 36,
       "y": 4,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT",
@@ -36,12 +36,12 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_GYARADOS",
-      "x": 10,
-      "y": 18,
+      "x": 6,
+      "y": 12,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
-      "movement_range_x": 3,
-      "movement_range_y": 3,
+      "movement_range_x": 2,
+      "movement_range_y": 2,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "NULL",
@@ -49,8 +49,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SEAKING",
-      "x": 18,
-      "y": 37,
+      "x": 19,
+      "y": 23,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
       "movement_range_x": 2,
@@ -63,7 +63,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(MUDKIP)",
       "x": 3,
-      "y": 41,
+      "y": 28,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
       "movement_range_x": 1,
@@ -75,8 +75,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_QUAGSIRE",
-      "x": 39,
-      "y": 40,
+      "x": 33,
+      "y": 26,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
       "movement_range_x": 2,
@@ -88,12 +88,12 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_POLITOED",
-      "x": 22,
-      "y": 26,
+      "x": 9,
+      "y": 23,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
-      "movement_range_x": 2,
-      "movement_range_y": 2,
+      "movement_range_x": 1,
+      "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "NULL",
@@ -102,8 +102,8 @@
     {
       "local_id": "Buizel",
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(BUIZEL)",
-      "x": 13,
-      "y": 36,
+      "x": 10,
+      "y": 33,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
       "movement_range_x": 0,
@@ -116,8 +116,8 @@
     {
       "local_id": "Goomy",
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(GOOMY)",
-      "x": 17,
-      "y": 25,
+      "x": 18,
+      "y": 13,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT",
       "movement_range_x": 0,
@@ -130,8 +130,8 @@
     {
       "local_id": "Slowpoke",
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(SLOWPOKE)",
-      "x": 27,
-      "y": 27,
+      "x": 25,
+      "y": 24,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -144,7 +144,7 @@
     {
       "local_id": "Croagunk",
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(CROAGUNK)",
-      "x": 37,
+      "x": 28,
       "y": 2,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
@@ -157,8 +157,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
-      "x": 25,
-      "y": 37,
+      "x": 15,
+      "y": 2,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_NONE",
       "movement_range_x": 0,
@@ -170,8 +170,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
-      "x": 43,
-      "y": 15,
+      "x": 39,
+      "y": 19,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_NONE",
       "movement_range_x": 0,
@@ -183,12 +183,12 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_MILOTIC",
-      "x": 24,
-      "y": 6,
+      "x": 8,
+      "y": 5,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
-      "movement_range_x": 3,
-      "movement_range_y": 3,
+      "movement_range_x": 2,
+      "movement_range_y": 2,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "NULL",
@@ -197,8 +197,8 @@
     {
       "local_id": "Marill",
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(MARILL)",
-      "x": 45,
-      "y": 46,
+      "x": 39,
+      "y": 32,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -210,8 +210,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(PSYDUCK)",
-      "x": 20,
-      "y": 46,
+      "x": 21,
+      "y": 34,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT",
       "movement_range_x": 1,
@@ -223,8 +223,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(SPRIGATITO)",
-      "x": 4,
-      "y": 46,
+      "x": 2,
+      "y": 17,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 1,
@@ -236,12 +236,12 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_LOMBRE",
-      "x": 40,
-      "y": 11,
+      "x": 29,
+      "y": 12,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
-      "movement_range_x": 2,
-      "movement_range_y": 2,
+      "movement_range_x": 1,
+      "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "NULL",
@@ -249,12 +249,12 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_STARMIE",
-      "x": 45,
-      "y": 24,
+      "x": 28,
+      "y": 19,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
-      "movement_range_x": 2,
-      "movement_range_y": 2,
+      "movement_range_x": 1,
+      "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "NULL",
@@ -262,12 +262,12 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CROCONAW",
-      "x": 8,
-      "y": 31,
+      "x": 16,
+      "y": 29,
       "elevation": 0,
-      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
-      "movement_range_x": 2,
-      "movement_range_y": 2,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "NULL",
@@ -275,8 +275,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
-      "x": 21,
-      "y": 44,
+      "x": 27,
+      "y": 37,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_NONE",
       "movement_range_x": 0,
@@ -288,8 +288,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(CHANSEY)",
-      "x": 14,
-      "y": 41,
+      "x": 15,
+      "y": 36,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -298,14 +298,27 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "ChanseyDaycarePond",
       "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
+      "x": 27,
+      "y": 38,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_RockSmash",
+      "flag": "FLAG_TEMP_2"
     }
   ],
   "warp_events": [],
   "coord_events": [
     {
       "type": "trigger",
-      "x": 15,
-      "y": 25,
+      "x": 16,
+      "y": 13,
       "elevation": 0,
       "var": "VAR_TEMP_0",
       "var_value": "0",
@@ -313,8 +326,8 @@
     },
     {
       "type": "trigger",
-      "x": 26,
-      "y": 27,
+      "x": 24,
+      "y": 24,
       "elevation": 0,
       "var": "VAR_TEMP_0",
       "var_value": "0",
@@ -322,7 +335,7 @@
     },
     {
       "type": "trigger",
-      "x": 37,
+      "x": 28,
       "y": 3,
       "elevation": 0,
       "var": "VAR_TEMP_0",
@@ -331,8 +344,8 @@
     },
     {
       "type": "trigger",
-      "x": 13,
-      "y": 35,
+      "x": 10,
+      "y": 32,
       "elevation": 0,
       "var": "VAR_TEMP_0",
       "var_value": "0",
@@ -340,8 +353,8 @@
     },
     {
       "type": "trigger",
-      "x": 16,
-      "y": 25,
+      "x": 17,
+      "y": 13,
       "elevation": 0,
       "var": "VAR_TEMP_0",
       "var_value": "0",
@@ -349,8 +362,8 @@
     },
     {
       "type": "trigger",
-      "x": 13,
-      "y": 34,
+      "x": 10,
+      "y": 31,
       "elevation": 0,
       "var": "VAR_TEMP_0",
       "var_value": "0",
@@ -358,8 +371,8 @@
     },
     {
       "type": "trigger",
-      "x": 28,
-      "y": 27,
+      "x": 26,
+      "y": 24,
       "elevation": 0,
       "var": "VAR_TEMP_0",
       "var_value": "0",
@@ -367,7 +380,7 @@
     },
     {
       "type": "trigger",
-      "x": 37,
+      "x": 28,
       "y": 4,
       "elevation": 0,
       "var": "VAR_TEMP_0",
@@ -376,7 +389,7 @@
     },
     {
       "type": "trigger",
-      "x": 37,
+      "x": 28,
       "y": 5,
       "elevation": 0,
       "var": "VAR_TEMP_0",
@@ -385,7 +398,7 @@
     },
     {
       "type": "trigger",
-      "x": 37,
+      "x": 28,
       "y": 6,
       "elevation": 0,
       "var": "VAR_TEMP_0",
@@ -394,7 +407,7 @@
     },
     {
       "type": "trigger",
-      "x": 37,
+      "x": 28,
       "y": 7,
       "elevation": 0,
       "var": "VAR_TEMP_0",
@@ -405,7 +418,7 @@
   "bg_events": [
     {
       "type": "sign",
-      "x": 47,
+      "x": 35,
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
diff --git a/data/maps/DaycareTreehouse/map.json b/data/maps/DaycareTreehouse/map.json
index 32d66b94d189..af9e1407f590 100644
--- a/data/maps/DaycareTreehouse/map.json
+++ b/data/maps/DaycareTreehouse/map.json
@@ -15,7 +15,7 @@
   "connections": [
     {
       "map": "MAP_DAYCARE_WEST",
-      "offset": 4,
+      "offset": -1,
       "direction": "right"
     },
     {
@@ -28,7 +28,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(AIPOM)",
       "x": 26,
-      "y": 21,
+      "y": 16,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
@@ -40,8 +40,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(GROOKEY)",
-      "x": 8,
-      "y": 11,
+      "x": 12,
+      "y": 7,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
       "movement_range_x": 0,
@@ -54,7 +54,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(PANSEAR)",
       "x": 3,
-      "y": 17,
+      "y": 12,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
@@ -67,7 +67,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(PANSAGE)",
       "x": 19,
-      "y": 19,
+      "y": 13,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
@@ -79,8 +79,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(PANPOUR)",
-      "x": 12,
-      "y": 22,
+      "x": 11,
+      "y": 24,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -92,8 +92,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(BEAUTIFLY)",
-      "x": 14,
-      "y": 20,
+      "x": 8,
+      "y": 14,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
       "movement_range_x": 2,
@@ -118,8 +118,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(SNIVY)",
-      "x": 11,
-      "y": 30,
+      "x": 20,
+      "y": 21,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -133,7 +133,7 @@
       "local_id": "Weavile",
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(WEAVILE)",
       "x": 3,
-      "y": 11,
+      "y": 6,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -146,7 +146,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(CHIMCHAR)",
       "x": 29,
-      "y": 11,
+      "y": 8,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -158,8 +158,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(GROVYLE)",
-      "x": 25,
-      "y": 13,
+      "x": 24,
+      "y": 7,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -172,7 +172,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(DITTO)",
       "x": 26,
-      "y": 23,
+      "y": 18,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -185,7 +185,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(CHANSEY)",
       "x": 16,
-      "y": 23,
+      "y": 18,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -201,7 +201,7 @@
     {
       "type": "trigger",
       "x": 3,
-      "y": 13,
+      "y": 9,
       "elevation": 0,
       "var": "VAR_TEMP_0",
       "var_value": "0",
diff --git a/data/maps/DaycareWest/map.json b/data/maps/DaycareWest/map.json
index 51c4d0440d1d..1c38a9f85e72 100644
--- a/data/maps/DaycareWest/map.json
+++ b/data/maps/DaycareWest/map.json
@@ -20,20 +20,20 @@
     },
     {
       "map": "MAP_DAYCARE_TREEHOUSE",
-      "offset": -4,
+      "offset": 1,
       "direction": "left"
     },
     {
       "map": "MAP_DAYCARE_MOUNTAIN",
-      "offset": 0,
+      "offset": -2,
       "direction": "up"
     }
   ],
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(SURSKIT)",
-      "x": 13,
-      "y": 34,
+      "x": 12,
+      "y": 35,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
       "movement_range_x": 1,
@@ -73,7 +73,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(SPINARAK)",
       "x": 24,
-      "y": 26,
+      "y": 25,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
@@ -85,7 +85,7 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(APPLIN)",
-      "x": 9,
+      "x": 7,
       "y": 26,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
@@ -98,8 +98,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(BOUNSWEET)",
-      "x": 26,
-      "y": 6,
+      "x": 23,
+      "y": 9,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_NONE",
       "movement_range_x": 0,
@@ -110,29 +110,29 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_SPECIES(DITTO)",
-      "x": 22,
-      "y": 6,
+      "graphics_id": "OBJ_EVENT_GFX_SPECIES(CHANSEY)",
+      "x": 14,
+      "y": 7,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DaycareWestDittoOpenXforms",
+      "script": "ChanseyDaycareWestHeal",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_SPECIES(CHANSEY)",
-      "x": 14,
-      "y": 7,
+      "graphics_id": "OBJ_EVENT_GFX_SPECIES(DITTO)",
+      "x": 0,
+      "y": 5,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "ChanseyDaycareWestHeal",
+      "script": "DaycareWestDittoOpenXforms",
       "flag": "0"
     }
   ],
diff --git a/data/maps/daycarebase/map.json b/data/maps/daycarebase/map.json
index 2e80dfdb2b42..c03142189a0e 100644
--- a/data/maps/daycarebase/map.json
+++ b/data/maps/daycarebase/map.json
@@ -93,8 +93,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(PORYGON2)",
-      "x": 15,
-      "y": 16,
+      "x": 17,
+      "y": 14,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
       "movement_range_x": 1,
@@ -107,7 +107,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(COMBEE)",
       "x": 25,
-      "y": 20,
+      "y": 21,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
       "movement_range_x": 1,
@@ -132,7 +132,7 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(RIOLU)",
-      "x": 23,
+      "x": 24,
       "y": 13,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
@@ -198,8 +198,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(BULBASAUR)",
-      "x": 15,
-      "y": 26,
+      "x": 19,
+      "y": 27,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
       "movement_range_x": 1,
@@ -251,7 +251,7 @@
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(PIKIPEK)",
       "x": 21,
-      "y": 11,
+      "y": 10,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 1,
@@ -264,7 +264,7 @@
     {
       "local_id": "scyther",
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(SCYTHER)",
-      "x": 41,
+      "x": 40,
       "y": 14,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
@@ -277,8 +277,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SPECIES(CHANSEY)",
-      "x": 12,
-      "y": 19,
+      "x": 13,
+      "y": 18,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
       "movement_range_x": 1,
diff --git a/data/tilesets/primary/general/metatiles.bin b/data/tilesets/primary/general/metatiles.bin
index 776faa8f621f258eca0db4094db59124777130a1..df929ec65868e9b96b9d41c7cd2fcf7d8116aef8 100644
GIT binary patch
delta 143
zcmZojXh_&#pe}LD@i-73b7Wv}Gzc&VG+<L;R}fPWQ`zjHeuK?`Nr4#%nG_lf8Vx2G
zOoYqA#9Itn4W<}Og^N!P(3@bu$0#QV!ZijA3_U;$GZG@o$H>4?4;1Z3XcEx>002kZ
B9GU<C

delta 129
zcmZojXh_&#pg#G7I>$r-fyoy%**5#BUt%+0fC7yJng=WnSRUX$z<osOfYcF~xaJX!
yBbG-jj=;nx2k1?JYtlZTeZ=~JHBj+e#dnJD6=9lS;%`+MSl+9?Q=KfJ{{a9jpD4-z

diff --git a/data/tilesets/secondary/mauville/metatile_attributes.bin b/data/tilesets/secondary/mauville/metatile_attributes.bin
index b30ffc5ae02fa783b89dfbb26247ad693cca7642..5c873d8152b403ffa1a321fbbf297ef2212be0e3 100644
GIT binary patch
delta 30
acmeyv{)c@+k+1-R00S}r@;A1YGXnr$3<V4T

delta 13
Ucmeyv{)c@+(L@EgjT3U10V{(AhyVZp

diff --git a/data/tilesets/secondary/mauville/metatiles.bin b/data/tilesets/secondary/mauville/metatiles.bin
index 4737b6ea0e9caeb85bccab51c37e8bf5db58e2b8..40b0ad202491e69ad3319be66ba2691a65f68f44 100644
GIT binary patch
delta 167
zcmcZ*e<6Ou3>E_hDDYK^1wvmX28Oqa?-buFqKm&(Wng))`c8H736=>4a)J;DQuNP4
k&k&{wT^z2dgB77k7N}g;5Su1m(|;DarZ7#LJ=i)l0b^MyfdBvi

delta 163
zcmcZ*e<6Ou3>JeVgJgpugJOgK0t^iNf(&o~6R#KiFVH85kePgfWr7Awl7RtL8$ukU
mfnRX)16GmAQ&?Nzw&)A$3)%xA%o>;meL;B?@y#A=9hv}`6Ck(%

diff --git a/src/data/heal_locations.json b/src/data/heal_locations.json
index e297d5d6770c..42d16d33bcc0 100644
--- a/src/data/heal_locations.json
+++ b/src/data/heal_locations.json
@@ -135,8 +135,8 @@
     {
       "id": "HEAL_LOCATION_DAYCAREBASE",
       "map": "MAP_DAYCAREBASE",
-      "x": 12,
-      "y": 20
+      "x": 13,
+      "y": 19
     },
     {
       "id": "HEAL_LOCATION_DAYCAREBASE_2",
@@ -165,14 +165,14 @@
     {
       "id": "HEAL_LOCATION_DAYCARE_POND",
       "map": "MAP_DAYCARE_POND",
-      "x": 14,
-      "y": 42
+      "x": 15,
+      "y": 37
     },
     {
       "id": "HEAL_LOCATION_DAYCARE_TREEHOUSE",
       "map": "MAP_DAYCARE_TREEHOUSE",
       "x": 16,
-      "y": 24
+      "y": 19
     },
     {
       "id": "HEAL_LOCATION_DAYCARE_VOLCANO",