Merge branch 'zeldaret:main' into d_a_obj_bird_sp

include/d/a/obj/d_a_obj_island_LOD.h

@@ -8,7 +8,19 @@ public:
     dAcOislandLOD_c() {}
     virtual ~dAcOislandLOD_c() {}
 
+    virtual bool createHeap() override;
+    virtual int create() override;
+    virtual int doDelete() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
+
 private:
+    static const char* const resFilenames[5];
+    static const char* const resMdlNames[5];
+    
+    /* 0x330 */ nw4r::g3d::ResFile mResFile;
+    /* 0x334 */ m3d::smdl_c mMdl;
+    /* 0x350 */ u8 mMdlLodIdx;
 };
 
 #endif

include/d/a/obj/d_a_obj_stream_lava.h

@@ -1,20 +1,47 @@
 #ifndef D_A_OBJ_STREAM_LAVA_H
 #define D_A_OBJ_STREAM_LAVA_H
 
+#include "common.h"
 #include "d/a/obj/d_a_obj_base.h"
+#include "d/col/bg/d_bg_w.h"
+#include "m/m3d/m_anmmatclr.h"
+#include "m/m3d/m_anmtexsrt.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
+#include "toBeSorted/actor_event.h"
+#include "toBeSorted/stage_render_stuff.h"
 
 class dAcOstreamLava_c : public dAcObjBase_c {
 public:
-    dAcOstreamLava_c() : mStateMgr(*this, sStateID::null) {}
+    dAcOstreamLava_c() : mStateMgr(*this, sStateID::null), mEvent(*this, nullptr), mScnCallback(this) {}
+    virtual int create() override;
+    virtual int doDelete() override;
+    virtual int draw() override;
+    virtual bool createHeap() override;
     virtual ~dAcOstreamLava_c() {}
+    virtual int actorExecute() override;
 
     STATE_FUNC_DECLARE(dAcOstreamLava_c, Wait);
     STATE_FUNC_DECLARE(dAcOstreamLava_c, Stream);
 
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcOstreamLava_c);
+    const static f32 unkFloat0;
+    static u32 eventFlags1;
+    static u32 eventFlags2;
+
+    /* 0x330 */ nw4r::g3d::ResFile mResFile;
+    /* 0x334 */ m3d::smdl_c mModel;
+    /* 0x350 */ m3d::anmTexSrt_c mAnmTexSrtWait;
+    /* 0x37C */ m3d::anmMatClr_c mAnmMatClr;
+    /* 0x3A8 */ dBgW mCollision;
+    /* 0x5B8 */ STATE_MGR_DECLARE(dAcOstreamLava_c);
+    /* 0x5F4 */ ActorEventRelated mEvent;
+    /* 0x644 */ dScnCallback_c mScnCallback;
+
+    /* 0x650 */ u8 mSubtype;
+    /* 0x651 */ u8 mShouldStreamSceneflag;
+    /* 0x652 */ u8 mEventId;
+    /* 0x653 */ bool mHideActor;
 };
 
 #endif

include/d/t/d_t_shutter_fence_forbiddance.h

@@ -1,13 +1,16 @@
 #ifndef D_T_SHUTTER_FENCE_FORBIDDANCE_H
 #define D_T_SHUTTER_FENCE_FORBIDDANCE_H
 
-#include "d/a/d_a_base.h"
+#include "d/t/d_tg.h"
 
-class dTgShutterFenceForbiddance_c : public dAcBase_c {
+class dTgShutterFenceForbiddance_c : public dTg_c {
 public:
     dTgShutterFenceForbiddance_c();
     virtual ~dTgShutterFenceForbiddance_c();
 
+    virtual int create() override;
+    virtual int actorExecute() override;
+
 private:
 };
 

include/f/f_base.h

@@ -15,7 +15,6 @@
 #include "f/f_manager.h"
 #include "f/f_profile.h"
 
-
 // Ghidra: fBase
 //   size: 0x64
 // official name
@@ -91,6 +90,10 @@ public:
         group_type = m_tmpCtData.group_type;
     }
 
+    inline u32 getFromParams(u8 shift, u32 mask) {
+        return (params >> shift) & mask;
+    }
+
 public:
     /* 802e12f0 */ fBase_c();
     /* 802e23b0 */ static void *operator new(size_t);

include/toBeSorted/blur_and_palette_manager.h

@@ -268,6 +268,8 @@ public:
     void fn_800226E0(LightParams *);
     // light pillar related
     void fn_80024240(s16, s16, s16);
+    bool fn_80024770(int);
+    bool fn_800247A0(int);
 
     u8 get0x2DE8() const {
         return field_0x2DE0[8];

include/toBeSorted/event.h

@@ -15,6 +15,10 @@ public:
     void *callback2;
 
 public:
+    static u32 makeEventFlag(const u32 &clearMask, const u32 &unsetBits) {
+        return clearMask & ~unsetBits;
+    }
+
     /** 0x800A0C40 */
     Event(const char *eventName, u32 unk, u32 eventFlags, void *callback1, void *callback2);
     Event(u32 eventId, s32 roomId, u32 eventFlags, void *callback1, void *callback2);