Merge branch 'master' into enemies

6 files changed, 20 insertions, 20 deletions

diff --git a/src/manager/horizontalMinishPathBackgroundManager.c b/src/manager/horizontalMinishPathBackgroundManager.c
index f2a8b1fb..a407e50e 100644
--- a/src/manager/horizontalMinishPathBackgroundManager.c
+++ b/src/manager/horizontalMinishPathBackgroundManager.c
@@ -29,7 +29,7 @@ void HorizontalMinishPathBackgroundManager_Main(HorizontalMinishPathBackgroundMa
 }
 
 void sub_08057EFC(void* this) {
-    LoadGfxGroup((u32)gRoomVars.unk_10[0]);
+    LoadGfxGroup((u32)gRoomVars.graphicsGroups[0]);
     sub_08058034();
     ((HorizontalMinishPathBackgroundManager*)this)->unk_3c = 0;
     ((HorizontalMinishPathBackgroundManager*)this)->unk_38 = 0;
@@ -103,7 +103,7 @@ void sub_080580B0(u32 unk1) {
     gMapTop.bgSettings = 0;
     REG_DISPCNT = 0;
     LoadGfxGroup(unk1);
-    gRoomVars.unk_10[0] = unk1;
+    gRoomVars.graphicsGroups[0] = unk1;
     sub_08058034();
     tmp = gRoomControls.scroll_x - gRoomControls.origin_x;
     tmp = tmp + (tmp >> 3) + (0x400 - gRoomControls.width) / 2;
diff --git a/src/manager/hyruleTownTilesetManager.c b/src/manager/hyruleTownTilesetManager.c
index 9797a0c2..b3ce85a5 100644
--- a/src/manager/hyruleTownTilesetManager.c
+++ b/src/manager/hyruleTownTilesetManager.c
@@ -72,9 +72,9 @@ void HyruleTownTilesetManager_Main(HyruleTownTilesetManager* this) {
 }
 
 void sub_08059A2C(HyruleTownTilesetManager* this) {
-    gRoomVars.unk_10[2] = 0xff;
-    gRoomVars.unk_10[1] = 0xff;
-    gRoomVars.unk_10[0] = 0xff;
+    gRoomVars.graphicsGroups[2] = 0xff;
+    gRoomVars.graphicsGroups[1] = 0xff;
+    gRoomVars.graphicsGroups[0] = 0xff;
     this->field_0x22 = 0xff;
     this->field_0x21 = 0xff;
     this->field_0x20 = 0xff;
@@ -147,8 +147,8 @@ bool32 sub_08059C8C(HyruleTownTilesetManager* this, u32 param_2, u8* param_3, co
     bool32 bVar2;
 
     *param_3 = CheckRegionsOnScreen(param_4);
-    if ((*param_3 != 0xff) && (gRoomVars.unk_10[param_2] != *param_3)) {
-        gRoomVars.unk_10[param_2] = *param_3;
+    if ((*param_3 != 0xff) && (gRoomVars.graphicsGroups[param_2] != *param_3)) {
+        gRoomVars.graphicsGroups[param_2] = *param_3;
         return TRUE;
     } else {
         return FALSE;
@@ -158,7 +158,7 @@ bool32 sub_08059C8C(HyruleTownTilesetManager* this, u32 param_2, u8* param_3, co
 void sub_08059CC0(u32 param_1, u32 param_2) {
     const Unknown* unknown;
 
-    gRoomVars.unk_10[param_1] = param_2;
+    gRoomVars.graphicsGroups[param_1] = param_2;
     if (gRoomControls.area != AREA_FESTIVAL_TOWN) {
         unknown = &gUnk_08108408[param_2];
     } else {
diff --git a/src/manager/minishVillageTilesetManager.c b/src/manager/minishVillageTilesetManager.c
index 225ba477..055e78b0 100644
--- a/src/manager/minishVillageTilesetManager.c
+++ b/src/manager/minishVillageTilesetManager.c
@@ -69,7 +69,7 @@ void MinishVillageTilesetManager_Main(MinishVillageTilesetManager* this) {
         return;
 
     if (sub_08057E40(this)) {
-        tmp = (u32)gRoomVars.unk_10[0];
+        tmp = (u32)gRoomVars.graphicsGroups[0];
         if (this->unk_20 != tmp) {
             this->unk_20 = tmp;
             super->timer = 0;
@@ -115,7 +115,7 @@ void MinishVillageTilesetManager_Main(MinishVillageTilesetManager* this) {
         RegisterTransitionManager(this, sub_08057E30, 0);
     }
     if (sub_08057E40(this)) {
-        tmp = (u32)gRoomVars.unk_10[0];
+        tmp = (u32)gRoomVars.graphicsGroups[0];
         if (this->unk_20 != tmp) {
             this->unk_20 = tmp;
             super->timer = 0;
@@ -153,13 +153,13 @@ void MinishVillageTilesetManager_Main(MinishVillageTilesetManager* this) {
 #endif
 
 void sub_08057E30(void* this) {
-    sub_08057E7C(gRoomVars.unk_10[0]);
+    sub_08057E7C(gRoomVars.graphicsGroups[0]);
 }
 
 bool32 sub_08057E40(MinishVillageTilesetManager* this) {
     u32 tmp = CheckRegionsOnScreen(gUnk_08108050);
     if (tmp != 0xFF) {
-        gRoomVars.unk_10[0] = tmp;
+        gRoomVars.graphicsGroups[0] = tmp;
         return TRUE;
     } else {
         return FALSE;
@@ -187,5 +187,5 @@ void sub_08057E7C(u32 unk1) {
     for (tmp = 0; tmp < 8; tmp++, tmp2 += 2) {
         DmaCopy32(3, &gGlobalGfxAndPalettes[tmp2[0]], tmp2[1], 0x400 * 4);
     }
-    gRoomVars.unk_10[0] = unk1;
+    gRoomVars.graphicsGroups[0] = unk1;
 }
diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c
index c250e517..60bed46c 100644
--- a/src/manager/miscManager.c
+++ b/src/manager/miscManager.c
@@ -392,7 +392,7 @@ void MiscManager_TypeD(MiscManager* this) {
         SetPlayerControl(3);
         if (gRoomControls.reload_flags)
             return;
-        if (gRoomVars.field_0x0) {
+        if (gRoomVars.didEnterScrolling) {
             StartPlayerScript(gUnk_08108380[gRoomControls.scroll_direction]);
         } else {
             StartPlayerScript(gUnk_08108380[gPlayerEntity.base.animationState >> 1]);
diff --git a/src/manager/verticalMinishPathBackgroundManager.c b/src/manager/verticalMinishPathBackgroundManager.c
index d2978bb7..e67cde8d 100644
--- a/src/manager/verticalMinishPathBackgroundManager.c
+++ b/src/manager/verticalMinishPathBackgroundManager.c
@@ -51,7 +51,7 @@ void sub_080575C8(u32 param) {
     gMapTop.bgSettings = 0;
     REG_DISPCNT = 0;
     LoadGfxGroup(param);
-    gRoomVars.unk_10[0] = param;
+    gRoomVars.graphicsGroups[0] = param;
 
     bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y);
     bgOffset += bgOffset >> 3;
@@ -80,7 +80,7 @@ void sub_08057688(void) {
 }
 
 void sub_080576A0(void* this) {
-    LoadGfxGroup(gRoomVars.unk_10[0]);
+    LoadGfxGroup(gRoomVars.graphicsGroups[0]);
     ((VerticalMinishPathBackgroundManager*)this)->field_0x38 = NULL;
     ((VerticalMinishPathBackgroundManager*)this)->field_0x3c = NULL;
     sub_0805754C((VerticalMinishPathBackgroundManager*)this);
diff --git a/src/manager/weatherChangeManager.c b/src/manager/weatherChangeManager.c
index 83fa2d16..0528f36d 100644
--- a/src/manager/weatherChangeManager.c
+++ b/src/manager/weatherChangeManager.c
@@ -46,7 +46,7 @@ void WeatherChangeManager_Main(WeatherChangeManager* this) {
             this->unk_20 = 0x1F;
             this->unk_22 = 5;
         }
-        gRoomVars.unk_10[0] = 0xFF;
+        gRoomVars.graphicsGroups[0] = 0xFF;
         RegisterTransitionManager(this, sub_080595E4, 0);
     }
     sub_08059608(this);
@@ -55,7 +55,7 @@ void WeatherChangeManager_Main(WeatherChangeManager* this) {
 }
 
 void sub_080595E4(WeatherChangeManager* this) {
-    gRoomVars.unk_10[0] = 0xFF;
+    gRoomVars.graphicsGroups[0] = 0xFF;
     sub_08059690(this);
     sub_080596E0(this);
     LoadStaticBackground(0);
@@ -134,8 +134,8 @@ void sub_080596E0(WeatherChangeManager* this) {
             }
             break;
     }
-    if (gRoomVars.unk_10[0] != this->unk_22) {
-        gRoomVars.unk_10[0] = this->unk_22;
+    if (gRoomVars.graphicsGroups[0] != this->unk_22) {
+        gRoomVars.graphicsGroups[0] = this->unk_22;
         switch (this->unk_22) {
             case 0 ... 3:
                 LoadGfxGroup(this->unk_22 + 0x2B);