summaryrefslogtreecommitdiff
path: root/data/maps/Route7
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route7')
-rw-r--r--data/maps/Route7/map.json24
-rw-r--r--data/maps/Route7/scripts.inc4
-rw-r--r--data/maps/Route7/text.inc2
3 files changed, 17 insertions, 13 deletions
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
index e30bc8149..52e630274 100644
--- a/data/maps/Route7/map.json
+++ b/data/maps/Route7/map.json
@@ -6,11 +6,13 @@
"region_map_section": "MAPSEC_ROUTE_7",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_3",
- "unknown_18": 1,
- "unknown_19": 6,
- "elevator_flag": 0,
- "battle_scene": "BATTLE_SCENE_0",
+ "map_type": "MAP_TYPE_ROUTE",
+ "allow_cycling": true,
+ "allow_escaping": false,
+ "allow_running": true,
+ "show_map_name": true,
+ "floor_number": 0,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [
{
"map": "MAP_CELADON_CITY",
@@ -18,15 +20,16 @@
"direction": "left"
},
{
- "map": "MAP_SAFFRON_CITY_CLASSIC",
+ "map": "MAP_SAFFRON_CITY_CONNECTION",
"offset": -10,
"direction": "right"
}
],
"object_events": [
{
- "graphics_id": "65375",
- "x": 65528,
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
+ "in_connection": true,
+ "x": -8,
"y": 12,
"elevation": 10,
"movement_type": "MOVEMENT_TYPE_NONE",
@@ -57,11 +60,12 @@
"coord_events": [],
"bg_events": [
{
- "type": "bg_event_type_0",
+ "type": "sign",
"x": 5,
"y": 14,
"elevation": 0,
- "script": "Route7_EventScript_167FBC"
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route7_EventScript_UndergroundPathSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc
index 52d0f5f36..299d6bad8 100644
--- a/data/maps/Route7/scripts.inc
+++ b/data/maps/Route7/scripts.inc
@@ -1,6 +1,6 @@
Route7_MapScripts:: @ 8167FBB
.byte 0
-Route7_EventScript_167FBC:: @ 8167FBC
- msgbox gUnknown_8184097, MSGBOX_SIGN
+Route7_EventScript_UndergroundPathSign:: @ 8167FBC
+ msgbox Route7_Text_UndergroundPathSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route7/text.inc b/data/maps/Route7/text.inc
index 3f1cdda5b..4a58cc14b 100644
--- a/data/maps/Route7/text.inc
+++ b/data/maps/Route7/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8184097:: @ 8184097
+Route7_Text_UndergroundPathSign:: @ 8184097
.string "UNDERGROUND PATH\n"
.string "CELADON CITY - LAVENDER TOWN$"