From 1afef8f35faeaeb3475e099194847de057a59d6f Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 22 Aug 2025 01:12:46 -0400 Subject: [PATCH] Fix weak func order for d_a_player_main --- include/d/actor/d_a_player_main.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index 5fa121d24..449626f76 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -1900,9 +1900,9 @@ public: virtual BOOL setThrowDamage(cXyz*, s16, f32, f32, int); virtual void changeTextureAnime(u16, u16, int); + virtual f32 getGroundY() { return mAcch.GetGroundH(); } virtual MtxP getLeftHandMatrix() { return mpCLModel->getAnmMtx(0x08); } // cl_LhandA joint virtual MtxP getRightHandMatrix() { return mpCLModel->getAnmMtx(0x0C); } // cl_RhandA joint - virtual f32 getGroundY() { return mAcch.GetGroundH(); } virtual s32 getTactMusic() const; virtual int getTactTimerCancel() const; virtual BOOL checkPlayerGuard() const; @@ -1927,7 +1927,6 @@ public: virtual BOOL checkTactWait() const { return mCurProc == daPyProc_TACT_WAIT_e; } virtual void setTactZev(fpc_ProcID, int, char*); virtual void onDekuSpReturnFlg(u8 i_point); - virtual BOOL checkComboCutTurn() const { return mCurProc == daPyProc_CUT_TURN_e && mProcVar0.m3570 != 0; } virtual f32 getBaseAnimeFrameRate() { return mFrameCtrlUnder[UNDER_MOVE0_e].getRate(); } virtual f32 getBaseAnimeFrame() { return mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); } virtual fpc_ProcID getItemID() const { return mActorKeepEquip.getID(); } @@ -1943,6 +1942,7 @@ public: virtual MtxP getModelJointMtx(u16 idx) { return mpCLModel->getAnmMtx(idx); } virtual f32 getOldSpeedY() { return mOldSpeed.y; } virtual BOOL setHookshotCarryOffset(fpc_ProcID, const cXyz*); + virtual BOOL checkComboCutTurn() const { return mCurProc == daPyProc_CUT_TURN_e && mProcVar0.m3570 != 0; } virtual void cancelChangeTextureAnime() { resetDemoTextureAnime(); } public: