various fixes / matches (#2052)

* some fixes in d/s, d_item, d_shop

* fix for dKankyo_DayProc weak generation

* d_cc_uty fix

* some d_name / d_com_inf_game / f_op_actor_mng matches

* fix some player inline virtuals

* remove asm

3 files changed, 33 insertions, 38 deletions

diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h
index 08d73420da..41ba148b0e 100644
--- a/include/d/a/d_a_alink.h
+++ b/include/d/a/d_a_alink.h
@@ -2971,18 +2971,18 @@ public:
     /* 80140888 */ void statusWindowExecute(cXyz const*, s16);
     /* 80140984 */ void statusWindowDraw();
     /* 80140AC8 */ void resetStatusWindow();
-    /* 8018280C */ void getChainGrabActor();
-    /* 80182814 */ void checkCokkoGlide() const;
-    /* 8018283C */ void checkCameraLargeDamage() const;
-    /* 80182870 */ void getHsSubChainTopPos() const;
-    /* 80182888 */ void checkCutHeadProc() const;
-    /* 8018289C */ void getRideActor();
+    /* 8018280C */ fopAc_ac_c* getChainGrabActor() { return field_0x2844.getActor(); }
+    /* 80182814 */ BOOL checkCokkoGlide() const { return mProcID == PROC_AUTO_JUMP && mProcVar2.field_0x300c != 0; }
+    /* 8018283C */ BOOL checkCameraLargeDamage() const { return mProcID == PROC_LARGE_DAMAGE || mProcID == PROC_LARGE_DAMAGE_WALL || mProcID == PROC_LARGE_DAMAGE_UP || mProcID == PROC_WOLF_LARGE_DAMAGE_UP; }
+    /* 80182870 */ const cXyz& getHsSubChainTopPos() const { return mIronBallBgChkPos; }
+    /* 80182888 */ BOOL checkCutHeadProc() const { return mProcID == PROC_CUT_HEAD; }
+    /* 8018289C */ fopAc_ac_c* getRideActor() { return mRideAcKeep.getActor(); }
 
     virtual cXyz* getMidnaAtnPos() const;
     virtual void setMidnaMsgNum(fopAc_ac_c*, u16);
     virtual MtxP getModelMtx();
     virtual MtxP getInvMtx();
-    virtual cXyz* getShadowTalkAtnPos();
+    virtual cXyz* getShadowTalkAtnPos() { return &field_0x375c; }
     virtual f32 getGroundY();
     virtual MtxP getLeftItemMatrix();
     virtual MtxP getRightItemMatrix();
diff --git a/include/d/a/d_a_item_static.h b/include/d/a/d_a_item_static.h
index 5b1c508483..2cf89231dd 100644
--- a/include/d/a/d_a_item_static.h
+++ b/include/d/a/d_a_item_static.h
@@ -19,7 +19,7 @@ public:
     /* 8015B3D8 */ void CreateInit();
     /* 8015B7BC */ void setCullInfo();
     /* 8015B7D4 */ int _daItem_create();
-    /* 8015BA9C */ void _daItem_execute();
+    /* 8015BA9C */ int _daItem_execute();
     /* 8015BD84 */ int _daItem_draw();
     /* 8015BDE8 */ int _daItem_delete();
     /* 8015BE60 */ void procInitNormal();
@@ -109,8 +109,11 @@ public:
     bool checkFlag(u8 flag) { return cLib_checkBit(mFlag, flag); }
     void clrFlag(u8 flag) { cLib_offBit(mFlag, flag); }
 
+#ifdef NONMATCHING
+    static procFunc mFuncPtr[9];
+#else
     static u8 mFuncPtr[120];
-    //static procFunc mFuncPtr[9];
+#endif
     static dCcD_SrcCyl m_cyl_src;
     static s32 m_timer_max;
 
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index f453b76aac..c3511a4a69 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -540,25 +540,17 @@ public:
     void cancelOriginalDemo();
     void changeOriginalDemo();
     cXyz getHeadTopPos() const;
-    /* 801829E0 */ void checkThrowDamage() const;
-    /* 80182A10 */ void checkGoronSideMove() const;
-    /* 80182AAC */ void getRightFootPosP();
-    /* 80182AB4 */ void getLeftFootPosP();
-    /* 80182ABC */  // u32 getMidnaActor();
-    /* 80182AC4 */ void checkCopyRodThrowAfter() const;
-    /* 80182AD8 */ void checkRide() const;
-    /* 80182B9C */ void getRightHandPos() const;
-    /* 8015DFD8 */ const cXyz getItemPos() const;
-    /* 8015DFF4 */ const cXyz& getLeftHandPos() const;
+    /* 801829E0 */ BOOL checkThrowDamage() const { return i_checkNoResetFlg1(FLG1_THROW_DAMAGE); }
+    /* 80182A10 */ BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; }
+    /* 80182AAC */ cXyz* getRightFootPosP() { return &mRightFootPos; }
+    /* 80182AB4 */ cXyz* getLeftFootPosP() { return &mLeftFootPos; }
+    /* 80182AC4 */ BOOL checkCopyRodThrowAfter() const { return i_checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); }
+    /* 80182AD8 */ BOOL checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
+    /* 80182B9C */ const cXyz& getRightHandPos() const { return mRightHandPos; }
+    /* 8015DFD8 */ const cXyz* getItemPos() const { return &mItemPos; }
+    /* 8015DFF4 */ const cXyz* getLeftHandPos() const { return &mLeftHandPos; }
     /* 800977B4 */ bool checkMidnaRide() const;
 
-    /* const cXyz* getItemPos() const {
-        return &mItemPos;
-    }
-    const cXyz* getLeftHandPos() const {
-        return &mLeftHandPos;
-    } */
-
     virtual cXyz* getMidnaAtnPos() const;
     virtual void setMidnaMsgNum(fopAc_ac_c*, u16);
     virtual MtxP getModelMtx();
@@ -574,9 +566,9 @@ public:
     virtual MtxP getWolfBackbone2Matrix();
     virtual MtxP getBottleMtx();
     virtual BOOL checkPlayerGuard() const;
-    virtual u32 checkPlayerFly() const;
-    virtual BOOL checkFrontRoll() const;
-    virtual BOOL checkWolfDash() const;
+    virtual u32 checkPlayerFly() const { return 0; }
+    virtual BOOL checkFrontRoll() const { return false; }
+    virtual BOOL checkWolfDash() const { return false; }
     virtual BOOL checkAutoJump() const;
     virtual bool checkSideStep() const;
     virtual bool checkWolfTriggerJump() const;
@@ -618,9 +610,9 @@ public:
     virtual void setAnimeFrame(f32);
     virtual bool checkWolfLock(fopAc_ac_c*) const;
     virtual bool cancelWolfLock(fopAc_ac_c*);
-    virtual s32 getAtnActorID() const;
+    virtual s32 getAtnActorID() const { return -1; }
     virtual s32 getItemID() const;
-    virtual s32 getGrabActorID() const;
+    virtual s32 getGrabActorID() const { return -1; }
     virtual bool exchangeGrabActor(fopAc_ac_c*);
     virtual bool setForceGrab(fopAc_ac_c*, int, int);
     virtual void setForcePutPos(cXyz const&);
@@ -632,11 +624,11 @@ public:
     virtual void setOutPower(f32, short, int);
     virtual void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*);
     virtual void onMagneGrab(f32, f32);
-    virtual void onFrollCrashFlg(u8, int);
+    virtual void onFrollCrashFlg(u8, int) {}
     virtual MtxP getModelJointMtx(u16);
     virtual MtxP getHeadMtx();
     virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
-    virtual BOOL checkCutJumpCancelTurn() const;
+    virtual BOOL checkCutJumpCancelTurn() const { return FALSE; }
     virtual bool checkIronBallReturn() const;
     virtual bool checkIronBallGroundStop() const;
     virtual BOOL checkSingleBoarBattleSecondBowReady() const;
@@ -655,11 +647,11 @@ public:
     virtual void onSceneChangeArea(u8, u8, fopAc_ac_c*);
     virtual void onSceneChangeAreaJump(u8, u8, fopAc_ac_c*);
     virtual void onSceneChangeDead(u8, int);
-    virtual u32 checkHorseRide() const;
-    virtual u32 checkBoarRide() const;
-    virtual u32 checkCanoeRide() const;
-    virtual u32 checkBoardRide() const;
-    virtual u32 checkSpinnerRide() const;
+    virtual u32 checkHorseRide() const { return false; }
+    virtual u32 checkBoarRide() const { return 0; }
+    virtual u32 checkCanoeRide() const { return 0; }
+    virtual u32 checkBoardRide() const { return 0; }
+    virtual u32 checkSpinnerRide() const { return 0; }
     virtual fopAc_ac_c* getSpinnerActor();
     virtual BOOL checkHorseRideNotReady() const;
     virtual bool checkArrowChargeEnd() const;