diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /data/maps/SecretBase_Tree3 | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/maps/SecretBase_Tree3')
| -rw-r--r-- | data/maps/SecretBase_Tree3/map.json | 3 | ||||
| -rw-r--r-- | data/maps/SecretBase_Tree3/scripts.inc | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 6e4494836..89fd3cf49 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE3", "name": "SecretBase_Tree3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Tree3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Tree3/scripts.inc b/data/maps/SecretBase_Tree3/scripts.inc deleted file mode 100644 index 9512bbb80..000000000 --- a/data/maps/SecretBase_Tree3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree3_MapScripts:: @ 823B483 |