1 files changed, 11 insertions, 11 deletions

diff --git a/src/fieldmap.c b/src/fieldmap.c
index cd9baa217..4dcfbe30b 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -42,7 +42,7 @@ EWRAM_DATA struct MapHeader gMapHeader = {0};
 EWRAM_DATA struct Camera gUnknown_0202E844 = {0};
 EWRAM_DATA static struct ConnectionFlags gUnknown_0202E850 = {0};
 
-extern const struct ConnectionFlags gUnknown_08308E28;
+static const struct ConnectionFlags sDummyConnectionFlags = {0};
 
 void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader);
 void sub_80560AC(struct MapHeader *);
@@ -112,7 +112,7 @@ void sub_80560AC(struct MapHeader *mapHeader) {
 	int count;
 	count = mapHeader->connections->count;
 	connection = mapHeader->connections->connections;
-	gUnknown_0202E850 = gUnknown_08308E28;
+	gUnknown_0202E850 = sDummyConnectionFlags;
 	for (i = 0; i < count; i++, connection++) {
 		cMap = mapconnection_get_mapheader(connection);
 		offset = connection->offset;
@@ -156,8 +156,8 @@ void sub_8056134(int x, int y, struct MapHeader *mapHeader, int x2, int y2, int
 
 void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
 	int x, y;
-	int x2, y2;
-	int width, height;
+	int x2;
+	int width;
 	int cWidth;
 
 	if (connectedMapHeader) {
@@ -190,9 +190,9 @@ void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
 }
 
 void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
-	int x, y;
+	int x;
 	int x2, y2;
-	int width, height;
+	int width;
 	int cWidth, cHeight;
 
 	if (connectedMapHeader) {
@@ -229,9 +229,9 @@ void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
 
 
 void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
-	int x, y;
+	int y;
 	int x2, y2;
-	int width, height;
+	int height;
 	int cWidth, cHeight;
 	if (connectedMapHeader) {
 		cWidth = connectedMapHeader->mapData->width;
@@ -265,9 +265,9 @@ void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connected
 
 void fillEastConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
 	int x, y;
-	int x2, y2;
-	int width, height;
-	int cWidth, cHeight;
+	int y2;
+	int height;
+	int cHeight;
 	if (connectedMapHeader) {
 		cHeight = connectedMapHeader->mapData->height;
 		x = mapHeader->mapData->width + 7;