daNpz_Nz_c Work (#615)

* daNpz_Nz_c Work

* Forgot This

oops

include/d/actor/d_a_esa.h

@@ -2,10 +2,23 @@
 #define D_A_ESA_H
 
 #include "f_op/f_op_actor.h"
+#include "d/d_particle.h"
+#include "JSystem/J3DGraphAnimator/J3DModel.h"
 
 class esa_class : public fopAc_ac_c {
 public:
-    /* Place member variables here */
-};
+    /* 0x290 */ u8 field_0x290[0x298 - 0x290];
+    /* 0x298 */ u8 field_0x298;
+    /* 0x29C */ f32 mGroundHeight;
+    /* 0x2A0 */ s8 mActionState;
+    /* 0x2A1 */ s8 mState;
+    /* 0x2A2 */ u8 field_0x2A2[0x2A4 - 0x2A2];
+    /* 0x2A4 */ dPa_rippleEcallBack field_0x2A4;
+    /* 0x2B8 */ u8 field_0x2B8;
+    /* 0x2B9 */ s8 field_0x2B9;
+    /* 0x2BA */ u8 field_0x2BA;
+    /* 0x2BC */ J3DModel* mpModel;
+    /* 0x2C0 */ s16 mTimer[2];
+}; // Size: 0x2C4
 
 #endif /* D_A_ESA_H */

include/d/actor/d_a_npc_nz.h

@@ -2,46 +2,57 @@
 #define D_A_NPC_NZ_H
 
 #include "f_op/f_op_actor.h"
+#include "m_Do/m_Do_hostIO.h"
+#include "m_Do/m_Do_ext.h"
+#include "d/d_particle.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_npc.h"
+#include "d/actor/d_a_shop_item.h"
 
 class J3DNode;
 
-class daNpc_Nz_c : public fopAc_ac_c {
+class daNpc_Nz_c : public fopNpc_npc_c {
 public:
     enum Proc_e {
-        
+        PROC_0_e = 0,
+        PROC_1_e = 1,
     };
 
+    // objdiff says this is a weak function
+    // but defining it here with {} causes it to be inlined with fopAcM_SetupActor which breaks things
+    daNpc_Nz_c();
+
     void modeProcInit(int) {}
 
-    static BOOL NodeCallBack(J3DNode*, int);
-    static BOOL TailNodeCallBack(J3DNode*, int);
+    BOOL NodeCallBack(J3DNode*, int);
+    BOOL TailNodeCallBack(J3DNode*, int);
     void TailControl();
-    void _createHeap();
-    void XyEventCB(int);
+    bool _createHeap();
+    s16 XyEventCB(int);
     void eventOrder();
     void checkOrder();
     void setAttention();
     void LookBack();
-    void setAnm(signed char, bool);
+    void setAnm(s8, bool);
     void setMtx();
     void modeWaitInit();
     void modeWait();
     void modeEventEsaInit();
     void modeEventEsa();
     void modeProc(Proc_e, int);
-    void createShopItem(unsigned char, unsigned char);
-    void getShopItem(int);
+    void createShopItem(u8, u8);
+    daShopItem_c* getShopItem(int);
     void deleteShopItem();
-    void next_msgStatus(unsigned long*);
-    void anmAtr(unsigned short);
-    BOOL _execute();
-    BOOL _draw();
-    void createInit();
+    u16 next_msgStatus(u32*);
+    void anmAtr(u16);
+    bool _execute();
+    bool _draw();
+    BOOL createInit();
     void setSmokeParticle();
     void getArg();
     s32 _create();
-    BOOL _delete();
-    void _searchEsa(fopAc_ac_c*);
+    bool _delete();
+    BOOL _searchEsa(fopAc_ac_c*);
     void cutProc();
     void cutEatesaStart();
     void cutEatesaProc();
@@ -61,15 +72,66 @@ public:
     void cutChkGetItemProc();
 
 public:
-    /* Place member variables here */
-};
+    static const char m_arc_name[];
+    static const char m_bdl_arc_name[];
 
-class daNpc_Nz_HIO_c {
+    /* 0x6C4 */ cXyz field_0x6C4;
+    /* 0x6D0 */ int mCurMode;
+    /* 0x6D4 */ s8 field_0x6D4;
+    /* 0x6D5 */ s8 field_0x6D5;
+    /* 0x6D6 */ s8 field_0x6D6;
+    /* 0x6D8 */ request_of_phase_process_class mPhs1;
+    /* 0x6E0 */ request_of_phase_process_class mPhs2;
+    /* 0x6E8 */ mDoExt_McaMorf* mpMorf;
+    /* 0x6EC */ f32 field_0x6EC;
+    /* 0x6F0 */ dBgS_ObjAcch mAcch;
+    /* 0x8B4 */ dBgS_AcchCir mAcchCir;
+    /* 0x8F4 */ int field_0x8F4;
+    /* 0x8F8 */ u8 field_0x8F8;
+    /* 0x8FA */ s16 field_0x8FA;
+    /* 0x8FC */ bool field_0x8FC;
+    /* 0x8FE */ s16 field_0x8FE;
+    /* 0x900 */ u32 field_0x900;
+    /* 0x904 */ s16 field_0x904;
+    /* 0x906 */ s16 field_0x906;
+    /* 0x908 */ u8 field_0x908;
+    /* 0x909 */ u8 field_0x909;
+    /* 0x90A */ s16 field_0x90A;
+    /* 0x90C */ fopAc_ac_c* mpBait;
+    /* 0x910 */ f32 field_0x910;
+    /* 0x914 */ dPa_smokeEcallBack field_0x914;
+    /* 0x934 */ mDoExt_3DlineMat1_c field_0x934;
+    /* 0x970 */ u32 field_0x970;
+    /* 0x974 */ cXyz field_0x974[10];
+    /* 0x9EC */ cXyz field_0x9EC[10];
+    /* 0xA64 */ cXyz field_0xA64[2];
+    /* 0xA7C */ u8 field_0xA70[0xC];
+    /* 0xA88 */ u32 field_0xA88;
+    /* 0xA8C */ u32 field_0xA8C;
+    /* 0xA90 */ s16 field_0xA90;
+}; // Size: 0xA92
+
+class daNpc_Nz_HIO_c : public JORReflexible {
 public:
     daNpc_Nz_HIO_c();
+    virtual ~daNpc_Nz_HIO_c() {}
 
-public:
-    /* Place member variables here */
-};
+    /* 0x00 - vtable */
+    /* 0x04 */ s8 field_0x04;
+    /* 0x06 */ s16 field_0x06;
+    /* 0x08 */ s16 field_0x08;
+    /* 0x0A */ s16 field_0x0A;
+    /* 0x0C */ s16 field_0x0C;
+    /* 0x0E */ s16 field_0x0E;
+    /* 0x10 */ s16 field_0x10;
+    /* 0x12 */ s16 field_0x12;
+    /* 0x14 */ s16 field_0x14;
+    /* 0x16 */ s16 field_0x16;
+    /* 0x18 */ s16 field_0x18;
+    /* 0x1A */ s8 field_0x1A;
+    /* 0x1C */ f32 field_0x1C;
+    /* 0x20 */ f32 field_0x20;
+    /* 0x24 */ f32 field_0x24;
+}; // Size: 0x28
 
 #endif /* D_A_NPC_NZ_H */

include/d/actor/d_a_obj_barrel.h

@@ -8,7 +8,11 @@ namespace daObjBarrel {
     public:
         void attr() const {}
         void get_slant_angle() {}
-        void pos_init() {}
+        void pos_init() {
+            current.pos = home.pos;
+            current.angle = home.angle;
+            shape_angle = home.angle;
+        }
         void prm_get_cull() const {}
         void set_slant_angle(short) {}
     

include/d/d_bg_s_acch.h

@@ -135,6 +135,8 @@ public:
     bool ChkWallHit() { return m_flags & WALL_HIT; }
     void OffLineCheckHit() { m_flags &= ~LINE_CHECK_HIT; }
     void OffLineCheck() { m_flags &= ~LINE_CHECK; }
+    void OffLineCheckNone() { m_flags &= ~LINE_CHECK_NONE; }
+    void OnLineCheckNone() { m_flags |= LINE_CHECK_NONE; }
     bool ChkLineCheckNone() { return m_flags & LINE_CHECK_NONE; }
     bool ChkLineCheck() { return m_flags & LINE_CHECK; }
     void ClrRoofHit() { m_flags &= ~ROOF_HIT; }

include/d/d_lib.h

@@ -56,6 +56,12 @@ public:
     virtual s16 getAngleStick();
 };
 
+class dLib_anm_idx_c {
+public:
+    /* 0x00 */ int field_0x00;
+    /* 0x04 */ int field_0x04;
+}; // Size: 0x08
+
 class dLib_anm_prm_c {
 public:
     /* 0x00 */ s8 mBckIdx;
@@ -64,7 +70,7 @@ public:
     /* 0x04 */ f32 mMorf;
     /* 0x08 */ f32 mPlaySpeed;
     /* 0x0C */ int mLoopMode;
-};
+}; // Size: 0x10
 
 class dLib_circle_path_c {
 public:
@@ -86,8 +92,6 @@ public:
     /* 0x0A */ s16 mRotZ;
 };
 
-class dLib_anm_idx_c;
-
 void dLib_setCirclePath(dLib_circle_path_c*);
 f32 dLib_getWaterY(cXyz& pos, dBgS_ObjAcch& acch);
 void dLib_waveRot(Vec*, f32, dLib_wave_c*);