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/Route3/map.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/Route3/map.json') diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index f2ad40c5e..a881483f8 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route3_EventScript_167F78", + "script": "Route3_EventScript_Youngster", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route3_EventScript_1A957B", + "script": "Route3_EventScript_Robin", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route3_EventScript_1A94C1", + "script": "Route3_EventScript_James", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A953D", + "script": "Route3_EventScript_Sally", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route3_EventScript_1A9483", + "script": "Route3_EventScript_Greg", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A9407", + "script": "Route3_EventScript_Calvin", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A94FF", + "script": "Route3_EventScript_Janice", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route3_EventScript_1A9445", + "script": "Route3_EventScript_Colton", "flag": "0" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route3_EventScript_1A93C9", + "script": "Route3_EventScript_Ben", "flag": "0" } ], @@ -150,7 +150,7 @@ "x": 72, "y": 11, "elevation": 0, - "script": "Route3_EventScript_167F81" + "script": "Route3_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/Route3/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route3/map.json') diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index f2ad40c5e..3c08fcd12 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/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/Route3/map.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/maps/Route3/map.json') diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 3c08fcd12..22f5835c4 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/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/Route3/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route3/map.json') diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 22f5835c4..af0de6644 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_3", "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_ROUTE4", -- 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/Route3/map.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route3/map.json') diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 7651e395a..1dbccf3ac 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 70, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 32, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 30, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 29, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 19, "y": 9, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 17, "y": 4, "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/Route3/map.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data/maps/Route3/map.json') diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 1dbccf3ac..c137d9f48 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -148,10 +148,11 @@ "coord_events": [], "bg_events": [ { - "type": "bg_event_type_0", + "type": "sign", "x": 72, "y": 11, "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "script": "Route3_EventScript_RouteSign" }, { -- cgit v1.2.3