From a1ea8cc82958679baee1c65acc30069d051463c6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 29 Jan 2020 21:03:07 -0500 Subject: Document Routes 3-9 scripts --- data/maps/Route7/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route7/map.json') diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index e30bc8149..66833b93b 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -61,7 +61,7 @@ "x": 5, "y": 14, "elevation": 0, - "script": "Route7_EventScript_167FBC" + "script": "Route7_EventScript_UndergroundPathSign" }, { "type": "hidden_item", -- cgit v1.2.3 From 4ab216f309fe2db2cd2abfa775fa235f59178791 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 31 Jan 2020 14:57:57 -0500 Subject: Rename generic building tilesets, SAFFRON_CITY_CLASSIC --- data/maps/Route7/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route7/map.json') diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index e30bc8149..2c5a9717c 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -18,7 +18,7 @@ "direction": "left" }, { - "map": "MAP_SAFFRON_CITY_CLASSIC", + "map": "MAP_SAFFRON_CITY_CONNECTION", "offset": -10, "direction": "right" } -- cgit v1.2.3 From 4643330fdd2f458a4f714eb7ae1a586d2d24da37 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:08:29 -0500 Subject: Name allow_cycling, floor_number header properties --- data/maps/Route7/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route7/map.json') diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 2c5a9717c..b21d91530 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 6, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", -- cgit v1.2.3 From e94f9c148358f2e25e6ebbd58d39eb9ddd27f7c3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:52:42 -0500 Subject: Name allow_escaping, allow_running, show_map_name header properties --- data/maps/Route7/map.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/maps/Route7/map.json') diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index b21d91530..5c4d7a22f 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "allow_cycling": true, - "unknown_19": 6, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": [ { -- cgit v1.2.3 From 729c224bf2421c30e64f2082f19907b5e66b8138 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 16:16:03 -0500 Subject: Name battle scene and map type constants --- data/maps/Route7/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route7/map.json') diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 5c4d7a22f..d75cae2e4 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CELADON_CITY", -- cgit v1.2.3 From 2a2db28e57e78eb8861997422f998378d91bf9dc Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 18:13:31 -0500 Subject: Split connection field from graphics id in object events --- data/maps/Route7/map.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'data/maps/Route7/map.json') diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index d75cae2e4..b5bfba23b 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -27,8 +27,9 @@ ], "object_events": [ { - "graphics_id": "65375", - "x": 65528, + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "in_connection": 255, + "x": -8, "y": 12, "elevation": 10, "movement_type": "MOVEMENT_TYPE_NONE", -- cgit v1.2.3 From 3e806419156cd1b57f8c6c1b215f836b467c723a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 19:52:37 -0500 Subject: in_connection to bool --- data/maps/Route7/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route7/map.json') diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index b5bfba23b..1fcf4cc50 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -28,7 +28,7 @@ "object_events": [ { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": -8, "y": 12, "elevation": 10, -- cgit v1.2.3 From 1fc8db43b7254f7445b335cec22c7406edb1902d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 23 Feb 2020 17:00:12 -0500 Subject: Sync object event gfx constants --- data/maps/Route7/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route7/map.json') diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 6aaffd6fc..09de5c2b8 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "in_connection": true, "x": -8, "y": 12, -- cgit v1.2.3 From 6191739a4d01c4a83c4df721eb05b4f86c747381 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 12:24:05 -0500 Subject: Label sign bg events --- data/maps/Route7/map.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data/maps/Route7/map.json') diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 09de5c2b8..52e630274 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -60,10 +60,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 5, "y": 14, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route7_EventScript_UndergroundPathSign" }, { -- cgit v1.2.3