d_a_pirate_flag (#681)

* d_a_pirate_flag started work * daPirate_Flag_packet_c::setCorrectNrmAngle matching * daPirate_Flag_packet_c::setBackNrm matching * daPirate_Flag_packet_c::setNrmVtx work * d_a_pirate_flag work * get_cloth_anim_factor matching * pirate_flag_move matching * daPirate_Flag_Execute matching * d_a_pirate_flag mostly done
zeldaret · Oct 19, 2024 · 9ed7cfc · 9ed7cfc
1 parent 716492b
commit 9ed7cfc
Show file tree

Hide file tree

Showing 3 changed files with 608 additions and 34 deletions.
diff --git a/include/d/actor/d_a_pirate_flag.h b/include/d/actor/d_a_pirate_flag.h
@@ -2,27 +2,93 @@
 #define D_A_PIRATE_FLAG_H
 
 #include "f_op/f_op_actor.h"
+#include "m_Do/m_Do_hostIO.h"
+#include "m_Do/m_Do_mtx.h"
+#include "JSystem/J3DGraphBase/J3DPacket.h"
+#include "SSystem/SComponent/c_lib.h"
+#include "SSystem/SComponent/c_phase.h"
 
-class daPirate_Flag_packet_c {
+class daPirate_Flag_packet_c : public J3DPacket {
 public:
-    void changeCurrentPos() {}
-    void getEscapeNrmAngle() {}
-    void getMtx() {}
-    void getNrm() {}
-    void getOffsetVec() {}
-    void getPos() {}
-    void setNrmMtx() {}
-    void setTevStr(dKy_tevstr_c*) {}
-
-    void setCorrectNrmAngle(short, float);
+    daPirate_Flag_packet_c() {
+        m87E = 0;
+        m878 = 0;
+        m87C = 0;
+        m87A = 0;
+        m87F = 1;
+    }
+
+    virtual ~daPirate_Flag_packet_c() {}
+
+    void changeCurrentPos() { m87E ^= 1; }
+    s16 getEscapeNrmAngle() { return m87A; }
+    MtxP getMtx() { return mMtx; }
+    cXyz* getNrm() { return mNrm[m87E]; }
+    cXyz* getOffsetVec() { return m74C; } // Guessed based on size in debug maps
+    cXyz* getPos() { return mPos[m87E]; }
+    void setNrmMtx() {
+        cMtx_YrotS(*calc_mtx, m878);
+    }
+    void setTevStr(dKy_tevstr_c* i_tevStr) { mTevStr = i_tevStr; }
+
+    void setCorrectNrmAngle(s16, f32);
     void setBackNrm();
     void setNrmVtx(cXyz*, int, int);
     void draw();
+public:
+    /* 0x010 */ Mtx mMtx;
+    /* 0x040 */ dKy_tevstr_c* mTevStr;
+    /* 0x044 */ cXyz mPos[2][25];
+    /* 0x29C */ cXyz mNrm[2][25];
+    /* 0x4F4 */ cXyz m4F4[2][25];
+    /* 0x74C */ cXyz m74C[25];
+    /* 0x878 */ s16 m878;
+    /* 0x87A */ s16 m87A;
+    /* 0x87C */ s16 m87C;
+    /* 0x87E */ u8 m87E;
+    /* 0x87F */ u8 m87F;
+};
+
+class daPirate_Flag_HIO_c : public JORReflexible {
+public:
+    daPirate_Flag_HIO_c() {
+        mChildID = -1;
+        m06 = 0;
+        m1C = 0.0f;
+        m05 = 0;
+        m07 = 0;
+        m08 = 0x40;
+        m0C = 13.0f;
+        m10 = 7.0f;
+        m14 = -3.5f;
+        m18 = 0.45f;
+    }
+
+    virtual ~daPirate_Flag_HIO_c() {
+        mChildID = -1;
+    }
+
+public:
+    /* 0x04 */ s8 mChildID;
+    /* 0x05 */ u8 m05;
+    /* 0x06 */ u8 m06;
+    /* 0x07 */ u8 m07;
+    /* 0x08 */ s32 m08;
+    /* 0x0C */ f32 m0C;
+    /* 0x10 */ f32 m10;
+    /* 0x14 */ f32 m14;
+    /* 0x18 */ f32 m18;
+    /* 0x1C */ f32 m1C;
 };
 
 class pirate_flag_class : public fopAc_ac_c {
 public:
-    /* Place member variables here */
+    /* 0x290 */ request_of_phase_process_class mPhs1;
+    /* 0x298 */ request_of_phase_process_class mPhs2;
+    /* 0x2A0 */ u8 pad2A0[0x08];
+    /* 0x2A8 */ s16 m2A8;
+    /* 0x2AA */ u8 pad2AA[0x0C];
+    /* 0x2B8 */ daPirate_Flag_packet_c mPacket;
 };
 
 #endif /* D_A_PIRATE_FLAG_H */
diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h
@@ -396,7 +396,7 @@ void dKy_instant_rainchg();
 SND_INFLUENCE * dKy_Sound_get();
 void dKy_Sound_set(cXyz i_pos, int param_1, fpc_ProcID i_actorID, int param_3);
 void dKy_SordFlush_set(cXyz hitPos, int lightType);
-cXyz dKy_FirstlightVec_get(cXyz* param_0);
+cXyz dKy_FirstlightVec_get(cXyz *pDst);
 void dKy_itudemo_se();
 void dKy_actor_addcol_set(s16, s16, s16, f32);
 void dKy_actor_addcol_amb_set(s16, s16, s16, f32);