gUnknown_0202E844 -> gCamera; fix internal compiler error

4 files changed, 15 insertions, 15 deletions

diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 98e8242aa..5a71559ba 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -328,10 +328,10 @@ void unc_grass_normal(struct Sprite *sprite)
     
     mapNum = sprite->data5 >> 8;
     mapGroup = sprite->data5;
-    if (gUnknown_0202E844.field_0 && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup))
+    if (gCamera.field_0 && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup))
     {
-        sprite->data1 -= gUnknown_0202E844.x;
-        sprite->data2 -= gUnknown_0202E844.y;
+        sprite->data1 -= gCamera.x;
+        sprite->data2 -= gCamera.y;
         sprite->data5 = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup;
     }
     localId = sprite->data3 >> 8;
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index f60b1b233..1568432f5 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1901,7 +1901,7 @@ extern void CameraObjectReset1(void);
 
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
 extern u8 gReservedSpritePaletteCount;
-extern struct Camera gUnknown_0202E844;
+extern struct Camera gCamera;
 
 static u8 gUnknown_030005A4;
 static u16 gUnknown_030005A6;
@@ -2990,9 +2990,9 @@ void UpdateFieldObjectCoordsForCameraUpdate(void)
     asm(""::"r"(i));  //makes the compiler store i in r3
 #endif
 
-    if (gUnknown_0202E844.field_0)
+    if (gCamera.field_0)
     {
-        for (i = 0, deltaX = gUnknown_0202E844.x, deltaY = gUnknown_0202E844.y; i < 16; i++)
+        for (i = 0, deltaX = gCamera.x, deltaY = gCamera.y; i < 16; i++)
         {
             struct MapObject *mapObject = &gMapObjects[i];
 
diff --git a/src/field_tasks.c b/src/field_tasks.c
index caf2ce6b9..628ee81de 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -836,11 +836,11 @@ void Task_MuddySlope(u8 taskId)
             }
             break;
     }
-    if (gUnknown_0202E844.field_0 && mapIndices != data[0])
+    if (gCamera.field_0 && mapIndices != data[0])
     {
         data[0] = mapIndices;
-        x2 = gUnknown_0202E844.x;
-        y2 = gUnknown_0202E844.y;
+        x2 = gCamera.x;
+        y2 = gCamera.y;
     }
     else
     {
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 0e0ec246c..7171e62b7 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -22,7 +22,7 @@ struct Coords32
 
 EWRAM_DATA static u16 gUnknown_02029828[0x2800] = {0};
 EWRAM_DATA struct MapHeader gMapHeader = {0};
-EWRAM_DATA struct Camera gUnknown_0202E844 = {0};
+EWRAM_DATA struct Camera gCamera = {0};
 EWRAM_DATA static struct ConnectionFlags gUnknown_0202E850 = {0};
 
 struct BackupMapData gUnknown_03004870;
@@ -713,7 +713,7 @@ bool8 CameraMove(int x, int y)
     unsigned int direction;
     struct MapConnection *connection;
     int old_x, old_y;
-    gUnknown_0202E844.field_0 = FALSE;
+    gCamera.field_0 = FALSE;
     direction = GetPostCameraMoveMapBorderId(x, y);
     if (direction + 1 <= 1)
     {
@@ -728,14 +728,14 @@ bool8 CameraMove(int x, int y)
         connection = sub_8056A64(direction, gSaveBlock1.pos.x, gSaveBlock1.pos.y);
         sub_8056918(connection, direction, x, y);
         sub_80538F0(connection->mapGroup, connection->mapNum);
-        gUnknown_0202E844.field_0 = TRUE;
-        gUnknown_0202E844.x = old_x - gSaveBlock1.pos.x;
-        gUnknown_0202E844.y = old_y - gSaveBlock1.pos.y;
+        gCamera.field_0 = TRUE;
+        gCamera.x = old_x - gSaveBlock1.pos.x;
+        gCamera.y = old_y - gSaveBlock1.pos.y;
         gSaveBlock1.pos.x += x;
         gSaveBlock1.pos.y += y;
         sub_80566F0(direction);
     }
-    return gUnknown_0202E844.field_0;
+    return gCamera.field_0;
 }
 
 struct MapConnection *sub_8056A64(u8 direction, int x, int y)