b_bq done (except weak funcs) (#2110)

include/SSystem/SComponent/c_xyz.h

@@ -1,8 +1,8 @@
 #ifndef C_XYZ_H
 #define C_XYZ_H
 
-#include "math.h"
 #include "dolphin/mtx/vec.h"
+#include "math.h"
 
 struct cXyz : Vec {
     static const cXyz Zero;
@@ -40,7 +40,6 @@ struct cXyz : Vec {
     /* 80266B84 */ cXyz operator*(f32) const;
     /* 80266BD0 */ cXyz operator*(Vec const&) const;
     /* 80266C18 */ cXyz operator/(f32) const;
-    /* 800977D8 */ // void operator=(cXyz const&);
 
     void operator+=(f32 f) {
         x += f;
@@ -60,7 +59,10 @@ struct cXyz : Vec {
     }
 
     void operator-=(const Vec& other) { VECSubtract(this, &other, this); }
-    void operator+=(const Vec& other) { VECAdd(this, &other, this); }
+    cXyz* operator+=(const Vec& other) {
+        VECAdd(this, &other, this);
+        return this;
+    }
     void operator*=(f32 scale) { VECScale(this, this, scale); }
     void operator/=(f32 scale) { VECScale(this, this, 1.0f / scale); }
     /* 80266C6C */ cXyz getCrossProduct(Vec const&) const;

include/d/a/d_a_player.h

@@ -722,6 +722,8 @@ public:
         mDemo.setDemoMode(1);
     }
 
+    u8 getCutCount() const { return mComboCutCount; }
+
     bool checkStatusWindowDraw() { return checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); }
     bool checkCargoCarry() const { return mSpecialMode == SMODE_CARGO_CARRY; }
     bool getHeavyStateAndBoots() { return checkNoResetFlg0(FLG0_HVY_STATE); }
@@ -805,6 +807,7 @@ public:
     u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); }
     BOOL checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
     BOOL checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
+    BOOL checkFastSwordCut() const { return checkNoResetFlg0(FLG0_UNK_80000); }
     bool checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); }
     void onPlayerNoDraw() { onNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
     void offPlayerNoDraw() { offNoResetFlg0(FLG0_PLAYER_NO_DRAW); }

include/d/com/d_com_inf_game.h

@@ -129,7 +129,7 @@ public:
     dVibration_c& getVibration() { return mVibration; }
     camera_class* getCamera(int idx) { return mCameraInfo[idx].mCamera; }
     void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; }
-    fopAc_ac_c* getPlayer(int idx) { return (fopAc_ac_c*)mPlayer[idx]; }
+    fopAc_ac_c* getPlayer(int idx) { return (fopAc_ac_c*)mPlayer[idx * 2]; }
     dPa_control_c* getParticle() { return mParticle; }
     dEvent_manager_c& getEvtManager() { return mEvtManager; }
     dAttention_c& getAttention() { return mAttention; }
@@ -489,7 +489,7 @@ public:
     void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] &= ~flag; }
     bool checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[i]; }
 
-    int getPlayerCameraID(int i) { return mPlayerCameraID[i]; }
+    int getPlayerCameraID(int i) { return mPlayerCameraID[i * 8]; }
     void setCameraParamFileName(int i, char* name) { mCameraInfo[i].mCameraParamFileName = name; }
     void setCamera(int i, camera_class* cam) { mCameraInfo[i].mCamera = cam; }
     const char* getCameraParamFileName(int i) { return mCameraInfo[i].mCameraParamFileName; }

include/f_op/f_op_actor.h

@@ -243,6 +243,7 @@ public:
     bool checkWolfNoLock() const { return mFlags & 0x200; }
     bool checkHeadLockFlg() const { return mFlags & 0x80; }
     bool checkDownFlg() const { return mFlags & 0x1; }
+    bool checkCutDownHitFlg() const { return mFlags & 0x2; }
     bool checkDeadFlg() const { return mFlags & 0x8; }
     cXyz& getDownPos() { return mDownPos; }
     cXyz& getHeadLockPos() { return mHeadLockPos; }
@@ -252,11 +253,16 @@ public:
     void onWolfDownStartFlg() { mFlags |= 0x14; }
     void onWolfDownPullEndFlg() { mFlags |= 0x20; }
     void onWolfNoLock() { mFlags |= 0x200; }
+    void onDownFlg() { mFlags |= 1; }
+
+    void offCutDownHitFlg() { mFlags &= ~0x2; }
+    void offDownFlg() { mFlags &= ~0x17; }
 
     void setThrowModeCatch() { mThrowMode |= 2; }
     void setThrowModeDash() { mThrowMode |= 4; }
     void setThrowModeThrowRight() { mThrowMode |= 0x10; }
     void setThrowModeThrowLeft() { mThrowMode |= 8; }
+    void setDownPos(const cXyz* i_pos) { mDownPos = *i_pos; }
 
     /* 0x568 */ cXyz mDownPos;
     /* 0x574 */ cXyz mHeadLockPos;

include/m_Do/m_Do_graphic.h

@@ -69,6 +69,7 @@ public:
     static u8 isFade() { return mFade; }
     static void offBlure() { mBlureFlag = false; }
     static bool isBlure() { return mBlureFlag; }
+    static void setBlureRate(u8 i_rate) { mBlureRate = i_rate; }
     static u8 getBlureRate() { return mBlureRate; }
     static MtxP getBlureMtx() { return mBlureMtx; }
     static void offAutoForcus() { data_80450BE7 = 0; }

include/std/cmath.h

@@ -1,15 +0,0 @@
-#ifndef STD_CMATH_H_
-#define STD_CMATH_H_
-
-
-namespace std {
-float fabs(float num) {
-    return fabsf(num);
-}
-
-float abs(float num) {
-    return fabsf(num);
-}
-}  // namespace std
-
-#endif