d_a_horse mostly done (#2284)

* checkpoint

* d_a_horse mostly done

* some horse doc

include/JSystem/JParticle/JPAEmitter.h

@@ -168,6 +168,9 @@ public:
         JPASetRMtxSTVecfromMtx(matrix, mGlobalRot, &mGlobalScl, &mGlobalTrs);
         mGlobalPScl.set(mGlobalScl.x, mGlobalScl.y);
     }
+    void setDirection(const JGeometry::TVec3<f32>& direction) {
+        mLocalDir.set(direction);
+    }
 
     void setLocalScale(const JGeometry::TVec3<f32>& scale) {
         mLocalScl.set(scale);

include/SSystem/SComponent/c_cc_d.h

@@ -496,6 +496,7 @@ public:
     u32 ChkCoNoCrr() const { return mObjCo.ChkNoCrr(); }
     void OnCoNoCrrBit() { mObjCo.OnNoCrrBit(); }
     u32 ChkCoSph3DCrr() const { return mObjCo.ChkSph3DCrr(); }
+    void OnCoNoCoHitInfSet() { mObjCo.OnSPrmBit(0x200); }
     void OnAtSPrmBit(u32 flag) { mObjAt.OnSPrmBit(flag); }
     void OffAtSPrmBit(u32 flag) { mObjAt.OffSPrmBit(flag); }
     void OffTgSPrmBit(u32 flag) { mObjTg.OffSPrmBit(flag); }
@@ -518,6 +519,7 @@ public:
     void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); }
     void SetCoVsGrp(u32 grp) { mObjCo.SetVsGrp(grp); }
     void SetCoIGrp(u32 grp) { mObjCo.SetIGrp(grp); }
+    void SetTgGrp(u32 grp) { mObjTg.SetGrp(grp); }
     void SetAtSPrm(u32 prm) { mObjAt.SetSPrm(prm); }
     void SetTgSPrm(u32 prm) { mObjTg.SetSPrm(prm); }
     void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); }

include/d/actor/d_a_alink.h

@@ -3244,7 +3244,7 @@ public:
     bool checkHorseTiredAnime() const { return checkUpperAnime(0x263); }
     bool checkHorseSwordUpAnime() const { return checkUpperAnime(0xCC); }
     bool checkHorseUnderItemAnime() const { return checkUnderAnime(0x19); }
-    bool checkHorseWalkStartAnm() const { return checkUnderMove0BckNoArc(ANM_WSTARTH); }
+    BOOL checkHorseWalkStartAnm() const { return checkUnderMove0BckNoArc(ANM_WSTARTH); }
     bool checkIronBallPreSwingAnime() const { return checkUpperAnime(0x19A); }
     bool checkIronBallSwingAnime() const { return checkUpperAnime(0x19B); }
     bool checkDashDamageAnime() const { return checkUpperAnime(0xAD); }
@@ -3382,6 +3382,18 @@ public:
         return var_r4;
     }
 
+    BOOL checkSlideMode() {
+        return mProcID == PROC_SLIDE ||
+               mProcID == PROC_SLIDE_LAND ||
+               mProcID == PROC_WOLF_SLIDE_READY ||
+               mProcID == PROC_WOLF_SLIDE_LAND ||
+               mProcID == PROC_WOLF_SLIDE;
+    }
+
+    BOOL checkHorseGetItem() const {
+        return (mProcID == PROC_GET_ITEM && checkHorseRide()) || mProcID == PROC_HORSE_GET_KEY;
+    }
+
     bool checkFisingRodJewl() const {
         return (mEquipItem == 0x5C || mEquipItem == 0x5F) || mEquipItem == 0x5E;
     }
@@ -3418,7 +3430,10 @@ public:
 
     bool checkCopyRodRevive() const { return mProcID == PROC_COPY_ROD_REVIVE; }
     bool checkHorseGetOffMode() const { return mProcID == PROC_HORSE_GETOFF; }
+    bool checkHorseHangMode() const { return mProcID == PROC_HORSE_HANG; }
+    bool checkHorseBackInput() const { return mProcID == PROC_HORSE_WAIT; }
     bool checkHorseRideOn() const { return mProcID == PROC_HORSE_RIDE; }
+    bool checkHorseTurnMode() const { return mProcID == PROC_HORSE_TURN; }
     bool checkGrabUp() const { return mProcID == PROC_GRAB_UP; }
     bool checkSpinnerRideWait() const {
         return mProcID == PROC_SPINNER_WAIT && mProcVar2.field_0x300c == 0;
@@ -3519,6 +3534,8 @@ public:
     int getIronBallHandChainNum() const { return mItemMode; }
     const cXyz& getIronBallChainHandRootPos() const { return mHookshotTopPos; }
 
+    fopAc_ac_c* getAtnActor() { return mTargetedActor; }
+
     void itemHitSE(u32 param_1, u32 param_2, Z2SoundObjBase* param_3) { mZ2Link.startHitItemSE(param_1, param_2, param_3, -1.0f); }
 
     BOOL checkStartFall() { return getStartMode() == 3; }
@@ -3528,6 +3545,16 @@ public:
 
     BOOL checkWindSpeedMoveXZ() const { return mWindSpeed.abs2XZ() > 1.0f; }
 
+    BOOL checkHorseRideReady() const { return checkHorseRideOn() || checkHorseGetOffMode(); }
+
+    void getHorseReinCenterLeftPos(cXyz* o_pos) {
+        mDoMtx_multVec(getLeftHandMatrix(), &m_handLeftInSidePos, o_pos);
+    }
+
+    void getHorseReinCenterRightPos(cXyz* o_pos) {
+        mDoMtx_multVec(getRightHandMatrix(), &m_handRightInSidePos, o_pos);
+    }
+
     inline bool checkWindSpeedOnXZ() const;
     inline void startRestartRoomFromOut(int, u32, int);
     inline u16 getReadyItem();
@@ -4199,7 +4226,7 @@ struct daAlinkHIO_anm_c {
     /* 0x04 */ f32 mSpeed;
     /* 0x08 */ f32 mStartFrame;
     /* 0x0C */ f32 mInterpolation;
-    /* 0x10 */ f32 mCheckFrame;  // name maybe wrong
+    /* 0x10 */ f32 mCancelFrame;
 }; // size: 0x14
 
 struct daAlinkHIO_basic_c1 {

include/d/actor/d_a_cow.h

@@ -54,7 +54,7 @@ public:
     /* 8065C508 */ void setCowInCage();
     /* 8065C680 */ void setEnterCount();
     /* 8065C70C */ void action_enter();
-    /* 8065CFBC */ void isAngry();
+    /* 8065CFBC */ bool isAngry();
     /* 8065D03C */ void isGuardFad();
     /* 8065D0B8 */ void setAngryHit();
     /* 8065D17C */ void checkBeforeBgAngry(s16);

include/d/actor/d_a_hozelda.h

@@ -59,8 +59,11 @@ public:
     /* 80848B64 */ void draw();
 
     MtxP getRightHandMtx() { return mpZeldaModel->getAnmMtx(22); }
+    MtxP getRightFingerMtx() { return mpZeldaModel->getAnmMtx(23); }
+
     u8 checkBowMode() const { return field_0x6d8; }
     void setDamageInit() { field_0x6db = 1; }
+    u8 checkSingleRide() const { return field_0x6df; }
 
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ J3DModel* mpZeldaModel;

include/d/actor/d_a_player.h

@@ -113,8 +113,8 @@ private:
 
 class daPy_frameCtrl_c : public J3DFrameCtrl {
 public:
-    /* 80140D24 */ ~daPy_frameCtrl_c();
-    /* 80140D80 */ daPy_frameCtrl_c();
+    /* 80140D24 */ virtual ~daPy_frameCtrl_c() {}
+    /* 80140D80 */ daPy_frameCtrl_c() {}
     bool checkAnmEnd();
     void updateFrame();
     void setFrameCtrl(u8, short, short, f32, f32);
@@ -929,6 +929,7 @@ public:
     BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_UNK_1); }
     u32 getCutAtFlg() const { return checkNoResetFlg0(FLG0_UNK_40); }
     u32 checkBoarSingleBattleFirst() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
+    u32 checkBoarSingleBattleSecond() const { return checkNoResetFlg2(FLG2_UNK_1000000); }
 
     void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); }
     bool onWolfEnemyHangBite(fopAc_ac_c* param_0) { return onWolfEnemyBiteAll(param_0, FLG2_WOLF_ENEMY_HANG_BITE); }

include/d/actor/d_a_scene_exit.h

@@ -25,6 +25,16 @@ public:
     u8 getPathID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; }
     void setSceneChangeOK() { mSceneChangeOK = true; }
 
+    BOOL checkArea(const cXyz* param_0) {
+        cXyz spC;
+        mDoMtx_multVec(mMatrix, param_0, &spC);
+        if (spC.y >= 0.0f && spC.y <= scale.y && fabsf(spC.x) <= scale.x && fabsf(spC.z) <= scale.z) {
+            return TRUE;
+        }
+
+        return FALSE;
+    }
+
     /* 0x568 */ Mtx mMatrix;
     /* 0x598 */ u8 field_0x598;
     /* 0x599 */ bool mSceneChangeOK;

include/d/actor/d_a_tag_hstop.h

@@ -16,6 +16,12 @@ public:
     daTagHstop_c* getNext() { return mNext; }
     bool getActiveFlg() const { return mActive; }
 
+    void onTagStop() {
+        if (field_0x573 == 0) {
+            field_0x573 = 1;
+        }
+    }
+
     static daTagHstop_c* m_top;
     static dMsgFlow_c m_msgFlow;
 

include/d/d_bg_s_acch.h

@@ -265,4 +265,13 @@ public:
     virtual ~dBgS_BombAcch() {}
 };
 
+class dBgS_HorseAcch : public dBgS_Acch {
+public:
+    dBgS_HorseAcch() {
+        SetHorse();
+    }
+
+    /* 80845274 */ virtual ~dBgS_HorseAcch() {}
+};
+
 #endif /* D_BG_D_BG_S_ACCH_H */

include/d/d_com_inf_game.h

@@ -1590,6 +1590,26 @@ inline void dComIfGs_setRestartRoomParam(u32 i_param) {
     g_dComIfG_gameInfo.info.getRestart().setRoomParam(i_param);
 }
 
+inline cXyz& dComIfGs_getHorseRestartPos() {
+    return g_dComIfG_gameInfo.info.getPlayer().getHorsePlace().getPos();
+}
+
+inline s16 dComIfGs_getHorseRestartAngleY() {
+    return g_dComIfG_gameInfo.info.getPlayer().getHorsePlace().getAngleY();
+}
+
+inline const char* dComIfGs_getHorseRestartStageName() {
+    return g_dComIfG_gameInfo.info.getPlayer().getHorsePlace().getStageName();
+}
+
+inline s8 dComIfGs_getHorseRestartRoomNo() {
+    return g_dComIfG_gameInfo.info.getPlayer().getHorsePlace().getRoomNo();
+}
+
+inline void dComIfGs_setHorseRestart(const char* i_stageName, cXyz& i_pos, s16 i_angle, s8 i_roomNo) {
+    g_dComIfG_gameInfo.info.getPlayer().getHorsePlace().set(i_stageName, i_pos, i_angle, i_roomNo);
+}
+
 inline u8 dComIfGs_getMagic() {
     return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMagic();
 }
@@ -2121,6 +2141,10 @@ inline daHorse_c* dComIfGp_getHorseActor() {
     return (daHorse_c*)g_dComIfG_gameInfo.play.getPlayerPtr(1);
 }
 
+inline void dComIfGp_setHorseActor(fopAc_ac_c* i_horse) {
+    g_dComIfG_gameInfo.play.setPlayerPtr(1, i_horse);
+}
+
 inline dMsgObject_c* dComIfGp_getMsgObjectClass() {
     return g_dComIfG_gameInfo.play.getMsgObjectClass();
 }

include/d/d_meter2_info.h

@@ -192,6 +192,7 @@ public:
     u8 getTableMapRegionNo() { return mTableMapRegionNo; }
     u8 getGoldWolfMapType() { return mGoldWolfMapType; }
     bool isWindowAccept(int param_0) { return mWindowAccept & (1 << param_0); }
+    void setHorseLifeCount(s16 i_count) { mHorseLifeCount = i_count; }
 
 public:
     /* 0x04 */ u8 unk4[4];
@@ -794,6 +795,10 @@ inline bool dMeter2Info_isWindowAccept(int param_0) {
     return g_meter2_info.isWindowAccept(param_0);
 }
 
+inline void dMeter2Info_setHorseLifeCount(s16 i_count) {
+    g_meter2_info.setHorseLifeCount(i_count);
+}
+
 const char* dMeter2Info_getPlusTextureName();
 const char* dMeter2Info_getNumberTextureName(int pIndex);
 int dMeter2Info_recieveLetter();

include/d/d_save.h

@@ -211,12 +211,17 @@ public:
     void init();
     void set(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_roomNo);
 
+    cXyz& getPos() { return mPos; }
+    s16 getAngleY() const { return mAngleY; }
+    const char* getStageName() const { return mName; }
+    s8 getRoomNo() const { return mRoomNo; }
+
 private:
     /* 0x00 */ cXyz mPos;
-    /* 0x0C */ u16 mAngleY;
+    /* 0x0C */ s16 mAngleY;
     /* 0x0E */ char mName[8];
     /* 0x16 */ u8 mSpawnId;
-    /* 0x17 */ u8 mRoomNo;
+    /* 0x17 */ s8 mRoomNo;
 };  // Size: 0x18
 
 class dSv_player_return_place_c {
@@ -514,6 +519,7 @@ public:
     dSv_player_info_c& getPlayerInfo() { return mPlayerInfo; }
     dSv_player_status_a_c& getPlayerStatusA() { return mPlayerStatusA; }
     dSv_player_status_b_c& getPlayerStatusB() { return mPlayerStatusB; }
+    dSv_horse_place_c& getHorsePlace() { return mHorsePlace; }
     dSv_player_item_c& getItem() { return mItem; }
     dSv_player_collect_c& getCollect() { return mCollect; }
     dSv_player_item_record_c& getItemRecord() { return mItemRecord; }

include/f_op/f_op_actor_mng.h

@@ -86,63 +86,6 @@ public:
 
 dBgS& dComIfG_Bgsp();
 
-class fopAcM_lc_c {
-public:
-    fopAcM_lc_c() { mLineCheck.ClrSttsRoofOff(); }
-
-    static dBgS_ObjLinChk* getLineCheck() { return &mLineCheck; }
-    static bool checkMoveBG() { return dComIfG_Bgsp().ChkMoveBG(mLineCheck); }
-    static cXyz* getCrossP() { return mLineCheck.GetCrossP(); }
-    static bool lineCheck(const cXyz*, const cXyz*, const fopAc_ac_c*);
-    static bool getTriPla(cM3dGPla* o_tri) { return dComIfG_Bgsp().GetTriPla(mLineCheck, o_tri); }
-    static bool checkWallHit() {
-        cM3dGPla poly;
-        getTriPla(&poly);
-        return cBgW_CheckBWall(poly.mNormal.y);
-    }
-
-    static dBgS_ObjLinChk mLineCheck;
-};
-
-class dBgS_RoofChk;
-class fopAcM_rc_c {
-public:
-    static dBgS_ObjRoofChk* getRoofCheck() { return &mRoofCheck; }
-    static f32 getRoofY() { return mRoofY; }
-    static bool roofCheck(const cXyz*);
-
-    static dBgS_ObjRoofChk mRoofCheck;
-    static f32 mRoofY;
-};
-
-class dBgS_GndChk;
-class fopAcM_gc_c {
-public:
-    static bool gndCheck(const cXyz*);
-    static dBgS_ObjGndChk mGndCheck;
-    static f32 mGroundY;
-
-    static bool getTriPla(cM3dGPla* i_plane) {
-        return dComIfG_Bgsp().GetTriPla(mGndCheck, i_plane);
-    }
-    static int getRoomId() { return dComIfG_Bgsp().GetRoomId(mGndCheck); }
-    static int getPolyColor() { return dComIfG_Bgsp().GetPolyColor(mGndCheck); }
-    static int getPolyAtt0() { return dComIfG_Bgsp().GetPolyAtt0(mGndCheck); }
-    static dBgS_ObjGndChk* getGroundCheck() { return &mGndCheck; }
-    static f32 getGroundY() { return mGroundY; }
-};
-
-class fopAcM_wt_c {
-public:
-    static dBgS_WtrChk* getWaterCheck() { return &mWaterCheck; }
-    static f32 getWaterY() { return mWaterY; }
-    static int getPolyAtt0() { return dComIfG_Bgsp().GetPolyAtt0(mWaterCheck); }
-
-    static bool waterCheck(const cXyz*);
-    static dBgS_WtrChk mWaterCheck;
-    static f32 mWaterY;
-};
-
 class dKy_tevstr_c;
 class cBgS_PolyInfo;
 typedef int (*heapCallbackFunc)(fopAc_ac_c*);
@@ -796,4 +739,69 @@ inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_
 #define fopAcM_setWarningMessage(...)
 #endif
 
+class fopAcM_lc_c {
+public:
+    fopAcM_lc_c() { mLineCheck.ClrSttsRoofOff(); }
+
+    static dBgS_ObjLinChk* getLineCheck() { return &mLineCheck; }
+    static bool checkMoveBG() { return dComIfG_Bgsp().ChkMoveBG(mLineCheck); }
+    static cXyz* getCrossP() { return mLineCheck.GetCrossP(); }
+    static bool lineCheck(const cXyz*, const cXyz*, const fopAc_ac_c*);
+    static bool getTriPla(cM3dGPla* o_tri) { return dComIfG_Bgsp().GetTriPla(mLineCheck, o_tri); }
+    static bool checkWallHit() {
+        cM3dGPla poly;
+        getTriPla(&poly);
+        return cBgW_CheckBWall(poly.mNormal.y);
+    }
+
+    static dBgS_ObjLinChk mLineCheck;
+};
+
+class dBgS_RoofChk;
+class fopAcM_rc_c {
+public:
+    static dBgS_ObjRoofChk* getRoofCheck() { return &mRoofCheck; }
+    static f32 getRoofY() { return mRoofY; }
+    static bool roofCheck(const cXyz*);
+
+    static dBgS_ObjRoofChk mRoofCheck;
+    static f32 mRoofY;
+};
+
+class dBgS_GndChk;
+class fopAcM_gc_c {
+public:
+    static bool gndCheck(const cXyz*);
+    static dBgS_ObjGndChk mGndCheck;
+    static f32 mGroundY;
+
+    static bool getTriPla(cM3dGPla* i_plane) {
+        return dComIfG_Bgsp().GetTriPla(mGndCheck, i_plane);
+    }
+
+    static s16 getGroundAngleDirection(s16 param_0) {
+        cM3dGPla spC;
+        getTriPla(&spC);
+        return fopAcM_getPolygonAngle(&spC, param_0);
+    }
+
+    static int getRoomId() { return dComIfG_Bgsp().GetRoomId(mGndCheck); }
+    static int getPolyColor() { return dComIfG_Bgsp().GetPolyColor(mGndCheck); }
+    static int getPolyAtt0() { return dComIfG_Bgsp().GetPolyAtt0(mGndCheck); }
+    static int getHorseNoEntry() { return dComIfG_Bgsp().GetHorseNoEntry(mGndCheck); }
+    static dBgS_ObjGndChk* getGroundCheck() { return &mGndCheck; }
+    static f32 getGroundY() { return mGroundY; }
+};
+
+class fopAcM_wt_c {
+public:
+    static dBgS_WtrChk* getWaterCheck() { return &mWaterCheck; }
+    static f32 getWaterY() { return mWaterY; }
+    static int getPolyAtt0() { return dComIfG_Bgsp().GetPolyAtt0(mWaterCheck); }
+
+    static bool waterCheck(const cXyz*);
+    static dBgS_WtrChk mWaterCheck;
+    static f32 mWaterY;
+};
+
 #endif

include/global.h

@@ -40,6 +40,8 @@ inline BOOL checkEqual(s32 a, s32 b) {
 
 #define FAST_DIV(x, n) (x >> (n / 2))
 
+#define SQUARE(x) ((x) * (x))
+
 // hack to make strings with no references compile properly
 #define DEAD_STRING(s) OSReport(s)
 

include/m_Do/m_Do_ext.h

@@ -187,6 +187,8 @@ public:
 
     int remove(J3DModelData* i_modelData) { return i_modelData->removeTexNoAnimator(mpAnm); }
 
+    J3DAnmTexPattern* getBtpAnm() const { return mpAnm; }
+
 private:
     /* 0x14 */ J3DAnmTexPattern* mpAnm;
 };
@@ -210,8 +212,11 @@ class J3DTransformInfo;
 
 class mDoExt_AnmRatioPack {
 public:
-    /* 80140DF0 */ ~mDoExt_AnmRatioPack();
-    /* 80140E2C */ mDoExt_AnmRatioPack();
+    ~mDoExt_AnmRatioPack() {}
+    mDoExt_AnmRatioPack() {
+        mRatio = 0.0f;
+        mAnmTransform = NULL;
+    }
 
     void setRatio(f32 ratio) { mRatio = ratio; }
     f32 getRatio() { return mRatio; }

src/d/actor/d_a_alink.cpp

@@ -13046,9 +13046,9 @@ BOOL daAlink_c::checkItemAction() {
         if (mEquipItem == 0x103) {
             daPy_frameCtrl_c* frame_ctrl = &mUpperFrameCtrl[2];
 
-            if ((checkUpperAnime(0x80) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaL_c0::m.mCutAnm.mCheckFrame) ||
-                (checkUpperAnime(0x81) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaR_c0::m.mCutAnm.mCheckFrame) ||
-                (checkUpperAnime(0x82) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaCharge_c0::m.mCutAnm.mCheckFrame) ||
+            if ((checkUpperAnime(0x80) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaL_c0::m.mCutAnm.mCancelFrame) ||
+                (checkUpperAnime(0x81) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaR_c0::m.mCutAnm.mCancelFrame) ||
+                (checkUpperAnime(0x82) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaCharge_c0::m.mCutAnm.mCancelFrame) ||
                 checkModeFlg(0x40000))
             {
                 return false;
@@ -13791,25 +13791,25 @@ void daAlink_c::setItemAction() {
             setCopyRodControllUpperSpeedRate();
         }
     } else if (checkBoomerangCatchAnime()) {
-        if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame)) {
+        if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCancelFrame)) {
             resetUpperAnime(UPPER_2, 3.0f);
         } else if (frame_ctrl->getFrame() >= 20.0f) {
             field_0x2f97 = 6;
         }
     } else if (checkBoomerangThrowAnime()) {
-        if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mThrowAnm.mCheckFrame)) {
+        if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mThrowAnm.mCancelFrame)) {
             resetUpperAnime(UPPER_2, 3.0f);
         } else if (frame_ctrl->checkPass(5.5f)) {
             throwBoomerang();
         }
     } else if (checkCopyRodThrowAnime()) {
-        if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mThrowAnm.mCheckFrame)) {
+        if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mThrowAnm.mCancelFrame)) {
             resetUpperAnime(UPPER_2, 3.0f);
         } else if (frame_ctrl->checkPass(6.5f)) {
             throwCopyRod();
         }
     } else if (checkKandelaarSwingAnime()) {
-        if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_kandelaar_c0::m.mShakeAnm.mCheckFrame)) {
+        if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_kandelaar_c0::m.mShakeAnm.mCancelFrame)) {
             resetUpperAnime(UPPER_2, 3.0f);
         }
     } else if (checkEquipAnime()) {

src/d/actor/d_a_alink_boom.inc

@@ -313,7 +313,7 @@ void daAlink_c::checkUpperItemActionBoomerangFly() {
 /* 800E0BE4-800E0D8C 0DB524 01A8+00 4/4 0/0 0/0 .text checkNextActionBoomerang__9daAlink_cFv */
 int daAlink_c::checkNextActionBoomerang() {
     if ((checkBoomerangCatchAnime() &&
-         mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) ||
+         mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCancelFrame) ||
         checkNoResetFlg1(FLG1_UNK_2)) {
         return 0;
     }
@@ -495,7 +495,7 @@ int daAlink_c::procBoomerangCatch() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
     onEndResetFlg0(ERFLG0_UNK_8000000);
 
-    if (frameCtrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) {
+    if (frameCtrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCancelFrame) {
         onModeFlg(4);
     }
 

src/d/actor/d_a_alink_bottle.inc

@@ -604,7 +604,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) {
             }
         }
 
-        field_0x3478 = daAlinkHIO_bottle_c0::m.mScoopAnm.mCheckFrame;
+        field_0x3478 = daAlinkHIO_bottle_c0::m.mScoopAnm.mCancelFrame;
         field_0x347c = 14.0f;
 
         if (var_r31 != NULL) {
@@ -620,11 +620,11 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) {
         }
     } else if (temp_r3) {
         setSingleAnimeParam(ANM_BOTTLE_SWING_DOWN, &daAlinkHIO_bottle_c0::m.mSwingDownAnm);
-        field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingDownAnm.mCheckFrame;
+        field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingDownAnm.mCancelFrame;
         field_0x347c = 8.0f;
     } else {
         setSingleAnimeParam(ANM_BOTTLE_SWING, &daAlinkHIO_bottle_c0::m.mSwingSideAnm);
-        field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingSideAnm.mCheckFrame;
+        field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingSideAnm.mCancelFrame;
         field_0x347c = 4.0f;
     }
 

src/d/actor/d_a_alink_bow.inc

@@ -424,7 +424,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
         }
 
         if (checkAnmEnd(&mUpperFrameCtrl[2]) ||
-            (mUpperFrameCtrl[2].getFrame() > daAlinkHIO_bow_c0::m.mShootAnm.mCheckFrame &&
+            (mUpperFrameCtrl[2].getFrame() > daAlinkHIO_bow_c0::m.mShootAnm.mCancelFrame &&
              itemButton()))
         {
             setBowReadyAnime();