d_a_tag_ret basically done (#16)

include/SSystem/SComponent/c_cc_d.h

@@ -61,7 +61,6 @@ public:
     virtual cXyz& GetCoCP() { return m_virtual_center; }
     virtual void CalcAabBox() = 0;
     virtual bool GetNVec(cXyz const&, cXyz*) const = 0;
-    virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
 
     cM3dGAab& GetWorkAab() { return mAab; }
     cM3dGAab const& GetWorkAab() const { return mAab; }
@@ -172,7 +171,6 @@ public:
     virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
     virtual void CalcAabBox();
     virtual bool GetNVec(cXyz const&, cXyz*) const;
-    virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
 
 };  // Size = 0x34
 
@@ -204,7 +202,6 @@ public:
     virtual cXyz& GetCoCP() { return mCenter; }
     virtual void CalcAabBox();
     virtual bool GetNVec(cXyz const&, cXyz*) const;
-    virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
 
 };  // Size = 0x38
 
@@ -497,7 +494,6 @@ public:
     virtual cCcD_GObjInf* GetGObjInf() { return NULL; }
     virtual cCcD_ShapeAttr const* GetShapeAttr() const { return NULL; }
     virtual cCcD_ShapeAttr* GetShapeAttr() { return NULL; }
-    virtual void Draw(_GXColor const&) {}
     void ct();
     void Set(cCcD_SrcObj const&);
     fopAc_ac_c* GetAc();

include/d/actor/d_a_player.h

@@ -70,49 +70,54 @@ public:
     /* 0x2FC */ u8 field_0x2FC[0x300 - 0x2FC];
     /* 0x300 */ f32 field_0x300;
     /* 0x304 */ daPy_demo_c mDemo;
-    /* 0x31C */ void* vtbl;
 
-    void onFrollCrashFlg(u32);
-    void getGrabActorID() const;
-    void getBokoFlamePos(cXyz*);
-    void setPlayerPosAndAngle(cXyz*, s16);
+    virtual void getLeftHandMatrix();
+    virtual void getRightHandMatrix();
+    virtual void getGroundY();
+    virtual void getTactMusic() const;
+    virtual void getTactTimerCancel() const;
+    virtual void checkPlayerGuard() const;
+    virtual void getGrabMissActor();
+    virtual void checkPlayerFly() const;
+    virtual void checkFrontRoll() const;
+    virtual void checkBottleSwing() const;
+    virtual void checkCutCharge() const;
+    virtual void getBokoFlamePos(cXyz*);
+    virtual void checkTactWait() const;
+    virtual void setTactZev(u32, int, char*);
+    virtual void onDekuSpReturnFlg(u8);
+    virtual void checkComboCutTurn() const;
+    virtual void getBaseAnimeFrameRate();
+    virtual void getBaseAnimeFrame();
+    virtual void getItemID() const;
+    virtual void getThrowBoomerangID() const;
+    virtual void getGrabActorID() const;
+    virtual void checkGrabBarrel();
+    virtual void checkPlayerNoDraw();
+    virtual void checkRopeTag();
+    virtual void checkRopeReadyAnime() const;
+    virtual void voiceStart(u32);
+    virtual void setOutPower(f32, s16, int);
+    virtual void onFrollCrashFlg(u32);
+    virtual void getModelJointMtx(u16);
+    virtual void getOldSpeedY();
+    virtual void setHookshotCarryOffset(u32, cXyz const*);
+    virtual void setPlayerPosAndAngle(cXyz*, s16);
+    virtual void setPlayerPosAndAngle(cXyz*, csXyz*);
+    virtual void setPlayerPosAndAngle(f32*[][][][]);
+    virtual void setThrowDamage(cXyz*, s16, f32, f32, int);
+    virtual void changeTextureAnime(u16, u16, int);
+    virtual void cancelChangeTextureAnime();
+    
     void getSwordTopPos() const;
-    void checkPlayerFly() const;
-    void checkPlayerNoDraw();
     void getLeftHandPos() const;
-    void checkPlayerGuard() const;
     void getRopeJumpLand() const;
-    void checkRopeReadyAnime() const;
     void checkRopeForceEnd() const;
     void getHeadTopPos() const;
     void changePlayer(fopAc_ac_c*);
     void objWindHitCheck(dCcD_Cyl*);
     void setDoButtonQuake();
     void stopDoButtonQuake(int);
-    void getTactMusic() const;
-    void getTactTimerCancel() const;
-    void getGrabMissActor();
-    void checkFrontRoll() const;
-    void checkBottleSwing() const;
-    void checkCutCharge() const;
-    void checkTactWait() const;
-    void setTactZev(u32, int, char*);
-    void onDekuSpReturnFlg(u8);
-    void checkComboCutTurn() const;
-    void getItemID() const;
-    void getThrowBoomerangID() const;
-    void checkGrabBarrel();
-    void checkRopeTag();
-    void voiceStart(u32);
-    void setOutPower(f32, s16, int);
-    void getModelJointMtx(u16);
-    void getOldSpeedY();
-    void setHookshotCarryOffset(u32, cXyz const*);
-    void setPlayerPosAndAngle(f32*[][][][]);
-    void setPlayerPosAndAngle(cXyz*, csXyz*);
-    void setThrowDamage(cXyz*, s16, f32, f32, int);
-    void changeTextureAnime(u16, u16, int);
-    void cancelChangeTextureAnime();
     void getRopePos() const;
 };
 

include/d/d_a_obj.h

@@ -6,7 +6,8 @@
 namespace daObj {
     template <typename T>
     int PrmAbstract(const fopAc_ac_c* actor, T width, T shift) {
-        return ((1 << width) - 1) & (fopAcM_GetParam(actor) >> shift);
+        u32 param = fopAcM_GetParam(actor);
+        return ((1 << width) - 1) & (param >> shift);
     }
 };
 

include/d/d_cc_d.h

@@ -351,7 +351,7 @@ STATIC_ASSERT(sizeof(dCcD_GObjInf) == 0xF8);
 class dCcD_Cyl : public dCcD_GObjInf, public cCcD_CylAttr {
 public:
     void Set(dCcD_SrcCyl const&);
-    cCcD_ShapeAttr* GetShapeAttr();
+    cCcD_ShapeAttr* GetShapeAttr() { return this; }
     void StartCAt(cXyz&);
     void MoveCAt(cXyz&);
     void MoveCTg(cXyz&);

include/d/d_item.h

@@ -1,8 +1,8 @@
 #ifndef D_ITEM_H
 #define D_ITEM_H
 
-void execItemGet(unsigned char);
-void checkItemGet(unsigned char, int);
+void execItemGet(u8 itemNo);
+BOOL checkItemGet(u8 itemNo, BOOL defaultVal);
 void item_func_heart();
 void item_func_green_rupee();
 void item_func_blue_rupee();