d_a_obj_appear_bridge mostly matching (#36)

* d_a_obj_appear_bridge - weak function order issue

* Mark as nonmatching for now

* Name unk IScnObjCallback funcs

---------

Co-authored-by: elijah-thomas774 <elijahthomas774@gmail.com>

include/d/a/d_a_base.h

@@ -70,9 +70,9 @@ public:
     /* 0x84 */ ObjInfo *obj_info;
     /* 0x88 */ TList<SoundInfo, 0xC> sound_list;
     /* 0x94 */ SoundSource *sound_source;
-    /* 0x9C */ mVec3_c *obj_pos;
-    /* 0x9c */ mVec3_c pos_copy;
-    /* 0xa8 */ u32 params2;
+    /* 0x98 */ mVec3_c *obj_pos;
+    /* 0x9C */ mVec3_c pos_copy;
+    /* 0xA8 */ u32 params2;
     /* 0xAC */ mAng3_c rot_copy;
     /* 0xB2 */ u16 obj_id; // enemydefeat flag / id on obj-map
     /* 0xB4 */ s8 room_id_copy;

include/d/a/obj/d_a_obj_appear_bridge.h

@@ -0,0 +1,50 @@
+#ifndef D_A_OBJ_APPEAR_BRIDGE_H
+#define D_A_OBJ_APPEAR_BRIDGE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <m/m3d/m_anmmatclr.h>
+#include <m/m3d/m_anmtexsrt.h>
+#include <m/m3d/m_smdl.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+#include <toBeSorted/actor_collision.h>
+#include <toBeSorted/actor_event.h>
+#include <toBeSorted/stage_render_stuff.h>
+
+class dAcOappearBridge_c : public dAcObjBase_c {
+public:
+    dAcOappearBridge_c() : mStateMgr(*this, sStateID::null), mActorEvent(*this, nullptr), mSceneCallback(this) {}
+    virtual ~dAcOappearBridge_c() {}
+    virtual bool createHeap() override;
+    virtual int create() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
+    virtual int doDelete() override;
+
+    STATE_FUNC_DECLARE(dAcOappearBridge_c, Wait);
+    STATE_FUNC_DECLARE(dAcOappearBridge_c, Appear);
+    STATE_FUNC_DECLARE(dAcOappearBridge_c, Disappear);
+
+private:
+    static const f32 sMovementRate;
+
+    nw4r::g3d::ResFile mResFile;
+    m3d::smdl_c mModel;
+    m3d::anmTexSrt_c mSrtAnm;
+    m3d::anmMatClr_c mClrAnm;
+    ActorCollision mCollision;
+    STATE_MGR_DECLARE(dAcOappearBridge_c);
+    ActorEventRelated mActorEvent;
+
+    // TODO the weak IScnObjCallback functions are in the wrong order.
+    // The vtable order is            dtor, World,   Mat,  View,   Opa,   Xlu
+    // and the emitted order is       dtor,   Xlu,   Opa,  View,   Mat, World
+    // but the order in the binary is dtor,   Xlu,   Opa,  Mat,  World,  View
+    dScnCallback_c mSceneCallback;
+    /* 0x650 */ mVec3_c mSoundPosition;
+    /* 0x65C */ f32 field_0x65C;
+    /* 0x660 */ u8 mAreaIdx;
+    /* 0x661 */ u8 mEventId;
+};
+
+#endif

include/nw4r/g3d/g3d_scnobj.h

@@ -144,6 +144,8 @@ struct IScnObjCallback {
     virtual void ExecCallback_CALC_WORLD(ScnObj::Timing, ScnObj *, u32, void *) {} // at 0xC
     virtual void ExecCallback_CALC_MAT(ScnObj::Timing, ScnObj *, u32, void *) {}   // at 0x10
     virtual void ExecCallback_CALC_VIEW(ScnObj::Timing, ScnObj *, u32, void *) {}  // at 0x14
+    virtual void ExecCallback_DRAW_OPA(ScnObj::Timing, ScnObj *, u32, void *) {}   // at 0x18
+    virtual void ExecCallback_DRAW_XLU(ScnObj::Timing, ScnObj *, u32, void *) {}   // at 0x1C
 };
 
 // Is there a better way of resolving this dependency?

include/toBeSorted/actor_collision.h

@@ -32,6 +32,7 @@ public:
 
     static CollisionCheckContext* get();
     void registerActorBgCollision(ActorCollision&, dAcObjBase_c*);
+    void destroyActorBgCollision(ActorCollision&);
 };
 
 #endif

include/toBeSorted/area_utils.h

@@ -0,0 +1,10 @@
+#ifndef AREA_UTILS_H
+#define AREA_UTILS_H
+
+#include <m/m_vec.h>
+
+/* 800a9b00 */ bool checkPosInArea(void **AREA, const mVec3_c& pos);
+/* 800a9bd0 */ void *getAreaForIndexInRoom(s32 areaIndex, s32 roomId);
+/* 800a9c50 */ bool *checkPosInArea(s32 areaIndex, s32 roomId, const mVec3_c& pos, void **AREA);
+
+#endif

include/toBeSorted/event.h

@@ -17,6 +17,7 @@ public:
 public:
     /** 0x800A0C40 */
     Event(char *eventName, u32 unk, u32 eventFlags, void *callback1, void *callback2);
+    Event(u32 eventId, s32 roomId, u32 eventFlags, void *callback1, void *callback2);
     /** 0x800A1240 */
     virtual ~Event();
 };

include/toBeSorted/stage_render_stuff.h

@@ -0,0 +1,19 @@
+#ifndef D_STAGE_RENDER_STUFF_H
+#define D_STAGE_RENDER_STUFF_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <nw4r/g3d/g3d_scnobj.h>
+#include <m/m3d/m_scnleaf.h>
+
+class dScnCallback_c : public nw4r::g3d::IScnObjCallback {
+public:
+    dScnCallback_c(dAcObjBase_c *arg): mpActor(arg) {}
+    /* vt 0x10 */ virtual void ExecCallback_CALC_MAT(nw4r::g3d::ScnObj::Timing, nw4r::g3d::ScnObj *, u32, void *) override;
+
+    /* 0x04 */ dAcObjBase_c *mpActor;
+    /* 0x08 */ UNKWORD field_0x08;
+
+    /* 8001a230 */ void attach(m3d::scnLeaf_c&);
+};
+
+#endif