summaryrefslogtreecommitdiff
path: root/data/maps/Route15
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-02-24 09:02:25 -0500
committerGitHub <noreply@github.com>2020-02-24 09:02:25 -0500
commita0fa06a066dd2261dfdfb87ea5fd8a4ecb3fa634 (patch)
treeb5bec9a5a1b819bf9d98fb349598e9cf5feb1207 /data/maps/Route15
parent942ea77a0d574b7c9bb71bace53755dc9ccde5b5 (diff)
parent1fc8db43b7254f7445b335cec22c7406edb1902d (diff)
Merge pull request #265 from GriffinRichards/sync-objgfx
Sync object event gfx constants
Diffstat (limited to 'data/maps/Route15')
-rw-r--r--data/maps/Route15/map.json28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
index fc65f0932..cd0581a20 100644
--- a/data/maps/Route15/map.json
+++ b/data/maps/Route15/map.json
@@ -27,7 +27,7 @@
],
"object_events": [
{
- "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+ "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 22,
"y": 13,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+ "graphics_id": "OBJ_EVENT_GFX_ROCKER",
"x": 31,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+ "graphics_id": "OBJ_EVENT_GFX_ROCKER",
"x": 37,
"y": 14,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+ "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 44,
"y": 13,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+ "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 50,
"y": 12,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 59,
"y": 12,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+ "graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 63,
"y": 13,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+ "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 52,
"y": 8,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+ "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 54,
"y": 12,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+ "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 28,
"y": 6,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 20,
"y": 6,
"elevation": 3,
@@ -170,7 +170,7 @@
"flag": "FLAG_HIDE_ROUTE15_TM18"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+ "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"x": 39,
"y": 7,
"elevation": 3,
@@ -183,7 +183,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"x": 40,
"y": 7,
"elevation": 3,
@@ -196,7 +196,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
"in_connection": true,
"x": 73,
"y": 7,