move entity update functions

1 files changed, 24 insertions, 24 deletions

diff --git a/src/manager/manager2.c b/src/manager/manager2.c
index 6f020f25..05fe08f7 100644
--- a/src/manager/manager2.c
+++ b/src/manager/manager2.c
@@ -21,8 +21,8 @@ extern u32 gUnk_0200B650;
 void Manager2_Main(Manager2* this) {
     if (this->manager.action == 0) {
         this->manager.action = 1;
-        gScreen.affine.bg3Updated = 0;
-        gScreen.bg.bg1Updated = 0;
+        gScreen.bg3.updated = 0;
+        gScreen.bg1.updated = 0;
         sub_08052D74(this, sub_080576A0, 0);
     }
     sub_0805754C(this);
@@ -33,19 +33,19 @@ void sub_0805754C(Manager2* this) {
 
     bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
     bgOffset += bgOffset >> 3;
-    gScreen.affine.bg3yOffset = bgOffset & 0x3f;
-    gScreen.affine.bg3Tilemap = gMapDataTopSpecial + (bgOffset / 0x40) * 0x200;
-    if (this->field_0x38 != gScreen.affine.bg3Tilemap) {
-        this->field_0x38 = gScreen.affine.bg3Tilemap;
-        gScreen.affine.bg3Updated = 1;
+    gScreen.bg3.yOffset = bgOffset & 0x3f;
+    gScreen.bg3.tilemap = gMapDataTopSpecial + (bgOffset / 0x40) * 0x200;
+    if (this->field_0x38 != gScreen.bg3.tilemap) {
+        this->field_0x38 = gScreen.bg3.tilemap;
+        gScreen.bg3.updated = 1;
     }
     bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
     bgOffset += bgOffset >> 2;
-    gScreen.bg.bg1yOffset = bgOffset & 0x3f;
-    gScreen.bg.bg1Tilemap = gMapDataTopSpecial + 0x2000 + (bgOffset / 0x40) * 0x200;
-    if (this->field_0x3c != gScreen.bg.bg1Tilemap) {
-        this->field_0x3c = gScreen.bg.bg1Tilemap;
-        gScreen.bg.bg1Updated = 1;
+    gScreen.bg1.yOffset = bgOffset & 0x3f;
+    gScreen.bg1.tilemap = gMapDataTopSpecial + 0x2000 + (bgOffset / 0x40) * 0x200;
+    if (this->field_0x3c != gScreen.bg1.tilemap) {
+        this->field_0x3c = gScreen.bg1.tilemap;
+        gScreen.bg1.updated = 1;
     }
 }
 
@@ -59,27 +59,27 @@ void sub_080575C8(u32 param) {
 
     bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
     bgOffset += bgOffset >> 3;
-    gScreen.affine.bg3yOffset = bgOffset & 0x3f;
-    gScreen.affine.bg3xOffset = 0;
-    gScreen.affine.bg3Tilemap = &gMapDataTopSpecial[(bgOffset / 0x40) * 0x200];
-    gScreen.affine.bg3Control = 0x1d49;
-    gScreen.affine.bg3Updated = 1;
+    gScreen.bg3.yOffset = bgOffset & 0x3f;
+    gScreen.bg3.xOffset = 0;
+    gScreen.bg3.tilemap = &gMapDataTopSpecial[(bgOffset / 0x40) * 0x200];
+    gScreen.bg3.control = 0x1d49;
+    gScreen.bg3.updated = 1;
 
     bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
     bgOffset += bgOffset >> 2;
-    gScreen.bg.bg1yOffset = bgOffset & 0x3f;
-    gScreen.bg.bg1xOffset = 0;
-    gScreen.bg.bg1Tilemap = &gMapDataTopSpecial[0x2000 + (bgOffset / 0x40) * 0x200];
-    gScreen.bg.bg1Control = 0x1e49;
-    gScreen.bg.bg1Updated = 1;
+    gScreen.bg1.yOffset = bgOffset & 0x3f;
+    gScreen.bg1.xOffset = 0;
+    gScreen.bg1.tilemap = &gMapDataTopSpecial[0x2000 + (bgOffset / 0x40) * 0x200];
+    gScreen.bg1.control = 0x1e49;
+    gScreen.bg1.updated = 1;
     gScreen.controls.layerFXControl = 0x3c48;
     gScreen.controls.alphaBlend = 0x609;
     gScreen.lcd.displayControl |= 0xa00;
 }
 
 void sub_08057688(void) {
-    gScreen.affine.bg3Control = 0x1d48;
-    gScreen.bg.bg1Control = 0x1e48;
+    gScreen.bg3.control = 0x1d48;
+    gScreen.bg1.control = 0x1e48;
 }
 
 void sub_080576A0(Manager2* this) {