diff --git a/spec b/spec
index 1121c8895e..397064c1c9 100644
--- a/spec
+++ b/spec
@@ -760,8 +760,7 @@ beginseg
     name "ovl_En_Light"
     compress
     include "build/src/overlays/actors/ovl_En_Light/z_en_light.o"
-    include "build/data/ovl_En_Light/ovl_En_Light.data.o"
-    include "build/data/ovl_En_Light/ovl_En_Light.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Light/ovl_En_Light_reloc.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c
index fdb2cf1234..f815147a2a 100644
--- a/src/overlays/actors/ovl_En_Light/z_en_light.c
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_light.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -15,7 +16,8 @@ void EnLight_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnLight_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-#if 0
+void func_80865F38(Actor* thisx, GlobalContext* globalCtx);
+
 const ActorInit En_Light_InitVars = {
     ACTOR_EN_LIGHT,
     ACTORCAT_ITEMACTION,
@@ -28,16 +30,173 @@ const ActorInit En_Light_InitVars = {
     (ActorFunc)EnLight_Draw,
 };
 
-#endif
+typedef struct {
+    /* 0x00 */ Color_RGBA8 unk_00;
+    /* 0x04 */ Color_RGB8 unk_04;
+    /* 0x07 */ u8 unk_07;
+} EnLightStruct; // size = 0x8
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Light/EnLight_Init.s")
+EnLightStruct D_808666D0[] = {
+    { { 255, 200, 0, 255 }, { 255, 0, 0 }, 75 },     { { 255, 235, 175, 255 }, { 255, 0, 0 }, 75 },
+    { { 0, 170, 255, 255 }, { 0, 0, 255 }, 75 },     { { 170, 255, 0, 255 }, { 0, 150, 0 }, 75 },
+    { { 255, 200, 0, 255 }, { 255, 0, 0 }, 40 },     { { 255, 200, 0, 255 }, { 255, 0, 0 }, 75 },
+    { { 170, 255, 0, 255 }, { 0, 150, 0 }, 75 },     { { 0, 170, 255, 255 }, { 0, 0, 255 }, 75 },
+    { { 255, 0, 170, 255 }, { 200, 0, 0 }, 75 },     { { 255, 255, 170, 255 }, { 255, 50, 0 }, 75 },
+    { { 255, 255, 170, 255 }, { 255, 255, 0 }, 75 }, { { 255, 255, 170, 255 }, { 100, 255, 0 }, 75 },
+    { { 255, 170, 255, 255 }, { 255, 0, 100 }, 75 }, { { 255, 170, 255, 255 }, { 100, 0, 255 }, 75 },
+    { { 170, 255, 255, 255 }, { 0, 0, 255 }, 75 },   { { 170, 255, 255, 255 }, { 0, 150, 255 }, 75 },
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Light/EnLight_Destroy.s")
+void EnLight_Init(Actor* thisx, GlobalContext* globalCtx) {
+    s32 pad;
+    EnLight* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Light/func_80865BF8.s")
+    if (!ENLIGHT_GET_4000(&this->actor)) {
+        if ((gSaveContext.gameMode == 3) || ENLIGHT_GET_2000(&this->actor)) {
+            Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.world.pos.x,
+                                      ((this->actor.params < 0) ? 1 : 40) + (s32)this->actor.world.pos.y,
+                                      this->actor.world.pos.z, 255, 255, 180, -1);
+        } else {
+            Lights_PointGlowSetInfo(&this->lightInfo, this->actor.world.pos.x,
+                                    ((this->actor.params < 0) ? 1 : 40) + (s32)this->actor.world.pos.y,
+                                    this->actor.world.pos.z, 255, 255, 180, -1);
+        }
+        this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo);
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Light/EnLight_Update.s")
+    Actor_SetScale(&this->actor, D_808666D0[ENLIGHT_GET_F(&this->actor)].unk_07 * 0.0001f);
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Light/func_80865F38.s")
+    this->unk_144 = (s8)(Rand_ZeroOne() * 255.0f);
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Light/EnLight_Draw.s")
+    if (ENLIGHT_GET_800(&this->actor)) {
+        this->actor.update = func_80865F38;
+        if (ENLIGHT_GET_1000(&this->actor) && Flags_GetSwitch(globalCtx, ENLIGHT_SWITCHFLAG(&this->actor))) {
+            Actor_SetScale(&this->actor, 0.0f);
+        }
+    } else if (ENLIGHT_GET_2000(&this->actor)) {
+        this->actor.draw = NULL;
+    }
+}
+
+void EnLight_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    EnLight* this = THIS;
+
+    if (!ENLIGHT_GET_4000(&this->actor)) {
+        LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode);
+    }
+}
+
+void func_80865BF8(EnLight* this, GlobalContext* globalCtx) {
+    this->actor.shape.rot.y = BINANG_ROT180(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)));
+
+    if (this->actor.parent != NULL) {
+        Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.parent->world.pos);
+        this->actor.world.pos.y += 17.0f;
+    }
+
+    this->unk_144++;
+}
+
+void EnLight_Update(Actor* thisx, GlobalContext* globalCtx) {
+    EnLight* this = THIS;
+
+    if (!ENLIGHT_GET_4000(&this->actor)) {
+        EnLightStruct* sp28 = &D_808666D0[ENLIGHT_GET_F(&this->actor)];
+        f32 temp_f2 = (Rand_ZeroOne() * 0.5f) + 0.5f;
+        s32 radius = (this->actor.params < 0) ? 100 : ENLIGHT_GET_2000(&this->actor) ? 730 : 300;
+
+        Lights_PointSetColorAndRadius(&this->lightInfo, (u8)(sp28->unk_00.r * temp_f2), (u8)(sp28->unk_00.g * temp_f2),
+                                      (u8)(sp28->unk_00.b * temp_f2), radius);
+    }
+
+    func_80865BF8(this, globalCtx);
+
+    if ((this->actor.params >= 0) && !ENLIGHT_GET_4000(&this->actor)) {
+        Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_TORCH - SFX_FLAG);
+    }
+}
+
+void func_80865F38(Actor* thisx, GlobalContext* globalCtx) {
+    EnLight* this = THIS;
+    EnLightStruct* sp38 = &D_808666D0[ENLIGHT_GET_F(&this->actor)];
+    f32 temp_f2;
+    f32 sp30 = this->actor.scale.x / (sp38->unk_07 * 0.0001f);
+    s32 sp2C = false;
+
+    if (ENLIGHT_GET_1000(&this->actor)) {
+        if (Flags_GetSwitch(globalCtx, ENLIGHT_SWITCHFLAG(&this->actor))) {
+            Math_StepToF(&sp30, 1.0f, 0.05f);
+            sp2C = true;
+        } else {
+            if (sp30 < 0.1f) {
+                Actor_SetScale(&this->actor, 0.0f);
+                sp30 = 0.0f;
+            }
+            Math_StepToF(&sp30, 0.0f, 0.05f);
+        }
+    } else if (Flags_GetSwitch(globalCtx, ENLIGHT_SWITCHFLAG(&this->actor))) {
+        if (sp30 < 0.1f) {
+            Actor_SetScale(&this->actor, 0.0f);
+            sp30 = 0.0f;
+        }
+        Math_StepToF(&sp30, 0.0f, 0.05f);
+    } else {
+        Math_StepToF(&sp30, 1.0f, 0.05f);
+        sp2C = true;
+    }
+
+    Actor_SetScale(&this->actor, sp38->unk_07 * 0.0001f * sp30);
+
+    if (!ENLIGHT_GET_4000(&this->actor)) {
+        temp_f2 = (Rand_ZeroOne() * 0.5f) + 0.5f;
+        Lights_PointSetColorAndRadius(&this->lightInfo, (u8)(sp38->unk_00.r * temp_f2), (u8)(sp38->unk_00.g * temp_f2),
+                                      (u8)(sp38->unk_00.b * temp_f2), 300.0f * sp30);
+    }
+
+    func_80865BF8(this, globalCtx);
+
+    if ((this->actor.params >= 0) && (sp2C == true)) {
+        Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_TORCH - SFX_FLAG);
+    }
+}
+
+void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    s32 pad;
+    EnLight* this = THIS;
+    EnLightStruct* sp6C = &D_808666D0[ENLIGHT_GET_F(&this->actor)];
+    Gfx* sp68;
+
+    OPEN_DISPS(globalCtx->state.gfxCtx);
+
+    func_8012C2DC(globalCtx->state.gfxCtx);
+
+    if (this->actor.params >= 0) {
+        gSPSegment(POLY_XLU_DISP++, 0x08,
+                   Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (this->unk_144 * -20) & 0x1FF,
+                                    0x20, 0x80));
+        sp68 = gGameplayKeepDrawFlameDL;
+        gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, sp6C->unk_00.r, sp6C->unk_00.g, sp6C->unk_00.b, sp6C->unk_00.a);
+        gDPSetEnvColor(POLY_XLU_DISP++, sp6C->unk_04.r, sp6C->unk_04.g, sp6C->unk_04.b, 0);
+    } else {
+        gSPSegment(POLY_XLU_DISP++, 0x08,
+                   Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x10, 0x20, 1, (this->unk_144 * 2) & 0x3F,
+                                    (this->unk_144 * -6) & 0x7F, 0x10, 0x20));
+        sp68 = gameplay_keep_DL_01ACF0;
+        gDPSetPrimColor(POLY_XLU_DISP++, 0xC0, 0xC0, 255, 200, 0, 0);
+        gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0);
+    }
+
+    Matrix_RotateY(BINANG_ROT180(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) - this->actor.shape.rot.y),
+                   MTXMODE_APPLY);
+
+    if (ENLIGHT_GET_1(&this->actor)) {
+        Matrix_InsertYRotation_f(M_PI, MTXMODE_APPLY);
+    }
+
+    Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
+
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_XLU_DISP++, sp68);
+
+    CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.h b/src/overlays/actors/ovl_En_Light/z_en_light.h
index f1aff8de96..b17f55fd72 100644
--- a/src/overlays/actors/ovl_En_Light/z_en_light.h
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.h
@@ -5,9 +5,19 @@
 
 struct EnLight;
 
+#define ENLIGHT_GET_1(thisx) ((thisx)->params & 1)
+#define ENLIGHT_GET_F(thisx) ((thisx)->params & 0xF)
+#define ENLIGHT_GET_800(thisx) ((thisx)->params & 0x800)
+#define ENLIGHT_SWITCHFLAG(thisx) (((thisx)->params & 0x7F0) >> 4)
+#define ENLIGHT_GET_1000(thisx) ((thisx)->params & 0x1000)
+#define ENLIGHT_GET_2000(thisx) ((thisx)->params & 0x2000)
+#define ENLIGHT_GET_4000(thisx) ((thisx)->params & 0x4000)
+
 typedef struct EnLight {
     /* 0x000 */ Actor actor;
-    /* 0x144 */ char unk_144[0x18];
+    /* 0x144 */ u8 unk_144;
+    /* 0x148 */ LightNode* lightNode;
+    /* 0x14C */ LightInfo lightInfo;
 } EnLight; // size = 0x15C
 
 extern const ActorInit En_Light_InitVars;