diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-26 15:03:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 15:03:22 -0400 |
| commit | 1491b1855b9a604642c6c882f29d489959189d93 (patch) | |
| tree | b48426b94f51b5f972cc564daefb751da8fe6668 /data/maps | |
| parent | de6e1e9ecf72f9ffad23d83a3cfccdbabd2b239b (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/Route117/map.json | 2 | ||||
| -rw-r--r-- | data/maps/Route117_PokemonDayCare/map.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index b29b58639..12420784c 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route117_EventScript_291C18", + "script": "Route117_EventScript_DaycareMan", "flag": "0" }, { diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index c233701e5..9cb052633 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route117_PokemonDayCare_EventScript_291D11", + "script": "Route117_PokemonDayCare_EventScript_DaycareWoman", "flag": "0" } ], |