dbg npc_aru (-1 func), npc_maro, and npc_bans equiv (#3053)

* dbg npc_aru (-1 func), npc_maro, and tag_push equiv
* daNpc_Aru_c::adjustMoveDir doesn't match. I don't know how to fix it without breaking GCN

* JORM default args + PR comments

* npc_bans dbg equiv

include/d/actor/d_a_horse.h

@@ -277,7 +277,7 @@ public:
     u32 checkCutTurnCancel() const { return checkEndResetStateFlg0(ERFLG0_CUT_TURN_CANCEL); }
     u32 checkTurnCancelKeep() const { return checkStateFlg0(FLG0_TURN_CANCEL_KEEP); }
     u32 checkRodeoLeft() const { return checkStateFlg0(FLG0_RODEO_LEFT); }
-    u32 checkHorseCallWait() const { return checkStateFlg0(FLG0_NO_DRAW_WAIT); }
+    u32 checkHorseCallWait() { return checkStateFlg0(FLG0_NO_DRAW_WAIT); }
     BOOL checkTurn() const { return m_procID == PROC_TURN_e && field_0x1720 == 0; }
     BOOL checkStop() const { return m_procID == PROC_STOP_e; }
     BOOL checkJump() const { return m_procID == PROC_JUMP_e; }

include/d/actor/d_a_npc_aru.h

@@ -153,7 +153,9 @@ public:
             char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
-        i_arcNames) {}
+        i_arcNames) {
+        OS_REPORT("|%06d:%x|daNpc_Aru_c -> コンストラクト\n", g_Counter.mCounter0, this);
+    }
     u16 getEyeballMaterialNo() { return ARU_EYEBALL_M; }
     s32 getHeadJointNo() { return JNT_HEAD; }
     s32 getNeckJointNo() { return JNT_NECK; }
@@ -165,13 +167,9 @@ public:
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
-        if (nodeNo == 0xffff) {
-            return -1;
-        }
-
-        return nodeNo;
+        return (nodeNo == 0xFFFF) ? -1 : nodeNo;
     }
-    int getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
+    u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
     void setLastIn() { mLastGoatIn = true; }
 
     static char* mCutNameList[7];

include/d/actor/d_a_npc_maro.h

@@ -7,7 +7,7 @@
 
 struct daNpc_Maro_HIOParam {
     /* 0x00 */ daNpcT_HIOParam common;
-    /* 0x8C */ s16 field_0x8c;
+    /* 0x8C */ s16 tease_interval;
 };
 
 class daNpc_Maro_Param_c {
@@ -125,6 +125,7 @@ public:
     int arrowTutorial(void*);
     int talk(void*);
     int shop(void*);
+    BOOL test(void*);
     daNpc_Maro_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
@@ -169,16 +170,21 @@ public:
     static char* mCutNameList[17];
     static cutFunc mCutList[17];
 
+    u8 getGroupId() {
+        return (fopAcM_GetParam(this) & 0xF0000000) >> 28;
+    }
+
+    u8 getPathID() {
+        return (fopAcM_GetParam(this) & 0xFF00) >> 8;
+    }
+
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
-        if (nodeNo == 0xffff) {
-            return -1;
-        }
-        return nodeNo;
+        return (nodeNo == 0xFFFF) ? -1 : nodeNo;
     }
 
     u8 getMaxNumItem() {
-        return (fopAcM_GetParam(this) & 0xf000000) >> 0x18;
+        return (fopAcM_GetParam(this) & 0xF000000) >> 24;
     }
 
 private:

include/d/d_meter2_info.h

@@ -174,7 +174,7 @@ public:
     void setTimeMs(s32 i_time) { mTimeMs = i_time; }
     s32 getTimeMs() { return mTimeMs; }
     u8 getNowCount() { return mNowCount; }
-    int getMaxCount() { return mMaxCount; }
+    u8 getMaxCount() { return mMaxCount; }
     void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; }
     u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; }
     void setItemExplainWindowStatus(u8 i_value) { mItemExplainWindowStatus = i_value; }
@@ -671,7 +671,7 @@ inline u8 dMeter2Info_getNowCount() {
     return g_meter2_info.getNowCount();
 }
 
-inline int dMeter2Info_getMaxCount() {
+inline u8 dMeter2Info_getMaxCount() {
     return g_meter2_info.getMaxCount();
 }
 

include/d/d_shop_camera.h

@@ -70,11 +70,11 @@ public:
     /* 0x2c */ fopAc_ac_c* field_0x2c;
     /* 0x30 */ fopAc_ac_c* field_0x30;
     /* 0x34 */ fopAc_ac_c* field_0x34;
-    /* 0x38 */ cXyz field_0x38;
-    /* 0x44 */ cXyz field_0x44;
+    /* 0x38 */ Vec field_0x38;
+    /* 0x44 */ Vec field_0x44;
     /* 0x50 */ f32 field_0x50;
-    /* 0x54 */ cXyz field_0x54;
-    /* 0x60 */ cXyz field_0x60;
+    /* 0x54 */ Vec field_0x54;
+    /* 0x60 */ Vec field_0x60;
     /* 0x6c */ f32 field_0x6c;
     /* 0x70 */ cXyz field_0x70;
     /* 0x7C */ cXyz field_0x7c;