summaryrefslogtreecommitdiff
path: root/data/maps/Route13
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-03-28 12:26:00 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-03-28 12:26:00 -0400
commit9bcc82856db7e6417bb56265bbcc04dae290cbf3 (patch)
treefe99372c9b2b8bed204b31764a917936c4513a35 /data/maps/Route13
parent24ac46856ad10af92054d82b4ec50486feaf222e (diff)
parent24b294236b678211875e61f3055a996560f694b8 (diff)
Merge branch 'master' of github.com:pret/pokefirered into overworld
Diffstat (limited to 'data/maps/Route13')
-rw-r--r--data/maps/Route13/map.json22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json
index 85260be5c..01c83ca04 100644
--- a/data/maps/Route13/map.json
+++ b/data/maps/Route13/map.json
@@ -34,7 +34,7 @@
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "1",
"script": "Route13_EventScript_Alma",
"flag": "0"
@@ -47,7 +47,7 @@
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "1",
"script": "Route13_EventScript_Sebastian",
"flag": "0"
@@ -60,7 +60,7 @@
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "1",
"script": "Route13_EventScript_Susie",
"flag": "0"
@@ -73,7 +73,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route13_EventScript_Sheila",
"flag": "0"
@@ -86,7 +86,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route13_EventScript_Lola",
"flag": "0"
@@ -99,7 +99,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "1",
"script": "Route13_EventScript_Valerie",
"flag": "0"
@@ -112,7 +112,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_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": "Route13_EventScript_Gwen",
"flag": "0"
@@ -125,7 +125,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route13_EventScript_Robert",
"flag": "0"
@@ -138,7 +138,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_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": "Route13_EventScript_Perry",
"flag": "0"
@@ -151,7 +151,7 @@
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "1",
+ "trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "1",
"script": "Route13_EventScript_Jared",
"flag": "0"
@@ -164,7 +164,7 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
- "trainer_type": "0",
+ "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"