Mir_Ray (1 non-matching) (#634)

* Mir_Ray

* PR

* fmt

include/functions.h

@@ -2052,7 +2052,7 @@ s32 func_80124020(void);
 u8 Player_GetMask(GlobalContext* globalCtx);
 void Player_RemoveMask(GlobalContext* globalCtx);
 s32 func_8012405C(GlobalContext* globalCtx);
-// void func_80124088(void);
+s32 func_80124088(GlobalContext* globalCtx);
 s32 func_801240C8(Player* player);
 // void func_801240DC(void);
 // void func_80124110(void);

spec

@@ -1254,8 +1254,11 @@ beginseg
     name "ovl_Mir_Ray"
     compress
     include "build/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.o"
-    include "build/data/ovl_Mir_Ray/ovl_Mir_Ray.data.o"
+#ifdef NON_MATCHING
+    include "build/src/overlays/actors/ovl_Mir_Ray/ovl_Mir_Ray_reloc.o"
+#else
     include "build/data/ovl_Mir_Ray/ovl_Mir_Ray.reloc.o"
+#endif
 endseg
 
 beginseg

src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h

@@ -5,9 +5,39 @@
 
 struct MirRay;
 
+#define MIRRAY_LOCATION(thisx) ((thisx)->params)
+
+// Locations of light beams in sMirRayData
+typedef enum {
+    /* 0 */ MIRRAY_SPIRIT_BOMBCHUIWAROOM_DOWNLIGHT,
+    /* 1 */ MIRRAY_SPIRIT_SUNBLOCKROOM_DOWNLIGHT,
+    /* 2 */ MIRRAY_SPIRIT_SINGLECOBRAROOM_DOWNLIGHT,
+    /* 3 */ MIRRAY_SPIRIT_ARMOSROOM_DOWNLIGHT,
+    /* 4 */ MIRRAY_SPIRIT_TOPROOM_DOWNLIGHT,
+    /* 5 */ MIRRAY_SPIRIT_TOPROOM_CEILINGMIRROR,
+    /* 6 */ MIRRAY_SPIRIT_SINGLECOBRAROOM_COBRA,
+    /* 7 */ MIRRAY_SPIRIT_TOPROOM_COBRA1,
+    /* 8 */ MIRRAY_SPIRIT_TOPROOM_COBRA2,
+    /* 9 */ MIRRAY_GANONSCASTLE_SPIRITTRIAL_DOWNLIGHT,
+    /* 10 */ MIRRAY_MAX,
+} MirRayBeamLocations;
+
 typedef struct MirRay {
-    /* 0x000 */ Actor actor;
-    /* 0x144 */ char unk_144[0x164];
+    /* 0x0000 */ Actor actor;
+    /* 0x0144 */ ColliderJntSph collider1;
+    /* 0x0164 */ ColliderJntSphElement collider1Elements[1];
+    /* 0x01A4 */ ColliderQuad collider2;
+    /* 0x0224 */ f32 reflectIntensity; // Reflection occurs if it is positive, brightness depends on it
+    /* 0x0228 */ Vec3f shieldCorners[6];
+    /* 0x0270 */ f32 reflectRange;
+    /* 0x0274 */ Vec3f sourcePt;
+    /* 0x0280 */ Vec3f poolPt;
+    /* 0x028C */ s16 sourceEndRad;
+    /* 0x028E */ s16 poolEndRad;
+    /* 0x0290 */ s16 lightPointRad;
+    /* 0x0294 */ LightNode* lightNode;
+    /* 0x0298 */ LightInfo lightInfo;
+    /* 0x02A6 */ u8 unLit; // Conditioned on. set in Cobra?
 } MirRay; // size = 0x2A8
 
 extern const ActorInit Mir_Ray_InitVars;

tools/disasm/functions.txt

@@ -6539,17 +6539,17 @@
     0x808E2444:("func_808E2444",),
     0x808E24B4:("BgCtowerRot_Update",),
     0x808E24D8:("BgCtowerRot_Draw",),
-    0x808E2600:("func_808E2600",),
-    0x808E26C8:("func_808E26C8",),
+    0x808E2600:("MirRay_SetupCollider",),
+    0x808E26C8:("MirRay_MakeShieldLight",),
     0x808E286C:("MirRay_Init",),
     0x808E2B04:("MirRay_Destroy",),
     0x808E2B7C:("MirRay_Update",),
-    0x808E2C68:("func_808E2C68",),
-    0x808E2E1C:("func_808E2E1C",),
-    0x808E2FF8:("func_808E2FF8",),
-    0x808E30FC:("func_808E30FC",),
+    0x808E2C68:("MirRay_SetIntensity",),
+    0x808E2E1C:("MirRay_SetupReflectionPolys",),
+    0x808E2FF8:("MirRay_RemoveSimilarReflections",),
+    0x808E30FC:("MirRay_ReflectedBeam",),
     0x808E36A4:("MirRay_Draw",),
-    0x808E3984:("func_808E3984",),
+    0x808E3984:("MirRay_CheckInFrustum",),
     0x808E3EF0:("EnSb_Init",),
     0x808E3FF0:("EnSb_Destroy",),
     0x808E401C:("EnSb_SpawnBubbles",),

undefined_syms.txt

@@ -1975,12 +1975,6 @@ D_06000D94 = 0x06000D94;
 D_06007650 = 0x06007650;
 D_0600D658 = 0x0600D658;
 
-// ovl_Mir_Ray
-
-D_06000168 = 0x06000168;
-D_060003F8 = 0x060003F8;
-D_060004B0 = 0x060004B0;
-
 // ovl_Mir_Ray3
 
 D_06000168 = 0x06000168;