Clean up inlines for f_op_actor_mng

include/d/d_com_inf_game.h

@@ -233,6 +233,33 @@ public:
 
 class dADM_CharTbl : public cDT {
 public:
+    s32 GetNITEM0()  { return mIndex_N_ITEM0; }
+    s32 GetNITEM1()  { return mIndex_N_ITEM1; }
+    s32 GetNITEM2()  { return mIndex_N_ITEM2; }
+    s32 GetNITEM3()  { return mIndex_N_ITEM3; }
+    s32 GetNITEM4()  { return mIndex_N_ITEM4; }
+    s32 GetNITEM5()  { return mIndex_N_ITEM5; }
+    s32 GetNITEM6()  { return mIndex_N_ITEM6; }
+    s32 GetNITEM7()  { return mIndex_N_ITEM7; }
+    s32 GetNITEM8()  { return mIndex_N_ITEM8; }
+    s32 GetNITEM9()  { return mIndex_N_ITEM9; }
+    s32 GetNITEM10() { return mIndex_N_ITEM10; }
+    s32 GetNITEM11() { return mIndex_N_ITEM11; }
+    s32 GetNITEM12() { return mIndex_N_ITEM12; }
+    s32 GetNITEM13() { return mIndex_N_ITEM13; }
+    s32 GetNITEM14() { return mIndex_N_ITEM14; }
+    s32 GetNITEM15() { return mIndex_N_ITEM15; }
+    s32 GetPercent() { return mIndex_percent; }
+    s32 GetITEM0() { return mIndex_ITEM0; }
+    s32 GetITEM1() { return mIndex_ITEM1; }
+    s32 GetITEM2() { return mIndex_ITEM2; }
+    s32 GetITEM3() { return mIndex_ITEM3; }
+    s32 GetITEM4() { return mIndex_ITEM4; }
+    s32 GetITEM5() { return mIndex_ITEM5; }
+    s32 GetITEM6() { return mIndex_ITEM6; }
+    s32 GetITEM7() { return mIndex_ITEM7; }
+
+private:
     /* 0x28 */ s32 mIndex_ARG;
     /* 0x2C */ s32 mIndex_N_ITEM0;
     /* 0x30 */ s32 mIndex_N_ITEM1;
@@ -2527,8 +2554,7 @@ inline s32 dComIfGp_event_orderOld(u16 eventType, u16 priority, u16 flag, u16 hi
 }
 
 inline fopAc_ac_c* dComIfGp_event_getTalkPartner() {
-    u32 t = g_dComIfG_gameInfo.play.getEvent().mPtTalk;
-    return g_dComIfG_gameInfo.play.getEvent().convPId(t);
+    return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtT();
 }
 
 inline void dComIfGp_event_setTalkPartner(void* i_actor) {
@@ -2536,18 +2562,15 @@ inline void dComIfGp_event_setTalkPartner(void* i_actor) {
 }
 
 inline fopAc_ac_c* dComIfGp_event_getItemPartner() {
-    u32 i = g_dComIfG_gameInfo.play.getEvent().mPtItem;
-    return g_dComIfG_gameInfo.play.getEvent().convPId(i);
+    return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtI();
 }
 
 inline fopAc_ac_c* dComIfGp_event_getPt1() {
-    u32 pt1 = g_dComIfG_gameInfo.play.getEvent().mPt1;
-    return g_dComIfG_gameInfo.play.getEvent().convPId(pt1);
+    return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt1();
 }
 
 inline fopAc_ac_c* dComIfGp_event_getPt2() {
-    u32 pt2 = g_dComIfG_gameInfo.play.getEvent().mPt2;
-    return g_dComIfG_gameInfo.play.getEvent().convPId(pt2);
+    return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt2();
 }
 
 inline f32 dComIfGp_event_getCullRate() {

include/d/d_event.h

@@ -91,7 +91,7 @@ public:
     dStage_Event_dt_c* getStageEventDt();
     dStage_Event_dt_c* nextStageEventDt(void*);
     int getPId(void*);
-    fopAc_ac_c * convPId(unsigned int);
+    void* convPId(unsigned int);
     u8 getTactFreeMStick(int);
     u8 getTactFreeCStick(int);
     bool giveItemCut(u8);
@@ -100,11 +100,15 @@ public:
     bool chkTalkXY() { return mTalkButton == 1 || mTalkButton == 2 || mTalkButton == 3; }
     void setPtI_Id(unsigned int id) { mPtItem = id; }
     void setPtI(void* actor) { mPtItem = getPId(actor); }
+    void* getPtI() { return convPId(mPtItem); }
     void setGtItm(u8 itemNo) { mGetItemNo = itemNo; }
     u8 getGtItm() { return mGetItemNo; }
     void setPtT(void* i_actor) { mPtTalk = getPId(i_actor); }
+    void* getPtT() { return convPId(mPtTalk); }
     void setPt1(void* i_actor) { mPt1 = getPId(i_actor); }
+    void* getPt1() { return convPId(mPt1); }
     void setPt2(void* i_actor) { mPt2 = getPId(i_actor); }
+    void* getPt2() { return convPId(mPt2); }
     u8 getPreItemNo() { return mItemNo; }
     
     f32 getCullRate() { return mCullFarClipRatio; }
@@ -118,6 +122,14 @@ public:
     bool runCheck() { return mMode != 0; }
     u8 getMode() { return mMode; }
 
+    void checkHind(u16) {}
+    void chkPhoto() {}
+    void getMode() const {}
+    void offHindFlag(u16) {}
+    void onHindFlag(u16) {}
+    void setDebugStb(u8) {}
+
+public:
     /* 0x00 */ dEvt_order_c mOrder[8];
     /* 0xC0 */ s8 mOrderCount;
     /* 0xC1 */ s8 mFirstOrderIdx;
@@ -125,7 +137,7 @@ public:
     /* 0xC3 */ u8 mbEndProc;
     /* 0xC4 */ u32 mPt1;
     /* 0xC8 */ u32 mPt2;
-    /* 0xCC */ int mPtTalk;
+    /* 0xCC */ u32 mPtTalk;
     /* 0xD0 */ u32 mPtItem;
     /* 0xD4 */ u8 mGetItemNo;
     /* 0xD5 */ u8 field_0xD5[0xD6 - 0xD5];

include/f_op/f_op_actor.h

@@ -107,13 +107,13 @@ struct actor_process_profile_definition {
     /* 0x28 */ u32 mStatus;
     /* 0x2C */ u8 mGroup;
     /* 0x2D */ u8 mCullType;
-};
+};  // Size: 0x30
 
 // Unclear what this is. Only appears in 2 profiles (PLAYER,BG)
 struct actor_process_profile_definition2 {
     /* 0x00 */ actor_process_profile_definition def;
     /* 0x30 */ u32 field_0x30;
-};
+};  // Size: 0x34
 
 class JKRSolidHeap;
 
@@ -220,7 +220,10 @@ public:
     /* 0xC */ f32 mRadius;
 
     fopAc_cullSizeSphere() {}
-    fopAc_cullSizeSphere(cXyz, f32);
+    fopAc_cullSizeSphere(cXyz p, f32 r) {
+        mCenter = p;
+        mRadius = r;
+    }
     ~fopAc_cullSizeSphere() {}
 #endif
 };
@@ -232,8 +235,14 @@ public:
     /* 0xC */ Vec mMax;
 #else
     fopAc_cullSizeBox() {}
-    fopAc_cullSizeBox(const fopAc_cullSizeBox&);
-    fopAc_cullSizeBox(cXyz, cXyz);
+    fopAc_cullSizeBox(const fopAc_cullSizeBox& box) {
+        mMin = box.mMin;
+        mMax = box.mMax;
+    }
+    fopAc_cullSizeBox(cXyz min, cXyz max) {
+        mMin = min;
+        mMax = max;
+    }
     ~fopAc_cullSizeBox() {}
 
     /* 0x0 */ cXyz mMin;

include/f_op/f_op_actor_mng.h

@@ -71,6 +71,9 @@ struct fopAcM_search_prm {
 class l_HIO {
 public:
     ~l_HIO() {}
+
+    void entry() {}
+    void erase() {}
 };
 
 class dKy_tevstr_c;