diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
| commit | 1dc0b25c1e58e422883e16ce7fb4f6bea1e9a0bb (patch) | |
| tree | 867d72df6ebe9b2d1f3ff72503879640322ec224 /data/maps/MtEmber_RubyPath_1F | |
| parent | 9a53686a4eb595c288758486af5fea9b7805283f (diff) | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'data/maps/MtEmber_RubyPath_1F')
| -rw-r--r-- | data/maps/MtEmber_RubyPath_1F/map.json | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index af7c2032f..b0d678752 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 11, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 20, "y": 12, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 7, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 21, "y": 15, "elevation": 3, @@ -75,8 +75,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" } ], "warp_events": [ |