cleanup hole manager

2 files changed, 215 insertions, 109 deletions

diff --git a/src/manager/holeManager.c b/src/manager/holeManager.c
index c83ed3ea..4517f41d 100644
--- a/src/manager/holeManager.c
+++ b/src/manager/holeManager.c
@@ -7,105 +7,210 @@
 #include "manager/holeManager.h"
 #include "common.h"
 #include "flags.h"
-#include "functions.h"
 #include "object.h"
 #include "room.h"
 #include "screen.h"
+#include "manager/lightManager.h"
+#include "assets/gfx_offsets.h"
+#include "functions.h"
+
+typedef enum {
+    HOLE_TRANSITION_ABSOLUTE,
+    HOLE_TRANSITION_RELATIVE,
+    HOLE_TRANSITION_ABSOLUTE_MINISH,
+} HoleTransitionType;
+
+typedef struct {
+    u32 gfx;
+    u16 offset_x;
+    u16 offset_y;
+    u16 x;
+    u16 y;
+} HoleTransitionPersistance;
+
+typedef struct {
+    u8 type;
+    u8 subtype;
+    u8 unk_2;
+    u8 unk_3;
+    u16 x;
+    u16 y;
+} HoleTransitionParallax;
+
+typedef struct HoleTransition {
+    u8 type;
+    u8 area;
+    u8 room;
+    u8 layer;
+    u16 x;
+    u16 y;
+    u8 hole_x;
+    u8 hole_y;
+    u8 hole_width;
+    u8 hole_height;
+    const HoleTransitionPersistance* persistance;
+    const HoleTransitionParallax* parallax;
+} HoleTransition;
+
+void HoleManager_Init(HoleManager*);
+void HoleManager_Update(HoleManager*);
 
-extern void (*const HoleManager_Actions[])(HoleManager*);
+void (*const HoleManager_Actions[])(HoleManager*) = {
+    HoleManager_Init,
+    HoleManager_Update,
+};
+
+const HoleTransitionPersistance gHoleTransitionPersistances[] = {
+    { offset_gfx_unknown_6, 0x00c4, 0x0030, 0x0310, 0x13c8 },
+    { offset_gfx_unknown_6 + 0x800, 0x00c4, 0x0030, 0x0310, 0x13c8 },
+    { offset_gfx_unknown_6 + 0x800 * 2, 0xfffa, 0x00de, 0x05d0, 0x0410 },
+    { offset_gfx_unknown_6 + 0x800 * 3, 0x0024, 0x0004, 0x0290, 0x04e0 },
+    { offset_gfx_unknown_6 + 0x800 * 4, 0x0058, 0x0014, 0x0280, 0x0cf0 },
+    { offset_gfx_unknown_6 + 0x800 * 5, 0x002c, 0x0004, 0x04a0, 0x0cf0 },
+    { offset_gfx_unknown_7, 0x0060, 0x0010, 0x0170, 0x08e0 },
+    { offset_gfx_unknown_7 + 0x800, 0x001c, 0x00d0, 0x05b0, 0x0e20 },
+    { offset_gfx_unknown_7 + 0x800 * 2, 0x005c, 0x00a4, 0x0290, 0x1b48 },
+};
+
+const HoleTransitionParallax gHoleTransitionParallaxes[] = {
+    { 0x00, 0x00, 0x00, 0x00, 0x0088, 0x0068 }, { 0x01, 0x01, 0x00, 0x00, 0x0088, 0x0068 },
+    { 0x02, 0x02, 0x00, 0x00, 0x00b8, 0x0068 }, { 0x04, 0x04, 0x00, 0x00, 0x00b8, 0x0068 },
+    { 0x05, 0x00, 0x00, 0x00, 0x0078, 0x00b8 }, { 0x06, 0x01, 0x00, 0x00, 0x0048, 0x0040 },
+    { 0x07, 0x02, 0x00, 0x00, 0x0090, 0x0040 }, { 0x07, 0x03, 0x00, 0x00, 0x0240, 0x0050 },
+    { 0x07, 0x04, 0x00, 0x00, 0x0158, 0x0100 }, { 0x08, 0x05, 0x00, 0x00, 0x007c, 0x0050 },
+    { 0x09, 0x06, 0x00, 0x00, 0x0078, 0x0070 }, { 0x0a, 0x07, 0x00, 0x00, 0x0060, 0x0058 },
+    { 0x0b, 0x08, 0x00, 0x00, 0x0081, 0x005e }, { 0x0c, 0x09, 0x00, 0x00, 0x0080, 0x0058 },
+    { 0x0d, 0x0a, 0x00, 0x00, 0x0060, 0x0038 }, { 0x0e, 0x0b, 0x00, 0x00, 0x0260, 0x0064 },
+    { 0x0f, 0x00, 0x00, 0x00, 0x00a8, 0x0148 },
+};
+
+const HoleTransition gHoleTransitions[] = {
+    { 0x00, 0x48, 0x14, 0x02, 0x00e8, 0x00c8, 0x00, 0x00, 0x00, 0x00, NULL, NULL },
+    { 0x00, 0x51, 0x00, 0x02, 0x00c0, 0x00f8, 0x00, 0x00, 0x00, 0x00, &gHoleTransitionPersistances[0], NULL },
+    { 0x01, 0x58, 0x1b, 0x02, 0xfeb0, 0x0000, 0x1d, 0x06, 0x05, 0x02, &gHoleTransitionPersistances[2], NULL },
+    { 0x01, 0x58, 0x1d, 0x01, 0xffe0, 0xff20, 0x09, 0x13, 0x03, 0x03, NULL, &gHoleTransitionParallaxes[16] },
+    { 0x01, 0x58, 0x1c, 0x01, 0xfff0, 0x0000, 0x08, 0x05, 0x03, 0x03, &gHoleTransitionPersistances[3], NULL },
+    { 0x01, 0x58, 0x20, 0x01, 0xfff0, 0x0000, 0x00, 0x00, 0x00, 0x00, &gHoleTransitionPersistances[4], NULL },
+    { 0x01, 0x58, 0x22, 0x01, 0xffe0, 0x0000, 0x00, 0x00, 0x00, 0x00, &gHoleTransitionPersistances[5], NULL },
+    { 0x00, 0x62, 0x11, 0x01, 0x00c8, 0x0038, 0x00, 0x00, 0x00, 0x00, NULL, NULL },
+    { 0x01, 0x60, 0x20, 0x01, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[0] },
+    { 0x01, 0x60, 0x21, 0x01, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[1] },
+    { 0x01, 0x60, 0x2e, 0x01, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[2] },
+    { 0x01, 0x60, 0x11, 0x01, 0xffc0, 0x0000, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[3] },
+    { 0x00, 0x60, 0x31, 0x01, 0x0078, 0x00a8, 0x00, 0x00, 0x00, 0x00, NULL, NULL },
+    { 0x00, 0x51, 0x00, 0x02, 0x00c0, 0x00f8, 0x00, 0x00, 0x00, 0x00, &gHoleTransitionPersistances[1], NULL },
+    { 0x01, 0x08, 0x01, 0x01, 0x0000, 0x0000, 0x1d, 0x1d, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x1d, 0x1d, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x23, 0x03, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x32, 0x03, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x03, 0x13, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x37, 0x10, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x2f, 0x18, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x16, 0x2b, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x25, 0x2c, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x32, 0x2d, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x0d, 0x35, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x17, 0x37, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x1d, 0x38, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x36, 0x38, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x38, 0x19, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x3a, 0x2e, 0x01, 0x01, NULL, NULL },
+    { 0x01, 0x08, 0x02, 0x01, 0x0000, 0x0000, 0x30, 0x39, 0x01, 0x01, NULL, NULL },
+    { 0x00, 0x1a, 0x00, 0x01, 0x0058, 0x0048, 0x18, 0x1b, 0x03, 0x03, NULL, NULL },
+    { 0x01, 0x70, 0x0f, 0x01, 0x01e0, 0x0070, 0x08, 0x03, 0x04, 0x04, NULL, NULL },
+    { 0x01, 0x70, 0x10, 0x01, 0x0000, 0x0090, 0x14, 0x05, 0x05, 0x03, NULL, NULL },
+    { 0x01, 0x70, 0x10, 0x01, 0x0000, 0x0090, 0x21, 0x05, 0x04, 0x03, NULL, NULL },
+    { 0x00, 0x70, 0x0c, 0x01, 0x0078, 0x00a0, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[4] },
+    { 0x01, 0x70, 0x15, 0x01, 0x01e0, 0x0000, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[5] },
+    { 0x01, 0x70, 0x19, 0x01, 0x00f0, 0x0000, 0x05, 0x08, 0x04, 0x04, NULL, NULL },
+    { 0x01, 0x70, 0x1b, 0x01, 0x0000, 0x0000, 0x08, 0x02, 0x02, 0x04, NULL, &gHoleTransitionParallaxes[6] },
+    { 0x01, 0x70, 0x1d, 0x01, 0xfe30, 0x0000, 0x23, 0x02, 0x02, 0x04, NULL, &gHoleTransitionParallaxes[7] },
+    { 0x01, 0x70, 0x1f, 0x01, 0xff10, 0xff60, 0x13, 0x0e, 0x07, 0x04, NULL, &gHoleTransitionParallaxes[8] },
+    { 0x01, 0x70, 0x21, 0x01, 0x0000, 0x0090, 0x06, 0x03, 0x04, 0x04, NULL, NULL },
+    { 0x01, 0x70, 0x26, 0x01, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[9] },
+    { 0x01, 0x70, 0x29, 0x01, 0x0000, 0x0000, 0x06, 0x06, 0x03, 0x02, NULL, &gHoleTransitionParallaxes[10] },
+    { 0x01, 0x70, 0x2c, 0x01, 0x0000, 0x0000, 0x12, 0x0c, 0x04, 0x04, NULL, NULL },
+    { 0x01, 0x70, 0x32, 0x01, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[11] },
+    { 0x01, 0x70, 0x32, 0x02, 0x00f0, 0x0000, 0x07, 0x04, 0x02, 0x02, NULL, NULL },
+    { 0x01, 0x70, 0x32, 0x01, 0x00f0, 0x0000, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[12] },
+    { 0x01, 0x70, 0x32, 0x01, 0x01e0, 0x0000, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[13] },
+    { 0x01, 0x70, 0x32, 0x01, 0x0000, 0x00a0, 0x00, 0x00, 0x00, 0x00, NULL, &gHoleTransitionParallaxes[14] },
+    { 0x00, 0x31, 0x00, 0x01, 0x0078, 0x0068, 0x25, 0x04, 0x03, 0x03, NULL, &gHoleTransitionParallaxes[15] },
+    { 0x00, 0x70, 0x00, 0x02, 0x01d8, 0x00d8, 0x00, 0x00, 0x00, 0x00, NULL, NULL },
+    { 0x01, 0x88, 0x1e, 0x01, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, &gHoleTransitionPersistances[6], NULL },
+    { 0x01, 0x88, 0x2c, 0x01, 0x0000, 0xff30, 0x00, 0x00, 0x00, 0x00, &gHoleTransitionPersistances[7], NULL },
+    { 0x01, 0x88, 0x3a, 0x01, 0x0000, 0xffe0, 0x00, 0x00, 0x00, 0x00, &gHoleTransitionPersistances[8], NULL },
+    { 0x00, 0x88, 0x06, 0x01, 0x00a8, 0x0088, 0x00, 0x00, 0x00, 0x00, NULL, NULL },
+    { 0x02, 0x23, 0x01, 0x01, 0x0078, 0x0078, 0x00, 0x00, 0x00, 0x00, NULL, NULL },
+    { 0x02, 0x23, 0x00, 0x01, 0x00a8, 0x0060, 0x00, 0x00, 0x00, 0x00, NULL, NULL },
+    { 0x02, 0x22, 0x04, 0x01, 0x00a8, 0x0058, 0x00, 0x00, 0x00, 0x00, NULL, NULL },
+    { 0x02, 0x23, 0x03, 0x01, 0x0078, 0x0078, 0x00, 0x00, 0x00, 0x00, NULL, NULL },
+    { 0x00, 0x41, 0x01, 0x01, 0x0078, 0x0050, 0x2f, 0x27, 0x03, 0x03, NULL, NULL },
+};
 
 void HoleManager_Main(HoleManager* this) {
     HoleManager_Actions[super->action](this);
 }
 
-typedef struct struct_08108764 {
-    u8 unk_00;
-    u8 unk_01; // area ID?
-    u8 unk_02; // room ID?
-    u8 unk_03; // layer?
-    u16 unk_04;
-    u16 unk_06;
-    u8 unk_08;
-    u8 unk_09;
-    u8 unk_0a;
-    u8 unk_0b;
-    struct {
-        u32 unk_00;
-        u16 unk_04;
-        u16 unk_06;
-        u16 unk_08;
-        u16 unk_0a;
-    } * unk_0c;
-    struct {
-        u8 unk_00;
-        u8 unk_01;
-        u8 unk_02[2];
-        u16 unk_04;
-        u16 unk_06;
-    } * unk_10;
-} struct_08108764;
-
-extern struct_08108764 gUnk_08108764[];
-
-u32 sub_0805B1CC(HoleManager*);
-void sub_0805B210(HoleManager*);
-void sub_0805B2B0(HoleManager*);
-void sub_0805B328(HoleManager*);
-
-void sub_0805B048(HoleManager* this) {
-    struct_08108764* tmp;
+bool32 IsPlayerOnHole(HoleManager*);
+void DoHoleTransition(HoleManager*);
+void HoleManager_ConfigureBG3Offset(HoleManager*);
+void HoleManager_ConfigureBG3(HoleManager*);
+
+void HoleManager_Init(HoleManager* this) {
+    const HoleTransition* transition;
     Entity* obj;
     SetEntityPriority((Entity*)super, PRIO_PLAYER_EVENT);
-    MemClear(&this->unk_20, 0x20);
+    MemClear(&this->x, 0x20);
     super->action = 1;
     this->unk_3f = gRoomControls.room;
-    tmp = &gUnk_08108764[super->type];
-    if (!tmp->unk_0a) {
-        this->unk_20 = gRoomControls.origin_x;
-        this->unk_22 = gRoomControls.origin_y;
-        this->unk_24 = gRoomControls.width;
-        this->unk_26 = gRoomControls.height;
+    transition = &gHoleTransitions[super->type];
+    if (transition->hole_width == 0) {
+        this->x = gRoomControls.origin_x;
+        this->y = gRoomControls.origin_y;
+        this->width = gRoomControls.width;
+        this->height = gRoomControls.height;
     } else {
-        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);
+        this->x = (transition->hole_x << 4) + gRoomControls.origin_x;
+        this->y = (transition->hole_y << 4) + gRoomControls.origin_y;
+        this->width = (transition->hole_width << 4);
+        this->height = (transition->hole_height << 4);
     }
-    super->type2 = tmp->unk_0c != 0;
+    super->type2 = transition->persistance != NULL;
     if (super->type2) {
         super->flags |= ENT_PERSIST;
-        this->unk_34 = tmp->unk_0c->unk_04;
-        this->unk_36 = tmp->unk_0c->unk_06;
-        this->unk_30 = tmp->unk_0c->unk_08;
-        this->unk_32 = tmp->unk_0c->unk_0a;
-        sub_0805BC4C();
-        sub_0805B2B0(this);
-        sub_0805B328(this);
-        RegisterTransitionManager(this, sub_0805B328, 0);
+        this->persistance_offset_x = transition->persistance->offset_x;
+        this->persistance_offset_y = transition->persistance->offset_y;
+        this->persistance_x = transition->persistance->x;
+        this->persistance_y = transition->persistance->y;
+        UnDarkRoom();
+        HoleManager_ConfigureBG3Offset(this);
+        HoleManager_ConfigureBG3(this);
+        RegisterTransitionManager(this, HoleManager_ConfigureBG3, NULL);
     }
-    if (!tmp->unk_10)
+    if (!transition->parallax)
         return;
-    obj = CreateObject(PARALLAX_ROOM_VIEW, tmp->unk_10->unk_00, tmp->unk_10->unk_01);
+    obj = CreateObject(PARALLAX_ROOM_VIEW, transition->parallax->type, transition->parallax->subtype);
     if (obj) {
-        obj->x.HALF.HI = tmp->unk_10->unk_04 + gRoomControls.origin_x;
-        obj->y.HALF.HI = tmp->unk_10->unk_06 + gRoomControls.origin_y;
+        obj->x.HALF.HI = transition->parallax->x + gRoomControls.origin_x;
+        obj->y.HALF.HI = transition->parallax->y + gRoomControls.origin_y;
     }
     if (super->type != 0xa || CheckLocalFlag(0x4B))
         return;
     obj = CreateObject(PARALLAX_ROOM_VIEW, 3, 3);
     if (obj) {
-        obj->x.HALF.HI = tmp->unk_10->unk_04 + gRoomControls.origin_x;
-        obj->y.HALF.HI = tmp->unk_10->unk_06 + gRoomControls.origin_y;
+        obj->x.HALF.HI = transition->parallax->x + gRoomControls.origin_x;
+        obj->y.HALF.HI = transition->parallax->y + gRoomControls.origin_y;
     }
 }
 
-void sub_0805B168(HoleManager* this) {
-    if (sub_0805B1CC(this)) {
-        sub_0805B210(this);
+void HoleManager_Update(HoleManager* this) {
+    if (IsPlayerOnHole(this)) {
+        DoHoleTransition(this);
         DeleteThisEntity();
         return;
     }
-    sub_0805B2B0(this);
+    HoleManager_ConfigureBG3Offset(this);
     if (gRoomControls.reload_flags == 1) {
         super->subAction = 1;
         return;
@@ -121,82 +226,83 @@ void sub_0805B168(HoleManager* this) {
     DeleteThisEntity();
 }
 
-u32 sub_0805B1CC(HoleManager* this) {
-    u32 re = 0;
-    if (CheckPlayerProximity(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) {
+bool32 IsPlayerOnHole(HoleManager* this) {
+    bool32 re = FALSE;
+    if (CheckPlayerProximity(this->x, this->y, this->width, this->height)) {
         if ((gPlayerState.flags & PL_DROWNING) && (gPlayerState.flags & PL_BUSY)) {
             gPlayerState.flags |= PL_PIT_IS_EXIT;
         } else if (gPlayerState.flags & PL_PIT_IS_EXIT) {
-            re = 1;
+            re = TRUE;
         }
     }
     return re;
 }
 
-void sub_0805B210(HoleManager* this) {
-    struct_08108764* tmp;
+void DoHoleTransition(HoleManager* this) {
+    const HoleTransition* transition;
     gRoomTransition.transitioningOut = 1;
     gRoomTransition.type = TRANSITION_CUT;
     gRoomTransition.player_status.start_anim = 4;
-    tmp = &gUnk_08108764[super->type];
-    gRoomTransition.player_status.area_next = tmp->unk_01;
-    gRoomTransition.player_status.room_next = tmp->unk_02;
-    gRoomTransition.player_status.layer = tmp->unk_03;
+    transition = &gHoleTransitions[super->type];
+    gRoomTransition.player_status.area_next = transition->area;
+    gRoomTransition.player_status.room_next = transition->room;
+    gRoomTransition.player_status.layer = transition->layer;
     if (gPlayerState.flags & PL_MINISH) {
         gRoomTransition.player_status.spawn_type = PL_SPAWN_DROP_MINISH;
     } else {
         gRoomTransition.player_status.spawn_type = PL_SPAWN_DROP;
     }
-    switch (tmp->unk_00) {
-        case 0:
-            gRoomTransition.player_status.start_pos_x = tmp->unk_04;
-            gRoomTransition.player_status.start_pos_y = tmp->unk_06;
+    switch (transition->type) {
+        case HOLE_TRANSITION_ABSOLUTE:
+            gRoomTransition.player_status.start_pos_x = transition->x;
+            gRoomTransition.player_status.start_pos_y = transition->y;
             break;
-        case 1:
+        case HOLE_TRANSITION_RELATIVE:
             gRoomTransition.player_status.start_pos_x =
-                gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x + tmp->unk_04;
+                gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x + transition->x;
             gRoomTransition.player_status.start_pos_y =
-                gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y + tmp->unk_06;
+                gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y + transition->y;
             break;
-        case 2:
-            gRoomTransition.player_status.start_pos_x = tmp->unk_04;
-            gRoomTransition.player_status.start_pos_y = tmp->unk_06;
+        case HOLE_TRANSITION_ABSOLUTE_MINISH:
+            gRoomTransition.player_status.start_pos_x = transition->x;
+            gRoomTransition.player_status.start_pos_y = transition->y;
             gRoomTransition.player_status.spawn_type = PL_SPAWN_DROP_MINISH;
             break;
+        default:
+            break;
     }
 }
 
-void sub_0805B2B0(HoleManager* this) {
-    s32 tmp, tmp2;
+void HoleManager_ConfigureBG3Offset(HoleManager* this) {
+    s32 x, y;
     if (!super->type2)
         return;
-    tmp = (this->unk_30 - gRoomControls.scroll_x) / 4;
-    tmp2 = (this->unk_32 - gRoomControls.scroll_y) / 4;
-    if (tmp < -12) {
-        tmp = -12;
+    x = (this->persistance_x - gRoomControls.scroll_x) / 4;
+    y = (this->persistance_y - gRoomControls.scroll_y) / 4;
+    if (x < -12) {
+        x = -12;
     }
-    if (tmp > 12) {
-        tmp = 12;
+    if (x > 12) {
+        x = 12;
     }
-    if (tmp2 < -12) {
-        tmp2 = -12;
+    if (y < -12) {
+        y = -12;
     }
-    if (tmp2 > 12) {
-        tmp2 = 12;
+    if (y > 12) {
+        y = 12;
     }
     gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
-    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;
+
+    gScreen.bg3.xOffset = gRoomControls.bg3OffsetX.HALF.HI = gRoomControls.scroll_x + this->persistance_offset_x + x;
+    gScreen.bg3.yOffset = gRoomControls.bg3OffsetY.HALF.HI = gRoomControls.scroll_y + this->persistance_offset_y + y;
 }
 
-void sub_0805B328(HoleManager* this) {
-    struct_08108764* tmp;
+void HoleManager_ConfigureBG3(HoleManager* this) {
+    const HoleTransition* transition;
     if (!super->type2)
         return;
-    tmp = &gUnk_08108764[super->type];
-    LoadResourceAsync(&gGlobalGfxAndPalettes[tmp->unk_0c->unk_00], 0x0600F000, 0x800);
+    transition = &gHoleTransitions[super->type];
+    LoadResourceAsync(&gGlobalGfxAndPalettes[transition->persistance->gfx], 0x0600F000, 0x800);
     gScreen.bg3.control = 0x1E07;
     gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
     gScreen.bg3.xOffset = gRoomControls.bg3OffsetX.HALF.HI;
diff --git a/src/manager/lightManager.c b/src/manager/lightManager.c
index 7a0cca5f..cb96636d 100644
--- a/src/manager/lightManager.c
+++ b/src/manager/lightManager.c
@@ -186,7 +186,7 @@ s32 sub_0805BC04(void) {
     return iVar1;
 }
 
-void sub_0805BC4C() {
+void UnDarkRoom() {
     if (gArea.lightType != 0) {
         gArea.lightType = 0;
         gScreen.lcd.displayControl &= ~(DISPCNT_BG3_ON | DISPCNT_WIN0_ON);