From 3a1b5a680bbe075d6ea27feb2df400b0d3a66682 Mon Sep 17 00:00:00 2001 From: fakuzatsu Date: Fri, 26 Sep 2025 15:14:46 +0100 Subject: [PATCH 1/4] final map tweaks --- data/layouts/CavetoMew/map.bin | 2 +- data/layouts/DaycareDesert/map.bin | Bin 5600 -> 5600 bytes data/layouts/DaycareDesertTemple/map.bin | Bin 5600 -> 5600 bytes data/layouts/DaycareMausholdShrink/map.bin | 2 +- data/layouts/DaycareMountain/map.bin | Bin 4576 -> 4576 bytes data/layouts/DaycareMountainCave/map.bin | 2 +- data/layouts/DaycarePond/map.bin | Bin 3780 -> 3780 bytes data/layouts/DaycareVolcano/map.bin | 2 +- data/layouts/daycarebase/map.bin | 2 +- data/layouts/layouts.json | 4 +-- data/maps/CavetoMew/map.json | 34 ++++++++++----------- data/maps/DaycareMountain/map.json | 6 ++-- data/maps/DaycareVolcano/map.json | 2 +- src/data/heal_locations.json | 6 ++-- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/data/layouts/CavetoMew/map.bin b/data/layouts/CavetoMew/map.bin index bdb214690189..bce236012ed4 100644 --- a/data/layouts/CavetoMew/map.bin +++ b/data/layouts/CavetoMew/map.bin @@ -1 +1 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!-----------./------------!!!!-----56i7-----!!!!!!!!!!"3i3i3i13i3i3i3i3i3i3i3i3i !!!!!!!!!!"3i3i3i3i3i3i13i13i!!!!!!!!!!O3i3i13i3i&3i13i3i3i1 !!!!!!!!!!"3i13i3i1 3i13i3i3i1!!!!!!!!!!"13i3i3i1&3i"3i3i3i3i3i !!!!!!!!!!O3i3i3i13i 3i3i3i3i3i3i!!!!!!!!!!"3i3i13i1&3i"3i3i3i3i3i !!!!!!!!!!O3i13i13i()*3i3i3i3i3i!!!!!!!!!!"3i3i3i3i3i3i3i3i3i3i3i3i3i !!!!!!!!!!")))))h))))) !!!!!!!!!!O"3i13i3i3i3i3i3i3i03i  !!!!!!!!!!"I13i3i3i3i3i3i3i3i3i0 !!!!!!!!!!""3i3i3i3i3i;i3i3i3i3i3i  !!!!!!!!!!$2222289:222%%%!!!!!!!!!!###############!!!!!!!!!!###############!!!!!!!!!!###############!!!!!!!!!!###############!!!!!!!!!!###############!!!!!! \ No newline at end of file +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!-------------./------------!!!!!!-----56i7-----!!!!!!!!!!!!"3i3i3i13i3i3i3i3i3i3i3i3i !!!!!!!!!!!!"3i3i3i3i3i3i13i13i!!!!!!!!!!!!O3i3i13i3i&3i13i3i3i1 !!!!!!!!!!!!"3i13i3i1 3i3i3i3i3i3i!!!!!!!!!!!!"13i3i3i1&3i"3i3i3i3i3i !!!!!!!!!!!!O3i3i3i13i 3i3i3i3i3i3i!!!!!!!!!!!!"3i3i13i1&3i"3i3i3i3i3i !!!!!!!!!!!!O3i13i13i()*3i3i3i3i3i!!!!!!!!!!!!"3i3i3i3i3i3i3i3i3i3i3i3i3i !!!!!!!!!!!!")))))h))))) !!!!!!!!!!!!O"3i13i3i3i3i3i3i3i03i  !!!!!!!!!!!!"I13i3i3i3i3i3i3i3i3i0 !!!!!!!!!!!!""3i3i3i3i3i;i3i3i3i3i3i  !!!!!!!!!!!!$2222289:222%%%!!!!!! \ No newline at end of file diff --git a/data/layouts/DaycareDesert/map.bin b/data/layouts/DaycareDesert/map.bin index b60f3e16b4963712ea86fc69f86fb9cd26131636..edf5cdbb466f382b65ecc2e58e059cb826b338a4 100644 GIT binary patch delta 608 zcmZ8eJxc>Y5KV}=%jV-U@gyku0Tv6IV3XY<1i>O*2n37}SWJ!(Y;0n*h_;I56k=m3 z*a@~4w)p`TTBVaT)&?xxx!nsyhUIwk-n@M~H{&z@{GG(Nq=&!BIzBi>eY`{;0_-^r z^xUF8sSF1Z7WLnqK=;ydi3jcw%Z`IJH-)e6F>5U~+o=Jo+8K#=7LkiYmlvtWry-AS+Fsl_IdM3FH(xsm?KVv|?mR(5s%<{w^UyM9?!paNB00!G$nm^&&$ zO}EcrY^jN*K5|`Oz$ILT{b)538(!C^6^z2Z31ptY69Ss}YODEvq+RQ^dQUmI$ZB{xLg7|LG>Nf78DR42{k51ssgpNAh^oKqlF8sr5Kc(=WGBP d1L1Xmco4Q_!{i^rDg4<2jz}%NfI>hUy7X?4A~-p zktbgafU6YODEvq+RQ^dQUmI$ZB{xLg7|LG>Bg9Cf>kU7+y?{6S^-o?b%N|7Z~{bK zO8o%N&OcgbIIFzH{=stX$sFH->s3;7Zr<8=@NiL+7KY3dN2iAEvy3ze5_9vd z`EJ?6e$jdt#mXg-UWj7t9lIH*;_dY|ucZ2>;&D9#QQW-xF5j;09C7aaFl^L9D*cYhEZuKC*LzDQy@+EnXxhb<+_IBo9OY{O8E@iUd58Xm8UIf7My)L2F|38Btz z8_Ka}OU3XN9w4?++@-a9gzj=8*-XS-7?v@~rt88?vtPK$dbR(V3zV^#fC{axv|=K09YPAZycmE**6C*;{A ztCdpiU|TxT|&+vZ~(OWRJ`a-0gD1Ec4t|OsPApLEPKQCAFwQ?y z&C>Un%~>kB@0ITLAN9B4j&{dqB-t3HE&LKyR?$|D<1MC$bh^;n-X^>OD$P zN03QhmcLiA_)z^=;`cjSm;Y3; z_^JAN$@OZz51Y8t-7ofI;rxYv^no5wE$h?`cfRvg&-CD?c#ZlH`Yn3*t|a;24<1>UB3WFMaW>;IBR4W6sNG|u>s z53d<($sBR-Y5X0}{sEUGliO9QS9vB|UUQp^Xa9i9_Ue08{0UBb-LuM4uTtDoO+A8+ X6gw*=em-4tWi|PBts}($p}qeCSpr7L literal 4576 zcmeH~yKWRQ6o!XrTO_9nT{3Twf(D5fNSQKCG!@!FkY;ByC?OkZwwvvuB?Ssdq@&Cm zWIO2CE?h*BMHB<#AvnK}J+>#F%SNI@N4xf1{Q39s@v&zlM*r;}dSDPOZwD1U@5<|m zSe|BDq}1AGzmG8YU=B;}U83QHTBqVwbVg%cDAGcJc`WHh!E!YaQ}IT;E!CktYc-0O zW8!TP;R{x*+YjXkwBoz?0d3$5SMgAdfEC}BYua5#bFzu_FGiph>v7yJ?Kw9bp84wA zL&@b49MgEJ&+TiT^D2EJwgUStt~2-cecv6PbDE*dwyj{>%Y{l~KAygZIY*@0)Iqi# z?0C7lReR~@?gYLVb=4Z(z8Yfbw%(!W!swzJGk2NI$q)#F$5$e{D z#1V2NtvVhNWhHSYz)fQ!)6-9mtv^uqdL5>(DkW19eMz7f4>O?d5e4d#DF zt!_jtGlb#7zpOWjdr`0Nx1#t}{4V^@Q(=1Q z!tK+T;P*0ab(~eoR2VXIbsTb>m41+VK~>qm!YSie-A`%FXfkt|r~h3p-XQSY{&R4!>TXe-CR{73)MPcjW`|(mQXiAG&bk@SMgp4td2U;=Wp=Zanz7$?9-C z93QMUX`g~idA>XMFpOmkJ;}cp_4c9om{X($^<0xDlNf%OD(*c0Sv1+ag=^Ifc(A>%WE$UfZ=my(0 z_`SlFt#}10=EZ<)mhIDTmhD}@t}gb;p4VpfM68gv%nr!A-BsprX-?TV!=tWpy#QOE z);W(u|1&}TlMzK`%0WioaI$7+ZB4bmZd9%p3(DFl{o@@v`zs1~=-F`f6Q?Zo8l~J9 zPSxP@6`lPpE_w!6E7i}e(&4gFAD7Pl78iAU)Mnpnuklx~)~hMidqj3a79%6?=4?i7Mkd~d$upQXfT#sba+BDFCb9EOKETQ{xridqj3a79%6$=4?i7MkYpv$upQXFfj^DUce+biCt(CJI~|;tSpnen1vvMGLv^P Un?aeI`B?5TG8$}t%X*yy0LXe1_5c6? diff --git a/data/layouts/DaycareVolcano/map.bin b/data/layouts/DaycareVolcano/map.bin index c92bebeb428e..cbeeea4cb2c9 100644 --- a/data/layouts/DaycareVolcano/map.bin +++ b/data/layouts/DaycareVolcano/map.bin @@ -1 +1 @@ -qqq{yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy|qqqqqq{yyyyyyyyyyyyyyyyyyyyyyyyyy|qqqqpqqqqqq{yyyyyyyy|hhjhqhqhqhhhjh{yyyyyyy|qqqqpqqqqqq{yyyyyy|pxzqhiqhxzr{yyyyy|qqqqpqqqqqq888888xyyyyyyyz88888qqqqpqqqqqq888888yyyyyyyyy88888qqqqpqqqqqq8888888888888888888888qqqqpqqqqqq88888iiiiiiiiiiiiiiii~h~hqqqqpqqqqqq88ii~hqhqhqhqhqhqhqhqhqhqhiqhqhqhqhqhqhqhqqqqpqqqqqq~h~hii~hqhiqhqhqhqhqhiqhqhqhqhqhqhqhqhqhqhqhhjqqqqpqqqqqqqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhqhxzqqqqpqqqqqqqhqhqhqhqhqhiqhqhqh{yyyyyyyyyyyy|qhqhqqqqpqqqqqqqhqhqhqhhjqhqh{yz{yyyyyyyyyy|hi~qqqqpqqqqqqqhqhqhqhxz{yz{y8888888888qqqqqqpqqqqqqqhqhqhqhqh{z{y888888888888qqqqqqpqqqqqqqhqhqhiqhr{88888888888888qqqqqqpqqqqqqqhqhqhqhqhrr88888888888888~~qqqqqqpqqqqqqqhqhqhqhqhhh8888888888888hj qqqqqpqqqqqqqhqhqhqhqhqhqhh88888888888~hxzqqqqqqpqqqqqqqhqhqhqhqhqhqhqhhiiiiiiiiiii~hqhqhqhqqqqqpqqqqqqhjqhqhqhqhqhqhqhiqhqhqhiqhqhqhqhqhqhqhqhqhqhqqqqqqpqqqqqqxzqhqhqhqhiqhqhqhqhqhqhqhqhqhqhqhqhqhiqhqhqhqqqqqpqqqqqq{yyy|qhqhqhqhqhqhqhqhqhqhiqhqhqhqhqhqhqhqhqqqqqqpqqqqqq{y|xyyyyyyyyy| qhqhqhqhqhqhqhqhq qqqqpqqqqqq8yyyyyyyyy|xyyy|qhqhqhqhqhqqqqqpqqqqqq88888888888yyy|x|qhqhqhqhqqqqqqpqqqqqq888888888888888|x|qhqhqhxyyyy|qpqqqqqq8888888888888888|qhiqh{yyy|qpqqqqqq88888888888888888qhqhqhr{y|qpqqqqqq8888888888888888h~qhqhqhrr8qpqqqqqq8888888888888888qhqhqh{zr8qpqqqqqq888888888888888~h~hqhqhqhr{8qpqqqqqqhhhh888888888888qhqhiqhqhrr88qpqqqqqqqhqhiqhkihhhh888888~hqhqhqhqhqhrr88qpqqqqqqqhqhqhqhsiqhqhqhqhh88ii~hqhqhqhqhqhqhrr88qpqqqqqqiqhqhqh{iqhqhqhiqhhhh~hqhqhqhiqhqhqhqh{zr88qpqqqqqqqhqhqhqhrhjqhqhqhqhqhqhqhqhqhqhqhqhqhqh r{88qpqqqqqqqhhqh rxzqhqhqhqhqhqhqhqhqhqhqhqhqh{yzr888qpqqqqqq  iiiiiiiiiiiiiijr{y888qpqqqqqqqqqqqqqqqqqqqqqqqqqqqrrr88888qpqqqqqqqqqqqqqqqqqqqqqqqqqqq~~~i~qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file +qqq{yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy|qqqqqq{yyyyyyyyyyyyyyyyyyyyyyyyyy|qqqqpqqqqqq{yyyyyyyy|hhjhqhqhqhhhjh{yyyyyyy|qqqqpqqqqqq{yyyyyy|pxzqhiqhxzr{yyyyy|qqqqpqqqqqq888888xyyyyyyyz88888qqqqpqqqqqq888888yyyyyyyyy88888qqqqpqqqqqq88888888888888888888~h~hqqqqpqqqqqq88888iiiiiiiiiiiiii~h~h~h~hqqqqpqqqqq{z88ii~hqhqhqhqhqhqhqhqhqhqhiqhqhqhqhqhqhqhqqqqpqqqqqq~h~hii~hqhiqhqhqhqhqhiqhqhqhqhqhqhqh qhqhqhhjqqqqpqqqqq{zqhqhqhqhqhqhqhqhhjqhqh {yyyyyyy|qhqhxzqqqqpqqqqqqhqhqhqhqhqhqhiqhxz{yyzqhqh qhqhqhqhxy|qhqhqqqqpqqqqq qhqhqhqhhjqh{yyz{yyyyyyyyyy|hi~qqqqpqqqqqqhqhqhqhqhxz{zqh{y8888888888qqqqqqpqqqqqhjqhqhqhqh{z{y888888888888qqqqqqpqqqqqxzqhqhiqhr{88888888888888qqqqqqpqqqqqqhqhqhqhqhqhrr88888888888888~h~hqqqqqqpqqqqqqhqhqhqhqhqhhh8888888888888qhh~ qqqqqpqqqqqqhqhqhqhqhqhqhqhh88888888888~hqhqqqqqqqpqqqqq~jqhqhqhqhqhqhqhqhhiiiiiiiiiii~hqhqhqqqqqqpqqqqqqhjqhqhqhqhqhqhqhiqhqhqhiqhqhqhqhqhqhqhqhqhqqqqqqqpqqqqqqxzqh qhqhiqhqhqhqhqhqhqhqhqhqhqhqhqhiqhqhqqqqqqpqqqqqq{yyyyyy|qhqh qhqhqhqhiqhqhqhqhqhqhqhx|qqqqqqpqqqqqq{y|qqqxyyyyyyy|qhqhqhqhqhqhqhqhq qqqqpqqqqqq8yyyyyyyyy|qxyy|qhqhqhqhqhqqqqqpqqqqqq88888888888yyy|x|qhqhqhqhx|qqqqqpqqqqqq888888888888888|x|qhqhqh xyyy|qpqqqqqq8888888888888888|qhiqh{yyy|qpqqqqq~j88888888888888888qhqhqhr{y|qpqqqqqq8888888888888888h~qhqhqhrr8qpqqqqqq8888888888888888qhqhqh{zr8qpqqqqqq888888888888888~h~hqhqhqhr{8qpqqqqqqhhhh888888888888qhqhiqhqhrr88qpqqqqqqqhqhiqhkihhhh888888~hqhqhqhqhqhrr88qpqqqqqqqhqhqhqhsiqhqhqhqhh88ii~hqhqhqhqhqh{zr88qpqqqqqqiqhqhqh{iqhqhqhiqhhhh~hqhqhqhiqhqhqhqhrqr88qpqqqqqqqhqhqhqhrhjqhqhqhqhqhqhqhqhqhqhqhqhqhqh r{88qpqqqqqqqhhqh rxzqhqhqhqhqhqhqhqhqhqhqhqhqh{yzr888qpqqqqqq  iiiiiiiiiiiiiijr{y888qpqqqqqqqqqqqqqqqqqqqqqqqqqqqrrr88888qpqqqqqqqqqqqqqqqqqqqqqqqqqqq~~~i~qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file diff --git a/data/layouts/daycarebase/map.bin b/data/layouts/daycarebase/map.bin index 367922f25049..c60a03af0cdb 100644 --- a/data/layouts/daycarebase/map.bin +++ b/data/layouts/daycarebase/map.bin @@ -2,7 +2,7 @@ hhh htpypzp ` ` ` ` ` `hh a!a)a*ahhhhhhhhhhh ` `hiiijh ` ` ` ` ` ` `h ` ` `ypypypypzp ` ` `h ` ` ` `ha!a"ahhhhhhhhhhhhhhpipspqqqupjphhh ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `hh a!a*ahhhh!h!h)h)h)h)h!h!hhppq`{p|pq|p}prphhhhhhhhhhhh ` ` ` ` ` ` ` ` ` `hhh a"ahhh!h!h)h*hhhhh(h!h"hppq`q`q`q`q`q`rphhhhhhaaaaahhhhhhhhhhhhhh(a*ahh!h!h*hh hhh hh -h h"hppaaaaatpzphhhhhh!haaaahhhhhhhhhhhhhhhhh h!h"h h +h h"hppq`q`q`q`q`tpzphhhhhh!haaaahhhhhhhhhhhhhhhhh h!h"h h hhh hhhh h"hxpqqqqqzp`hh!h!h)h)haahhh)h)h)h)h)h)h)h)h!h!hhhhhhhh!h!h"hhhh hh h hh!h!hhhhhhhhh!h!h)h*hhhhhhhhhhaahhhh(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*hhpiiiiiijphaaaahhaahhaaaah(h!h!hhhhhhhh!h!h!h!h!h!h!h)h)h*hh`hps`qqqqqqupiaaaahh(h)h)h!h!h!h!h!h!h!h!h!h!h!h!h*h``h`hps`qqqqqqmpaahhh h!h!h!h!h!h!h!h!h)h)h*hh`hpiikpllkpl`l`l`l`l`mphhh(h)h!h!h!h!h!h!h*hh`hpiikpllqqkp`q`q`q`q`q`upqaahhh h!h!h!h)h*hhpiiqkplkpl`l`l``q`q`q`q`q`q``mpaah h!h)h*hhhppqkplkpl`` q`q`q`q`q`q`q`uph h"hhhhpikplqqspq`q` q`q`q`q`q`q`q`uph h"hhhppqspqqqq{p|p|p |p|p|ppq`q`q`uph h"hhhppqspqtp|p|p|p|p|p |p|ppspq`q`q`uph h!hhhppqspquptpypypypyp yppspspq`q`q`uph(h!h"hhppq{p|p}prp ppsp{pypypyp}phh h"hhppqqqqrp ppspqqqqqޑhh h"hhxppqqqrp pp{pypypphh!h"hhhppqqtpzp ppqq`q`sphhh h!h*hhhxppqrp xpyppq`spqq````````hhh!h"hhhhhxpypzp ``ppq`{pypyp``h ` ` ` `hhhhh!h!h*hhhhhh ``ppq```q```h ` ` ` ` ` `hhhh h!h*hhhhhhh ``ppq```q```hh ` ` ` ` ` ` `hhhh!h"hhhhhhhh ``ppq`q`q`q````h ` ` ` ` ` ` ` `hhhh(h)h*hhhhhh ` ` ````````pp``q`q`` ` ` ` ` ` ` `hhhhhhhhhhhh ` ` `!- - - - !````````pp``q`q``h ` ` `hhhhhhhhhhhhhh ` ` `%%%%%%%%xpypypypyp``hhhhhhhhhhhhhhhh ` ` `p`````hhhhhhhhhhhh `hhhh ` ` `p567h h `hh`````h ` ` hhhhh ` ` `p hpspq`upi`jp`hh h `````ph ` ` ` `hhhh``` pp{p|p}pq`rpph ` `h```` `hh` ` ` diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index a35710517c34..8066b5652560 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -4554,8 +4554,8 @@ { "id": "LAYOUT_CAVETO_MEW", "name": "CavetoMew_Layout", - "width": 25, - "height": 23, + "width": 27, + "height": 18, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", "border_filepath": "data/layouts/CavetoMew/border.bin", diff --git a/data/maps/CavetoMew/map.json b/data/maps/CavetoMew/map.json index 00c97c22b465..29a32b6a7e76 100644 --- a/data/maps/CavetoMew/map.json +++ b/data/maps/CavetoMew/map.json @@ -16,7 +16,7 @@ "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 14, + "x": 16, "y": 10, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -29,7 +29,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 15, + "x": 17, "y": 10, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -42,7 +42,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 16, + "x": 18, "y": 10, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -55,7 +55,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 13, + "x": 15, "y": 9, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -68,7 +68,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 15, + "x": 17, "y": 8, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -81,7 +81,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 17, + "x": 19, "y": 9, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -94,7 +94,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 16, + "x": 18, "y": 8, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -107,7 +107,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 16, + "x": 18, "y": 7, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -120,7 +120,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 14, + "x": 16, "y": 7, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -133,7 +133,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 14, + "x": 16, "y": 8, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -146,7 +146,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 9, + "x": 11, "y": 5, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -159,7 +159,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 7, + "x": 9, "y": 8, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -172,7 +172,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 13, + "x": 15, "y": 7, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -185,7 +185,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 6, + "x": 8, "y": 9, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -198,7 +198,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", - "x": 17, + "x": 19, "y": 7, "elevation": 0, "movement_type": "MOVEMENT_TYPE_NONE", @@ -212,14 +212,14 @@ ], "warp_events": [ { - "x": 11, + "x": 13, "y": 16, "elevation": 0, "dest_map": "MAP_DAYCARE_EAST", "dest_warp_id": "1" }, { - "x": 11, + "x": 13, "y": 3, "elevation": 0, "dest_map": "MAP_DAYCARE_DESERT_TEMPLE", diff --git a/data/maps/DaycareMountain/map.json b/data/maps/DaycareMountain/map.json index df14958b378d..79123f423d5d 100644 --- a/data/maps/DaycareMountain/map.json +++ b/data/maps/DaycareMountain/map.json @@ -88,7 +88,7 @@ { "graphics_id": "OBJ_EVENT_GFX_SPECIES(GLIGAR)", "x": 33, - "y": 45, + "y": 46, "elevation": 0, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, @@ -196,8 +196,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_SPECIES(CHANSEY)", - "x": 7, - "y": 24, + "x": 11, + "y": 23, "elevation": 0, "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 0, diff --git a/data/maps/DaycareVolcano/map.json b/data/maps/DaycareVolcano/map.json index 012f92820565..1dadf5355d6b 100644 --- a/data/maps/DaycareVolcano/map.json +++ b/data/maps/DaycareVolcano/map.json @@ -164,7 +164,7 @@ }, { "graphics_id": "OBJ_EVENT_GFX_SPECIES(CHANSEY)", - "x": 27, + "x": 28, "y": 7, "elevation": 0, "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", diff --git a/src/data/heal_locations.json b/src/data/heal_locations.json index fcbb93f202f4..8d49cd26562c 100644 --- a/src/data/heal_locations.json +++ b/src/data/heal_locations.json @@ -207,14 +207,14 @@ { "id": "HEAL_LOCATION_DAYCARE_VOLCANO_1", "map": "MAP_DAYCARE_VOLCANO", - "x": 27, + "x": 28, "y": 8 }, { "id": "HEAL_LOCATION_DAYCARE_MOUNTAIN", "map": "MAP_DAYCARE_MOUNTAIN", - "x": 7, - "y": 25 + "x": 11, + "y": 24 } ] } From 9481d36ffa7a917e5775cbb5755a00bf269a4a00 Mon Sep 17 00:00:00 2001 From: fakuzatsu Date: Fri, 26 Sep 2025 15:27:50 +0100 Subject: [PATCH 2/4] fix for a thing --- data/maps/DaycareDesert/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/maps/DaycareDesert/map.json b/data/maps/DaycareDesert/map.json index 78aa83b93379..cfcd777082b2 100644 --- a/data/maps/DaycareDesert/map.json +++ b/data/maps/DaycareDesert/map.json @@ -123,7 +123,7 @@ "graphics_id": "OBJ_EVENT_GFX_SPECIES(FLYGON)", "x": 25, "y": 31, - "elevation": 0, + "elevation": 4, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, From 7f3f082ef84350619dbe2a30475ab90978782d7d Mon Sep 17 00:00:00 2001 From: fakuzatsu Date: Fri, 26 Sep 2025 15:36:24 +0100 Subject: [PATCH 3/4] collision fixes --- data/layouts/DaycareDesert/map.bin | Bin 5600 -> 5600 bytes data/layouts/DaycareMountain/map.bin | Bin 4576 -> 4576 bytes data/layouts/DaycareMountainCave/map.bin | 2 +- data/layouts/daycarebase/map.bin | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/layouts/DaycareDesert/map.bin b/data/layouts/DaycareDesert/map.bin index edf5cdbb466f382b65ecc2e58e059cb826b338a4..1019c24a5301921821bfd55dc84e37d91826eec2 100644 GIT binary patch delta 14 VcmaE${Xly|I4`5X<_O*n4gf2%1mpk! delta 14 VcmaE${Xly|I4@(u<_O*n4gf8Z1vCHv diff --git a/data/layouts/DaycareMountain/map.bin b/data/layouts/DaycareMountain/map.bin index e2d379e5d30c0f128ffdafd08a3ce704d0168eb8..304237a5335e246a89093c961618bb66cda9b9af 100644 GIT binary patch delta 82 zcmaE${6Kj_AP2JmOTy#=4w1d$lOJ)MWfa)Ff%7FJkTZ*WIU~bnC!SbFW`;tB l$%}YHnHkPAO#a2YlU1NVpfF)_0-wm_Gko1Z9TEH;OaM388H@k` delta 82 zcmaE${6Kj_AO~{-OTy#=4w1d-lOJ)MWlY$-f%7FJkTZ*WIgsPT6U)e)P?#`z j5pO7S!uf>Bzj$}DCKLz&MH2W#CZFN!1}ci+?_dG|$>|+T diff --git a/data/layouts/DaycareMountainCave/map.bin b/data/layouts/DaycareMountainCave/map.bin index a01a7fed0260..5a71a9570d47 100644 --- a/data/layouts/DaycareMountainCave/map.bin +++ b/data/layouts/DaycareMountainCave/map.bin @@ -1 +1 @@ -{|{w|iii{|{|iiii{iiiii~iiii}iiiiiiii{ciii~iiiiiiiiiiiii|iiiiii~iiiiiiii}ci||iii~ii~i}iiiiiiii~iii}iiiii~iiiiiiiii{iiiiiiiiiii~iiiiiiixyiiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiii~iiiiiiii~iiiii}}~iiiiiiiiiiiiiiiiiiii~iiiiiiii~iiiiiiiiiiiiiiiiii~i~iiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiii}iiiiii~iiiiii~iiiiiiiiiiiiix{iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}~~iiiiiiiii|i}iiiiiiiiiiixyziii}iixyyyyyyyyyz|iiiiiiiii}iiiiiiiixziiiiiiiiiiiii}ii}xiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii|iiiiiiiiiiiii~iiiiiiiiiiii~iiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}iiiiiiiiiii}iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}i~iiiiiiiiiiiiiiii}iiiii}iiiiiiiiii}ii~iiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}iiii~iiiiiiiiiiiiiiiiii}iiiiiiiiixyziiiiiiiiiiiiiiiiiiiiiiiiiiii}iiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiii}}iiiiiii}iiiiiiiiiiiiii~iiiiiiiiiiii}iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}iiiiiiiiiiiiiiiiiiiiiiiiiiiiiyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy \ No newline at end of file +{|{w|iii{|{|iiii{iiiii~iiii}iiiiiiii{ciii~iiiiiiiiiiiii|iiiiii~iiiiiiii}ci||iii~ii~i}iiiiiiii~iii}iiiii~iiiiiiiii{iiiiiiiiiii~iiiiiiixyiiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiii~iiiiiiii~iiiii}}~iiiiiiiiiiiiiiiiiiii~iiiiiiii~iiiiiiiiiiiiiiiiii~i~iiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiii}iiiiii~iiiiii~iiiiiiiiiiiiix{iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}~~iiiiiiiii|i}iiiiiiiiiiixyziii}iixyyyyyyyyyz|iiiiiiiii}iiiiiiiixziiiiiiiiiiiii}ii}xiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii|iiiiiiiiiiiii~iiiiiiiiiiii~iiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}iiiiiiiiiii}iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}i~iiiiiiiiiiiiiiii}iiiii}iiiiiiiiii}ii~iiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}iiii~iiiiiiiiiiiiiiiiii}iiiiiiiiixyziiiiiiiiiiiiiiiiiiiiiiiiiiii}iiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiiiiii~iiiiiiiiiiiiiiiiii}}iiiiiii}iiiiiiiiiiiii~iiiiiiiiiiii}iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii}iiiiiiiiiiiiiiiiiiiiiiiiiiiiyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy \ No newline at end of file diff --git a/data/layouts/daycarebase/map.bin b/data/layouts/daycarebase/map.bin index c60a03af0cdb..f588c830b60c 100644 --- a/data/layouts/daycarebase/map.bin +++ b/data/layouts/daycarebase/map.bin @@ -4,6 +4,6 @@ htpypzp ` ` ` ` ` `hh a!a)a*ahhhhhhhhhhh ` `h hhh hh h h"hppq`q`q`q`q`tpzphhhhhh!haaaahhhhhhhhhhhhhhhhh h!h"h h hhh hhhh h"hxpqqqqqzp`hh!h!h)h)haahhh)h)h)h)h)h)h)h)h!h!hhhhhhhh!h!h"hhhh hh h -hh!h!hhhhhhhhh!h!h)h*hhhhhhhhhhaahhhh(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*hhpiiiiiijphaaaahhaahhaaaah(h!h!hhhhhhhh!h!h!h!h!h!h!h)h)h*hh`hps`qqqqqqupiaaaahh(h)h)h!h!h!h!h!h!h!h!h!h!h!h!h*h``h`hps`qqqqqqmpaahhh h!h!h!h!h!h!h!h!h)h)h*hh`hpiikpllkpl`l`l`l`l`mphhh(h)h!h!h!h!h!h!h*hh`hpiikpllqqkp`q`q`q`q`q`upqaahhh h!h!h!h)h*hhpiiqkplkpl`l`l``q`q`q`q`q`q``mpaah h!h)h*hhhppqkplkpl`` q`q`q`q`q`q`q`uph h"hhhhpikplqqspq`q` q`q`q`q`q`q`q`uph h"hhhppqspqqqq{p|p|p |p|p|ppq`q`q`uph h"hhhppqspqtp|p|p|p|p|p |p|ppspq`q`q`uph h!hhhppqspquptpypypypyp yppspspq`q`q`uph(h!h"hhppq{p|p}prp ppsp{pypypyp}phh h"hhppqqqqrp ppspqqqqqޑhh h"hhxppqqqrp pp{pypypphh!h"hhhppqqtpzp ppqq`q`sphhh h!h*hhhxppqrp xpyppq`spqq````````hhh!h"hhhhhxpypzp ``ppq`{pypyp``h ` ` ` `hhhhh!h!h*hhhhhh ``ppq```q```h ` ` ` ` ` `hhhh h!h*hhhhhhh ``ppq```q```hh ` ` ` ` ` ` `hhhh!h"hhhhhhhh ``ppq`q`q`q````h ` ` ` ` ` ` ` `hhhh(h)h*hhhhhh ` ` ````````pp``q`q`` ` ` ` ` ` ` `hhhhhhhhhhhh ` ` `!- - - - !````````pp``q`q``h ` ` `hhhhhhhhhhhhhh ` ` `%%%%%%%%xpypypypyp``hhhhhhhhhhhhhhhh ` ` `p`````hhhhhhhhhhhh `hhhh ` ` `p567h h `hh`````h ` ` +hh!h!hhhhhhhhh!h!h)h*hhhhhhhhhhaahhhh(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*hhpiiiiiijphaaaahhaahhaaaah(h!h!hhhhhhhh!h!h!h!h!h!h!h)h)h*hh`hps`qqqqqqupiaaaahh(h)h)h!h!h!h!h!h!h!h!h!h!h!h!h*h``h`hps`qqqqqqmpaahhh h!h!h!h!h!h!h!h!h)h)h*hh`hpiikpllkpl`l`l`l`l`mphhh(h)h!h!h!h!h!h!h*hh`hpiikpllqqkp`q`q`q`q`q`upqaahhh h!h!h!h)h*hhpiiqkplkpl`l`l``q`q`q`q`q`q``mpaah h!h)h*hhhppqkplkpl`` q`q`q`q`q`q`q`uph h"hhhhpikplqqspq`q` q`q`q`q`q`q`q`uph h"hhhppqspqqqq{p|p|p |p|p|ppq`q`q`uph h"hhhppqspqtp|p|p|p|p|p |p|ppspq`q`q`uph h!hhhppqspquptpypypypyp yppspspq`q`q`uph(h!h"hhppq{p|p}prp ppsp{pypypyp}phh h"hhppqqqqrp ppspqqqqqޑhh h"hhxppqqqrp pp{pypypphh!h"hhhppqqtpzp ppqq`q`sphhh h!h*hhhxppqrp xpyppq`spqq````````hhh!h"hhhhhxpypzp ``ppq`{pypyp``h ` ` ` `hhhhh!h!h*hhhhhh ``ppq```q```h ` ` ` ` ` `hhhh h!h*hhhhhhh ``ppq```q```hh ` ` ` ` ` ` `hhhh!h"hhhhhhhh ``ppq`q`q`q````h ` ` ` ` ` ` ` `hhhh(h)h*hhhhhh ` ` ````````pp``q`q`` ` ` ` ` ` ` `hhhhhhhhhhhh ` ` `!- - - - !````````pp``q`q``h ` ` `hhhhhhhhhhhhhh ` ` `%%%%%%%%xpypypypyp``hhhhhhhhhhhhhhhh ` ` `p`````hhhhhhhhhhhh `hhhh ` ` `p567h h `hh`````h ` ` hhhhh ` ` `p hpspq`upi`jp`hh h `````ph ` ` ` `hhhh``` pp{p|p}pq`rpph ` `h```` `hh` ` ` `hh```` ppq`q`tpzph ` ````` h `hh hhhp``` xpypypzphh `h `p```hhh hh hhh``` ` !" `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`aa`(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 From 9618dd14f98cecd1c35c66bdb0e48d247f9a3d3c Mon Sep 17 00:00:00 2001 From: fakuzatsu Date: Fri, 26 Sep 2025 15:41:23 +0100 Subject: [PATCH 4/4] makes Pikachu more obvious a different way --- data/layouts/daycarebase/map.bin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/layouts/daycarebase/map.bin b/data/layouts/daycarebase/map.bin index f588c830b60c..ae12254c80ec 100644 --- a/data/layouts/daycarebase/map.bin +++ b/data/layouts/daycarebase/map.bin @@ -4,6 +4,6 @@ htpypzp ` ` ` ` ` `hh a!a)a*ahhhhhhhhhhh ` `h hhh hh h h"hppq`q`q`q`q`tpzphhhhhh!haaaahhhhhhhhhhhhhhhhh h!h"h h hhh hhhh h"hxpqqqqqzp`hh!h!h)h)haahhh)h)h)h)h)h)h)h)h!h!hhhhhhhh!h!h"hhhh hh h -hh!h!hhhhhhhhh!h!h)h*hhhhhhhhhhaahhhh(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*hhpiiiiiijphaaaahhaahhaaaah(h!h!hhhhhhhh!h!h!h!h!h!h!h)h)h*hh`hps`qqqqqqupiaaaahh(h)h)h!h!h!h!h!h!h!h!h!h!h!h!h*h``h`hps`qqqqqqmpaahhh h!h!h!h!h!h!h!h!h)h)h*hh`hpiikpllkpl`l`l`l`l`mphhh(h)h!h!h!h!h!h!h*hh`hpiikpllqqkp`q`q`q`q`q`upqaahhh h!h!h!h)h*hhpiiqkplkpl`l`l``q`q`q`q`q`q``mpaah h!h)h*hhhppqkplkpl`` q`q`q`q`q`q`q`uph h"hhhhpikplqqspq`q` q`q`q`q`q`q`q`uph h"hhhppqspqqqq{p|p|p |p|p|ppq`q`q`uph h"hhhppqspqtp|p|p|p|p|p |p|ppspq`q`q`uph h!hhhppqspquptpypypypyp yppspspq`q`q`uph(h!h"hhppq{p|p}prp ppsp{pypypyp}phh h"hhppqqqqrp ppspqqqqqޑhh h"hhxppqqqrp pp{pypypphh!h"hhhppqqtpzp ppqq`q`sphhh h!h*hhhxppqrp xpyppq`spqq````````hhh!h"hhhhhxpypzp ``ppq`{pypyp``h ` ` ` `hhhhh!h!h*hhhhhh ``ppq```q```h ` ` ` ` ` `hhhh h!h*hhhhhhh ``ppq```q```hh ` ` ` ` ` ` `hhhh!h"hhhhhhhh ``ppq`q`q`q````h ` ` ` ` ` ` ` `hhhh(h)h*hhhhhh ` ` ````````pp``q`q`` ` ` ` ` ` ` `hhhhhhhhhhhh ` ` `!- - - - !````````pp``q`q``h ` ` `hhhhhhhhhhhhhh ` ` `%%%%%%%%xpypypypyp``hhhhhhhhhhhhhhhh ` ` `p`````hhhhhhhhhhhh `hhhh ` ` `p567h h `hh`````h ` ` +hh!h!hh(a*ahhhhh!h!h)h*hhhhhhhhhhaahhhh(h)h)h)h)h)h)h)h)h!h!h"hhhhh hhh h!h!h!hhh!h!h!h!h)h)h*hhpiiiiiijphaaaahhaahhaaaah(h!h!hhhhhhhh!h!h!h!h!h!h!h)h)h*hh`hps`qqqqqqupiaaaahh(h)h)h!h!h!h!h!h!h!h!h!h!h!h!h*h``h`hps`qqqqqqmpaahhh h!h!h!h!h!h!h!h!h)h)h*hh`hpiikpllkpl`l`l`l`l`mphhh(h)h!h!h!h!h!h!h*hh`hpiikpllqqkp`q`q`q`q`q`upqaahhh h!h!h!h)h*hhpiiqkplkpl`l`l``q`q`q`q`q`q``mpaah h!h)h*hhhppqkplkpl`` q`q`q`q`q`q`q`uph h"hhhhpikplqqspq`q` q`q`q`q`q`q`q`uph h"hhhppqspqqqq{p|p|p |p|p|ppq`q`q`uph h"hhhppqspqtp|p|p|p|p|p |p|ppspq`q`q`uph h!hhhppqspquptpypypypyp yppspspq`q`q`uph(h!h"hhppq{p|p}prp ppsp{pypypyp}phh h"hhppqqqqrp ppspqqqqqޑhh h"hhxppqqqrp pp{pypypphh!h"hhhppqqtpzp ppqq`q`sphhh h!h*hhhxppqrp xpyppq`spqq````````hhh!h"hhhhhxpypzp ``ppq`{pypyp``h ` ` ` `hhhhh!h!h*hhhhhh ``ppq```q```h ` ` ` ` ` `hhhh h!h*hhhhhhh ``ppq```q```hh ` ` ` ` ` ` `hhhh!h"hhhhhhhh ``ppq`q`q`q````h ` ` ` ` ` ` ` `hhhh(h)h*hhhhhh ` ` ````````pp``q`q`` ` ` ` ` ` ` `hhhhhhhhhhhh ` ` `!- - - - !````````pp``q`q``h ` ` `hhhhhhhhhhhhhh ` ` `%%%%%%%%xpypypypyp``hhhhhhhhhhhhhhhh ` ` `p`````hhhhhhhhhhhh `hhhh ` ` `p567h h `hh`````h ` ` hhhhh ` ` `p hpspq`upi`jp`hh h `````ph ` ` ` `hhhh``` pp{p|p}pq`rpph ` `h```` `hh` ` ` `hh```` ppq`q`tpzph ` ````` h `hh hhhp``` xpypypzphh `h `p```hhh hh hhh``` ` !" `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`aa`(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