f_op_actor_mng event work

include/d/d_com_inf_game.h

@@ -1123,11 +1123,43 @@ inline s32 dComIfGp_event_moveApproval(void* actor) {
     return g_dComIfG_gameInfo.play.getEvent().moveApproval(actor);
 }
 
+inline s32 dComIfGp_event_order(u16 eventType, u16 priority, u16 flag, u16 hind, void* pActor1, void* pActor2, s16 eventID, u8 infoIdx) {
+    return g_dComIfG_gameInfo.play.getEvent().order(eventType, priority, flag, hind, pActor1, pActor2, eventID, infoIdx);
+}
+
+inline s32 dComIfGp_event_orderOld(u16 eventType, u16 priority, u16 flag, u16 hind, void* pActor1, void* pActor2, const char *pEventName) {
+    return g_dComIfG_gameInfo.play.getEvent().orderOld(eventType, priority, flag, hind, pActor1, pActor2, pEventName);
+}
+
+inline fopAc_ac_c* dComIfGp_event_getTalkPartner() {
+    u32 t = g_dComIfG_gameInfo.play.getEvent().mPtTalk;
+    return g_dComIfG_gameInfo.play.getEvent().convPId(t);
+}
+
+inline fopAc_ac_c* dComIfGp_event_getItemPartner() {
+    u32 i = g_dComIfG_gameInfo.play.getEvent().mPtItem;
+    return g_dComIfG_gameInfo.play.getEvent().convPId(i);
+}
+
+inline fopAc_ac_c* dComIfGp_event_getPt1() {
+    u32 pt1 = g_dComIfG_gameInfo.play.getEvent().mPt1;
+    return g_dComIfG_gameInfo.play.getEvent().convPId(pt1);
+}
+
+inline fopAc_ac_c* dComIfGp_event_getPt2() {
+    u32 pt2 = g_dComIfG_gameInfo.play.getEvent().mPt2;
+    return g_dComIfG_gameInfo.play.getEvent().convPId(pt2);
+}
+
 inline dEvent_manager_c& dComIfGp_getEventManager() {
     return g_dComIfG_gameInfo.play.getEvtManager();
 }
 
-inline u32 dComIfGp_evmng_getEventIdx(char* pName, u8 evNo) {
+inline s32 dComIfGp_evmng_getEventPrio(s16 eventIdx) {
+    return dComIfGp_getEventManager().getEventPrio(eventIdx);
+}
+
+inline s16 dComIfGp_evmng_getEventIdx(char* pName, u8 evNo) {
     return dComIfGp_getEventManager().getEventIdx(pName, evNo);
 }
 

include/d/d_event.h

@@ -5,6 +5,22 @@
 
 class fopAc_ac_c;
 
+enum dEvtType_e {
+    /* 0x00 */ dEvtType_TALK_e,
+    /* 0x01 */ dEvtType_DOOR_e,
+    /* 0x02 */ dEvtType_OTHER_e,
+    /* 0x03 */ dEvtType_COMPULSORY_e,
+    /* 0x04 */ dEvtType_POTENTIAL_e,
+    /* 0x05 */ dEvtType_ITEM_e,
+    /* 0x06 */ dEvtType_SHOWITEM_X_e,
+    /* 0x07 */ dEvtType_SHOWITEM_Y_e,
+    /* 0x08 */ dEvtType_SHOWITEM_Z_e,
+    /* 0x09 */ dEvtType_CATCH_e,
+    /* 0x0A */ dEvtType_TREASURE_e,
+    /* 0x0B */ dEvtType_PHOTO_e,
+    /* 0x0A */ dEvtType_CHANGE_e,
+};
+
 class dEvt_order_c {
 public:
     ~dEvt_order_c() {}
@@ -25,8 +41,8 @@ class dEvt_control_c {
 public:
     dEvt_control_c();
 
-    void orderOld(u16, u16, u16, u16, void*, void*, const void*);
-    void order(u16, u16, u16, u16, void*, void*, s16, u8);
+    s32 orderOld(u16, u16, u16, u16, void*, void*, const void*);
+    s32 order(u16, u16, u16, u16, void*, void*, s16, u8);
     void setParam(dEvt_order_c*);
     void beforeFlagProc(dEvt_order_c*);
     void afterFlagProc(dEvt_order_c*);
@@ -54,7 +70,7 @@ public:
     void getStageEventDt();
     void nextStageEventDt(void*);
     void getPId(void*);
-    void convPId(unsigned int);
+    fopAc_ac_c * convPId(unsigned int);
     void getTactFreeMStick(int);
     void getTactFreeCStick(int);
     void giveItemCut(u8);

include/d/d_event_manager.h

@@ -50,7 +50,7 @@ public:
     void* getMySubstanceP(int, const char*, int);
     void getMySubstanceNum(int, const char*);
     void cutEnd(int);
-    void getEventPrio(s16);
+    u16 getEventPrio(s16);
     void getEventEndSound(s16);
     void exceptionProc();
     void issueStaff(const char*);

include/f_op/f_op_actor.h

@@ -172,6 +172,7 @@ class JntHit_c;
 
 struct fopAc_cullSizeSphere {
 public:
+    fopAc_cullSizeSphere() {}
     fopAc_cullSizeSphere(cXyz, float);
 
     /* 0x0 */ Vec mCenter;
@@ -180,6 +181,7 @@ public:
 
 struct fopAc_cullSizeBox {
 public:
+    fopAc_cullSizeBox() {}
     fopAc_cullSizeBox(const fopAc_cullSizeBox&);
     fopAc_cullSizeBox(cXyz, cXyz);
 

include/f_op/f_op_actor_mng.h

@@ -416,7 +416,8 @@ s32 fopAcM_orderCatchEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16);
 s32 fopAcM_orderOtherEvent(fopAc_ac_c*, char*, u16, u16, u16);
 s32 fopAcM_orderOtherEvent(fopAc_ac_c*, fopAc_ac_c*, char*, u16, u16, u16);
 s32 fopAcM_orderOtherEvent2(fopAc_ac_c*, char*, u16, u16);
-s32 fopAcM_orderChangeEventId(fopAc_ac_c*, s16, u16, u16);
+s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_this, s16 eventIdx, u16 flag, u16 hind);
+s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_this, fopAc_ac_c* i_partner, s16 eventIdx, u16 flag, u16 hind);
 s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 param_3,
                              u16 priority, u16 flag);
 s32 fopAcM_orderMapToolEvent(fopAc_ac_c*, u8, s16, u16, u16, u16);