summaryrefslogtreecommitdiff
path: root/data/maps/Route112/map.json
diff options
context:
space:
mode:
authorSierraffinity <sierra@domoreaweso.me>2020-05-04 20:54:27 -0700
committerSierraffinity <sierra@domoreaweso.me>2020-05-04 20:54:27 -0700
commita1244aa5dd4c7519ba6c2dcba5796eec2eba1c90 (patch)
tree76cd7fa5a9ed806e19221e8d9a11337355f074f5 /data/maps/Route112/map.json
parent072a98ca9aea8bfea7edc65f0a4a230974362b96 (diff)
parentb3b99b52ca978104ebed318f1d238fc97892836a (diff)
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/Route112/map.json')
-rw-r--r--data/maps/Route112/map.json32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json
index b711e1b78..37f0a38df 100644
--- a/data/maps/Route112/map.json
+++ b/data/maps/Route112/map.json
@@ -7,8 +7,8 @@
"requires_flash": false,
"weather": "WEATHER_SUNNY",
"map_type": "MAP_TYPE_ROUTE",
- "allow_bike": true,
- "allow_escape_rope": false,
+ "allow_cycling": true,
+ "allow_escaping": false,
"allow_running": true,
"show_map_name": true,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
@@ -38,7 +38,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "0",
+ "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route112_EventScript_MagmaGrunts",
"flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
@@ -51,7 +51,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "2",
"script": "Route112_EventScript_Brice",
"flag": "0"
@@ -64,7 +64,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route112_EventScript_Larry",
"flag": "0"
@@ -77,7 +77,7 @@
"movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route112_EventScript_Carol",
"flag": "0"
@@ -90,7 +90,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route112_EventScript_Trent",
"flag": "0"
@@ -103,7 +103,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "0",
+ "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route112_EventScript_MagmaGrunts",
"flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
@@ -116,7 +116,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "0",
+ "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "24",
"script": "BerryTreeScript",
"flag": "0"
@@ -129,7 +129,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "0",
+ "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "23",
"script": "BerryTreeScript",
"flag": "0"
@@ -142,7 +142,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "0",
+ "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "22",
"script": "BerryTreeScript",
"flag": "0"
@@ -155,7 +155,7 @@
"movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "0",
+ "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "21",
"script": "BerryTreeScript",
"flag": "0"
@@ -168,7 +168,7 @@
"movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
"movement_range_x": 0,
"movement_range_y": 3,
- "trainer_type": "0",
+ "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route112_EventScript_Hiker",
"flag": "0"
@@ -181,7 +181,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 0,
"movement_range_y": 0,
- "trainer_type": "0",
+ "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route112_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_112_NUGGET"
@@ -194,7 +194,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route112_EventScript_Bryant",
"flag": "0"
@@ -207,7 +207,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route112_EventScript_Shayla",
"flag": "0"