diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
| commit | 23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (patch) | |
| tree | 9e276d9e08c46e9fe4f92af636d53f1dda33190a /data/layouts | |
| parent | ddfa0c6298f4c4dcde9b40782bbdf41867bff761 (diff) | |
| parent | f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff) | |
Merge master into doc-tower
Diffstat (limited to 'data/layouts')
| -rw-r--r-- | data/layouts/BattleFrontier_BattlePyramidFloor/border.bin (renamed from data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin) | bin | 8 -> 8 bytes | |||
| -rw-r--r-- | data/layouts/BattleFrontier_BattlePyramidFloor/map.bin (renamed from data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/layouts.json | 8 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin +++ b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin index 7c224d524..7c224d524 100644 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin +++ b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index c41bf92bd..cb41ff9e9 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3602,14 +3602,14 @@ "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" }, { - "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", - "name": "BattleFrontier_BattlePyramidEmptySquare_Layout", + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR", + "name": "BattleFrontier_BattlePyramidFloor_Layout", "width": 8, "height": 8, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattlePyramid", - "border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin", - "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/map.bin" }, { "id": "LAYOUT_BATTLE_PYRAMID_SQUARE01", |