Merge branch 'master' of https://github.com/zeldaret/tp into ext

include/f_op/f_op_actor.h

@@ -14,7 +14,7 @@ public:
     dEvt_info_c();
     virtual ~dEvt_info_c();
     void setEventName(char*);
-    s16 getEventName();
+    char* getEventName();
     void beforeProc();
     void onCondition(u16);
     void offCondition(u16);
@@ -29,7 +29,7 @@ public:
     void setArchiveName(char* name) { mArchiveName = name; }
     u8 getMapToolId() { return mMapToolId; }
     s16 getEventId() { return mEventId; }
-    u8 getIdx() { return mIndex; }
+    s16 getIdx() { return mIndex; }
     char* getArchiveName() { return mArchiveName; }
     bool chkCondition(u16 condition) { return mCondition == condition; }
 
@@ -40,7 +40,7 @@ public:
     /* 0x06 */ u16 mCondition;
     /* 0x08 */ s16 mEventId;
     /* 0x0A */ u8 mMapToolId;
-    /* 0x0B */ u8 mIndex;
+    /* 0x0B */ s8 mIndex;
     /* 0x0C */ char* mArchiveName;
     /* 0x10 */ void* field_0x10;
     /* 0x14 */ void* field_0x14;
@@ -119,6 +119,7 @@ public:
 
     const cXyz& getPosition() const { return mCurrent.mPosition; }
     const csXyz& getAngle() const { return mCurrent.mAngle; }
+    s8 getRoomNo() const { return mCurrent.mRoomNo; }
 };  // Size: 0x568
 
 s32 fopAc_IsActor(void* actor);

include/f_op/f_op_actor_mng.h

@@ -110,6 +110,10 @@ inline void fopAcM_SetParam(void* p_actor, u32 param) {
     fpcM_SetParam(p_actor, param);
 }
 
+inline s16 fpcAcM_GetProfName(void* pActor) {
+    return fpcM_GetProfName(pActor);
+}
+
 inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) {
     return p_actor->mGroup;
 }
@@ -122,6 +126,10 @@ inline void fopAcM_OffStatus(fopAc_ac_c* pActor, u32 flag) {
     pActor->mStatus &= ~flag;
 }
 
+inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc func, void* param) {
+    return (fopAc_ac_c*)fopAcIt_Judge(func, param);
+}
+
 inline fopAc_ac_c* fopAcM_SearchByID(unsigned int id) {
     return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id);
 }
@@ -374,9 +382,8 @@ void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void);
 void fopAcM_riverStream__FP4cXyzPsPff(void);
 void fopAcM_carryOffRevise__FP10fopAc_ac_c(void);
 void fopAcM_searchFromName4Event__FPCcs(void);
-void fopAcM_GetName__FPv(void);                  // mostly inlined
-void fopAcM_GetID__FPCv(void);                   // mostly inlined
-static void fopAcM_GetParam__FPCv(void const*);  // mostly inlined
+void fopAcM_GetName__FPv(void);  // mostly inlined
+void fopAcM_GetID__FPCv(void);   // mostly inlined
 }
 
 #endif