summaryrefslogtreecommitdiff
path: root/data/maps/Route115/map.json
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-06-01 20:40:27 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-06-01 20:40:27 -0400
commitf0b41debc35c2084aad6d369eab11a2d2df4ab44 (patch)
tree9b720ab0b617fa207051efc7ff9373669f7dc47b /data/maps/Route115/map.json
parenta839463c849679974c986bf9c9c260eff0e94cb7 (diff)
parent9f5bf65fb336cf7a3ba68d32267bf993f0f6a494 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps
Diffstat (limited to 'data/maps/Route115/map.json')
-rw-r--r--data/maps/Route115/map.json10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index 2d0dbdbaa..bbac132f5 100644
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -73,7 +73,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "69",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_KELPSY_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -86,7 +86,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "70",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_KELPSY_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -99,7 +99,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "71",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_KELPSY_3",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -190,7 +190,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "55",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_BLUK_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -203,7 +203,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "56",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_BLUK_2",
"script": "BerryTreeScript",
"flag": "0"
},