diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
| commit | 47534a1471019a25e25c29a3f5bb529ccbd73e86 (patch) | |
| tree | da4f2abb0fa27f5f07bcbdd4af47ca4eec84a786 /data/layouts | |
| parent | b8fec3d9f617ec9a764bb56804c526ff7449631f (diff) | |
| parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into trade
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 | 10 |
3 files changed, 5 insertions, 5 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 2f0942f7e..fbeee8c39 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3620,7 +3620,7 @@ "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_83453C0", + "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2", "name": "UnusedLayout_83453C0_Layout", "width": 30, "height": 7, @@ -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", |
