From 8c5d05cd549981dcbf6f7609ff1eb59a6bf83e15 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 14 Sep 2025 16:17:54 -0400 Subject: [PATCH] Finish renaming subtype to argument (#2659) --- include/d/d_stage.h | 8 +++---- include/f_op/f_op_actor_mng.h | 22 +++++++++--------- src/d/d_event_data.cpp | 43 +++++++++++++++++++++++------------ src/d/d_stage.cpp | 26 ++++++++++----------- src/f_op/f_op_actor.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 42 +++++++++++++++++----------------- 6 files changed, 78 insertions(+), 65 deletions(-) diff --git a/include/d/d_stage.h b/include/d/d_stage.h index c6e22f09c9..a72ff30f5a 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1189,9 +1189,9 @@ private: // unknown name struct dStage_objectNameInf { - char mName[8]; - s16 mProcName; - s8 mSubtype; + /* 0x00 */ char name[8]; + /* 0x08 */ s16 procname; + /* 0x0A */ s8 argument; }; // Size: 0xC class dStage_KeepDoorInfo { @@ -1273,7 +1273,7 @@ void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* stageDt, int param_2); dStage_KeepDoorInfo* dStage_GetKeepDoorInfo(); dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo(); void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage); -const char* dStage_getName(s16 procName, s8 subtype); +const char* dStage_getName(s16 procName, s8 argument); #if VERSION == VERSION_WII_USA_R0 void dStage_escapeRestart(); diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 3be6217137..bab11a4041 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -60,7 +60,7 @@ struct fopAcM_prm_class { /* 0x00 */ fopAcM_prmBase_class base; /* 0x18 */ fopAcM_prmScale_class scale; /* 0x1C */ fpc_ProcID parent_id; - /* 0x20 */ s8 subtype; + /* 0x20 */ s8 argument; /* 0x21 */ s8 room_no; }; @@ -70,20 +70,20 @@ struct fopAcM_search4ev_prm { name[0] = 0; event_id = -1; procname = PROC_PLAY_SCENE; - subtype = 0; + argument = 0; } /* 0x00 */ char name[30]; /* 0x1E */ s16 event_id; /* 0x20 */ s16 procname; - /* 0x22 */ s8 subtype; + /* 0x22 */ s8 argument; }; struct fopAcM_search_prm { /* 0x00 */ u32 prm0; /* 0x04 */ u32 prm1; /* 0x08 */ s16 procname; - /* 0x0A */ s8 subtype; + /* 0x0A */ s8 argument; }; struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { @@ -502,7 +502,7 @@ s32 fopAcM_SearchByName(s16 i_procName, fopAc_ac_c** i_outActor); fopAcM_prm_class* fopAcM_CreateAppend(); fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + const csXyz* i_angle, const cXyz* i_scale, s8 i_argument, fpc_ProcID i_parentId); void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message); @@ -512,11 +512,11 @@ s32 fopAcM_delete(fopAc_ac_c* i_actor); s32 fopAcM_delete(fpc_ProcID i_actorID); fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cXyz* i_pos, - int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, s8 i_argument, createFunc i_createFunc); fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype); + const csXyz* i_angle, const cXyz* i_scale, s8 i_argument); inline fpc_ProcID fopAcM_create(s16 i_procName, createFunc i_createFunc, void* params) { return fpcM_Create(i_procName, i_createFunc, params); @@ -527,7 +527,7 @@ inline fpc_ProcID fopAcM_Create(s16 i_procName, createFunc i_createFunc, void* p } fopAc_ac_c* fopAcM_fastCreate(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + const csXyz* i_angle, const cXyz* i_scale, s8 i_argument, createFunc i_createFunc, void* i_createFuncData); fopAc_ac_c* fopAcM_fastCreate(const char* i_actorname, u32 i_parameters, const cXyz* i_pos, @@ -536,11 +536,11 @@ fopAc_ac_c* fopAcM_fastCreate(const char* i_actorname, u32 i_parameters, const c fpc_ProcID fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, - const cXyz* i_scale, s8 i_subtype, createFunc i_createFunc); + const cXyz* i_scale, s8 i_argument, createFunc i_createFunc); fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, - const cXyz* i_scale, s8 i_subtype, createFunc i_createFunc); + const cXyz* i_scale, s8 i_argument, createFunc i_createFunc); void fopAcM_DeleteHeap(fopAc_ac_c* i_actor); @@ -805,7 +805,7 @@ inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_ char buf[64]; snprintf(buf, sizeof(buf), "<%s> %s", dStage_getName(fopAcM_GetProfName(i_actor), - i_actor->subtype), i_msg); setWarningMessage_f_va(JUTAssertion::getSDevice(), i_filename, + i_actor->argument), i_msg); setWarningMessage_f_va(JUTAssertion::getSDevice(), i_filename, i_line, buf, args); va_end(args); */ diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index c5eb481698..39bee2cb2e 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -389,7 +389,7 @@ void dEvDtStaff_c::specialProcLight() { f32* hourP; switch (*(int*)nowCutName) { - case 'CHAN': + case 'CHAN': { hourP = dComIfGp_evmng_getMyFloatP(staffId, "Hour"); if (hourP != NULL) { dKy_instant_timechg(*hourP * 15.0f); @@ -403,6 +403,7 @@ void dEvDtStaff_c::specialProcLight() { } } break; + } case 'ADD_': hourP = dComIfGp_evmng_getMyFloatP(staffId, "Hour"); if (hourP != NULL) { @@ -452,7 +453,7 @@ void dEvDtStaff_c::specialProcMessage() { case 'FINI': work->mLMsg->mode = 0x10; break; - case 'CONT': + case 'CONT': { work->mLMsg->mode = 0xF; int* ptr = dComIfGp_evmng_getMyIntegerP(staffId, "msgNo"); if (ptr == NULL) { @@ -461,7 +462,8 @@ void dEvDtStaff_c::specialProcMessage() { work->mMsgNo = *ptr; fopMsgM_messageSet(work->mMsgNo, 1000); break; - case 'SAVE': + } + case 'SAVE': { work->mMsgNo = 1; int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); if (typeP != NULL && *typeP == 1) { @@ -469,7 +471,8 @@ void dEvDtStaff_c::specialProcMessage() { } work->_0 = d_GameOver_Create(work->mMsgNo); break; - case 'TELO': + } + case 'TELO': { int* forStartP = dComIfGp_evmng_getMyIntegerP(staffId, "ForStart"); if (forStartP != NULL && *forStartP != 0) { @@ -491,6 +494,7 @@ void dEvDtStaff_c::specialProcMessage() { work->_0 = fopMsgM_messageSetDemo(work->mMsgNo); } } + } } switch (*(int*)nowCutName) { @@ -624,7 +628,7 @@ void dEvDtStaff_c::specialProcSound() { case 'NOMS': specialProc_WaitStart(staffId); break; - case 'RIDD': + case 'RIDD': { int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); if (typeP != NULL && *typeP == 1) { mDoAud_seStart(Z2SE_READ_RIDDLE_A, NULL, 0, 0); @@ -632,12 +636,14 @@ void dEvDtStaff_c::specialProcSound() { mDoAud_seStart(Z2SE_READ_RIDDLE_B, NULL, 0, 0); } break; - case 'BGMS': + } + case 'BGMS': { int* timerP = dComIfGp_evmng_getMyIntegerP(staffId, "Timer"); if (timerP != NULL) { mDoAud_bgmStop(*timerP); } } + } } switch (*(int*)nowCutName) { @@ -707,8 +713,8 @@ void dEvDtStaff_c::specialProcCreate() { scale = *scaleP; } - fopAcM_create(objNameInf->mProcName, arg, &pos, dComIfGp_roomControl_getStayNo(), - &angle, &scale, objNameInf->mSubtype); + fopAcM_create(objNameInf->procname, arg, &pos, dComIfGp_roomControl_getStayNo(), + &angle, &scale, objNameInf->argument); break; } } @@ -779,7 +785,7 @@ void dEvDtStaff_c::specialProcDirector() { case 'NEXT': dEvDt_Next_Stage(staffId, 0xD); break; - case 'SKIP': + case 'SKIP': { char* zev = dComIfGp_evmng_getMyStringP(staffId, "Zev"); // cast needed to match void* pt = (void*)evtControl.getPt1(); @@ -793,7 +799,8 @@ void dEvDtStaff_c::specialProcDirector() { evtControl.setSkipProc(pt, dEv_defaultSkipProc, 0); } break; - case 'FADE': + } + case 'FADE': { f32* rateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate"); int* colorP = dComIfGp_evmng_getMyIntegerP(staffId, "Color"); @@ -811,13 +818,15 @@ void dEvDtStaff_c::specialProcDirector() { mDoGph_gInf_c::fadeOut(*rateP); } break; - case 'VIBR': + } + case 'VIBR': { specialProc_WaitStart(staffId); int* patternP = dComIfGp_evmng_getMyIntegerP(staffId, "Pattern"); int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); dComIfGp_getVibration().StartQuake((u8*)patternP, 0, *typeP, cXyz(0, 1, 0)); break; - case 'WIPE': + } + case 'WIPE': { f32* wipeRateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate"); dDlst_list_c::wipeIn(-*wipeRateP); if (*wipeRateP > 0) { @@ -834,7 +843,8 @@ void dEvDtStaff_c::specialProcDirector() { } } break; - case 'MAPT': + } + case 'MAPT': { int* idP = dComIfGp_evmng_getMyIntegerP(staffId, "ID"); data->unk = *idP; dStage_MapEvent_dt_c* mapEvent = dEvt_control_c::searchMapEventData(data->unk); @@ -848,7 +858,8 @@ void dEvDtStaff_c::specialProcDirector() { data->unk2 = 0; } break; - case 'CAST': + } + case 'CAST': { char* pt2Name = dComIfGp_evmng_getMyStringP(staffId, "Pt2"); if (pt2Name != NULL) { fopAc_ac_c* pt2 = fopAcM_searchFromName4Event(pt2Name, -1); @@ -881,6 +892,7 @@ void dEvDtStaff_c::specialProcDirector() { } } break; + } case 'SPEC': int* specTypeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); if (specTypeP != NULL) { @@ -1002,7 +1014,7 @@ void dEvDtStaff_c::specialProcPackage() { case 'WAIT': specialProc_WaitProc(staffId); break; - case 'PLAY': + case 'PLAY': { dEvt_control_c& evtControl = dComIfGp_getEvent(); if (dDemo_c::getMode() == 2) { dStage_MapEvent_dt_c* event = evtControl.getStageEventDt(); @@ -1018,6 +1030,7 @@ void dEvDtStaff_c::specialProcPackage() { dComIfGp_evmng_cutEnd(staffId); } break; + } default: dComIfGp_evmng_cutEnd(staffId); break; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 0c2b86228e..fb18904a87 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1501,7 +1501,7 @@ dStage_objectNameInf* dStage_searchName(char const* objName) { dStage_objectNameInf* obj = l_objectName; for (u32 i = 0; i < ARRAY_SIZEU(l_objectName); i++) { - if (!strcmp(obj->mName, objName)) { + if (!strcmp(obj->name, objName)) { return obj; } obj++; @@ -1511,33 +1511,33 @@ dStage_objectNameInf* dStage_searchName(char const* objName) { return NULL; } -const char* dStage_getName(s16 procName, s8 subtype) { +const char* dStage_getName(s16 procName, s8 argument) { static char tmp_name[8]; dStage_objectNameInf* obj = l_objectName; char* tmp = NULL; for (int i = 0; i < ARRAY_SIZEU(l_objectName); i++) { - if (obj->mProcName == procName) { - if (obj->mSubtype == subtype) { - return obj->mName; + if (obj->procname == procName) { + if (obj->argument == argument) { + return obj->name; } if (tmp == NULL) { - tmp = obj->mName; + tmp = obj->name; } } obj++; } if (tmp == NULL) { - snprintf(tmp_name, 8, "%d%+0d", procName, subtype); + snprintf(tmp_name, 8, "%d%+0d", procName, argument); tmp = tmp_name; } return tmp; } -const char* dStage_getName2(s16 procName, s8 subtype) { - return dStage_getName(procName, subtype); +const char* dStage_getName2(s16 procName, s8 argument) { + return dStage_getName(procName, argument); } /* 80450D60-80450D64 000260 0004+00 1/1 3/3 1/1 .sbss mProcID__20dStage_roomControl_c */ @@ -1577,9 +1577,9 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c OS_REPORT("\x1B""[43;30mStage Actor Name Nothing !! <%s>\n\x1B[m", i_actorData->name); JKRFree(i_actorPrm); } else { - i_actorPrm->subtype = actorInf->mSubtype; - if (actorInf->mProcName == PROC_SUSPEND) { - fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_FastCreate(actorInf->mProcName, NULL, NULL, i_actorPrm); + i_actorPrm->argument = actorInf->argument; + if (actorInf->procname == PROC_SUSPEND) { + fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_FastCreate(actorInf->procname, NULL, NULL, i_actorPrm); if (actor != NULL) { fopAcM_delete(actor); @@ -1587,7 +1587,7 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c return; } - fopAcM_create(actorInf->mProcName, NULL, i_actorPrm); + fopAcM_create(actorInf->procname, NULL, i_actorPrm); } } diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 55dd164e09..b303a6828b 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -153,7 +153,7 @@ static int fopAc_Create(void* i_this) { a_this->home.angle = append->base.angle; a_this->shape_angle = append->base.angle; a_this->parentActorID = append->parent_id; - a_this->argument = append->subtype; + a_this->argument = append->argument; a_this->scale.set(append->scale.x * 0.1f, append->scale.y * 0.1f, append->scale.z * 0.1f); a_this->setID = append->base.setID; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 58dcc20b5c..6f54360418 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -89,7 +89,7 @@ fopAcM_prm_class* fopAcM_CreateAppend() { append->scale.y = 10; append->scale.z = 10; append->parent_id = fpcM_ERROR_PROCESS_ID_e; - append->subtype = -1; + append->argument = -1; } return append; } @@ -97,7 +97,7 @@ fopAcM_prm_class* fopAcM_CreateAppend() { /* 80019B1C-80019C78 01445C 015C+00 4/4 0/0 0/0 .text * createAppend__FUsUlPC4cXyziPC5csXyzPC4cXyzScUi */ fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + const csXyz* i_angle, const cXyz* i_scale, s8 i_argument, fpc_ProcID i_parentId) { fopAcM_prm_class* append = fopAcM_CreateAppend(); if (append == NULL) { @@ -132,7 +132,7 @@ fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos, append->base.parameters = i_parameters; append->parent_id = i_parentId; - append->subtype = i_subtype; + append->argument = i_argument; return append; } @@ -164,10 +164,10 @@ s32 fopAcM_delete(fpc_ProcID i_actorID) { /* 80019D18-80019D98 014658 0080+00 2/2 0/0 0/0 .text * fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */ fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cXyz* i_pos, - int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, s8 i_argument, createFunc i_createFunc) { fopAcM_prm_class* append = createAppend(i_setId, i_parameters, i_pos, i_roomNo, i_angle, - i_scale, i_subtype, fpcM_ERROR_PROCESS_ID_e); + i_scale, i_argument, fpcM_ERROR_PROCESS_ID_e); if (append == NULL) { return fpcM_ERROR_PROCESS_ID_e; } @@ -178,18 +178,18 @@ fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cX /* 80019D98-80019E04 0146D8 006C+00 3/3 11/11 70/70 .text * fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc */ fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype) { + const csXyz* i_angle, const cXyz* i_scale, s8 i_argument) { return fopAcM_create(i_procName, 0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, - i_subtype, NULL); + i_argument, NULL); } /* 80019E04-80019E6C 014744 0068+00 5/5 6/6 18/18 .text * fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv */ fopAc_ac_c* fopAcM_fastCreate(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + const csXyz* i_angle, const cXyz* i_scale, s8 i_argument, createFunc i_createFunc, void* i_createFuncData) { fopAcM_prm_class* append = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, - i_subtype, fpcM_ERROR_PROCESS_ID_e); + i_argument, fpcM_ERROR_PROCESS_ID_e); if (append == NULL) { return NULL; } @@ -207,17 +207,17 @@ fopAc_ac_c* fopAcM_fastCreate(const char* i_actorname, u32 i_parameters, const c return NULL; } - return fopAcM_fastCreate(nameInfo->mProcName, i_parameters, i_pos, i_roomNo, i_angle, i_scale, - nameInfo->mSubtype, i_createFunc, i_createFuncData); + return fopAcM_fastCreate(nameInfo->procname, i_parameters, i_pos, i_roomNo, i_angle, i_scale, + nameInfo->argument, i_createFunc, i_createFuncData); } /* 80019EF0-80019F78 014830 0088+00 0/0 1/1 105/105 .text * fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */ fpc_ProcID fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, - const cXyz* i_scale, s8 i_subtype, createFunc i_createFunc) { + const cXyz* i_scale, s8 i_argument, createFunc i_createFunc) { fopAcM_prm_class* append = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, - i_subtype, i_parentID); + i_argument, i_parentID); if (append == NULL) { return fpcM_ERROR_PROCESS_ID_e; } @@ -229,7 +229,7 @@ fpc_ProcID fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentID, u32 i_param * fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */ fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, - const cXyz* i_scale, s8 i_subtype, + const cXyz* i_scale, s8 i_argument, createFunc i_createFunc) { fopAc_ac_c* parent_actor = fopAcM_SearchByID(i_parentID); s16 parent_angleY = parent_actor->current.angle.y; @@ -256,7 +256,7 @@ fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u pos.z += offset_pos.z * cM_scos(parent_angleY) - offset_pos.x * cM_ssin(parent_angleY); fopAcM_prm_class* append = - createAppend(0xFFFF, i_parameters, &pos, i_roomNo, &angle, i_scale, i_subtype, i_parentID); + createAppend(0xFFFF, i_parameters, &pos, i_roomNo, &angle, i_scale, i_argument, i_parentID); if (append == NULL) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1923,7 +1923,7 @@ static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* i_actor, void* i_ return NULL; } - if (prm->procname == fopAcM_GetProfName(i_actor) && prm->subtype == i_actor->argument) { + if (prm->procname == fopAcM_GetProfName(i_actor) && prm->argument == i_actor->argument) { if (prm->prm0 == 0 || prm->prm1 == (prm->prm0 & fopAcM_GetParam(i_actor))) { return i_actor; } @@ -1943,8 +1943,8 @@ fopAc_ac_c* fopAcM_searchFromName(char const* name, u32 param0, u32 param1) { return NULL; } - prm.procname = objInf->mProcName; - prm.subtype = objInf->mSubtype; + prm.procname = objInf->procname; + prm.argument = objInf->argument; return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObjectCB, &prm); } @@ -1957,7 +1957,7 @@ fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* i_actor, void* i_data) { return NULL; } - if (prm->procname == fopAcM_GetProfName(i_actor) && prm->subtype == i_actor->argument) { + if (prm->procname == fopAcM_GetProfName(i_actor) && prm->argument == i_actor->argument) { if (prm->event_id < 0 || prm->event_id == i_actor->eventInfo.getIdx()) { return i_actor; } @@ -1993,8 +1993,8 @@ fopAc_ac_c* fopAcM_searchFromName4Event(char const* i_name, s16 i_eventID) { return 0; } - prm.procname = objInf->mProcName; - prm.subtype = objInf->mSubtype; + prm.procname = objInf->procname; + prm.argument = objInf->argument; return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObject4EventCB, &prm); }