mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-22 17:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup event stuff (#2688)

Browse Source 
* cleanup event stuff

* fix debug
This commit is contained in:
TakaRikka
2025-09-23 04:20:38 -07:00
committed by GitHub
parent 47abdf82fa
commit 125f2325a5
20 changed files with 2843 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+48 -49
View File
@@ -3504,18 +3504,18 @@ inline s16 dComIfGp_getItemMaxBombNumCount() {
return g_dComIfG_gameInfo.play.getItemMaxBombNumCount(fpcNm_ITEM_NORMAL_BOMB);
}
inline BOOL dComIfGp_event_compulsory(void* param_0, const char* param_1, u16 param_2) {
return g_dComIfG_gameInfo.play.getEvent().compulsory(param_0, param_1, param_2);
inline BOOL dComIfGp_event_compulsory(void* i_actor, const char* i_eventname, u16 i_hindFlag) {
return g_dComIfG_gameInfo.play.getEvent().compulsory(i_actor, i_eventname, i_hindFlag);
}
inline int dComIfGp_event_moveApproval(void* actor) {
return g_dComIfG_gameInfo.play.getEvent().moveApproval(actor);
inline int dComIfGp_event_moveApproval(void* i_actor) {
return g_dComIfG_gameInfo.play.getEvent().moveApproval(i_actor);
}
inline int dComIfGp_event_order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4,
void* param_5, s16 eventID, u8 infoIdx) {
return g_dComIfG_gameInfo.play.getEvent().order(eventType, priority, flag, param_3, param_4,
param_5, eventID, infoIdx);
inline int dComIfGp_event_order(u16 i_type, u16 i_prio, u16 i_flags, u16 i_hindFlags, void* i_requestActor,
void* i_targetActor, s16 i_eventID, u8 i_mapToolId) {
return g_dComIfG_gameInfo.play.getEvent().order(i_type, i_prio, i_flags, i_hindFlags, i_requestActor,
i_targetActor, i_eventID, i_mapToolId);
}
inline void dComIfGp_event_setGtItm(int i_itemNo) {
@@ -3542,28 +3542,28 @@ inline void dComIfGp_event_offHindFlag(u16 i_flag) {
g_dComIfG_gameInfo.play.getEvent().offHindFlag(i_flag);
}
inline void dComIfGp_evmng_cutEnd(int param_0) {
dComIfGp_getPEvtManager()->cutEnd(param_0);
inline void dComIfGp_evmng_cutEnd(int i_staffId) {
dComIfGp_getPEvtManager()->cutEnd(i_staffId);
}
inline cXyz* dComIfGp_evmng_getGoal() {
return dComIfGp_getPEvtManager()->getGoal();
}
inline BOOL dComIfGp_evmng_startCheck(char const* i_event) {
return g_dComIfG_gameInfo.play.getEvtManager().startCheckOld(i_event);
inline BOOL dComIfGp_evmng_startCheck(char const* i_eventname) {
return g_dComIfG_gameInfo.play.getEvtManager().startCheckOld(i_eventname);
}
inline BOOL dComIfGp_evmng_startCheck(s16 i_eventId) {
return g_dComIfG_gameInfo.play.getEvtManager().startCheck(i_eventId);
}
inline BOOL dComIfGp_evmng_endCheck(const char* event) {
return g_dComIfG_gameInfo.play.getEvtManager().endCheckOld(event);
inline BOOL dComIfGp_evmng_endCheck(const char* i_eventname) {
return g_dComIfG_gameInfo.play.getEvtManager().endCheckOld(i_eventname);
}
inline BOOL dComIfGp_evmng_endCheck(s16 eventID) {
return g_dComIfG_gameInfo.play.getEvtManager().endCheck(eventID);
inline BOOL dComIfGp_evmng_endCheck(s16 i_eventID) {
return g_dComIfG_gameInfo.play.getEvtManager().endCheck(i_eventID);
}
inline int dComIfGp_evmng_cameraPlay() {
@@ -3574,20 +3574,20 @@ inline u8 dComIfGp_event_getPreItemNo() {
return g_dComIfG_gameInfo.play.getEvent().getPreItemNo();
}
inline void dComIfGp_event_setItemPartner(void* param_0) {
g_dComIfG_gameInfo.play.getEvent().setPtI(param_0);
inline void dComIfGp_event_setItemPartner(void* i_actor) {
g_dComIfG_gameInfo.play.getEvent().setPtI(i_actor);
}
inline void dComIfGp_event_setItemPartnerId(fpc_ProcID id) {
g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
inline void dComIfGp_event_setItemPartnerId(fpc_ProcID i_id) {
g_dComIfG_gameInfo.play.getEvent().setPtI_Id(i_id);
}
inline u8 dComIfGp_event_getGtItm() {
return g_dComIfG_gameInfo.play.getEvent().getGtItm();
}
inline int dComIfGp_evmng_startDemo(int param_0) {
return dComIfGp_getPEvtManager()->setStartDemo(param_0);
inline int dComIfGp_evmng_startDemo(int i_mapToolId) {
return dComIfGp_getPEvtManager()->setStartDemo(i_mapToolId);
}
inline void dComIfGp_event_setTalkPartner(void* i_actor) {
@@ -3618,23 +3618,23 @@ inline f32 dComIfGp_event_getCullRate() {
return g_dComIfG_gameInfo.play.getEvent().getCullRate();
}
inline u16 dComIfGp_event_checkHind(u16 flag) {
inline u16 dComIfGp_event_checkHind(u16 i_hindFlag) {
if (!dComIfGp_event_runCheck()) {
return false;
}
return g_dComIfG_gameInfo.play.getEvent().checkHind(flag);
return g_dComIfG_gameInfo.play.getEvent().checkHind(i_hindFlag);
}
inline u16 dComIfGp_event_chkEventFlag(u16 flag) {
return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(flag);
inline u16 dComIfGp_event_chkEventFlag(u16 i_flag) {
return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(i_flag);
}
inline BOOL dComIfGp_event_chkTalkXY() {
return g_dComIfG_gameInfo.play.getEvent().chkTalkXY();
}
inline void dComIfGp_event_setCullRate(f32 f) {
g_dComIfG_gameInfo.play.getEvent().setCullRate(f);
inline void dComIfGp_event_setCullRate(f32 i_rate) {
g_dComIfG_gameInfo.play.getEvent().setCullRate(i_rate);
}
inline u8 dComIfGp_event_getMode() {
@@ -3645,41 +3645,40 @@ inline fopAc_ac_c* dComIfGp_event_getDoorPartner() {
return g_dComIfG_gameInfo.play.getEvent().getPtD();
}
inline int dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2) {
return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, param_2);
inline int dComIfGp_evmng_getMyStaffId(const char* i_staffname, fopAc_ac_c* i_actor, int i_tagId) {
return dComIfGp_getPEvtManager()->getMyStaffId(i_staffname, i_actor, i_tagId);
}
inline int dComIfGp_evmng_getMyActIdx(int i_staffIdx, char** param_1, int param_2, int param_3,
int param_4) {
return dComIfGp_getPEvtManager()->getMyActIdx(i_staffIdx, param_1, param_2, param_3, param_4);
inline int dComIfGp_evmng_getMyActIdx(int i_staffId, char** i_actions, int i_actionNum, BOOL param_3, BOOL param_4) {
return dComIfGp_getPEvtManager()->getMyActIdx(i_staffId, i_actions, i_actionNum, param_3, param_4);
}
inline int dComIfGp_evmng_getIsAddvance(int param_0) {
return dComIfGp_getPEvtManager()->getIsAddvance(param_0);
inline int dComIfGp_evmng_getIsAddvance(int i_staffId) {
return dComIfGp_getPEvtManager()->getIsAddvance(i_staffId);
}
inline int* dComIfGp_evmng_getMyIntegerP(int index, char* name) {
return (int*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_INT);
inline int* dComIfGp_evmng_getMyIntegerP(int i_staffId, char* i_dataname) {
return (int*)dComIfGp_getPEvtManager()->getMySubstanceP(i_staffId, i_dataname, dEvDtData_c::TYPE_INT);
}
inline char* dComIfGp_evmng_getMyStringP(int index, char* name) {
return (char*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_STRING);
inline char* dComIfGp_evmng_getMyStringP(int i_staffId, char* i_dataname) {
return (char*)dComIfGp_getPEvtManager()->getMySubstanceP(i_staffId, i_dataname, dEvDtData_c::TYPE_STRING);
}
inline f32* dComIfGp_evmng_getMyFloatP(int index, char* name) {
return (f32*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_FLOAT);
inline f32* dComIfGp_evmng_getMyFloatP(int i_staffId, char* i_dataname) {
return (f32*)dComIfGp_getPEvtManager()->getMySubstanceP(i_staffId, i_dataname, dEvDtData_c::TYPE_FLOAT);
}
inline cXyz* dComIfGp_evmng_getMyXyzP(int index, char* name) {
return (cXyz*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_VEC);
inline cXyz* dComIfGp_evmng_getMyXyzP(int i_staffId, char* i_dataname) {
return (cXyz*)dComIfGp_getPEvtManager()->getMySubstanceP(i_staffId, i_dataname, dEvDtData_c::TYPE_VEC);
}
inline int dComIfGp_evmng_getMySubstanceNum(int index, char* name) {
return dComIfGp_getPEvtManager()->getMySubstanceNum(index, name);
inline int dComIfGp_evmng_getMySubstanceNum(int i_staffId, char* i_dataname) {
return dComIfGp_getPEvtManager()->getMySubstanceNum(i_staffId, i_dataname);
}
inline void dComIfGp_evmng_setGoal(cXyz* i_goal) {
dComIfGp_getPEvtManager()->setGoal(i_goal);
inline void dComIfGp_evmng_setGoal(cXyz* i_pos) {
dComIfGp_getPEvtManager()->setGoal(i_pos);
}
inline BOOL dComIfGp_evmng_ChkPresentEnd() {
@@ -3706,9 +3705,9 @@ inline BOOL dComIfGp_evmng_isMapToolCamera(u8 mapToolID) {
return g_dComIfG_gameInfo.play.getEvtManager().isMapToolCamera(mapToolID, -1);
}
inline bool dComIfGp_evmng_existence(const char* event_str) {
inline bool dComIfGp_evmng_existence(const char* eventname) {
return g_dComIfG_gameInfo.play.getEvtManager().getEventData(
dComIfGp_evmng_getEventIdx(event_str, -1)) != NULL;
dComIfGp_evmng_getEventIdx(eventname, 0xFF)) != NULL;
}
inline void dComIfGp_particle_createCommon(const void* data) {
include/d/d_drawlist.h
+1
View File
@@ -439,6 +439,7 @@ public:
void imageDrawShadow(Mtx param_0) { mShadowControl.imageDraw(param_0); }
void drawShadow(Mtx param_0) { mShadowControl.draw(param_0); }
static void wipeOut(f32 i_rate) { wipeIn(-i_rate); }
static void offWipe() { mWipe = 0; }
static f32 getWipeRate() { return mWipeRate; }
include/d/d_event.h
+79 -70
View File
@@ -3,7 +3,10 @@
#include "d/actor/d_a_itembase.h"
int dEv_noFinishSkipProc(void*, int);
int dEv_defaultSkipProc(void* actor, int parameter);
int dEv_defaultSkipZev(void* actor, int parameter);
int dEv_defaultSkipStb(void* actor, int parameter);
int dEv_noFinishSkipProc(void* actor, int parameter);
struct dStage_MapEvent_dt_c;
class fopAc_ac_c;
@@ -16,36 +19,36 @@ public:
/* 0x00 */ u16 mEventType;
/* 0x02 */ u16 mFlag;
/* 0x04 */ u16 mHindFlag;
/* 0x08 */ fopAc_ac_c* mActor1;
/* 0x0C */ fopAc_ac_c* mActor2;
/* 0x08 */ fopAc_ac_c* mpRequestActor;
/* 0x0C */ fopAc_ac_c* mpTargetActor;
/* 0x10 */ s16 mEventId;
/* 0x12 */ u16 mPriority;
/* 0x14 */ s8 mNextOrderIdx;
/* 0x15 */ u8 mEventInfoIdx;
/* 0x15 */ u8 mMapToolId;
}; // Size = 0x18
STATIC_ASSERT(sizeof(dEvt_order_c) == 0x18);
typedef int (*SkipFunc)(void*, int);
typedef int (*dEvt_SkipCb)(void*, int);
enum EventMode {
/* 0x0 */ EVT_MODE_NONE,
/* 0x1 */ EVT_MODE_TALK,
/* 0x2 */ EVT_MODE_DEMO,
/* 0x3 */
enum dEvt_mode_e {
/* 0x0 */ dEvt_mode_WAIT_e,
/* 0x1 */ dEvt_mode_TALK_e,
/* 0x2 */ dEvt_mode_DEMO_e,
/* 0x3 */ dEvt_mode_COMPULSORY_e
};
enum EventType {
/* 0x0 */ EVT_TYPE_TALK,
/* 0x1 */ EVT_TYPE_DOOR,
/* 0x2 */ EVT_TYPE_OTHER,
/* 0x3 */ EVT_TYPE_COMPULSORY,
/* 0x4 */ EVT_TYPE_POTENTIAL,
/* 0x5 */ EVT_TYPE_ITEM,
/* 0x6 */ EVT_TYPE_SHOWITEM_X,
/* 0x7 */ EVT_TYPE_SHOWITEM_Y,
/* 0xA */ EVT_TYPE_CATCH = 10,
/* 0xB */ EVT_TYPE_TREASURE,
enum dEvt_type_e {
/* 0x0 */ dEvt_type_TALK_e,
/* 0x1 */ dEvt_type_DOOR_e,
/* 0x2 */ dEvt_type_OTHER_e,
/* 0x3 */ dEvt_type_COMPULSORY_e,
/* 0x4 */ dEvt_type_POTENTIAL_e,
/* 0x5 */ dEvt_type_ITEM_e,
/* 0x6 */ dEvt_type_SHOWITEM_X_e,
/* 0x7 */ dEvt_type_SHOWITEM_Y_e,
/* 0xA */ dEvt_type_CATCH_e = 10,
/* 0xB */ dEvt_type_TREASURE_e,
};
enum EventStatus {
@@ -55,23 +58,24 @@ enum EventStatus {
class dEvt_control_c {
public:
dEvt_control_c();
s32 orderOld(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, void* param_5,
void const* param_6);
s32 order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, void* param_5,
s16 eventID, u8 infoIdx);
void setParam(dEvt_order_c* p_order);
s32 beforeFlagProc(dEvt_order_c* p_order);
void afterFlagProc(dEvt_order_c* p_order);
int commonCheck(dEvt_order_c* p_order, u16 condition, u16 command);
int talkCheck(dEvt_order_c* p_order);
int talkXyCheck(dEvt_order_c* p_order);
int catchCheck(dEvt_order_c* p_order);
s32 orderOld(u16 type, u16 prio, u16 flag, u16 hind, void* requestActor,
void* targetActor, const void* eventName);
s32 order(u16 type, u16 prio, u16 flag, u16 hind, void* requestActor,
void* targetActor, s16 id, u8 mapToolId);
void setParam(dEvt_order_c* order);
s32 beforeFlagProc(dEvt_order_c* order);
void afterFlagProc(dEvt_order_c* order);
int commonCheck(dEvt_order_c* order, u16 condition, u16 command);
int talkCheck(dEvt_order_c* order);
int talkXyCheck(dEvt_order_c* order);
int catchCheck(dEvt_order_c* order);
int talkEnd();
int demoCheck(dEvt_order_c* p_order);
int demoCheck(dEvt_order_c* order);
int demoEnd();
int potentialCheck(dEvt_order_c* p_order);
int doorCheck(dEvt_order_c* p_order);
int itemCheck(dEvt_order_c* p_order);
int potentialCheck(dEvt_order_c* order);
int doorCheck(dEvt_order_c* order);
int itemCheck(dEvt_order_c* order);
int endProc();
int change();
int entry();
@@ -79,69 +83,79 @@ public:
void reset();
void clearSkipSystem();
char* getSkipEventName();
void setSkipProc(void*, SkipFunc, int);
void setSkipZev(void*, char*);
void setSkipProc(void* skipActor, dEvt_SkipCb skipCb, int skipParameter);
void setSkipZev(void* skipActor, char* eventName);
void onSkipFade();
void offSkipFade();
bool skipper();
int Step();
int moveApproval(void*);
BOOL compulsory(void*, char const*, u16);
BOOL compulsory(void*, const char* eventName, u16 hind);
void remove();
dStage_MapEvent_dt_c* getStageEventDt();
void sceneChange(int exitId);
u32 getPId(void*);
fopAc_ac_c* convPId(fpc_ProcID);
fpc_ProcID getPId(void* actor);
fopAc_ac_c* convPId(fpc_ProcID id);
void* getStbDemoData(char* resName);
static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID, s32 roomNo);
static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID);
s16 runningEventID(s16 eventID);
void setPt1(void* ptr);
void setPt2(void* ptr);
void setPtT(void* ptr);
void setPtI(void* ptr);
void setPt1(void* actor);
void setPt2(void* actor);
void setPtT(void* actor);
void setPtI(void* actor);
void setPtI_Id(fpc_ProcID id);
void setPtD(void* ptr);
void setPtD(void* actor);
void setGtItm(u8 itemNo);
u16 chkFlag2(u16 flag) { return flag & mFlag2; }
BOOL runCheck() {
#if DEBUG
#if DEBUG
return mEventStatus != 0 || mDebugStb != 0;
#else
#else
return mEventStatus != 0;
#endif
#endif
}
f32 getCullRate() { return mCullRate; }
void setCullRate(f32 rate) { mCullRate = rate; }
u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
void onEventFlag(u16 flag) { mEventFlag |= flag; }
void offEventFlag(u16 flag) { mEventFlag &= ~flag; }
u8 getMode() const { return mMode; }
void onHindFlag(u16 flag) { mHindFlag |= flag; }
void offHindFlag(u16 flag) { mHindFlag &= ~flag; }
u16 checkHind(u16 flag) { return flag & mHindFlag; }
u8 checkCompulsory() { return mCompulsory; }
u8 getMapToolId() { return mMapToolId; }
void onFlag2(u16 flag) { mFlag2 |= flag; }
void offFlag2(u16 flag) { mFlag2 &= ~flag; }
void setCullRate(f32 f) { mCullRate = f; }
BOOL chkTalkXY() { return field_0xed == 1 || field_0xed == 2; }
BOOL chkTalkXY() { return mTalkXyType == 1 || mTalkXyType == 2; }
BOOL isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; }
fopAc_ac_c* getPt1() { return convPId(mPt1); }
fopAc_ac_c* getPt2() { return convPId(mPt2); }
fopAc_ac_c* getPtT() { return convPId(mPtT); }
fopAc_ac_c* getPtI() { return convPId(mPtI); }
fopAc_ac_c* getPtD() { return convPId(mPtd); }
bool isChangeOK(void* param_0) { return mChangeOK == param_0; }
bool isChangeOK(void* actor) { return mChangeActor == actor; }
u8 getPreItemNo() { return mPreItemNo; }
u8 getGtItm() { return mGtItm; }
void startCheckSkipEdge(void* param_0) { setSkipProc(param_0, dEv_noFinishSkipProc, 0); }
void startCheckSkipEdge(void* actor) { setSkipProc(actor, dEv_noFinishSkipProc, 0); }
bool checkSkipEdge() { return chkFlag2(8) != false; }
void setDebugStb(u8 stb) { mDebugStb = stb; }
public:
/* 0x000 */ u8 field_0x0[4];
/* 0x000 */ u8 unk_0x0[4];
/* 0x004 */ dEvt_order_c mOrder[8];
/* 0x0C4 */ fpc_ProcID mPt1;
/* 0x0C8 */ fpc_ProcID mPt2;
@@ -151,31 +165,31 @@ public:
/* 0x0D8 */ u16 mEventFlag;
/* 0x0DA */ u16 mFlag2;
/* 0x0DC */ u16 mHindFlag;
/* 0x0DE */ s16 mSpecifiedEvent; // name maybe wrong
/* 0x0E0 */ s16 mEventID;
/* 0x0DE */ s16 mEventId;
/* 0x0E0 */ s16 mUnkEventId; // unknown purpose
/* 0x0E2 */ s8 mNum;
/* 0x0E3 */ s8 mOrderIdx;
/* 0x0E4 */ u8 mMode;
/* 0x0E5 */ u8 mEventStatus;
/* 0x0E6 */ u8 field_0xe6;
/* 0x0E7 */ u8 field_0xe7;
/* 0x0E8 */ u8 field_0xe8;
/* 0x0E8 */ s8 field_0xe8;
/* 0x0E9 */ u8 mDebugStb;
/* 0x0EA */ u8 field_0xea;
/* 0x0EB */ u8 mMapToolId;
/* 0x0EC */ u8 field_0xec;
/* 0x0ED */ u8 field_0xed;
/* 0x0ED */ u8 mTalkXyType;
/* 0x0EE */ u8 mPreItemNo;
/* 0x0EF */ u8 mGtItm;
/* 0x0F0 */ f32 mCullRate;
/* 0x0F4 */ dStage_MapEvent_dt_c* mStageEventDt;
/* 0x0F8 */ void* mChangeOK;
/* 0x0FC */ u8 field_0xfc[4];
/* 0x100 */ SkipFunc mSkipFunc;
/* 0x104 */ u32 field_0x104;
/* 0x0F8 */ void* mChangeActor;
/* 0x0FC */ u8 unk_0xfc[4];
/* 0x100 */ dEvt_SkipCb mSkipFunc;
/* 0x104 */ fpc_ProcID mSkipActorId;
/* 0x108 */ int mSkipTimer;
/* 0x10C */ int field_0x10c;
/* 0x110 */ int mSkipFade;
/* 0x10C */ int mSkipParameter;
/* 0x110 */ BOOL mIsSkipFade;
/* 0x114 */ char mSkipEventName[20];
/* 0x128 */ u8 mCompulsory;
/* 0x129 */ bool mRoomInfoSet;
@@ -183,11 +197,6 @@ public:
#if PLATFORM_WII || PLATFORM_SHIELD
/* 0x130 */ u8 field_0x130;
#endif
}; // Size = 0x130
int dEv_defaultSkipProc(void* param_0, int param_1);
int dEv_defaultSkipZev(void* param_0, int param_1);
int dEv_defaultSkipStb(void* param_0, int param_1);
int dEv_noFinishSkipProc(void* param_0, int param_1);
};
#endif /* D_EVENT_D_EVENT_H */
include/d/d_event_data.h
+19 -9
View File
@@ -2,6 +2,7 @@
#define D_EVENT_D_EVENT_DATA_H
#include "global.h"
#include "f_pc/f_pc_base.h"
class msg_class;
@@ -23,6 +24,11 @@ struct event_binary_data_header {
/* 0x38 */ u8 unk[8];
}; // Size: 0x40
enum dEvDt_State_e {
dEvDt_State_START_e = 1,
dEvDt_State_END_e,
};
class dEvDtData_c {
public:
enum DataType {
@@ -56,6 +62,7 @@ public:
char* getName() { return mName; }
int getNext() { return mNext; }
int getStartFlag(int idx) { return mFlags[idx]; }
u32 getTagId() { return mTagID; }
private:
/* 0x00 */ char mName[32];
@@ -85,11 +92,13 @@ public:
};
struct StaffWork {
unsigned int _0;
msg_class* mLMsg;
unsigned int mMsgNo;
s32 mMsgSubstanceNum;
int* mMsgSubstanceP;
fpc_ProcID l_msgId;
msg_class* l_msg;
u32 l_msgNo;
struct {
int n; // substance num
int* d; // data
} msgs;
};
struct MessageData {
@@ -131,13 +140,13 @@ public:
int getType() { return mType; }
char* getName() { return mName; }
s32 getTagID() { return mTagID; }
int getCurrentCut() { return mCurrentCut; }
int getStartCut() { return mStartCut; }
// private:
/* 0x00 */ char mName[8];
/* 0x08 */ StaffWork mWork;
/* 0x0C */ u8 field_0x1C[0x20 - 0x1C];
/* 0x08 */ u8 mWork[0x18];
/* 0x20 */ s32 mTagID;
/* 0x24 */ u32 mIndex;
/* 0x28 */ u32 mFlagID;
@@ -172,7 +181,7 @@ public:
/* 0x7C */ int mNStaff;
/* 0x80 */ u8 field_0x80[4];
/* 0x84 */ int field_0x84;
/* 0x88 */ int field_0x88[3];
/* 0x88 */ int mFlags[3];
/* 0x94 */ bool mPlaySound;
/* 0x95 */ u8 field_0x95[0xF];
/* 0xA4 */ int mEventState;
@@ -187,7 +196,7 @@ public:
BOOL flagMaxCheck(int flag);
void init();
#define FlagMax 0x2800
static const int FlagMax = 0x2800;
private:
u32 mFlags[320];
@@ -204,6 +213,7 @@ public:
event_binary_data_header* getHeaderP() { return mHeaderP; }
dEvDtStaff_c* getStaffP(int i) { return &mStaffP[i]; }
dEvDtStaff_c* getStaffP() { return mStaffP; }
dEvDtEvent_c* getEventP(int i) { return &mEventP[i]; }
dEvDtEvent_c* getEventP() { return mEventP; }
dEvDtData_c* getDataP(int i) { return &mDataP[i]; }
include/d/d_event_debug.h
+5 -4
View File
@@ -41,9 +41,10 @@ struct dEvDb_flag_base_c {
struct dEvM_play_HIO_c : public JORReflexible {
dEvM_play_HIO_c();
~dEvM_play_HIO_c() {}
/* 0x04 */ s16 mTargetEvent;
/* 0x06 */ s16 field_0x6;
/* 0x06 */ s16 mEventIdx;
/* 0x08 */ s16 mEventCameraMode;
/* 0x0A */ s16 field_0xA;
@@ -70,7 +71,7 @@ STATIC_ASSERT(sizeof(dEvM_play_HIO_c) == 0xC);
struct dEvM_reg_HIO_c : public JORReflexible {
dEvM_reg_HIO_c();
~dEvM_reg_HIO_c();
~dEvM_reg_HIO_c() {}
/* 0x04 */ dEvDb_flag_base_c* mFlagTables;
/* 0x08 */ u8 field_0x008;
@@ -91,7 +92,7 @@ STATIC_ASSERT(sizeof(dEvM_reg_HIO_c) == 0xC);
struct dEvM_bit_HIO_c : public JORReflexible {
dEvM_bit_HIO_c();
~dEvM_bit_HIO_c();
~dEvM_bit_HIO_c() {}
/* 0x04 */ dEvDb_flag_base_c* mFlagTables;
/* 0x08 */ u8 field_0x008;
@@ -134,7 +135,7 @@ STATIC_ASSERT(sizeof(dEvM_root_reg_HIO_c) == 0x4B8);
struct dEvM_HIO_c : public JORReflexible {
dEvM_HIO_c();
~dEvM_HIO_c();
~dEvM_HIO_c() {}
/* 0x004 */ s8 field_0x004;
/* 0x005 */ u8 m_EVdata_output;
include/d/d_event_manager.h
+77 -61
View File
@@ -3,6 +3,7 @@
#include "SSystem/SComponent/c_xyz.h"
#include "d/d_event_data.h"
#include "d/d_event_debug.h"
class fopAc_ac_c;
@@ -10,105 +11,120 @@ class dEvent_exception_c {
public:
dEvent_exception_c() { mEventInfoIdx = -1; }
void init();
s32 setStartDemo(int mapToolID);
int setStartDemo(int mapToolID);
const char* getEventName();
// private:
/* 0x0 */ s32 mEventInfoIdx;
/* 0x0 */ int mEventInfoIdx;
/* 0x4 */ u8 field_0x4;
/* 0x5 */ u8 field_0x5;
/* 0x6 */ u8 field_0x6;
/* 0x7 */ u8 field_0x7;
/* 0x8 */ s32 mState;
/* 0x8 */ int mState;
};
#define EVT_SE_RIDDLE_A 1
#define EVT_SE_RIDDLE_B 2
#ifdef DEBUG
#define EVENT_LIST_NUM 12
#else
#define EVENT_LIST_NUM 11
#endif
class dEvent_manager_c {
public:
void* getSubstance(dEvDtData_c* p_data, int type);
void setDbgData(const char*);
public:
enum {
BASE_NULL,
BASE_KEEP,
BASE_ACTOR,
BASE_STAGE,
BASE_ROOM0,
BASE_ROOM1,
BASE_ROOM2,
BASE_ROOM3,
BASE_ROOM4,
BASE_ROOM5,
BASE_DEMO,
#if DEBUG
BASE_DEBUG,
#endif
BASE_MAX,
};
void* getSubstance(dEvDtData_c* evData, int type);
void setDbgData(const char* srcData);
dEvent_manager_c();
~dEvent_manager_c() {}
int create();
bool setObjectArchive(char* arcName);
bool setObjectArchive(char* arcname);
void demoInit();
void roomInit(int roomNo);
void roomFinish(int roomNo);
int orderStartDemo();
void remove();
void startProc(dEvDtEvent_c* p_evnt);
void closeProc(dEvDtEvent_c* p_evnt);
void endProc(s16 eventID, int close);
void startProc(dEvDtEvent_c* event);
void closeProc(dEvDtEvent_c* event);
void endProc(s16 evId, BOOL isClose);
void Sequencer();
void Experts();
dEvDtEvent_c* getEventData(s16 eventCompositId);
dEvDtEvent_c* getEventData(s16, int);
s16 getEventIdx(char const* eventName, u8 mapToolID, s32 roomNo);
s16 getEventIdx(fopAc_ac_c* pActor, u8 mapToolID);
s16 getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 mapToolID);
dEvDtEvent_c* getEventData(s16 evCompositId);
dEvDtEvent_c* getEventData(s16 evIdx, int evType);
s16 getEventIdx(const char* eventName, u8 mapToolID, s32 roomNo);
s16 getEventIdx(fopAc_ac_c* actor, u8 mapToolID);
s16 getEventIdx(fopAc_ac_c* actor, const char* eventName, u8 mapToolID);
int isMapToolCamera(u8 mapToolID, s32 roomNo);
int order(s16 eventCompositId);
int startCheck(s16 eventCompositId);
int startCheckOld(char const* name);
int endCheck(s16);
int endCheckOld(char const* name);
int getMyStaffId(char const* staffName, fopAc_ac_c* pActor, int tagId);
int getIsAddvance(int staffIdx);
int getMyActIdx(int staffIdx, char const* const* param_1, int param_2, int param_3,
int param_4);
char* getMyNowCutName(int cutIndex);
dEvDtData_c* getMyDataP(int index, char const* name, int type);
void* getMySubstanceP(int index, char const* name, int type);
int getMySubstanceNum(int index, char const* name);
void cutEnd(int cutIndex);
int getEventPrio(fopAc_ac_c* pActor, s16 eventCompositId);
void issueStaff(char const* name);
void cancelStaff(char const* name);
void setGoal(cXyz* p_goal);
int order(s16 evCompositId);
int startCheck(s16 evCompositId);
int startCheckOld(const char* eventname);
int endCheck(s16 eventID);
int endCheckOld(const char* eventname);
int getMyStaffId(const char* staffName, fopAc_ac_c* actor, int tagId);
int getIsAddvance(int staffId);
int getMyActIdx(int staffId, const char* const* action, int n_action, BOOL param_3, BOOL param_4);
char* getMyNowCutName(int staffId);
dEvDtData_c* getMyDataP(int staffId, const char* dataname, BOOL isSeekStart);
void* getMySubstanceP(int staffId, const char* dataname, int datatype);
int getMySubstanceNum(int staffId, const char* dataname);
void cutEnd(int staffId);
int getEventPrio(fopAc_ac_c* actor, s16 evCompositId);
void issueStaff(const char* staffname);
void cancelStaff(const char* staffname);
void setGoal(cXyz* pos);
cXyz* getGoal();
const char* getRunEventName();
fopAc_ac_c* specialCast_Shutter(s16 bsTypeId, int param_1);
fopAc_ac_c* specialCast(char const* name, int param_1);
fopAc_ac_c* specialCast_Shutter(s16 actorName, BOOL param_1);
fopAc_ac_c* specialCast(const char* staffname, BOOL param_1);
int ChkPresentEnd();
int checkStartDemo();
int setStartDemo(int param_0) { return mEventException.setStartDemo(param_0); }
void debugBfProc();
int setStartDemo(int mapToolId) { return mException.setStartDemo(mapToolId); }
void setCameraPlay(int status) { mCameraPlay = status; }
dEvDtBase_c& getBase() { return mEventList[mCurrentEventType]; }
dEvDtBase_c& getBase() { return mEventList[mCurrentEvType]; }
void setFlag(int flag) { mFlags.flagSet(flag); }
bool dataLoaded() { return mDataLoaded; }
int flagCheck(int flag) { return mFlags.flagCheck(flag); }
int cameraPlay() { return mCameraPlay; }
event_binary_data_header* getHeader(u8 idx) {return mEventList[idx].getHeaderP(); }
dEvDtEvent_c* getEventList(u8 idx) { return mEventList[idx].getEventP(); }
event_binary_data_header* getHeader(u8 type) {return mEventList[type].getHeaderP(); }
dEvDtEvent_c* getEventList(u8 type) { return mEventList[type].getEventP(); }
inline static s16 getIndexCompositId(s16 param_0) { return param_0 != -1 ? (s16)(param_0 & 0xff) : (s16)-1; }
static int getTypeCompositId(s16 param_0) { return param_0 == -1 ? 0 : param_0 >> 8; }
dEvDtFlag_c& getFlags() { return mFlags; }
static s16 makeCompositId(s16 a, int b) { return a | (b << 8); }
#if DEBUG
dEvM_HIO_c& getEventHIO();
#endif
private:
/* 0x0000 */ dEvDtBase_c mEventList[EVENT_LIST_NUM];
/* 0x018C */ s32 mCameraPlay;
/* 0x0190 */ dEvent_exception_c mEventException;
/* 0x019C */ cXyz mGoal;
/* 0x01A8 */ u8 field_0x1a8[2];
/* 0x01AA */ s16 mCurrentEventCompositId;
/* 0x01AC */ u8 field_0x1ac[4];
/* 0x01B0 */ int mRoomNo;
/* 0x01B4 */ u32 mCurrentEventType;
/* 0x01B8 */ s32 field_0x1b8;
/* 0x01BC */ dEvDtFlag_c mFlags;
/* 0x06BC */ bool mDataLoaded;
/* 0x000 */ dEvDtBase_c mEventList[BASE_MAX];
/* 0x18C */ int mCameraPlay;
/* 0x190 */ dEvent_exception_c mException;
/* 0x19C */ cXyz mGoal;
/* 0x1A8 */ u8 unk_0x1a8[2];
/* 0x1AA */ s16 mCurrentEvId;
/* 0x1AC */ u8 unk_0x1ac[4];
/* 0x1B0 */ int mRoomNo;
/* 0x1B4 */ int mCurrentEvType;
/* 0x1B8 */ s32 unk_0x1b8;
/* 0x1BC */ dEvDtFlag_c mFlags;
/* 0x6BC */ bool mDataLoaded;
};
#endif /* D_EVENT_D_EVENT_MANAGER_H */
include/d/d_msg_object.h
+2 -2
View File
@@ -537,11 +537,11 @@ inline void dMsgObject_setSelectCursorPos(u8 param_0) {
}
inline u8 dMsgObject_getSelectBombBagID() {
dMsgObject_getMsgObjectClass()->getSelectBombBagID();
return dMsgObject_getMsgObjectClass()->getSelectBombBagID();
}
inline s16 dMsgObject_getSelectBombPrice() {
dMsgObject_getMsgObjectClass()->getSelectBombPrice();
return dMsgObject_getMsgObjectClass()->getSelectBombPrice();
}
inline bool dMsgObject_isMouthCheck() {
include/d/d_stage.h
+33 -10
View File
@@ -378,29 +378,52 @@ struct dStage_DMap_c {
/* 0x04 */ dStage_DMap_dt_c* entries;
};
// REVT
/**
* dStage_MapEvent
* Section Magic: "REVT"
*
* For STB/ZEV events, an event name is specified for data
* For MapTool events, other data is specified instead
*/
// using packing to make sure event_name doesn't get aligned
// field_0x1a / switch_no might be part of maptool data? unsure
#pragma push
#pragma pack(1)
struct dStage_MapEvent_dt_c {
/* 0x00 */ u8 mType;
/* 0x00 */ u8 type;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u8 field_0x2;
/* 0x03 */ u8 field_0x3;
/* 0x04 */ u8 field_0x4;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 mPriority;
/* 0x06 */ u8 priority;
/* 0x07 */ u8 field_0x7;
/* 0x08 */ u8 field_0x8;
/* 0x09 */ u8 field_0x9;
/* 0x0A */ u8 field_0xA;
/* 0x0B */ u8 field_0xB;
/* 0x0C */ u8 field_0xC;
/* 0x0D */ char mName[7];
/* 0x14 */ u16 field_0x14;
/* 0x16 */ u8 field_0x16;
/* 0x17 */ u8 field_0x17;
/* 0x18 */ u8 mSeType; // 1: RIDDLE_A, 2: RIDDLE_B
/* 0x19 */ u8 field_0x19[0x1B - 0x19];
/* 0x1B */ u8 mSwitch;
union {
/* 0x0D */ char event_name[13];
struct {
/* 0x0D */ u8 field_0xd[0x14 - 0xD];
/* 0x14 */ u16 field_0x14;
/* 0x16 */ u8 field_0x16;
/* 0x17 */ u8 field_0x17;
/* 0x18 */ u8 sound_type;
/* 0x19 */ u8 field_0x19;
} maptool;
} data;
/* 0x1A */ u8 field_0x1a;
/* 0x1B */ u8 switch_no;
}; // SIZE = 0x1C
#pragma pop
enum dStage_MapEvent_dt_type {
dStage_MapEvent_dt_TYPE_MAPTOOLCAMERA,
dStage_MapEvent_dt_TYPE_ZEV,
dStage_MapEvent_dt_TYPE_STB,
};
struct dStage_MapEventInfo_c {
/* 0x0 */ int num;
include/f_op/f_op_msg.h
+16
View File
@@ -4,6 +4,22 @@
#include "SSystem/SComponent/c_xyz.h"
#include "f_pc/f_pc_leaf.h"
enum fopMsg_Mode_e {
fopMsg_MODE_MSG_PREPARING_e = 0x01,
fopMsg_MODE_BOX_OPENING_e = 0x02,
fopMsg_MODE_MSG_TYPING_e = 0x06,
fopMsg_MODE_UNK_A_e = 0x0A,
fopMsg_MODE_UNK_B_e = 0x0B,
fopMsg_MODE_UNK_D_e = 0x0D,
fopMsg_MODE_MSG_DISPLAYED_e = 0x0E,
fopMsg_MODE_MSG_CONTINUE_e = 0x0F,
fopMsg_MODE_MSG_END_e = 0x10,
fopMsg_MODE_BOX_CLOSING_e = 0x11,
fopMsg_MODE_BOX_CLOSED_e = 0x12,
fopMsg_MODE_MSG_DESTROYED_e = 0x13,
fopMsg_MODE_UNK15_e = 0x15,
};
class fopAc_ac_c;
class msg_class : public leafdraw_class {
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h
+6 -2
View File
@@ -1,11 +1,15 @@
#ifndef STD_CMATH_H_
#define STD_CMATH_H_
#ifndef STD_CSTRING_H_
#define STD_CSTRING_H_
#include "string.h"
namespace std {
using ::strlen;
using ::strcpy;
inline char* strchr(char* str, int c) {
return ::strchr(str, c);
}
}; // namespace std
#endif
src/d/actor/d_a_tbox.cpp
+1 -1
View File
@@ -1525,7 +1525,7 @@ void daTbox_c::settingDropDemoCamera() {
stage_camera_class* stage_camera = roomdt->getCamera();
stage_camera2_data_class* stage_camera_data = stage_camera->m_entries;
stage_camera_data += maptooldata->field_0x16;
stage_camera_data += maptooldata->data.maptool.field_0x16;
stage_arrow_class* stage_arrow = roomdt->getArrow();
stage_arrow_data_class* stage_arrow_data = stage_arrow->m_entries;
src/d/d_camera.cpp
+2 -2
View File
@@ -9214,9 +9214,9 @@ bool dCamera_c::eventCamera(s32 param_0) {
break;
}
if (mEventData.field_0xec->mType == 0 && (mEventData.field_0xec->field_0xC & 0x80) != 0)
if (mEventData.field_0xec->type == dStage_MapEvent_dt_TYPE_MAPTOOLCAMERA && (mEventData.field_0xec->field_0xC & 0x80) != 0)
{
field_0x8d8.mCameraIndex = mEventData.field_0xec->field_0x16;
field_0x8d8.mCameraIndex = mEventData.field_0xec->data.maptool.field_0x16;
OS_REPORT("camera: event: change default type %d \n", field_0x8d8.mCameraIndex);
}
} else {
src/d/d_ev_camera.cpp
+7 -7
View File
@@ -1892,8 +1892,8 @@ bool dCamera_c::maptoolIdEvCamera() {
mEventData.field_0xec);
int var_r6 = 0xFF;
if (mEventData.field_0xec != NULL && mEventData.field_0xec->mType == 0) {
var_r6 = mEventData.field_0xec->field_0x16;
if (mEventData.field_0xec != NULL && mEventData.field_0xec->type == dStage_MapEvent_dt_TYPE_MAPTOOLCAMERA) {
var_r6 = mEventData.field_0xec->data.maptool.field_0x16;
}
getEvIntData(&mEventData.field_0x24, "CameraID", var_r6);
@@ -1910,7 +1910,7 @@ bool dCamera_c::maptoolIdEvCamera() {
room_no = -1;
}
if (mEventData.field_0xec->mType == 0 && mEventData.field_0xec->field_0xC != 0xFF) {
if (mEventData.field_0xec->type == dStage_MapEvent_dt_TYPE_MAPTOOLCAMERA && mEventData.field_0xec->field_0xC != 0xFF) {
if (mEventData.field_0xec->field_0xC & 1) {
clrFlag(0x200000);
}
@@ -1932,9 +1932,9 @@ bool dCamera_c::maptoolIdEvCamera() {
#endif
bool var_r3 = (this->*engine_tbl[mCamParam.Algorythmn(style)])(style);
if (mEventData.field_0xec->mType == 0) {
if (mEventData.field_0xec->field_0x14 == 0xFF ||
mCurCamStyleTimer > mEventData.field_0xec->field_0x14)
if (mEventData.field_0xec->type == dStage_MapEvent_dt_TYPE_MAPTOOLCAMERA) {
if (mEventData.field_0xec->data.maptool.field_0x14 == 0xFF ||
mCurCamStyleTimer > mEventData.field_0xec->data.maptool.field_0x14)
{
var_r31 = true;
}
@@ -1947,7 +1947,7 @@ bool dCamera_c::maptoolIdEvCamera() {
}
if (var_r31) {
if (mEventData.field_0xec->mType == 0 && (mEventData.field_0xec->field_0xC & 0x20)) {
if (mEventData.field_0xec->type == dStage_MapEvent_dt_TYPE_MAPTOOLCAMERA && (mEventData.field_0xec->field_0xC & 0x20)) {
return mDoCPd_c::getHoldA(mPadID) || mDoCPd_c::getHoldB(mPadID);
}
return true;
src/d/d_event.cpp
+589 -317
View File
File diff suppressed because it is too large Load Diff
src/d/d_event_data.cpp
+877 -512
View File
File diff suppressed because it is too large Load Diff
src/d/d_event_debug.cpp
+156 -173
View File
@@ -5,12 +5,8 @@
#include "JSystem/JHostIO/JORFile.h"
#include "JSystem/JHostIO/JORMContext.h"
#include "JSystem/JHostIO/JORReflexible.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_event_data.h"
#include "m_Do/m_Do_controller_pad.h"
#include "os.h"
static dEvDb_bit_c dEvDb_flag_bit_table[799] = {
#include "d/d_event_debug_bit_table.inc"
@@ -55,7 +51,7 @@ dEvM_HIO_c::dEvM_HIO_c() {
m_evd_unfinished = false;
m_prioritize_file = false;
if(mDoCPd_c::getHoldL(PAD_2))
if (mDoCPd_c::getHoldL(PAD_2))
m_prioritize_file = true;
m_enable_skip = false;
@@ -74,79 +70,79 @@ dEvM_HIO_c::dEvM_HIO_c() {
m_temp_reg.mFlagTables = &dEvDb_flag_base_table_tmp;
}
void dEvM_HIO_c::genMessage(JORMContext* ctx) {
ctx->genLabel("- ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
void dEvM_HIO_c::genMessage(JORMContext* mctx) {
mctx->genLabel("- ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
/* "- Event Manager Testing" */
ctx->genLabel("- イベントマネージャーテスト用", LBL_EVENT_MANAGER_TESTING, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel("- イベントマネージャーテスト用", LBL_EVENT_MANAGER_TESTING, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "Playback test"
ctx->genNode("再生テスト", &m_playtest, 0, 0);
mctx->genNode("再生テスト", &m_playtest, 0, 0);
// "Save B"
ctx->genNode("セーブＢ", &m_save_bit, 0, 0);
mctx->genNode("セーブＢ", &m_save_bit, 0, 0);
// "Temporary B"
ctx->genNode("一時Ｂ", &m_temp_bit, 0, 0);
mctx->genNode("一時Ｂ", &m_temp_bit, 0, 0);
// "Save R"
ctx->genNode("セーブＲ", &m_save_reg, 0, 0);
mctx->genNode("セーブＲ", &m_save_reg, 0, 0);
// "Temporary R"
ctx->genNode("一時Ｒ", &m_temp_reg, 0, 0);
mctx->genNode("一時Ｒ", &m_temp_reg, 0, 0);
// "Read"
ctx->genButton("読み込み", BTN_READ, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genButton("読み込み", BTN_READ, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "evM Debug"
ctx->genCheckBox("evM デバック", &m_evm_debug, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genCheckBox("evM デバック", &m_evm_debug, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "evD Debug"
ctx->genCheckBox("evD デバック", &m_evd_debug, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genCheckBox("evD デバック", &m_evd_debug, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "eve Debug"
ctx->genCheckBox("eve デバック", &m_eve_debug, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genCheckBox("eve デバック", &m_eve_debug, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "EV data output"
ctx->genCheckBox("ＥＶデータ出力", &m_EVdata_output, 1, 0, NULL , 0xffff, 0xffff, 0x200, 0x18);
mctx->genCheckBox("ＥＶデータ出力", &m_EVdata_output, 1, 0, NULL , 0xffff, 0xffff, 0x200, 0x18);
// "evD unfinished"
ctx->genCheckBox("evD 未終了", &m_evd_unfinished, 1, 0, NULL, 0xffff , 0xffff, 0x200, 0x18);
mctx->genCheckBox("evD 未終了", &m_evd_unfinished, 1, 0, NULL, 0xffff , 0xffff, 0x200, 0x18);
// "Scene switching prohibited"
ctx->genCheckBox("シーン切替禁止", &m_prevent_scene_switch, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genCheckBox("シーン切替禁止", &m_prevent_scene_switch, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genLabel("- ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel("- ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
/* "- Map Tool Data" */
ctx->genLabel("- マップツールデータ", 0, 0, NULL, 0xffff, 0xffff, 0x200 , 0x18);
mctx->genLabel("- マップツールデータ", 0, 0, NULL, 0xffff, 0xffff, 0x200 , 0x18);
// "Corrective Sound Adjustment"
ctx->genSlider("　正解音調整",&m_corrective_sound_adjustment, -200, 200, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genSlider("　正解音調整",&m_corrective_sound_adjustment, -200, 200, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genLabel("- ",0,0,NULL,0xffff,0xffff,0x200,0x18);
mctx->genLabel("- ",0,0,NULL,0xffff,0xffff,0x200,0x18);
/* "- Event Data" */
ctx->genLabel("- イベントデータ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel("- イベントデータ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "Continuously prioritize"
ctx->genCheckBox("常駐優先", &m_prioritize_file, 1, 0, NULL, 0xffff , 0xffff, 0x200, 0x18);
mctx->genCheckBox("常駐優先", &m_prioritize_file, 1, 0, NULL, 0xffff , 0xffff, 0x200, 0x18);
/* "- Apply then Reset" */
ctx->genLabel("- つけてから要リセット", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel("- つけてから要リセット", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "Skip enabled"
ctx->genCheckBox("スキップ有効", &m_enable_skip, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genCheckBox("スキップ有効", &m_enable_skip, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genLabel("- ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genLabel("- ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel("- ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel("- ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "Forced termination"
ctx->genButton("強制終了", BTN_FORCED_TERMINATION, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genButton("強制終了", BTN_FORCED_TERMINATION, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
}
void dEvM_HIO_c::listenPropertyEvent(const JORPropertyEvent* param_0) {
@@ -155,72 +151,72 @@ void dEvM_HIO_c::listenPropertyEvent(const JORPropertyEvent* param_0) {
JORReflexible::listenPropertyEvent(param_0);
switch(reinterpret_cast<u32>(param_0->id)) {
case BTN_READ:
if(!debug_data) {
// "Fly? Soar?" or maybe something along the lines of "Order change?", not entirely sure of translation...
OS_REPORT("飛ぶか？そるか？\n");
debug_data = static_cast<char*>(JKRAlloc(0x32000,0));
}
switch (reinterpret_cast<u32>(param_0->id)) {
case BTN_READ:
if(!debug_data) {
// "Fly? Soar?" or maybe something along the lines of "Order change?", not entirely sure of translation...
OS_REPORT("飛ぶか？そるか？\n");
debug_data = static_cast<char*>(JKRAlloc(0x32000,0));
}
// "Event data (*.dat)"
// Extra null terminators & *.dat needed for .data section to match??
// Maybe the result of some kind of macro for formatting extension masks?
if(debug_data && eventDataFile.open(1, "イベントデータ(*.dat)\0*.dat\0\0\0", NULL, NULL, NULL)) {
eventDataFile.readData(debug_data, 0);
eventDataFile.close();
// "Event data (*.dat)"
// Extra null terminators & *.dat needed for .data section to match??
// Maybe the result of some kind of macro for formatting extension masks?
if (debug_data && eventDataFile.open(1, "イベントデータ(*.dat)\0*.dat\0\0\0", NULL, NULL, NULL)) {
eventDataFile.readData(debug_data, 0);
eventDataFile.close();
// Update available events
m_playtest.removeComboBox();
dComIfGp_getPEvtManager()->setDbgData(debug_data);
m_playtest.addComboBox();
}
break;
case BTN_READ + 1:
break;
case BTN_FORCED_TERMINATION:
// "Forced termination" button
dComIfGp_getEvent().reset();
break;
// Update available events
m_playtest.removeComboBox();
dComIfGp_getPEvtManager()->setDbgData(debug_data);
m_playtest.addComboBox();
}
break;
case BTN_READ + 1:
break;
case BTN_FORCED_TERMINATION:
// "Forced termination" button
dComIfGp_getEvent().reset();
break;
}
}
bool dEvM_HIO_c::setDebugCameraData(void* buffer) {
if(m_playtest.mEventCameraMode != dEvM_play_HIO_c::UNSET)
if (m_playtest.mEventCameraMode != dEvM_play_HIO_c::UNSET)
return false;
if(dComIfGp_event_runCheck())
if (dComIfGp_event_runCheck())
return false;
dComIfGp_getPEvtManager()->setDbgData(static_cast<const char*>(buffer));
m_playtest.mTargetEvent = 0;
m_playtest.field_0x6 = 0;
m_playtest.mEventIdx = 0;
m_playtest.mEventCameraMode = dEvM_play_HIO_c::PLAYBACK;
m_playtest.field_0xA = 0;
return true;
}
void dEvM_root_bit_HIO_c::genMessage(JORMContext* ctx) {
void dEvM_root_bit_HIO_c::genMessage(JORMContext* mctx) {
u8 i = 0;
for(; i < ARRAY_SIZEU(mBit) && i < mFlagTables->mNumRootBits; i++) {
for (; i < ARRAY_SIZEU(mBit) && i < mFlagTables->mNumRootBits; i++) {
mBit[i].mFlagTables = mFlagTables;
mBit[i].mRootBitIdx = i;
if(mFlagTables->searchDirNameBit(i))
ctx->genNode(mFlagTables->searchDirNameBit(i), &mBit[i], 0, 0);
if (mFlagTables->searchDirNameBit(i))
mctx->genNode(mFlagTables->searchDirNameBit(i), &mBit[i], 0, 0);
}
}
void dEvM_root_reg_HIO_c::genMessage(JORMContext* ctx) {
void dEvM_root_reg_HIO_c::genMessage(JORMContext* mctx) {
u8 i = 0;
for(; i < ARRAY_SIZEU(mReg) && i < mFlagTables->mNumRootRegs; i++) {
for (; i < ARRAY_SIZEU(mReg) && i < mFlagTables->mNumRootRegs; i++) {
mReg[i].mFlagTables = mFlagTables;
mReg[i].mRootRegIdx = i;
if(mFlagTables->searchDirNameReg(i))
ctx->genNode(mFlagTables->searchDirNameReg(i), &mReg[i], 0, 0);
if (mFlagTables->searchDirNameReg(i))
mctx->genNode(mFlagTables->searchDirNameReg(i), &mReg[i], 0, 0);
}
}
@@ -229,87 +225,84 @@ const char* non_text = "無し";
dEvM_play_HIO_c::dEvM_play_HIO_c() {
mTargetEvent = 0;
field_0x6 = 0;
mEventIdx = 0;
mEventCameraMode = UNSET;
field_0xA = 0;
}
void dEvM_play_HIO_c::genMessage(JORMContext* ctx) {
void dEvM_play_HIO_c::genMessage(JORMContext* mctx) {
event_binary_data_header* const header = dComIfGp_getPEvtManager()->getHeader(1);
dEvDtEvent_c* const list = dComIfGp_getPEvtManager()->getEventList(1);
/* "Event Playback Test" */
ctx->genLabel("イベントの再生テスト", LBL_EVENT_PLAYBACK_TESTING, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel("イベントの再生テスト", LBL_EVENT_PLAYBACK_TESTING, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "Playback"
ctx->genButton("再生", BTN_PLAYBACK, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genButton("再生", BTN_PLAYBACK, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "Stop"
ctx->genButton("停止", BTN_STOP, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genButton("停止", BTN_STOP, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "Target event"
ctx->startComboBox("対象イベント", &mTargetEvent, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a);
mctx->startComboBox("対象イベント", &mTargetEvent, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a);
int i;
if(!header) {
ctx->genComboBoxItem(non_text,0);
}
else {
for(i = 0; i < header->eventNum; i++) {
ctx->genComboBoxItem(list[i].getName(), i);
if (!header) {
mctx->genComboBoxItem(non_text,0);
} else {
for (i = 0; i < header->eventNum; i++) {
mctx->genComboBoxItem(list[i].getName(), i);
}
}
ctx->endComboBox();
mctx->endComboBox();
}
void dEvM_play_HIO_c::listenPropertyEvent(const JORPropertyEvent* param_0) {
JORReflexible::listenPropertyEvent(param_0);
mEventCameraMode = UNSET;
switch(reinterpret_cast<u32>(param_0->id)) {
case BTN_PLAYBACK:
mEventCameraMode = PLAYBACK;
break;
case BTN_STOP:
mEventCameraMode = STOP;
break;
switch (reinterpret_cast<u32>(param_0->id)) {
case BTN_PLAYBACK:
mEventCameraMode = PLAYBACK;
break;
case BTN_STOP:
mEventCameraMode = STOP;
break;
}
}
void dEvM_play_HIO_c::removeComboBox() {
// Empty function
}
void dEvM_play_HIO_c::removeComboBox() {}
void dEvM_play_HIO_c::addComboBox() {
JORMContext* ctx = attachJORMContext(5);
ctx->invalidNode(this, 3);
releaseJORMContext(ctx);
JORMContext* mctx = attachJORMContext(5);
mctx->invalidNode(this, 3);
releaseJORMContext(mctx);
}
dEvM_bit_HIO_c::dEvM_bit_HIO_c() {
field_0x008 = 0;
}
void dEvM_bit_HIO_c::genMessage(JORMContext* ctx) {
void dEvM_bit_HIO_c::genMessage(JORMContext* mctx) {
/* "----Event Save Bit---" */
ctx->genLabel("----イベント セーブビット---", LBL_EVENT_SAVE_BIT, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel("----イベント セーブビット---", LBL_EVENT_SAVE_BIT, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "Update"
ctx->genButton("更新", BTN_UPDATE, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genButton("更新", BTN_UPDATE, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
int i = 0;
u32 labelPosY = 0;
int unused = labelPosY;
for(; i < mFlagTables->mTotalBitNum; i++) {
if(mRootBitIdx == mFlagTables->mBitTable[i].mRootBit) {
if(mFlagTables == &dEvDb_flag_base_table)
for (; i < mFlagTables->mTotalBitNum; i++) {
if (mRootBitIdx == mFlagTables->mBitTable[i].mRootBit) {
if (mFlagTables == &dEvDb_flag_base_table)
mFlagTables->mBitTable[i].mIsSet = dComIfGs_isEventBit(mFlagTables->mBitTable[i].mFlagValue);
else
mFlagTables->mBitTable[i].mIsSet = dComIfGs_isTmpBit(mFlagTables->mBitTable[i].mFlagValue);
ctx->genCheckBox(mFlagTables->mBitTable[i].mFlagName, &mFlagTables->mBitTable[i].mIsSet, 1, 0, NULL, 0xffff, 0xffff, 0xfa, 0x18);
ctx->genLabel(mFlagTables->mBitTable[i].mFlagDescription, i + (1 << 31) + (1 << 1), 0, NULL, 0x100, labelPosY * 25 + 50, 0x200, 0x18);
mctx->genCheckBox(mFlagTables->mBitTable[i].mFlagName, &mFlagTables->mBitTable[i].mIsSet, 1, 0, NULL, 0xffff, 0xffff, 0xfa, 0x18);
mctx->genLabel(mFlagTables->mBitTable[i].mFlagDescription, i + (1 << 31) + (1 << 1), 0, NULL, 0x100, labelPosY * 25 + 50, 0x200, 0x18);
labelPosY++;
}
@@ -320,134 +313,125 @@ void dEvM_bit_HIO_c::listenPropertyEvent(const JORPropertyEvent* param_0) {
int i;
JORReflexible::listenPropertyEvent(param_0);
switch(reinterpret_cast<u32>(param_0->id)) {
case BTN_UPDATE:
update();
case BTN_UPDATE + 1:
break;
default:
for(i = 0; i < mFlagTables->mTotalBitNum; i++) {
if(mRootBitIdx == mFlagTables->mBitTable[i].mRootBit && param_0->id == reinterpret_cast<char*>(&mFlagTables->mBitTable[i].mIsSet)) {
if(mFlagTables == &dEvDb_flag_base_table) {
if(mFlagTables->mBitTable[i].mIsSet)
dComIfGs_onEventBit(mFlagTables->mBitTable[i].mFlagValue);
else
dComIfGs_offEventBit(mFlagTables->mBitTable[i].mFlagValue);
}
else if(mFlagTables->mBitTable[i].mIsSet) {
dComIfGs_onTmpBit(mFlagTables->mBitTable[i].mFlagValue);
}
else {
dComIfGs_offTmpBit(mFlagTables->mBitTable[i].mFlagValue);
}
switch (reinterpret_cast<u32>(param_0->id)) {
case BTN_UPDATE:
update();
case BTN_UPDATE + 1:
break;
default:
for (i = 0; i < mFlagTables->mTotalBitNum; i++) {
if (mRootBitIdx == mFlagTables->mBitTable[i].mRootBit && param_0->id == reinterpret_cast<char*>(&mFlagTables->mBitTable[i].mIsSet)) {
if (mFlagTables == &dEvDb_flag_base_table) {
if (mFlagTables->mBitTable[i].mIsSet)
dComIfGs_onEventBit(mFlagTables->mBitTable[i].mFlagValue);
else
dComIfGs_offEventBit(mFlagTables->mBitTable[i].mFlagValue);
} else if (mFlagTables->mBitTable[i].mIsSet) {
dComIfGs_onTmpBit(mFlagTables->mBitTable[i].mFlagValue);
} else {
dComIfGs_offTmpBit(mFlagTables->mBitTable[i].mFlagValue);
}
}
break;
}
break;
}
}
void dEvM_bit_HIO_c::update() {
JORMContext* context = attachJORMContext(8);
JORMContext* mctx = attachJORMContext(8);
if(mFlagTables->mTotalBitNum > 0)
context->startUpdateNode(this);
if (mFlagTables->mTotalBitNum > 0)
mctx->startUpdateNode(this);
int i = 0;
for(; i < mFlagTables->mTotalBitNum; i++) {
if(mRootBitIdx == mFlagTables->mBitTable[i].mRootBit) {
if(mFlagTables == &dEvDb_flag_base_table)
for (; i < mFlagTables->mTotalBitNum; i++) {
if (mRootBitIdx == mFlagTables->mBitTable[i].mRootBit) {
if (mFlagTables == &dEvDb_flag_base_table)
mFlagTables->mBitTable[i].mIsSet = dComIfGs_isEventBit(mFlagTables->mBitTable[i].mFlagValue);
else
mFlagTables->mBitTable[i].mIsSet = dComIfGs_isTmpBit(mFlagTables->mBitTable[i].mFlagValue);
context->updateCheckBox(2, &mFlagTables->mBitTable[i].mIsSet, 1, 0);
mctx->updateCheckBox(2, &mFlagTables->mBitTable[i].mIsSet, 1, 0);
}
}
releaseJORMContext(context);
releaseJORMContext(mctx);
}
dEvM_reg_HIO_c::dEvM_reg_HIO_c() {
field_0x008 = 0;
}
void dEvM_reg_HIO_c::genMessage(JORMContext* ctx) {
void dEvM_reg_HIO_c::genMessage(JORMContext* mctx) {
/* "----Event Save Register---" */
ctx->genLabel("----イベント セーブレジスター---", LBL_EVENT_SAVE_REGISTER, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel("----イベント セーブレジスター---", LBL_EVENT_SAVE_REGISTER, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// "Update"
ctx->genButton("更新", BTN_UPDATE, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
// Stack non-matching if i is declared in the for loop header and flagVal is declared in loop body
mctx->genButton("更新", BTN_UPDATE, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
int i = 0;
u8 flagVal;
for(; i < mFlagTables->mTotalRegNum; i++) {
if(mRootRegIdx == mFlagTables->mRegTable[i].mRootReg) {
if(mFlagTables == &dEvDb_flag_base_table)
for (; i < mFlagTables->mTotalRegNum; i++) {
if (mRootRegIdx == mFlagTables->mRegTable[i].mRootReg) {
if (mFlagTables == &dEvDb_flag_base_table)
mFlagTables->mRegTable[i].mIsSet = dComIfGs_getEventReg(mFlagTables->mRegTable[i].mFlagValue);
else
mFlagTables->mRegTable[i].mIsSet = dComIfGs_getTmpReg(mFlagTables->mRegTable[i].mFlagValue);
ctx->genLabel(mFlagTables->mRegTable[i].mFlagDescription, 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genLabel(mFlagTables->mRegTable[i].mFlagDescription, 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
flagVal = mFlagTables->mRegTable[i].mFlagValue;
ctx->genSlider(mFlagTables->mRegTable[i].mFlagName, &mFlagTables->mRegTable[i].mIsSet, 0, flagVal, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
mctx->genSlider(mFlagTables->mRegTable[i].mFlagName, &mFlagTables->mRegTable[i].mIsSet, 0, flagVal, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
}
}
}
void dEvM_reg_HIO_c::listenPropertyEvent(const JORPropertyEvent* param_0) {
// Stack non-matching if i is declared in the for loop header
int i;
JORReflexible::listenPropertyEvent(param_0);
switch(reinterpret_cast<u32>(param_0->id)) {
case BTN_UPDATE:
update();
case BTN_UPDATE + 1:
break;
default:
for(i = 0; i < mFlagTables->mTotalRegNum; i++) {
if(mRootRegIdx == mFlagTables->mRegTable[i].mRootReg && param_0->id == reinterpret_cast<char*>(&mFlagTables->mRegTable[i].mIsSet)) {
if(mFlagTables == &dEvDb_flag_base_table)
dComIfGs_setEventReg(mFlagTables->mRegTable[i].mFlagValue, mFlagTables->mRegTable[i].mIsSet);
else
dComIfGs_setTmpReg(mFlagTables->mRegTable[i].mFlagValue, mFlagTables->mRegTable[i].mIsSet);
}
case BTN_UPDATE:
update();
case BTN_UPDATE + 1:
break;
default:
for (i = 0; i < mFlagTables->mTotalRegNum; i++) {
if (mRootRegIdx == mFlagTables->mRegTable[i].mRootReg && param_0->id == reinterpret_cast<char*>(&mFlagTables->mRegTable[i].mIsSet)) {
if (mFlagTables == &dEvDb_flag_base_table)
dComIfGs_setEventReg(mFlagTables->mRegTable[i].mFlagValue, mFlagTables->mRegTable[i].mIsSet);
else
dComIfGs_setTmpReg(mFlagTables->mRegTable[i].mFlagValue, mFlagTables->mRegTable[i].mIsSet);
}
break;
}
break;
}
}
void dEvM_reg_HIO_c::update() {
JORMContext* context = attachJORMContext(8);
JORMContext* mctx = attachJORMContext(8);
if(mFlagTables->mTotalRegNum > 0)
context->startUpdateNode(this);
if (mFlagTables->mTotalRegNum > 0)
mctx->startUpdateNode(this);
// Stack non-matching if i is declared in the for loop header
int i = 0;
for(; i < mFlagTables->mTotalRegNum; i++) {
if(mRootRegIdx == mFlagTables->mRegTable[i].mRootReg) {
if(mFlagTables == &dEvDb_flag_base_table)
for (; i < mFlagTables->mTotalRegNum; i++) {
if (mRootRegIdx == mFlagTables->mRegTable[i].mRootReg) {
if (mFlagTables == &dEvDb_flag_base_table)
mFlagTables->mRegTable[i].mIsSet = dComIfGs_getEventReg(mFlagTables->mRegTable[i].mFlagValue);
else
mFlagTables->mRegTable[i].mIsSet = dComIfGs_getTmpReg(mFlagTables->mRegTable[i].mFlagValue);
context->updateSlider(2, &mFlagTables->mRegTable[i].mIsSet, 0, 0, 0);
mctx->updateSlider(2, &mFlagTables->mRegTable[i].mIsSet, 0, 0, 0);
}
}
releaseJORMContext(context);
releaseJORMContext(mctx);
}
char* dEvDb_flag_base_c::searchDirNameBit(int bit) {
// Stack non-matching if i is declared in the for loop header
int i = 0;
for(; i < mTotalBitNum; i++) {
if(bit == mBitTable[i].mRootBit)
for (; i < mTotalBitNum; i++) {
if (bit == mBitTable[i].mRootBit)
return mBitTable[i].mArea;
}
@@ -455,13 +439,12 @@ char* dEvDb_flag_base_c::searchDirNameBit(int bit) {
}
char* dEvDb_flag_base_c::searchDirNameReg(int bit) {
// Stack non-matching if i is declared in the for loop header
int i = 0;
for(; i < mTotalRegNum; i++) {
if(bit == mRegTable[i].mRootReg)
for (; i < mTotalRegNum; i++) {
if (bit == mRegTable[i].mRootReg)
return mRegTable[i].mArea;
}
return NULL;
}
src/d/d_event_manager.cpp
+906 -477
View File
File diff suppressed because it is too large Load Diff
src/d/d_lib.cpp
+1 -1
View File
@@ -231,7 +231,7 @@ bool STControl::checkDownTrigger() {
u8 dLib_getEventSwitchNo(int param_0) {
dStage_MapEvent_dt_c* mapEvent = dEvt_control_c::searchMapEventData(param_0);
if (mapEvent != NULL) {
return mapEvent->mSwitch;
return mapEvent->switch_no;
}
return 0xff;
}
src/f_op/f_op_actor_mng.cpp
+14 -14
View File
@@ -836,7 +836,7 @@ s32 fopAcM_orderTalkEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio
i_priority = 0x1FF;
}
return dComIfGp_event_order(EVT_TYPE_TALK, i_priority, i_flag, 0x14F, i_actorA, i_actorB, -1,
return dComIfGp_event_order(dEvt_type_TALK_e, i_priority, i_flag, 0x14F, i_actorA, i_actorB, -1,
-1);
}
@@ -870,7 +870,7 @@ s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) {
i_priority = 0x1EA;
}
return dComIfGp_event_order(EVT_TYPE_TALK, i_priority, i_flag, 0x14F, dComIfGp_getPlayer(0),
return dComIfGp_event_order(dEvt_type_TALK_e, i_priority, i_flag, 0x14F, dComIfGp_getPlayer(0),
i_actor, -1, -1);
}
@@ -894,7 +894,7 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio
eventID = dComIfGp_getEventManager().getEventIdx(i_actorA, NULL, toolID);
}
return dComIfGp_event_order(EVT_TYPE_DOOR, i_priority, i_flag, -1, i_actorA, i_actorB, eventID,
return dComIfGp_event_order(dEvt_type_DOOR_e, i_priority, i_flag, -1, i_actorA, i_actorB, eventID,
toolID);
}
@@ -911,7 +911,7 @@ s32 fopAcM_orderCatchEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_pri
i_priority = 2;
}
return dComIfGp_event_order(EVT_TYPE_CATCH, i_priority, i_flag, -1, i_actorA, i_actorB, -1, -1);
return dComIfGp_event_order(dEvt_type_CATCH_e, i_priority, i_flag, -1, i_actorA, i_actorB, -1, -1);
}
/* 8001B3CC-8001B4E0 015D0C 0114+00 0/0 2/2 6/6 .text
@@ -938,7 +938,7 @@ s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actor, char const* i_eventName, u16 par
eventPrio = i_priority;
}
return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, i_flag, param_2, i_actor,
return dComIfGp_event_order(dEvt_type_OTHER_e, eventPrio, i_flag, param_2, i_actor,
event_second_actor(i_flag), eventIdx, -1);
}
@@ -966,7 +966,7 @@ s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, char cons
eventPrio = i_priority;
}
return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, i_flag, param_3, i_actorA, i_actorB,
return dComIfGp_event_order(dEvt_type_OTHER_e, eventPrio, i_flag, param_3, i_actorA, i_actorB,
eventIdx, -1);
}
@@ -978,7 +978,7 @@ s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_actor, s16 i_eventID, u16 i_flag, u1
eventPrio = 0xFF;
}
return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, i_flag | 0x400, param_3, i_actor,
return dComIfGp_event_order(dEvt_type_OTHER_e, eventPrio, i_flag | 0x400, param_3, i_actor,
event_second_actor(i_flag), i_eventID, -1);
}
@@ -1009,12 +1009,12 @@ s32 fopAcM_orderOtherEventId(fopAc_ac_c* i_actor, s16 i_eventID, u8 i_mapToolID,
dStage_MapEvent_dt_c* dt = dEvt_control_c::searchMapEventData(i_mapToolID, roomNo);
if (dt != NULL) {
newPriority = dt->mPriority;
newPriority = dt->priority;
}
}
}
return dComIfGp_event_order(EVT_TYPE_OTHER, newPriority, i_flag, param_3, i_actor,
return dComIfGp_event_order(dEvt_type_OTHER_e, newPriority, i_flag, param_3, i_actor,
event_second_actor(i_flag), i_eventID, i_mapToolID);
}
@@ -1036,7 +1036,7 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16
dStage_MapEvent_dt_c* dt = dEvt_control_c::searchMapEventData(param_1, roomNo);
if (dt != NULL) {
newPriority = dt->mPriority;
newPriority = dt->priority;
if (i_eventID == 0xFF) {
i_eventID = dComIfGp_getEventManager().getEventIdx(i_actor, param_1);
@@ -1051,7 +1051,7 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16
newPriority = param_5;
}
return dComIfGp_event_order(EVT_TYPE_OTHER, newPriority, i_flag, param_3, i_actor,
return dComIfGp_event_order(dEvt_type_OTHER_e, newPriority, i_flag, param_3, i_actor,
event_second_actor(i_flag), i_eventID, param_1);
}
@@ -1075,7 +1075,7 @@ s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_actor, u16 i_flag, u16 param_2, u16
i_priority = 0xFF;
}
return dComIfGp_event_order(EVT_TYPE_POTENTIAL, i_priority, i_flag, param_2, i_actor,
return dComIfGp_event_order(dEvt_type_POTENTIAL_e, i_priority, i_flag, param_2, i_actor,
event_second_actor(i_flag), -1, -1);
}
@@ -1092,7 +1092,7 @@ s32 fopAcM_orderItemEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) {
i_priority = 0xFF;
}
return dComIfGp_event_order(EVT_TYPE_ITEM, i_priority, i_flag, -1, dComIfGp_getPlayer(0),
return dComIfGp_event_order(dEvt_type_ITEM_e, i_priority, i_flag, -1, dComIfGp_getPlayer(0),
i_actor, -1, -1);
}
@@ -1110,7 +1110,7 @@ s32 fopAcM_orderTreasureEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_
i_priority = 0xFF;
}
return dComIfGp_event_order(EVT_TYPE_TREASURE, i_priority, i_flag, -1, i_actorA, i_actorB, -1,
return dComIfGp_event_order(dEvt_type_TREASURE_e, i_priority, i_flag, -1, i_actorA, i_actorB, -1,
-1);
}
src/f_op/f_op_msg_mng.cpp
+4 -4
View File
@@ -153,7 +153,7 @@ fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_talkActor, u32 param_2
dMsgObject_c* msg = (dMsgObject_c*)fopMsgM_SearchByID(i_msgID);
if (msg != NULL && msg->mode == 1) {
if (msg != NULL && msg->mode == fopMsg_MODE_MSG_PREPARING_e) {
msg->pos.set(pos);
msg->msg_idx = i_msgIdx;
msg->field_0xf0 = param_2;
@@ -185,7 +185,7 @@ fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, u32 param_1) {
dMsgObject_c* msg = (dMsgObject_c*)fopMsgM_SearchByID(i_msgID);
if (msg != NULL) {
if (msg->mode == 1) {
if (msg->mode == fopMsg_MODE_MSG_PREPARING_e) {
msg->pos.set(pos);
msg->msg_idx = i_msgIdx;
msg->field_0xf0 = param_1;
@@ -193,7 +193,7 @@ fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, u32 param_1) {
msg->setTalkPartner(NULL);
msg->setMessageIndex(i_msgIdx, param_1, false);
return i_msgID;
} else if (msg->mode == 15) {
} else if (msg->mode == fopMsg_MODE_MSG_CONTINUE_e) {
msg->pos.set(pos);
msg->msg_idx = i_msgIdx;
msg->field_0xf0 = param_1;
@@ -225,7 +225,7 @@ fpc_ProcID fopMsgM_messageSetDemo(u32 i_msgidx) {
dMsgObject_c* msg = (dMsgObject_c*)fopMsgM_SearchByID(i_msgID);
if (msg != NULL && msg->mode == 1) {
if (msg != NULL && msg->mode == fopMsg_MODE_MSG_PREPARING_e) {
msg->pos.set(pos);
msg->msg_idx = i_msgidx;
msg->field_0xf0 = 1000;