d_a_pirate_flag mostly done

zeldaret · Oct 19, 2024 · e9687ad · e9687ad
1 parent 7029e32
commit e9687ad
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 7 deletions.
diff --git a/include/d/actor/d_a_pirate_flag.h b/include/d/actor/d_a_pirate_flag.h
@@ -2,13 +2,24 @@
 #define D_A_PIRATE_FLAG_H
 
 #include "f_op/f_op_actor.h"
-#include "d/d_com_inf_game.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 : public J3DPacket {
 public:
+    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; }
@@ -35,11 +46,24 @@ class daPirate_Flag_packet_c : public J3DPacket {
     /* 0x87A */ s16 m87A;
     /* 0x87C */ s16 m87C;
     /* 0x87E */ u8 m87E;
+    /* 0x87F */ u8 m87F;
 };
 
 class daPirate_Flag_HIO_c : public JORReflexible {
 public:
-    daPirate_Flag_HIO_c() {}
+    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;
     }
@@ -59,7 +83,6 @@ class daPirate_Flag_HIO_c : public JORReflexible {
 
 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];

diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp
@@ -234,7 +234,10 @@ void daPirate_Flag_packet_c::setNrmVtx(cXyz* param_0, int param_1, int param_2)
 void daPirate_Flag_packet_c::draw() {
     j3dSys.reinitGX();
 
+#if VERSION != VERSION_JPN
     GXSetNumIndStages(0);
+#endif
+
     dKy_GxFog_tevstr_set(mTevStr);
     dKy_setLight_mine(mTevStr);
     GXClearVtxDesc();
@@ -320,10 +323,12 @@ void daPirate_Flag_packet_c::draw() {
     GXSetArray(GX_VA_NRM, m4F4[m87E], sizeof(cXyz));
     GXCallDisplayList(l_pirate_flag_DL, sizeof(l_pirate_flag_DL) - 0x04);
 
+#if VERSION != VERSION_JPN
     J3DShape::resetVcdVatCache();
+#endif
 }
 
-const u8 dummy_4211[] = {0x00, 0xFF, 0x00, 0x80};
+const u8 dummy_4241[] = {0x00, 0xFF, 0x00, 0x80};
 const u8 dummy_4243[] = {0x00, 0x00, 0xFF, 0x80};
 const u8 dummy_4245[] = {0xFF, 0x00, 0x00, 0x80};
 
@@ -489,9 +494,17 @@ static void pirate_flag_move(pirate_flag_class* i_this) {
 
     i_this->mPacket.setBackNrm();
 
+#if VERSION == VERSION_JPN
+    // WTH is even happening here? This just seems like an overflow.
+    // 7500 is bigger than the total size of pirate_flag_class.
+    // 7500 / sizeof(cXyz) = 7500 / 12 = 625 = 25 * 25
+    // Each buffer contains 25 elements.
+    DCStoreRangeNoSync(i_this->mPacket.getPos(), 7500);
+#else
     DCStoreRangeNoSync(i_this->mPacket.getPos(), sizeof(*i_this->mPacket.mPos));
     DCStoreRangeNoSync(i_this->mPacket.getNrm(), sizeof(*i_this->mPacket.mNrm));
     DCStoreRangeNoSync(i_this->mPacket.getNrm() + sizeof(i_this->mPacket.mNrm) / sizeof(cXyz), sizeof(*i_this->mPacket.m4F4)); // Fakematch?
+#endif
 }
 
 /* 00001938-00001A38       .text daPirate_Flag_Execute__FP17pirate_flag_class */
@@ -528,8 +541,34 @@ static BOOL daPirate_Flag_Delete(pirate_flag_class* i_this) {
 }
 
 /* 00001A90-00001C8C       .text daPirate_Flag_Create__FP10fopAc_ac_c */
-static s32 daPirate_Flag_Create(fopAc_ac_c*) {
-    /* Nonmatching */
+static s32 daPirate_Flag_Create(fopAc_ac_c* i_this) {
+    pirate_flag_class* a_this = static_cast<pirate_flag_class*>(i_this);
+    fopAcM_SetupActor(i_this, pirate_flag_class);
+
+    s32 result = dComIfG_resLoad(&a_this->mPhs1, "Cloth");
+    if (result != cPhs_COMPLEATE_e) {
+        return result;
+    }
+
+    result = dComIfG_resLoad(&a_this->mPhs2, "Kaizokusen");
+    if (result != cPhs_COMPLEATE_e) {
+        return result;
+    }
+
+    cXyz* pos = a_this->mPacket.getPos();
+
+    for (int i = 0; i < 5; i++) {
+        for (int j = 0; j < 5; j++) {
+            cXyz tmp = l_pos[i * 5 + j];
+
+            *pos++ = tmp;
+        }
+    }
+
+    l_p_ship = static_cast<daObjPirateship::Act_c*>(fopAcM_SearchByID(a_this->parentActorID));
+    pirate_flag_move(a_this);
+
+    return cPhs_COMPLEATE_e;
 }
 
 static s32 daPirate_Flag_ToFore(pirate_flag_class*); // Unused