diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
| commit | 2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (patch) | |
| tree | a3a6d928910ed170904b5b367084afb2d1fb8b3d /data/layouts | |
| parent | 6ca932e5e98fcd69c281d798406e53aee5a4d816 (diff) | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'data/layouts')
| -rw-r--r-- | data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin (renamed from data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin (renamed from data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin) | bin | 480 -> 480 bytes | |||
| -rw-r--r-- | data/layouts/layouts.json | 8 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin b/data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin index 56b76feec..56b76feec 100644 --- a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin +++ b/data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin diff --git a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin b/data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin Binary files differindex 77ec431c8..77ec431c8 100644 --- a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin +++ b/data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 0b1685e5a..fbeee8c39 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3884,16 +3884,16 @@ "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", - "name": "SevenIsland_SeavaultCanyon_TanobyKey_Layout", + "id": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", + "name": "SevenIsland_SevaultCanyon_TanobyKey_Layout", "width": 15, "height": 16, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4A94", "secondary_tileset": "gTileset_82D4E0C", - "border_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin" + "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin" }, { "id": "LAYOUT_BIRTH_ISLAND_EXTERIOR", |
