player_main work

include/d/actor/d_a_boomerang.h

@@ -6,7 +6,7 @@
 
 class daBoomerang_c : public fopAc_ac_c {
 public:
-    void onCancelFlg() {}
+    void onCancelFlg() { mCancelFlg = true; }
 
     daBoomerang_c();
     s32 create();
@@ -27,6 +27,8 @@ public:
 
 public:
     /* Place member variables here */
+    /* 0x290 */ u8 m290[0xF34 - 0x290];
+    /* 0xF34 */ bool mCancelFlg;
 };
 
 class daBoomerang_blur_c {
@@ -43,9 +45,4 @@ public:
     void play(int);
 };
 
-class dBgS_BoomerangLinChk {
-public:
-    ~dBgS_BoomerangLinChk();
-};
-
 #endif /* D_A_BOOMERANG_H */

include/d/actor/d_a_player.h

@@ -125,6 +125,7 @@ public:
         daPyFlg1_UNK800000              = 0x00800000,
         daPyFlg1_UNK1000000             = 0x01000000,
         daPyFlg1_VINE_CATCH             = 0x02000000,
+        daPyFlg1_UNK4000000             = 0x04000000,
         daPyFlg1_UNK8000000             = 0x08000000,
         daPyFlg1_UNK10000000            = 0x10000000,
         daPyFlg1_LAST_COMBO_WAIT        = 0x20000000,

include/d/actor/d_a_player_main.h

@@ -827,7 +827,7 @@ public:
     void seStartSwordCut(u32);
     BOOL itemButton() const;
     BOOL itemTrigger() const;
-    u8 getReadyItem();
+    int getReadyItem();
     BOOL checkGroupItem(int, int);
     BOOL checkSetItemTrigger(int, int);
     BOOL auraJointCB0(int);
@@ -895,7 +895,7 @@ public:
     void setBlendMoveAnime(f32);
     void setBlendAtnBackMoveAnime(f32);
     void setBlendAtnMoveAnime(f32);
-    void setAnimeEquipSword(int);
+    void setAnimeEquipSword(BOOL);
     void setAnimeEquipSingleItem(u16);
     void setAnimeEquipItem();
     void setAnimeUnequipSword();