some cleanup of f_pc/f_op files (#2254)

* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work

configure.py

@@ -397,7 +397,7 @@ config.libs = [
             Object(Matching, "f_op/f_op_kankyo.cpp"),
             Object(Matching, "f_op/f_op_msg.cpp"),
             Object(Matching, "f_op/f_op_kankyo_mng.cpp"),
-            Object(NonMatching, "f_op/f_op_msg_mng.cpp"),
+            Object(Matching, "f_op/f_op_msg_mng.cpp", extra_cflags=['-pragma "nosyminline on"']),
             Object(Matching, "f_op/f_op_draw_iter.cpp"),
             Object(Matching, "f_op/f_op_draw_tag.cpp"),
             Object(Matching, "f_op/f_op_scene_pause.cpp"),
@@ -927,7 +927,7 @@ config.libs = [
         [
             Object(NonMatching, "JSystem/JGadget/binary.cpp"),
             Object(NonMatching, "JSystem/JGadget/linklist.cpp"),
-            Object(NonMatching, "JSystem/JGadget/std-vector.cpp"),
+            Object(Equivalent, "JSystem/JGadget/std-vector.cpp"),  # just weak order
         ],
     ),
     JSystemLib(
@@ -984,7 +984,7 @@ config.libs = [
             Object(Matching, "JSystem/J3DGraphBase/J3DGD.cpp"),
             Object(Matching, "JSystem/J3DGraphBase/J3DSys.cpp"),
             Object(Matching, "JSystem/J3DGraphBase/J3DVertex.cpp"),
-            Object(NonMatching, "JSystem/J3DGraphBase/J3DTransform.cpp"),
+            Object(Matching, "JSystem/J3DGraphBase/J3DTransform.cpp"),
             Object(Matching, "JSystem/J3DGraphBase/J3DTexture.cpp"),
             Object(Matching, "JSystem/J3DGraphBase/J3DPacket.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeMtx.cpp"),

include/JSystem/J3DGraphBase/J3DTransform.h

@@ -53,7 +53,7 @@ struct J3DTransformInfo {
 extern J3DTransformInfo const j3dDefaultTransformInfo;
 extern Vec const j3dDefaultScale;
 extern Mtx const j3dDefaultMtx;
-extern f32 PSMulUnit01[2];
+extern f32 PSMulUnit01[];
 
 void J3DGQRSetup7(u32 param_0, u32 param_1, u32 param_2, u32 param_3);
 void J3DCalcBBoardMtx(f32 (*)[4]);

include/JSystem/JGadget/std-memory.h

@@ -0,0 +1,33 @@
+#ifndef STD_MEMORY_H
+#define STD_MEMORY_H
+
+#include "JSystem/JUtility/JUTAssert.h"
+
+namespace JGadget {
+template <typename T>
+struct TAllocator {
+    T* allocate(u32 count, void *param_2) {
+        return AllocateRaw(count * sizeof(T));
+    }
+
+    T* AllocateRaw(u32 size) {
+        return (T*)operator new(size);
+    }
+
+    void deallocate(T* mem, u32 size) {
+        DeallocateRaw(mem);
+    }
+
+    void DeallocateRaw(T* mem) {
+        delete mem;
+    }
+
+    void destroy(T* p) {
+        JUT_ASSERT(68, p!=0);
+    }
+
+    /* 0x0 */ u8 mAllocator;
+};
+}
+
+#endif /* STD_MEMORY_H */

include/JSystem/JGadget/std-vector.h

@@ -1,4 +1,176 @@
 #ifndef STD_VECTOR_H
 #define STD_VECTOR_H
 
+#include "JSystem/JGadget/std-memory.h"
+#include "algorithm.h"
+#include "msl_memory.h"
+
+namespace JGadget {
+namespace vector {
+/* 802DCCC8 */ u32 extend_default(u32, u32, u32);
+};
+
+typedef u32 (*extendFunc)(u32, u32, u32);
+
+template <typename T, typename Allocator = JGadget::TAllocator<T> >
+struct TVector {
+    struct TDestructed_deallocate_ {
+        TDestructed_deallocate_(JGadget::TAllocator<T>& allocator, T* ptr) {
+            mAllocator = &allocator;
+            mPtr = ptr;
+        }
+
+        ~TDestructed_deallocate_() { mAllocator->deallocate(mPtr, 0); }
+
+        void set(T* ptr) { mPtr = ptr; }
+
+        Allocator* mAllocator;
+        T* mPtr;
+    };
+
+    TVector(Allocator const& allocator) {
+        mAllocator = allocator;
+        pBegin_ = NULL;
+        pEnd_ = pBegin_;
+        mCapacity = 0;
+        pfnExtend_ = JGadget::vector::extend_default;
+    }
+
+    ~TVector() {
+        clear();
+        mAllocator.deallocate(pBegin_, 0);
+    }
+
+    T* insert(T* pos, const T& val) {
+        u32 diff = (int)((u32)pos - (u32)begin()) / 4;
+        insert(pos, 1, val);
+        return pBegin_ + diff;
+    }
+
+    void insert(T* pos, u32 count, const T& val) {
+        if (count != 0) {
+            T* ptr = Insert_raw(pos, count);
+            if (ptr == end()) {
+                /* JGadget_outMessage sp120(JGadget_outMessage::warning, __FILE__, 0x141);
+                sp120 << "can't allocate memory"; */
+            } else {
+                std::uninitialized_fill_n(ptr, count, val);
+            }
+        }
+    }
+
+    T* Insert_raw(T* pIt, u32 pCount) {
+        JUT_ASSERT(446, (pBegin_ <= pIt) && (pIt <= pEnd_));
+
+        T* const pFirst = pIt;
+
+        if (pCount == 0) {
+            return pIt;
+        }
+
+        if (pCount + size() <= mCapacity) {
+            void** newEnd = pFirst + pCount;
+
+            if (newEnd < pEnd_) {
+                void** pOverwrittenValues = pEnd_ - pCount;
+                std::uninitialized_copy(pOverwrittenValues, pEnd_, pEnd_);
+                std::copy_backward(pFirst, pOverwrittenValues, pEnd_);
+                DestroyElement_(pFirst, newEnd);
+
+                pEnd_ += pCount;
+                return pIt;
+            } else {
+                std::uninitialized_copy(pFirst, pEnd_, newEnd);
+                DestroyElement_(pFirst, pEnd_);
+
+                pEnd_ += pCount;
+                return pIt;
+            }
+        }
+
+        u32 newSize = GetSize_extend_(pCount);
+
+        void** newDataPointer = mAllocator.allocate(newSize, 0);
+        if (!newDataPointer) {
+            return end();
+        }
+
+        TDestructed_deallocate_ destructionDeallocator(mAllocator, newDataPointer);
+
+        void** const endOfCopy = std::uninitialized_copy(pBegin_, pFirst, newDataPointer);
+        std::uninitialized_copy(pFirst, pEnd_, endOfCopy + pCount);
+
+        DestroyElement_all_();
+        destructionDeallocator.set(pBegin_);
+
+        pEnd_ = newDataPointer + (pEnd_ - pBegin_ + pCount);
+        pBegin_ = newDataPointer;
+        mCapacity = newSize;
+
+        return endOfCopy;
+    }
+
+    T* begin() { return pBegin_; }
+
+    T* end() { return pEnd_; }
+
+    u32 size() {
+        if (pBegin_ == 0) {
+            return 0;
+        }
+        return (int)((u32)pEnd_ - (u32)pBegin_) / 4;
+    }
+
+    u32 capacity() { return mCapacity; }
+
+    u32 GetSize_extend_(u32 count) {
+        JUT_ASSERT(0x22B, pfnExtend_!=0);
+
+        u32 oldSize = size();
+        u32 neededNewSpace = oldSize + count;
+        u32 extendedSize = pfnExtend_(capacity(), oldSize, count);
+
+        return neededNewSpace > extendedSize ? neededNewSpace : extendedSize;
+    }
+
+    void DestroyElement_(T* start, T* end) {
+        for (; start != end; start++) {
+            mAllocator.destroy(start);
+        }
+    }
+
+    void DestroyElement_all_() { DestroyElement_(pBegin_, pEnd_); }
+
+    T* erase(T* start, T* end) {
+        T* vectorEnd = pEnd_;
+        T* ppvVar3 = std::copy(end, vectorEnd, start);
+        DestroyElement_(ppvVar3, pEnd_);
+        pEnd_ = ppvVar3;
+        return start;
+    }
+
+    void clear() { erase(begin(), end()); }
+
+    /* 0x00 */ Allocator mAllocator;
+    /* 0x04 */ T* pBegin_;
+    /* 0x08 */ T* pEnd_;
+    /* 0x0C */ u32 mCapacity;
+    /* 0x10 */ extendFunc pfnExtend_;
+};
+
+struct TVector_pointer_void : public TVector<void*, TAllocator<void*> > {
+    TVector_pointer_void(const JGadget::TAllocator<void*>& allocator);
+    TVector_pointer_void(u32, void* const&,
+                         const JGadget::TAllocator<void*>& allocator);
+
+    ~TVector_pointer_void();
+
+    void insert(void**, void* const&);
+    void** erase(void**, void**);
+
+    void clear() { erase(begin(), end()); }
+    void push_back(const void*& value) { insert(end(), (void* const&)value); }
+};
+}  // namespace JGadget
+
 #endif /* STD_VECTOR_H */

include/JSystem/JMessage/data.h

@@ -42,6 +42,13 @@ struct data {
 
     struct TParse_TBlock_messageID : public TParse_TBlock {
         TParse_TBlock_messageID(const void* data) : TParse_TBlock(data) {}
+
+        char* get() const { return (char*)getRaw(); }
+        u8 get_formSupplement() const { return *(u8*)(get() + 0xB); }
+        u16 get_number() const { return *(u16*)(get() + 0x8); }
+        char* getContent() const { return (char*)get() + 0x10; }
+        u8 get_form() const { return *(u8*)(get() + 0xA) & 0xF; }
+        bool get_isOrdered() const { return *(u8*)(get() + 0xA) & 0xF0; }
     };
 
     struct TParse_TBlock_color : public TParse_TBlock {

include/JSystem/JMessage/resource.h

@@ -14,7 +14,7 @@ namespace JMessage {
  */
 struct TResource {
     TResource()
-        : field_0x8(NULL), field_0xc(NULL), field_0x10(NULL), field_0x14(0), field_0x18(NULL) {}
+        : field_0x8(NULL), field_0xc(NULL), field_0x10(NULL), field_0x14(0), mMessageID(NULL) {}
 
     /* 802A8CDC */ u16 toMessageIndex_messageID(u32, u32, bool*) const;
 
@@ -56,7 +56,7 @@ struct TResource {
     /* 0x0C */ data::TParse_TBlock_info field_0xc;
     /* 0x10 */ char* field_0x10;
     /* 0x14 */ int field_0x14;
-    /* 0x18 */ data::TParse_TBlock_messageID field_0x18;
+    /* 0x18 */ data::TParse_TBlock_messageID mMessageID;
 };
 
 /**

include/SSystem/SComponent/c_request.h

@@ -4,204 +4,9 @@
 #include "dolphin/types.h"
 
 struct request_base_class {
-    struct {
-        u8 flag0 : 1;
-        u8 flag1 : 1;
-        u8 flag2 : 6;
-    } field_0x0;
-    u8 field_0x1;
-    u8 field_0x2;
-    u8 field_0x3;
-    u16 field_0x4;
-    u8 field_0x6;
-    u8 field_0x7;
-    u32 field_0x8;
-    s8 field_0xc;
-    u8 field_0xd;
-    u8 field_0xe;
-    u8 field_0xf;
-    int* field_0x10;
-    // u8 field_0x11;
-    // u8 field_0x12;
-    // u8 field_0x13;
-    u8 field_0x14;
-    u8 field_0x15;
-    u8 field_0x16;
-    u8 field_0x17;
-    u8 field_0x18;
-    u8 field_0x19;
-    u8 field_0x1a;
-    u8 field_0x1b;
-    u8 field_0x1c;
-    u8 field_0x1d;
-    u8 field_0x1e;
-    u8 field_0x1f;
-    u32* field_0x20;
-    u8 field_0x24;
-    u8 field_0x25;
-    u8 field_0x26;
-    u8 field_0x27;
-    u8 field_0x28;
-    u8 field_0x29;
-    u8 field_0x2a;
-    u8 field_0x2b;
-    u8 field_0x2c;
-    u8 field_0x2d;
-    u8 field_0x2e;
-    u8 field_0x2f;
-    u8 field_0x30;
-    u8 field_0x31;
-    u8 field_0x32;
-    u8 field_0x33;
-    u8 field_0x34;
-    u8 field_0x35;
-    u8 field_0x36;
-    u8 field_0x37;
-    u8 field_0x38;
-    u8 field_0x39;
-    u8 field_0x3a;
-    u8 field_0x3b;
-    u8 field_0x3c;
-    u8 field_0x3d;
-    u8 field_0x3e;
-    u8 field_0x3f;
-    u8 field_0x40;
-    u8 field_0x41;
-    u8 field_0x42;
-    u8 field_0x43;
-    u8 field_0x44;
-    u8 field_0x45;
-    u8 field_0x46;
-    u8 field_0x47;
-    u8 field_0x48;
-    u8 field_0x49;
-    u8 field_0x4a;
-    u8 field_0x4b;
-    u8 field_0x4c;
-    u8 field_0x4d;
-    u8 field_0x4e;
-    u8 field_0x4f;
-    u8 field_0x50;
-    u8 field_0x51;
-    u8 field_0x52;
-    u8 field_0x53;
-    u8 field_0x54;
-    u8 field_0x55;
-    u8 field_0x56;
-    u8 field_0x57;
-    u8 field_0x58;
-    u8 field_0x59;
-    u8 field_0x5a;
-    u8 field_0x5b;
-    u8 field_0x5c;
-    u8 field_0x5d;
-    u8 field_0x5e;
-    u8 field_0x5f;
-    u8 field_0x60;
-    u8 field_0x61;
-    u8 field_0x62;
-    u8 field_0x63;
-    u8 field_0x64;
-    u8 field_0x65;
-    u8 field_0x66;
-    u8 field_0x67;
-    u8 field_0x68;
-    u8 field_0x69;
-    u8 field_0x6a;
-    u8 field_0x6b;
-    u8 field_0x6c;
-    u8 field_0x6d;
-    u8 field_0x6e;
-    u8 field_0x6f;
-    u8 field_0x70;
-    u8 field_0x71;
-    u8 field_0x72;
-    u8 field_0x73;
-    u8 field_0x74;
-    u8 field_0x75;
-    u8 field_0x76;
-    u8 field_0x77;
-    u8 field_0x78;
-    u8 field_0x79;
-    u8 field_0x7a;
-    u8 field_0x7b;
-    u8 field_0x7c;
-    u8 field_0x7d;
-    u8 field_0x7e;
-    u8 field_0x7f;
-    u8 field_0x80;
-    u8 field_0x81;
-    u8 field_0x82;
-    u8 field_0x83;
-    u8 field_0x84;
-    u8 field_0x85;
-    u8 field_0x86;
-    u8 field_0x87;
-    u8 field_0x88;
-    u8 field_0x89;
-    u8 field_0x8a;
-    u8 field_0x8b;
-    u8 field_0x8c;
-    u8 field_0x8d;
-    u8 field_0x8e;
-    u8 field_0x8f;
-    u8 field_0x90;
-    u8 field_0x91;
-    u8 field_0x92;
-    u8 field_0x93;
-    u8 field_0x94;
-    u8 field_0x95;
-    u8 field_0x96;
-    u8 field_0x97;
-    u8 field_0x98;
-    u8 field_0x99;
-    u8 field_0x9a;
-    u8 field_0x9b;
-    u8 field_0x9c;
-    u8 field_0x9d;
-    u8 field_0x9e;
-    u8 field_0x9f;
-    u8 field_0xa0;
-    u8 field_0xa1;
-    u8 field_0xa2;
-    u8 field_0xa3;
-    u8 field_0xa4;
-    u8 field_0xa5;
-    u8 field_0xa6;
-    u8 field_0xa7;
-    u8 field_0xa8;
-    u8 field_0xa9;
-    u8 field_0xaa;
-    u8 field_0xab;
-    u8 field_0xac;
-    u8 field_0xad;
-    u8 field_0xae;
-    u8 field_0xaf;
-    u8 field_0xb0;
-    u8 field_0xb1;
-    u8 field_0xb2;
-    u8 field_0xb3;
-    u8 field_0xb4;
-    u8 field_0xb5;
-    u8 field_0xb6;
-    u8 field_0xb7;
-    u8 field_0xb8;
-    u8 field_0xb9;
-    u8 field_0xba;
-    u8 field_0xbb;
-    u8 field_0xbc;
-    u8 field_0xbd;
-    u8 field_0xbe;
-    u8 field_0xbf;
-    u32 field_0xc0;
-    // u8 field_0xc1;
-    // u8 field_0xc2;
-    // u8 field_0xc3;
-    request_base_class* field_0xc4;
-    // u8 field_0xc5;
-    // u8 field_0xc6;
-    // u8 field_0xc7;
-    u32* field_0xc8;
+    u8 flag0 : 1;
+    u8 flag1 : 1;
+    u8 flag2 : 6;
 };
 
 int cReq_Is_Done(request_base_class*);

include/c/c_dylink.h

@@ -19,4 +19,8 @@ struct DynamicNameTableEntry {
 int cDyl_InitAsyncIsDone();
 void cDyl_InitAsync();
 
+BOOL cDyl_IsLinked(s16 i_ProfName);
+BOOL cDyl_Unlink(s16 i_ProfName);
+int cDyl_LinkASync(s16 i_ProfName);
+
 #endif /* C_C_DYLINK_H */

include/d/actor/d_a_ykgr.h

@@ -74,7 +74,7 @@ public:
         camera_class* iVar1 = dComIfGp_getCamera(0);
         cXyz local_28;
         current.pos = *fopCamM_GetEye_p(iVar1);
-        dKyr_get_vectle_calc(&iVar1->mLookat.mEye, &iVar1->mLookat.mCenter, &local_28);
+        dKyr_get_vectle_calc(&iVar1->lookat.eye, &iVar1->lookat.center, &local_28);
         current.angle.y = cM_atan2s(local_28.x, local_28.z);
         current.angle.x = -cM_atan2s(
             local_28.y, JMAFastSqrt((local_28.x * local_28.x + local_28.z * local_28.z)));

include/d/d_com_inf_game.h

@@ -3393,19 +3393,19 @@ inline void dComIfGp_event_setTalkPartner(fopAc_ac_c* i_actor) {
 }
 
 inline fopAc_ac_c* dComIfGp_event_getTalkPartner() {
-    return g_dComIfG_gameInfo.play.getEvent().getPtT();
+    return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtT();
 }
 
 inline fopAc_ac_c* dComIfGp_event_getItemPartner() {
-    return g_dComIfG_gameInfo.play.getEvent().getPtI();
+    return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtI();
 }
 
 inline fopAc_ac_c* dComIfGp_event_getPt1() {
-    return g_dComIfG_gameInfo.play.getEvent().getPt1();
+    return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt1();
 }
 
 inline fopAc_ac_c* dComIfGp_event_getPt2() {
-    return g_dComIfG_gameInfo.play.getEvent().getPt2();
+    return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt2();
 }
 
 inline BOOL dComIfGp_event_runCheck() {
@@ -3897,11 +3897,11 @@ inline view_class* dComIfGd_getView() {
 }
 
 inline Mtx44* dComIfGd_getProjViewMtx() {
-    return &(g_dComIfG_gameInfo.drawlist.getView()->mProjViewMtx);
+    return &(g_dComIfG_gameInfo.drawlist.getView()->projViewMtx);
 }
 
 inline MtxP dComIfGd_getInvViewMtx() {
-    return g_dComIfG_gameInfo.drawlist.getView()->mInvViewMtx;
+    return g_dComIfG_gameInfo.drawlist.getView()->invViewMtx;
 }
 
 inline view_port_class* dComIfGd_getViewport() {
@@ -3909,10 +3909,10 @@ inline view_port_class* dComIfGd_getViewport() {
 }
 
 inline MtxP dComIfGd_getViewRotMtx() {
-    return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->mViewMtxNoTrans;
+    return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->viewMtxNoTrans;
 }
 inline MtxP dComIfGd_getViewMtx() {
-    return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->mViewMtx;
+    return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->viewMtx;
 }
 
 inline J3DDrawBuffer* dComIfGd_getListFilter() {

include/d/d_drawlist.h

@@ -249,7 +249,7 @@ public:
     s8 getCameraID() { return mCameraID; }
     void setMode(int mode) { mMode = mode; }
     view_port_class* getViewPort() { return &mViewport; }
-    scissor_class* getScissor() { return &mViewport.mScissor; }
+    scissor_class* getScissor() { return &mViewport.scissor; }
 
 private:
     /* 0x00 */ view_port_class mViewport;

include/f_op/f_op_actor.h

@@ -11,16 +11,16 @@ struct actor_method_class {
 };
 
 struct actor_process_profile_definition {
-    /* 0x00 */ leaf_process_profile_definition mBase;
+    /* 0x00 */ leaf_process_profile_definition base;
     /* 0x24 */ actor_method_class* sub_method;
     /* 0x28 */ u32 status;
-    /* 0x2C */ u8 mActorType;
+    /* 0x2C */ u8 group;
     /* 0x2D */ u8 cullType;
 };
 
 // Unclear what this is. Only appears in 4 profiles (BG,DSHUTTER,PATH,SCENE_EXIT)
 struct actor_process_profile_definition2 {
-    /* 0x00 */ actor_process_profile_definition def;
+    /* 0x00 */ actor_process_profile_definition base;
     /* 0x30 */ u32 field_0x30;
 };
 
@@ -304,7 +304,7 @@ public:
     /* 0x5A8 */ u8 mMidnaBindMode;
 };  // Size: 0x5AC
 
-s32 fopAc_IsActor(void* actor);
+BOOL fopAc_IsActor(void* i_actor);
 
 extern actor_method_class g_fopAc_Method;
 

include/f_op/f_op_actor_tag.h

@@ -3,11 +3,10 @@
 
 #include "SSystem/SComponent/c_tag.h"
 
-u32 fopAcTg_ActorQTo(create_tag_class* pTag);
-u32 fopAcTg_Init(create_tag_class* pTag, void* data);
-u32 fopAcTg_ToActorQ(create_tag_class* c);
+int fopAcTg_ActorQTo(create_tag_class* i_createTag);
+int fopAcTg_Init(create_tag_class* i_createTag, void* i_data);
+int fopAcTg_ToActorQ(create_tag_class* i_createTag);
 
-// f_op_actor_tag::g_fopAcTg_Queue
 extern node_list_class g_fopAcTg_Queue;
 
-#endif
+#endif

include/f_op/f_op_camera.h

@@ -6,13 +6,13 @@
 class camera_class;
 
 struct camera_process_profile_definition {
-    /* 0x00 */ view_process_profile_definition mBase;
+    /* 0x00 */ view_process_profile_definition base;
     /* 0x3C */ leafdraw_method_class* sub_method; // Subclass methods
 };
 
-static s32 fopCam_Draw(camera_class* param_1);
-static int fopCam_Execute(camera_class* pCamera);
-int fopCam_IsDelete(camera_class* pCamera);
+static s32 fopCam_Draw(camera_class* i_this);
+static int fopCam_Execute(camera_class* i_this);
+int fopCam_IsDelete(camera_class* i_this);
 
 extern leafdraw_method_class g_fopCam_Method;
 

include/f_op/f_op_camera_mng.h

@@ -9,91 +9,91 @@ typedef struct leafdraw_method_class leafdraw_method_class;
 
 class camera_process_class : public view_class {
 public:
-    /* 0x210 */ create_tag_class mCreateTag;
-    /* 0x224 */ leafdraw_method_class* mpMtd;
+    /* 0x210 */ create_tag_class create_tag;
+    /* 0x224 */ leafdraw_method_class* submethod;
     /* 0x228 */ u8 field_0x228[4];
-    /* 0x22C */ s8 mPrm1;
-    /* 0x22D */ s8 mPrm2;
-    /* 0x22E */ s8 mPrm3;
+    /* 0x22C */ s8 prm1;
+    /* 0x22D */ s8 prm2;
+    /* 0x22E */ s8 prm3;
     /* 0x22F */ s8 field_0x22f;
-    /* 0x230 */ csXyz mAngle;
+    /* 0x230 */ csXyz angle;
     /* 0x238 */ int field_0x238;
 };
 
 class camera_class : public camera_process_class {
 public:
     /* 0x23C */ int field_0x23c;
-    /* 0x240 */ request_of_phase_process_class mPhaseReq;
+    /* 0x240 */ request_of_phase_process_class phase_request;
     /* 0x248 */ dCamera_c mCamera;
 };
 
 inline void fopCamM_SetNear(camera_class* i_this, f32 near) {
-    i_this->mNear = near;
+    i_this->near = near;
 }
 
 inline void fopCamM_SetFar(camera_class* i_this, f32 far) {
-    i_this->mFar = far;
+    i_this->far = far;
 }
 
 inline void fopCamM_SetFovy(camera_class* i_this, f32 fovy) {
-    i_this->mFovy = fovy;
+    i_this->fovy = fovy;
 }
 
 inline void fopCamM_SetAspect(camera_class* i_this, f32 aspect) {
-    i_this->mAspect = aspect;
+    i_this->aspect = aspect;
 }
 
 inline void fopCamM_SetEye(camera_class* i_this, f32 x, f32 y, f32 z) {
-    i_this->mLookat.mEye.set(x, y, z);
+    i_this->lookat.eye.set(x, y, z);
 }
 
 inline void fopCamM_SetCenter(camera_class* i_this, f32 x, f32 y, f32 z) {
-    i_this->mLookat.mCenter.set(x, y, z);
+    i_this->lookat.center.set(x, y, z);
 }
 
 inline void fopCamM_SetBank(camera_class* i_this, s16 bank) {
-    i_this->mBank = bank;
+    i_this->bank = bank;
 }
 
 inline void fopCamM_SetPrm1(camera_class* i_this, int prm1) {
-    i_this->mPrm1 = prm1;
+    i_this->prm1 = prm1;
 }
 
 inline void fopCamM_SetPrm2(camera_class* i_this, int prm2) {
-    i_this->mPrm2 = prm2;
+    i_this->prm2 = prm2;
 }
 
 inline void fopCamM_SetPrm3(camera_class* i_this, int prm3) {
-    i_this->mPrm3 = prm3;
+    i_this->prm3 = prm3;
 }
 
 inline s16 fopCamM_GetAngleX(camera_class* i_camera) {
-    return i_camera->mAngle.x;
+    return i_camera->angle.x;
 }
 
 inline s16 fopCamM_GetAngleY(camera_class* i_camera) {
-    return i_camera->mAngle.y;
+    return i_camera->angle.y;
 }
 
 inline s16 fopCamM_GetAngleZ(camera_class* i_camera) {
-    return i_camera->mAngle.z;
+    return i_camera->angle.z;
 }
 
 inline f32 fopCamM_GetFovy(camera_class* i_camera) {
-    return i_camera->mFovy;
+    return i_camera->fovy;
 }
 
 inline cXyz* fopCamM_GetEye_p(camera_class* i_camera) {
-    return &i_camera->mLookat.mEye;
+    return &i_camera->lookat.eye;
 }
 
 inline cXyz* fopCamM_GetCenter_p(camera_class* i_camera) {
-    return &i_camera->mLookat.mCenter;
+    return &i_camera->lookat.center;
 }
 
-u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3);
-void fopCamM_Management(void);
-u32 fopCamM_GetParam(camera_class* pCamera);
-void fopCamM_Init(void);
+fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* i_append);
+void fopCamM_Management();
+u32 fopCamM_GetParam(camera_class* i_this);
+void fopCamM_Init();
 
 #endif

include/f_op/f_op_draw_iter.h

@@ -3,8 +3,8 @@
 
 typedef struct create_tag_class create_tag_class;
 
-static create_tag_class* fopDwIt_GetTag(void);
-create_tag_class* fopDwIt_Begin(void);
-create_tag_class* fopDwIt_Next(create_tag_class* pCreateTag);
+create_tag_class* fopDwIt_GetTag();
+create_tag_class* fopDwIt_Begin();
+create_tag_class* fopDwIt_Next(create_tag_class* i_createTag);
 
-#endif
+#endif

include/f_op/f_op_draw_tag.h

@@ -7,9 +7,9 @@ typedef struct create_tag_class create_tag_class;
 
 extern node_lists_tree_class g_fopDwTg_Queue;
 
-void fopDwTg_DrawQTo(create_tag_class* pTag);
+void fopDwTg_DrawQTo(create_tag_class* i_createTag);
 void fopDwTg_CreateQueue();
-bool fopDwTg_Init(create_tag_class* pCreateTagClass, void* pActor);
-void fopDwTg_ToDrawQ(create_tag_class* pCreateTagClass, int priority);
+bool fopDwTg_Init(create_tag_class* i_createTag, void* i_process);
+void fopDwTg_ToDrawQ(create_tag_class* i_createTag, int priority);
 
-#endif
+#endif

include/f_op/f_op_kankyo.h

@@ -6,12 +6,12 @@
 
 class kankyo_class : public leafdraw_class {
 public:
-    /* 0xC0 */ int mBsType;
+    /* 0xC0 */ int type;
     /* 0xC4 */ create_tag_class draw_tag;
     /* 0xD8 */ leafdraw_method_class* sub_method;
-    /* 0xDC */ cXyz mPos;
-    /* 0xE8 */ cXyz mScale;
-    /* 0xF4 */ u32 mParam;
+    /* 0xDC */ cXyz pos;
+    /* 0xE8 */ cXyz scale;
+    /* 0xF4 */ u32 parameters;
 };
 
 struct kankyo_process_profile_definition {

include/f_op/f_op_kankyo_mng.h

@@ -5,25 +5,24 @@
 #include "f_pc/f_pc_manager.h"
 
 struct fopKyM_prm_class {
-    /* 0x00 */ cXyz mPos;
-    /* 0x0C */ cXyz mScale;
-    /* 0x18 */ int mParam;
+    /* 0x00 */ cXyz pos;
+    /* 0x0C */ cXyz scale;
+    /* 0x18 */ int parameters;
 };  // Size: 0x1C
 
 typedef int (*fopKyM_CreateFunc)(void*);
 
-static fopKyM_prm_class* fopKyM_CreateAppend(void);
-static fopKyM_prm_class* createAppend(int param_1, cXyz* param_2, cXyz* param_3);
-void fopKyM_Delete(void* param_1);
-int fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale,
-                  fopKyM_CreateFunc i_createFunc);
-static int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2, void* param_3);
-base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3,
-                                      fopKyM_CreateFunc);
-int fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param);
+fopKyM_prm_class* fopKyM_CreateAppend();
+void fopKyM_Delete(void* i_process);
+fpc_ProcID fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale,
+                         fopKyM_CreateFunc i_createFunc);
+fpc_ProcID fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_append);
+base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale,
+                                      fopKyM_CreateFunc i_createFunc);
+fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param);
 
-inline void* fopKyM_GetAppend(void* param_0) {
-    return fpcM_GetAppend(param_0);
+inline fopKyM_prm_class* fopKyM_GetAppend(void* i_process) {
+    return (fopKyM_prm_class*)fpcM_GetAppend(i_process);
 }
 
-#endif
+#endif