summaryrefslogtreecommitdiff
path: root/data/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'data/layouts')
-rw-r--r--data/layouts/SaffronCity/map.binbin3840 -> 7260 bytes
-rw-r--r--data/layouts/SaffronCity_Classic/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SaffronCity_Classic/map.binbin0 -> 3840 bytes
-rw-r--r--data/layouts/layouts.json18
4 files changed, 9 insertions, 9 deletions
diff --git a/data/layouts/SaffronCity/map.bin b/data/layouts/SaffronCity/map.bin
index dd7aea1cf..001fb4e2f 100644
--- a/data/layouts/SaffronCity/map.bin
+++ b/data/layouts/SaffronCity/map.bin
Binary files differ
diff --git a/data/layouts/SaffronCity_Classic/border.bin b/data/layouts/SaffronCity_Classic/border.bin
new file mode 100644
index 000000000..a701312cf
--- /dev/null
+++ b/data/layouts/SaffronCity_Classic/border.bin
Binary files differ
diff --git a/data/layouts/SaffronCity_Classic/map.bin b/data/layouts/SaffronCity_Classic/map.bin
new file mode 100644
index 000000000..dd7aea1cf
--- /dev/null
+++ b/data/layouts/SaffronCity_Classic/map.bin
Binary files differ
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 3675b33c0..2f0942f7e 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -859,16 +859,16 @@
"blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin"
},
{
- "id": "LAYOUT_SAFFRON_CITY",
- "name": "SaffronCity_Layout",
+ "id": "LAYOUT_SAFFRON_CITY_CLASSIC",
+ "name": "SaffronCity_Classic_Layout",
"width": 48,
"height": 40,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4A94",
"secondary_tileset": "gTileset_82D4B9C",
- "border_filepath": "data/layouts/SaffronCity/border.bin",
- "blockdata_filepath": "data/layouts/SaffronCity/map.bin"
+ "border_filepath": "data/layouts/SaffronCity_Classic/border.bin",
+ "blockdata_filepath": "data/layouts/SaffronCity_Classic/map.bin"
},
{
"id": "LAYOUT_ROUTE1",
@@ -2276,16 +2276,16 @@
"blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin"
},
{
- "id": "LAYOUT_SAFFRON_CITY_DUPLICATE",
- "name": "SaffronCity_Duplicate_Layout",
+ "id": "LAYOUT_SAFFRON_CITY",
+ "name": "SaffronCity_Layout",
"width": 66,
"height": 55,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4A94",
"secondary_tileset": "gTileset_82D4B9C",
- "border_filepath": "data/layouts/SaffronCity_Duplicate/border.bin",
- "blockdata_filepath": "data/layouts/SaffronCity_Duplicate/map.bin"
+ "border_filepath": "data/layouts/SaffronCity/border.bin",
+ "blockdata_filepath": "data/layouts/SaffronCity/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE",
@@ -4400,4 +4400,4 @@
"blockdata_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin"
}
]
-} \ No newline at end of file
+}