diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-12 16:18:38 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-12 16:18:38 -0400 |
| commit | 03b4ea32a9af67e6afb954cc44ff0c2768b86091 (patch) | |
| tree | 0371bfddb0f099e447cd6cdb3a23192993162535 /data/layouts | |
| parent | c9632154babc05708d0f2c7ee1f20b2939762ea1 (diff) | |
| parent | b54bd2e387feb7ece4f34f50f17519e329419716 (diff) | |
Merge remote-tracking branch 'origin' into doc_pokesum
Diffstat (limited to 'data/layouts')
| -rw-r--r-- | data/layouts/RecordCorner/border.bin (renamed from data/layouts/RecordCenter/border.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/RecordCorner/map.bin (renamed from data/layouts/RecordCenter/map.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/layouts.json | 8 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/layouts/RecordCenter/border.bin b/data/layouts/RecordCorner/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/RecordCenter/border.bin +++ b/data/layouts/RecordCorner/border.bin diff --git a/data/layouts/RecordCenter/map.bin b/data/layouts/RecordCorner/map.bin index 08209eaca..08209eaca 100644 --- a/data/layouts/RecordCenter/map.bin +++ b/data/layouts/RecordCorner/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index a9911aed4..1083cd406 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -457,16 +457,16 @@ "blockdata_filepath": "data/layouts/TradeCenter/map.bin" }, { - "id": "LAYOUT_RECORD_CENTER", - "name": "RecordCenter_Layout", + "id": "LAYOUT_RECORD_CORNER", + "name": "RecordCorner_Layout", "width": 20, "height": 10, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_CableClub", - "border_filepath": "data/layouts/RecordCenter/border.bin", - "blockdata_filepath": "data/layouts/RecordCenter/map.bin" + "border_filepath": "data/layouts/RecordCorner/border.bin", + "blockdata_filepath": "data/layouts/RecordCorner/map.bin" }, { "id": "LAYOUT_BATTLE_COLOSSEUM_4P", |