diff --git a/data/event_scripts.s b/data/event_scripts.s index 38294f0d1..67d90e707 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1102,3 +1102,5 @@ Common_EventScript_LegendaryFlewAway:: .include "data/maps/Route117South/scripts.inc" .include "data/maps/Route117South_PokeBreedersHouse/scripts.inc" + + .include "data/maps/Route111East/scripts.inc" diff --git a/data/layouts/Route103/map.bin b/data/layouts/Route103/map.bin index 5e5082ba5..270729a11 100644 --- a/data/layouts/Route103/map.bin +++ b/data/layouts/Route103/map.bin @@ -1 +1 @@ -ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕ�pppppppppp’sq{‰sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquÜÝÜÝäåäåäåäåäåäåÜÝÜÝÜÝÜÝÜÝ�uvpppppppp’{|‰s{‰qquqq{‰qqqqt|||||||‰qqqqqqqqt}qqqqquÔÕÔÕ000000 0 0 0 0 0 0ÔÕÔÕÔÕÔÕÔÕ�}~ppppppppš‰�s{‰sqquqt‰{||||}qt©©©‰q{||||||||}qqqqqquÜÝäç000Ð1Ñ1Ñ1Ò1 0 0 0 0 0æåÜÝÜÝÜÝäç�ppppppuvPQpp’{‰s{‰ququ{©©|||||}qqq{|©©©©©©©©©©||||||}ÔÕ 0 0000à1á1á1â100 0 0 0 0 0ÔÕÔÕÔÕˆ‰˜puvppp}~XYppš�s{‰{|}t}t‘‘‘‘‘‘‘‘yyy‘ÎÎÎΑ‘‘‘ÎÎÎÎÎÎÎÎÎÎÜÝ 0 0 0 0Õ4‡4‡4‡4‡4‡4‡4o4 0 0 0 0æåÜÝÜÝdQpp}~uvPQpppuvPesq{|||}qr0000000K1L5L5L5M1ÇÇ0000ÇÇÇÇÇÇÇÇÔÕ 0 0 0 0 0 0 00000�4‡4‡4‡4‡4‡4Ö4ÔÕÔÕlYuvpp}~XYppp}~Xm{|‘‘‘‘‘yz0ÆÆÆÆÆÆ1111100000Ç0ÇÇæå 0 0 0 0 0 0 000000000000æåäç�p}~ppppppppppppš‰‰Š000000ÆÆÆÆÆ000000Ç00000000ÇÇÇÇ0Ç0000 0 0 0 0 0 00000Ð1Ñ1Ñ1Ñ1Ò10000ˆ‰˜ppppppppppppppppppš‰‰‰‰Š000ÆÆÇÇ00000000000000Ç00Î1Ï1Î1Ç1 0 0 0 0 00040à1á1Ù1Ù1Ù1Ò1000�ppppppppppppppppppppppppp’0000ÇÇÇ0Ç0Ç00000Ç0000111Ô×Ô× 0 0 0 00000000à1á1á1â1000�ppppppppppppppppppppppppp’011110ÇÇÇ000000000011!1!1)1ÜÝÜÝ 0 0 0 0000000 0 0 0 00000�ppppppppppppppppppppppppp’0(1)1!1!1111100000011!1!1)1*10ÔÕÔÕÕ4‡4‡4‡4‡4‡4‡4‡4‡4Ö4 0 0 0 0 00000Ô0yppppppppppppppppppppppp’000(1)1)1)1!1!1111111111111111!1!1)1*100ÇÜÝÜÝ0000000 0 0 0 0 0 0 0Æ1Ï1Î1Ï1Î1Ï1dQPQppppppppppuvppppp“““’0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*10000ÇÔÕÔÕ0000000 0 0 0 0 0 0 0Ö5Õ5Ô5Õ5Ô×lYXYuvppppPQPQ}~puvpxÆÆÆ000ÇÇÇ0Ç000000000000000000000ÇÇÇÜÝÜÝÎ1Ï1000000Æ1Ç1Æ1Ç1Æ1Ç1ÜÝÜÝÜ݈2‰2yp}~uvPQXYXYpPQ}~PeÆÇÇÇÇÇÇÇÇÇÇÇ00000000Ç0ÇÇÇÇÔÕÔÕÔ×000000Ö5ÕÔÕÔÕÔÕÔÕÔÕÔ×�ppp}~XYpppppXYppXmÆÆÆÆÇÇÇÇÇÇÇÇ000000000ÇÇÇÇÇÜÝÜÝÜÝÎ1Ï10000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ�uvppppppppppppppp’ÆÆÆÆÇÇÇÇÇÇÇÇÇ0Ç0Ç0Ç0Ç0Ç0Ç0Ç0Ç0ÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕ�}~ppppppppppppppx0ÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝæåæå�pppppppppppppppp’ÆÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕ0000�pppppppppppppppp’ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝæå€‰‰‰˜pppppppppppp’è1é1è1é1ôõôõôõôõôõôõôõôõôõôõôõôõôõôõôõôõôõôõ \ No newline at end of file +ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕ�pppppppppp’sq{‰sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquÜÝÜÝäåäåäåäåäåäåÜÝÜÝÜÝÜÝÜÝ�uvpppppppp’{|‰s{‰qquqq{‰qqqqt|||||||‰qqqqqqqqt}qqqqquÔÕÔÕ000000 0 0 0 0 0 0ÔÕÔÕÔÕÔÕÔÕ�}~ppppppppš‰�s{‰sqquqt‰{||||}qt©©©‰q{||||||||}qqqqqquÜÝäç000Ð1Ñ1Ñ1Ò1 0 0 0 0 0æåÜÝÜÝÜÝäç�ppppppuvPQpp’{‰s{‰ququ{©©|||||}qqq{|©©©©©©©©©©||||||}ÔÕ 0 0000à1á1á1â100 0 0 0 0 0ÔÕÔÕÔÕˆ‰˜puvppp}~XYppš�s{‰{|}t}t‘‘‘‘‘‘‘‘yyy‘ÎÎÎΑ‘‘‘ÎÎÎÎÎÎÎÎÎÎÜÝ 0 0 0 0Õ4‡4‡4‡4‡4‡4‡4o4 0 0 0 0æåÜÝÜÝdQpp}~uvPQpppuvPesq{|||}qr0000000K1L5L5L5M1ÇÇ0000ÇÇÇÇÇÇÇÇÔÕ 0 0 0 0 0 0 00000�4‡4‡4‡4‡4‡4Ö4ÔÕÔÕlYuvpp}~XYppp}~Xm{|‘‘‘‘‘yz0ÆÆÆÆÆÆ1111100000Ç0ÇÇæå 0 0 0 0 0 0 000000000000æåäç�p}~ppppppppppppš‰‰Š000000ÆÆÆÆÆ000000Ç00000000ÇÇÇÇ0Ç0000 0 0 0 0 0 00000Ð1Ñ1Ñ1Ñ1Ò10000ˆ‰˜ppppppppppppppppppš‰‰‰‰Š000ÆÆÇÇ00000000000000Ç00Î1Ï1Î1Ç1 0 0 0 0 00040à1á1Ù1Ù1Ù1Ò1000�ppppppppppppppppppppppppp’0000ÇÇÇ0Ç0Ç00000Ç0000111Ô×Ô× 0 0 0 00000000à1á1á1â1000�ppppppppppppppppppppppppp’011110ÇÇÇ000000000011!1!1)1ÜÝÜÝ 0 0 0 0000000 0 0 0 00000�ppppppppppppppppppppppppp’0(1)1!1!1111100000011!1!1)1*10ÔÕÔÕÕ4‡4‡4‡4‡4‡4‡4‡4‡4Ö4 0 0 0 0 00000Ô0yppppppppppppppppppppppp’000(1)1)1)1!1!1111111111111111!1!1)1*100ÇÜÝÜÝ0000000 0 0 0 0 0 0 0Æ1Ï1Î1Ï1Î1Ï1dQPQppppppppppppppppp“““’0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*10000ÇÔÕÔÕ0000000 0 0 0 0 0 0 0Ö5Õ5Ô5Õ5Ô×lYXYppppppppppppppppxÆÆÆ000ÇÇÇ0Ç000000000000000000000ÇÇÇÜÝÜÝÎ1Ï1000000Æ1Ç1Æ1Ç1Æ1Ç1ÜÝÜÝÜ݈2‰2yppppppppppppppppPeÆÇÇÇÇÇÇÇÇÇÇÇ00000000Ç0ÇÇÇÇÔÕÔÕÔ×000000Ö5ÕÔÕÔÕÔÕÔÕÔÕÔ×�ppppppppppppppppXmÆÆÆÆÇÇÇÇÇÇÇÇ000000000ÇÇÇÇÇÜÝÜÝÜÝÎ1Ï10000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ�uvppppppppppppppp’ÆÆÆÆÇÇÇÇÇÇÇÇÇ0Ç0Ç0Ç0Ç0Ç0Ç0Ç0Ç0ÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕ�}~ppppppppppppppx0ÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝæåæå�pppppppppppppppp’ÆÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕ0000�pppppppppppppppp’ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝæå€‰‰‰˜pppppppppppp’è1é1è1é1ôõôõôõôõôõôõôõôõôõôõôõôõôõôõôõôõôõôõ \ No newline at end of file diff --git a/data/layouts/Route111/map.bin b/data/layouts/Route111/map.bin index 6216fb9ca..58cb575f5 100644 Binary files a/data/layouts/Route111/map.bin and b/data/layouts/Route111/map.bin differ diff --git a/data/layouts/Route111East/border.bin b/data/layouts/Route111East/border.bin new file mode 100644 index 000000000..4531975c7 Binary files /dev/null and b/data/layouts/Route111East/border.bin differ diff --git a/data/layouts/Route111East/map.bin b/data/layouts/Route111East/map.bin new file mode 100644 index 000000000..c8e866b3d Binary files /dev/null and b/data/layouts/Route111East/map.bin differ diff --git a/data/layouts/Route116Ext/map.bin b/data/layouts/Route116Ext/map.bin index ec8d4211e..fba09767a 100644 --- a/data/layouts/Route116Ext/map.bin +++ b/data/layouts/Route116Ext/map.bin @@ -2,4 +2,4 @@ 2000 00 00à 0h¾kllállm¾j 0 0 0 0 0ÔÕÔÕ000à1â100¸¡¡¡¡¡Ëè1é1è1é1Ì¡¡¡þÿ¡¡¡¡¡ºÔÕÔÕÔÕÔÕÔÕÔÕ 0002Ð1Ñ1Ñ1Ñ1Ò12 0 00 0 00 0 0pqsqqqqquqr 0 0 0 0 0äåäå002 22 2 2¸¡¡¡Ëè1é1ÔÕÔÕ¸¡ºÓ0üý¸¡¡¡¡ËÜÝÜÝÜÝÜÝÜÝÜÝ0 0 02Ø1Ù1Ù1Ù1Ú1200 0 00 0 0h¾qsqkmqquqr 0 0 0 0 0Î1Ï10000°±±±±À¡¡¡ºÔÕÜÝÜݸ¡º2ä帡º000ÔÕÔÕÔÕÔÕÔÕÔÕ 00 02Ø1Ù1Ù1Ù1Ú120 0 0 0 0hiqkllqsuqquqr 0 0 0 0 0Ö×Î1Ï100¸¡¡¡¡¡¡¡¡ºÜÝÔÕÔÕ¸¡º2 22¸¡º2 0 0äåÜÝÜÝÜÝäåÜÝ 0 00 2Ø1Ù1Ù1Ù1Ú1200 0 0h¾qklqqqsuqquqr 0 0 0 0 0ÞßÖ×00¸¡¡¡¡¡¡¡¡ºÔÕäåä帡±±±À¡º 020 00ÔÕÔÕÔÕ20ÔÕ 00 02à1á1á1á1â1200 0h¾qkláqklluqquqr 0 0 0 0 0Ö×Þß00¸¡¡¡¡¡¡¡¡ºäå°±±±À¡¡¡¡¡¡¡º 00 0 0 0äåÜÝÜÝ 0 0äå 0 00022 -22 200 00pkllqqklqquqt}qr 0 0 0 0 0ÞßÖ×0 00000Ô0¸¡¡¡Â±±À¡¡¡¡¡¡¡¡¡¡¡Ë 0000002ÔÕÔÕ20 0 0 00Æ1Ç1Î1Ç1 0Æ1Ç1000h¾sqqkllqqququqqr 0 0 0 0 0Ö×äå 0 0Ð1Ñ1Ñ1Ò100000000è1é10Ô0¸¡¡¡ºÓ0è1é100000002äåäå 000000Ö×Ö× 0Ö× 00h¾qsqklqqáqt}quqqr 0 0 0 0 0äå00 0Ð1Ù1á1á1á1Ñ1Ñ1Ñ1Ò10000ÔÕ 0 0¸¡¡¡º 0ÔÕ00hiij000 0 0 00 0 0 000æçæç 0æç0h¾qásqsqqqqt}qquqqr 0 0 0 0 0Î1Ï10 0 0à1â10Î1Ï1à1á1Ù1Ù1Ò10Æ1Ç1ÜÝ 0 0¸¡¡¡º 0ÜÝ0h¾áq¾iiiiiiiiiiiiiiiiiiii¾qqqsqsqt||}qqquqqr 0 0 0 0 0ÔÕ0 0 0 000Ö×00à1á1â1 0ÔÕÔÕ 0 0¸¡¡¡º 0ÔÕ 0pklllllllllllllllllllllll¶lllqq{|}qqqqqquqtz 0 0 0 0 0ÜÝ0 0 0 0 00äå 0Æ1Ï10Æ1Ç1ÜÝÜÝ 0 0¸¡¡¡º 0ÜÝ 0psqklllmqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqquqr 0 0 0 0 0 0ÔÕ00 0 0 0000 0ÔÕ 0ÔÕÔÕÔÕ 0 0Ô0¸¡¡º 0ÔÕ 0psqsqqq¾llllllálllllllllllllllllllmqqqqquqr 0 0 0 0 0 0ÜÝ0 0 0 0Æ1Ç1Æ1Ï1Î1óò 0ÜÝÜÝÜÝÆ1Ç1Æ1é1è1é1è1Ç1ÜÝàpsqsqqk¶¶¶¶¶¶¶lllllllllllllllllllllllllmuqr 0 0 0 0 0 0 \ No newline at end of file +22 200 00pkllqqklqquqt}qr 0 0 0 0 0ÞßÖ×0 00000Ô0¸¡¡¡Â±±À¡¡¡¡¡¡¡¡¡¡¡Ë 0000002ÔÕÔÕ20 0 0 00Æ1Ç1Î1Ç1 0Æ1Ç1000h¾sqqkllqqququqqr 0 0 0 0 0Ö×äå 0 0Ð1Ñ1Ñ1Ò100000000è1é10Ô0¸¡¡¡ºÓ0è1é100000002äåäå 000000Ö×Ö× 0Ö× 00h¾qsqklqqáqt}quqqr 0 0 0 0 0äå00 0Ð1Ù1á1á1á1Ñ1Ñ1Ñ1Ò10000ÔÕ 0 0¸¡¡¡º 0ÔÕ00hiij000 0 0 00 0 0 000æçæç 0æç0h¾qásqsqqqqt}qquqqr 0 0 0 0 0Î1Ï10 0 0à1â10Î1Ï1à1á1Ù1Ù1Ò10Æ1Ç1ÜÝ 0 0¸¡¡¡º 0ÜÝ0h¾áq¾iiiiiiiiiiiiiiiiiiii¾qqqsqsqt||}qqquqqr 0 0 0 0 0ÔÕ0 0 0 000Ö×00à1á1â1 0ÔÕÔÕ 0 0¸¡¡¡º 0ÔÕ 0pklllllllllllllllllllllll¶lllqq{|}qqqqqquqtz 0 0 0 0 0ÜÝ0 0 0 0 00äå 0Æ1Ï10Æ1Ç1ÜÝÜÝ 0 0¸¡¡¡º 0ÜÝ 0psqklllmqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqquqr 0 0 0 0 0 0ÔÕ00 0 0 0000 0ÔÕ 0ÔÕÔÕÔÕ 0 0Ô0¸¡¡º 0ÔÕ 0psqsqqq¾llllllálllllllllllllllllllmqqqqquqr 0 0 0 0 0 0ÜÝ0 0 0 0Æ1Ç1Æ1Ï1Î1óòÇ1ÜÝÜÝÜÝÆ1Ç1Æ1é1è1é1è1Ç1ÜÝàpsqsqqk¶¶¶¶¶¶¶lllllllllllllllllllllllllmuqr 0 0 0 0 0 0 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index d9f384e0d..ecc9ca574 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -4620,6 +4620,16 @@ "secondary_tileset": "gTileset_GenericBuilding", "border_filepath": "data/layouts/Route117South_PokeBreedersHouse/border.bin", "blockdata_filepath": "data/layouts/Route117South_PokeBreedersHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE111EAST", + "name": "Route111East_Layout", + "width": 50, + "height": 100, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route111East/border.bin", + "blockdata_filepath": "data/layouts/Route111East/map.bin" } ] } diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index d672f0718..2bf06d9d5 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_TEALA", @@ -155,7 +155,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index c99fe3047..55bb6085f 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -459,7 +459,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index bcf579cf1..cb13ef948 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -412,7 +412,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index dc30c6ea9..92c686a3d 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_FLANNERY", @@ -277,7 +277,9 @@ "dest_warp_id": "23" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index b90802b17..a772d775c 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_MAN_5", @@ -237,6 +237,10 @@ "dest_warp_id": "25" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index 0833460ba..8776a3bf8 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", @@ -64,7 +64,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index 3aed0cceb..9ddc84bb4 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_VAR_0", @@ -37,6 +37,10 @@ "dest_warp_id": "2" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index a8a03ed95..f3e72480f 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_MAN_4", @@ -70,6 +70,10 @@ "dest_warp_id": "3" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index b17bc357a..0925e97e1 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", @@ -70,6 +70,10 @@ "dest_warp_id": "7" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index e7f47bcfb..34954aa20 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", @@ -181,6 +181,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 0dc3774d7..2e8d578d0 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", @@ -70,6 +70,10 @@ "dest_warp_id": "4" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 2dbd61569..65a8a62ff 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -32,6 +32,11 @@ "map": "MAP_ROUTE117NORTH", "offset": 120, "direction": "left" + }, + { + "map": "MAP_ROUTE111EAST", + "offset": 3, + "direction": "right" } ], "object_events": [ diff --git a/data/maps/Route111East/map.json b/data/maps/Route111East/map.json new file mode 100644 index 000000000..bb375557d --- /dev/null +++ b/data/maps/Route111East/map.json @@ -0,0 +1,335 @@ +{ + "id": "MAP_ROUTE111EAST", + "name": "Route111East", + "layout": "LAYOUT_ROUTE111EAST", + "music": "MUS_ROUTE110", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_SANDSTORM", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "map": "MAP_ROUTE111", + "offset": -3, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "OBJ_EVENT_GFX_HIKER", + "x": 38, + "y": 81, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", + "x": 34, + "y": 67, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", + "x": 42, + "y": 48, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 9, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", + "x": 46, + "y": 48, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_CAMPER", + "x": 16, + "y": 87, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", + "x": 28, + "y": 87, + "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": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_TRAPINCH", + "x": 23, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", + "x": 25, + "y": 39, + "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": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_ABRA", + "x": 12, + "y": 52, + "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": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_SANDSLASH", + "x": 15, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", + "x": 45, + "y": 66, + "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": "NULL", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", + "x": 46, + "y": 66, + "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": "NULL", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", + "x": 47, + "y": 66, + "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": "NULL", + "flag": "FLAG_TEMP_10" + }, + { + "graphics_id": "OBJ_EVENT_GFX_LUXURY_BALL", + "x": 46, + "y": 68, + "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": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_DIGLETT", + "x": 43, + "y": 74, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE", + "movement_range_x": 5, + "movement_range_y": 5, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_CAMPER", + "x": 14, + "y": 45, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", + "x": 20, + "y": 45, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", + "x": 29, + "y": 21, + "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": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", + "x": 21, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", + "x": 45, + "y": 17, + "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": "NULL", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_PHANPY", + "x": 47, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "NULL", + "flag": "0" + } + ], + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + { + "type": "secret_base", + "x": 28, + "y": 92, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE1_1" + }, + { + "type": "secret_base", + "x": 42, + "y": 85, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_2" + }, + { + "type": "hidden_item", + "x": 47, + "y": 8, + "elevation": 0, + "item": "ITEM_NONE", + "flag": "FLAG_TEMP_1" + }, + { + "type": "hidden_item", + "x": 36, + "y": 62, + "elevation": 0, + "item": "ITEM_NONE", + "flag": "FLAG_TEMP_1" + } + ] +} diff --git a/data/maps/Route111East/scripts.inc b/data/maps/Route111East/scripts.inc new file mode 100644 index 000000000..26cc4df85 --- /dev/null +++ b/data/maps/Route111East/scripts.inc @@ -0,0 +1,2 @@ +Route111East_MapScripts:: + .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 5e6f9d75e..0b5cefd0a 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_LASS", @@ -83,6 +83,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 128c9f6e7..0686f0920 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", @@ -44,6 +44,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 3ab11461b..28559ebad 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_PICNICKER", diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index f1e9048b1..07e164026 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -148,7 +148,13 @@ "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM" } ], - "warp_events": [], - "coord_events": [], - "bg_events": [] + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 876ffb8f6..6058adbde 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -143,8 +143,12 @@ "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET" } ], - "warp_events": [], - "coord_events": [], + "warp_events": [ + + ], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 93f3d2a79..4a70b9556 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -52,7 +52,13 @@ "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM22" } ], - "warp_events": [], - "coord_events": [], - "bg_events": [] + "warp_events": [ + + ], + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index dee1e4062..5927d0060 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -118,6 +118,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index 87fdc8318..53258d989 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -91,8 +91,12 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION" } ], - "warp_events": [], - "coord_events": [], + "warp_events": [ + + ], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 39edcb2c6..1f651a857 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -61,7 +61,9 @@ "dest_warp_id": "0" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/SlateportCity_House/map.json b/data/maps/SlateportCity_House/map.json index 354c39441..063c206d1 100644 --- a/data/maps/SlateportCity_House/map.json +++ b/data/maps/SlateportCity_House/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", @@ -57,6 +57,10 @@ "dest_warp_id": "10" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json index 297b686e2..551427bc3 100644 --- a/data/maps/TrainerHill_1F/map.json +++ b/data/maps/TrainerHill_1F/map.json @@ -12,8 +12,10 @@ "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], + "connections": 0, + "object_events": [ + + ], "warp_events": [ { "x": 2, @@ -30,6 +32,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json index 7df034d83..a4278e7bb 100644 --- a/data/maps/TrainerHill_2F/map.json +++ b/data/maps/TrainerHill_2F/map.json @@ -12,8 +12,10 @@ "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], + "connections": 0, + "object_events": [ + + ], "warp_events": [ { "x": 2, @@ -30,6 +32,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json index d20e019d3..a0029ceb8 100644 --- a/data/maps/TrainerHill_3F/map.json +++ b/data/maps/TrainerHill_3F/map.json @@ -12,8 +12,10 @@ "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], + "connections": 0, + "object_events": [ + + ], "warp_events": [ { "x": 2, @@ -30,6 +32,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json index 2405deea8..8fbeccf67 100644 --- a/data/maps/TrainerHill_4F/map.json +++ b/data/maps/TrainerHill_4F/map.json @@ -12,8 +12,10 @@ "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], + "connections": 0, + "object_events": [ + + ], "warp_events": [ { "x": 2, @@ -30,6 +32,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index a611cbf64..54d1a684f 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_TEALA", @@ -44,6 +44,10 @@ "dest_warp_id": "1" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index 0f2b4ec55..beff2f127 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -12,7 +12,7 @@ "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_TEALA", diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index 7975c08c2..f1bf2195a 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -12,7 +12,7 @@ "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", @@ -44,6 +44,10 @@ "dest_warp_id": "1" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 4aa13e418..6de311a56 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -104,7 +104,8 @@ "Route116Ext", "Route101West", "Route117North", - "Route117South" + "Route117South", + "Route111East" ], "gMapGroup_IndoorLittleroot": [ "LittlerootTown_BrendansHouse_1F", diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 19553eb30..4ec999024 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -467,5 +467,6 @@ #define LAYOUT_ROUTE117NORTH 460 #define LAYOUT_ROUTE117SOUTH 461 #define LAYOUT_ROUTE117SOUTH_POKE_BREEDERS_HOUSE 462 +#define LAYOUT_ROUTE111EAST 463 #endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 49e77ebcc..5620d0207 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -75,6 +75,7 @@ #define MAP_ROUTE101WEST (66 | (0 << 8)) #define MAP_ROUTE117NORTH (67 | (0 << 8)) #define MAP_ROUTE117SOUTH (68 | (0 << 8)) +#define MAP_ROUTE111EAST (69 | (0 << 8)) // gMapGroup_IndoorLittleroot #define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) diff --git a/src/data/map_group_count.h b/src/data/map_group_count.h index 5e80aed9f..ba87acd41 100644 --- a/src/data/map_group_count.h +++ b/src/data/map_group_count.h @@ -1 +1 @@ -static const u8 MAP_GROUP_COUNT[] = {69, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 2, 1, 114, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0}; +static const u8 MAP_GROUP_COUNT[] = {70, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 2, 1, 114, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0}; diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 2a4508946..84d74934d 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -6,7 +6,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_bart[] = { }, { .iv = 0, - .lvl = 3, + .lvl = 6, .species = SPECIES_RALTS, } }; diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index b6b0e0735..8ff151ac3 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -12914,6 +12914,75 @@ } ] } + }, + { + "map": "MAP_ROUTE111EAST", + "base_label": "gRoute111East0", + "land_mons": { + "encounter_rate": 10, + "mons": [ + { + "min_level": 20, + "max_level": 20, + "species": "SPECIES_SANDSHREW" + }, + { + "min_level": 20, + "max_level": 20, + "species": "SPECIES_TRAPINCH" + }, + { + "min_level": 21, + "max_level": 21, + "species": "SPECIES_SANDSHREW" + }, + { + "min_level": 21, + "max_level": 21, + "species": "SPECIES_TRAPINCH" + }, + { + "min_level": 19, + "max_level": 19, + "species": "SPECIES_BALTOY" + }, + { + "min_level": 21, + "max_level": 21, + "species": "SPECIES_BALTOY" + }, + { + "min_level": 19, + "max_level": 19, + "species": "SPECIES_SANDSHREW" + }, + { + "min_level": 19, + "max_level": 19, + "species": "SPECIES_TRAPINCH" + }, + { + "min_level": 20, + "max_level": 20, + "species": "SPECIES_BALTOY" + }, + { + "min_level": 20, + "max_level": 20, + "species": "SPECIES_CACNEA" + }, + { + "min_level": 22, + "max_level": 22, + "species": "SPECIES_CACNEA" + }, + { + "min_level": 22, + "max_level": 22, + "species": "SPECIES_CACNEA" + } + ] + } } ] },