summaryrefslogtreecommitdiff
path: root/data/maps/MossdeepCity_Mart
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MossdeepCity_Mart')
-rw-r--r--data/maps/MossdeepCity_Mart/events.inc13
-rw-r--r--data/maps/MossdeepCity_Mart/header.inc15
-rw-r--r--data/maps/MossdeepCity_Mart/map.json88
3 files changed, 88 insertions, 28 deletions
diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc
deleted file mode 100644
index d452187d1..000000000
--- a/data/maps/MossdeepCity_Mart/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MossdeepCity_Mart_EventObjects: @ 8532B50
- object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0
- object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0
- object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0
- object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0
-
-MossdeepCity_Mart_MapWarps: @ 8532BB0
- warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY
- warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY
-
-MossdeepCity_Mart_MapEvents:: @ 8532BC0
- map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc
deleted file mode 100644
index 7de6cb5de..000000000
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_Mart: @ 8483948
- .4byte Mart_Layout
- .4byte MossdeepCity_Mart_MapEvents
- .4byte MossdeepCity_Mart_MapScripts
- .4byte 0x0
- .2byte MUS_FRIENDLY
- .2byte 63
- .byte MAPSEC_MOSSDEEP_CITY
- .byte 0
- .byte WEATHER_NONE
- .byte MAP_TYPE_INDOOR
- .2byte 0
- map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
- .byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json
new file mode 100644
index 000000000..6b739a2d2
--- /dev/null
+++ b/data/maps/MossdeepCity_Mart/map.json
@@ -0,0 +1,88 @@
+{
+ "id": "MAP_MOSSDEEP_CITY_MART",
+ "name": "MossdeepCity_Mart",
+ "layout": "LAYOUT_MART",
+ "music": "MUS_FRIENDLY",
+ "region_map_section": "MAPSEC_MOSSDEEP_CITY",
+ "requires_flash": false,
+ "weather": "WEATHER_NONE",
+ "map_type": "MAP_TYPE_INDOOR",
+ "allow_bike": false,
+ "allow_escape_rope": false,
+ "allow_running": false,
+ "show_map_name": false,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+ "connections": null,
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
+ "x": 1,
+ "y": 3,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": 0,
+ "trainer_sight_or_berry_tree_id": 0,
+ "script": "MossdeepCity_Mart_EventScript_2223C8",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+ "x": 1,
+ "y": 5,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_UP",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": 0,
+ "trainer_sight_or_berry_tree_id": 0,
+ "script": "MossdeepCity_Mart_EventScript_2223F6",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+ "x": 8,
+ "y": 3,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 1,
+ "trainer_type": 0,
+ "trainer_sight_or_berry_tree_id": 0,
+ "script": "MossdeepCity_Mart_EventScript_2223FF",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+ "x": 5,
+ "y": 3,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": 0,
+ "trainer_sight_or_berry_tree_id": 0,
+ "script": "MossdeepCity_Mart_EventScript_222408",
+ "flag": "0"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 3,
+ "y": 7,
+ "elevation": 0,
+ "dest_map": "MAP_MOSSDEEP_CITY",
+ "dest_warp_id": 4
+ },
+ {
+ "x": 4,
+ "y": 7,
+ "elevation": 0,
+ "dest_map": "MAP_MOSSDEEP_CITY",
+ "dest_warp_id": 4
+ }
+ ],
+ "coord_events": [],
+ "bg_events": []
+} \ No newline at end of file