d_a_e_nz equivalent

.vscode/settings.json

@@ -24,6 +24,8 @@
   "search.exclude": {
     "build/*/config.json": true,
     "build/*/report.json": true,
+    "build/*/report_changes.json": true,
+    "build/*/baseline.json": true,
     "build/**/*.MAP": true,
     "build/**/*.o": true,
     "build/**/*.plf": true,

configure.py

@@ -1692,7 +1692,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(NonMatching, "d_a_e_mm"),
     ActorRel(NonMatching, "d_a_e_mm_mt"),
     ActorRel(Equivalent, "d_a_e_ms"), # weak func order
-    ActorRel(NonMatching, "d_a_e_nz"),
+    ActorRel(Equivalent, "d_a_e_nz"), # weak func order
     ActorRel(Equivalent, "d_a_e_oc"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_e_oct_bg"),
     ActorRel(Equivalent, "d_a_e_ot"), # weak func order

include/d/actor/d_a_e_nz.h

@@ -1,5 +1,9 @@
 #ifndef D_A_E_NZ_H
 #define D_A_E_NZ_H
+
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -10,16 +14,61 @@
  * @details 
  * 
  */
-class e_nz_class : public fopEn_enemy_c {
-private:
-    /* 0x5ac */ u8 field_0x5ac[0xa88 - 0x5ac];
+class e_nz_class {
+public:
+    /* 0x000 */ fopEn_enemy_c enemy;
+    /* 0x5AC */ request_of_phase_process_class mPhase;
+    /* 0x5B4 */ s16 mSubAction;
+    /* 0x5B6 */ u8 field_0x5b6;
+    /* 0x5B6 */ u8 field_0x5b7;
+    /* 0x5B8 */ int field_0x5b8;
+    /* 0x5BC */ cXyz field_0x5bc;
+    /* 0x5D4 */ cXyz field_0x5c8;
+    /* 0x5D4 */ s16 field_0x5d4;
+    /* 0x5D8 */ f32 field_0x5d8;
+    /* 0x5DC */ f32 field_0x5dc;
+    /* 0x5E0 */ mDoExt_McaMorfSO* mpMorf;
+    /* 0x5E4 */ int field_0x5e4;
+    /* 0x5E8 */ mDoExt_invisibleModel mInvModel;
+    /* 0x5F0 */ f32 mMaterialAlpha;
+    /* 0x5F4 */ Z2CreatureEnemy mSound;
+    /* 0x698 */ s16 field_0x698;
+    /* 0x69A */ s16 mAction;
+    /* 0x6A0 */ f32 mPlayerDistance;
+    /* 0x6A0 */ s16 mPlayerAngleY;
+    /* 0x6A2 */ s16 field_0x6a2[4];
+    /* 0x6AA */ s16 field_0x6aa;
+    /* 0x6AC */ s8 field_0x6ac;
+    /* 0x6B0 */ dBgS_AcchCir mAcchCir;
+    /* 0x6F0 */ dBgS_ObjAcch mAcch;
+    /* 0x8C8 */ s8 field_0x8c8;
+    /* 0x8CC */ dCcD_Stts mStts;
+    /* 0x908 */ dCcD_Sph mSph;
+    /* 0xA40 */ dCcU_AtInfo mAtInfo;
+    /* 0xA64 */ u32 mParticle;
+    /* 0xA68 */ u32 mParticleIds[4];
+    /* 0xA78 */ s8 field_0xa78;
+    /* 0xA7C */ int field_0xa7c;
+    /* 0xA80 */ int field_0xa80;
+    /* 0xA84 */ bool mIsHIOOwner;
 };
 
 STATIC_ASSERT(sizeof(e_nz_class) == 0xa88);
 
-class daE_NZ_HIO_c {
+class daE_NZ_HIO_c : public JORReflexible {
+public:
     /* 807299EC */ daE_NZ_HIO_c();
-    /* 8072BC88 */ ~daE_NZ_HIO_c();
+    /* 8072BC88 */ virtual ~daE_NZ_HIO_c() {}
+
+    void genMessage(JORMContext*);
+
+    /* 0x04 */ s8 mId;
+    /* 0x08 */ f32 mBasicSize;
+    /* 0x0C */ f32 mSpeed;
+    /* 0x10 */ f32 mAttackSpeed;
+    /* 0x14 */ s16 mWaitTime;
+    /* 0x18 */ f32 mCurrentAlphaSpeed;
+    /* 0x1C */ f32 mVanishingAlphaSpeed;
 };
 
 

include/d/actor/d_a_midna.h

@@ -214,6 +214,7 @@ class daMidna_c : public fopAc_ac_c {
     };
 
     void onForcePanic() { onEndResetStateFlg0(ERFLG0_FORCE_PANIC); }
+    void onRatBody(int) { onForcePanic(); }
     u32 checkForceNormalColor() const { return checkStateFlg1(FLG1_FORCE_NORMAL_COL); }
     u32 checkForceTiredColor() const { return checkStateFlg1(FLG1_FORCE_TIRED_COL); }
     void onNoServiceWait() { onEndResetStateFlg0(ERFLG0_NO_SERVICE_WAIT); }

include/d/actor/d_a_npc_ykm.h

@@ -40,6 +40,8 @@ class daNpc_ykM_Param_c : public JORReflexible {
 public:
     /* 80B5D6C8 */ virtual ~daNpc_ykM_Param_c() {}
 
+    void genMessage(JORMContext*);
+
     static daNpc_ykM_HIOParam const m;
 };