From 4ab216f309fe2db2cd2abfa775fa235f59178791 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Fri, 31 Jan 2020 14:57:57 -0500
Subject: Rename generic building tilesets, SAFFRON_CITY_CLASSIC

---
 data/maps/Route5/map.json                    |  2 +-
 data/maps/Route6/map.json                    |  2 +-
 data/maps/Route7/map.json                    |  2 +-
 data/maps/Route8/map.json                    |  2 +-
 data/maps/SaffronCity_Classic/map.json       | 40 ----------------------------
 data/maps/SaffronCity_Classic/scripts.inc    |  2 --
 data/maps/SaffronCity_Connection/map.json    | 40 ++++++++++++++++++++++++++++
 data/maps/SaffronCity_Connection/scripts.inc |  2 ++
 data/maps/map_groups.json                    |  4 +--
 9 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 data/maps/SaffronCity_Classic/map.json
 delete mode 100644 data/maps/SaffronCity_Classic/scripts.inc
 create mode 100644 data/maps/SaffronCity_Connection/map.json
 create mode 100644 data/maps/SaffronCity_Connection/scripts.inc

(limited to 'data/maps')

diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json
index 8b047231e..28b739341 100644
--- a/data/maps/Route5/map.json
+++ b/data/maps/Route5/map.json
@@ -18,7 +18,7 @@
       "direction": "up"
     },
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": 0,
       "direction": "down"
     }
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
index f67590481..a6016c5fa 100644
--- a/data/maps/Route6/map.json
+++ b/data/maps/Route6/map.json
@@ -13,7 +13,7 @@
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": 0,
       "direction": "up"
     },
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
index e30bc8149..2c5a9717c 100644
--- a/data/maps/Route7/map.json
+++ b/data/maps/Route7/map.json
@@ -18,7 +18,7 @@
       "direction": "left"
     },
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": -10,
       "direction": "right"
     }
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
index 7ed8e635d..f16933a2e 100644
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -13,7 +13,7 @@
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": -10,
       "direction": "left"
     },
diff --git a/data/maps/SaffronCity_Classic/map.json b/data/maps/SaffronCity_Classic/map.json
deleted file mode 100644
index 0a5614975..000000000
--- a/data/maps/SaffronCity_Classic/map.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "id": "MAP_SAFFRON_CITY_CLASSIC",
-  "name": "SaffronCity_Classic",
-  "layout": "LAYOUT_SAFFRON_CITY_CLASSIC",
-  "music": "MUS_NIBI",
-  "region_map_section": "MAPSEC_SAFFRON_CITY",
-  "requires_flash": false,
-  "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_1",
-  "unknown_18": 1,
-  "unknown_19": 6,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
-  "connections": [
-    {
-      "map": "MAP_ROUTE5",
-      "offset": 0,
-      "direction": "up"
-    },
-    {
-      "map": "MAP_ROUTE6",
-      "offset": 12,
-      "direction": "down"
-    },
-    {
-      "map": "MAP_ROUTE7",
-      "offset": 10,
-      "direction": "left"
-    },
-    {
-      "map": "MAP_ROUTE8",
-      "offset": 10,
-      "direction": "right"
-    }
-  ],
-  "object_events": [],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
-}
diff --git a/data/maps/SaffronCity_Classic/scripts.inc b/data/maps/SaffronCity_Classic/scripts.inc
deleted file mode 100644
index 26470756d..000000000
--- a/data/maps/SaffronCity_Classic/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SaffronCity_Classic_MapScripts:: @ 8167483
-	.byte 0
diff --git a/data/maps/SaffronCity_Connection/map.json b/data/maps/SaffronCity_Connection/map.json
new file mode 100644
index 000000000..718007c43
--- /dev/null
+++ b/data/maps/SaffronCity_Connection/map.json
@@ -0,0 +1,40 @@
+{
+  "id": "MAP_SAFFRON_CITY_CONNECTION",
+  "name": "SaffronCity_Connection",
+  "layout": "LAYOUT_SAFFRON_CITY_CONNECTION",
+  "music": "MUS_NIBI",
+  "region_map_section": "MAPSEC_SAFFRON_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE5",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_ROUTE6",
+      "offset": 12,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE7",
+      "offset": 10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE8",
+      "offset": 10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
diff --git a/data/maps/SaffronCity_Connection/scripts.inc b/data/maps/SaffronCity_Connection/scripts.inc
new file mode 100644
index 000000000..94f49eb2d
--- /dev/null
+++ b/data/maps/SaffronCity_Connection/scripts.inc
@@ -0,0 +1,2 @@
+SaffronCity_Connection_MapScripts:: @ 8167483
+	.byte 0
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 27213f55e..7c1094bbb 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -250,7 +250,7 @@
     "CinnabarIsland",
     "IndigoPlateau_Exterior",
     "SaffronCity",
-    "SaffronCity_Classic",
+    "SaffronCity_Connection",
     "OneIsland",
     "TwoIsland",
     "ThreeIsland",
@@ -567,7 +567,7 @@
     "CinnabarIsland",
     "IndigoPlateau_Exterior",
     "SaffronCity",
-    "SaffronCity_Classic",
+    "SaffronCity_Connection",
     "OneIsland",
     "TwoIsland",
     "ThreeIsland",
-- 
cgit v1.2.3