d_a_alink cleanup / debug work (#3045)

* start d_a_alink debug cleanup

* d_a_alink_damage debug

* d_a_alink_guard debug

* d_a_alink_bow debug

* d_a_alink_boom debug

* d_a_alink_copyrod debug

* d_a_alink_hvyboots debug

* d_a_alink_grab debug

* d_a_alink_sumou debug

* d_a_alink_horse debug

* d_a_alink_canoe debug

* d_a_alink_crawl / d_a_alink_hang debug

* d_a_alink_swim debug

* d_a_alink_hook / d_a_alink_iceleaf debug

* d_a_alink_bottle debug

* d_a_alink_whistle / d_a_alink_kandelaar / d_a_alink_ironball debug

* d_a_alink_demo debug

* d_a_alink_effect debug

* d_a_alink_wolf debug

* d_a_alink debug / cleanup

* cleanup button status enums

include/SSystem/SComponent/c_cc_d.h

@@ -221,7 +221,7 @@ public:
     u32 MskRPrm(u32 mask) const { return mRPrm & mask; }
     void OnSPrmBit(u32 flag) { mSPrm |= flag; }
     void OffSPrmBit(u32 flag) { mSPrm &= ~flag; }
-    u32 ChkSPrm(u32 prm) const { return MskSPrm(prm); }
+    u32 ChkSPrm(u32 prm) const { return MskSPrm(prm) != 0; }
 
     void Set(cCcD_SrcObjCommonBase const& src) { mSPrm = src.mSPrm; }
 };

include/Z2AudioLib/Z2LinkMgr.h

@@ -58,6 +58,7 @@ public:
     void setMarkState(u8 state) { mMarkState = state; }
 
     static Z2CreatureLink* mLinkPtr;
+    static Z2CreatureLink* getLink() { return mLinkPtr; }
 
     friend class Z2LinkSoundStarter;
     friend class Z2RideSoundStarter;
@@ -96,7 +97,7 @@ private:
 };  // Size: 0xD0
 
 inline Z2CreatureLink* Z2GetLink() {
-    return Z2CreatureLink::mLinkPtr;
+    return Z2CreatureLink::getLink();
 }
 
 class Z2CreatureRide;

include/d/actor/d_a_b_dr.h

@@ -79,8 +79,8 @@ public:
 
     MtxP getMtx() { return mpModelMorf->getModel()->getAnmMtx(15); }
 
-    void onTarget() { mTarget = true; }
-    bool isBack() { return arg0; }
+    u8 onTarget() { return mTarget = true; }
+    u8 isBack() { return arg0; }
 
 private:
     /* 0x05AC */ request_of_phase_process_class mPhase;

include/d/actor/d_a_boomerang.h

@@ -116,7 +116,7 @@ public:
     void offStateFlg0(daBoomerang_FLG0 flag) { m_stateFlg0 &= ~flag; }
     u32 getReturnFlg() const { return checkStateFlg0(FLG0_1); }
     void onWindCatch() { onStateFlg0(WIND_CATCH); }
-    bool checkForceDelete() const { return m_forceDelete; }
+    u8 checkForceDelete() const { return m_forceDelete; }
     void onForceDelete() { m_forceDelete = true; }
     bool checkCharge() const { return true; }
     void setThrow() { fopAcM_SetParam(this, 1); }

include/d/actor/d_a_canoe.h

@@ -34,7 +34,7 @@ public:
     J3DModel* getModel() { return mpModel; }
     MtxP getModelMtx() { return mpModel->getBaseTRMtx(); }
     bool checkTandem() { return fopAcM_GetParam(this) == 2; }
-    bool checkJumpRideFlg() { return mJumpRideFlg; }
+    u8 checkJumpRideFlg() const { return mJumpRideFlg; }
     void incShapeOffsetY(f32 offset) { mShapeOffsetY += offset; }
     void incShapeAngleZ(s16 incZ) { shape_angle.z += incZ; }
     void onRodID(fpc_ProcID i_rodID) { mRodID = i_rodID; }

include/d/actor/d_a_cow.h

@@ -194,16 +194,16 @@ public:
     daCow_c* getCowP() { return mCowP; }
 
     // cLib_onBit<u16>(mFlags, (mask))
-    void setCrazyBeforeCatch() { mFlags |= Flag_CrazyBeforeCatch; }
-    void setCrazyCatch() { mFlags |= Flag_CrazyCatch; }
-    void setCrazyDash() { mFlags |= Flag_CrazyDash; }
-    void setCrazyThrowLeft() { mFlags |= Flag_CrazyThrowLeft; }
-    void setCrazyThrowRight() { mFlags |= Flag_CrazyThrowRight; }
-    void setCrazyReady() { mFlags |= Flag_CrazyReady; }
-    void setCrazyGo() { mFlags |= Flag_CrazyGo; }
-    void setNaderu() { mFlags |= Flag_Naderu; }
-    void setNaderuFinish() { mFlags |= Flag_NaderuFinish; }
-    void setCrazyReadyDrawOn() { mFlags |= Flag_CrazyReadyDrawOn; }
+    void setCrazyBeforeCatch() { mFlags |= (u16)Flag_CrazyBeforeCatch; }
+    void setCrazyCatch() { mFlags |= (u16)Flag_CrazyCatch; }
+    void setCrazyDash() { mFlags |= (u16)Flag_CrazyDash; }
+    void setCrazyThrowLeft() { mFlags |= (u16)Flag_CrazyThrowLeft; }
+    void setCrazyThrowRight() { mFlags |= (u16)Flag_CrazyThrowRight; }
+    void setCrazyReady() { mFlags |= (u16)Flag_CrazyReady; }
+    void setCrazyGo() { mFlags |= (u16)Flag_CrazyGo; }
+    void setNaderu() { mFlags |= (u16)Flag_Naderu; }
+    void setNaderuFinish() { mFlags |= (u16)Flag_NaderuFinish; }
+    void setCrazyReadyDrawOn() { mFlags |= (u16)Flag_CrazyReadyDrawOn; }
 
     u8 getCowIn() { return mCowIn; }
     u8 getNoNearCheckTimer() { return mNoNearCheckTimer; }

include/d/actor/d_a_npc_bou.h

@@ -152,8 +152,7 @@ public:
     BOOL speakTo() {
         if (mType == 4) {
             if (current.pos.absXZ(daPy_getPlayerActorClass()->current.pos) < 1100.0f && strlen(mpEvtData[5].eventName) != 0) {
-                u32 len = strlen(mpArcNames[mpEvtData[5].num]);
-                if (len != 0) {
+                if (strlen(mpArcNames[mpEvtData[5].num]) != 0) {
                     eventInfo.setArchiveName(mpArcNames[mpEvtData[5].num]);
                     dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName());
                 }

include/d/actor/d_a_npc_kn.h

@@ -218,6 +218,8 @@ public:
 
     void setTalkFlag(u8 i_flag) { field_0x15bd = i_flag; }
 
+    bool checkBattleMode() { return true; }
+    
     int create();
     int CreateHeap();
     int Delete();

include/d/actor/d_a_npc_kolin.h

@@ -146,8 +146,7 @@ public:
             }
 
             if (strlen(mpEvtData[var_r29].eventName) != 0) {
-                u32 len = strlen(mpArcNames[mpEvtData[var_r29].num]);
-                if (len != 0) {
+                if (strlen(mpArcNames[mpEvtData[var_r29].num]) != 0) {
                     eventInfo.setArchiveName(mpArcNames[mpEvtData[var_r29].num]);
                     dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName());
                 }

include/d/actor/d_a_obj_gra2.h

@@ -228,11 +228,11 @@ public:
     cXyz getAttentionPos(fopAc_ac_c*);
     int standWaitJump(void*);
 
-    bool checkNpcObjGra() { return mMode == 1; }
-    void setCrazyDash() { field_0xa48 |= 4; }
-    void setCrazyCatch() { field_0xa48 |= 2; }
-    void setCrazyThrowLeft() { field_0xa48 |= 8; }
-    void setCrazyThrowRight() { field_0xa48 |= 0x10; }
+    u8 checkNpcObjGra() { return mMode == 1; }
+    void setCrazyDash() { field_0xa48 |= (u16)4; }
+    void setCrazyCatch() { field_0xa48 |= (u16)2; }
+    void setCrazyThrowLeft() { field_0xa48 |= (u16)8; }
+    void setCrazyThrowRight() { field_0xa48 |= (u16)0x10; }
 
     static MotionFunc mBaseMotionList[22];
     static MotionFunc mFaceMotionList[14];

include/d/actor/d_a_obj_sekizoa.h

@@ -229,45 +229,34 @@ public:
     }
 
     u8 getType() {
-        int prm = fopAcM_GetParam(this) >> 0x1C;
+        int prm = (fopAcM_GetParam(this) & 0xF0000000) >> 28;
 
-        u8 type;
         switch (argument) {
         case 0:
             switch (prm) {
             case 1:
-                type = 2;
-                break;
+                return 2;
             case 2:
-                type = 4;
-                break;
+                return 4;
             case 3:
-                type = 6;
-                break;
+                return 6;
             default:
-                type = 0;
-                break;
+                return 0;
             }
             break;
         case 1:
             switch (prm) {
             case 1:
-                type = 3;
-                break;
+                return 3;
             case 2:
-                type = 5;
-                break;
+                return 5;
             default:
-                type = 1;
-                break;
+                return 1;
             }
             break;
         default:
-            type = 0;
-            break;
+            return 0;
         }
-
-        return type;
     }
 
     u8 getBitSW() { return fopAcM_GetParam(this) & 0xff; }
@@ -304,11 +293,11 @@ public:
     /* 0x1124 */ daNpcT_Path_c mPath;
     /* 0x114C */ cXyz mCXyzJump;
     /* 0x1158 */ int mLatencyTime;
-    /* 0x115C */ float mJumpHeight;
-    /* 0x1160 */ float mJumpSpeed;
-    /* 0x1164 */ float mColsetBlend;
-    /* 0x1168 */ float mGoalStatueTurnSpeed;
-    /* 0x116C */ float mGoalStatueAngle;
+    /* 0x115C */ f32 mJumpHeight;
+    /* 0x1160 */ f32 mJumpSpeed;
+    /* 0x1164 */ f32 mColsetBlend;
+    /* 0x1168 */ f32 mGoalStatueTurnSpeed;
+    /* 0x116C */ f32 mGoalStatueAngle;
     /* 0x1170 */ s16 mPlayerDirection;
     /* 0x1172 */ u8 mReset;
     /* 0x1173 */ u8 mSetWolfHowling;

include/d/actor/d_a_obj_swhang.h

@@ -65,7 +65,7 @@ public:
     cXyz getHangPos() { return mHangPos; }
 
     void setHangPlayer() { mHangPlayer = 1; }
-    u8 getType() { return mType; }
+    int getType() { return mType; }
     u8 getType_private() { return fopAcM_GetParamBit(this, 28, 4); }
     u8 checkType() { return fopAcM_GetParamBit(this, 25, 1); }
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
@@ -76,6 +76,7 @@ public:
     void clrFlag() { mFlags = 0; }
     void onFlag(u16 flag) { mFlags |= flag; }
     u16 checkFlag(u16 flag) { return mFlags & flag; }
+    s16 getAngleY() { return shape_angle.y; }
 
 private:
     /* 0x5B0 */ request_of_phase_process_class mPhase;

include/d/actor/d_a_obj_wchain.h

@@ -37,21 +37,25 @@ public:
     cXyz& getJumpAimPos() { return eyePos; }
     cXyz& getTopPos() { return mTopPos; }
     cXyz& getRoofPos() { return mRoofPos; }
-    f32 getPullLength() { return mPullLength; }
+    f32 getPullLength() const { return mPullLength; }
     void setPullLength(f32 i_length) { mPullLength = i_length; }
-    f32 getInitOutLength() { return mInitOutLength; }
+    f32 getInitOutLength() const { return mInitOutLength; }
     f32 getRealRoofY() { return mRealRoofY; }
     f32 getMoveDisRate() { return mPullLength * 0.01f; }
-    f32 getLastOffset() { return 6.0f; }
-    f32 getDownOffset() { return 100.0f; }
-    f32 getSwitchOffset() { return 94.0f; }
+    static f32 getLastOffset() { return 6.0f; }
+    static f32 getDownOffset() { return 100.0f; }
+    static f32 getSwitchOffset() { return 94.0f; }
     u8 getSwitchNum() { return mSw; }
     void onRide() { mRide = true; }
     void offRide() { mRide = false; }
     bool checkRideFlg() { return mRide; }
     void onEndFlg() { mEnd = true; }
     bool getEndFlg() { return mEnd; }
-    void onNowSwitchFlg() { mDown = mNowSwitch = true; }
+
+    void onNowSwitchFlg() {
+        mNowSwitch = true;
+        mDown = true;
+    }
 
 private:
     /* 0x568 */ request_of_phase_process_class mPhaseReq;

include/d/actor/d_a_obj_wind_stone.h

@@ -31,7 +31,7 @@ public:
     u8 getGoldWolfIdx();
 
     s8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); }
-    int getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); }
+    s8 getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); }
     u32 getSwBit1() { return home.angle.x & 0xff; }
     u32 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
     u32 getDelEveFlgId() { return fopAcM_GetParamBit(this, 0x10, 0x10); }

include/d/actor/d_a_obj_yobikusa.h

@@ -82,7 +82,10 @@ public:
     const attributes* attr() const { return &M_attr; }
     int getType() { return argument & 0x7F; }
     u8 getPathID() { return fopAcM_GetParam(this); }
-    bool isPlayerCorrect() { return (s8)(u8)(fopAcM_GetParam(this) >> 8) > 0; }
+    bool isPlayerCorrect() {
+        s8 var_r31 = (fopAcM_GetParam(this) >> 8) & 0xFF;
+        return var_r31 > 0;
+    }
 
 private:
     /* 0x568 */ J3DModel* mpActiveModel;

include/d/actor/d_a_spinner.h

@@ -48,6 +48,7 @@ public:
     dPath* checkPathMoveNow() { return mpPathMove; }
 
     static u32 getWaitArg() { return 0; }
+    static int getWaterSinkLimit() { return 50; }
 
     BOOL getDeleteFlg() const { return mDeleteFlg; }
 

include/d/actor/d_a_tag_kmsg.h

@@ -45,9 +45,9 @@ public:
     }
     
     int getType() {
-        int param = fopAcM_GetParam(this) >> 0x18;
-        int type;
+        u32 param = (fopAcM_GetParam(this) & 0xFF000000) >> 0x18;
 
+        int type;
         if (param == 0xFF) {
             type = 0;
         } else {

include/d/d_camera.h

@@ -1092,8 +1092,8 @@ public:
         i_info->field_0x1e = param_1;
     }
 
-    void EventFlag(int i_flag) {
-        mEventData.field_0x24 = i_flag;
+    int EventFlag(int i_flag) {
+        return mEventData.field_0x24 = i_flag;
     }
 
     void Att() {