d_a_npc_henna equivalent

config/GZ2E01/rels/d_a_npc_henna/symbols.txt

@@ -309,6 +309,7 @@ lbl_82_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
 l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte
 lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte
 lbl_82_bss_90 = .bss:0x00000090; // type:object size:0x1 data:byte
+lbl_82_bss_91 = .bss:0x00000091; // type:object size:0x1 data:byte
 @5112 = .bss:0x00000094; // type:object size:0xC scope:local
 @5113 = .bss:0x000000A0; // type:object size:0xC scope:local
 @5114 = .bss:0x000000AC; // type:object size:0xC scope:local
@@ -331,8 +332,11 @@ lbl_82_bss_90 = .bss:0x00000090; // type:object size:0x1 data:byte
 @5131 = .bss:0x00000178; // type:object size:0xC scope:local
 zoom_check_pos = .bss:0x00000184; // type:object size:0xF0 scope:global
 koro2_reset = .bss:0x00000274; // type:object size:0x4 scope:global
+@5134 = .bss:0x00000278; // type:object size:0x4 scope:local
 old_stick_x$5644 = .bss:0x0000027C; // type:object size:0x4 scope:local
+@5136 = .bss:0x00000280; // type:object size:0x4 scope:local
 old_stick_sx$5647 = .bss:0x00000284; // type:object size:0x4 scope:local
+lbl_82_bss_288 = .bss:0x00000288; // type:object size:0x1 scope:local
 lbl_82_bss_289 = .bss:0x00000289; // type:object size:0x1 data:byte
 sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000028C; // type:object size:0x4 scope:global
 sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000290; // type:object size:0x4 scope:global

config/GZ2E01/symbols.txt

@@ -21726,7 +21726,7 @@ data_80450C9B = .sbss:0x80450C9B; // type:object size:0x1 scope:global align:1
 data_80450C9C = .sbss:0x80450C9C; // type:object size:0x1 scope:global align:1
 data_80450C9D = .sbss:0x80450C9D; // type:object size:0x1
 data_80450C9E = .sbss:0x80450C9E; // type:object size:0x1
-data_80450C9F = .sbss:0x80450C9F; // type:object size:0x1
+cDmr_FishingWeather = .sbss:0x80450C9F; // type:object size:0x1
 data_80450CA0 = .sbss:0x80450CA0; // type:object size:0x4 scope:global align:4
 JPTracePCB4 = .sbss:0x80450CA4; // type:object size:0x4 scope:global align:4 data:4byte
 DMC_initialized = .sbss:0x80450CA8; // type:object size:0x1 scope:local align:1 data:byte

config/GZ2J01/symbols.txt

@@ -21736,7 +21736,7 @@ data_80450C9B = .sbss:0x8044ADDB; // type:object size:0x1
 data_80450C9C = .sbss:0x8044ADDC; // type:object size:0x1
 data_80450C9D = .sbss:0x8044ADDD; // type:object size:0x1
 data_80450C9E = .sbss:0x8044ADDE; // type:object size:0x1
-data_80450C9F = .sbss:0x8044ADDF; // type:object size:0x1
+cDmr_FishingWeather = .sbss:0x8044ADDF; // type:object size:0x1
 data_80450CA0 = .sbss:0x8044ADE0; // type:object size:0x4
 JPTracePCB4 = .sbss:0x8044ADE4; // type:object size:0x4 scope:global align:4 data:4byte
 DMC_initialized = .sbss:0x8044ADE8; // type:object size:0x1 data:byte

configure.py

@@ -1545,7 +1545,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(NonMatching, "d_a_npc_besu"),
     ActorRel(Equivalent, "d_a_npc_fairy_seirei"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_npc_fish"),
-    ActorRel(NonMatching, "d_a_npc_henna"),
+    ActorRel(Equivalent, "d_a_npc_henna"), # weak func order
     ActorRel(NonMatching, "d_a_npc_kakashi"),
     ActorRel(NonMatching, "d_a_npc_kkri"),
     ActorRel(NonMatching, "d_a_npc_kolin"),

include/c/c_damagereaction.h

@@ -13,6 +13,14 @@ class JPTraceParticleCallBack4 : JPAParticleCallBack {
 BOOL cDmrNowMidnaTalk();
 
 extern u8 cDmr_SkipInfo;
+extern u8 data_80450C99;
+extern u8 data_80450C9A;
+extern u8 data_80450C9B;
+extern u8 data_80450C9C;
+extern u8 data_80450C9D;
+extern u8 data_80450C9E;
+extern u8 cDmr_FishingWeather;
+extern u8 data_80450CA0;
 extern JPTraceParticleCallBack4 JPTracePCB4;
 
 #endif /* C_C_DAMAGEREACTION_H */

include/d/actor/d_a_npc_du.h

@@ -11,9 +11,12 @@
  * @details
  *
  */
-class npc_du_class : public fopAc_ac_c {
-private:
-    /* 0x568 */ u8 field_0x568[0xa00 - 0x568];
+class npc_du_class {
+public:
+    fopAc_ac_c actor;
+    /* 0x568 */ u8 field_0x568[0x5b8 - 0x568];
+    /* 0x5B8 */ f32 field_0x5b8;
+    /* 0x5BC */ u8 field_0x5bc[0xa00 - 0x5bc];
 };
 
 STATIC_ASSERT(sizeof(npc_du_class) == 0xa00);

include/d/actor/d_a_npc_henna.h

@@ -1,6 +1,9 @@
 #ifndef D_A_NPC_HENNA_H
 #define D_A_NPC_HENNA_H
 
+#include "JSystem/JHostIO/JORReflexible.h"
+#include "SSystem/SComponent/c_phase.h"
+#include "d/d_msg_flow.h"
 #include "f_op/f_op_actor.h"
 
 /**
@@ -11,25 +14,144 @@
  * @details
  *
  */
-class npc_henna_class : public fopAc_ac_c {
+class npc_henna_class {
 public:
-    /* 0x568 */ u8 field_0x568[0x752 - 0x568];
-    /* 0x752 */ u16 field_0x752;
-    /* 0x754 */ u16 field_0x754;
-    /* 0x756 */ u8 field_0x756[0x7b5 - 0x756];
+    /* 0x0   */ fopEn_enemy_c actor;
+    /* 0x5AC */ request_of_phase_process_class field_0x5ac;
+    /* 0x5B4 */ u8 field_0x5b4;
+    /* 0x5B5 */ s8 field_0x5b5;
+    /* 0x5B6 */ s8 field_0x5b6;
+    /* 0x5B8 */ s16 mIsTalking;
+    /* 0x5BA */ s16 field_0x5ba;
+    /* 0x5BC */ s16 field_0x5bc;
+    /* 0x5BE */ s16 field_0x5be;
+    /* 0x5C0 */ dMsgFlow_c mMsgFlow;
+    /* 0x60C */ u8 field_0x60c[0x618 - 0x60c];
+    /* 0x618 */ s16 field_0x618;
+    /* 0x61C */ f32 field_0x61c;
+    /* 0x620 */ s16 field_0x620;
+    /* 0x624 */ mDoExt_McaMorf* mpMorf;
+    /* 0x628 */ mDoExt_btkAnm* mpBtkAnms[3];
+    /* 0x634 */ mDoExt_btpAnm* mpBtpAnms[3];
+    /* 0x640 */ u8 field_0x640[0x654 - 0x640];
+    /* 0x654 */ s32 field_0x654;
+    /* 0x658 */ s32 field_0x658;
+    /* 0x65C */ s32 mAnmResIndex;
+    /* 0x660 */ s16 field_0x660;
+    /* 0x662 */ s16 field_0x662;
+    /* 0x664 */ s32 field_0x664;
+    /* 0x668 */ mDoExt_bckAnm* mpBckAnms[8];
+    /* 0x688 */ s32 field_0x688;
+    /* 0x68C */ J3DModel* mpModel;
+    /* 0x690 */ s16 field_0x690;
+    /* 0x692 */ s8 field_0x692;
+    /* 0x693 */ s8 field_0x693;
+    /* 0x694 */ s8 field_0x694;
+    /* 0x698 */ f32 field_0x698;
+    /* 0x69C */ f32 field_0x69c;
+    /* 0x6A0 */ s16 field_0x6a0;
+    /* 0x6A2 */ s16 field_0x6a2;
+    /* 0x6A4 */ s16 field_0x6a4;
+    /* 0x6A6 */ s16 field_0x6a6;
+    /* 0x6A8 */ u8 field_0x6a8[0x6ac - 0x6a8];
+    /* 0x6AC */ f32 field_0x6ac;
+    /* 0x6B0 */ s16 field_0x6b0;
+    /* 0x6B2 */ u8 field_0x6b2[0x6b6 - 0x6b2];
+    /* 0x6B6 */ s16 field_0x6b6;
+    /* 0x6B8 */ u8 field_0x6b8[0x6ba - 0x6b8];
+    /* 0x6BA */ s16 field_0x6ba;
+    /* 0x6BC */ s16 field_0x6bc;
+    /* 0x6BE */ s16 field_0x6be;
+    /* 0x6C0 */ s16 field_0x6c0;
+    /* 0x6C2 */ s16 field_0x6c2;
+    /* 0x6C4 */ s16 field_0x6c4;
+    /* 0x6C6 */ u8 field_0x6c6[0x6f2 - 0x6c6];
+    /* 0x6F2 */ s16 field_0x6f2;
+    /* 0x6F4 */ u8 field_0x6f4[0x704 - 0x6f4];
+    /* 0x704 */ s16 field_0x704;
+    /* 0x706 */ s16 field_0x706;
+    /* 0x708 */ u8 field_0x708;
+    /* 0x709 */ u8 field_0x709;
+    /* 0x70A */ u8 field_0x70a;
+    /* 0x70B */ u8 field_0x70b;
+    /* 0x70C */ s8 field_0x70c;
+    /* 0x70D */ s8 field_0x70d;
+    /* 0x70E */ s16 field_0x70e;
+    /* 0x710 */ s16 field_0x710;
+    /* 0x714 */ cXyz field_0x714;
+    /* 0x720 */ cXyz field_0x720;
+    /* 0x72C */ f32 field_0x72c;
+    /* 0x730 */ f32 field_0x730;
+    /* 0x734 */ u8 field_0x734;
+    /* 0x738 */ f32 field_0x738;
+    /* 0x73C */ s16 field_0x73c[10];
+    /* 0x750 */ s16 field_0x750;
+    /* 0x752 */ s16 field_0x752;
+    /* 0x754 */ s16 field_0x754;
+    /* 0x756 */ u16 field_0x756;
+    /* 0x758 */ s16 field_0x758;
+    /* 0x75A */ u8 field_0x75a[0x75c - 0x75a];
+    /* 0x75C */ s16 field_0x75c;
+    /* 0x760 */ cXyz field_0x760;
+    /* 0x76C */ cXyz field_0x76c;
+    /* 0x778 */ cXyz field_0x778;
+    /* 0x784 */ cXyz field_0x784;
+    /* 0x790 */ cXyz field_0x790;
+    /* 0x79C */ cXyz field_0x79c;
+    /* 0x7A8 */ cXyz field_0x7a8;
+    /* 0x7B4 */ u8 field_0x7b4;
     /* 0x7B5 */ u8 field_0x7b5;
-    /* 0x7B6 */ u8 field_0x7b6[0x7b9 - 0x7b6];
+    /* 0x7B6 */ u8 field_0x7b6;
+    /* 0x7B7 */ u8 field_0x7b7;
+    /* 0x7B8 */ u8 field_0x7b8;
     /* 0x7B9 */ u8 field_0x7b9;
-    /* 0x7BA */ u8 field_0x7ba[0x7fc - 0x7ba];
+    /* 0x7BA */ u8 field_0x7ba;
+    /* 0x7BC */ f32 field_0x7bc;
+    /* 0x7C0 */ f32 field_0x7c0;
+    /* 0x7C4 */ f32 field_0x7c4;
+    /* 0x7C8 */ u8 field_0x7c8[0x7cc - 0x7c8];
+    /* 0x7CC */ u32 field_0x7cc;
+    /* 0x7D0 */ u8 field_0x7d0[0x7d4 - 0x7d0];
+    /* 0x7D4 */ u8 field_0x7d4;
+    /* 0x7D5 */ u8 field_0x7d5;
+    /* 0x7D6 */ u8 field_0x7d6;
+    /* 0x7D7 */ u8 field_0x7d7;
+    /* 0x7D8 */ u8 field_0x7d8[0x7e1 - 0x7d8];
+    /* 0x7E1 */ s8 field_0x7e1;
+    /* 0x7E4 */ fpc_ProcID mBoatId;
+    /* 0x7E8 */ u8 field_0x7e8[0x7f8 - 0x7e8];
+    /* 0x7F8 */ u8 field_0x7f8;
 };
 
 STATIC_ASSERT(sizeof(npc_henna_class) == 0x7fc);
 
-class daNpc_Henna_HIO_c {
+class daNpc_Henna_HIO_c : public JORReflexible {
 public:
     /* 80542F0C */ daNpc_Henna_HIO_c();
-    /* 80549E40 */ ~daNpc_Henna_HIO_c();
+    /* 80549E40 */ virtual ~daNpc_Henna_HIO_c() {}
+    void genMessage(JORMContext*);
+
+    s8 field_0x4;
+    f32 field_0x8;
+    s16 field_0xc;
+    s16 mSeasonDefColorR;
+    s16 mSeasonDefColorG;
+    s16 mSeasonDefColorB;
+    s16 mSeason2ColorR;
+    s16 mSeason2ColorG;
+    s16 mSeason2ColorB;
+    s16 mSeason3ColorR;
+    s16 mSeason3ColorG;
+    s16 mSeason3ColorB;
+    f32 mSeasonDefLightDist;
+    s16 mSeasonDefLightAngle;
+    f32 mSeason2LightDist;
+    s16 mSeason2LightAngle;
+    f32 mSeason3LightDist;
+    s16 mSeason3LightAngle;
 };
 
 
+
+
 #endif /* D_A_NPC_HENNA_H */

include/d/actor/d_a_player.h

@@ -1148,6 +1148,10 @@ class daPy_py_c : public fopAc_ac_c {
         onEndResetFlg2(ERFLG2_UNK_2);
     }
 
+    s16 getFishingRodAngleY() const {
+        return shape_angle.y + mBodyAngle.y;
+    }
+
     void onFishingRelease() {
         this->mEndResetFlg0 |= 0x4000000;
     }

include/d/d_com_inf_game.h

@@ -1868,7 +1868,7 @@ inline u8 dComIfGs_getTmpReg(const u16 i_reg) {
     return g_dComIfG_gameInfo.info.getTmp().getEventReg(i_reg);
 }
 
-inline u8 dComIfGs_getEventReg(const u16 reg) {
+inline u8 dComIfGs_getEventReg(u16 reg) {
     return g_dComIfG_gameInfo.info.getEvent().getEventReg(reg);
 }
 
@@ -3064,7 +3064,7 @@ inline bool dComIfGp_checkMesgBgm() {
     return g_dComIfG_gameInfo.play.checkMesgBgm();
 }
 
-inline void dComIfGp_setMessageCountNumber(u32 number) {
+inline void dComIfGp_setMessageCountNumber(s32 number) {
     g_dComIfG_gameInfo.play.setMessageCountNumber(number);
 }
 

include/d/d_save.h

@@ -648,10 +648,10 @@ class dSv_memBit_c {
 class dSv_event_c {
 public:
     void init();
-    void onEventBit(u16 i_no);
-    void offEventBit(u16 i_no);
-    int isEventBit(u16 i_no) const;
-    void setEventReg(u16 i_reg, u8 i_no);
+    void onEventBit(const u16 i_no);
+    void offEventBit(const u16 i_no);
+    int isEventBit(const u16 i_no) const;
+    void setEventReg(const u16 i_reg, u8 i_no);
     u8 getEventReg(u16 i_reg) const;
 
     void* getPEventBit() { return (void*)mEvent; }

include/m_Do/m_Do_ext.h

@@ -146,6 +146,9 @@ class mDoExt_bckAnm : public mDoExt_baseAnm {
     /* 8000D990 */ void changeBckOnly(J3DAnmTransform* i_bck);
     /* 8000D9CC */ void entry(J3DModelData* i_modelData, f32 i_frame);
     /* 8000D9E8 */ void entryJoint(J3DModelData* i_modelData, u16 i_jntNo, f32 i_frame);
+    inline void entryJoint(J3DModelData* i_modelData, u16 i_jntNo) {
+        entryJoint(i_modelData, i_jntNo, getFrame());
+    }
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
 

src/c/c_damagereaction.cpp

@@ -19,7 +19,7 @@ u8 data_80450C9B;
 u8 data_80450C9C;
 u8 data_80450C9D;
 u8 data_80450C9E;
-u8 data_80450C9F;
+u8 cDmr_FishingWeather;
 
 /* 8001817C-800182A4 012ABC 0128+00 1/0 0/0 0/0 .text
  * execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle */
@@ -67,8 +67,7 @@ BOOL cDmrNowMidnaTalk() {
 }
 
 /* 80450CA0-80450CA4 0001A0 0004+00 0/0 0/0 2/2 .sbss            None */
-extern u8 data_80450CA0[4];
-u8 data_80450CA0[4];
+u8 data_80450CA0;
 
 /* 80450CA4-80450CA8 0001A4 0004+00 1/1 1/1 1/1 .sbss            JPTracePCB4 */
 JPTraceParticleCallBack4 JPTracePCB4;

src/d/actor/d_a_b_oh.cpp

@@ -158,9 +158,9 @@ daB_OH_HIO_c::daB_OH_HIO_c() {
 }
 
 /* 8061B75C-8061B8B0 00011C 0154+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
-static int nodeCallBack(J3DJoint* param_0, int param_1) {
+static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
-        int jnt_no = param_0->getJntNo();
+        int jnt_no = i_joint->getJntNo();
         J3DModel* model_p = j3dSys.getModel();
         b_oh_class* this_ = (b_oh_class*)model_p->getUserArea();
 

src/d/actor/d_a_mg_fshop.cpp

@@ -1466,10 +1466,10 @@ static void rod_set(fshop_class* param_0) {
 }
 
 /* 8086CC6C-8086CD70 000CEC 0104+00 1/1 0/0 0/0 .text            s_fish_sub__FPvPv */
-static void* s_fish_sub(void* param_1, void* param_2) {
-    fopAc_ac_c* actor = (fopAc_ac_c*)param_1;
-    fs_weed_s* weed = (fs_weed_s*)param_2;
-    if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_MG_FISH && actor->speedF > 0.1f) {
+static void* s_fish_sub(void* param_0, void* param_1) {
+    fopAc_ac_c* actor = (fopAc_ac_c*)param_0;
+    fs_weed_s* weed = (fs_weed_s*)param_1;
+    if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_MG_FISH && actor->speedF > 0.1f) {
         f32 dVar9 = actor->current.pos.x - weed->field_0x00[0].x;
         f32 dVar8 = actor->current.pos.y - weed->field_0x00[0].y;
         f32 dVar10 = actor->current.pos.z - weed->field_0x00[0].z;
@@ -1480,7 +1480,7 @@ static void* s_fish_sub(void* param_1, void* param_2) {
         if (fabsf(dVar8) < 60.0f * weed->field_0xb4 &&
             JMAFastSqrt(((dVar9 * dVar9) + (dVar10 * dVar10))) < dVar3 * 35.0f){
             cLib_addCalc2(&weed->field_0xb8, dVar3, 0.1f, 0.05f);
-            return (fopAc_ac_c*)param_1;
+            return (fopAc_ac_c*)param_0;
         }
     }
 
@@ -1853,11 +1853,11 @@ static int daFshop_Execute(fshop_class* param_1) {
                     }
                 }
                 if (!bVar5) {
-                    henna->health = 1;
+                    henna->actor.health = 1;
                 } else if (param_1->field_0x567 == 1) {
-                    henna->health = 0;
+                    henna->actor.health = 0;
                 } else {
-                    henna->health = 2;
+                    henna->actor.health = 2;
                 }
 
                 henna->field_0x752 = 0x49;
@@ -1879,7 +1879,7 @@ static int daFshop_Execute(fshop_class* param_1) {
                             }
 
                             if (bVar5) {
-                                henna->health = 3;
+                                henna->actor.health = 3;
                                 henna->field_0x752 = 0x49;
                             } else {
                                 henna->field_0x752 = 0x4c;