diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-18 18:23:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-18 18:23:00 -0400 |
| commit | 918ed2d31eeeb036230d0912cc2527b83788bc85 (patch) | |
| tree | d4a6e64701f4c79fcb00c20d2efd01a6e43da177 /data/layouts | |
| parent | 9392ba8ab1a726e48c0a40321ede325bdb74178c (diff) | |
| parent | c128e68062b0f9ff06be35d8563549fe8144f7d4 (diff) | |
Merge pull request #417 from SatoMew/master
Replace rival labels
Diffstat (limited to 'data/layouts')
| -rw-r--r-- | data/layouts/PalletTown_RivalsHouse/border.bin (renamed from data/layouts/PalletTown_GarysHouse/border.bin) | bin | 8 -> 8 bytes | |||
| -rw-r--r-- | data/layouts/PalletTown_RivalsHouse/map.bin (renamed from data/layouts/PalletTown_GarysHouse/map.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/layouts.json | 8 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/layouts/PalletTown_GarysHouse/border.bin b/data/layouts/PalletTown_RivalsHouse/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/PalletTown_GarysHouse/border.bin +++ b/data/layouts/PalletTown_RivalsHouse/border.bin diff --git a/data/layouts/PalletTown_GarysHouse/map.bin b/data/layouts/PalletTown_RivalsHouse/map.bin index a29b5dbdc..a29b5dbdc 100644 --- a/data/layouts/PalletTown_GarysHouse/map.bin +++ b/data/layouts/PalletTown_RivalsHouse/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 1083cd406..b44d6ed86 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -26,16 +26,16 @@ "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin" }, { - "id": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", - "name": "PalletTown_GarysHouse_Layout", + "id": "LAYOUT_PALLET_TOWN_RIVALS_HOUSE", + "name": "PalletTown_RivalsHouse_Layout", "width": 13, "height": 10, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_GenericBuilding2", - "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin", - "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin" + "border_filepath": "data/layouts/PalletTown_RivalsHouse/border.bin", + "blockdata_filepath": "data/layouts/PalletTown_RivalsHouse/map.bin" }, { "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", |