d_a_npc / d_a_tag_mhint / d_a_grass work (#1916)

* some npc work / cleanup

* tag_mhint / grass work

* fix path / remove asm

include/d/a/d_a_alink.h

@@ -6365,39 +6365,22 @@ public:
     }
 
     bool checkShadowModelDrawSmode() const {
-        if (field_0x84e != 3 && field_0x84e != 4) {
-            if (field_0x84e == 2) {
-                return false;
-            }
-        }
-        return true;
+        return field_0x84e == 3 || field_0x84e == 4 || field_0x84e == 2;
     }
 
-    int checkShadowModelDraw() const {
-        int ret = 0;
-
-        if (checkShadowModelDrawDemoForce() == 0) {
-            if (checkShadowModelDrawSmode() != 0) {
-                ret = 0;
-            }
-        }  
-
-        return ret;
+    bool checkShadowModelDraw() const {
+        return checkShadowModelDrawDemoForce() || checkShadowModelDrawSmode();
     }
 
-    int checkShadowReturnEnd() const {
-        if (field_0x5e4[0].getIdx() == 0x21C && !field_0x578->isStop()) {
-            return 1;
-        }
-
-        return 0;
+    bool checkShadowReturnEnd() const {
+        return field_0x5e4[0].getIdx() == 0x21C && field_0x578->isStop();
     }
 
     bool checkShadowModeTalkWait() const {
         return (field_0x84e == 2 || field_0x84e == 1) ;
     }
 
-    void setShadowReturn() { mDemoType = 4; }
+    void setShadowReturn() { field_0x84e = 4; }
 
 
     bool checkPortalObjRide() const {

include/d/a/d_a_npc.h

@@ -290,7 +290,7 @@ public:
     /* 0xE1E */ u16 field_0xe1e;
     /* 0xE20 */ u16 field_0xe20;
     /* 0xE22 */ u16 field_0xe22;
-    /* 0xE24 */ u8 field_0xe24;
+    /* 0xE24 */ s8 field_0xe24;
     /* 0xE25 */ u8 field_0xe25;
     /* 0xE26 */ u8 field_0xe26;
     /* 0xE27 */ u8 field_0xe27;
@@ -422,8 +422,8 @@ public:
     }
 
     static u8 const mCcDObjData[48];
-    static u8 mCcDCyl[68];
-    static u8 mCcDSph[64];
+    static dCcD_SrcCyl mCcDCyl;
+    static dCcD_SrcSph mCcDSph;
     static fopAc_ac_c* mFindActorPtrs[50];
     static s16 mSrchName;
     static s32 mFindCount;
@@ -643,7 +643,7 @@ public:
 
     static u8 const mCcDObjInfo[48];
     static dCcD_SrcCyl mCcDCyl;
-    static u8 mCcDSph[64];
+    static dCcD_SrcSph mCcDSph;
     static fopAc_ac_c* mFindActorPList[100];
     static s32 mFindCount;
     static s16 mSrchActorName;
@@ -794,8 +794,8 @@ public:
     void setVtable(void* table) { vtable = table;}
 
     static u8 const mCcDObj[48];
-    static u8 mCcDCyl[68];
-    static u8 mCcDSph[64];
+    static dCcD_SrcCyl mCcDCyl;
+    static dCcD_SrcSph mCcDSph;
 };
 
 class daBaseNpc_moveBgActor_c : public daBaseNpc_c {

include/d/cc/d_cc_mass_s.h

@@ -41,6 +41,7 @@ public:
     void SetCoHitObj(cCcD_Obj* obj) { mpCoObj = obj; }
     void SetAtHitObj(cCcD_Obj* obj) { mpAtObj = obj; }
     void SetCoHitLen(f32 len) { mCoHitLen = len; }
+    cCcD_Obj* GetAtHitObj() const { return mpAtObj; }
 };
 
 class dCcMassS_Mng {

include/d/cc/d_cc_s.h

@@ -46,10 +46,10 @@ public:
     /* 80086754 */ virtual void CalcParticleAngle(dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, csXyz*);
 
     void SetMass(cCcD_Obj* i_obj, u8 i_priority) { mMass_Mng.Set(i_obj, i_priority); }
+    void PrepareMass() { mMass_Mng.Prepare(); }
 
     static u8 m_mtrl_hit_tbl[64];
 
-private:
     // /* 0x0000 */ cCcS mCCcS;
     /* 0x284C */ dCcMassS_Mng mMass_Mng;
 };  // Size = 0x2AC4

include/d/com/d_com_inf_game.h

@@ -1831,6 +1831,10 @@ inline u8 dComIfGp_att_getCatchChgItem() {
     return dComIfGp_getAttention().getCatchChgItem();
 }
 
+inline int dComIfGp_att_ZHintRequest(fopAc_ac_c *param_1, int param_2) {
+    return dComIfGp_getAttention().ZHintRequest(param_1, param_2);
+}
+
 inline void dComIfGp_att_LookRequest(fopAc_ac_c* param_0, f32 i_horizontalDist, f32 i_upDist,
                                      f32 i_downDist, s16 i_angle, int param_5) {
     dComIfGp_getAttention().LookRequest(param_0, i_horizontalDist, i_upDist, i_downDist, i_angle,

include/d/d_npc_lib.h

@@ -4,7 +4,8 @@
 #include "d/com/d_com_inf_game.h"
 #include "dolphin/types.h"
 
-struct dNpcLib_lookat_c {
+class dNpcLib_lookat_c {
+public:
     /* 80251314 */ dNpcLib_lookat_c();
     /* 8025140C */ void init(J3DModel*, int*, csXyz*, csXyz*);
     /* 80251534 */ void action(cXyz, cXyz, fopAc_ac_c*, f32 (*)[4], int);

include/d/d_stage.h

@@ -165,12 +165,12 @@ struct stage_camera_class {
 struct stage_arrow_data_class {
     /* 0x00 */ cXyz mPosition;
     /* 0x0C */ csXyz mAngle;
-};
+};  // Size: 0x14
 
 struct stage_arrow_class {
     /* 0x00 */ int mNum;
     /* 0x04 */ stage_arrow_data_class* mEntries;
-};  // Size: 0x14
+};
 
 class stage_actor_data_class {
 public: