d_a_sail 100% (#678)

* d_a_sail * add some comments * d_a_sail amendment
zeldaret · Sep 9, 2024 · 7d2ed1b · 7d2ed1b
1 parent 1606255
commit 7d2ed1b
Show file tree

Hide file tree

Showing 3 changed files with 499 additions and 43 deletions.
diff --git a/include/d/actor/d_a_sail.h b/include/d/actor/d_a_sail.h
@@ -15,23 +15,27 @@ class daSail_packet_c : public J3DPacket {
         m1C36 = 0;
         m1C3B = 1;
     }
-    
-    void getMtx() {}
-    void getNrm() {}
-    void getPos() {}
-    void getPosSpd() {}
-    void getStickMtx() {}
-    void getTexMtx() {}
-    void setTevStr(dKy_tevstr_c*) {}
+
+    Mtx* getMtx() { return &mMtx; }
+    cXyz* getNrm() { return m0C74 + (0x54 * m1C3A); }
+    cXyz* getPos() { return m00A4 + (0x54 * m1C3A); }
+    cXyz* getPosSpd() { return m0884; }
+    Mtx* getStickMtx() { return &mStickMtx; }
+    Mtx* getTexMtx() { return &mTexMtx; }
+    void setTevStr(dKy_tevstr_c* tevStr) { mTevStr = tevStr; }
 
     void setCorrectNrmAngle(s16, f32);
     void setNrmMtx();
     void setBackNrm();
     void setNrmVtx(cXyz*, int, int);
     virtual void draw();
+    virtual ~daSail_packet_c() {}
 
 public:
-    /* 0x0010 */ u8 m0010[0x00A4 - 0x0010];
+    /* 0x0010 */ Mtx mMtx;
+    /* 0x0040 */ Mtx mTexMtx;
+    /* 0x0070 */ Mtx mStickMtx;
+    /* 0x00A0 */ dKy_tevstr_c* mTevStr;
     /* 0x00A4 */ cXyz m00A4[0x54 * 2];
     /* 0x0884 */ cXyz m0884[0x54];
     /* 0x0C74 */ cXyz m0C74[0x54 * 2];
@@ -41,18 +45,23 @@ class daSail_packet_c : public J3DPacket {
     /* 0x1C38 */ s16 m1C38;
     /* 0x1C3A */ u8 m1C3A;
     /* 0x1C3B */ u8 m1C3B;
-    /* 0x1C3C */ J3DModel* m1C3C;
-    /* 0x1C40 */ u8 m1C40[0x1C44 - 0x1C40];
+    /* 0x1C3C */ J3DModel* mStickModel;
+    /* 0x1C40 */ s32 m1C40;
     /* 0x1C44 */ f32 m1C44;
     /* 0x1C48 */ f32 m1C48;
+    /* 0x1C4C */ f32 m1C4C;
+    /* 0x1C50 */ s16 m1C50;
+    /* 0x1C52 */ s16 m1C52;
 };
 
 class sail_class : public fopAc_ac_c {
+public:
+    sail_class() {}
+
 public:
     /* 0x0290 */ request_of_phase_process_class mClothPhase;
     /* 0x0298 */ request_of_phase_process_class mKaizokusenPhase;
     /* 0x02A0 */ daSail_packet_c mSailPacket;
-    /* 0x1EEC */ u8 m1EEC[0x1EF4 - 0x1EEC];
 };
 
 class daSail_HIO_c : public JORReflexible {
@@ -73,7 +82,9 @@ class daSail_HIO_c : public JORReflexible {
     /* 0x05 */ u8 m05;
     /* 0x06 */ u8 m06;
     /* 0x07 */ u8 m07;
-    /* 0x08 */ u8 m08[0x10 - 0x08];
+    /* 0x08 */ u8 m08;
+    /* 0x09 */ u8 m09[0x0C - 0x09];
+    /* 0x0C */ f32 m0C;
     /* 0x10 */ f32 m10;
 };
 

diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h
@@ -396,6 +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);
 void dKy_itudemo_se();
 void dKy_actor_addcol_set(s16, s16, s16, f32);
 void dKy_actor_addcol_amb_set(s16, s16, s16, f32);