summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/Route102/map.json4
-rw-r--r--data/maps/Route103/map.json6
-rw-r--r--data/maps/Route104/map.json20
-rw-r--r--data/maps/Route110/map.json6
-rw-r--r--data/maps/Route111/map.json8
-rw-r--r--data/maps/Route112/map.json8
-rw-r--r--data/maps/Route114/map.json6
-rw-r--r--data/maps/Route115/map.json10
-rw-r--r--data/maps/Route116/map.json8
-rw-r--r--data/maps/Route117/map.json6
-rw-r--r--data/maps/Route118/map.json6
-rw-r--r--data/maps/Route119/map.json14
-rw-r--r--data/maps/Route120/map.json20
-rw-r--r--data/maps/Route121/map.json16
-rw-r--r--data/maps/Route123/map.json36
-rw-r--r--data/maps/Route130/map.json2
16 files changed, 88 insertions, 88 deletions
diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json
index fc9adee3b..609c90079 100644
--- a/data/maps/Route102/map.json
+++ b/data/maps/Route102/map.json
@@ -112,7 +112,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "2",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_PECHA",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -125,7 +125,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "1",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_ORAN",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 4b91f913b..fbf92dd0c 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -112,7 +112,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "5",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_103_CHERI_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -125,7 +125,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "6",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_103_LEPPA",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -138,7 +138,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "7",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_103_CHERI_2",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
index 69e5faf27..6ec8b3752 100644
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -156,7 +156,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "8",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_CHERI_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -169,7 +169,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "9",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -182,7 +182,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "10",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_LEPPA",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -195,7 +195,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "11",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_ORAN_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -208,7 +208,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "12",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_3",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -221,7 +221,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "13",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_PECHA",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -247,7 +247,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "3",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -260,7 +260,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "4",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_ORAN_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -273,7 +273,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "75",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_4",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -286,7 +286,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "76",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_CHERI_2",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json
index bb5df5eb4..abfc2b767 100644
--- a/data/maps/Route110/map.json
+++ b/data/maps/Route110/map.json
@@ -234,7 +234,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "16",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_110_NANAB_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -247,7 +247,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "17",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_110_NANAB_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -260,7 +260,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "18",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_110_NANAB_3",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
index 014ac084c..4621591e4 100644
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -104,7 +104,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "19",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_RAZZ_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -117,7 +117,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "20",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_RAZZ_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -273,7 +273,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "80",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_ORAN_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -286,7 +286,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "81",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_ORAN_2",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json
index d4d650857..04b2e6d12 100644
--- a/data/maps/Route112/map.json
+++ b/data/maps/Route112/map.json
@@ -117,7 +117,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "24",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_RAWST_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -130,7 +130,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "23",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_PECHA_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -143,7 +143,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "22",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_PECHA_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -156,7 +156,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "21",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_RAWST_1",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 37edf509d..38891b518 100644
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -34,7 +34,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "77",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_114_PERSIM_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -47,7 +47,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "78",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_114_PERSIM_3",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -125,7 +125,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "68",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_114_PERSIM_1",
"script": "BerryTreeScript",
"flag": "0"
},
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"
},
diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json
index 247a4b7b1..13b4bac1c 100644
--- a/data/maps/Route116/map.json
+++ b/data/maps/Route116/map.json
@@ -34,7 +34,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "25",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_PINAP_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -47,7 +47,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "26",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_CHESTO_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -138,7 +138,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "66",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_CHESTO_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -151,7 +151,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "67",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_PINAP_2",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index dd923a7cd..b72866741 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -164,7 +164,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "29",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_117_WEPEAR_3",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -177,7 +177,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "28",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_117_WEPEAR_2",
"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": "27",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_117_WEPEAR_1",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index 7b541e629..67acb1b98 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -39,7 +39,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "31",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_118_SITRUS_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -52,7 +52,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "32",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_118_SOIL",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -65,7 +65,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "33",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_118_SITRUS_2",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
index 8d78d1065..c5715daa2 100644
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -34,7 +34,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "34",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_POMEG_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -47,7 +47,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "35",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_POMEG_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -60,7 +60,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "36",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_POMEG_3",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -372,7 +372,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "83",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_HONDEW_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -385,7 +385,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "84",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_HONDEW_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -398,7 +398,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "85",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_SITRUS",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -411,7 +411,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "86",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_LEPPA",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index 787f51361..6b67310d3 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -34,7 +34,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "46",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_WEPEAR",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -47,7 +47,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "45",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PINAP",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -60,7 +60,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "44",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_NANAB",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -73,7 +73,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "43",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_RAZZ",
"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": "37",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_ASPEAR_1",
"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": "38",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_ASPEAR_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -112,7 +112,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "39",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_ASPEAR_3",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -125,7 +125,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "40",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PECHA_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -138,7 +138,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "41",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PECHA_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -151,7 +151,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "42",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PECHA_3",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json
index e956f6251..aa8f07085 100644
--- a/data/maps/Route121/map.json
+++ b/data/maps/Route121/map.json
@@ -52,7 +52,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "47",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_PERSIM",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -65,7 +65,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "48",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_ASPEAR",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -78,7 +78,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "49",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_RAWST",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -91,7 +91,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "50",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_CHESTO",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -104,7 +104,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "51",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_SOIL_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -117,7 +117,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "52",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_NANAB_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -130,7 +130,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "53",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_NANAB_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -143,7 +143,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "54",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_SOIL_2",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
index 1bd25310a..695b50acd 100644
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -34,7 +34,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "58",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_3",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -47,7 +47,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "59",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_4",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -60,7 +60,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "60",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -73,7 +73,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "61",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_2",
"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": "62",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_LEPPA_1",
"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": "63",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_SOIL",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -112,7 +112,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "64",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_LEPPA_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -151,7 +151,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "65",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_3",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -164,7 +164,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "72",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_4",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -177,7 +177,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "73",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_2",
"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": "74",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_3",
"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": "79",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_4",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -216,7 +216,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "14",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -229,7 +229,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "15",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_1",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -242,7 +242,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "30",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_2",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -320,7 +320,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "87",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_PECHA",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -333,7 +333,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "88",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_SITRUS",
"script": "BerryTreeScript",
"flag": "0"
},
@@ -346,7 +346,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "89",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_RAWST",
"script": "BerryTreeScript",
"flag": "0"
},
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
index 7b4cf047c..c612eccb5 100644
--- a/data/maps/Route130/map.json
+++ b/data/maps/Route130/map.json
@@ -60,7 +60,7 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
- "trainer_sight_or_berry_tree_id": "82",
+ "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_130_LIECHI",
"script": "BerryTreeScript",
"flag": "FLAG_TEMP_11"
},