diff --git a/data/layouts/DaycareEast/map.bin b/data/layouts/DaycareEast/map.bin index e44ccb063494..b05c1c5eb492 100644 Binary files a/data/layouts/DaycareEast/map.bin and b/data/layouts/DaycareEast/map.bin differ diff --git a/data/layouts/DaycareMountain/map.bin b/data/layouts/DaycareMountain/map.bin index 9bbb86d60c21..a7cdd4ea74e2 100644 Binary files a/data/layouts/DaycareMountain/map.bin and b/data/layouts/DaycareMountain/map.bin differ diff --git a/data/layouts/DaycarePond/map.bin b/data/layouts/DaycarePond/map.bin index 704a3ae87080..89b50d1c2a9f 100644 Binary files a/data/layouts/DaycarePond/map.bin and b/data/layouts/DaycarePond/map.bin differ diff --git a/data/layouts/DaycareTreehouse/map.bin b/data/layouts/DaycareTreehouse/map.bin index 0d5ac68c6e80..0e073e1e2bcc 100644 Binary files a/data/layouts/DaycareTreehouse/map.bin and b/data/layouts/DaycareTreehouse/map.bin differ 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`tpypypypqqqqqqqqqqqqqqqqp`ppq`q`q`rptp`ppp`xphx`ixzprppppxpypyppx`qxypzphxpp `hhhaaaahh `xppaaaaaaahh ` `xpypp ` `haaahh ` ` `xpp `haaahhh ` ` `xpphhhhaaahhhh ` `xp|pphhaaahhhhh ` ` `xppxxhhhhhhhhaaahhhhh ` ` `xp|p|p|p|p|p|p|phhhaaaahhhhh ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `hhhhaaahhhhhhhhhhhhhhhaaaaaaaaaaaaaaaaahhhhhaaahhhhhhhhhhhhhhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa````````aaaa```aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa`aa`aaaaaaaaaaaaaaaaaaaaaaaaaaaa````haah````hhhh```hhhhh``hhhhhhhh`hhhhhhhhhaahhhhhhhhhhaahhhhhhhhhhhhhhhhhhhhhhhhaaaahhhhhhhhhhhhhhhhhhhhhhhhhhhhaaaaaahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhaa`````hhhhhhhhhhhhhhh``````hhhhhaaaaaa````hhhhh`````hhhh``````hhh`````hhhh`````````hh`````hhhh`````````hhh````aaaa`````````hhh````aaaaaaaaaaaaaaaa \ No newline at end of file +yyyyyyyyyyyyyy}q`q`q`q`q`{yyyyyyyyyyyyyyyyyyyyyyyyyyh`iyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyp`qyyyyyyyyyyyyyyyyyyyyyyyyyyyyyq`q`q`q`tpq`q`q`q`rpxh`iyzxyyp`q hhhhhhxaahhhhhxy  h h"hhhh `xh h!hhh ` ` `xh h!hhh ` ` ` `x|h(h!h"hhh ` ` ` ` `xhh h!hhh ` ` ` ` ` `x|||hh h!h"hhh ` ` ` ` ` ` ` ` ````` ` ` ` ` `hhh!h!h!hhhh ` ` ` ` ` `hhaaaaaaaa` ` ` `hh!h!h)h)h!h!hhhhhhhhhhhhhhhaaaaaaa"h` ` ` `h(h)h*hhh(h)h!h!hhhhhhhhhhhhh````aaaah` ` ` `hhhhhhh(h)h)h)h)h)h)h)h)h)h!h!h!h)haaaaaaa!h"h`aaaaaaaaaaaaaaaaaahh h!h*hh` h"h`hh!h*hhh` h"h`h h"hhaa` h"h`h(h*hh`(h*h`hhhhhh```hhhhhhhaahhhhhhh(h*hhaahhhhhhhhhhhh(h!hhhhhhhhh!h*hhaaaa(h*hhhhhhhhh(h*hhhhhhhhhhhhhhhaaaaaahhhhhhhhhhhhhhhhhhh(h)h)h*hhaah`````hhhhhhhhhhh``````hhhhhaa``hhhhh`````hhhh````hhh`````hhhh```````hh`````hhhh```````hhh````aaaa```````hhh````aaAh:h9hBhaaaaAh:h9hBh \ No newline at end of file diff --git a/data/layouts/daycarebase/map.bin b/data/layouts/daycarebase/map.bin index 8733b340939d..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`|`|`|`|`|`aaaaaaaaaaaaaa`````````pppppp````````````````````aaaaaaaaaaaaaa`````````5x6h6h6h6h7x````````````````````aaaaaaaaaaaaaatpypqqqqpppq`q`q`q`rptpypypypp```````````````aaaaaaaaaaaa `tpzp `qqqqppppq`q`q`q`rprp ` ` `xpp``````````````aaaaaaaaaaaatpzp ` `qqqqppxp|phx`ixzprph ` ` `xpypypp```````````aaaaaaaa ` `tpypzp ` `hhh h hxpypypypyppx`qxypzphh ` ` ` ` `xpypp`````````aaaaaaaa `tpzp ` ` `hhaaaaaaaaaaaaaahh ` ` ` ` ` ` `xpypypp``````aaaaaahtpypzp ` ` `haa!a!a!a!a!a!a!a!a!a!a!a!a!a"ahhhhh ` ` ` ` ` ` `xpp`````aaaaaatpzp ` ` `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`````````````aaaaaaaaaaaaaa`````````pppppp````````````````````aaaaaaaaaaaaaa`````````5x6h6h6h6h7x```````a````````````aaaaaaaaaaaaaatpypqqqqpppq`q`q`q`rptpypypypp`````a`````````aaaaaaaaaaaa `tpzp `qqqqppppq`q`q`q`rprp ` ` `xpp``````````````aaaaaaaaaaaatpzp ` `qqqqxppxp|phx`ixzprph ` ` `xpypypp```````````aaaaaaaa ` `tpypzp `h ` `h h hhxpypypyppx`qxypzp ` ` ` ` ` ` `xpypp`````````aaaaaaaa `tpzp ` ` ` ` `hhhhhhhhhhhh ` ` ` ` ` `h ` ` ` `xpypypp``````aaaaaahtpypzp `h ` `hhhaaaaaahhhhhh ` ` ` ` ` ` ` ` ` ` `h `xpp`````aaaaaatpzp ` ` ` ` ` `haa!a!a)a)a)a*ahhhhhhh ` ` `h ` ` ` ` ` ` ` ` `xpypypypypyp hhh -htpypzp ` ` `hha!a!a!a!a*ahhhhhhhhhhhhhhhiiijhhh ` ` ` ` ` ` ` ` `ypypypypzp ` ` ` `hha!a!a!a!a*ahhhhhhhhhhhhhhpipspqqqupjphhhh ` ` ` ` ` ` ` ` ` ` ` ` ` ` `hhh a!a!a!a*ahhhhh!h!h)h)h)h)h!h!hhppq`{p|pq|p}prphhhhhhhhhhhh -hhhh -hhhhhh a!a!a"ahhhhh!h)h*h hhh h(h!h"hppq`q`q`q`q`q`rphhhhhhaaaaahhhhhhhhhhh(a)a)a*ahhhh!h*h h +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"hppaaaaaarphhhhhh!haaaahhhhhhhhhhhhhhhhhh!h"h h -hhh h hhh h"hxpqqqqqqzphh!h!h)h)haahhh)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*hhpiiiiiijphaahhhhhhhhhhhhhhh(h!h!hhhhhhhh!h!h!h!h!h!h!h)h)h*hhhhps`qqqqqqupiaahhaahhhhhhhhhh(h)h)h!h!h!h!h!h!h!h!h!h!h!h!h*hhhhhhps`qqqqqqmpaaaahhhhhhhhhhh h!h!h!h!h!h!h!h!h)h)h*hhhhpiikpllkpl`l`l`l`l`mpaahhhhhhhhh(h)h!h!h!h!h!h!h*hhhhpiikpllqqkp`q`q`q`q`q`upqaaaaaaaahhh 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 ppspqqqqqhh h"hhxppqqqrp pp{pypyppqqhh!h"hhhppqqtpzp ppqq`q`spqqhhh h!h*hhhxppqrp xpyppq`spqq````````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 ` `p567h 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!haaaahhhhhhhhhhhhhhhhh h!h"h h +hhh hhhh h"hxpqypypypypzp`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 ppspqqqqqhh h"hhxppqqqrp pp{pypyppqqhh!h"hhhppqqtpzp ppqq`q`spqqhhh h!h*hhhxppqrp xpyppq`spqq````````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 ` ` `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 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 da2dd85a19e6..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, @@ -300,25 +300,25 @@ "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_SPECIES(CHANSEY)", - "x": 30, - "y": 2, + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", + "x": 27, + "y": 38, "elevation": 0, - "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "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": "ChanseyDaycarePond", - "flag": "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", @@ -326,8 +326,8 @@ }, { "type": "trigger", - "x": 26, - "y": 27, + "x": 24, + "y": 24, "elevation": 0, "var": "VAR_TEMP_0", "var_value": "0", @@ -335,7 +335,7 @@ }, { "type": "trigger", - "x": 37, + "x": 28, "y": 3, "elevation": 0, "var": "VAR_TEMP_0", @@ -344,8 +344,8 @@ }, { "type": "trigger", - "x": 13, - "y": 35, + "x": 10, + "y": 32, "elevation": 0, "var": "VAR_TEMP_0", "var_value": "0", @@ -353,8 +353,8 @@ }, { "type": "trigger", - "x": 16, - "y": 25, + "x": 17, + "y": 13, "elevation": 0, "var": "VAR_TEMP_0", "var_value": "0", @@ -362,8 +362,8 @@ }, { "type": "trigger", - "x": 13, - "y": 34, + "x": 10, + "y": 31, "elevation": 0, "var": "VAR_TEMP_0", "var_value": "0", @@ -371,8 +371,8 @@ }, { "type": "trigger", - "x": 28, - "y": 27, + "x": 26, + "y": 24, "elevation": 0, "var": "VAR_TEMP_0", "var_value": "0", @@ -380,7 +380,7 @@ }, { "type": "trigger", - "x": 37, + "x": 28, "y": 4, "elevation": 0, "var": "VAR_TEMP_0", @@ -389,7 +389,7 @@ }, { "type": "trigger", - "x": 37, + "x": 28, "y": 5, "elevation": 0, "var": "VAR_TEMP_0", @@ -398,7 +398,7 @@ }, { "type": "trigger", - "x": 37, + "x": 28, "y": 6, "elevation": 0, "var": "VAR_TEMP_0", @@ -407,7 +407,7 @@ }, { "type": "trigger", - "x": 37, + "x": 28, "y": 7, "elevation": 0, "var": "VAR_TEMP_0", @@ -418,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 3220bd7c1dd9..df929ec65868 100644 Binary files a/data/tilesets/primary/general/metatiles.bin and b/data/tilesets/primary/general/metatiles.bin differ diff --git a/data/tilesets/secondary/mauville/metatile_attributes.bin b/data/tilesets/secondary/mauville/metatile_attributes.bin index b30ffc5ae02f..5c873d8152b4 100644 Binary files a/data/tilesets/secondary/mauville/metatile_attributes.bin and b/data/tilesets/secondary/mauville/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/mauville/metatiles.bin b/data/tilesets/secondary/mauville/metatiles.bin index 4737b6ea0e9c..40b0ad202491 100644 Binary files a/data/tilesets/secondary/mauville/metatiles.bin and b/data/tilesets/secondary/mauville/metatiles.bin differ diff --git a/src/data/heal_locations.json b/src/data/heal_locations.json index 7b215415bbef..5f66924106b8 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",