diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-15 20:44:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 20:44:57 -0500 |
| commit | a4cd331634d1fcc5f7cb217c51c328c5769a9616 (patch) | |
| tree | 7b610171c3d893d1cace513cf61e0b74014dbad2 /data/maps/SSAnne_2F_Room2/map.json | |
| parent | 34deceb13695e7b13a27ecb94666fc95d2ced550 (diff) | |
| parent | fee980decd6dfd5dc98c15ba13c9ea8f7b597934 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'data/maps/SSAnne_2F_Room2/map.json')
| -rw-r--r-- | data/maps/SSAnne_2F_Room2/map.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index e01f65eb5..df5cf4bc8 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_2F_Room2_EventScript_160CB1", + "script": "SSAnne_2F_Room2_EventScript_Dale", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_2F_Room2_EventScript_160CC8", + "script": "SSAnne_2F_Room2_EventScript_Brooks", "flag": "0" }, { |