summaryrefslogtreecommitdiff
path: root/data/maps/Route13
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-10-23 09:05:26 -0400
committerGitHub <noreply@github.com>2019-10-23 09:05:26 -0400
commit6e36c229200e083ca005cbc448e99210d111f3b2 (patch)
treeaec86bd0f081a7ff207f68cba33315991b629be1 /data/maps/Route13
parent4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff)
parent3efd2e1210b4149628197446d063df0fc11281ab (diff)
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'data/maps/Route13')
-rw-r--r--data/maps/Route13/map.json31
1 files changed, 16 insertions, 15 deletions
diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json
index 919048b8d..86a682dfb 100644
--- a/data/maps/Route13/map.json
+++ b/data/maps/Route13/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "40",
+ "graphics_id": "MAP_OBJ_GFX_PICNICKER",
"x": 62,
"y": 6,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "26",
+ "graphics_id": "MAP_OBJ_GFX_ROCKER",
"x": 63,
"y": 12,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "40",
+ "graphics_id": "MAP_OBJ_GFX_PICNICKER",
"x": 54,
"y": 11,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "29",
+ "graphics_id": "MAP_OBJ_GFX_BEAUTY",
"x": 42,
"y": 7,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "29",
+ "graphics_id": "MAP_OBJ_GFX_BEAUTY",
"x": 43,
"y": 7,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "40",
+ "graphics_id": "MAP_OBJ_GFX_PICNICKER",
"x": 35,
"y": 10,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "40",
+ "graphics_id": "MAP_OBJ_GFX_PICNICKER",
"x": 29,
"y": 11,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "26",
+ "graphics_id": "MAP_OBJ_GFX_ROCKER",
"x": 9,
"y": 14,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "26",
+ "graphics_id": "MAP_OBJ_GFX_ROCKER",
"x": 16,
"y": 5,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "53",
+ "graphics_id": "MAP_OBJ_GFX_BIKER",
"x": 14,
"y": 8,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "0"
},
{
- "graphics_id": "95",
+ "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"x": 44,
"y": 5,
"elevation": 3,
@@ -164,8 +164,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route13_EventScript_1BDF13",
- "flag": "18"
+ "script": "EventScript_InteractWithCutTreeObject",
+ "flag": "FLAG_TEMP_12"
}
],
"warp_events": [],
@@ -198,8 +198,9 @@
"y": 14,
"elevation": 3,
"item": "ITEM_PP_UP",
- "flag": "15",
- "unknown": 1
+ "flag": "HIDDEN_ITEM_ROUTE13_PP_UP",
+ "quantity": 1,
+ "underfoot": false
}
]
}