Do some work on f_op_actor_mng (#328)

* decompctx - try without shiftjis and write utf8 as output

* Do some work on f_op_actor_mng

* Remove duplicated includes

* Add fopAcM_setEffectMtx

* Match dShopSystem_searchCameraActor

* fopAcM_setEffectMtx now matches with literals

* Remove unnecessary inline in headers

12 files changed, 51 insertions, 12 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 39fcfece23..3988dcf5bf 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -63,6 +63,7 @@ public:
     u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); }
     GXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); }
     J3DFog* getFog() { return mPEBlock->getFog(); }
+    J3DTexMtx* getTexMtx(u32 idx) { return mTexGenBlock->getTexMtx(idx); }
 
     void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
     void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); }
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 8a8158b7ba..95580afa91 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -36,12 +36,13 @@ struct J3DTextureSRTInfo {
 
 struct J3DTexMtxInfo {
     /* 80325718 */ void operator=(J3DTexMtxInfo const&);
+    /* 80325794 */ void setEffectMtx(Mtx);
 
     /* 0x00 */ u8 mProjection;
-    /* 0x01 */ u8 mInfo;
+    /* 0x01 */ s8 mInfo;
     /* 0x04 */ Vec mCenter;
     /* 0x10 */ J3DTextureSRTInfo mSRT;
-    /* 0x24 */ Mtx44 mEffectMtx;
+    /* 0x24 */ Mtx44 mEffectMtx;    
 };  // Size: 0x64
 
 class J3DTexMtx {
@@ -55,6 +56,7 @@ public:
 
     J3DTexMtxInfo& getTexMtxInfo() { return mTexMtxInfo; }
     Mtx& getMtx() { return mMtx; }
+    void setEffectMtx(Mtx effectMtx) { mTexMtxInfo.setEffectMtx(effectMtx); }
 
 private:
     /* 0x00 */ J3DTexMtxInfo mTexMtxInfo;
diff --git a/include/JSystem/J3DU/J3DUClipper.h b/include/JSystem/J3DU/J3DUClipper.h
index d622fbde44..3f8645a23b 100644
--- a/include/JSystem/J3DU/J3DUClipper.h
+++ b/include/JSystem/J3DU/J3DUClipper.h
@@ -19,6 +19,8 @@ public:
     void setNear(f32 near) { mNear = near; }
     void setFar(f32 far) { mFar = far; }
 
+    f32 getFar() { return mFar; }
+
 private:
     Vec _04;
     Vec _10;
diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h
index b9b4e5e719..a904b9e7b7 100644
--- a/include/d/a/d_a_npc.h
+++ b/include/d/a/d_a_npc.h
@@ -164,7 +164,7 @@ public:
     /* 80146188 */ int chkPassed1(cXyz, int);
     /* 801464D8 */ int chkPassed2(cXyz, cXyz*, int, int);
 
-    inline cXyz& getPntPos(u16 i_idx) {
+    inline cXyz& getPntPos(int i_idx) {
         return mpRoomPath->m_points[i_idx].m_position;
     }
 
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index b492ca3877..88e1846ab2 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -3205,6 +3205,15 @@ inline JPABaseEmitter* dComIfGp_particle_getEmitter(u32 param_0) {
     return g_dComIfG_gameInfo.play.getParticle()->getEmitter(param_0);
 }
 
+inline u32 dComIfGp_particle_setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param_2,
+                                      cXyz const* param_3, dKy_tevstr_c const* param_4, int param_5,
+                                      csXyz const* param_6, cXyz const* param_7,
+                                      dPa_levelEcallBack* param_8, s8 param_9,
+                                      cXyz const* param_10) {
+    return g_dComIfG_gameInfo.play.getParticle()->setSimpleFoot(param_0, param_1, param_2, param_3, param_4, param_5,
+                                                         param_6, param_7, param_8, param_9, param_10);
+}
+
 inline u32 dComIfGp_particle_setPolyColor(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2,
                                           const cXyz* param_3, const dKy_tevstr_c* param_4,
                                           const csXyz* param_5, const cXyz* param_6, int param_7,
diff --git a/include/d/d_camera.h b/include/d/d_camera.h
index f4e909853a..08c4fe7396 100644
--- a/include/d/d_camera.h
+++ b/include/d/d_camera.h
@@ -368,7 +368,10 @@ public:
     /* 0x0A8 */ int field_0xa8;
     /* 0x0AC */ u32 field_0xac;
     /* 0x0B0 */ dCamInfo_c field_0xb0;
-    /* 0x0D0 */ dCamInfo_c field_0xd0[2];
+    /* 0x0D0 */ u8 field_0xd0[0x8];
+    /* 0x0D8 */ cXyz field_0xd8;
+    /* 0x0E4 */ u8 field_0xe4[0xc];
+    /* 0x0F0 */ dCamInfo_c field_0xf0;
     class {
     public:
         /* 0x00 */ int field_0x0;
diff --git a/include/d/d_path.h b/include/d/d_path.h
index 7385af7afa..e7f58a88cd 100644
--- a/include/d/d_path.h
+++ b/include/d/d_path.h
@@ -18,5 +18,6 @@ inline int dPath_ChkClose(dPath* i_path) { return (i_path->m_closed & 1); }
 
 dPath* dPath_GetRoomPath(int path_index, int room_no);
 dStage_dPnt_c* dPath_GetPnt(dPath const* path, int pnt_index);
+u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2);
 
 #endif /* D_D_PATH_H */
diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h
index 8a7737559c..94fd475066 100644
--- a/include/d/particle/d_particle.h
+++ b/include/d/particle/d_particle.h
@@ -319,7 +319,7 @@ public:
                                   _GXColor const&, int, f32);
     /* 8004D23C */ void getSimple(u16);
     /* 8004D770 */ void setStopContinue(u32);
-    /* 8004D7C4 */ void setSimpleFoot(u32, u32*, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
+    /* 8004D7C4 */ u32 setSimpleFoot(u32, u32*, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
                                       int, csXyz const*, cXyz const*, dPa_levelEcallBack*, s8,
                                       cXyz const*);
     /* 8004D988 */ void setCommonPoly(u32*, cBgS_PolyInfo*, cXyz const*, cXyz const*,
diff --git a/include/d/save/d_save_temp_bit_labels.inc b/include/d/save/d_save_temp_bit_labels.inc
index 021b8218bd..13aeaba7b3 100644
--- a/include/d/save/d_save_temp_bit_labels.inc
+++ b/include/d/save/d_save_temp_bit_labels.inc
@@ -98,7 +98,7 @@ T_0029              = 0x0380,       // Ordon Village                - Succeed at
 T_0030              = 0x0340,       // Ordon Village                - Rusl, Press button to "take"
 T_0031              = 0x0320,       // Ordon Village                - Borrow Rusl's sword
 T_0032              = 0x0310,       // Ordon Village                - Return Rusl's sword
-T_0033              = 0x0308,       // Ordon Village                - Press A and ↑ during rampaging goat game
+T_0033              = 0x0308,       // Ordon Village                - Press A and up during rampaging goat game
 T_0034              = 0x0304,       // Ordon Village                - Rusl sword failure count 1
 T_0035              = 0x0302,       // Ordon Village                - Rusl sword failure count 2
 T_0036              = 0x0301,       // Ordon Village                - Rusl sword failure count 3
diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index c092479b16..cc38fa72db 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -117,7 +117,7 @@ public:
     /* 0x10C */ dKy_tevstr_c mTevStr;
     /* 0x494 */ u16 mSetID;
     /* 0x496 */ u8 mGroup;
-    /* 0x497 */ u8 mCullType;
+    /* 0x497 */ s8 mCullType;
     /* 0x498 */ u8 mDemoActorId;
     /* 0x499 */ s8 mSubtype;
     /* 0x49A */ u8 mCarryType;
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index d1636034f2..239d8e737a 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -537,7 +537,7 @@ s32 fopAcM_otoCheck(const fopAc_ac_c*, f32);
 s32 fopAcM_otherBgCheck(const fopAc_ac_c*, const fopAc_ac_c*);
 s32 fopAcM_wayBgCheck(const fopAc_ac_c*, f32, f32);
 s32 fopAcM_plAngleCheck(const fopAc_ac_c*, s16);
-s32 fopAcM_effSmokeSet1(u32*, u32*, const cXyz*, const csXyz*, f32, const dKy_tevstr_c*, int);
+void fopAcM_effSmokeSet1(u32*, u32*, const cXyz*, const csXyz*, f32, const dKy_tevstr_c*, int);
 void fopAcM_effHamonSet(u32*, const cXyz*, f32, f32);
 s32 fopAcM_riverStream(cXyz*, s16*, f32*, f32);
 s32 fopAcM_carryOffRevise(fopAc_ac_c*);
diff --git a/include/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h b/include/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h
index d2c259e40a..88c3bf2b14 100644
--- a/include/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h
+++ b/include/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h
@@ -11,17 +11,38 @@ public:
         return mPriority;
     }
 
+    static daTagStream_c* getTop() {
+        return m_top;
+    }
+
+    daTagStream_c* getNext() {
+        return mNext;
+    }
+
+    u8 checkStreamOn() {
+        return mStreamOn;
+    }
+
+    s32 checkCanoeOn() {
+        return mParameters;
+    }
+
+    u8 getPower() {
+        return mPower;
+    }
+
     /* 80D638F8 */ int create();
     /* 80D63A98 */ ~daTagStream_c();
     /* 80D63B58 */ int execute();
+    int checkArea(cXyz const*);
 
     /* 0x568 */ u8 mPriority;
-    /* 0x569 */ u8 field_0x569;
-    /* 0x56A */ u8 field_0x56a;
+    /* 0x569 */ u8 mStreamOn;
+    /* 0x56A */ u8 mPower;
     /* 0x56B */ u8 field_0x56b;
-    /* 0x56C */ u32 mParameters;
+    /* 0x56C */ s32 mParameters;
     /* 0x570 */ daTagStream_c* field_0x570;
-    /* 0x574 */ daTagStream_c* field_0x574;
+    /* 0x574 */ daTagStream_c* mNext;
 
     static daTagStream_c* m_top;
 };