diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:29:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 11:29:06 -0500 |
| commit | b4fce4020d218e9c246fda91339e660a46182393 (patch) | |
| tree | a227691fa960338b08cc57f20eaa9bff98fe79e6 /data/layouts | |
| parent | 659afd708b43626e235a4a9953a9adc25a361583 (diff) | |
| parent | 4e07002d13c97f90cb8885298c0db2c331dc2b07 (diff) | |
Merge branch 'master' into doc-tilesets
Diffstat (limited to 'data/layouts')
| -rw-r--r-- | data/layouts/SaffronCity_CopycatsHouse_1F/border.bin (renamed from data/layouts/SaffronCity_House1_1F/border.bin) | bin | 8 -> 8 bytes | |||
| -rw-r--r-- | data/layouts/SaffronCity_CopycatsHouse_1F/map.bin (renamed from data/layouts/SaffronCity_House1_1F/map.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/SaffronCity_CopycatsHouse_2F/border.bin (renamed from data/layouts/SaffronCity_House1_2F/border.bin) | bin | 8 -> 8 bytes | |||
| -rw-r--r-- | data/layouts/SaffronCity_CopycatsHouse_2F/map.bin (renamed from data/layouts/SaffronCity_House1_2F/map.bin) | bin | 216 -> 216 bytes | |||
| -rw-r--r-- | data/layouts/layouts.json | 16 |
5 files changed, 8 insertions, 8 deletions
diff --git a/data/layouts/SaffronCity_House1_1F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_House1_1F/border.bin +++ b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin diff --git a/data/layouts/SaffronCity_House1_1F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin index 6db070ab7..6db070ab7 100644 --- a/data/layouts/SaffronCity_House1_1F/map.bin +++ b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin diff --git a/data/layouts/SaffronCity_House1_2F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_House1_2F/border.bin +++ b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin diff --git a/data/layouts/SaffronCity_House1_2F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin Binary files differindex c3090f485..c3090f485 100644 --- a/data/layouts/SaffronCity_House1_2F/map.bin +++ b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index c3d2d3650..d585542af 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -2504,28 +2504,28 @@ "blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin" }, { - "id": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", - "name": "SaffronCity_House1_1F_Layout", + "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "name": "SaffronCity_CopycatsHouse_1F_Layout", "width": 13, "height": 10, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_GenericBuilding1", - "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin", - "blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin" + "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/map.bin" }, { - "id": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", - "name": "SaffronCity_House1_2F_Layout", + "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "name": "SaffronCity_CopycatsHouse_2F_Layout", "width": 12, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_GenericBuilding1", - "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin", - "blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin" + "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/map.bin" }, { "id": "LAYOUT_SAFFRON_CITY_DOJO", |