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/Route9/map.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/Route9/map.json') diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 24e5c3c4f..ffb83f27c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9E71", + "script": "Route9_EventScript_Alicia", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route9_EventScript_1A9F69", + "script": "Route9_EventScript_Jeremy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route9_EventScript_1A9EED", + "script": "Route9_EventScript_Alan", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9DF5", + "script": "Route9_EventScript_Chris", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route9_EventScript_1A9D79", + "script": "Route9_EventScript_Brent", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9DB7", + "script": "Route9_EventScript_Conner", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route9_EventScript_1A9F2B", + "script": "Route9_EventScript_Brice", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route9_EventScript_1A9EAF", + "script": "Route9_EventScript_Caitlin", "flag": "0" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route9_EventScript_1A9E33", + "script": "Route9_EventScript_Drew", "flag": "0" }, { @@ -189,7 +189,7 @@ "x": 29, "y": 7, "elevation": 0, - "script": "Route9_EventScript_167FD0" + "script": "Route9_EventScript_RouteSign" }, { "type": "hidden_item", -- 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/Route9/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route9/map.json') diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 24e5c3c4f..f35158171 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/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/Route9/map.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/maps/Route9/map.json') diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index f35158171..296e10f4c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/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/Route9/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route9/map.json') diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 296e10f4c..e67441c39 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_9", "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_CERULEAN_CITY", -- 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/Route9/map.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'data/maps/Route9/map.json') diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 123be8d5a..7fbff394d 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 14, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 61, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 26, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 26, "y": 1, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 49, "y": 7, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 53, "y": 2, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 60, "y": 9, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 36, "y": 6, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 2, "y": 8, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 17, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_ROUTE9_TM40" }, { - "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 65, "y": 17, "elevation": 3, -- 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/Route9/map.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data/maps/Route9/map.json') diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 7fbff394d..e8cedc59c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -187,10 +187,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 29, "y": 7, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route9_EventScript_RouteSign" }, { -- cgit v1.2.3 From 42e6e9bd9cc98d9edd214330aba2795766ec95af Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 14:55:20 -0500 Subject: Remove interactwith from field move scripts --- data/maps/Route9/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route9/map.json') diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index e8cedc59c..4bf88e47c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { -- cgit v1.2.3