d_stage cleanup

4 files changed, 40 insertions, 39 deletions

diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp
index d0ac5787..a3a9dae4 100644
--- a/src/f_op/f_op_actor.cpp
+++ b/src/f_op/f_op_actor.cpp
@@ -156,16 +156,16 @@ cPhs_State fopAc_Create(void* pProc) {
 
         fopAcM_prm_class* prm = fopAcM_GetAppend(actor);
         if (prm != NULL) {
-            fopAcM_SetParam(actor, prm->mParameter);
-            actor->home.pos = prm->mPos;
-            actor->home.angle = prm->mAngle;
-            actor->shape_angle = prm->mAngle;
-            actor->parentActorID = prm->mParentPcId;
-            actor->subtype = prm->mSubtype;
-            actor->gbaName = prm->mGbaName;
-            actor->scale.set(prm->mScale.x * 0.1f, prm->mScale.y * 0.1f, prm->mScale.z * 0.1f);
-            actor->setID = prm->mSetId;
-            actor->home.roomNo = prm->mRoomNo;
+            fopAcM_SetParam(actor, prm->base.parameters);
+            actor->home.pos = prm->base.position;
+            actor->home.angle = prm->base.angle;
+            actor->shape_angle = prm->base.angle;
+            actor->parentActorID = prm->parent_id;
+            actor->subtype = prm->subtype;
+            actor->gbaName = prm->gbaName;
+            actor->scale.set(prm->scale.x * 0.1f, prm->scale.y * 0.1f, prm->scale.z * 0.1f);
+            actor->setID = prm->base.setID;
+            actor->home.roomNo = prm->room_no;
         }
 
         actor->old = actor->home;
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index df1e68cf..4d5832fb 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -80,13 +80,13 @@ fopAcM_prm_class* fopAcM_CreateAppend() {
     fopAcM_prm_class* params = (fopAcM_prm_class*)cMl::memalignB(-4, sizeof(fopAcM_prm_class));
     if (params != NULL) {
         cLib_memSet(params, 0, sizeof(fopAcM_prm_class));
-        params->mSetId = 0xFFFF;
-        params->mRoomNo = -1;
-        params->mScale.x = 10;
-        params->mScale.y = 10;
-        params->mScale.z = 10;
-        params->mParentPcId = fpcM_ERROR_PROCESS_ID_e;
-        params->mSubtype = -1;
+        params->base.setID = 0xFFFF;
+        params->room_no = -1;
+        params->scale.x = 10;
+        params->scale.y = 10;
+        params->scale.z = 10;
+        params->parent_id = fpcM_ERROR_PROCESS_ID_e;
+        params->subtype = -1;
     }
     return params;
 }
@@ -98,30 +98,30 @@ fopAcM_prm_class * createAppend(u32 parameter, cXyz* pPos, int roomNo, csXyz* pA
         return NULL;
 
     if (pPos != NULL)
-        params->mPos = *pPos;
+        params->base.position = *pPos;
     else
-        params->mPos = cXyz::Zero;
+        params->base.position = cXyz::Zero;
 
-    params->mRoomNo = roomNo;
+    params->room_no = roomNo;
 
     if (pAngle != NULL)
-        params->mAngle = *pAngle;
+        params->base.angle = *pAngle;
     else
-        params->mAngle = csXyz::Zero;
+        params->base.angle = csXyz::Zero;
 
     if (pScale != NULL) {
-        params->mScale.x = 10.0f * pScale->x;
-        params->mScale.y = 10.0f * pScale->y;
-        params->mScale.z = 10.0f * pScale->z;
+        params->scale.x = 10.0f * pScale->x;
+        params->scale.y = 10.0f * pScale->y;
+        params->scale.z = 10.0f * pScale->z;
     } else {
-        params->mScale.x = 10.0f;
-        params->mScale.y = 10.0f;
-        params->mScale.z = 10.0f;
+        params->scale.x = 10.0f;
+        params->scale.y = 10.0f;
+        params->scale.z = 10.0f;
     }
 
-    params->mParameter = parameter;
-    params->mParentPcId = parentPcId;
-    params->mSubtype = subtype;
+    params->base.parameters = parameter;
+    params->parent_id = parentPcId;
+    params->subtype = subtype;
 
     return params;
 }
@@ -1388,11 +1388,11 @@ fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c* it, void* i_prm) {
     fopAcM_search_prm* Prm = (fopAcM_search_prm*)i_prm;
     JUT_ASSERT(4095, Prm);
 
-    dStage_objectNameInf *inf = dStage_searchName(Prm->mpProcName);
+    dStage_objectNameInf *inf = dStage_searchName(Prm->procname);
     if (inf == NULL)
         return NULL;
 
-    if (inf->mProcName == fopAcM_GetProfName(it) && inf->mSubtype == it->subtype && (Prm->mParamMask == 0 || Prm->mParameter == (fopAcM_GetParam(it) & Prm->mParamMask)))
+    if (inf->mProcName == fopAcM_GetProfName(it) && inf->mSubtype == it->subtype && (Prm->prm_mask == 0 || Prm->parameter == (fopAcM_GetParam(it) & Prm->prm_mask)))
         return it;
 
     return NULL;
@@ -1401,9 +1401,9 @@ fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c* it, void* i_prm) {
 /* 80028410-80028448       .text fopAcM_searchFromName__FPcUlUl */
 fopAc_ac_c* fopAcM_searchFromName(char* pProcName, u32 paramMask, u32 parameter) {
     fopAcM_search_prm param;
-    param.mpProcName = pProcName;
-    param.mParamMask = paramMask;
-    param.mParameter = parameter;
+    param.procname = pProcName;
+    param.prm_mask = paramMask;
+    param.parameter = parameter;
     return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObjectCB, &param);
 }
 
diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp
index 818afb86..945486f9 100644
--- a/src/f_op/f_op_camera.cpp
+++ b/src/f_op/f_op_camera.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "f_op/f_op_camera.h"
+#include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_draw_tag.h"
 #include "dolphin/types.h"
 #include "d/d_meter.h"
@@ -56,10 +57,10 @@ cPhs_State fopCam_Create(void* pProc) {
         camera->mpMtd = profile->sub_method;
 
         fopDwTg_Init(&camera->draw_tag, camera);
-        u32* append = (u32*)fpcM_GetAppend(camera);
+        fopCamM_prm_class* append = (fopCamM_prm_class*)fpcM_GetAppend(camera);
 
         if (append) {
-            fpcM_SetParam(camera, *append);
+            fpcM_SetParam(camera, append->base.parameters);
         }
     }
 
diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp
index 7bef5a13..1ef9a7e0 100644
--- a/src/f_op/f_op_kankyo.cpp
+++ b/src/f_op/f_op_kankyo.cpp
@@ -71,7 +71,7 @@ static cPhs_State fopKy_Create(void* i_ky) {
         i_this->sub_method = profile->sub_method;
 
         fopDwTg_Init(&i_this->draw_tag, i_this);
-        fopKyM_prm_class* append = (fopKyM_prm_class*)fopKyM_GetAppend(i_this);
+        fopKyM_prm_class* append = fopKyM_GetAppend(i_this);
 
         if (append != NULL) {
             i_this->mPos = append->mPos;