diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
| commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
| tree | aec86bd0f081a7ff207f68cba33315991b629be1 /data/maps/Route2 | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
| parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) | |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'data/maps/Route2')
| -rw-r--r-- | data/maps/Route2/map.json | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 33ed43697..c211c5b72 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 16, "y": 62, "elevation": 3, @@ -34,11 +34,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", - "flag": "20" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 15, "y": 69, "elevation": 3, @@ -47,11 +47,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 13, "elevation": 3, @@ -60,11 +60,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", - "flag": "21" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 18, "y": 26, "elevation": 3, @@ -73,11 +73,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", - "flag": "22" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 54, "elevation": 3, @@ -87,10 +87,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BE58E", - "flag": "340" + "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 64, "elevation": 3, @@ -100,7 +100,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BE59B", - "flag": "341" + "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { "graphics_id": "65375", |