d_camera improvements (part 1) (#2623)

* Rename several dCamera_c fields

* Refactor mWork to generic buffer instead of union

* d_camera match improvements

* Implement several dCamera_c functions

* Remove d_camera.h from PCH

The symbol names in d_camera indicate that this header wasn't
included in the PCH (as they're compiled directly in d_camera.cpp).

include/d/actor/d_a_alink.h

@@ -12,6 +12,7 @@
 #include "d/d_particle_copoly.h"
 #include "d/d_save.h"
 #include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_camera_mng.h"
 
 class J2DAnmColorKey;
 class J2DAnmTransformKey;

include/d/actor/d_a_horse.h

@@ -221,11 +221,11 @@ public:
     /* 80844590 */ int draw();
     /* 8084478C */ ~daHorse_c();
     
-    /* 80182D04 */ bool getLashDashStart() const { return checkResetStateFlg0(RFLG0_LASH_DASH_START); }
+    /* 80182D04 */ BOOL getLashDashStart() const { return checkResetStateFlg0(RFLG0_LASH_DASH_START); }
     
 
     bool checkNoBombProc() const { return m_procID == PROC_WAIT_e || m_procID == PROC_MOVE_e; }
-    bool checkResetStateFlg0(daHorse_RFLG0 flag) const { return m_resetStateFlg0 & flag; }
+    BOOL checkResetStateFlg0(daHorse_RFLG0 flag) const { return m_resetStateFlg0 & flag; }
     bool checkEndResetStateFlg0(daHorse_ERFLG0 flag) const { return m_endResetStateFlg0 & flag; }
     u32 checkStateFlg0(daHorse_FLG0 flag) const { return m_stateFlg0 & flag; }
     f32 getNormalMaxSpeedF() { return m_normalMaxSpeedF; }
@@ -258,7 +258,7 @@ public:
     void setZeldaActor(fopAc_ac_c* i_actor) { m_zeldaActorKeep.setData(i_actor); }
 
     bool checkTurnStandCamera() const { return checkResetStateFlg0(RFLG0_TURN_STAND_CAMERA); }
-    bool checkTurnStand() const { return checkResetStateFlg0(RFLG0_TURN_STAND); }
+    BOOL checkTurnStand() const { return checkResetStateFlg0(RFLG0_TURN_STAND); }
     u32 checkRodeoMode() const { return checkStateFlg0(FLG0_RODEO_MODE); }
     bool checkCutTurnCancel() const { return checkEndResetStateFlg0(ERFLG0_CUT_TURN_CANCEL); }
     bool checkTurnCancelKeep() const { return checkStateFlg0(FLG0_TURN_CANCEL_KEEP); }
@@ -270,7 +270,7 @@ public:
     bool checkWait() const { return m_procID == PROC_WAIT_e; }
     bool checkLand() const { return m_procID == PROC_LAND_e && field_0x171a == 0; }
     bool checkGetOff() const { return fabsf(speedF) < 3.0f; }
-    bool checkEnemySearch() { return checkResetStateFlg0(RFLG0_ENEMY_SEARCH); }
+    BOOL checkEnemySearch() { return checkResetStateFlg0(RFLG0_ENEMY_SEARCH); }
     bool checkOriginalDemo() const { return field_0x16b8 == 3; }
     bool checkHorseDemoMode() { return field_0x16b8 != 0; }
     s16 checkCowHit() const { return m_cowHit; }

include/d/actor/d_a_midna.h

@@ -371,8 +371,9 @@ public:
     void resetRatBody() {}
 
     bool checkFlyWaitAnime() const {
-        return mBckHeap[0].getIdx() == 0x1CB || mBckHeap[0].getIdx() == 0x1C7
-            || mBckHeap[0].getIdx() == 0x1C8 || mBckHeap[0].getIdx() == 0x1C9;
+        // fakematch (doesn't match in debug)
+        return (u16)mBckHeap[0].getIdx() == 0x1CB || ((u16)mBckHeap[0].getIdx() == 0x1C7
+            || (u16)mBckHeap[0].getIdx() == 0x1C8 || (u16)mBckHeap[0].getIdx() == 0x1C9);
     }
 
     void onForceMorfCancel() { onEndResetStateFlg0(ERFLG0_FORCE_MORF_CANCEL); }

include/d/actor/d_a_npc_tk.h

@@ -4,6 +4,7 @@
 #include "d/actor/d_a_npc.h"
 #include "d/d_cc_uty.h"
 #include "d/d_path.h"
+#include "d/d_spline_path.h"
 
 struct cXyz;
 class daNpc_Hanjo_c;

include/d/actor/d_a_player.h

@@ -703,7 +703,7 @@ public:
     cXyz* getLeftFootPosP() { return &mLeftFootPos; }
     cXyz getLeftFootPos() const { return mLeftFootPos; }
     cXyz getRightFootPos() const { return mRightFootPos; }
-    BOOL checkCopyRodThrowAfter() const { return checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); }
+    u32 checkCopyRodThrowAfter() const { return checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); }
     u32 checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
     cXyz getRightHandPos() const { return mRightHandPos; }
     const cXyz getLeftHandPos() const { return mLeftHandPos; }

include/d/d_cam_param.h

@@ -96,6 +96,9 @@ public:
     /* 80182CD0 */ f32 Val(s32 param_0, int param_1) {
         return mCamStyleData[param_0].field_0x8[param_1];
     }
+    void SetVal(s32 param_0, int param_1, f32 i_value) {
+        mCamStyleData[param_0].field_0x8[param_1] = i_value;
+    }
 
     /* 0x00 */ u8 mMapToolFovy;
     /* 0x01 */ u8 mMapToolArg0;

include/d/d_com_inf_game.h

@@ -9,7 +9,9 @@
 #include "d/d_resorce.h"
 #include "d/d_save.h"
 #include "d/d_vibration.h"
-#include "f_op/f_op_camera_mng.h"
+#include "d/d_drawlist.h"
+#include "d/d_stage.h"
+#include "f_op/f_op_actor.h"
 #include "global.h"
 #include "m_Do/m_Do_controller_pad.h"
 
@@ -45,6 +47,7 @@ public:
     /* 0x4 */ JKRHeap* mpHeap;
 };
 
+class camera_class;
 class dComIfG_camera_info_class {
 public:
     dComIfG_camera_info_class() {}
@@ -4106,10 +4109,10 @@ inline view_port_class* dComIfGd_getViewport() {
 }
 
 inline MtxP dComIfGd_getViewRotMtx() {
-    return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->viewMtxNoTrans;
+    return g_dComIfG_gameInfo.drawlist.getView()->viewMtxNoTrans;
 }
 inline MtxP dComIfGd_getViewMtx() {
-    return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->viewMtx;
+    return g_dComIfG_gameInfo.drawlist.getView()->viewMtx;
 }
 
 inline J3DDrawBuffer* dComIfGd_getListFilter() {

include/d/d_stage.h

@@ -1362,7 +1362,7 @@ inline u16 dStage_stagInfo_GetStageTitleNo(stage_stag_info_class* pstag) {
     return pstag->mStageTitleNo;
 }
 
-inline u8 dStage_stagInfo_DefaultCameraType(stage_stag_info_class* pstag) {
+inline int dStage_stagInfo_DefaultCameraType(stage_stag_info_class* pstag) {
     return pstag->mCameraType;
 }
 

src/d/actor/d_a_L7demo_dr.cpp

@@ -10,6 +10,7 @@
 #include "d/actor/d_a_obj_lv7bridge.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_overlap_mng.h"
 
 /* 805A9238-805A92DC 000078 00A4+00 5/5 0/0 0/0 .text            setAction__6daDr_cFM6daDr_cFPCvPv_v

src/d/actor/d_a_L7op_demo_dr.cpp

@@ -10,6 +10,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 #include "d/actor/d_a_npc.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg_mng.h"
 
 /* 805AB098-805AB13C 000078 00A4+00 2/2 0/0 0/0 .text setAction__9daL7ODR_cFM9daL7ODR_cFPCvPv_v */

src/d/actor/d_a_b_bq.cpp

@@ -9,7 +9,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"

src/d/actor/d_a_b_dr.cpp

@@ -14,6 +14,7 @@
 #include "d/actor/d_a_npc.h"
 #include "d/d_camera.h"
 #include "c/c_damagereaction.h"
+#include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
 

src/d/actor/d_a_b_dre.cpp

@@ -13,6 +13,7 @@
 #include "d/d_camera.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_graphic.h"
 
 int daB_DRE_c::CreateHeap() {

src/d/actor/d_a_b_ds.cpp

@@ -8,8 +8,8 @@
 #include "d/actor/d_a_b_ds.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 #include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg.h"
 #include "f_op/f_op_msg_mng.h"
 #include "d/actor/d_a_spinner.h"

src/d/actor/d_a_b_gg.cpp

@@ -11,6 +11,7 @@
 #include "m_Do/m_Do_graphic.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daB_GG_HIO_c : public JORReflexible {
 public:

src/d/actor/d_a_b_gm.cpp

@@ -12,6 +12,7 @@
 #include "d/d_com_inf_game.h"
 #include "c/c_damagereaction.h"
 #include "SSystem/SComponent/c_math.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 

src/d/actor/d_a_b_mgn.cpp

@@ -8,6 +8,7 @@
 #include "d/actor/d_a_b_mgn.h"
 #include "d/actor/d_a_obj_bhashi.h"
 #include "d/d_camera.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_graphic.h"
 #include "f_op/f_op_actor_enemy.h"

src/d/actor/d_a_b_ob.cpp

@@ -13,6 +13,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_graphic.h"
 #include "d/actor/d_a_b_oh.h"

src/d/actor/d_a_b_tn.cpp

@@ -12,6 +12,7 @@
 #include "d/actor/d_a_nbomb.h"
 
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daB_TN_HIO_c {
 public:

src/d/actor/d_a_b_yo.cpp

@@ -10,6 +10,7 @@
 #include "SSystem/SComponent/c_math.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "m_Do/m_Do_graphic.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg.h"
 #include "f_op/f_op_msg_mng.h"
 #include "c/c_damagereaction.h"

src/d/actor/d_a_bd.cpp

@@ -11,6 +11,7 @@
 #include "d/actor/d_a_npc_kkri.h"
 #include "d/d_cc_d.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
 /* ############################################################################################## */

src/d/actor/d_a_cow.cpp

@@ -17,6 +17,7 @@
 #include "d/d_timer.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_mtx.h"

src/d/actor/d_a_e_bee.cpp

@@ -11,6 +11,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 #include "SSystem/SComponent/c_math.h"
 
 /* 80685674-80685678 -00001 0004+00 2/2 0/0 0/0 .bss             None */

src/d/actor/d_a_e_bg.cpp

@@ -14,6 +14,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_drawlist.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 8068580C-8068585C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_BG_HIO_cFv */
 daE_BG_HIO_c::daE_BG_HIO_c() {

src/d/actor/d_a_e_df.cpp

@@ -8,6 +8,7 @@
 #include "d/actor/d_a_e_df.h"
 #include "d/actor/d_a_obj_carry.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_DF_HIO_c : public JORReflexible {
 public:

src/d/actor/d_a_e_dt.cpp

@@ -17,6 +17,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_bomb.h"
 #include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_lib.h"
 

src/d/actor/d_a_e_fm.cpp

@@ -12,6 +12,7 @@
 #include "d/actor/d_a_obj_hhashi.h"
 #include "d/actor/d_a_obj_ystone.h"
 #include "c/c_damagereaction.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 

src/d/actor/d_a_e_gb.cpp

@@ -11,6 +11,7 @@
 #include "d/d_bomb.h"
 #include "d/actor/d_a_obj_smallkey.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 
 /* 806C1CEC-806C1D3C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_GB_HIO_cFv */

src/d/actor/d_a_e_gi.cpp

@@ -8,6 +8,7 @@
 #include "d/actor/d_a_e_gi.h"
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_GI_HIO_c : public JORReflexible {
 public:

src/d/actor/d_a_e_gob.cpp

@@ -12,6 +12,7 @@
 #include "d/actor/d_a_obj_msima.h"
 #include "d/actor/d_a_obj_myogan.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_graphic.h"
 #include "c/c_damagereaction.h"
 #include "Z2AudioLib/Z2Instances.h"

src/d/actor/d_a_e_hzelda.cpp

@@ -9,6 +9,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "SSystem/SComponent/c_math.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_graphic.h"
 #include "d/d_s_play.h"

src/d/actor/d_a_e_mk.cpp

@@ -17,6 +17,7 @@
 #include "d/actor/d_a_obj_brg.h"
 #include "d/actor/d_a_e_mk_bo.h"
 #include "d/d_camera.h"
+#include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
 class daE_MK_HIO_c : public JORReflexible {

src/d/actor/d_a_e_nest.cpp

@@ -12,6 +12,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_bomb.h"
 #include "d/d_procname.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80504950-80504954 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_hioInit;

src/d/actor/d_a_e_oc.cpp

@@ -13,6 +13,7 @@
 #include "d/actor/d_a_obj_rotBridge.h"
 #include "d/d_cc_uty.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_OC_HIO_c {
 public:

src/d/actor/d_a_e_ph.cpp

@@ -10,6 +10,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 
 #define PH_BMD 20
 

src/d/actor/d_a_e_pm.cpp

@@ -17,6 +17,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_obj_smw_stone.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_PM_HIO_c {
 public:

src/d/actor/d_a_e_po.cpp

@@ -10,6 +10,7 @@
 #include "d/d_cc_d.h"
 #include "d/d_cc_uty.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* ############################################################################################## */
 

src/d/actor/d_a_e_pz.cpp

@@ -13,6 +13,7 @@
 #include "c/c_damagereaction.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_PZ_HIO_c : public JORReflexible {
 public:

src/d/actor/d_a_e_rd.cpp

@@ -16,6 +16,7 @@
 #include "c/c_damagereaction.h"
 #include "d/d_attention.h"
 #include "d/actor/d_a_obj_h_saku.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_kankyo_mng.h"
 #include "d/actor/d_a_e_rdb.h"
 #include "d/actor/d_a_e_dn.h"

src/d/actor/d_a_e_rdb.cpp

@@ -13,6 +13,7 @@
 #include "d/d_msg_object.h"
 #include "m_Do/m_Do_graphic.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_RDB_HIO_c : public JORReflexible {
 public:

src/d/actor/d_a_e_rdy.cpp

@@ -15,6 +15,7 @@
 #include "d/d_cc_d.h"
 #include "d/d_msg_object.h"
 #include "d/d_camera.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_kankyo_mng.h"
 #include "f_op/f_op_actor_enemy.h"
 #include "m_Do/m_Do_graphic.h"

src/d/actor/d_a_e_s1.cpp

@@ -13,6 +13,7 @@
 #include "d/d_path.h"
 #include "d/d_s_play.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_S1_HIO_c {
 public:

src/d/actor/d_a_e_sm2.cpp

@@ -11,6 +11,7 @@
 #include "f_op/f_op_kankyo_mng.h"
 #include "SSystem/SComponent/c_counter.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_SM2_HIO_c : public fOpAcm_HIO_entry_c {
 public:

src/d/actor/d_a_e_sw.cpp

@@ -7,6 +7,7 @@
 
 #include "d/actor/d_a_e_sw.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 #include "d/d_bomb.h"
 #include <cmath.h>
 #include "Z2AudioLib/Z2Instances.h"

src/d/actor/d_a_e_th.cpp

@@ -11,6 +11,7 @@
 #include "d/d_item.h"
 #include "c/c_damagereaction.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_TH_HIO_c : public JORReflexible {
 public:

src/d/actor/d_a_e_vt.cpp

@@ -15,6 +15,7 @@
 #include "d/d_s_play.h"
 #include "d/d_camera.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 #define WL_CUT_TYPE_SMALL 1
 #define WL_CUT_TYPE_JUMP 2

src/d/actor/d_a_e_warpappear.cpp

@@ -9,6 +9,7 @@
 #include "d/actor/d_a_e_s1.h"
 #include "d/actor/d_a_horse.h"
 #include "d/actor/d_a_obj_ihasi.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 807CF7D8-807CF8BC 000078 00E4+00 1/0 0/0 0/0 .text daE_Warpappear_Draw__FP18e_warpappear_class */
 static int daE_Warpappear_Draw(e_warpappear_class* i_this) {

src/d/actor/d_a_e_ym.cpp

@@ -13,6 +13,7 @@
 #include "d/actor/d_a_tag_firewall.h"
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_enemy.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daE_YM_HIO_c {
 public:

src/d/actor/d_a_e_ymb.cpp

@@ -10,6 +10,7 @@
 #include "d/actor/d_a_obj_drop.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
+#include "f_op/f_op_camera_mng.h"
 #include <cmath.h>
 #include "Z2AudioLib/Z2Instances.h"
 

src/d/actor/d_a_e_zh.cpp

@@ -12,6 +12,7 @@
 #include "d/d_camera.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/d_debug_viewer.h"
+#include "f_op/f_op_camera_mng.h"
 
 enum E_ZH_RES_File_ID {
     /* BCK */

src/d/actor/d_a_kago.cpp

@@ -19,6 +19,7 @@
 #include "d/actor/d_a_obj_riverrock.h"
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_tag_waterfall.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_overlap_mng.h"
 
 /* 80854D4C-80854D8C 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src__22@unnamed@d_a_kago_cpp@ */

src/d/actor/d_a_kytag00.cpp

@@ -7,6 +7,7 @@
 
 #include "d/actor/d_a_kytag00.h"
 #include "d/d_com_inf_game.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 8046B718-8046B9DC 000078 02C4+00 2/2 0/0 0/0 .text            get_check_pos__FP13kytag00_class */
 static cXyz get_check_pos(kytag00_class* i_this) {

src/d/actor/d_a_kytag01.cpp

@@ -10,6 +10,7 @@
 #include "Z2AudioLib/Z2EnvSeMgr.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo_rain.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80855058-80855320 000078 02C8+00 1/1 0/0 0/0 .text            get_check_pos__FP13kytag01_class */
 static cXyz get_check_pos(kytag01_class* i_this) {

src/d/actor/d_a_kytag03.cpp

@@ -12,6 +12,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo_rain.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80855ED8-808560DC 000078 0204+00 1/1 0/0 0/0 .text dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath
  */

src/d/actor/d_a_kytag06.cpp

@@ -10,6 +10,7 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 8085786C-80857918 0000EC 00AC+00 1/1 0/0 0/0 .text            dice_wether_init__FUcff */
 static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) {

src/d/actor/d_a_kytag10.cpp

@@ -10,6 +10,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_path.h"
 #include "d/d_kankyo_rain.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80528BF8-80528D0C 000078 0114+00 1/1 0/0 0/0 .text            get_rail_ratio_pos__FP5dPathifPsPs
  */

src/d/actor/d_a_kytag13.cpp

@@ -9,6 +9,7 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo_rain.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 8085F1F8-8085F200 000078 0008+00 1/0 0/0 0/0 .text            daKytag13_Draw__FP13kytag13_class
  */

src/d/actor/d_a_mg_fshop.cpp

@@ -12,6 +12,7 @@
 #include "d/d_bg_w.h"
 #include "d/d_kankyo.h"
 #include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_camera_mng.h"
 #include "d/d_timer.h"
 #include "dol2asm.h"
 #include "m_Do/m_Do_controller_pad.h"

src/d/actor/d_a_ni.cpp

@@ -3,8 +3,6 @@
 // Translation Unit: d_a_ni
 //
 
-#include "d/dolzel_rel.h"
-
 /**
  * Basically entirely matching except for ONE float reg alloc in play_camera,
  * and some extra dtors being emitted that shouldnt be after daNi_Create
@@ -24,6 +22,7 @@
 #include "SSystem/SComponent/c_math.h"
 #include "c/c_damagereaction.h"
 #include "Z2AudioLib/Z2Instances.h"
+#include "f_op/f_op_camera_mng.h"
 
 enum Joint {
     /* 0x0 */ JNT_WAIST,

src/d/actor/d_a_npc.cpp

@@ -7,6 +7,7 @@
 #include "d/d_msg_object.h"
 #include "SSystem/SComponent/c_math.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_kankyo_mng.h"
 #include "m_Do/m_Do_lib.h"
 

src/d/actor/d_a_npc_ks.cpp

@@ -28,6 +28,7 @@
 #include "d/d_stage.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daNpc_Ks_HIO_c : public JORReflexible {
 public:

src/d/actor/d_a_npc_lf.cpp

@@ -9,6 +9,7 @@
 #include "d/dolzel_rel.h"
 
 #include "d/actor/d_a_npc_lf.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80A6AA1C-80A6AA28 000000 000C+00 1/1 0/0 0/0 .data            wp$3976 */
 static f32 wp[3] = {

src/d/actor/d_a_npc_maro.cpp

@@ -6,12 +6,14 @@
 #include "d/dolzel_rel.h"
 
 #include "d/actor/d_a_npc_maro.h"
+
 #include "d/actor/d_a_horse.h"
 #include "d/actor/d_a_npc_len.h"
 #include "d/actor/d_a_obj_itamato.h"
 #include "d/actor/d_a_tag_evtarea.h"
 #include "d/actor/d_a_tag_push.h"
 #include "d/actor/d_a_tag_shop_item.h"
+#include "d/d_camera.h"
 #include "d/d_com_static.h"
 #include "d/d_item.h"
 #include "d/d_timer.h"

src/d/actor/d_a_npc_ne.cpp

@@ -14,6 +14,7 @@
 #include "d/actor/d_a_mg_fish.h"
 #include "SSystem/SComponent/c_math.h"
 #include "JSystem/JUtility/JUTReport.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_kankyo_mng.h"
 #include "c/c_damagereaction.h"
 

src/d/actor/d_a_npc_sq.cpp

@@ -9,6 +9,7 @@
 #include "SSystem/SComponent/c_math.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_camera_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"

src/d/actor/d_a_npc_tk.cpp

@@ -15,6 +15,7 @@
 #include "d/d_camera.h"
 #include "d/d_cc_d.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 
 class daNPC_TK_HIO_c : public JORReflexible {
 public:

src/d/actor/d_a_npc_ykw.cpp

@@ -15,6 +15,7 @@
 #include "d/d_debug_viewer.h"
 #include "d/d_meter2_info.h"
 #include "d/d_timer.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_ext.h"
 
 #if DEBUG

src/d/actor/d_a_obj_ari.cpp

@@ -11,6 +11,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_menu_insect.h"
 #include "d/d_procname.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80BA55E0-80BA55E4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;

src/d/actor/d_a_obj_brg.cpp

@@ -13,6 +13,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_path.h"
 #include "Z2AudioLib/Z2Instances.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80BBC90C-80BBCCFC 0000EC 03F0+00 1/1 0/0 0/0 .text
  * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c            */

src/d/actor/d_a_obj_cdoor.cpp

@@ -7,6 +7,7 @@
 
 #include "d/actor/d_a_obj_cdoor.h"
 #include "d/actor/d_a_obj_wchain.h"
+#include "d/d_camera.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 

src/d/actor/d_a_obj_cho.cpp

@@ -11,6 +11,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_menu_insect.h"
 #include "d/d_procname.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80BCC750-80BCC754 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;

src/d/actor/d_a_obj_crvgate.cpp

@@ -7,8 +7,10 @@
 
 #include "d/actor/d_a_obj_crvgate.h"
 
+#include "d/d_camera.h"
 #include "d/actor/d_a_obj_eff.h"
 #include "d/actor/d_a_player.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80BD30C0-80BD3100 000000 0040+00 12/12 0/0 0/0 .rodata          ccCylSrc$3774 */
 const static dCcD_SrcSph ccSphSrc = {

src/d/actor/d_a_obj_dan.cpp

@@ -11,6 +11,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_menu_insect.h"
 #include "d/d_procname.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80BDC568-80BDC56C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;

src/d/actor/d_a_obj_drop.cpp

@@ -17,6 +17,7 @@
 #include "m_Do/m_Do_graphic.h"
 #include "d/actor/d_a_e_ym.h"
 #include "d/actor/d_a_e_ymb.h"
+#include "f_op/f_op_camera_mng.h"
 
 #ifdef DEBUG
 daObjDrop_HIO_c l_HIO;

src/d/actor/d_a_obj_gra2.cpp

@@ -18,6 +18,7 @@
 #include "dol2asm.h"
 #include "d/d_msg_object.h"
 #include "d/d_attention.h"
+#include "f_op/f_op_camera_mng.h"
 #include <cmath.h>
 
 /* 80BFFF0C-80BFFF58 0000EC 004C+00 2/2 0/0 0/0 .text            jointCtrlCallBack__FP8J3DJointi */

src/d/actor/d_a_obj_hhashi.cpp

@@ -12,6 +12,7 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_lib.h"
 #include "SSystem/SComponent/c_math.h"
 

src/d/actor/d_a_obj_iceblock.cpp

@@ -11,6 +11,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_camera.h"
 #include "d/actor/d_a_mirror.h"
+#include "f_op/f_op_camera_mng.h"
 
 enum PUSH_DIR {
     DIR_SOUTH,

src/d/actor/d_a_obj_item.cpp

@@ -13,7 +13,7 @@
 #include "d/d_item.h"
 #include "d/d_item_data.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_mtx.h"
 
 //

src/d/actor/d_a_obj_kabuto.cpp

@@ -11,6 +11,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_menu_insect.h"
 #include "d/d_procname.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80C2E2F0-80C2E2F4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;

src/d/actor/d_a_obj_kamakiri.cpp

@@ -11,7 +11,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_menu_insect.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_lib.h"
 
 static u8 l_initHIO;

src/d/actor/d_a_obj_katatsumuri.cpp

@@ -11,6 +11,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_menu_insect.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_lib.h"
 
 static u8 hioInit;

src/d/actor/d_a_obj_lp.cpp

@@ -10,6 +10,7 @@
 #include "d/actor/d_a_mg_rod.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
+#include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
 /* 80C54198-80C542FC 000078 0164+00 1/0 0/0 0/0 .text            daObj_Lp_Draw__FP12obj_lp_class */

src/d/actor/d_a_obj_smallkey.cpp

@@ -10,6 +10,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_item_data.h"
 #include "d/d_tresure.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80CDB7F4-80CDB838 000000 0044+00 6/6 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {

src/d/actor/d_a_obj_so.cpp

@@ -14,6 +14,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_cc_uty.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80CE03CC-80CE03F0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__14daObj_So_HIO_cFv */
 daObj_So_HIO_c::daObj_So_HIO_c() {

src/d/actor/d_a_obj_sw.cpp

@@ -12,6 +12,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_path.h"
 #include "d/d_s_play.h"
+#include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_ext.h"
 
 /* 80CF0638-80CF0774 000078 013C+00 1/0 0/0 0/0 .text            daObj_Sw_Draw__FP12obj_sw_class */

src/d/actor/d_a_obj_ten.cpp

@@ -9,7 +9,8 @@
 #include "d/actor/d_a_player.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"
-#include "f_op//f_op_actor_mng.h"
+#include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_camera_mng.h"
 #include "d/d_cc_d.h"
 #include "SSystem/SComponent/c_lib.h"
 #include "m_Do/m_Do_lib.h"

src/d/actor/d_a_obj_tks.cpp

@@ -6,6 +6,7 @@
 #include "d/dolzel_rel.h"
 
 #include "d/actor/d_a_obj_tks.h"
+#include "d/d_camera.h"
 #include "d/d_com_inf_game.h"
 
 /* 80D12910-80D12940 000020 0030+00 1/2 0/0 0/0 .data            l_bckGetParamList */

src/d/actor/d_a_obj_toby.cpp

@@ -11,6 +11,7 @@
 #include "d/d_bg_w.h"
 #include "d/d_bomb.h"
 #include "d/d_com_inf_game.h"
+#include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
 #ifdef DEBUG

src/d/actor/d_a_obj_tobyhouse.cpp

@@ -10,6 +10,7 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_bomb.h"
+#include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
 #ifdef DEBUG

src/d/actor/d_a_obj_tombo.cpp

@@ -10,6 +10,7 @@
 #include "d/d_menu_insect.h"
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_pc/f_pc_name.h"
 #include "m_Do/m_Do_lib.h"
 

src/d/actor/d_a_ppolamp.cpp

@@ -8,6 +8,7 @@
 #include "d/actor/d_a_ppolamp.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/d_com_inf_game.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80D4C938-80D4C958 000078 0020+00 1/1 0/0 0/0 .text daPPolamp_c_createHeap__FP10fopAc_ac_c */
 static int daPPolamp_c_createHeap(fopAc_ac_c* i_this) {

src/d/actor/d_a_tag_allmato.cpp

@@ -4,6 +4,7 @@
 #include "d/actor/d_a_obj_itamato.h"
 #include "d/actor/d_a_obj_boumato.h"
 #include "d/actor/d_a_arrow.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 804897BC-804897FC -00001 0040+00 2/2 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[8] = {

src/d/actor/d_a_tag_firewall.cpp

@@ -10,6 +10,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_bomb.h"
+#include "d/d_camera.h"
 
 struct Tag_FWall_n {
     static dCcD_SrcSph cc_sph_src;

src/d/actor/d_a_tag_kago_fall.cpp

@@ -8,6 +8,7 @@
 #include "d/actor/d_a_tag_kago_fall.h"
 
 #include "d/actor/d_a_player.h"
+#include "d/d_camera.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/d_msg_object.h"

src/d/actor/d_a_tag_waterfall.cpp

@@ -8,6 +8,7 @@
 #include "d/actor/d_a_tag_waterfall.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
+#include "f_op/f_op_camera_mng.h"
 
 /* 80D64D94-80D64D98 000000 0004+00 2/2 0/0 0/0 .data            m_master_id */
 static u32 m_master_id = static_cast<u32>(0xFFFFFFFF);

src/d/actor/d_a_tbox.cpp

@@ -11,6 +11,7 @@
 #include "d/actor/d_a_midna.h"
 #include "d/d_path.h"
 #include "d/d_bg_w.h"
+#include "f_op/f_op_camera_mng.h"
 #include "SSystem/SComponent/c_math.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include <cmath.h>

src/d/actor/d_a_vrbox2.cpp

@@ -9,6 +9,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/d_kankyo_rain.h"
+#include "f_op/f_op_camera_mng.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "SSystem/SComponent/c_math.h"
 #include "dol2asm.h"

src/d/actor/d_a_ykgr.cpp

@@ -8,6 +8,7 @@
 #include "d/actor/d_a_ykgr.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_camera_mng.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "Z2AudioLib/Z2Instances.h"
 

src/d/d_cam_param.cpp

@@ -6,8 +6,10 @@
 #include "d/dolzel.h"
 
 #include "d/d_cam_param.h"
+
 #include "SSystem/SComponent/c_math.h"
 #include "d/actor/d_a_player.h"
+#include "d/d_camera.h"
 #include "d/d_com_inf_game.h"
 
 /* 8008813C-80088284 082A7C 0148+00 0/0 12/12 0/0 .text            rationalBezierRatio__8dCamMathFff