diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 12:16:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 12:16:04 -0500 |
| commit | 2c92f89adc58f7e6d4538645895818b27e1f2583 (patch) | |
| tree | 6353fcce9f9b95fd5c7d8b4900ea26fc04c71052 /data/layouts | |
| parent | 6bee17b4cecf000724d46bcc0116498a82acaae4 (diff) | |
| parent | 9addd6a6b6703f5d0810ce191a43869927cb9974 (diff) | |
Merge branch 'master' into doc-tilesets
Diffstat (limited to 'data/layouts')
| -rw-r--r-- | data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin (renamed from data/layouts/UnusedLayout_83453C0/border.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin (renamed from data/layouts/UnusedLayout_83453C0/map.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/layouts.json | 8 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/layouts/UnusedLayout_83453C0/border.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/UnusedLayout_83453C0/border.bin +++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin diff --git a/data/layouts/UnusedLayout_83453C0/map.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin index ffc668ba5..ffc668ba5 100644 --- a/data/layouts/UnusedLayout_83453C0/map.bin +++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index d585542af..a9911aed4 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3620,16 +3620,16 @@ "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin" }, { - "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2", - "name": "UnusedLayout_83453C0_Layout", + "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT", + "name": "ThreeIsland_DunsparceTunnel_DugOut_Layout", "width": 30, "height": 7, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin" + "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin", + "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin" }, { "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", |