From 5c1667b41a7d31df6d405d272833895bf8472cf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 16:55:25 -0600 Subject: Define layout constants --- data/maps/Route104_Prototype/events.inc | 2 +- data/maps/Route104_Prototype/header.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route104_Prototype') diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc index 08976e5a8..4f1dfef12 100644 --- a/data/maps/Route104_Prototype/events.inc +++ b/data/maps/Route104_Prototype/events.inc @@ -1,3 +1,3 @@ -Route104_Prototype_MapEvents:: @ 853DDC0 +Route104_Prototype_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 0de3a4b47..7bc8d0a87 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,10 +1,10 @@ -Route104_Prototype: @ 8485AF8 +Route104_Prototype: .4byte Route104_Prototype_Layout .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 .2byte MUS_NEXTROAD - .2byte 287 + .2byte LAYOUT_ROUTE104_PROTOTYPE .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY -- cgit v1.2.3 From 29d6221935d3e8e01dc11b4023ba977ff433f3c9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 31 Jan 2019 15:51:20 -0600 Subject: Convert map data to JSON --- data/maps/Route104_Prototype/events.inc | 3 --- data/maps/Route104_Prototype/header.inc | 15 --------------- data/maps/Route104_Prototype/map.json | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 data/maps/Route104_Prototype/events.inc delete mode 100644 data/maps/Route104_Prototype/header.inc create mode 100644 data/maps/Route104_Prototype/map.json (limited to 'data/maps/Route104_Prototype') diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc deleted file mode 100644 index 4f1dfef12..000000000 --- a/data/maps/Route104_Prototype/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_Prototype_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc deleted file mode 100644 index 7bc8d0a87..000000000 --- a/data/maps/Route104_Prototype/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_Prototype: - .4byte Route104_Prototype_Layout - .4byte Route104_Prototype_MapEvents - .4byte Route104_Prototype_MapScripts - .4byte 0x0 - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104_PROTOTYPE - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json new file mode 100644 index 000000000..168cee142 --- /dev/null +++ b/data/maps/Route104_Prototype/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_ROUTE104_PROTOTYPE", + "name": "Route104_Prototype", + "layout": "LAYOUT_ROUTE104_PROTOTYPE", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file -- cgit v1.2.3