mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-10 22:31:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

add more default parameters for common funcs

Browse Source
This commit is contained in:
LagoLunatic
2024-04-16 13:44:24 -04:00
parent ad0478fe15
commit 8238d12e71
26 changed files with 100 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+6 -5
View File
@@ -2507,7 +2507,8 @@ inline BOOL dComIfGp_event_compulsory(void* param_1, const char* param_2 = NULL,
return g_dComIfG_gameInfo.play.getEvent().compulsory(param_1, param_2, param_3);
}
inline s32 dComIfGp_event_order(u16 eventType, u16 priority, u16 flag, u16 hind, void* pActor1, void* pActor2, s16 eventID, u8 infoIdx) {
inline s32 dComIfGp_event_order(u16 eventType, u16 priority, u16 flag, u16 hind, void* pActor1,
void* pActor2, s16 eventID = -1, u8 infoIdx = -1) {
return g_dComIfG_gameInfo.play.getEvent().order(eventType, priority, flag, hind, pActor1, pActor2, eventID, infoIdx);
}
@@ -2570,7 +2571,7 @@ inline u32 dComIfGp_evmng_getEventPrio(s16 eventIdx) {
return g_dComIfG_gameInfo.play.getEvtManager().getEventPrio(eventIdx);
}
inline s16 dComIfGp_evmng_getEventIdx(const char* pName, u8 evNo) {
inline s16 dComIfGp_evmng_getEventIdx(const char* pName, u8 evNo = -1) {
return g_dComIfG_gameInfo.play.getEvtManager().getEventIdx(pName, evNo);
}
@@ -2582,8 +2583,8 @@ inline int dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor = N
return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, staffType);
}
inline int dComIfGp_evmng_getMyActIdx(int staffIdx, char** pActions, int actionCount, int force, int param_5) {
return dComIfGp_getPEvtManager()->getMyActIdx(staffIdx, pActions, actionCount, force, param_5);
inline int dComIfGp_evmng_getMyActIdx(int staffIdx, char** pActions, int actionCount, BOOL force, int nameType) {
return dComIfGp_getPEvtManager()->getMyActIdx(staffIdx, pActions, actionCount, force, nameType);
}
inline char* dComIfGp_evmng_getMyActName(int staffIdx) {
@@ -2675,7 +2676,7 @@ inline void dComIfGp_evmng_cancelStartDemo() {
}
inline BOOL dComIfGp_evmng_existence(const char* pName) {
s16 eventIdx = dComIfGp_evmng_getEventIdx(pName, 0xFF);
s16 eventIdx = dComIfGp_evmng_getEventIdx(pName);
return g_dComIfG_gameInfo.play.getEvtManager().getEventData(eventIdx) != NULL;
}
include/d/d_event_manager.h
+1 -1
View File
@@ -43,7 +43,7 @@ public:
BOOL endCheckOld(const char*);
int getMyStaffId(const char*, fopAc_ac_c*, int);
BOOL getIsAddvance(int);
int getMyActIdx(int, const char* const*, int, int, int);
int getMyActIdx(int staffIdx, const char* const* action, int actionNum, BOOL force, int nameType);
char* getMyActName(int);
char* getMyNowCutName(int);
dEvDtData_c* getMyDataP(int, const char*, int);
src/d/actor/d_a_mbdoor.cpp
+1 -1
View File
@@ -292,7 +292,7 @@ s32 daMbdoor_c::getDemoAction() {
"ADJUSTMENT",
};
return dComIfGp_evmng_getMyActIdx(mEvtStaffId, action_table, ARRAY_SIZE(action_table), 0, 0);
return dComIfGp_evmng_getMyActIdx(mEvtStaffId, action_table, ARRAY_SIZE(action_table), FALSE, 0);
}
/* 00000B3C-00000F78 .text demoProc__10daMbdoor_cFv */
src/d/actor/d_a_npc_bs1.cpp
+7 -7
View File
@@ -1629,13 +1629,13 @@ BOOL daNpc_Bs1_c::CreateInit() {
switch(mType) {
case 0:
setAction(&wait_action, 0);
m83A = dComIfGp_evmng_getEventIdx("BS1_GETDEMO", 0xFF);
m83A = dComIfGp_evmng_getEventIdx("BS1_GETDEMO");
mEventCut.setActorInfo("Bs1", this);
mEventCut.setJntCtrlPtr(&mJntCtrl);
break;
case 1:
setAction(&wait_action, 0);
m83A = dComIfGp_evmng_getEventIdx("BS2_GETDEMO", 0xFF);
m83A = dComIfGp_evmng_getEventIdx("BS2_GETDEMO");
mEventCut.setActorInfo("Bs2", this);
mEventCut.setJntCtrlPtr(&mJntCtrl);
break;
@@ -1674,8 +1674,8 @@ BOOL daNpc_Bs1_c::CreateInit() {
createShopList();
m82B = 2;
mEventIdxs[0] = dComIfGp_evmng_getEventIdx("PUT_PRAICE_TICKET", 0xFF);
mEventIdxs[1] = dComIfGp_evmng_getEventIdx("PUT_FULL_TICKET", 0xFF);
mEventIdxs[0] = dComIfGp_evmng_getEventIdx("PUT_PRAICE_TICKET");
mEventIdxs[1] = dComIfGp_evmng_getEventIdx("PUT_FULL_TICKET");
return TRUE;
}
@@ -1819,7 +1819,7 @@ BOOL daNpc_Bs1_c::getdemo_action(void*) {
};
u32 staffIdx = dComIfGp_evmng_getMyStaffId(a_name[mType]);
u32 actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, a_cut_name, 2, 0, 0);
u32 actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, a_cut_name, ARRAY_SIZE(a_cut_name), FALSE, 0);
if (mActionStatus == ACTION_STARTING) {
daPy_getPlayerActorClass()->offPlayerNoDraw();
m830 = m831;
@@ -2012,7 +2012,7 @@ BOOL daNpc_Bs1_c::privateCut() {
if (staffId == -1) {
return FALSE;
}
int actIdx = dComIfGp_evmng_getMyActIdx(staffId, cut_name_tbl, 8, 1, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffId, cut_name_tbl, ARRAY_SIZE(cut_name_tbl), TRUE, 0);
if (actIdx == -1) {
dComIfGp_evmng_cutEnd(staffId);
} else {
@@ -2268,7 +2268,7 @@ BOOL daNpc_Bs1_c::CreateHeap() {
}
mpMorf->getModel()->setUserArea((u32)this);
mAcchCir.SetWall(30.0f, 0.0f);
mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL);
mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed);
mpShopCursor = ShopCursor_create((J3DModelData*)dComIfG_getObjectRes("Bs", BS_INDEX_BMD_SHOP_CURSOR01),
(J3DAnmTevRegKey*)dComIfG_getObjectRes("Bs", BS_INDEX_BRK_SHOP_CURSOR01),
l_HIO.mChild[mType].m30);
src/d/actor/d_a_npc_ji1.cpp
+20 -20
View File
@@ -1018,7 +1018,7 @@ s32 daNpc_Ji1_c::getEventActionNo(int staffIdx) {
"06_dummy"
};
return dComIfGp_evmng_getMyActIdx(staffIdx, ActionNames, 7, 0, 0);
return dComIfGp_evmng_getMyActIdx(staffIdx, ActionNames, ARRAY_SIZE(ActionNames), FALSE, 0);
}
/* 00004488-00004714 .text eventAction__11daNpc_Ji1_cFPv */
@@ -2856,27 +2856,27 @@ BOOL daNpc_Ji1_c::CreateHeap() {
field_0x330->getModel()->setUserArea((u32)this);
field_0x5F8.SetWall(60.0f, 50.0f);
field_0x434.Set(&current.pos, &old.pos, this, 1, &field_0x5F8, &speed, 0, 0);
field_0x434.Set(&current.pos, &old.pos, this, 1, &field_0x5F8, &speed);
field_0x434.OnLineCheck();
field_0xC54 = dComIfGp_evmng_getEventIdx("Ji1_StartSpeak", 0xFF);
field_0xC56 = dComIfGp_evmng_getEventIdx("Ji1_Speak", 0xFF);
field_0xC58 = dComIfGp_evmng_getEventIdx("Ji1_EndSpeak", 0xFF);
field_0xC5A = dComIfGp_evmng_getEventIdx("Ji1_BadSpeak", 0xFF);
field_0xC5C = dComIfGp_evmng_getEventIdx("Ji1_linkmove", 0xFF);
field_0xC5E = dComIfGp_evmng_getEventIdx("Ji1_kaiten", 0xFF);
field_0xC60 = dComIfGp_evmng_getEventIdx("Ji1_kaiten_exp", 0xFF);
field_0xC62 = dComIfGp_evmng_getEventIdx("Ji1_ItemGetEnd", 0xFF);
field_0xC64 = dComIfGp_evmng_getEventIdx("Ji1_ItemGetTalkEnd", 0xFF);
field_0xC66 = dComIfGp_evmng_getEventIdx("Ji1_pl_backroom", 0xFF);
field_0xC68 = dComIfGp_evmng_getEventIdx("Ji1_TeachSpRollCut", 0xFF);
field_0xC6A = dComIfGp_evmng_getEventIdx("Ji1_SpRollFail", 0xFF);
field_0xC6C = dComIfGp_evmng_getEventIdx("Ji1_NormAng", 0xFF);
field_0xC6E = dComIfGp_evmng_getEventIdx("Ji1_NormAng2", 0xFF);
field_0xC70 = dComIfGp_evmng_getEventIdx("Ji1_NormAngFin", 0xFF);
field_0xC72 = dComIfGp_evmng_getEventIdx("Ji1_SwordGetTalkEnd", 0xFF);
field_0xC74 = dComIfGp_evmng_getEventIdx("Ji1_KmonTalk", 0xFF);
field_0xC76 = dComIfGp_evmng_getEventIdx("Ji1_EquipTalk", 0xFF);
field_0xC54 = dComIfGp_evmng_getEventIdx("Ji1_StartSpeak");
field_0xC56 = dComIfGp_evmng_getEventIdx("Ji1_Speak");
field_0xC58 = dComIfGp_evmng_getEventIdx("Ji1_EndSpeak");
field_0xC5A = dComIfGp_evmng_getEventIdx("Ji1_BadSpeak");
field_0xC5C = dComIfGp_evmng_getEventIdx("Ji1_linkmove");
field_0xC5E = dComIfGp_evmng_getEventIdx("Ji1_kaiten");
field_0xC60 = dComIfGp_evmng_getEventIdx("Ji1_kaiten_exp");
field_0xC62 = dComIfGp_evmng_getEventIdx("Ji1_ItemGetEnd");
field_0xC64 = dComIfGp_evmng_getEventIdx("Ji1_ItemGetTalkEnd");
field_0xC66 = dComIfGp_evmng_getEventIdx("Ji1_pl_backroom");
field_0xC68 = dComIfGp_evmng_getEventIdx("Ji1_TeachSpRollCut");
field_0xC6A = dComIfGp_evmng_getEventIdx("Ji1_SpRollFail");
field_0xC6C = dComIfGp_evmng_getEventIdx("Ji1_NormAng");
field_0xC6E = dComIfGp_evmng_getEventIdx("Ji1_NormAng2");
field_0xC70 = dComIfGp_evmng_getEventIdx("Ji1_NormAngFin");
field_0xC72 = dComIfGp_evmng_getEventIdx("Ji1_SwordGetTalkEnd");
field_0xC74 = dComIfGp_evmng_getEventIdx("Ji1_KmonTalk");
field_0xC76 = dComIfGp_evmng_getEventIdx("Ji1_EquipTalk");
if(dComIfGs_isEventBit(0x1) && !dComIfGs_isEventBit(0x108)) {
eventInfo.setEventId(field_0xC76);
src/d/actor/d_a_npc_kamome.cpp
+2 -2
View File
@@ -442,7 +442,7 @@ BOOL daNpc_kam_c::init() {
attention_info.distances[3] = 38;
for (int i = 0; i < 3; i++) {
mEventIdxs[i] = dComIfGp_evmng_getEventIdx(event_name_tbl[i], 0xFF);
mEventIdxs[i] = dComIfGp_evmng_getEventIdx(event_name_tbl[i]);
}
eventInfo.setXyCheckCB(daNpc_kam_XyCheckCB);
@@ -963,7 +963,7 @@ BOOL daNpc_kam_c::eventProc() {
int staffId = dComIfGp_evmng_getMyStaffId(l_staff_name);
if (dComIfGp_event_runCheck() && !checkCommandTalk()) {
if (staffId != -1) {
int actIdx = dComIfGp_evmng_getMyActIdx(staffId, cut_name_tbl, ARRAY_SIZE(cut_name_tbl), 1, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffId, cut_name_tbl, ARRAY_SIZE(cut_name_tbl), TRUE, 0);
if (actIdx == -1) {
dComIfGp_evmng_cutEnd(staffId);
} else {
src/d/actor/d_a_npc_md.cpp
+1 -1
View File
@@ -1805,7 +1805,7 @@ BOOL daNpc_Md_c::eventProc() {
int staffIdx = dComIfGp_evmng_getMyStaffId(l_staff_name);
if (dComIfGp_event_runCheck() && !checkCommandTalk()) {
if (staffIdx != -1) {
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_tbl, ARRAY_SIZE(cut_name_tbl), 1, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_tbl, ARRAY_SIZE(cut_name_tbl), TRUE, 0);
if (actIdx == -1) {
dComIfGp_evmng_cutEnd(staffIdx);
} else {
src/d/actor/d_a_npc_nz.cpp
+3 -3
View File
@@ -232,7 +232,7 @@ static s16 daNpc_Nz_XyEventCB(void* i_this, int param_1) {
/* 000011C0-00001210 .text XyEventCB__10daNpc_Nz_cFi */
s16 daNpc_Nz_c::XyEventCB(int) {
field_0x8FA = dComIfGp_evmng_getEventIdx("DEFAULT_NPC_NZ_ESA", -1);
field_0x8FA = dComIfGp_evmng_getEventIdx("DEFAULT_NPC_NZ_ESA");
return field_0x8FA;
}
@@ -675,7 +675,7 @@ u16 daNpc_Nz_c::next_msgStatus(u32* pMsgNo) {
setAnm(0, false);
dComIfGp_setItemRupeeCount(-dComIfGp_getMessageRupee());
field_0x8F8 = 3;
field_0x8FA = dComIfGp_evmng_getEventIdx("DEFAULT_NPC_NZ_GETITEM", -1);
field_0x8FA = dComIfGp_evmng_getEventIdx("DEFAULT_NPC_NZ_GETITEM");
dComIfGp_event_setGtItm(field_0x908);
msgStatus = fopMsgStts_MSG_ENDS_e;
break;
@@ -846,7 +846,7 @@ BOOL daNpc_Nz_c::createInit() {
modeProcInit(0);
mAcchCir.SetWall(30.0f, 10.0f);
mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed, 0, 0);
mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed);
mAcch.OnLineCheckNone();
mAcch.SetWallNone();
mAcch.SetRoofNone();
src/d/actor/d_a_npc_nz_cut.inc
+1 -1
View File
@@ -162,7 +162,7 @@ void daNpc_Nz_c::cutProc() {
"DEFAULT_NPC_NZ_ESA",
};
int actIdx = dComIfGp_evmng_getMyActIdx(field_0x8F4, action_table, ARRAY_SIZE(action_table), 1, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(field_0x8F4, action_table, ARRAY_SIZE(action_table), TRUE, 0);
if(actIdx == -1) {
dComIfGp_evmng_cutEnd(field_0x8F4);
return;
src/d/actor/d_a_npc_os.cpp
+3 -3
View File
@@ -292,7 +292,7 @@ BOOL daNpc_Os_c::createHeap() {
mAcchCir[0].SetWall(20.0f, 40.0f);
mAcchCir[1].SetWall(60.0f, 40.0f);
mAcch.Set(&current.pos, &old.pos, this, 2, &mAcchCir[0], &speed, 0, 0);
mAcch.Set(&current.pos, &old.pos, this, 2, &mAcchCir[0], &speed);
mAcch.OnLineCheck();
mAcch.ClrRoofNone();
mAcch.SetRoofCrrHeight(120.0f);
@@ -1292,7 +1292,7 @@ BOOL daNpc_Os_c::eventProc() {
int staffIdx = getMyStaffId();
if(dComIfGp_event_runCheck() && !checkCommandTalk()) {
if(staffIdx != -1) {
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_tbl, ARRAY_SIZE(cut_name_tbl), 1, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_tbl, ARRAY_SIZE(cut_name_tbl), TRUE, 0);
if(actIdx == -1) {
dComIfGp_evmng_cutEnd(staffIdx);
}
@@ -1998,7 +1998,7 @@ BOOL daNpc_Os_c::init() {
mCyl.Set(l_cyl_src);
mCyl.SetStts(&mStts);
for(int i = 0; i < 0x10; i++) {
field_0x7C4[i] = dComIfGp_evmng_getEventIdx(event_name_tbl[i], -1);
field_0x7C4[i] = dComIfGp_evmng_getEventIdx(event_name_tbl[i]);
}
return true;
src/d/actor/d_a_obj_barrier.cpp
+1 -1
View File
@@ -243,7 +243,7 @@ void daObjBarrier_c::break_start_wait_proc() {
case 9:
case 10:
dComIfGs_onEventBit(dSv_evtBit_c::BARRIER_BREAK);
mEventID = dComIfGp_evmng_getEventIdx("seal", 0xFF);
mEventID = dComIfGp_evmng_getEventIdx("seal");
mBarrierProc = PROC_BREAK_ORDER;
break;
}
src/d/actor/d_a_obj_ferris.cpp
+2 -2
View File
@@ -168,8 +168,8 @@ s32 daObjFerris::Act_c::_create() {
mRotState = 0;
}
mEventIdx_kanban_vive = dComIfGp_evmng_getEventIdx("kanran_vive", 0xFF);
mEventIdx_kanban_start = dComIfGp_evmng_getEventIdx("kanran_start", 0xFF);
mEventIdx_kanban_vive = dComIfGp_evmng_getEventIdx("kanran_vive");
mEventIdx_kanban_start = dComIfGp_evmng_getEventIdx("kanran_start");
mRotAngle = 0x1800;
mGondolaWaveAngle = 0;
src/d/actor/d_a_obj_mknjd.cpp
+9 -9
View File
@@ -255,10 +255,10 @@ int daObjMknjD::Act_c::Create() {
}
if (m043E == true) {
mCheckEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[3], 0xFF);
mDemoEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[1], 0xFF);
mErrorEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[5], 0xFF);
mLessonEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[7], 0xFF);
mCheckEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[3]);
mDemoEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[1]);
mErrorEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[5]);
mLessonEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[7]);
mTactMode = 4;
mGiveItemNo = TACT_SONG5;
@@ -266,10 +266,10 @@ int daObjMknjD::Act_c::Create() {
m0430 = 0x2910;
}
else {
mCheckEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[2], 0xFF);
mDemoEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[0], 0xFF);
mErrorEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[4], 0xFF);
mLessonEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[6], 0xFF);
mCheckEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[2]);
mDemoEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[0]);
mErrorEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[4]);
mLessonEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[6]);
mTactMode = 3;
mGiveItemNo = TACT_SONG4;
@@ -445,7 +445,7 @@ void daObjMknjD::Act_c::privateCut() {
int staffIdx = dComIfGp_evmng_getMyStaffId("MknjD");
if (staffIdx != -1) {
mActionIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_table, ARRAY_SIZE(cut_name_table), 1, 0);
mActionIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_table, ARRAY_SIZE(cut_name_table), TRUE, 0);
if (mActionIdx == -1) {
dComIfGp_evmng_cutEnd(staffIdx);
src/d/actor/d_a_obj_toripost.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ void daObjTpost_c::cutProc() {
int staffIdx = dComIfGp_evmng_getMyStaffId("Tpost");
if(staffIdx != -1) {
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), 1, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), TRUE, 0);
if(actIdx == -1) {
dComIfGp_evmng_cutEnd(staffIdx);
}
src/d/actor/d_a_obj_vfan.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ int daObjVfan::Act_c::Create() {
mBreakTimer = 0;
mState = 0;
m_evid = dComIfGp_evmng_getEventIdx("Vfan", 0xff);
m_evid = dComIfGp_evmng_getEventIdx("Vfan");
return TRUE;
}
src/d/actor/d_a_spc_item01.cpp
+1 -1
View File
@@ -110,7 +110,7 @@ BOOL daSpcItem01_c::CreateInit() {
mCyl.SetR(tempVar2);
mCyl.SetH(tempVar1);
mAcchCir.SetWall(30.0f, 30.0f);
mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL);
mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed);
field_0x644 = daSpcItem01_prm::getFlag(this);
fopAcM_SetGravity(this, -4.0f);
src/d/actor/d_a_swhit0.cpp
+1 -1
View File
@@ -221,7 +221,7 @@ s32 daSwhit0_c::DemoProc() {
if (dComIfGp_evmng_getIsAddvance(mStaffId))
{
switch(dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0)) {
switch(dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), FALSE, 0)) {
case 1:
dComIfGs_onSwitch(getSwNo(), fopAcM_GetRoomNo(this));
onFlag(0x01);
src/d/actor/d_a_tag_event.cpp
+3 -3
View File
@@ -364,11 +364,11 @@ BOOL daTag_Event_c::actionSpeArrival() {
setActio(ACTION_WAIT);
return TRUE;
}
mEventIdx = dComIfGp_evmng_getEventIdx("SUPERELF", -1);
mEventIdx = dComIfGp_evmng_getEventIdx("SUPERELF");
} else if (dComIfGs_isEventBit(0x2740)) {
mEventIdx = dComIfGp_evmng_getEventIdx("fairy_flag_on_Jmp", -1);
mEventIdx = dComIfGp_evmng_getEventIdx("fairy_flag_on_Jmp");
} else {
mEventIdx = dComIfGp_evmng_getEventIdx("fairy_Jmp", -1);
mEventIdx = dComIfGp_evmng_getEventIdx("fairy_Jmp");
}
setActio(ACTION_SPE_HUNT);
return actionSpeHunt();
src/d/actor/d_a_tbox.cpp
+1 -1
View File
@@ -815,7 +815,7 @@ s32 daTbox_c::demoProc() {
"OPEN_SHORT"
};
s32 actionIdx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0);
s32 actionIdx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), FALSE, 0);
bool bIsAdvance = dComIfGp_evmng_getIsAddvance(mStaffId);
if (bIsAdvance) {
src/d/actor/d_a_warpfout.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ void daWarpfout_c::demo_proc() {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mStaffId != -1) {
int actIdx =
dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0);
dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (actIdx == -1) {
dComIfGp_evmng_cutEnd(mStaffId);
src/d/d_door.cpp
+1 -1
View File
@@ -315,7 +315,7 @@ s32 dDoor_info_c::getDemoAction() {
"DROP_AF",
};
return dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0);
return dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), FALSE, 0);
}
/* 8006C0EC-8006C1D8 .text setGoal__12dDoor_info_cFv */
src/d/d_event.cpp
+6 -6
View File
@@ -21,7 +21,7 @@ dEvt_order_c::dEvt_order_c() {}
/* 8006FE58-8006FEE8 .text orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv */
s32 dEvt_control_c::orderOld(u16 eventType, u16 priority, u16 flag, u16 hindFlag, void* ac1, void* ac2, const void* eventName) {
s32 eventIdx = dComIfGp_evmng_getEventIdx((const char*)eventName, 0xFF);
s32 eventIdx = dComIfGp_evmng_getEventIdx((const char*)eventName);
return order(eventType, priority, flag, hindFlag, ac1, ac2, eventIdx, 0xFF);
}
@@ -138,7 +138,7 @@ BOOL dEvt_control_c::talkCheck(dEvt_order_c* order) {
if (actor2 != NULL && actor2->eventInfo.getEventName() != NULL) {
mEventId = actor2->eventInfo.getEventId();
} else {
mEventId = dComIfGp_evmng_getEventIdx(defaultEventName, 0xFF);
mEventId = dComIfGp_evmng_getEventIdx(defaultEventName);
}
}
@@ -199,7 +199,7 @@ BOOL dEvt_control_c::talkXyCheck(dEvt_order_c* order) {
if (actor2 != NULL && (r3 = actor2->eventInfo.runXyEventCB(actor2, equippedItemIdx), r3 != -1)) {
mEventId = r3;
} else {
mEventId = dComIfGp_evmng_getEventIdx(defaultEventName, 0xFF);
mEventId = dComIfGp_evmng_getEventIdx(defaultEventName);
}
if (!dComIfGp_evmng_order(mEventId)) {
@@ -227,7 +227,7 @@ BOOL dEvt_control_c::photoCheck(dEvt_order_c* order) {
if (eventId != -1) {
mEventId = eventId;
} else {
mEventId = dComIfGp_evmng_getEventIdx(defaultEventName, 0xFF);
mEventId = dComIfGp_evmng_getEventIdx(defaultEventName);
}
if (!dComIfGp_evmng_order(mEventId))
@@ -377,7 +377,7 @@ BOOL dEvt_control_c::itemCheck(dEvt_order_c* order) {
const char* defaultEventName = "DEFAULT_GETITEM";
if (commonCheck(order, dEvtCnd_CANGETITEM_e, dEvtCmd_INGETITEM_e)) {
mMode = dEvtMode_DEMO_e;
mEventId = dComIfGp_evmng_getEventIdx(defaultEventName, 0xFF);
mEventId = dComIfGp_evmng_getEventIdx(defaultEventName);
if (!dComIfGp_evmng_order(mEventId))
JUT_ASSERT(0x2ea, 0);
return TRUE;
@@ -736,7 +736,7 @@ void dEvt_info_c::setEventName(char* evtName) {
if (evtName == NULL) {
mEventId = -1;
} else {
mEventId = dComIfGp_evmng_getEventIdx(evtName, -1);
mEventId = dComIfGp_evmng_getEventIdx(evtName);
}
}
src/d/d_event_data.cpp
+8 -8
View File
@@ -213,10 +213,10 @@ void dEvDtStaff_c::specialProcLight() {
"CHANGE",
"ADD_TIME",
};
int act = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), 0, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (act) {
switch (actIdx) {
case 1: // CHANGE
{
f32 * pHour = dComIfGp_evmng_getMyFloatP(staffIdx, "Hour");
@@ -274,7 +274,7 @@ void dEvDtStaff_c::specialProcMessage() {
static msg_class* l_msg;
static int l_msgNo;
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), 0, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
@@ -395,7 +395,7 @@ void dEvDtStaff_c::specialProcSound() {
"BGMSTOP",
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), 0, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
@@ -474,7 +474,7 @@ void dEvDtStaff_c::specialProcCreate() {
"CREATE",
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), 0, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
@@ -552,7 +552,7 @@ void dEvDtStaff_c::specialProcDirector() {
"PLAYER_NODRAW",
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), 0, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
@@ -721,7 +721,7 @@ void dEvDtStaff_c::specialProcPackage() {
"PLAY2",
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), 0, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // WAIT
@@ -798,7 +798,7 @@ void dEvDtStaff_c::specialProcTimekeeper() {
"WAIT",
};
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), 0, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (dComIfGp_evmng_getIsAddvance(staffIdx)) {
switch (actIdx) {
case 0: // COUNTDOWN
src/d/d_event_manager.cpp
+2 -2
View File
@@ -446,7 +446,7 @@ int dEvmng_strcmp(const char* s1, char* s2) {
}
/* 80074824-80074964 .text getMyActIdx__16dEvent_manager_cFiPCPCciii */
int dEvent_manager_c::getMyActIdx(int staffIdx, const char* const* action, int actionNum, int force, int nameType) {
int dEvent_manager_c::getMyActIdx(int staffIdx, const char* const* action, int actionNum, BOOL force, int nameType) {
if (staffIdx == -1)
return -1;
@@ -780,7 +780,7 @@ static int dEv_talkman_get_action(int param_0) {
if (staffId == -1) {
return -1;
}
int actIdx = dComIfGp_evmng_getMyActIdx(staffId, action_table, ARRAY_SIZE(action_table), 0, 0);
int actIdx = dComIfGp_evmng_getMyActIdx(staffId, action_table, ARRAY_SIZE(action_table), FALSE, 0);
if (actIdx == param_0) {
dComIfGp_evmng_cutEnd(staffId);
}
src/d/d_npc_event_cut.inc
+1 -1
View File
@@ -64,7 +64,7 @@ bool dNpc_EventCut_c::cutProc() {
},
};
mCurActIdx = dComIfGp_evmng_getMyActIdx(mEvtStaffId, action_table, ARRAY_SIZE(action_table), 1, 0);
mCurActIdx = dComIfGp_evmng_getMyActIdx(mEvtStaffId, action_table, ARRAY_SIZE(action_table), TRUE, 0);
if(mCurActIdx == -1) {
return false;
}
src/f_op/f_op_actor_mng.cpp
+16 -16
View File
@@ -641,47 +641,47 @@ s32 fopAcM_cullingCheck(fopAc_ac_c* i_this) {
/* 800259A8-800259F8 .text fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_c */
s32 fopAcM_orderTalkEvent(fopAc_ac_c* i_this, fopAc_ac_c* i_partner) {
return dComIfGp_event_order(dEvtType_TALK_e, 0x1FF, 0, 0x14F, i_this, i_partner, -1, 0xFF);
return dComIfGp_event_order(dEvtType_TALK_e, 0x1FF, 0, 0x14F, i_this, i_partner);
}
/* 800259F8-80025A48 .text fopAcM_orderTalkXBtnEvent__FP10fopAc_ac_cP10fopAc_ac_c */
s32 fopAcM_orderTalkXBtnEvent(fopAc_ac_c* i_this, fopAc_ac_c* i_partner) {
return dComIfGp_event_order(dEvtType_SHOWITEM_X_e, 0x1F4, 0, 0x14F, i_this, i_partner, -1, 0xFF);
return dComIfGp_event_order(dEvtType_SHOWITEM_X_e, 0x1F4, 0, 0x14F, i_this, i_partner);
}
/* 80025A48-80025A98 .text fopAcM_orderTalkYBtnEvent__FP10fopAc_ac_cP10fopAc_ac_c */
s32 fopAcM_orderTalkYBtnEvent(fopAc_ac_c* i_this, fopAc_ac_c* i_partner) {
return dComIfGp_event_order(dEvtType_SHOWITEM_Y_e, 0x1F4, 0, 0x14F, i_this, i_partner, -1, 0xFF);
return dComIfGp_event_order(dEvtType_SHOWITEM_Y_e, 0x1F4, 0, 0x14F, i_this, i_partner);
}
/* 80025A98-80025AE8 .text fopAcM_orderTalkZBtnEvent__FP10fopAc_ac_cP10fopAc_ac_c */
s32 fopAcM_orderTalkZBtnEvent(fopAc_ac_c* i_this, fopAc_ac_c* i_partner) {
return dComIfGp_event_order(dEvtType_SHOWITEM_Z_e, 0x1F4, 0, 0x14F, i_this, i_partner, -1, 0xFF);
return dComIfGp_event_order(dEvtType_SHOWITEM_Z_e, 0x1F4, 0, 0x14F, i_this, i_partner);
}
/* 80025AE8-80025B3C .text fopAcM_orderZHintEvent__FP10fopAc_ac_cP10fopAc_ac_c */
s32 fopAcM_orderZHintEvent(fopAc_ac_c* i_this, fopAc_ac_c* i_partner) {
return dComIfGp_event_order(dEvtType_TALK_e, 0x1FF, 0, 0xFFFF, i_this, i_partner, -1, 0xFF);
return dComIfGp_event_order(dEvtType_TALK_e, 0x1FF, 0, 0xFFFF, i_this, i_partner);
}
/* 80025B3C-80025B8C .text fopAcM_orderSpeakEvent__FP10fopAc_ac_c */
s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_this) {
return dComIfGp_event_order(dEvtType_TALK_e, 0x1EA, 0, 0x14F, dComIfGp_getPlayer(0), i_this, -1, 0xFF);
return dComIfGp_event_order(dEvtType_TALK_e, 0x1EA, 0, 0x14F, dComIfGp_getPlayer(0), i_this);
}
/* 80025B8C-80025BE0 .text fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_c */
s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_this, fopAc_ac_c* i_partner) {
return dComIfGp_event_order(dEvtType_DOOR_e, 0xFF, 0, 0xFFFF, i_this, i_partner, -1, 0xFF);
return dComIfGp_event_order(dEvtType_DOOR_e, 0xFF, 0, 0xFFFF, i_this, i_partner);
}
/* 80025BE0-80025C34 .text fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_c */
s32 fopAcM_orderCatchEvent(fopAc_ac_c* i_this, fopAc_ac_c* i_partner) {
return dComIfGp_event_order(dEvtType_CATCH_e, 1, 0, 0xFFFF, i_this, i_partner, -1, 0xFF);
return dComIfGp_event_order(dEvtType_CATCH_e, 1, 0, 0xFFFF, i_this, i_partner);
}
/* 80025C34-80025CC8 .text fopAcM_orderOtherEvent2__FP10fopAc_ac_cPcUsUs */
s32 fopAcM_orderOtherEvent2(fopAc_ac_c* i_this, char* pEventName, u16 flag, u16 hind) {
u16 prio = dComIfGp_evmng_getEventPrio(dComIfGp_evmng_getEventIdx(pEventName, 0xFF));
u16 prio = dComIfGp_evmng_getEventPrio(dComIfGp_evmng_getEventIdx(pEventName));
if (prio == 0)
prio = 0xFF;
@@ -690,12 +690,12 @@ s32 fopAcM_orderOtherEvent2(fopAc_ac_c* i_this, char* pEventName, u16 flag, u16
/* 80025CC8-80025D28 .text fopAcM_orderChangeEvent__FP10fopAc_ac_cPcUsUs */
s32 fopAcM_orderChangeEvent(fopAc_ac_c* i_this, char* pEventName, u16 flag, u16 hind) {
return fopAcM_orderChangeEventId(i_this, dComIfGp_evmng_getEventIdx(pEventName, 0xFF), flag, hind);
return fopAcM_orderChangeEventId(i_this, dComIfGp_evmng_getEventIdx(pEventName), flag, hind);
}
/* 80025D28-80025D94 .text fopAcM_orderChangeEvent__FP10fopAc_ac_cP10fopAc_ac_cPcUsUs */
s32 fopAcM_orderChangeEvent(fopAc_ac_c* i_this, fopAc_ac_c* i_partner, char* pEventName, u16 flag, u16 hind) {
return fopAcM_orderChangeEventId(i_this, i_partner, dComIfGp_evmng_getEventIdx(pEventName, 0xFF), flag, hind);
return fopAcM_orderChangeEventId(i_this, i_partner, dComIfGp_evmng_getEventIdx(pEventName), flag, hind);
}
/* 80025D94-80025E1C .text fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs */
@@ -704,7 +704,7 @@ s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_this, s16 eventIdx, u16 flag, u16 hi
if (prio == 0)
prio = 0xFF;
return dComIfGp_event_order(dEvtType_CHANGE_e, prio, flag, hind, i_this, dComIfGp_getPlayer(0), eventIdx, 0xFF);
return dComIfGp_event_order(dEvtType_CHANGE_e, prio, flag, hind, i_this, dComIfGp_getPlayer(0), eventIdx);
}
/* 80025E1C-80025EA4 .text fopAcM_orderChangeEventId__FP10fopAc_ac_cP10fopAc_ac_csUsUs */
@@ -713,7 +713,7 @@ s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_this, fopAc_ac_c* i_partner, s16 eve
if (prio == 0)
prio = 0xFF;
return dComIfGp_event_order(dEvtType_CHANGE_e, prio, flag, hind, i_this, i_partner, eventIdx, 0xFF);
return dComIfGp_event_order(dEvtType_CHANGE_e, prio, flag, hind, i_this, i_partner, eventIdx);
}
/* 80025EA4-80025F3C .text fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs */
@@ -735,17 +735,17 @@ s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_this, u16 flag, u16 hind, u16 prior
if (priority == 0)
priority = 0xFF;
return dComIfGp_event_order(dEvtType_POTENTIAL_e, priority, flag, hind, i_this, dComIfGp_getPlayer(0), -1, 0xFF);
return dComIfGp_event_order(dEvtType_POTENTIAL_e, priority, flag, hind, i_this, dComIfGp_getPlayer(0));
}
/* 80025F9C-80025FF0 .text fopAcM_orderItemEvent__FP10fopAc_ac_c */
s32 fopAcM_orderItemEvent(fopAc_ac_c* i_this) {
return dComIfGp_event_order(dEvtType_ITEM_e, 0xFF, 0, 0xFFFF, dComIfGp_getPlayer(0), i_this, -1, 0xFF);
return dComIfGp_event_order(dEvtType_ITEM_e, 0xFF, 0, 0xFFFF, dComIfGp_getPlayer(0), i_this);
}
/* 80025FF0-80026044 .text fopAcM_orderTreasureEvent__FP10fopAc_ac_cP10fopAc_ac_c */
s32 fopAcM_orderTreasureEvent(fopAc_ac_c* i_this, fopAc_ac_c* i_partner) {
return dComIfGp_event_order(dEvtType_TREASURE_e, 0xFF, 0, 0xFFFF, i_this, i_partner, -1, 0xFF);
return dComIfGp_event_order(dEvtType_TREASURE_e, 0xFF, 0, 0xFFFF, i_this, i_partner);
}
/* 80026044-80026074 .text fopAcM_getTalkEventPartner__FP10fopAc_ac_c */