d_a_npc work

daBaseNpc_c::setBckAnm and J3DAnmTransform* daBaseNpc_c daBaseNpc_c::setBtpAnm daBaseNpc_c::attnSttsOn daBaseNpc_c::orderEvent daBaseNpc_c::setEnvTevColor daBaseNpc_c::setRoomNo daBaseNpc_c::checkEndAnm attempt CheckCreateHeap daNpcF_addIdx daNpcF_subIdx daNpcF_incIdx daNpcF_decIdx daNpcF_ActorMngr_c::initialize() daNpcF_ActorMngr_c::entry cleanup daNpcF_ActorMngr_c::entry daNpcF_ActorMngr_c::remove daNpcF_ActorMngr_c::getActorP daNpcF_MatAnm_c::calc attempt daNpcF_SPCurve_c::initialize minor fixes daNpcF_Path_c::initialize daNpcF_Path_c::setPathInfo daNpcF_Path_c::chkPassed daNpcF_Path_c::reverse daNpcF_Path_c::setNextIdx daNpcF_Path_c::getNextIdx daNpcF_Path_c::getBeforeIdx daNpcF_Path_c::getBeforePos daNpcF_Path_c::getNextPos daNpcT_MatAnm_c::initialize daNpcT_MatAnm_c::calc daNpcT_addIdx daNpcT_subIdx daNpcT_decIdx daNpcT_Path_c::hermite daNpcT_Path_c::initialize daNpcT_Path_c::setPathInfo attempt daNpcT_Path_c::setNextPathInfo daNpcT_Path_c::reverse daNpcT_Path_c::setNextIdx daNpcT_Path_c::getDstPos attempt daNpcT_DmgStagger_c::setParam Add FLOAT_LABEL where possible fopEn_enemy / fix e_wb move jasper's jsystem work over d_attention / d_demo / d_lib work remove asm clean up dolphin files / work on some rels (#212) * d_a_alldie / d_a_tboxSw / d_a_tag_gstart / d_a_tag_hstop * dolphin OS work / cleanup * dolphin GX work / cleanup * finish changing dolphin files to C * more files into C * match rest of MSL_C math functions * more dolphin files converted to C * remove asm * d_bg_w work * remove asm * d_a_alink work / kytag14 initial changes to d_a_e_yc checkpoint until virtual destructor issue is solved daNpcF_Lookat_c::adjustMoveDisAngle daBaseNpc_c::setMtx daBaseNpc_moveBgActor_c::daBaseNpc_moveBgActor_c() daNpcT_c::ctrlFaceMotion daNpcT_c::ctrlMsgAnm attempt daNpcT_c::initTalk daNpcF_clearMessageTmpBit daNpcF_getDistTableIdx daNpcF_offTmpBit daNpcF_onTmpBit daNpcF_chkTmpBit daNpcF_onEvtBit daNpcF_chkEvtBit daNpcF_c::getDistTableIdx daNpcF_chkPointInArea daNpcF_chkDoBtnEqSpeak daNpcF_getPlayerInfoFromPlayerList attempt daNpcF_pntVsLineSegmentLengthSquare2D daNpcF_c::chkPointInArea daNpcF_c::chkPointInArea daNpcF_c::getAttentionPos daNpcT_chkTmpBit daNpcT_offTmpBit daNpcT_onTmpBit daNpcT_chkEvtBit daNpcT_offEvtBit daNpcT_onEvtBit daNpcT_chkDoBtnIsSpeak daNpcT_getDistTableIdx daBaseNpc_acMngr_c::entry daNpcF_c::initTalk undo override
2026-07-04 21:35:31 -04:00 · 2022-10-15 15:32:34 -06:00
parent 84950e08b4
commit 85ad8b190d
880 changed files with 23183 additions and 38749 deletions
@@ -9,7 +9,9 @@

 namespace JStudio {
 namespace data {
-    struct TEOperationData {};
+    enum TEOperationData {
+        UNK_0x19 = 0x19,
+    };
 };

 struct TAdaptor;
@@ -50,6 +52,26 @@ public:
    /* 8028680C */ virtual void do_wait(u32);
    /* 8028682C */ virtual void do_data(void const*, u32, void const*, u32);

+    void prepareAdaptor() {
+        if (mpAdaptor != NULL) {
+            // mpAdaptor->adaptor_setObject_(this);
+            // mpAdaptor->adaptor_do_begin();
+        }
+    }
+
+    template<class T>
+    T* createFromAdaptor(const stb::data::TParse_TBlock_object& param_0, T* param_1) {
+        T* n = new T(param_0, param_1);
+
+        if (n == NULL) {
+            return NULL;
+        }
+
+        n->prepareAdaptor();
+
+        return n;
+    }
+
    /* 0x34 */ TAdaptor* mpAdaptor;
 };

@@ -86,7 +108,11 @@ struct TAdaptor {
    /* 80286648 */ void adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor*, JStudio::TControl*,
                                                            u32, void const*, u32);

-    /* 0x4 */ TObject* pObject_;
+    void adaptor_setObject_(const TObject* pObject) {
+        pObject_ = pObject;
+    }
+
+    /* 0x4 */ const TObject* pObject_;
    /* 0x8 */ TVariableValue* pValue_;
    /* 0xC */ u32 u;
 };
@@ -73,7 +73,7 @@ struct TParse_TParagraph_data : public TParseData_aligned<4> {
    };

    TParse_TParagraph_data(const void* content) : TParseData_aligned<4>(content) {}
-    /* 80289A80 */ void getData(TData*) const;
+    /* 80289A80 */ void getData(TData* pData) const;
 };

 // Parses a TObject ("demo object")
@@ -152,6 +152,46 @@ private:
    /* 0x54 */ s32 _54;
 };

+template <int T>
+struct TParseData {
+    TParseData(const void* pContent) {
+        data::TParse_TParagraph_data data(pContent);
+        set(data);
+    }
+
+    void set(const data::TParse_TParagraph_data& data) {
+        //data::TParse_TParagraph_data::TData* p = (data::TParse_TParagraph_data::TData*)this;
+        data.getData(m_data);
+    }
+
+    bool isEnd() const {
+        return m_data->_0 == 0;
+    }
+
+    bool empty() const {
+        return m_data->_c == NULL;
+    }
+
+    bool isValid() const {
+        return !empty() && m_data->_0 == 50;
+    }
+
+    data::TParse_TParagraph_data::TData* m_data;
+};
+
+template <int T>
+struct TParseData_fixed : public TParseData<T> {
+    TParseData_fixed(const void* pContent) : TParseData(pContent) {}
+
+    const void* getNext() const {
+        return m_data->_c;
+    }
+
+    bool isValid() const {
+        return TParseData::isValid() && getNext() != NULL;
+    }
+};
+
 }  // namespace stb
 }  // namespace JStudio