Decompile ovl_En_Po_Composer (#1391)

* Decompiled, mostly named

* Few more labels and document object

* Review changes

* Further review changes

* Improve EnPoComposer_UpdateEnvColor

* PO_COMPOSER -> POE_COMPOSER, tweak animation names

* More changes

* OCARINA_MODE_EVENT

* fix merge

---------

Co-authored-by: angie <angheloalf95@gmail.com>

4 files changed, 757 insertions, 150 deletions

diff --git a/assets/xml/objects/object_po_composer.xml b/assets/xml/objects/object_po_composer.xml
index c45cf9039..81042139f 100644
--- a/assets/xml/objects/object_po_composer.xml
+++ b/assets/xml/objects/object_po_composer.xml
@@ -1,35 +1,37 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
+    <!-- Assets for the composer brothers Flat and Sharp -->
     <File Name="object_po_composer" Segment="6">
-        <Animation Name="object_po_composer_Anim_00020C" Offset="0x20C" />
-        <Animation Name="object_po_composer_Anim_000570" Offset="0x570" />
-        <Animation Name="object_po_composer_Anim_000A58" Offset="0xA58" />
-        <Animation Name="object_po_composer_Anim_001420" Offset="0x1420" />
-        <Animation Name="object_po_composer_Anim_0015B8" Offset="0x15B8" />
-        <Animation Name="object_po_composer_Anim_00188C" Offset="0x188C" />
-        <Animation Name="object_po_composer_Anim_001F44" Offset="0x1F44" />
-        <Animation Name="object_po_composer_Anim_0023E8" Offset="0x23E8" />
-        <Animation Name="object_po_composer_Anim_002AE0" Offset="0x2AE0" />
-        <Animation Name="object_po_composer_Anim_003024" Offset="0x3024" />
-        <Animation Name="object_po_composer_Anim_00334C" Offset="0x334C" />
-        <Animation Name="object_po_composer_Anim_003954" Offset="0x3954" />
-        <Animation Name="object_po_composer_Anim_003DB0" Offset="0x3DB0" />
-        <Texture Name="object_po_composer_Tex_003DC0" OutName="tex_003DC0" Format="i8" Width="32" Height="64" Offset="0x3DC0" />
+        <!-- Animations -->
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x20C" />
+        <Animation Name="gPoeComposerRaiseArmsAnim" Offset="0x570" />
+        <Animation Name="gPoeComposerBeginPlayAnim" Offset="0xA58" />
+        <Animation Name="gPoeComposerPlayAnim" Offset="0x1420" />
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x15B8" />
+        <Animation Name="gPoeComposerIdleAnim" Offset="0x188C" />
+        <Animation Name="gPoeComposerArmsRaisedAnim" Offset="0x1F44" />
+        <Animation Name="gPoeComposerLowerArmsAnim" Offset="0x23E8" />
+        <Animation Name="gPoeComposerLookDownAnim" Offset="0x2AE0" />
+        <Animation Name="gPoeComposerBeginRollAnim" Offset="0x3024" />
+        <Animation Name="gPoeComposerRollAnim" Offset="0x334C" />
+        <Animation Name="gPoeComposerAppearDisappearAnim" Offset="0x3954" />
+        <Animation Name="gPoeComposerStillAnim" Offset="0x3DB0" />
+
+        <!-- Texture -->
+        <Texture Name="gPoeComposerSoulTex" OutName="composer_soul" Format="i8" Width="32" Height="64" Offset="0x3DC0" />
+
+        <!-- Display Lists -->
         <DList Name="object_po_composer_DL_004600" Offset="0x4600" />
-        <DList Name="object_po_composer_DL_0052E0" Offset="0x52E0" />
-        <DList Name="object_po_composer_DL_0054E0" Offset="0x54E0" />
-        <DList Name="object_po_composer_DL_0055D0" Offset="0x55D0" />
-        <DList Name="object_po_composer_DL_005898" Offset="0x5898" />
-        <DList Name="object_po_composer_DL_005948" Offset="0x5948" />
-        <DList Name="object_po_composer_DL_005A00" Offset="0x5A00" />
-        <DList Name="object_po_composer_DL_005CB8" Offset="0x5CB8" />
-        <DList Name="object_po_composer_DL_005D68" Offset="0x5D68" />
-        <DList Name="object_po_composer_DL_006A70" Offset="0x6A70" />
+        <DList Name="gPoeComposerSharpHeadDL" Offset="0x6A70" />
         <DList Name="object_po_composer_DL_006D80" Offset="0x6D80" />
-        <DList Name="object_po_composer_DL_006E08" Offset="0x6E08" />
-        <DList Name="object_po_composer_DL_006EA8" Offset="0x6EA8" />
-        <DList Name="object_po_composer_DL_006F38" Offset="0x6F38" />
-        <DList Name="object_po_composer_DL_006FD8" Offset="0x6FD8" />
-        <DList Name="object_po_composer_DL_007BC0" Offset="0x7BC0" />
+        <DList Name="gPoeComposerLanternBaseDL" Offset="0x6E08" />
+        <DList Name="gPoeComposerLanternTopDL" Offset="0x6EA8" />
+        <DList Name="gPoeComposerLanternGlassDL" Offset="0x6F38" />
+        <DList Name="gPoeComposerFlatHeadDL" Offset="0x6FD8" />
+        <DList Name="gPoeComposerBurnDL" Offset="0x7BC0" />
+
+        <!-- Textures -->
         <Texture Name="object_po_composer_Tex_007E80" OutName="tex_007E80" Format="rgba16" Width="16" Height="16" Offset="0x7E80" />
         <Texture Name="object_po_composer_Tex_008080" OutName="tex_008080" Format="rgba16" Width="16" Height="16" Offset="0x8080" />
         <Texture Name="object_po_composer_Tex_008280" OutName="tex_008280" Format="rgba16" Width="16" Height="16" Offset="0x8280" />
@@ -42,17 +44,21 @@
         <Texture Name="object_po_composer_Tex_009280" OutName="tex_009280" Format="rgba16" Width="16" Height="16" Offset="0x9280" />
         <Texture Name="object_po_composer_Tex_009480" OutName="tex_009480" Format="rgba16" Width="16" Height="16" Offset="0x9480" />
         <Texture Name="object_po_composer_Tex_009680" OutName="tex_009680" Format="rgba16" Width="16" Height="16" Offset="0x9680" />
-        <Limb Name="object_po_composer_Standardlimb_009880" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_01" Offset="0x9880" />
-        <Limb Name="object_po_composer_Standardlimb_00988C" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_02" Offset="0x988C" />
-        <Limb Name="object_po_composer_Standardlimb_009898" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_03" Offset="0x9898" />
-        <Limb Name="object_po_composer_Standardlimb_0098A4" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_04" Offset="0x98A4" />
-        <Limb Name="object_po_composer_Standardlimb_0098B0" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_05" Offset="0x98B0" />
-        <Limb Name="object_po_composer_Standardlimb_0098BC" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_06" Offset="0x98BC" />
-        <Limb Name="object_po_composer_Standardlimb_0098C8" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_07" Offset="0x98C8" />
-        <Limb Name="object_po_composer_Standardlimb_0098D4" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_08" Offset="0x98D4" />
-        <Limb Name="object_po_composer_Standardlimb_0098E0" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_09" Offset="0x98E0" />
-        <Limb Name="object_po_composer_Standardlimb_0098EC" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_0A" Offset="0x98EC" />
-        <Limb Name="object_po_composer_Standardlimb_0098F8" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_0B" Offset="0x98F8" />
-        <Skeleton Name="object_po_composer_Skel_009930" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PO_COMPOSER_LIMB_NONE" LimbMax="OBJECT_PO_COMPOSER_LIMB_MAX" EnumName="ObjectPoComposerLimb" Offset="0x9930" />
+
+        <!-- Limbs -->
+        <Limb Name="gPoeComposerUpperBodyLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_UPPER_BODY" Offset="0x9880" />
+        <Limb Name="gPoeComposerLeftShoulderLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LEFT_SHOULDER" Offset="0x988C" />
+        <Limb Name="gPoeComposerLeftArmLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LEFT_ARM" Offset="0x9898" />
+        <Limb Name="gPoeComposerLeftHandLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LEFT_HAND" Offset="0x98A4" />
+        <Limb Name="gPoeComposerConductorBatonLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_CONDUCTOR_BATON" Offset="0x98B0" />
+        <Limb Name="gPoeComposerRightShoulderLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_RIGHT_SHOULDER" Offset="0x98BC" />
+        <Limb Name="gPoeComposerRightArmLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_RIGHT_ARM" Offset="0x98C8" />
+        <Limb Name="gPoeComposerRightHandLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_RIGHT_HAND" Offset="0x98D4" />
+        <Limb Name="gPoeComposerLanternLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LANTERN" Offset="0x98E0" />
+        <Limb Name="gPoeComposerHeadLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_HEAD" Offset="0x98EC" />
+        <Limb Name="gPoeComposerLowerBodyLimb" Type="Standard" EnumName="POE_COMPOSER_LIMB_LOWER_BODY" Offset="0x98F8" />
+
+        <!-- Skeleton -->
+        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" LimbNone="POE_COMPOSER_LIMB_NONE" LimbMax="POE_COMPOSER_LIMB_MAX" EnumName="PoeComposerLimb" Offset="0x9930" />
     </File>
 </Root>
diff --git a/spec b/spec
index 1344fcade..be052f9e8 100644
--- a/spec
+++ b/spec
@@ -4229,8 +4229,7 @@ beginseg
     name "ovl_En_Po_Composer"
     compress
     include "build/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.o"
-    include "build/data/ovl_En_Po_Composer/ovl_En_Po_Composer.data.o"
-    include "build/data/ovl_En_Po_Composer/ovl_En_Po_Composer.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Po_Composer/ovl_En_Po_Composer_reloc.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c
index ed8606208..c668b054c 100644
--- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c
+++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c
@@ -1,7 +1,7 @@
 /*
  * File: z_en_po_composer.c
  * Overlay: ovl_En_Po_Composer
- * Description: Poe Composers
+ * Description: Poe Composers Flat and Sharp
  */
 
 #include "z_en_po_composer.h"
@@ -15,19 +15,23 @@ void EnPoComposer_Destroy(Actor* thisx, PlayState* play);
 void EnPoComposer_Update(Actor* thisx, PlayState* play);
 void EnPoComposer_Draw(Actor* thisx, PlayState* play);
 
-void func_80BC5294(EnPoComposer* this, PlayState* play);
-void func_80BC52F0(EnPoComposer* this, PlayState* play);
-void func_80BC53A0(EnPoComposer* this, PlayState* play);
-void func_80BC5404(EnPoComposer* this, PlayState* play);
-void func_80BC5570(EnPoComposer* this, PlayState* play);
-void func_80BC55E0(EnPoComposer* this, PlayState* play);
-void func_80BC5670(EnPoComposer* this, PlayState* play);
-void func_80BC56D0(EnPoComposer* this, PlayState* play);
-void func_80BC5780(EnPoComposer* this, PlayState* play);
-void func_80BC5830(EnPoComposer* this, PlayState* play);
-void func_80BC58E0(EnPoComposer* this, PlayState* play);
-
-#if 0
+void EnPoComposer_AwaitPlayer(EnPoComposer* this, PlayState* play);
+void EnPoComposer_StartCutscene(EnPoComposer* this, PlayState* play);
+void EnPoComposer_StartedCutscene(EnPoComposer* this, PlayState* play);
+void EnPoComposer_PlayCurse(EnPoComposer* this, PlayState* play);
+void EnPoComposer_IdleStill(EnPoComposer* this, PlayState* play);
+void EnPoComposer_Appear(EnPoComposer* this, PlayState* play);
+void EnPoComposer_Idle(EnPoComposer* this, PlayState* play);
+void EnPoComposer_RaiseArms(EnPoComposer* this, PlayState* play);
+void EnPoComposer_LowerArms(EnPoComposer* this, PlayState* play);
+void EnPoComposer_CutscenePlayCurse(EnPoComposer* this, PlayState* play);
+void EnPoComposer_Roll(EnPoComposer* this, PlayState* play);
+
+void EnPoComposer_SetupAwaitPlayer(EnPoComposer* this);
+void EnPoComposer_SetupStartCutscene(EnPoComposer* this);
+void EnPoComposer_SetupStartedCutscene(EnPoComposer* this);
+void EnPoComposer_StepLightAlpha(EnPoComposer* this);
+
 ActorInit En_Po_Composer_InitVars = {
     /**/ ACTOR_EN_PO_COMPOSER,
     /**/ ACTORCAT_ITEMACTION,
@@ -40,32 +44,56 @@ ActorInit En_Po_Composer_InitVars = {
     /**/ EnPoComposer_Draw,
 };
 
-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_80BC6780 = {
-    { COLTYPE_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
-    { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, },
+static ColliderCylinderInit sCylinderInit = {
+    {
+        COLTYPE_HIT3,
+        AT_NONE,
+        AC_ON | AC_TYPE_PLAYER,
+        OC1_ON | OC1_TYPE_ALL,
+        OC2_TYPE_1,
+        COLSHAPE_CYLINDER,
+    },
+    {
+        ELEMTYPE_UNK0,
+        { 0x00000000, 0x00, 0x00 },
+        { 0xF7CFFFFF, 0x00, 0x00 },
+        TOUCH_NONE | TOUCH_SFX_NORMAL,
+        BUMP_ON,
+        OCELEM_ON,
+    },
     { 20, 40, 20, { 0, 0, 0 } },
 };
 
-// static ColliderJntSphElementInit sJntSphElementsInit[1] = {
-static ColliderJntSphElementInit D_80BC67AC[1] = {
+static ColliderJntSphElementInit sJntSphElementsInit[1] = {
     {
-        { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_ON, },
-        { 9, { { 0, -1500, 0 }, 10 }, 100 },
+        {
+            ELEMTYPE_UNK0,
+            { 0xF7CFFFFF, 0x00, 0x08 },
+            { 0x00000000, 0x00, 0x00 },
+            TOUCH_ON | TOUCH_SFX_NORMAL,
+            BUMP_NONE,
+            OCELEM_ON,
+        },
+        { POE_COMPOSER_LIMB_LANTERN, { { 0, -1500, 0 }, 10 }, 100 },
     },
 };
 
-// static ColliderJntSphInit sJntSphInit = {
-static ColliderJntSphInit D_80BC67D0 = {
-    { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_JNTSPH, },
-    ARRAY_COUNT(sJntSphElementsInit), D_80BC67AC, // sJntSphElementsInit,
+static ColliderJntSphInit sJntSphInit = {
+    {
+        COLTYPE_HIT3,
+        AT_ON | AT_TYPE_ENEMY,
+        AC_ON | AC_TYPE_PLAYER,
+        OC1_ON | OC1_TYPE_ALL,
+        OC2_TYPE_1,
+        COLSHAPE_JNTSPH,
+    },
+    ARRAY_COUNT(sJntSphElementsInit),
+    sJntSphElementsInit,
 };
 
-// sColChkInfoInit
-static CollisionCheckInfoInit D_80BC67E0 = { 4, 25, 50, 40 };
+static CollisionCheckInfoInit sColChkInfoInit = { 4, 25, 50, 40 };
 
-// static DamageTable sDamageTable = {
-static DamageTable D_80BC67E8 = {
+static DamageTable sDamageTable = {
     /* Deku Nut       */ DMG_ENTRY(0, 0x0),
     /* Deku Stick     */ DMG_ENTRY(2, 0x0),
     /* Horse trample  */ DMG_ENTRY(1, 0x0),
@@ -100,88 +128,619 @@ static DamageTable D_80BC67E8 = {
     /* Powder Keg     */ DMG_ENTRY(0, 0x0),
 };
 
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80BC6958[] = {
-    ICHAIN_F32(targetArrowOffset, 3200, ICHAIN_STOP),
+typedef enum {
+    /*  0 */ POE_COMPOSER_ANIM_STILL,
+    /*  1 */ POE_COMPOSER_ANIM_APPEAR_DISAPPEAR,
+    /*  2 */ POE_COMPOSER_ANIM_IDLE,
+    /*  3 */ POE_COMPOSER_ANIM_RAISE_ARMS,
+    /*  4 */ POE_COMPOSER_ANIM_ARMS_RAISED,
+    /*  5 */ POE_COMPOSER_ANIM_LOWER_ARMS,
+    /*  6 */ POE_COMPOSER_ANIM_LOOKING_DOWN,
+    /*  7 */ POE_COMPOSER_ANIM_BEGIN_PLAYING_CURSE,
+    /*  8 */ POE_COMPOSER_ANIM_PLAYING_CURSE,
+    /*  9 */ POE_COMPOSER_ANIM_BEGIN_ROLLING,
+    /* 10 */ POE_COMPOSER_ANIM_ROLLING,
+    /* 11 */ POE_COMPOSER_ANIM_FLEE,
+    /* 12 */ POE_COMPOSER_ANIM_ATTACK,
+    /* 13 */ POE_COMPOSER_ANIM_MAX
+} EnPoComposerAnim;
+
+static AnimationInfo sAnimationInfo[POE_COMPOSER_ANIM_MAX] = {
+    /*  0 */ { &gPoeComposerStillAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /*  1 */ { &gPoeComposerAppearDisappearAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f },
+    /*  2 */ { &gPoeComposerIdleAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /*  3 */ { &gPoeComposerRaiseArmsAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /*  4 */ { &gPoeComposerArmsRaisedAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /*  5 */ { &gPoeComposerLowerArmsAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /*  6 */ { &gPoeComposerLookDownAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /*  7 */ { &gPoeComposerBeginPlayAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /*  8 */ { &gPoeComposerPlayAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /*  9 */ { &gPoeComposerBeginRollAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /* 10 */ { &gPoeComposerRollAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /* 11 */ { &gPoeComposerFleeAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f },
+    /* 12 */ { &gPoeComposerAttackAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f },
 };
 
-#endif
-
-extern ColliderCylinderInit D_80BC6780;
-extern ColliderJntSphElementInit D_80BC67AC[1];
-extern ColliderJntSphInit D_80BC67D0;
-extern CollisionCheckInfoInit D_80BC67E0;
-extern DamageTable D_80BC67E8;
-extern InitChainEntry D_80BC6958[];
-
-extern UNK_TYPE D_0600188C;
-extern UNK_TYPE D_06006E08;
-extern UNK_TYPE D_06006FD8;
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/EnPoComposer_Init.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/EnPoComposer_Destroy.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5250.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5294.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC52D4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC52F0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC538C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC53A0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC53B0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5404.s")
+static Color_RGBA8 sLightColorInit = { 255, 255, 210, 0 };
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC552C.s")
+static Color_RGBA8 sEnvColorInit = { 0, 0, 0, 255 };
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5570.s")
+static Color_RGBA8 sSharpClothingColor1 = { 75, 20, 25, 255 };
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5580.s")
+static Color_RGBA8 sFlatClothingColor1 = { 80, 110, 90, 255 };
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC55E0.s")
+static Color_RGBA8 sSharpClothingColor2 = { 90, 85, 50, 255 };
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC562C.s")
+static Color_RGBA8 sFlatClothingColor2 = { 100, 90, 100, 255 };
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5670.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5680.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC56D0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5738.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5780.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC57E8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5830.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5898.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC58E0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC59BC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC59EC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5CC8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5D34.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5DEC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC5FE8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/EnPoComposer_Update.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC60BC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/func_80BC617C.s")
+static InitChainEntry sInitChain[] = {
+    ICHAIN_F32(targetArrowOffset, 3200, ICHAIN_STOP),
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Po_Composer/EnPoComposer_Draw.s")
+static s32 sPlayerIsPlayingOcarina = false;
+
+void EnPoComposer_Init(Actor* thisx, PlayState* play) {
+    EnPoComposer* this = THIS;
+
+    Actor_ProcessInitChain(&this->actor, sInitChain);
+    ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gPoeComposerSkel, &gPoeComposerIdleAnim, this->jointTable,
+                       this->morphTable, POE_COMPOSER_LIMB_MAX);
+    Collider_InitJntSph(play, &this->lanternCollider);
+    Collider_SetJntSph(play, &this->lanternCollider, &this->actor, &sJntSphInit, this->lanternColliderElements);
+    Collider_InitCylinder(play, &this->bodyCollider);
+    Collider_SetCylinder(play, &this->bodyCollider, &this->actor, &sCylinderInit);
+    CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
+    this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo);
+    Lights_PointGlowSetInfo(&this->lightInfo, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z,
+                            255, 255, 255, 0);
+    this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
+    this->lightColor = sLightColorInit;
+    this->envColor = sEnvColorInit;
+    this->cueId = POE_COMPOSER_CUEID_NONE;
+
+    if (POE_COMPOSER_IS_FLAT(&this->actor)) {
+        this->sharpCsNum = 0;
+        this->inCutscene = true;
+        EnPoComposer_SetupStartedCutscene(this);
+    } else if (POE_COMPOSER_4000(&this->actor)) {
+        if (gSaveContext.save.entrance != ENTRANCE(IKANA_CANYON, 10)) {
+            Actor_Kill(&this->actor);
+            return;
+        }
+        this->sharpCsNum = SHARP_CS_ENCOUNTER_FIRST;
+        this->inCutscene = true;
+        EnPoComposer_SetupStartedCutscene(this);
+    } else {
+        s32 i;
+        s16 csId = this->actor.csId;
+
+        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_14_04)) {
+            Actor_Kill(&this->actor);
+            return;
+        }
+
+        for (i = 0; i < ARRAY_COUNT(this->csIds); i++) {
+            if (csId == CS_ID_NONE) {
+                break;
+            }
+            this->csIds[i] = csId;
+            csId = CutsceneManager_GetAdditionalCsId(csId);
+        }
+
+        if (CHECK_WEEKEVENTREG(WEEKEVENTREG_14_02)) {
+            this->sharpCsNum = SHARP_CS_ENCOUNTER_OTHER;
+        } else {
+            this->sharpCsNum = SHARP_CS_ENCOUNTER_FIRST;
+        }
+        this->inCutscene = false;
+        EnPoComposer_SetupAwaitPlayer(this);
+    }
+}
+
+void EnPoComposer_Destroy(Actor* thisx, PlayState* play) {
+    EnPoComposer* this = THIS;
+
+    LightContext_RemoveLight(play, &play->lightCtx, this->lightNode);
+    Collider_DestroyJntSph(play, &this->lanternCollider);
+    Collider_DestroyCylinder(play, &this->bodyCollider);
+}
+
+void EnPoComposer_SetupAwaitPlayer(EnPoComposer* this) {
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_STILL);
+    this->actionFunc = EnPoComposer_AwaitPlayer;
+}
+
+void EnPoComposer_AwaitPlayer(EnPoComposer* this, PlayState* play) {
+    if (this->actor.xzDistToPlayer < 200.0f) {
+        EnPoComposer_SetupStartCutscene(this);
+    }
+}
+
+void EnPoComposer_SetupStartCutscene(EnPoComposer* this) {
+    this->inCutscene = true;
+    this->actionFunc = EnPoComposer_StartCutscene;
+}
+
+void EnPoComposer_StartCutscene(EnPoComposer* this, PlayState* play) {
+    if (CutsceneManager_IsNext(this->csIds[this->sharpCsNum])) {
+        CutsceneManager_Start(this->csIds[this->sharpCsNum], &this->actor);
+        EnPoComposer_SetupStartedCutscene(this);
+    } else {
+        if (CutsceneManager_GetCurrentCsId() == CS_ID_GLOBAL_TALK) {
+            CutsceneManager_Stop(CS_ID_GLOBAL_TALK);
+        }
+        CutsceneManager_Queue(this->csIds[this->sharpCsNum]);
+    }
+}
+
+void EnPoComposer_SetupStartedCutscene(EnPoComposer* this) {
+    this->actionFunc = EnPoComposer_StartedCutscene;
+}
+
+void EnPoComposer_StartedCutscene(EnPoComposer* this, PlayState* play) {
+}
+
+void EnPoComposer_SetupPlayCurse(EnPoComposer* this) {
+    this->actionTimer = 0;
+    this->actor.flags |= ACTOR_FLAG_TARGETABLE;
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_PLAYING_CURSE);
+    this->actionFunc = EnPoComposer_PlayCurse;
+}
+
+void EnPoComposer_PlayCurse(EnPoComposer* this, PlayState* play) {
+    Player* player = GET_PLAYER(play);
+
+    // Damage the player every second
+    if (this->actionTimer == 20) {
+        func_800B8D10(play, &this->actor, 0.0f, 0, 0.0f, 1, 4);
+        this->actionTimer = 0;
+    } else {
+        this->actionTimer++;
+    }
+
+    // Ocarina check
+    if (player->stateFlags2 & PLAYER_STATE2_8000000) {
+        if (!sPlayerIsPlayingOcarina) {
+            // Play sound whenever the player begins playing the Ocarina
+            Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
+        }
+        sPlayerIsPlayingOcarina = true;
+    } else {
+        sPlayerIsPlayingOcarina = false;
+    }
+
+    // Song check, check if player just played song of storms or song of healing
+    if (play->msgCtx.ocarinaMode == OCARINA_MODE_EVENT) {
+        switch (play->msgCtx.lastPlayedSong) {
+            case OCARINA_SONG_STORMS:
+                this->sharpCsNum = SHARP_CS_SONG_STORMS;
+                EnPoComposer_SetupStartCutscene(this);
+                break;
+
+            case OCARINA_SONG_HEALING:
+                this->sharpCsNum = SHARP_CS_SONG_HEALING;
+                EnPoComposer_SetupStartCutscene(this);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    // Play sharp's curse bgm
+    Audio_PlaySequenceAtPos(SEQ_PLAYER_BGM_SUB, &this->actor.projectedPos, NA_BGM_SHARPS_CURSE, 2000.0f);
+}
+
+void EnPoComposer_SetupIdleStill(EnPoComposer* this) {
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_STILL);
+    this->actionFunc = EnPoComposer_IdleStill;
+}
+
+void EnPoComposer_IdleStill(EnPoComposer* this, PlayState* play) {
+}
+
+void EnPoComposer_SetupAppear(EnPoComposer* this) {
+    this->actionTimer = 0;
+    Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_APPEAR);
+    Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH);
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_APPEAR_DISAPPEAR);
+    this->actionFunc = EnPoComposer_Appear;
+}
+
+void EnPoComposer_Appear(EnPoComposer* this, PlayState* play) {
+    this->actionTimer++;
+    this->actor.shape.rot.y += 0x1000;
+    if (this->actionTimer == 32) {
+        EnPoComposer_SetupIdleStill(this);
+    }
+}
+
+void EnPoComposer_SetupIdle(EnPoComposer* this) {
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_IDLE);
+    this->actionFunc = EnPoComposer_Idle;
+}
+
+void EnPoComposer_Idle(EnPoComposer* this, PlayState* play) {
+}
+
+void EnPoComposer_SetupRaiseArms(EnPoComposer* this) {
+    this->csCueTimer = 0;
+    Actor_PlaySfx(&this->actor, NA_SE_EN_SHARP_REACTION);
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_RAISE_ARMS);
+    this->actionFunc = EnPoComposer_RaiseArms;
+}
+
+void EnPoComposer_RaiseArms(EnPoComposer* this, PlayState* play) {
+    if ((this->csCueTimer == 0) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+        this->csCueTimer++;
+        Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_ARMS_RAISED);
+    }
+}
+
+void EnPoComposer_SetupLowerArms(EnPoComposer* this) {
+    this->csCueTimer = 0;
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_LOWER_ARMS);
+    this->actionFunc = EnPoComposer_LowerArms;
+}
+
+void EnPoComposer_LowerArms(EnPoComposer* this, PlayState* play) {
+    if ((this->csCueTimer == 0) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+        this->csCueTimer++;
+        Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_LOOKING_DOWN);
+    }
+}
+
+void EnPoComposer_SetupCutscenePlayCurse(EnPoComposer* this) {
+    this->csCueTimer = 0;
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_BEGIN_PLAYING_CURSE);
+    this->actionFunc = EnPoComposer_CutscenePlayCurse;
+}
+
+void EnPoComposer_CutscenePlayCurse(EnPoComposer* this, PlayState* play) {
+    if ((this->csCueTimer == 0) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+        this->csCueTimer++;
+        Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_PLAYING_CURSE);
+    }
+}
+
+void EnPoComposer_SetupRoll(EnPoComposer* this) {
+    this->csCueTimer = 0;
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_BEGIN_ROLLING);
+    this->actionFunc = EnPoComposer_Roll;
+}
+
+void EnPoComposer_Roll(EnPoComposer* this, PlayState* play) {
+    if (this->csCueTimer == 0) {
+        if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+            this->csCueTimer++;
+            Actor_PlaySfx(&this->actor, NA_SE_EN_SHARP_REACTION);
+            Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, POE_COMPOSER_ANIM_ROLLING);
+        }
+    } else if (Animation_OnFrame(&this->skelAnime, 1.0f) && (this->lightColor.a > 32)) {
+        if (this->csCueTimer == 1) {
+            Actor_PlaySfx(&this->actor, NA_SE_EN_LAST3_DEAD_WIND2_OLD);
+            this->csCueTimer = 2;
+        } else {
+            Actor_PlaySfx(&this->actor, NA_SE_EN_LAST3_DEAD_WIND3_OLD);
+            this->csCueTimer = 1;
+        }
+    }
+}
+
+void EnPoComposer_SharpCutsceneDone(EnPoComposer* this) {
+    SET_WEEKEVENTREG(WEEKEVENTREG_14_04);
+    Actor_Kill(&this->actor);
+}
+
+s32 EnPoComposer_UpdateAction(EnPoComposer* this, PlayState* play) {
+    u16 cueType = POE_COMPOSER_IS_FLAT(&this->actor) ? CS_CMD_ACTOR_CUE_482 : CS_CMD_ACTOR_CUE_481;
+    s32 cueChannel;
+
+    if (!this->inCutscene) {
+        return false;
+    }
+
+    if (Cutscene_IsCueInChannel(play, cueType)) {
+        cueChannel = Cutscene_GetCueChannel(play, cueType);
+
+        if (this->cueId != play->csCtx.actorCues[cueChannel]->id) {
+            this->cueId = play->csCtx.actorCues[cueChannel]->id;
+
+            switch (play->csCtx.actorCues[cueChannel]->id) {
+                case POE_COMPOSER_CUEID_IDLE: // loop idle
+                    EnPoComposer_SetupIdleStill(this);
+                    break;
+
+                case POE_COMPOSER_CUEID_APPEAR_SPIN: // appear/disappear -> loop idle
+                    EnPoComposer_SetupAppear(this);
+                    break;
+
+                case POE_COMPOSER_CUEID_IDLE2: // loop sharp idle
+                    EnPoComposer_SetupIdle(this);
+                    break;
+
+                case POE_COMPOSER_CUEID_RAISE_ARMS: // raise arms -> loop arms raised
+                    EnPoComposer_SetupRaiseArms(this);
+                    break;
+
+                case POE_COMPOSER_CUEID_LOWER_ARMS: // lower arms -> loop idle
+                    EnPoComposer_SetupLowerArms(this);
+                    break;
+
+                case POE_COMPOSER_CUEID_PLAY_CURSE: // begin playing -> loop playing
+                    EnPoComposer_SetupCutscenePlayCurse(this);
+                    break;
+
+                case POE_COMPOSER_CUEID_ROLL: // begin rolling -> loop rolling
+                    EnPoComposer_SetupRoll(this);
+                    break;
+
+                case POE_COMPOSER_CUEID_APPEAR: // appear
+                    this->visible = true;
+                    break;
+
+                case POE_COMPOSER_CUEID_DISAPPEAR: // disappear
+                    this->visible = false;
+                    Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DISAPPEAR);
+                    break;
+
+                case POE_COMPOSER_CUEID_DONE:
+                    if (cueType == CS_CMD_ACTOR_CUE_481) {
+                        EnPoComposer_SharpCutsceneDone(this);
+                    } else {
+                        Actor_Kill(&this->actor);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        if (this->actionFunc != EnPoComposer_Appear) {
+            Cutscene_ActorTranslateAndYaw(&this->actor, play, cueChannel);
+        } else {
+            Cutscene_ActorTranslate(&this->actor, play, cueChannel);
+        }
+
+        EnPoComposer_StepLightAlpha(this);
+
+        if ((this->sharpCsNum == SHARP_CS_SONG_STORMS) && (play->csCtx.curFrame == 204)) {
+            Audio_PlaySfx(NA_SE_SY_DIZZY_EFFECT);
+        }
+
+        if (this->visible == true) {
+            Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHARP_FLOAT - SFX_FLAG);
+        }
+        return true;
+    }
+
+    if ((this->actionFunc != EnPoComposer_StartedCutscene) && (this->actionFunc != EnPoComposer_StartCutscene) &&
+        (this->actionFunc != EnPoComposer_PlayCurse) && (play->csCtx.state == CS_STATE_IDLE)) {
+
+        if (POE_COMPOSER_IS_FLAT(&this->actor)) {
+            EnPoComposer_SetupStartedCutscene(this);
+        } else if (POE_COMPOSER_4000(&this->actor)) {
+            EnPoComposer_SetupStartedCutscene(this);
+        } else {
+            this->inCutscene = false;
+
+            if (this->sharpCsNum < SHARP_CS_SONG_STORMS) {
+                if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_14_02)) {
+                    SET_WEEKEVENTREG(WEEKEVENTREG_14_02);
+                }
+                EnPoComposer_SetupPlayCurse(this);
+            } else {
+                EnPoComposer_SetupStartedCutscene(this);
+            }
+        }
+    }
+
+    this->cueId = POE_COMPOSER_CUEID_NONE;
+    return false;
+}
+
+void EnPoComposer_StepLightAlpha(EnPoComposer* this) {
+    if ((this->visible == true) && (this->lightColor.a != 255)) {
+        if (this->lightColor.a > 247) {
+            this->lightColor.a = 255;
+        } else {
+            this->lightColor.a += 7;
+        }
+    } else if (!this->visible && (this->lightColor.a != 0)) {
+        if (this->lightColor.a < 8) {
+            this->lightColor.a = 0;
+        } else {
+            this->lightColor.a -= 7;
+        }
+    }
+}
+
+void EnPoComposer_StepLightColor(EnPoComposer* this) {
+    s16 color;
+
+    color = this->lightColor.r + 5;
+    this->lightColor.r = CLAMP_MAX(color, 255);
+
+    color = this->lightColor.g + 5;
+    this->lightColor.g = CLAMP_MAX(color, 255);
+
+    if (this->lightColor.b > 210) {
+        color = this->lightColor.b - 5;
+        this->lightColor.b = CLAMP_MIN(color, 210);
+    } else {
+        color = this->lightColor.b + 5;
+        this->lightColor.b = CLAMP_MAX(color, 210);
+    }
+}
+
+void EnPoComposer_UpdateEnvColor(EnPoComposer* this) {
+    if ((this->actionFunc == EnPoComposer_Appear) && (this->skelAnime.curFrame < 12.0f)) {
+        // Step rgb from 55 to 255 and alpha from 0 to 200 over the first 12 frames of the appear anim
+        this->envColor.r = this->envColor.g = this->envColor.b = 55.0f + this->skelAnime.curFrame * 16.66f;
+        this->envColor.a = this->skelAnime.curFrame * (200.0f / 12.0f);
+    } else {
+        f32 rand = Rand_ZeroOne();
+
+        this->envColor.r = 225 + (s32)(rand * 30.0f);
+        this->envColor.g = 155 + (s32)(rand * 100.0f);
+        this->envColor.b = 95 + (s32)(rand * 160.0f);
+        this->envColor.a = 200;
+    }
+    if (this->lightColor.a == 0) {
+        this->envColor.a = 0;
+    }
+}
+
+void EnPoComposer_UpdateCollision(EnPoComposer* this, PlayState* play) {
+    Collider_UpdateCylinder(&this->actor, &this->bodyCollider);
+    CollisionCheck_SetOC(play, &play->colChkCtx, &this->bodyCollider.base);
+    CollisionCheck_SetOC(play, &play->colChkCtx, &this->lanternCollider.base);
+}
+
+void EnPoComposer_Update(Actor* thisx, PlayState* play) {
+    EnPoComposer* this = THIS;
+
+    EnPoComposer_UpdateEnvColor(this);
+    SkelAnime_Update(&this->skelAnime);
+    Actor_SetFocus(&this->actor, 42.0f);
+
+    this->actionFunc(this, play);
+
+    if (!EnPoComposer_UpdateAction(this, play)) {
+        EnPoComposer_UpdateCollision(this, play);
+    }
+}
+
+s32 EnPoComposer_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx,
+                                  Gfx** gfx) {
+    EnPoComposer* this = THIS;
+
+    if ((this->lightColor.a == 0) || (limbIndex == POE_COMPOSER_LIMB_LANTERN)) {
+        *dList = NULL;
+    } else if (POE_COMPOSER_IS_FLAT(&this->actor) && (limbIndex == POE_COMPOSER_LIMB_HEAD)) {
+        *dList = gPoeComposerFlatHeadDL;
+    }
+
+    if (limbIndex == 19) {
+        //! @bug skeleton does not have a limb 19, this is leftover from OoT Poes
+        gDPPipeSync((*gfx)++);
+        gDPSetEnvColor((*gfx)++, this->lightColor.r, this->lightColor.g, this->lightColor.b, this->lightColor.a);
+    }
+
+    return false;
+}
+
+void EnPoComposer_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, Gfx** gfx) {
+    EnPoComposer* this = THIS;
+
+    Collider_UpdateSpheres(limbIndex, &this->lanternCollider);
+    if (limbIndex == POE_COMPOSER_LIMB_LANTERN) {
+        Matrix_Get(&this->lanternMtxF);
+    }
+}
+
+void EnPoComposer_Draw(Actor* thisx, PlayState* play) {
+    EnPoComposer* this = THIS;
+    s32 pad;
+    Gfx* dl;
+    Color_RGBA8* clothingColor;
+    Color_RGBA8* var_t0;
+    Vec3f lightOffset;
+    Vec3s lightPos;
+
+    OPEN_DISPS(play->state.gfxCtx);
+
+    EnPoComposer_StepLightColor(this);
+
+    // Select colors
+
+    if (POE_COMPOSER_IS_FLAT(&this->actor)) {
+        clothingColor = &sFlatClothingColor1;
+        var_t0 = &sFlatClothingColor2;
+    } else {
+        clothingColor = &sSharpClothingColor1;
+        var_t0 = &sSharpClothingColor2;
+    }
+
+    // Draw skeleton
+
+    if ((this->lightColor.a == 255) || (this->lightColor.a == 0)) {
+        Gfx_SetupDL25_Opa(play->state.gfxCtx);
+
+        gSPSegment(POLY_OPA_DISP++, 0x08,
+                   Gfx_EnvColor(play->state.gfxCtx, this->lightColor.r, this->lightColor.g, this->lightColor.b,
+                                this->lightColor.a));
+        gSPSegment(
+            POLY_OPA_DISP++, 0x0A,
+            Gfx_EnvColor(play->state.gfxCtx, clothingColor->r, clothingColor->g, clothingColor->b, this->lightColor.a));
+        gSPSegment(POLY_OPA_DISP++, 0x0B,
+                   Gfx_EnvColor(play->state.gfxCtx, var_t0->r, var_t0->g, var_t0->b, this->lightColor.a));
+        gSPSegment(POLY_OPA_DISP++, 0x0C, D_801AEFA0);
+
+        POLY_OPA_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               EnPoComposer_OverrideLimbDraw, EnPoComposer_PostLimbDraw, &this->actor, POLY_OPA_DISP);
+    } else {
+        Gfx_SetupDL25_Opa(play->state.gfxCtx);
+        Gfx_SetupDL25_Xlu(play->state.gfxCtx);
+
+        gSPSegment(POLY_XLU_DISP++, 0x08,
+                   Gfx_EnvColor(play->state.gfxCtx, this->lightColor.r, this->lightColor.g, this->lightColor.b,
+                                this->lightColor.a));
+        gSPSegment(
+            POLY_XLU_DISP++, 0x0A,
+            Gfx_EnvColor(play->state.gfxCtx, clothingColor->r, clothingColor->g, clothingColor->b, this->lightColor.a));
+        gSPSegment(POLY_XLU_DISP++, 0x0B,
+                   Gfx_EnvColor(play->state.gfxCtx, var_t0->r, var_t0->g, var_t0->b, this->lightColor.a));
+        gSPSegment(POLY_XLU_DISP++, 0x0C, D_801AEF88);
+
+        POLY_XLU_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               EnPoComposer_OverrideLimbDraw, EnPoComposer_PostLimbDraw, &this->actor, POLY_XLU_DISP);
+    }
+
+    if (this->lightColor.a != 0) {
+        // Draw lantern if visible
+
+        if (this->lightColor.a == 255) {
+            Scene_SetRenderModeXlu(play, 0, 1);
+            dl = POLY_OPA_DISP;
+        } else {
+            Scene_SetRenderModeXlu(play, 1, 2);
+            dl = POLY_XLU_DISP;
+        }
+
+        gDPPipeSync(&dl[0]);
+        gDPSetEnvColor(&dl[1], this->envColor.r, this->envColor.g, this->envColor.b, this->lightColor.a);
+
+        Matrix_Put(&this->lanternMtxF);
+        gSPMatrix(&dl[2], Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+        gSPDisplayList(&dl[3], gPoeComposerLanternBaseDL);
+        gSPDisplayList(&dl[4], gPoeComposerLanternGlassDL);
+
+        gDPPipeSync(&dl[5]);
+        gDPSetEnvColor(&dl[6], clothingColor->r, clothingColor->g, clothingColor->b, this->lightColor.a);
+        gSPDisplayList(&dl[7], gPoeComposerLanternTopDL);
+
+        if (this->lightColor.a == 255) {
+            POLY_OPA_DISP = &dl[8];
+        } else {
+            POLY_XLU_DISP = &dl[8];
+        }
+    }
+
+    Matrix_Put(&play->billboardMtxF);
+    Matrix_MultVecZ(15.0f, &lightOffset);
+    lightPos = this->lanternCollider.elements[0].dim.worldSphere.center;
+    lightPos.x += (s16)lightOffset.x;
+    lightPos.y += (s16)lightOffset.y;
+    lightPos.z += (s16)lightOffset.z;
+
+    Lights_PointGlowSetInfo(&this->lightInfo, lightPos.x, lightPos.y, lightPos.z, this->envColor.r, this->envColor.g,
+                            this->envColor.b, this->envColor.a * (200.0f / 255.0f));
+
+    CLOSE_DISPS(play->state.gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
index a42b5048f..55d751839 100644
--- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
+++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
@@ -2,6 +2,32 @@
 #define Z_EN_PO_COMPOSER_H
 
 #include "global.h"
+#include "objects/object_po_composer/object_po_composer.h"
+
+#define POE_COMPOSER_IS_FLAT(thisx) ((thisx)->params & 0x8000)
+#define POE_COMPOSER_4000(thisx)    ((thisx)->params & 0x4000)
+
+typedef enum {
+    /*  1 */ POE_COMPOSER_CUEID_IDLE = 1,
+    /*  2 */ POE_COMPOSER_CUEID_APPEAR_SPIN,
+    /*  3 */ POE_COMPOSER_CUEID_IDLE2,
+    /*  4 */ POE_COMPOSER_CUEID_RAISE_ARMS,
+    /*  5 */ POE_COMPOSER_CUEID_LOWER_ARMS,
+    /*  6 */ POE_COMPOSER_CUEID_PLAY_CURSE,
+    /*  7 */ POE_COMPOSER_CUEID_ROLL,
+    /*  8 */ POE_COMPOSER_CUEID_APPEAR,
+    /*  9 */ POE_COMPOSER_CUEID_DISAPPEAR,
+    /* 10 */ POE_COMPOSER_CUEID_DONE,
+    /* 99 */ POE_COMPOSER_CUEID_NONE = 99
+} EnPoComposerCueId;
+
+typedef enum {
+    /* 0 */ SHARP_CS_ENCOUNTER_FIRST,
+    /* 1 */ SHARP_CS_ENCOUNTER_OTHER,
+    /* 2 */ SHARP_CS_SONG_HEALING,
+    /* 3 */ SHARP_CS_SONG_STORMS,
+    /* 4 */ SHARP_CS_MAX
+} SharpCsIdIndex;
 
 struct EnPoComposer;
 
@@ -9,9 +35,26 @@ typedef void (*EnPoComposerActionFunc)(struct EnPoComposer*, PlayState*);
 
 typedef struct EnPoComposer {
     /* 0x000 */ Actor actor;
-    /* 0x144 */ char unk_144[0xF0];
+    /* 0x144 */ ColliderCylinder bodyCollider;
+    /* 0x190 */ ColliderJntSph lanternCollider;
+    /* 0x1B0 */ ColliderJntSphElement lanternColliderElements[1];
+    /* 0x1F0 */ SkelAnime skelAnime;
     /* 0x234 */ EnPoComposerActionFunc actionFunc;
-    /* 0x238 */ char unk_238[0x108];
+    /* 0x238 */ MtxF lanternMtxF;
+    /* 0x278 */ LightNode* lightNode;
+    /* 0x27C */ LightInfo lightInfo;
+    /* 0x28A */ UNK_TYPE1 unk_28A[0x6];
+    /* 0x290 */ s32 sharpCsNum;
+    /* 0x294 */ Vec3s jointTable[POE_COMPOSER_LIMB_MAX];
+    /* 0x2DC */ Vec3s morphTable[POE_COMPOSER_LIMB_MAX];
+    /* 0x324 */ s16 csIds[SHARP_CS_MAX];
+    /* 0x32C */ s16 actionTimer;
+    /* 0x32E */ s16 csCueTimer;
+    /* 0x330 */ s16 inCutscene;
+    /* 0x332 */ s16 visible;
+    /* 0x334 */ u16 cueId;
+    /* 0x336 */ Color_RGBA8 lightColor;
+    /* 0x33A */ Color_RGBA8 envColor;
 } EnPoComposer; // size = 0x340
 
 #endif // Z_EN_PO_COMPOSER_H