naming work

39 files changed, 251 insertions, 251 deletions

diff --git a/src/manager/manager10.c b/src/manager/manager10.c
index 607463a5..4eb78e21 100644
--- a/src/manager/manager10.c
+++ b/src/manager/manager10.c
@@ -6,7 +6,7 @@
 #include "sound.h"
 #include "screen.h"
 #include "common.h"
-#include "fileScreen.h"
+#include "fileselect.h"
 #include "functions.h"
 
 void sub_080595E4(Manager10*);
@@ -95,7 +95,7 @@ void sub_08059690(Manager10* this) {
 }
 
 void sub_080596E0(Manager10* this) {
-    if ((gScreenTransition.frameCount & 7) == 0) {
+    if ((gRoomTransition.frameCount & 7) == 0) {
         gScreen.bg1.xOffset += 8;
         gScreen.bg1.xOffset &= 0x1F;
     }
@@ -149,11 +149,11 @@ void sub_080596E0(Manager10* this) {
 }
 
 u32 sub_08059844() {
-    return gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX > gRoomControls.width >> 1;
+    return gPlayerEntity.x.HALF.HI - gRoomControls.origin_x > gRoomControls.width >> 1;
 }
 
 u32 sub_0805986C() {
-    return gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX > 0x200;
+    return gPlayerEntity.x.HALF.HI - gRoomControls.origin_x > 0x200;
 }
 
 void sub_08059894(const u16* unk1, const u16* unk2, u32 unk3) {
diff --git a/src/manager/manager12.c b/src/manager/manager12.c
index 630e17e5..a29877bd 100644
--- a/src/manager/manager12.c
+++ b/src/manager/manager12.c
@@ -65,7 +65,7 @@ void sub_08059A2C(Manager12* this) {
 }
 
 void sub_08059A58(Manager12* this) {
-    if (gRoomControls.areaID != AREA_FESTIVAL_TOWN) {
+    if (gRoomControls.area != AREA_FESTIVAL_TOWN) {
         if (sub_08059C8C(this, 0, &this->field_0x20, &gUnk_08108398) != 0) {
             sub_08059CC0(0, (u32)this->field_0x20);
         }
@@ -142,7 +142,7 @@ void sub_08059CC0(u32 param_1, u32 param_2) {
     Unknown* unknown;
 
     gRoomVars.unk_10[param_1] = param_2;
-    if (gRoomControls.areaID != AREA_FESTIVAL_TOWN) {
+    if (gRoomControls.area != AREA_FESTIVAL_TOWN) {
         unknown = &gUnk_08108408[param_2];
     } else {
         unknown = &gUnk_08108468[param_2];
@@ -154,7 +154,7 @@ void sub_08059CC0(u32 param_1, u32 param_2) {
 void TryLoadPrologueHyruleTown(void) {
     u32 tmp;
 
-    if (gRoomControls.areaID != AREA_FESTIVAL_TOWN) {
+    if (gRoomControls.area != AREA_FESTIVAL_TOWN) {
         tmp = CheckRegionsOnScreen(&gUnk_08108398);
         if (tmp != 0xff) {
             sub_08059CC0(0, tmp);
diff --git a/src/manager/manager13.c b/src/manager/manager13.c
index 409fdbb7..e1d7820b 100644
--- a/src/manager/manager13.c
+++ b/src/manager/manager13.c
@@ -33,7 +33,7 @@ void Manager13_Main(Manager13* this) {
     if (this->manager.action == 0) {
         this->manager.action = 1;
     }
-    if (gRoomControls.areaID == AREA_FESTIVAL_TOWN) {
+    if (gRoomControls.area == AREA_FESTIVAL_TOWN) {
         spawnData = gUnk_08108530;
     } else {
         spawnData = gUnk_081084C8;
@@ -46,8 +46,8 @@ void Manager13_Main(Manager13* this) {
             Entity* object = CreateObject(OBJECT_1C, spawnData->type, type2);
             if (object != NULL) {
                 object->frameIndex = spawnData->frameIndex;
-                object->x.HALF.HI = gRoomControls.roomOriginX + spawnData->x;
-                object->y.HALF.HI = gRoomControls.roomOriginY + spawnData->y;
+                object->x.HALF.HI = gRoomControls.origin_x + spawnData->x;
+                object->y.HALF.HI = gRoomControls.origin_y + spawnData->y;
                 object->parent = (Entity*)this;
                 object->field_0x80.HWORD = spawnData->x;
                 object->field_0x82.HWORD = spawnData->y;
diff --git a/src/manager/manager14.c b/src/manager/manager14.c
index a3771fe9..367111f6 100644
--- a/src/manager/manager14.c
+++ b/src/manager/manager14.c
@@ -83,7 +83,7 @@ void sub_08059EF8(Manager14* this) {
 }
 
 u32 sub_08059F9C(Manager14* this) {
-    switch (gRoomControls.roomID) {
+    switch (gRoomControls.room) {
         case 1:
             if (CheckLocalFlag(0x16)) {
                 return 0;
@@ -123,7 +123,7 @@ void sub_0805A048(Manager14* this) {
 }
 
 void sub_0805A098(Manager14* this) {
-    switch (gRoomControls.roomID) {
+    switch (gRoomControls.room) {
         case 0:
         case 8:
         case 9:
diff --git a/src/manager/manager15.c b/src/manager/manager15.c
index c23c24fd..21cad632 100644
--- a/src/manager/manager15.c
+++ b/src/manager/manager15.c
@@ -163,8 +163,8 @@ void sub_0805A4CC(Manager15* this, u32 unk_0) {
     Entity* tmp;
     tmp = CreateObject(OBJECT_8E, unk_0, 0);
     if (tmp) {
-        tmp->x.HALF.HI = this->unk_38 + gRoomControls.roomOriginX;
-        tmp->y.HALF.HI = this->unk_3a + gRoomControls.roomOriginY - 0x30;
+        tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x;
+        tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y - 0x30;
         tmp->parent = (Entity*)this;
         this->manager.unk_0d = 0;
     }
@@ -199,7 +199,7 @@ void sub_0805A500(Manager15* this) {
     }
     sub_0805AA58(this);
     sub_0805A9CC(this);
-    if (gRoomControls.unk2 == 1) {
+    if (gRoomControls.reload_flags == 1) {
         gScreen.lcd.displayControl |= DISPCNT_WIN1_ON;
         this->manager.unk_0d = 1;
         return;
@@ -207,7 +207,7 @@ void sub_0805A500(Manager15* this) {
     if (!this->manager.unk_0d)
         return;
     this->manager.unk_0d = 0;
-    if (this->unk_20 == gRoomControls.roomID)
+    if (this->unk_20 == gRoomControls.room)
         return;
     gScreen.lcd.displayControl &= ~(DISPCNT_WIN1_ON | DISPCNT_BG3_ON);
     DeleteThisEntity();
@@ -275,8 +275,8 @@ void sub_0805A6E8(Manager15* this) {
     sub_0805A89C(this);
     this->unk_23 = 0;
     sub_0805AAF0(0);
-    this->unk_38 += gRoomControls.roomOriginX;
-    this->unk_3a += gRoomControls.roomOriginY;
+    this->unk_38 += gRoomControls.origin_x;
+    this->unk_3a += gRoomControls.origin_y;
     if (!sub_0805A73C(this)) {
         this->manager.action++;
     }
@@ -307,7 +307,7 @@ void sub_0805A76C(Manager15* this) {
                     RequestPriorityDuration((Entity*)this, 600);
                     SetPlayerControl(0xFF);
                     gUnk_02034490[0] = 1;
-                    gRoomControls.cameraTarget = NULL;
+                    gRoomControls.camera_target = NULL;
                     sub_08077B20();
                 }
         }
@@ -371,9 +371,9 @@ void sub_0805A89C(Manager15* this) {
     this->manager.unk_0f = 0x10;
     this->unk_21 = 0;
     this->unk_22 = 0;
-    this->unk_20 = gRoomControls.roomID;
-    this->unk_24 = gRoomControls.roomOriginX;
-    this->unk_26 = gRoomControls.roomOriginY;
+    this->unk_20 = gRoomControls.room;
+    this->unk_24 = gRoomControls.origin_x;
+    this->unk_26 = gRoomControls.origin_y;
     RegisterTransitionManager(this, sub_0805AAC8, 0);
 }
 
@@ -382,14 +382,14 @@ void sub_0805A94C(Manager15* this);
 void sub_0805A8EC(Manager15* this) {
     sub_0805AA58(this);
     sub_0805A94C(this);
-    if (gRoomControls.unk2 == 1) {
+    if (gRoomControls.reload_flags == 1) {
         gScreen.lcd.displayControl |= DISPCNT_WIN1_ON;
         this->manager.unk_0d = 1;
     } else {
         if (!this->manager.unk_0d)
             return;
         this->manager.unk_0d = 0;
-        if (this->unk_20 == gRoomControls.roomID)
+        if (this->unk_20 == gRoomControls.room)
             return;
         gScreen.lcd.displayControl &= ~(DISPCNT_WIN1_ON | DISPCNT_BG3_ON);
         DeleteThisEntity();
@@ -398,8 +398,8 @@ void sub_0805A8EC(Manager15* this) {
 
 void sub_0805A94C(Manager15* this) {
     int tmp1, tmp2;
-    gScreen.bg3.xOffset = gRoomControls.roomScrollX - this->unk_24 + this->unk_34;
-    gScreen.bg3.yOffset = gRoomControls.roomScrollY - this->unk_26 + this->unk_36;
+    gScreen.bg3.xOffset = gRoomControls.scroll_x - this->unk_24 + this->unk_34;
+    gScreen.bg3.yOffset = gRoomControls.scroll_y - this->unk_26 + this->unk_36;
     tmp1 = -gScreen.bg3.xOffset;
     tmp2 = tmp1 + 0x100;
     if (tmp1 < 0)
@@ -427,7 +427,7 @@ void sub_0805A94C(Manager15* this) {
 void sub_0805A9CC(Manager15* this) {
     int tmp1, tmp2;
     void* tmp3;
-    gScreen.bg3.xOffset = gRoomControls.roomScrollX - this->unk_24 + this->unk_34;
+    gScreen.bg3.xOffset = gRoomControls.scroll_x - this->unk_24 + this->unk_34;
     tmp1 = -gScreen.bg3.xOffset;
     tmp2 = tmp1 + 0x100;
     if (tmp1 < 0)
@@ -439,7 +439,7 @@ void sub_0805A9CC(Manager15* this) {
     if (tmp2 > DISPLAY_WIDTH)
         tmp2 = DISPLAY_WIDTH;
     gScreen.controls.window1HorizontalDimensions = tmp1 << 8 | tmp2;
-    tmp1 = gRoomControls.roomScrollY - this->unk_26 + this->unk_36;
+    tmp1 = gRoomControls.scroll_y - this->unk_26 + this->unk_36;
     gScreen.bg3.yOffset = tmp1 & 0x3F;
     tmp3 = (&gBG3Buffer[((tmp1 / 0x40) << 8)]);
     gScreen.bg3.tilemap = (u32*)tmp3;
diff --git a/src/manager/manager17.c b/src/manager/manager17.c
index 139c4c2f..54c1656b 100644
--- a/src/manager/manager17.c
+++ b/src/manager/manager17.c
@@ -37,8 +37,8 @@ void sub_0805AD80(Manager17* manager) {
         if (object != NULL) {
             object->actionDelay = manager->field_0x35;
             object->collisionLayer = manager->field_0x36;
-            object->x.HALF.HI = manager->field_0x38 + gRoomControls.roomOriginX;
-            object->y.HALF.HI = manager->field_0x3a + gRoomControls.roomOriginY;
+            object->x.HALF.HI = manager->field_0x38 + gRoomControls.origin_x;
+            object->y.HALF.HI = manager->field_0x3a + gRoomControls.origin_y;
             object->field_0x86.HWORD = manager->field_0x3c;
         }
         DeleteThisEntity();
diff --git a/src/manager/manager18.c b/src/manager/manager18.c
index 4acc0bc4..fd7ba93f 100644
--- a/src/manager/manager18.c
+++ b/src/manager/manager18.c
@@ -40,8 +40,8 @@ void Manager18_Main(Manager18* this) {
             }
             gRoomControls.bg3OffsetX.WORD -= 0x2000;
             gRoomControls.bg3OffsetY.WORD -= 0x1000;
-            gScreen.bg3.xOffset = gRoomControls.roomScrollX + gRoomControls.bg3OffsetX.HALF.HI;
-            gScreen.bg3.yOffset = gRoomControls.roomScrollY + gRoomControls.bg3OffsetY.HALF.HI;
+            gScreen.bg3.xOffset = gRoomControls.scroll_x + gRoomControls.bg3OffsetX.HALF.HI;
+            gScreen.bg3.yOffset = gRoomControls.scroll_y + gRoomControls.bg3OffsetY.HALF.HI;
         }
     }
 }
@@ -52,8 +52,8 @@ void sub_0805AEDC(Manager18* this) {
     gScreen.controls.layerFXControl =
         BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD;
     gScreen.controls.alphaBlend = (this != NULL) ? this->field_0x20 : BLDALPHA_BLEND(0, 16);
-    gScreen.bg3.xOffset = gRoomControls.roomScrollX + gRoomControls.bg3OffsetX.HALF.HI;
-    gScreen.bg3.yOffset = gRoomControls.roomScrollY + gRoomControls.bg3OffsetY.HALF.HI;
+    gScreen.bg3.xOffset = gRoomControls.scroll_x + gRoomControls.bg3OffsetX.HALF.HI;
+    gScreen.bg3.yOffset = gRoomControls.scroll_y + gRoomControls.bg3OffsetY.HALF.HI;
     if (this != NULL) {
         Manager18_Main(this);
     }
diff --git a/src/manager/manager19.c b/src/manager/manager19.c
index f967c62a..5eee6ccb 100644
--- a/src/manager/manager19.c
+++ b/src/manager/manager19.c
@@ -22,8 +22,8 @@ void Manager19_Main(Manager* this) {
             }
         } else {
             gRoomControls.bg3OffsetX.WORD = gRoomControls.bg3OffsetX.WORD - 0x2000;
-            gScreen.bg3.xOffset = gRoomControls.roomScrollX + gRoomControls.bg3OffsetX.HALF.HI;
-            gScreen.bg3.yOffset = gRoomControls.roomScrollY + gRoomControls.bg3OffsetY.HALF.HI;
+            gScreen.bg3.xOffset = gRoomControls.scroll_x + gRoomControls.bg3OffsetX.HALF.HI;
+            gScreen.bg3.yOffset = gRoomControls.scroll_y + gRoomControls.bg3OffsetY.HALF.HI;
         }
     }
 }
@@ -31,6 +31,6 @@ void Manager19_Main(Manager* this) {
 void sub_0805AFFC(Manager* this) {
     gScreen.bg3.control = BGCNT_PRIORITY(3) | BGCNT_SCREENBASE(30);
     gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
-    gScreen.bg3.xOffset = gRoomControls.roomScrollX + gRoomControls.bg3OffsetX.HALF.HI;
-    gScreen.bg3.yOffset = gRoomControls.roomScrollY + gRoomControls.bg3OffsetY.HALF.HI;
+    gScreen.bg3.xOffset = gRoomControls.scroll_x + gRoomControls.bg3OffsetX.HALF.HI;
+    gScreen.bg3.yOffset = gRoomControls.scroll_y + gRoomControls.bg3OffsetY.HALF.HI;
 }
diff --git a/src/manager/manager1A.c b/src/manager/manager1A.c
index 2ad78228..5e760473 100644
--- a/src/manager/manager1A.c
+++ b/src/manager/manager1A.c
@@ -70,16 +70,16 @@ void sub_0805B048(Manager1A* this) {
     SetDefaultPriority((Entity*)&this->manager, PRIO_PLAYER_EVENT);
     MemClear(&this->unk_20, 0x20);
     this->manager.action = 1;
-    this->unk_3f = gRoomControls.roomID;
+    this->unk_3f = gRoomControls.room;
     tmp = &gUnk_08108764[this->manager.unk_0a];
     if (!tmp->unk_0a) {
-        this->unk_20 = gRoomControls.roomOriginX;
-        this->unk_22 = gRoomControls.roomOriginY;
+        this->unk_20 = gRoomControls.origin_x;
+        this->unk_22 = gRoomControls.origin_y;
         this->unk_24 = gRoomControls.width;
         this->unk_26 = gRoomControls.height;
     } else {
-        this->unk_20 = (tmp->unk_08 << 4) + gRoomControls.roomOriginX;
-        this->unk_22 = (tmp->unk_09 << 4) + gRoomControls.roomOriginY;
+        this->unk_20 = (tmp->unk_08 << 4) + gRoomControls.origin_x;
+        this->unk_22 = (tmp->unk_09 << 4) + gRoomControls.origin_y;
         this->unk_24 = (tmp->unk_0a << 4);
         this->unk_26 = (tmp->unk_0b << 4);
     }
@@ -99,15 +99,15 @@ void sub_0805B048(Manager1A* this) {
         return;
     obj = CreateObject(OBJECT_28, tmp->unk_10->unk_00, tmp->unk_10->unk_01);
     if (obj) {
-        obj->x.HALF.HI = tmp->unk_10->unk_04 + gRoomControls.roomOriginX;
-        obj->y.HALF.HI = tmp->unk_10->unk_06 + gRoomControls.roomOriginY;
+        obj->x.HALF.HI = tmp->unk_10->unk_04 + gRoomControls.origin_x;
+        obj->y.HALF.HI = tmp->unk_10->unk_06 + gRoomControls.origin_y;
     }
     if (this->manager.unk_0a != 0xa || CheckLocalFlag(0x4B))
         return;
     obj = CreateObject(OBJECT_28, 3, 3);
     if (obj) {
-        obj->x.HALF.HI = tmp->unk_10->unk_04 + gRoomControls.roomOriginX;
-        obj->y.HALF.HI = tmp->unk_10->unk_06 + gRoomControls.roomOriginY;
+        obj->x.HALF.HI = tmp->unk_10->unk_04 + gRoomControls.origin_x;
+        obj->y.HALF.HI = tmp->unk_10->unk_06 + gRoomControls.origin_y;
     }
 }
 
@@ -118,14 +118,14 @@ void sub_0805B168(Manager1A* this) {
         return;
     }
     sub_0805B2B0(this);
-    if (gRoomControls.unk2 == 1) {
+    if (gRoomControls.reload_flags == 1) {
         this->manager.unk_0d = 1;
         return;
     }
     if (!this->manager.unk_0d)
         return;
     this->manager.unk_0d = 0;
-    if (this->unk_3f == gRoomControls.roomID)
+    if (this->unk_3f == gRoomControls.room)
         return;
     if (this->manager.unk_0b) {
         gScreen.lcd.displayControl &= ~0x800;
@@ -147,33 +147,33 @@ u32 sub_0805B1CC(Manager1A* this) {
 
 void sub_0805B210(Manager1A* this) {
     struct_08108764* tmp;
-    gScreenTransition.transitioningOut = 1;
-    gScreenTransition.transitionType = TRANSITION_CUT;
-    gScreenTransition.player_status.start_anim = 4;
+    gRoomTransition.transitioningOut = 1;
+    gRoomTransition.type = TRANSITION_CUT;
+    gRoomTransition.player_status.start_anim = 4;
     tmp = &gUnk_08108764[this->manager.unk_0a];
-    gScreenTransition.player_status.area_next = tmp->unk_01;
-    gScreenTransition.player_status.room_next = tmp->unk_02;
-    gScreenTransition.player_status.layer = tmp->unk_03;
+    gRoomTransition.player_status.area_next = tmp->unk_01;
+    gRoomTransition.player_status.room_next = tmp->unk_02;
+    gRoomTransition.player_status.layer = tmp->unk_03;
     if (gPlayerState.flags & PL_MINISH) {
-        gScreenTransition.player_status.spawn_type = 6;
+        gRoomTransition.player_status.spawn_type = 6;
     } else {
-        gScreenTransition.player_status.spawn_type = 2;
+        gRoomTransition.player_status.spawn_type = 2;
     }
     switch (tmp->unk_00) {
         case 0:
-            gScreenTransition.player_status.start_pos_x = tmp->unk_04;
-            gScreenTransition.player_status.start_pos_y = tmp->unk_06;
+            gRoomTransition.player_status.start_pos_x = tmp->unk_04;
+            gRoomTransition.player_status.start_pos_y = tmp->unk_06;
             break;
         case 1:
-            gScreenTransition.player_status.start_pos_x =
-                gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX + tmp->unk_04;
-            gScreenTransition.player_status.start_pos_y =
-                gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY + tmp->unk_06;
+            gRoomTransition.player_status.start_pos_x =
+                gPlayerEntity.x.HALF.HI - gRoomControls.origin_x + tmp->unk_04;
+            gRoomTransition.player_status.start_pos_y =
+                gPlayerEntity.y.HALF.HI - gRoomControls.origin_y + tmp->unk_06;
             break;
         case 2:
-            gScreenTransition.player_status.start_pos_x = tmp->unk_04;
-            gScreenTransition.player_status.start_pos_y = tmp->unk_06;
-            gScreenTransition.player_status.spawn_type = 6;
+            gRoomTransition.player_status.start_pos_x = tmp->unk_04;
+            gRoomTransition.player_status.start_pos_y = tmp->unk_06;
+            gRoomTransition.player_status.spawn_type = 6;
             break;
     }
 }
@@ -182,8 +182,8 @@ void sub_0805B2B0(Manager1A* this) {
     s32 tmp, tmp2;
     if (!this->manager.unk_0b)
         return;
-    tmp = (this->unk_30 - gRoomControls.roomScrollX) / 4;
-    tmp2 = (this->unk_32 - gRoomControls.roomScrollY) / 4;
+    tmp = (this->unk_30 - gRoomControls.scroll_x) / 4;
+    tmp2 = (this->unk_32 - gRoomControls.scroll_y) / 4;
     if (tmp < -12) {
         tmp = -12;
     }
@@ -197,10 +197,10 @@ void sub_0805B2B0(Manager1A* this) {
         tmp2 = 12;
     }
     gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
-    gRoomControls.bg3OffsetX.HALF.HI = gRoomControls.roomScrollX + this->unk_34 + tmp;
-    gScreen.bg3.xOffset = gRoomControls.roomScrollX + this->unk_34 + tmp;
-    gRoomControls.bg3OffsetY.HALF.HI = gRoomControls.roomScrollY + this->unk_36 + tmp2;
-    gScreen.bg3.yOffset = gRoomControls.roomScrollY + this->unk_36 + tmp2;
+    gRoomControls.bg3OffsetX.HALF.HI = gRoomControls.scroll_x + this->unk_34 + tmp;
+    gScreen.bg3.xOffset = gRoomControls.scroll_x + this->unk_34 + tmp;
+    gRoomControls.bg3OffsetY.HALF.HI = gRoomControls.scroll_y + this->unk_36 + tmp2;
+    gScreen.bg3.yOffset = gRoomControls.scroll_y + this->unk_36 + tmp2;
 }
 
 void sub_0805B328(Manager1A* this) {
diff --git a/src/manager/manager1B.c b/src/manager/manager1B.c
index a172bcfc..8fb9e70a 100644
--- a/src/manager/manager1B.c
+++ b/src/manager/manager1B.c
@@ -40,20 +40,20 @@ void Manager1B_Main(Manager1B* this) {
         this->field_0x20 = iVar3 + (s8)tmp[2];
         gUnk_08108C54[tmp[1]](this);
     }
-    if (gRoomControls.unk2 == 0) {
+    if (gRoomControls.reload_flags == 0) {
         gUnk_08108C54[tmp[1]](this);
     }
 }
 
 void sub_0805B448(Manager1B* this) {
-    gScreen.bg3.xOffset = (gRoomControls.roomScrollX - gRoomControls.roomOriginX) >> 2;
-    gScreen.bg3.yOffset = ((gRoomControls.roomScrollY - gRoomControls.roomOriginY) >> 1) + this->field_0x20;
+    gScreen.bg3.xOffset = (gRoomControls.scroll_x - gRoomControls.origin_x) >> 2;
+    gScreen.bg3.yOffset = ((gRoomControls.scroll_y - gRoomControls.origin_y) >> 1) + this->field_0x20;
 }
 
 void sub_0805B474(Manager1B* this) {
-    s32 tmp = ((gRoomControls.roomScrollY - gRoomControls.roomOriginY) * 0x60) / (gRoomControls.height - 0xa0);
-    gScreen.bg3.yOffset = gRoomControls.roomOriginY + tmp;
-    gScreen.bg3.xOffset = gRoomControls.roomScrollX - ((gRoomControls.width - 0x100) / 2);
+    s32 tmp = ((gRoomControls.scroll_y - gRoomControls.origin_y) * 0x60) / (gRoomControls.height - 0xa0);
+    gScreen.bg3.yOffset = gRoomControls.origin_y + tmp;
+    gScreen.bg3.xOffset = gRoomControls.scroll_x - ((gRoomControls.width - 0x100) / 2);
 }
 
 void sub_0805B4B4(Manager1B* this) {
@@ -71,9 +71,9 @@ void sub_0805B4D0(u32 param_1) {
     LoadGfxGroup(gUnk_08108C5C[param_1]);
     gScreen.bg3.control = 0x1e07;
     gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
-    gScreen.bg3.xOffset = (gRoomControls.roomScrollX - gRoomControls.roomOriginX) >> 2;
+    gScreen.bg3.xOffset = (gRoomControls.scroll_x - gRoomControls.origin_x) >> 2;
 
-    uVar2 = (gRoomControls.roomScrollY - gRoomControls.roomOriginY) >> 1;
+    uVar2 = (gRoomControls.scroll_y - gRoomControls.origin_y) >> 1;
     iVar1 = 0x100 - gRoomControls.height;
     if (iVar1 < 0) {
         iVar1 = 0;
diff --git a/src/manager/manager1C.c b/src/manager/manager1C.c
index 4ff51e27..54b5e63f 100644
--- a/src/manager/manager1C.c
+++ b/src/manager/manager1C.c
@@ -25,8 +25,8 @@ void sub_0805B55C(Manager* manager) {
         manager->unk_0e = 0xf;
         waterDrop = CreateEnemy(WATER_DROP, 0);
         if (waterDrop != NULL) {
-            waterDrop->x.HALF.HI = gRoomControls.roomScrollX + 0x78 + gUnk_08108C6C[Random() & 7];
-            waterDrop->y.HALF.HI = gRoomControls.roomScrollY + 0x50 + gUnk_08108C7C[Random() & 3];
+            waterDrop->x.HALF.HI = gRoomControls.scroll_x + 0x78 + gUnk_08108C6C[Random() & 7];
+            waterDrop->y.HALF.HI = gRoomControls.scroll_y + 0x50 + gUnk_08108C7C[Random() & 3];
             waterDrop->z.HALF.HI = 0xff38;
         }
     }
diff --git a/src/manager/manager1D.c b/src/manager/manager1D.c
index b9039a05..f1d9a40f 100644
--- a/src/manager/manager1D.c
+++ b/src/manager/manager1D.c
@@ -25,8 +25,8 @@ void sub_0805B5E0(Manager* this) {
             gScreen.bg3.xOffset = 0;
             break;
         case 1:
-            gScreen.bg3.xOffset = gRoomControls.roomScrollX + gRoomControls.bg3OffsetX.HALF.HI;
-            gScreen.bg3.yOffset = gRoomControls.roomScrollY + gRoomControls.bg3OffsetY.HALF.HI;
+            gScreen.bg3.xOffset = gRoomControls.scroll_x + gRoomControls.bg3OffsetX.HALF.HI;
+            gScreen.bg3.yOffset = gRoomControls.scroll_y + gRoomControls.bg3OffsetY.HALF.HI;
             break;
     }
 }
@@ -34,7 +34,7 @@ void sub_0805B5E0(Manager* this) {
 void sub_0805B638(Manager* this) {
     if (this->unk_0a == 1) {
         gRoomControls.bg3OffsetX.WORD = gRoomControls.bg3OffsetX.WORD + 0x2000;
-        gScreen.bg3.xOffset = gRoomControls.roomScrollX + gRoomControls.bg3OffsetX.HALF.HI;
-        gScreen.bg3.yOffset = gRoomControls.roomScrollY + gRoomControls.bg3OffsetY.HALF.HI;
+        gScreen.bg3.xOffset = gRoomControls.scroll_x + gRoomControls.bg3OffsetX.HALF.HI;
+        gScreen.bg3.yOffset = gRoomControls.scroll_y + gRoomControls.bg3OffsetY.HALF.HI;
     }
 }
diff --git a/src/manager/manager2.c b/src/manager/manager2.c
index 0294a65f..a9404c10 100644
--- a/src/manager/manager2.c
+++ b/src/manager/manager2.c
@@ -29,7 +29,7 @@ void Manager2_Main(Manager2* this) {
 void sub_0805754C(Manager2* this) {
     s32 bgOffset;
 
-    bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
+    bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y);
     bgOffset += bgOffset >> 3;
     gScreen.bg3.yOffset = bgOffset & 0x3f;
     gScreen.bg3.tilemap = gMapDataTopSpecial + (bgOffset / 0x40) * 0x200;
@@ -37,7 +37,7 @@ void sub_0805754C(Manager2* this) {
         this->field_0x38 = gScreen.bg3.tilemap;
         gScreen.bg3.updated = 1;
     }
-    bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
+    bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y);
     bgOffset += bgOffset >> 2;
     gScreen.bg1.yOffset = bgOffset & 0x3f;
     gScreen.bg1.tilemap = gMapDataTopSpecial + 0x2000 + (bgOffset / 0x40) * 0x200;
@@ -55,7 +55,7 @@ void sub_080575C8(u32 param) {
     LoadGfxGroup(param);
     gRoomVars.unk_10[0] = param;
 
-    bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
+    bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y);
     bgOffset += bgOffset >> 3;
     gScreen.bg3.yOffset = bgOffset & 0x3f;
     gScreen.bg3.xOffset = 0;
@@ -63,7 +63,7 @@ void sub_080575C8(u32 param) {
     gScreen.bg3.control = BGCNT_SCREENBASE(29) | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(2) | BGCNT_MOSAIC;
     gScreen.bg3.updated = 1;
 
-    bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
+    bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y);
     bgOffset += bgOffset >> 2;
     gScreen.bg1.yOffset = bgOffset & 0x3f;
     gScreen.bg1.xOffset = 0;
diff --git a/src/manager/manager20.c b/src/manager/manager20.c
index 46f4fe20..8f0543ad 100644
--- a/src/manager/manager20.c
+++ b/src/manager/manager20.c
@@ -30,7 +30,7 @@ void Manager20_Main(Manager20* this) {
         tmp->y.HALF.HI = this->unk_3a;
         tmp->collisionLayer = this->unk_37 >> 4;
     }
-    tmp->x.HALF.HI += gRoomControls.roomOriginX;
-    tmp->y.HALF.HI += gRoomControls.roomOriginY;
+    tmp->x.HALF.HI += gRoomControls.origin_x;
+    tmp->y.HALF.HI += gRoomControls.origin_y;
     DeleteManager((Manager*)this);
 }
diff --git a/src/manager/manager21.c b/src/manager/manager21.c
index 49003b50..d07cbb18 100644
--- a/src/manager/manager21.c
+++ b/src/manager/manager21.c
@@ -40,8 +40,8 @@ void Manager21_Main(Manager21* this) {
                 if (object != NULL) {
                     object->actionDelay = spawnData->actionDelay;
                     object->field_0xf = count;
-                    object->x.HALF.HI = gRoomControls.roomOriginX + spawnData->x;
-                    object->y.HALF.HI = gRoomControls.roomOriginY + spawnData->y;
+                    object->x.HALF.HI = gRoomControls.origin_x + spawnData->x;
+                    object->y.HALF.HI = gRoomControls.origin_y + spawnData->y;
                     object->parent = (Entity*)this;
                     ResolveCollisionLayer(object);
                     this->field_0x20 |= 1 << count;
diff --git a/src/manager/manager22.c b/src/manager/manager22.c
index ba174d0a..b06295e2 100644
--- a/src/manager/manager22.c
+++ b/src/manager/manager22.c
@@ -11,7 +11,7 @@ ASM_FUNC("asm/non_matching/manager22/sub_0805BB00.inc", void sub_0805BB00())
 
 ASM_FUNC("asm/non_matching/manager22/sub_0805BB74.inc", void sub_0805BB74())
 
-ASM_FUNC("asm/non_matching/manager22/sub_0805BBBC.inc", void sub_0805BBBC())
+ASM_FUNC("asm/non_matching/manager22/sub_0805BBBC.inc", void UpdateLightLevel())
 
 ASM_FUNC("asm/non_matching/manager22/sub_0805BC04.inc", void sub_0805BC04())
 
diff --git a/src/manager/manager23.c b/src/manager/manager23.c
index 4fd43d8a..c38f0e8e 100644
--- a/src/manager/manager23.c
+++ b/src/manager/manager23.c
@@ -148,8 +148,8 @@ void sub_0805BEC4(Manager23* this) {
     Entity* object = CreateObject(OBJECT_2A, 1, 0);
     if (object != NULL) {
         *(s8*)(&object->flags + 1) = ((*(s8*)(&object->flags + 1)) & (-0x10)) | 3;
-        object->x.HALF.HI = this->field_0x38 + gRoomControls.roomOriginX;
-        object->y.HALF.HI = this->field_0x3a + gRoomControls.roomOriginY;
+        object->x.HALF.HI = this->field_0x38 + gRoomControls.origin_x;
+        object->y.HALF.HI = this->field_0x3a + gRoomControls.origin_y;
         object->collisionLayer = this->manager.unk_0b;
         object->spritePriority.b0 = 2;
     }
diff --git a/src/manager/manager24.c b/src/manager/manager24.c
index 1f200d47..388fd389 100644
--- a/src/manager/manager24.c
+++ b/src/manager/manager24.c
@@ -92,8 +92,8 @@ void sub_0805C050(u32 pos, u32 layer) {
         if (CheckIsInteriorWithEnemies() != 0) {
             Entity* object = CreateObject(ARCHWAY, 0xe, 0);
             if (object != NULL) {
-                object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.roomOriginX;
-                object->y.HALF.HI = ((pos & 0xfc0) >> 2) - 8 + gRoomControls.roomOriginY;
+                object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x;
+                object->y.HALF.HI = ((pos & 0xfc0) >> 2) - 8 + gRoomControls.origin_y;
             }
             SetTileType(0xb5, pos, 1);
         } else {
@@ -117,8 +117,8 @@ void sub_0805C050(u32 pos, u32 layer) {
         if (object == NULL) {
             return;
         }
-        object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.roomOriginX;
-        object->y.HALF.HI = ((pos & 0xfc0) >> 2) - 0x10 + gRoomControls.roomOriginY;
+        object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x;
+        object->y.HALF.HI = ((pos & 0xfc0) >> 2) - 0x10 + gRoomControls.origin_y;
         object->collisionLayer = 2;
     }
 }
@@ -137,8 +137,8 @@ void sub_0805C178(u32 pos, u32 layer) {
 
             object = CreateObject(ARCHWAY, 0xe, 1);
             if (object != NULL) {
-                object->x.HALF.HI = ((pos & 0x3f) << 4) + 0x18 + gRoomControls.roomOriginX;
-                object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.roomOriginY;
+                object->x.HALF.HI = ((pos & 0x3f) << 4) + 0x18 + gRoomControls.origin_x;
+                object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y;
             }
             SetTileType(0xf2, pos, 1);
         } else {
@@ -160,8 +160,8 @@ void sub_0805C178(u32 pos, u32 layer) {
         if (object == NULL) {
             return;
         }
-        object->x.HALF.HI = ((pos & 0x3f) << 4) + 0x20 + gRoomControls.roomOriginX;
-        object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.roomOriginY;
+        object->x.HALF.HI = ((pos & 0x3f) << 4) + 0x20 + gRoomControls.origin_x;
+        object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y;
         object->collisionLayer = 2;
     }
 }
@@ -178,8 +178,8 @@ void sub_0805C294(u32 pos, u32 layer) {
         if (CheckIsInteriorWithEnemies() != 0) {
             object = CreateObject(ARCHWAY, 0xe, 2);
             if (object != NULL) {
-                object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.roomOriginX;
-                object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 0x20 + gRoomControls.roomOriginY;
+                object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x;
+                object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y;
             }
             SetTileType(0xd2, pos, 1);
         } else {
@@ -201,8 +201,8 @@ void sub_0805C294(u32 pos, u32 layer) {
         if (object == NULL) {
             return;
         }
-        object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.roomOriginX;
-        object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 0x20 + gRoomControls.roomOriginY;
+        object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x;
+        object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y;
         object->collisionLayer = 2;
     }
 }
@@ -219,8 +219,8 @@ void sub_0805C3B4(u32 pos, u32 layer) {
         if (CheckIsInteriorWithEnemies() != 0) {
             object = CreateObject(ARCHWAY, 0xe, 3);
             if (object != NULL) {
-                object->x.HALF.HI = ((pos & 0x3f) << 4) + -0x10 + gRoomControls.roomOriginX;
-                object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.roomOriginY;
+                object->x.HALF.HI = ((pos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x;
+                object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y;
             }
             SetTileType(0xe5, pos, 1);
         } else {
@@ -243,8 +243,8 @@ void sub_0805C3B4(u32 pos, u32 layer) {
         if (object == NULL) {
             return;
         }
-        object->x.HALF.HI = ((pos & 0x3f) << 4) + -0x10 + gRoomControls.roomOriginX;
-        object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.roomOriginY;
+        object->x.HALF.HI = ((pos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x;
+        object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y;
         object->collisionLayer = 2;
     }
 }
@@ -261,8 +261,8 @@ void sub_0805C4E0(u32 pos, u32 layer) {
         if (CheckIsInteriorWithEnemies() != 0) {
             object = CreateObject(ARCHWAY, 0xe, 0);
             if (object != NULL) {
-                object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.roomOriginX;
-                object->y.HALF.HI = ((pos & 0xfc0) >> 2) + -0x10 + gRoomControls.roomOriginY;
+                object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x;
+                object->y.HALF.HI = ((pos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y;
             }
             SetTileType(0xc5, pos, 1);
         } else {
@@ -285,8 +285,8 @@ void sub_0805C4E0(u32 pos, u32 layer) {
         if (object == NULL) {
             return;
         }
-        object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.roomOriginX;
-        object->y.HALF.HI = ((pos & 0xfc0) >> 2) + -0x10 + gRoomControls.roomOriginY;
+        object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x;
+        object->y.HALF.HI = ((pos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y;
         object->collisionLayer = 2;
     }
 }
diff --git a/src/manager/manager26.c b/src/manager/manager26.c
index e06d36d5..5471660f 100644
--- a/src/manager/manager26.c
+++ b/src/manager/manager26.c
@@ -30,7 +30,7 @@ void sub_0805C6D0(Manager26* this) {
         DeleteManager(&this->manager);
         return;
     }
-    this->unk_2a = gRoomControls.roomOriginY + this->manager.unk_0e;
+    this->unk_2a = gRoomControls.origin_y + this->manager.unk_0e;
     this->manager.unk_0e = 0;
     this->unk_28 = 0;
     this->unk_29 = 0;
@@ -39,8 +39,8 @@ void sub_0805C6D0(Manager26* this) {
         obj = CreateObject(PUSHABLE_FURNITURE, tmp->unk_01, tmp->unk_02);
         if (obj) {
             obj->actionDelay = tmp->unk_03;
-            obj->x.HALF.HI = gRoomControls.roomOriginX + tmp->unk_04;
-            obj->y.HALF.HI = gRoomControls.roomOriginY + tmp->unk_06;
+            obj->x.HALF.HI = gRoomControls.origin_x + tmp->unk_04;
+            obj->y.HALF.HI = gRoomControls.origin_y + tmp->unk_06;
             obj->parent = (Entity*)this;
             obj->collisionLayer = 1;
             obj->field_0x82.HALF.HI = this->manager.unk_0e;
diff --git a/src/manager/manager27.c b/src/manager/manager27.c
index e8a2842d..8cd20656 100644
--- a/src/manager/manager27.c
+++ b/src/manager/manager27.c
@@ -19,9 +19,9 @@ void Manager27_Main(Entity* this) {
 
     gUnk_08108D10[this->action](this);
     if (CheckLocalFlagByBank(0x300, this->type + 0x67)) {
-        gScreenTransition.armos_data.field_0xac |= (1 << this->type);
+        gRoomTransition.armos_data.field_0xac |= (1 << this->type);
     } else {
-        gScreenTransition.armos_data.field_0xac &= ~(1 << this->type);
+        gRoomTransition.armos_data.field_0xac &= ~(1 << this->type);
     }
 }
 
diff --git a/src/manager/manager28.c b/src/manager/manager28.c
index 6280bc6e..98bfa916 100644
--- a/src/manager/manager28.c
+++ b/src/manager/manager28.c
@@ -109,8 +109,8 @@ Entity* Manager28_FindMatchingEntity(EntityData* unk1) {
     u32 x, y;
     Entity* i;
     LinkedList* tmp;
-    x = unk1->xPos + gRoomControls.roomOriginX;
-    y = unk1->yPos + gRoomControls.roomOriginY;
+    x = unk1->xPos + gRoomControls.origin_x;
+    y = unk1->yPos + gRoomControls.origin_y;
     tmp = &gEntityLists[4];
     for (i = tmp->first; (u32)i != (u32)tmp; i = i->next) {
         if (x == i->x.HALF.HI && y == i->y.HALF.HI && unk1->id == i->id && 3 == i->kind && unk1->type == i->type) {
diff --git a/src/manager/manager2B.c b/src/manager/manager2B.c
index 112390f6..c1739b88 100644
--- a/src/manager/manager2B.c
+++ b/src/manager/manager2B.c
@@ -44,8 +44,8 @@ void sub_0805D02C(Manager2B* this) {
         counter = 0;
         while (counter < 4) {
             object = CreateObject(ANGRY_STATUE, objectData[2], counter);
-            object->x.HALF.HI = objectData[0] + gRoomControls.roomOriginX;
-            object->y.HALF.HI = objectData[1] + gRoomControls.roomOriginY;
+            object->x.HALF.HI = objectData[0] + gRoomControls.origin_x;
+            object->y.HALF.HI = objectData[1] + gRoomControls.origin_y;
             object->parent = (Entity*)this;
             ResolveCollisionLayer(object);
             this->field_0x20[counter] = object;
diff --git a/src/manager/manager2C.c b/src/manager/manager2C.c
index c8b3f63d..3ad27242 100644
--- a/src/manager/manager2C.c
+++ b/src/manager/manager2C.c
@@ -20,17 +20,17 @@ void Manager2C_Main(Manager2C* manager) {
         manager->field_0x3a = 0;
     }
     if (((CheckPlayerInRegion(manager->field_0x38, manager->field_0x3a, 0x14, 0x40) != 0) &&
-         (((gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY) + gPlayerEntity.z.HALF.HI) < 0)) &&
-        (gRoomControls.roomScrollY == gRoomControls.roomOriginY)) {
-        MemClear(&gScreenTransition.player_status, 0x20);
-        gScreenTransition.transitioningOut = 1;
-        gScreenTransition.transitionType = TRANSITION_DEFAULT;
-        gScreenTransition.player_status.spawn_type = 0xb;
-        gScreenTransition.player_status.area_next = manager->manager.unk_0b;
-        gScreenTransition.player_status.room_next = manager->manager.unk_0e;
-        gScreenTransition.player_status.start_anim = manager->field_0x37;
-        gScreenTransition.player_status.start_pos_x = manager->field_0x3c;
-        gScreenTransition.player_status.start_pos_y = manager->field_0x3e;
-        gScreenTransition.player_status.layer = manager->field_0x36;
+         (((gPlayerEntity.y.HALF.HI - gRoomControls.origin_y) + gPlayerEntity.z.HALF.HI) < 0)) &&
+        (gRoomControls.scroll_y == gRoomControls.origin_y)) {
+        MemClear(&gRoomTransition.player_status, 0x20);
+        gRoomTransition.transitioningOut = 1;
+        gRoomTransition.type = TRANSITION_DEFAULT;
+        gRoomTransition.player_status.spawn_type = 0xb;
+        gRoomTransition.player_status.area_next = manager->manager.unk_0b;
+        gRoomTransition.player_status.room_next = manager->manager.unk_0e;
+        gRoomTransition.player_status.start_anim = manager->field_0x37;
+        gRoomTransition.player_status.start_pos_x = manager->field_0x3c;
+        gRoomTransition.player_status.start_pos_y = manager->field_0x3e;
+        gRoomTransition.player_status.layer = manager->field_0x36;
     }
 }
diff --git a/src/manager/manager2D.c b/src/manager/manager2D.c
index 8e1b7f65..2f64249d 100644
--- a/src/manager/manager2D.c
+++ b/src/manager/manager2D.c
@@ -4,8 +4,8 @@
 
 void Manager2D_Main(Entity* this) {
     SetTile(0x4014, 0x5c3, 1);
-    if ((gRoomControls.roomOriginY + 200 < gPlayerEntity.y.HALF.HI) &&
-        ((u32)(gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX) - 0x30 < 0x11)) {
+    if ((gRoomControls.origin_y + 200 < gPlayerEntity.y.HALF.HI) &&
+        ((u32)(gPlayerEntity.x.HALF.HI - gRoomControls.origin_x) - 0x30 < 0x11)) {
         gPlayerEntity.collisionLayer = 3;
         UpdateSpriteForCollisionLayer(&gPlayerEntity);
     }
diff --git a/src/manager/manager2F.c b/src/manager/manager2F.c
index d35c67a8..7b7285df 100644
--- a/src/manager/manager2F.c
+++ b/src/manager/manager2F.c
@@ -25,8 +25,8 @@ void Manager2F_Main(Manager* this) {
         } else {
             gRoomControls.bg3OffsetX.WORD -= 0x4000;
             gRoomControls.bg3OffsetY.WORD -= 0x2000;
-            gScreen.bg3.xOffset = gRoomControls.roomScrollX + gRoomControls.bg3OffsetX.HALF.HI;
-            gScreen.bg3.yOffset = gRoomControls.roomScrollY + gRoomControls.bg3OffsetY.HALF.HI;
+            gScreen.bg3.xOffset = gRoomControls.scroll_x + gRoomControls.bg3OffsetX.HALF.HI;
+            gScreen.bg3.yOffset = gRoomControls.scroll_y + gRoomControls.bg3OffsetY.HALF.HI;
         }
     }
 }
@@ -35,6 +35,6 @@ void sub_0805D470(Manager* this) {
     LoadGfxGroup(0x4c);
     gScreen.bg3.control = 0x1e07;
     gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
-    gScreen.bg3.xOffset = gRoomControls.roomScrollX + gRoomControls.bg3OffsetX.HALF.HI;
-    gScreen.bg3.yOffset = gRoomControls.roomScrollY + gRoomControls.bg3OffsetY.HALF.HI;
+    gScreen.bg3.xOffset = gRoomControls.scroll_x + gRoomControls.bg3OffsetX.HALF.HI;
+    gScreen.bg3.yOffset = gRoomControls.scroll_y + gRoomControls.bg3OffsetY.HALF.HI;
 }
diff --git a/src/manager/manager3.c b/src/manager/manager3.c
index 91450576..868a2e13 100644
--- a/src/manager/manager3.c
+++ b/src/manager/manager3.c
@@ -33,8 +33,8 @@ void Manager3_Main(Manager3* this) {
     s8 tmp;
     if (this->manager.action == 0) {
         this->manager.action = 1;
-        this->unk_20 = this->unk_38 + gRoomControls.roomOriginX - 0x20;
-        this->unk_24 = this->unk_3a + gRoomControls.roomOriginY - 0x20;
+        this->unk_20 = this->unk_38 + gRoomControls.origin_x - 0x20;
+        this->unk_24 = this->unk_3a + gRoomControls.origin_y - 0x20;
         return;
     }
     if (CheckPlayerProximity(this->unk_20, this->unk_24, 0x40, 0x40)) {
@@ -54,7 +54,7 @@ void Manager3_Main(Manager3* this) {
                 }
             }
             if (sub_080002C0(this->unk_38, this->unk_3a, this->manager.unk_0e) == 0x3d) {
-                CreateMagicSparkles(this->unk_38 + gRoomControls.roomOriginX, this->unk_3a + gRoomControls.roomOriginY,
+                CreateMagicSparkles(this->unk_38 + gRoomControls.origin_x, this->unk_3a + gRoomControls.origin_y,
                                     this->manager.unk_0e);
                 if (!this->manager.unk_0f) {
                     this->manager.unk_0f = 1;
diff --git a/src/manager/manager31.c b/src/manager/manager31.c
index 561319d8..8b12bd0c 100644
--- a/src/manager/manager31.c
+++ b/src/manager/manager31.c
@@ -65,8 +65,8 @@ void Manager31_Main(Manager31* this) {
                 if (object != NULL) {
                     object->actionDelay = 1;
                     object->field_0xf = count;
-                    object->x.HALF.HI = spawnData->x + gRoomControls.roomOriginX;
-                    object->y.HALF.HI = spawnData->y + gRoomControls.roomOriginY;
+                    object->x.HALF.HI = spawnData->x + gRoomControls.origin_x;
+                    object->y.HALF.HI = spawnData->y + gRoomControls.origin_y;
                     object->field_0x80.HWORD = spawnData->x;
                     object->field_0x82.HWORD = spawnData->y;
                     object->collisionLayer = 1;
diff --git a/src/manager/manager32.c b/src/manager/manager32.c
index 77e3d955..b07e57f0 100644
--- a/src/manager/manager32.c
+++ b/src/manager/manager32.c
@@ -25,7 +25,7 @@ extern void sub_0805622C(struct BgAffineDstData*, u32, u32);
 
 void Manager32_Main(Manager32* this) {
     gUnk_08108D7C[this->manager.action](this);
-    this->field_0x24 = gScreenTransition.frameCount << 4;
+    this->field_0x24 = gRoomTransition.frameCount << 4;
     sub_0805D9D8(this);
     sub_0805DA08(this->field_0x20, this->field_0x28, this->field_0x24);
 }
@@ -36,7 +36,7 @@ void sub_0805D7DC(Manager32* this) {
     this->manager.action = (this->manager.unk_0a == 0) ? 1 : 2;
     this->field_0x20 = 0;
     this->field_0x24 = 0;
-    switch (gRoomControls.areaID) {
+    switch (gRoomControls.area) {
         case 7:
         default:
             index = 0;
@@ -149,8 +149,8 @@ void sub_0805D9D8(Manager32* this) {
     // TODO find out the actual type of the parent of this manager.
     Manager* pMVar1 = this->manager.parent;
     if (pMVar1 != NULL) {
-        gScreen.bg3.xOffset = 0x80 - (*(s16*)&pMVar1[1].unk_0e - gRoomControls.roomScrollX);
-        gScreen.bg3.yOffset = 0x8c - (*(s16*)(pMVar1[1].unk_11 + 1) - gRoomControls.roomScrollY);
+        gScreen.bg3.xOffset = 0x80 - (*(s16*)&pMVar1[1].unk_0e - gRoomControls.scroll_x);
+        gScreen.bg3.yOffset = 0x8c - (*(s16*)(pMVar1[1].unk_11 + 1) - gRoomControls.scroll_y);
     }
 }
 
diff --git a/src/manager/manager33.c b/src/manager/manager33.c
index 63f3c533..de58fb00 100644
--- a/src/manager/manager33.c
+++ b/src/manager/manager33.c
@@ -6,9 +6,9 @@
 
 void Manager33_Main(Manager* this) {
     RoomControls* roomControls = &gRoomControls;
-    u32 a = roomControls->roomOriginX + 0x1f8;
+    u32 a = roomControls->origin_x + 0x1f8;
     u32 x = (a - gPlayerEntity.x.HALF.HI) + 0x10;
-    u32 b = roomControls->roomOriginY + 0x140;
+    u32 b = roomControls->origin_y + 0x140;
     u32 y = (b - gPlayerEntity.y.HALF.HI) + 0x10;
     if (this->action == 0) {
         if (x < 0x20 && y < 0x20 && gPlayerEntity.z.HALF.HI < -0x18 && gPlayerState.framestate == PL_STATE_CAPE) {
@@ -20,8 +20,8 @@ void Manager33_Main(Manager* this) {
         if (--this->unk_0e == 0) {
             Entity* object = CreateObject(OBJECT_96, 1, 0);
             if (object != NULL) {
-                object->x.HALF.HI = roomControls->roomOriginX + 0x1f8;
-                object->y.HALF.HI = roomControls->roomOriginY + 0x140;
+                object->x.HALF.HI = roomControls->origin_x + 0x1f8;
+                object->y.HALF.HI = roomControls->origin_y + 0x140;
                 object->z.HALF.HI = 0xffe8;
             }
             DeleteThisEntity();
diff --git a/src/manager/manager34.c b/src/manager/manager34.c
index e811aaea..ae12a2e2 100644
--- a/src/manager/manager34.c
+++ b/src/manager/manager34.c
@@ -22,7 +22,7 @@ void Manager34_Main(Manager34* this) {
 
 void sub_0805DBB4(Manager34* this) {
     this->manager.action = 1;
-    this->field_0x20 = gScreenTransition.field_0x3d * 0x3c;
+    this->field_0x20 = gRoomTransition.field_0x3d * 0x3c;
 }
 
 void sub_0805DBCC(Manager34* this) {
diff --git a/src/manager/manager35.c b/src/manager/manager35.c
index 599cdd9f..49083531 100644
--- a/src/manager/manager35.c
+++ b/src/manager/manager35.c
@@ -41,13 +41,13 @@ void sub_0805DCC8(Manager35* this) {
         if (this->manager.unk_0e == 0) {
             this->manager.unk_0e = 0x1e;
         }
-        this->manager.parent = (Manager*)gRoomControls.cameraTarget;
+        this->manager.parent = (Manager*)gRoomControls.camera_target;
         object = CreateObject(OBJECT_69, 0, 0);
         if (object != NULL) {
-            object->x.HALF.HI = this->field_0x38 + gRoomControls.roomOriginX;
-            object->y.HALF.HI = this->field_0x3a + gRoomControls.roomOriginY;
+            object->x.HALF.HI = this->field_0x38 + gRoomControls.origin_x;
+            object->y.HALF.HI = this->field_0x3a + gRoomControls.origin_y;
             *(Entity**)this->manager.unk_18 = object;
-            gRoomControls.cameraTarget = object;
+            gRoomControls.camera_target = object;
             RequestPriorityDuration(object, 0x1e);
         }
     }
@@ -68,7 +68,7 @@ void sub_0805DD68(Manager35* this) {
     RequestPriorityDuration(0, 8);
     if (this->field_0x36 != 0) {
         if (--this->field_0x36 == 0) {
-            gRoomControls.cameraTarget = (Entity*)this->manager.parent;
+            gRoomControls.camera_target = (Entity*)this->manager.parent;
         }
     } else {
         if ((gRoomControls.scroll_flags & 4) == 0) {
diff --git a/src/manager/manager37.c b/src/manager/manager37.c
index 8140ac22..348339ba 100644
--- a/src/manager/manager37.c
+++ b/src/manager/manager37.c
@@ -33,10 +33,10 @@ void sub_0805DE68(Manager* this) {
         DeleteThisEntity();
     }
     this->action = 1;
-    gScreenTransition.field_0x38 = 0;
-    gScreenTransition.field_0x39 = 0x0f;
-    *(u8*)&gScreenTransition.field_0x3a = 0x20;
-    *((u8*)&gScreenTransition.field_0x3a + 1) = 0x20;
+    gRoomTransition.field_0x38 = 0;
+    gRoomTransition.field_0x39 = 0x0f;
+    *(u8*)&gRoomTransition.field_0x3a = 0x20;
+    *((u8*)&gRoomTransition.field_0x3a + 1) = 0x20;
 #if !defined(EU) && !defined(JP)
     gSave.unk48C[3] = 0x1194;
 #endif
@@ -47,8 +47,8 @@ void sub_0805DEB8(Manager* this) {
     s32 distY;
     Entity* object;
 
-    distX = gPlayerEntity.x.HALF.HI - (gRoomControls.roomOriginX + 0x88);
-    distY = gPlayerEntity.y.HALF.HI - (gRoomControls.roomOriginY + 0x40);
+    distX = gPlayerEntity.x.HALF.HI - (gRoomControls.origin_x + 0x88);
+    distY = gPlayerEntity.y.HALF.HI - (gRoomControls.origin_y + 0x40);
     if (distX * distX + distY * distY < 0x901) {
         this->action = 2;
         this->unk_0d = 0;
@@ -57,8 +57,8 @@ void sub_0805DEB8(Manager* this) {
         sub_08078B48();
         object = CreateObject(OBJECT_64, 0, 0);
         if (object != NULL) {
-            object->x.HALF.HI = gRoomControls.roomOriginX + 0x88;
-            object->y.HALF.HI = gRoomControls.roomOriginY + 0x48;
+            object->x.HALF.HI = gRoomControls.origin_x + 0x88;
+            object->y.HALF.HI = gRoomControls.origin_y + 0x48;
         }
         object = CreateSpeechBubbleExclamationMark(&gPlayerEntity, 8, 0xfffffff0);
         if (object != NULL) {
@@ -71,8 +71,8 @@ void sub_0805DEB8(Manager* this) {
 void sub_0805DF4C(Manager* this) {
     gPlayerEntity.animationState = 0;
     if (gPlayerEntity.z.HALF.HI != 0) {
-        if (gPlayerEntity.y.HALF.HI < (gRoomControls.roomOriginY + 0x48)) {
-            gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x48;
+        if (gPlayerEntity.y.HALF.HI < (gRoomControls.origin_y + 0x48)) {
+            gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x48;
         }
     } else {
         if (--this->unk_0e == 0) {
@@ -109,11 +109,11 @@ void sub_0805DFE8(Manager* this) {
 void sub_0805E000(Manager* this) {
     Entity* enemy = CreateEnemy(VAATI_WRATH, 0);
     if (enemy != NULL) {
-        enemy->x.HALF.HI = gRoomControls.roomOriginX + 0xb0;
-        enemy->y.HALF.HI = gRoomControls.roomOriginY + 0x48;
+        enemy->x.HALF.HI = gRoomControls.origin_x + 0xb0;
+        enemy->y.HALF.HI = gRoomControls.origin_y + 0x48;
         enemy->collisionLayer = 1;
         UpdateSpriteForCollisionLayer(enemy);
-        if ((gScreenTransition.field_0x38 & 1) != 0) {
+        if ((gRoomTransition.field_0x38 & 1) != 0) {
             DeleteThisEntity();
         }
         *(Entity**)this->unk_18 = enemy;
@@ -134,5 +134,5 @@ void sub_0805E078(Manager* this) {
 
 void sub_0805E094(void) {
     SetInitializationPriority();
-    sub_0808091C((ScreenTransitionData*)&gUnk_0813AC34, 7);
+    sub_0808091C((ScreenTransitionData*)&gUnk_0813AC34, TRANSITION_7);
 }
diff --git a/src/manager/manager39.c b/src/manager/manager39.c
index b43de6e8..ffa4bb4e 100644
--- a/src/manager/manager39.c
+++ b/src/manager/manager39.c
@@ -36,7 +36,7 @@ void sub_0805E1F8(u32, u32);
 
 void Manager39_Main(Manager39* this) {
     gUnk_08108E28[this->manager.action](this);
-    if ((gRoomControls.roomID != this->unk_20) || (gMessage.doTextBox & 0x7F)) {
+    if ((gRoomControls.room != this->unk_20) || (gMessage.doTextBox & 0x7F)) {
         sub_0805E1D8(this);
     }
 }
@@ -44,7 +44,7 @@ void Manager39_Main(Manager39* this) {
 void sub_0805E140(Manager39* this) {
     this->manager.unk_10 |= 0x20;
     this->manager.action = 1;
-    this->unk_20 = gRoomControls.roomID;
+    this->unk_20 = gRoomControls.room;
     this->manager.unk_0e = 0x78;
     this->manager.unk_0f = 0x3c;
     SetDefaultPriority((Entity*)this, PRIO_HIGHEST);
diff --git a/src/manager/manager4.c b/src/manager/manager4.c
index 48223e88..e287d521 100644
--- a/src/manager/manager4.c
+++ b/src/manager/manager4.c
@@ -18,29 +18,29 @@ extern DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance*, int);
 
 void sub_0805786C(Manager* this) {
     DiggingCaveEntrance* tmp;
-    u8 roomID;
-    u8 areaID;
+    u8 room;
+    u8 area;
     u16 uVar = 0x81 << 7;
     sub_080805F8();
     if (gUnk_03004030.unk_08 != 0) {
         if (gUnk_03004030.unk_00 == 0) {
             gUnk_03004030.unk_0a = 0xFF;
-            roomID = gRoomControls.roomID;
-            tmp = diggingCaveEntrances[gRoomControls.areaID];
-            tmp = sub_08057AA8(tmp, roomID);
+            room = gRoomControls.room;
+            tmp = diggingCaveEntrances[gRoomControls.area];
+            tmp = sub_08057AA8(tmp, room);
             if (tmp != 0) {
-                roomID = tmp->target_roomID;
-                tmp = diggingCaveEntrances[tmp->target_areaID];
-                tmp = sub_08057AA8(tmp, roomID);
+                room = tmp->target_room;
+                tmp = diggingCaveEntrances[tmp->target_area];
+                tmp = sub_08057AA8(tmp, room);
                 if (tmp != 0) {
                     gUnk_03004030.unk_00 = tmp;
                 }
             }
         }
-        roomID = gRoomControls.roomID;
-        tmp = diggingCaveEntrances[gRoomControls.areaID];
+        room = gRoomControls.room;
+        tmp = diggingCaveEntrances[gRoomControls.area];
         uVar = 0x81 << 7;
-        for (tmp = sub_08057AA8(tmp, roomID); tmp != 0; tmp = sub_08057AA8(tmp, roomID)) {
+        for (tmp = sub_08057AA8(tmp, room); tmp != 0; tmp = sub_08057AA8(tmp, room)) {
             SetTile(uVar, tmp->unk_00 + 0x3F, 1);
             SetTile(uVar, tmp->unk_00 + 0x40, 1);
             SetTile(uVar, tmp->unk_00 + 0x41, 1);
@@ -54,10 +54,10 @@ extern u32 sub_0805795C(Manager*, DiggingCaveEntrance*);
 
 void sub_08057920(Manager* this) {
     DiggingCaveEntrance* tmp;
-    u8 roomID;
-    roomID = gRoomControls.roomID;
-    for (tmp = diggingCaveEntrances[gRoomControls.areaID];
-         (tmp = sub_08057AA8(tmp, roomID)) != 0 && !sub_0805795C(this, tmp); tmp++)
+    u8 room;
+    room = gRoomControls.room;
+    for (tmp = diggingCaveEntrances[gRoomControls.area];
+         (tmp = sub_08057AA8(tmp, room)) != 0 && !sub_0805795C(this, tmp); tmp++)
         ;
 }
 
@@ -67,8 +67,8 @@ u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
     u16 offsetX, offsetY, offsetX2, offsetY2;
     u32 tmp, tmp2;
     if (gUnk_03004030.unk_08) {
-        offsetX = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX;
-        offsetY = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY;
+        offsetX = gPlayerEntity.x.HALF.HI - gRoomControls.origin_x;
+        offsetY = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y;
         offsetX2 = (entr->unk_00 & 0x3F) * 16 + 8;
         offsetY2 = ((entr->unk_00 & 0xFC0) >> 6) * 16 + 0x18;
         tmp = offsetX - offsetX2;
@@ -81,7 +81,7 @@ u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
     } else {
         if (COORD_TO_TILE(&gPlayerEntity) != entr->unk_00)
             return 0;
-        offsetY2 = gRoomControls.roomOriginY + ((entr->unk_00 >> 6) << 4) + 6;
+        offsetY2 = gRoomControls.origin_y + ((entr->unk_00 >> 6) << 4) + 6;
         if (gPlayerEntity.y.HALF.HI >= offsetY2)
             return 0;
         sub_08057A18(this, entr);
@@ -98,29 +98,29 @@ void sub_08057A18(Manager* this, DiggingCaveEntrance* entr) {
     u16 tmp;
     SetInitializationPriority();
     gUnk_03004030.unk_0a = gUnk_03004030.unk_09;
-    gUnk_03004030.unk_09 = gRoomControls.areaID;
-    gScreenTransition.player_status.area_next = entr->target_areaID;
-    gScreenTransition.player_status.room_next = entr->target_roomID;
-    gRoomControls.areaID = entr->target_areaID;
-    gRoomControls.roomID = entr->target_roomID;
+    gUnk_03004030.unk_09 = gRoomControls.area;
+    gRoomTransition.player_status.area_next = entr->target_area;
+    gRoomTransition.player_status.room_next = entr->target_room;
+    gRoomControls.area = entr->target_area;
+    gRoomControls.room = entr->target_room;
     gUnk_03004030.unk_00 = entr;
-    gUnk_03004030.unk_04 = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX - ((entr->unk_00 & 0x3F) * 16);
-    gUnk_03004030.unk_06 = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY - ((entr->unk_00 & 0xFC0) >> 2);
+    gUnk_03004030.unk_04 = gPlayerEntity.x.HALF.HI - gRoomControls.origin_x - ((entr->unk_00 & 0x3F) * 16);
+    gUnk_03004030.unk_06 = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y - ((entr->unk_00 & 0xFC0) >> 2);
     tmp = gUnk_03004030.unk_08;
     if (!tmp) {
-        if ((entr->target_roomID | 0x80) != gUnk_03004030.unk_0b) {
+        if ((entr->target_room | 0x80) != gUnk_03004030.unk_0b) {
             gUnk_02034480.unk_00 = gUnk_03004030.unk_08;
         }
-        gUnk_03004030.unk_0b = entr->target_roomID | 0x80;
+        gUnk_03004030.unk_0b = entr->target_room | 0x80;
     }
     sub_08080930(entr->unk_03);
     DeleteManager(this);
 }
 #endif
 
-DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance* entr, int roomID) {
+DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance* entr, int room) {
     for (; entr->unk_00 != 0xFFFF; entr++) {
-        if (entr->source_roomID == roomID)
+        if (entr->source_room == room)
             return entr;
     }
     return 0;
diff --git a/src/manager/manager7.c b/src/manager/manager7.c
index 45ff72a4..ba3e03a2 100644
--- a/src/manager/manager7.c
+++ b/src/manager/manager7.c
@@ -74,7 +74,7 @@ void Manager7_Main(Manager7* this) {
             this->manager.unk_0e = 0;
         }
     }
-    if (gRoomControls.unk2)
+    if (gRoomControls.reload_flags)
         return;
 #ifndef JP
     tmp = this->unk_20;
diff --git a/src/manager/manager8.c b/src/manager/manager8.c
index 04a5b954..f3fbffa9 100644
--- a/src/manager/manager8.c
+++ b/src/manager/manager8.c
@@ -41,10 +41,10 @@ extern u8 gUnk_02006F00[];
 
 void sub_08057F20(Manager8* this) {
     u32 tmp;
-    tmp = gRoomControls.roomScrollX - gRoomControls.roomOriginX;
+    tmp = gRoomControls.scroll_x - gRoomControls.origin_x;
     tmp = tmp + (tmp >> 3) + ((0x400 - gRoomControls.width) / 2);
     gScreen.bg3.xOffset = tmp & 0xF;
-    gScreen.bg3.yOffset = 0x30 - ((0x30 - (gRoomControls.roomScrollY - gRoomControls.roomOriginY)) >> 2);
+    gScreen.bg3.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 2);
     gScreen.bg3.tilemap = gBG3Buffer;
     sub_08058004(tmp, gUnk_02006F00, gBG3Buffer);
     tmp = ((tmp >> 4) << 1);
@@ -52,10 +52,10 @@ void sub_08057F20(Manager8* this) {
         this->unk_38 = tmp;
         gScreen.bg3.updated = 1;
     }
-    tmp = (gRoomControls.roomScrollX - gRoomControls.roomOriginX);
+    tmp = (gRoomControls.scroll_x - gRoomControls.origin_x);
     tmp = tmp + (tmp >> 2) + ((0x400 - gRoomControls.width) / 2);
     gScreen.bg1.xOffset = tmp & 0xF;
-    gScreen.bg1.yOffset = 0x30 - ((0x30 - (gRoomControls.roomScrollY - gRoomControls.roomOriginY)) >> 1);
+    gScreen.bg1.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 1);
     gScreen.bg1.tilemap = gBG3Buffer + 0x400;
     sub_08058004(tmp, gUnk_02006F00 + 0x2000, gBG3Buffer + 0x400);
     tmp = ((tmp >> 4) << 1);
@@ -110,19 +110,19 @@ void sub_080580B0(u32 unk1) {
     LoadGfxGroup(unk1);
     gRoomVars.unk_10[0] = unk1;
     sub_08058034();
-    tmp = gRoomControls.roomScrollX - gRoomControls.roomOriginX; // r7
+    tmp = gRoomControls.scroll_x - gRoomControls.origin_x; // r7
     tmp = tmp + (tmp >> 3) + (0x400 - gRoomControls.width) / 2;
     sub_08058004(tmp, gUnk_02006F00, gBG3Buffer);
     gScreen.bg3.xOffset = tmp & 0xF;
-    gScreen.bg3.yOffset = 0x30 - ((0x30 - (gRoomControls.roomScrollY - gRoomControls.roomOriginY)) >> 1); //?
+    gScreen.bg3.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 1); //?
     gScreen.bg3.control = 0x1D09;
     gScreen.bg3.tilemap = gBG3Buffer;
     gScreen.bg3.updated = 1;
-    tmp = gRoomControls.roomScrollX - gRoomControls.roomOriginX; // r7
+    tmp = gRoomControls.scroll_x - gRoomControls.origin_x; // r7
     tmp = tmp + (tmp >> 2) + (0x400 - gRoomControls.width) / 2;
     sub_08058004(tmp, gUnk_02006F00 + 0x2000, gBG3Buffer + 0x400);
     gScreen.bg1.xOffset = tmp & 0xF;
-    gScreen.bg1.yOffset = 0x30 - ((0x30 - (gRoomControls.roomScrollY - gRoomControls.roomOriginY)) >> 1); //?
+    gScreen.bg1.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 1); //?
     gScreen.bg1.control = 0x1E09;
     gScreen.bg1.tilemap = gBG3Buffer + 0x400;
     gScreen.bg1.updated = 1;
diff --git a/src/manager/manager9.c b/src/manager/manager9.c
index c16fefa0..4e992f59 100644
--- a/src/manager/manager9.c
+++ b/src/manager/manager9.c
@@ -47,9 +47,9 @@ u32 sub_08058244(int i) {
     s32 tmp2;
     u32 tmp3;
     s32 tmp4;
-    tmp = ((gRoomControls.roomScrollY - gRoomControls.roomOriginY) * 0x20) / (gRoomControls.height - 0xa0);
-    gScreen.bg1.yOffset = gRoomControls.roomOriginY + tmp;
-    tmp = (((gRoomControls.roomScrollX - gRoomControls.roomOriginX) * gUnk_081081EC[i]) / (gRoomControls.width - 0xf0));
+    tmp = ((gRoomControls.scroll_y - gRoomControls.origin_y) * 0x20) / (gRoomControls.height - 0xa0);
+    gScreen.bg1.yOffset = gRoomControls.origin_y + tmp;
+    tmp = (((gRoomControls.scroll_x - gRoomControls.origin_x) * gUnk_081081EC[i]) / (gRoomControls.width - 0xf0));
     gScreen.bg1.xOffset = tmp & 0xf;
     return tmp;
 }
diff --git a/src/manager/managerC.c b/src/manager/managerC.c
index e8790891..fedd7800 100644
--- a/src/manager/managerC.c
+++ b/src/manager/managerC.c
@@ -77,7 +77,7 @@ void sub_08058894(ManagerC* this) {
 void sub_080588CC(ManagerC* this) {
     sub_08058CFC();
     sub_08058A04(this);
-    if (gScreenTransition.transitioningOut) {
+    if (gRoomTransition.transitioningOut) {
         this->manager.action = 2;
     } else {
         sub_080588F8(this);
@@ -111,7 +111,7 @@ void sub_080588F8(ManagerC* this) {
         }
     }
     if (this->manager.unk_0e) {
-        s32 tmp = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY;
+        s32 tmp = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y;
         u32 tmp2;
         tmp2 = (((unsigned)(tmp - 0x50 < 0 ? 0x50 - tmp : tmp - 0x50) >> 3) * 0x3000) + 0x4000;
         if (this->manager.unk_0f == 0) {
@@ -152,14 +152,14 @@ const struct_08108228 gUnk_081082B8[6] = { { 0xA0, 0x88, 0x20, 0x0A }, { 0x9E, 0
                                            { 0x98, 0x64, 0x1E, 0x1E }, { 0x98, 0x6A, 0x1C, 0x10 } };
 
 void sub_08058A04(ManagerC* this) {
-    s32 tmp = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX;
-    s32 tmp2 = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY;
+    s32 tmp = gPlayerEntity.x.HALF.HI - gRoomControls.origin_x;
+    s32 tmp2 = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y;
     if ((this->unk_20 - 0x118 < 0xDu) && CheckGlobalFlag(LV1TARU_OPEN) && (tmp - 0x6d < 0x17u) &&
         (tmp2 - 0x45 < 0x17u) && (gPlayerEntity.z.HALF.HI == 0)) {
         gPlayerState.queued_action = PLAYER_FALL;
         gPlayerState.field_0x38 = 0;
-        gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x78;
-        gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x50;
+        gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0x78;
+        gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x50;
         return;
     }
     if (tmp < 0x78) {
@@ -194,8 +194,8 @@ u32 sub_08058B08(ManagerC* this, u32 unk1, u32 unk2, const struct_08108228* unk3
         tmp -= unk1;
         tmp >>= 3;
         unk3 += tmp;
-        tmp2 = (gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX - unk3->unk_0);
-        tmp3 = (gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY - unk3->unk_2);
+        tmp2 = (gPlayerEntity.x.HALF.HI - gRoomControls.origin_x - unk3->unk_0);
+        tmp3 = (gPlayerEntity.y.HALF.HI - gRoomControls.origin_y - unk3->unk_2);
         return ((tmp2 < unk3->unk_4) && (tmp3 < unk3->unk_6));
     }
 }
@@ -203,14 +203,14 @@ u32 sub_08058B08(ManagerC* this, u32 unk1, u32 unk2, const struct_08108228* unk3
 const u16 gUnk_081082E8[0xC] = { 0xB8, 0x80, 0x0, 0xB8, 0x110, 0x2, 0x118, 0x80, 0x2, 0x118, 0x110, 0x0 };
 
 void sub_08058B5C(ManagerC* this, u32 unk1) {
-    gScreenTransition.transitioningOut = 1;
-    gScreenTransition.transitionType = TRANSITION_DEFAULT;
-    gScreenTransition.player_status.spawn_type = 4;
-    gScreenTransition.player_status.area_next = gRoomControls.areaID;
-    gScreenTransition.player_status.room_next = 6;
-    gScreenTransition.player_status.start_anim = unk1 & 1 ? 4 : 0;
-    gScreenTransition.player_status.start_pos_x = gUnk_081082E8[unk1 * 3];
-    gScreenTransition.player_status.start_pos_y = gUnk_081082E8[unk1 * 3 + 1];
+    gRoomTransition.transitioningOut = 1;
+    gRoomTransition.type = TRANSITION_DEFAULT;
+    gRoomTransition.player_status.spawn_type = 4;
+    gRoomTransition.player_status.area_next = gRoomControls.area;
+    gRoomTransition.player_status.room_next = 6;
+    gRoomTransition.player_status.start_anim = unk1 & 1 ? 4 : 0;
+    gRoomTransition.player_status.start_pos_x = gUnk_081082E8[unk1 * 3];
+    gRoomTransition.player_status.start_pos_y = gUnk_081082E8[unk1 * 3 + 1];
     gSave.unk7 = gUnk_081082E8[unk1 * 3 + 2];
     SoundReq(SFX_STAIRS);
 }
@@ -250,8 +250,8 @@ void sub_08058BC8(ManagerC* this) {
 const u16 gUnk_08108300[4] = { 0xA4, 0x4C, 0xF4, 0x9C };
 
 void sub_08058CB0(ManagerC* this) {
-    u32 tmp = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX;
-    u32 tmp2 = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY;
+    u32 tmp = gPlayerEntity.x.HALF.HI - gRoomControls.origin_x;
+    u32 tmp2 = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y;
     u32 tmp3;
     if (tmp < 0x78) {
         tmp3 = 1;
@@ -268,7 +268,7 @@ void sub_08058CB0(ManagerC* this) {
 }
 
 void sub_08058CFC() {
-    u32 tmp = gPlayerEntity.y.HALF.HI - gRoomControls.roomScrollY;
+    u32 tmp = gPlayerEntity.y.HALF.HI - gRoomControls.scroll_y;
     if (tmp < 0x4C) {
         sub_080044AE(&gPlayerEntity, 0xC0, 0x10);
     }
diff --git a/src/manager/managerF.c b/src/manager/managerF.c
index 82b33d19..dd27ac02 100644
--- a/src/manager/managerF.c
+++ b/src/manager/managerF.c
@@ -127,8 +127,8 @@ void sub_08058F84(u32 unk0, u32 unk1) {
     tmp = CreateObject(OBJECT_21, 0, 0);
     if (!tmp)
         return;
-    tmp->x.HALF.HI = gRoomControls.roomOriginX + unk0;
-    tmp->y.HALF.HI = gRoomControls.roomOriginY + unk1;
+    tmp->x.HALF.HI = gRoomControls.origin_x + unk0;
+    tmp->y.HALF.HI = gRoomControls.origin_y + unk1;
 }
 
 void sub_08058FB0(ManagerF* this) {
@@ -180,8 +180,8 @@ void sub_08059064(ManagerF* this) {
     if (!tmp)
         return;
     tmp->actionDelay = 2;
-    tmp->x.HALF.HI = this->unk_38 + gRoomControls.roomOriginX;
-    tmp->y.HALF.HI = this->unk_3a + gRoomControls.roomOriginY;
+    tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x;
+    tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y;
 }
 
 void sub_08059094(ManagerF* this) {
@@ -294,7 +294,7 @@ void sub_08059278() {
 
 void sub_08059290(ManagerF* this) {
     this->manager.action = 1;
-    gRoomControls.cameraTarget = &gPlayerEntity;
+    gRoomControls.camera_target = &gPlayerEntity;
 }
 
 void sub_080592A4(ManagerF* this) {
@@ -329,8 +329,8 @@ void sub_0805930C(ManagerF* this) {
 #endif
     if (!tmp)
         return;
-    tmp->x.HALF.HI = this->unk_38 + gRoomControls.roomOriginX;
-    tmp->y.HALF.HI = this->unk_3a + gRoomControls.roomOriginY;
+    tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x;
+    tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y;
     tmp->collisionLayer = 1;
 }
 
@@ -351,7 +351,7 @@ void sub_08059368(ManagerF* this) {
 void sub_0805938C(ManagerF* this) {
     if (sub_080593CC(this)) {
         if (++this->manager.unk_0e >= 8) {
-            sub_080806BC(this->unk_38 - gRoomControls.roomOriginX, this->unk_3a - gRoomControls.roomOriginY, 0xFF, 0xA);
+            sub_080806BC(this->unk_38 - gRoomControls.origin_x, this->unk_3a - gRoomControls.origin_y, 0xFF, 0xA);
         }
     } else {
         this->manager.unk_0e = 0;
@@ -377,8 +377,8 @@ void sub_08059424(ManagerF* this) {
     if (!tmp)
         return;
     tmp->collisionLayer = 2;
-    tmp->x.HALF.HI = this->unk_38 + gRoomControls.roomOriginX;
-    tmp->y.HALF.HI = this->unk_3a + gRoomControls.roomOriginY;
+    tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x;
+    tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y;
     EnqueueSFX(0x1B0);
     DeleteThisEntity();
 }
@@ -386,10 +386,10 @@ void sub_08059424(ManagerF* this) {
 void sub_0805947C(ManagerF* this) {
     if (!CheckFlags(this->unk_3e)) {
         SetPlayerControl(3);
-        if (gRoomControls.unk2)
+        if (gRoomControls.reload_flags)
             return;
         if (gRoomVars.field_0x0) {
-            StartPlayerScript(gUnk_08108380[gRoomControls.unk_10]);
+            StartPlayerScript(gUnk_08108380[gRoomControls.scroll_direction]);
         } else {
             StartPlayerScript(gUnk_08108380[gPlayerEntity.animationState >> 1]);
         }