Merge pull request #234 from GriffinRichards/doc-fuchsia

Document Fuchsia City and Safari Zone scripts

7 files changed, 12 insertions, 12 deletions

diff --git a/data/layouts/FuchsiaCity_Building1/border.bin b/data/layouts/FuchsiaCity_SafariZone_Office/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/FuchsiaCity_Building1/border.bin
+++ b/data/layouts/FuchsiaCity_SafariZone_Office/border.bin
diff --git a/data/layouts/FuchsiaCity_ZooBuilding/map.bin b/data/layouts/FuchsiaCity_SafariZone_Office/map.bin
index d18ddbd61..d18ddbd61 100644
--- a/data/layouts/FuchsiaCity_ZooBuilding/map.bin
+++ b/data/layouts/FuchsiaCity_SafariZone_Office/map.bin
diff --git a/data/layouts/FuchsiaCity_ZooBuilding/border.bin b/data/layouts/FuchsiaCity_WardensHouse/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/FuchsiaCity_ZooBuilding/border.bin
+++ b/data/layouts/FuchsiaCity_WardensHouse/border.bin
diff --git a/data/layouts/FuchsiaCity_Building1/map.bin b/data/layouts/FuchsiaCity_WardensHouse/map.bin
index 4efd7d891..4efd7d891 100644
--- a/data/layouts/FuchsiaCity_Building1/map.bin
+++ b/data/layouts/FuchsiaCity_WardensHouse/map.bin
diff --git a/data/layouts/SafariZone_Building/border.bin b/data/layouts/SafariZone_RestHouse/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SafariZone_Building/border.bin
+++ b/data/layouts/SafariZone_RestHouse/border.bin
diff --git a/data/layouts/SafariZone_Building/map.bin b/data/layouts/SafariZone_RestHouse/map.bin
index caec48cdc..caec48cdc 100644
--- a/data/layouts/SafariZone_Building/map.bin
+++ b/data/layouts/SafariZone_RestHouse/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 04727aaa7..cd071f1b3 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -2168,16 +2168,16 @@
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/map.bin"
     },
     {
-      "id": "LAYOUT_SAFARI_ZONE_BUILDING",
-      "name": "SafariZone_Building_Layout",
+      "id": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
+      "name": "SafariZone_RestHouse_Layout",
       "width": 13,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4BB4",
       "secondary_tileset": "gTileset_82D4F14",
-      "border_filepath": "data/layouts/SafariZone_Building/border.bin",
-      "blockdata_filepath": "data/layouts/SafariZone_Building/map.bin"
+      "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin"
     },
     {
       "id": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE",
@@ -2192,28 +2192,28 @@
       "blockdata_filepath": "data/layouts/SafariZone_SecretHouse/map.bin"
     },
     {
-      "id": "LAYOUT_FUCHSIA_CITY_ZOO_BUILDING",
-      "name": "FuchsiaCity_ZooBuilding_Layout",
+      "id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_OFFICE",
+      "name": "FuchsiaCity_SafariZone_Office_Layout",
       "width": 20,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4BB4",
       "secondary_tileset": "gTileset_82D4F14",
-      "border_filepath": "data/layouts/FuchsiaCity_ZooBuilding/border.bin",
-      "blockdata_filepath": "data/layouts/FuchsiaCity_ZooBuilding/map.bin"
+      "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/border.bin",
+      "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/map.bin"
     },
     {
-      "id": "LAYOUT_FUCHSIA_CITY_BUILDING1",
-      "name": "FuchsiaCity_Building1_Layout",
+      "id": "LAYOUT_FUCHSIA_CITY_WARDENS_HOUSE",
+      "name": "FuchsiaCity_WardensHouse_Layout",
       "width": 13,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4BB4",
       "secondary_tileset": "gTileset_82D4C2C",
-      "border_filepath": "data/layouts/FuchsiaCity_Building1/border.bin",
-      "blockdata_filepath": "data/layouts/FuchsiaCity_Building1/map.bin"
+      "border_filepath": "data/layouts/FuchsiaCity_WardensHouse/border.bin",
+      "blockdata_filepath": "data/layouts/FuchsiaCity_WardensHouse/map.bin"
     },
     {
       "id": "LAYOUT_FUCHSIA_CITY_HOUSE2",