summaryrefslogtreecommitdiff
path: root/data/maps/SSAnne_Kitchen
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2020-03-13 00:32:04 -0700
committerultima-soul <akshayjhanji@hotmail.com>2020-03-13 00:32:04 -0700
commit99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch)
tree1164d31577e6ebddc1cb313d40bb69ce0d426170 /data/maps/SSAnne_Kitchen
parent339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff)
parent6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff)
Merge branch 'master' into event_object_movement
Diffstat (limited to 'data/maps/SSAnne_Kitchen')
-rw-r--r--data/maps/SSAnne_Kitchen/map.json28
1 files changed, 15 insertions, 13 deletions
diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
index 579f9e9b0..d5ab6e972 100644
--- a/data/maps/SSAnne_Kitchen/map.json
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -6,15 +6,17 @@
"region_map_section": "MAPSEC_S_S_ANNE",
"requires_flash": false,
"weather": "WEATHER_NONE",
- "map_type": "MAP_TYPE_8",
- "unknown_18": 0,
- "unknown_19": 6,
- "elevator_flag": 0,
- "battle_scene": "BATTLE_SCENE_0",
+ "map_type": "MAP_TYPE_INDOOR",
+ "allow_cycling": false,
+ "allow_escaping": false,
+ "allow_running": true,
+ "show_map_name": true,
+ "floor_number": 0,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+ "graphics_id": "OBJ_EVENT_GFX_CHEF",
"x": 1,
"y": 5,
"elevation": 3,
@@ -27,7 +29,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+ "graphics_id": "OBJ_EVENT_GFX_CHEF",
"x": 6,
"y": 6,
"elevation": 3,
@@ -40,7 +42,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+ "graphics_id": "OBJ_EVENT_GFX_CHEF",
"x": 10,
"y": 4,
"elevation": 3,
@@ -53,7 +55,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+ "graphics_id": "OBJ_EVENT_GFX_CHEF",
"x": 8,
"y": 9,
"elevation": 3,
@@ -66,7 +68,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+ "graphics_id": "OBJ_EVENT_GFX_CHEF",
"x": 14,
"y": 5,
"elevation": 3,
@@ -79,7 +81,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+ "graphics_id": "OBJ_EVENT_GFX_CHEF",
"x": 14,
"y": 7,
"elevation": 3,
@@ -92,7 +94,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+ "graphics_id": "OBJ_EVENT_GFX_CHEF",
"x": 14,
"y": 9,
"elevation": 3,
@@ -105,7 +107,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 1,
"y": 10,
"elevation": 3,