encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Finish renaming subtype to argument (#2659)

Browse Source
This commit is contained in:
LagoLunatic
2025-09-14 13:17:54 -07:00
committed by GitHub
parent bd49d7b918
commit ae6f4242b3
6 changed files with 78 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_stage.h
+4 -4
View File
@@ -1189,9 +1189,9 @@ private:
// unknown name // unknown name
struct dStage_objectNameInf { struct dStage_objectNameInf {
char mName[8]; /* 0x00 */ char name[8];
s16 mProcName; /* 0x08 */ s16 procname;
s8 mSubtype; /* 0x0A */ s8 argument;
}; // Size: 0xC }; // Size: 0xC
class dStage_KeepDoorInfo { 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_GetKeepDoorInfo();
dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo(); dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo();
void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage); 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 #if VERSION == VERSION_WII_USA_R0
void dStage_escapeRestart(); void dStage_escapeRestart();
include/f_op/f_op_actor_mng.h
+11 -11
View File
@@ -60,7 +60,7 @@ struct fopAcM_prm_class {
/* 0x00 */ fopAcM_prmBase_class base; /* 0x00 */ fopAcM_prmBase_class base;
/* 0x18 */ fopAcM_prmScale_class scale; /* 0x18 */ fopAcM_prmScale_class scale;
/* 0x1C */ fpc_ProcID parent_id; /* 0x1C */ fpc_ProcID parent_id;
/* 0x20 */ s8 subtype; /* 0x20 */ s8 argument;
/* 0x21 */ s8 room_no; /* 0x21 */ s8 room_no;
}; };
@@ -70,20 +70,20 @@ struct fopAcM_search4ev_prm {
name[0] = 0; name[0] = 0;
event_id = -1; event_id = -1;
procname = PROC_PLAY_SCENE; procname = PROC_PLAY_SCENE;
subtype = 0; argument = 0;
} }
/* 0x00 */ char name[30]; /* 0x00 */ char name[30];
/* 0x1E */ s16 event_id; /* 0x1E */ s16 event_id;
/* 0x20 */ s16 procname; /* 0x20 */ s16 procname;
/* 0x22 */ s8 subtype; /* 0x22 */ s8 argument;
}; };
struct fopAcM_search_prm { struct fopAcM_search_prm {
/* 0x00 */ u32 prm0; /* 0x00 */ u32 prm0;
/* 0x04 */ u32 prm1; /* 0x04 */ u32 prm1;
/* 0x08 */ s16 procname; /* 0x08 */ s16 procname;
/* 0x0A */ s8 subtype; /* 0x0A */ s8 argument;
}; };
struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { 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* fopAcM_CreateAppend();
fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos, int i_roomNo, 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); fpc_ProcID i_parentId);
void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message); 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); s32 fopAcM_delete(fpc_ProcID i_actorID);
fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cXyz* i_pos, 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); createFunc i_createFunc);
fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, 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) { inline fpc_ProcID fopAcM_create(s16 i_procName, createFunc i_createFunc, void* params) {
return fpcM_Create(i_procName, i_createFunc, 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, 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); createFunc i_createFunc, void* i_createFuncData);
fopAc_ac_c* fopAcM_fastCreate(const char* i_actorname, u32 i_parameters, const cXyz* i_pos, 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, 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_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, 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_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); 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]; char buf[64];
snprintf(buf, sizeof(buf), "<%s> %s", dStage_getName(fopAcM_GetProfName(i_actor), 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); i_line, buf, args);
va_end(args); */ va_end(args); */
src/d/d_event_data.cpp
+28 -15
View File
@@ -389,7 +389,7 @@ void dEvDtStaff_c::specialProcLight() {
f32* hourP; f32* hourP;
switch (*(int*)nowCutName) { switch (*(int*)nowCutName) {
case 'CHAN': case 'CHAN': {
hourP = dComIfGp_evmng_getMyFloatP(staffId, "Hour"); hourP = dComIfGp_evmng_getMyFloatP(staffId, "Hour");
if (hourP != NULL) { if (hourP != NULL) {
dKy_instant_timechg(*hourP * 15.0f); dKy_instant_timechg(*hourP * 15.0f);
@@ -403,6 +403,7 @@ void dEvDtStaff_c::specialProcLight() {
} }
} }
break; break;
}
case 'ADD_': case 'ADD_':
hourP = dComIfGp_evmng_getMyFloatP(staffId, "Hour"); hourP = dComIfGp_evmng_getMyFloatP(staffId, "Hour");
if (hourP != NULL) { if (hourP != NULL) {
@@ -452,7 +453,7 @@ void dEvDtStaff_c::specialProcMessage() {
case 'FINI': case 'FINI':
work->mLMsg->mode = 0x10; work->mLMsg->mode = 0x10;
break; break;
case 'CONT': case 'CONT': {
work->mLMsg->mode = 0xF; work->mLMsg->mode = 0xF;
int* ptr = dComIfGp_evmng_getMyIntegerP(staffId, "msgNo"); int* ptr = dComIfGp_evmng_getMyIntegerP(staffId, "msgNo");
if (ptr == NULL) { if (ptr == NULL) {
@@ -461,7 +462,8 @@ void dEvDtStaff_c::specialProcMessage() {
work->mMsgNo = *ptr; work->mMsgNo = *ptr;
fopMsgM_messageSet(work->mMsgNo, 1000); fopMsgM_messageSet(work->mMsgNo, 1000);
break; break;
case 'SAVE': }
case 'SAVE': {
work->mMsgNo = 1; work->mMsgNo = 1;
int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type");
if (typeP != NULL && *typeP == 1) { if (typeP != NULL && *typeP == 1) {
@@ -469,7 +471,8 @@ void dEvDtStaff_c::specialProcMessage() {
} }
work->_0 = d_GameOver_Create(work->mMsgNo); work->_0 = d_GameOver_Create(work->mMsgNo);
break; break;
case 'TELO': }
case 'TELO': {
int* forStartP = dComIfGp_evmng_getMyIntegerP(staffId, "ForStart"); int* forStartP = dComIfGp_evmng_getMyIntegerP(staffId, "ForStart");
if (forStartP != NULL && *forStartP != 0) { if (forStartP != NULL && *forStartP != 0) {
@@ -492,6 +495,7 @@ void dEvDtStaff_c::specialProcMessage() {
} }
} }
} }
}
switch (*(int*)nowCutName) { switch (*(int*)nowCutName) {
case 'WAIT': case 'WAIT':
@@ -624,7 +628,7 @@ void dEvDtStaff_c::specialProcSound() {
case 'NOMS': case 'NOMS':
specialProc_WaitStart(staffId); specialProc_WaitStart(staffId);
break; break;
case 'RIDD': case 'RIDD': {
int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type");
if (typeP != NULL && *typeP == 1) { if (typeP != NULL && *typeP == 1) {
mDoAud_seStart(Z2SE_READ_RIDDLE_A, NULL, 0, 0); mDoAud_seStart(Z2SE_READ_RIDDLE_A, NULL, 0, 0);
@@ -632,13 +636,15 @@ void dEvDtStaff_c::specialProcSound() {
mDoAud_seStart(Z2SE_READ_RIDDLE_B, NULL, 0, 0); mDoAud_seStart(Z2SE_READ_RIDDLE_B, NULL, 0, 0);
} }
break; break;
case 'BGMS': }
case 'BGMS': {
int* timerP = dComIfGp_evmng_getMyIntegerP(staffId, "Timer"); int* timerP = dComIfGp_evmng_getMyIntegerP(staffId, "Timer");
if (timerP != NULL) { if (timerP != NULL) {
mDoAud_bgmStop(*timerP); mDoAud_bgmStop(*timerP);
} }
} }
} }
}
switch (*(int*)nowCutName) { switch (*(int*)nowCutName) {
case 'WAIT': case 'WAIT':
@@ -707,8 +713,8 @@ void dEvDtStaff_c::specialProcCreate() {
scale = *scaleP; scale = *scaleP;
} }
fopAcM_create(objNameInf->mProcName, arg, &pos, dComIfGp_roomControl_getStayNo(), fopAcM_create(objNameInf->procname, arg, &pos, dComIfGp_roomControl_getStayNo(),
&angle, &scale, objNameInf->mSubtype); &angle, &scale, objNameInf->argument);
break; break;
} }
} }
@@ -779,7 +785,7 @@ void dEvDtStaff_c::specialProcDirector() {
case 'NEXT': case 'NEXT':
dEvDt_Next_Stage(staffId, 0xD); dEvDt_Next_Stage(staffId, 0xD);
break; break;
case 'SKIP': case 'SKIP': {
char* zev = dComIfGp_evmng_getMyStringP(staffId, "Zev"); char* zev = dComIfGp_evmng_getMyStringP(staffId, "Zev");
// cast needed to match // cast needed to match
void* pt = (void*)evtControl.getPt1(); void* pt = (void*)evtControl.getPt1();
@@ -793,7 +799,8 @@ void dEvDtStaff_c::specialProcDirector() {
evtControl.setSkipProc(pt, dEv_defaultSkipProc, 0); evtControl.setSkipProc(pt, dEv_defaultSkipProc, 0);
} }
break; break;
case 'FADE': }
case 'FADE': {
f32* rateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate"); f32* rateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate");
int* colorP = dComIfGp_evmng_getMyIntegerP(staffId, "Color"); int* colorP = dComIfGp_evmng_getMyIntegerP(staffId, "Color");
@@ -811,13 +818,15 @@ void dEvDtStaff_c::specialProcDirector() {
mDoGph_gInf_c::fadeOut(*rateP); mDoGph_gInf_c::fadeOut(*rateP);
} }
break; break;
case 'VIBR': }
case 'VIBR': {
specialProc_WaitStart(staffId); specialProc_WaitStart(staffId);
int* patternP = dComIfGp_evmng_getMyIntegerP(staffId, "Pattern"); int* patternP = dComIfGp_evmng_getMyIntegerP(staffId, "Pattern");
int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type");
dComIfGp_getVibration().StartQuake((u8*)patternP, 0, *typeP, cXyz(0, 1, 0)); dComIfGp_getVibration().StartQuake((u8*)patternP, 0, *typeP, cXyz(0, 1, 0));
break; break;
case 'WIPE': }
case 'WIPE': {
f32* wipeRateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate"); f32* wipeRateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate");
dDlst_list_c::wipeIn(-*wipeRateP); dDlst_list_c::wipeIn(-*wipeRateP);
if (*wipeRateP > 0) { if (*wipeRateP > 0) {
@@ -834,7 +843,8 @@ void dEvDtStaff_c::specialProcDirector() {
} }
} }
break; break;
case 'MAPT': }
case 'MAPT': {
int* idP = dComIfGp_evmng_getMyIntegerP(staffId, "ID"); int* idP = dComIfGp_evmng_getMyIntegerP(staffId, "ID");
data->unk = *idP; data->unk = *idP;
dStage_MapEvent_dt_c* mapEvent = dEvt_control_c::searchMapEventData(data->unk); dStage_MapEvent_dt_c* mapEvent = dEvt_control_c::searchMapEventData(data->unk);
@@ -848,7 +858,8 @@ void dEvDtStaff_c::specialProcDirector() {
data->unk2 = 0; data->unk2 = 0;
} }
break; break;
case 'CAST': }
case 'CAST': {
char* pt2Name = dComIfGp_evmng_getMyStringP(staffId, "Pt2"); char* pt2Name = dComIfGp_evmng_getMyStringP(staffId, "Pt2");
if (pt2Name != NULL) { if (pt2Name != NULL) {
fopAc_ac_c* pt2 = fopAcM_searchFromName4Event(pt2Name, -1); fopAc_ac_c* pt2 = fopAcM_searchFromName4Event(pt2Name, -1);
@@ -881,6 +892,7 @@ void dEvDtStaff_c::specialProcDirector() {
} }
} }
break; break;
}
case 'SPEC': case 'SPEC':
int* specTypeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); int* specTypeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type");
if (specTypeP != NULL) { if (specTypeP != NULL) {
@@ -1002,7 +1014,7 @@ void dEvDtStaff_c::specialProcPackage() {
case 'WAIT': case 'WAIT':
specialProc_WaitProc(staffId); specialProc_WaitProc(staffId);
break; break;
case 'PLAY': case 'PLAY': {
dEvt_control_c& evtControl = dComIfGp_getEvent(); dEvt_control_c& evtControl = dComIfGp_getEvent();
if (dDemo_c::getMode() == 2) { if (dDemo_c::getMode() == 2) {
dStage_MapEvent_dt_c* event = evtControl.getStageEventDt(); dStage_MapEvent_dt_c* event = evtControl.getStageEventDt();
@@ -1018,6 +1030,7 @@ void dEvDtStaff_c::specialProcPackage() {
dComIfGp_evmng_cutEnd(staffId); dComIfGp_evmng_cutEnd(staffId);
} }
break; break;
}
default: default:
dComIfGp_evmng_cutEnd(staffId); dComIfGp_evmng_cutEnd(staffId);
break; break;
src/d/d_stage.cpp
+13 -13
View File
@@ -1501,7 +1501,7 @@ dStage_objectNameInf* dStage_searchName(char const* objName) {
dStage_objectNameInf* obj = l_objectName; dStage_objectNameInf* obj = l_objectName;
for (u32 i = 0; i < ARRAY_SIZEU(l_objectName); i++) { for (u32 i = 0; i < ARRAY_SIZEU(l_objectName); i++) {
if (!strcmp(obj->mName, objName)) { if (!strcmp(obj->name, objName)) {
return obj; return obj;
} }
obj++; obj++;
@@ -1511,33 +1511,33 @@ dStage_objectNameInf* dStage_searchName(char const* objName) {
return NULL; return NULL;
} }
const char* dStage_getName(s16 procName, s8 subtype) { const char* dStage_getName(s16 procName, s8 argument) {
static char tmp_name[8]; static char tmp_name[8];
dStage_objectNameInf* obj = l_objectName; dStage_objectNameInf* obj = l_objectName;
char* tmp = NULL; char* tmp = NULL;
for (int i = 0; i < ARRAY_SIZEU(l_objectName); i++) { for (int i = 0; i < ARRAY_SIZEU(l_objectName); i++) {
if (obj->mProcName == procName) { if (obj->procname == procName) {
if (obj->mSubtype == subtype) { if (obj->argument == argument) {
return obj->mName; return obj->name;
} }
if (tmp == NULL) { if (tmp == NULL) {
tmp = obj->mName; tmp = obj->name;
} }
} }
obj++; obj++;
} }
if (tmp == NULL) { if (tmp == NULL) {
snprintf(tmp_name, 8, "%d%+0d", procName, subtype); snprintf(tmp_name, 8, "%d%+0d", procName, argument);
tmp = tmp_name; tmp = tmp_name;
} }
return tmp; return tmp;
} }
const char* dStage_getName2(s16 procName, s8 subtype) { const char* dStage_getName2(s16 procName, s8 argument) {
return dStage_getName(procName, subtype); return dStage_getName(procName, argument);
} }
/* 80450D60-80450D64 000260 0004+00 1/1 3/3 1/1 .sbss mProcID__20dStage_roomControl_c */ /* 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); OS_REPORT("\x1B""[43;30mStage Actor Name Nothing !! <%s>\n\x1B[m", i_actorData->name);
JKRFree(i_actorPrm); JKRFree(i_actorPrm);
} else { } else {
i_actorPrm->subtype = actorInf->mSubtype; i_actorPrm->argument = actorInf->argument;
if (actorInf->mProcName == PROC_SUSPEND) { if (actorInf->procname == PROC_SUSPEND) {
fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_FastCreate(actorInf->mProcName, NULL, NULL, i_actorPrm); fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_FastCreate(actorInf->procname, NULL, NULL, i_actorPrm);
if (actor != NULL) { if (actor != NULL) {
fopAcM_delete(actor); fopAcM_delete(actor);
@@ -1587,7 +1587,7 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c
return; return;
} }
fopAcM_create(actorInf->mProcName, NULL, i_actorPrm); fopAcM_create(actorInf->procname, NULL, i_actorPrm);
} }
} }
src/f_op/f_op_actor.cpp
+1 -1
View File
@@ -153,7 +153,7 @@ static int fopAc_Create(void* i_this) {
a_this->home.angle = append->base.angle; a_this->home.angle = append->base.angle;
a_this->shape_angle = append->base.angle; a_this->shape_angle = append->base.angle;
a_this->parentActorID = append->parent_id; 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, a_this->scale.set(append->scale.x * 0.1f, append->scale.y * 0.1f,
append->scale.z * 0.1f); append->scale.z * 0.1f);
a_this->setID = append->base.setID; a_this->setID = append->base.setID;
src/f_op/f_op_actor_mng.cpp
+21 -21
View File
@@ -89,7 +89,7 @@ fopAcM_prm_class* fopAcM_CreateAppend() {
append->scale.y = 10; append->scale.y = 10;
append->scale.z = 10; append->scale.z = 10;
append->parent_id = fpcM_ERROR_PROCESS_ID_e; append->parent_id = fpcM_ERROR_PROCESS_ID_e;
append->subtype = -1; append->argument = -1;
} }
return append; return append;
} }
@@ -97,7 +97,7 @@ fopAcM_prm_class* fopAcM_CreateAppend() {
/* 80019B1C-80019C78 01445C 015C+00 4/4 0/0 0/0 .text /* 80019B1C-80019C78 01445C 015C+00 4/4 0/0 0/0 .text
* createAppend__FUsUlPC4cXyziPC5csXyzPC4cXyzScUi */ * createAppend__FUsUlPC4cXyziPC5csXyzPC4cXyzScUi */
fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos, int i_roomNo, 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) { fpc_ProcID i_parentId) {
fopAcM_prm_class* append = fopAcM_CreateAppend(); fopAcM_prm_class* append = fopAcM_CreateAppend();
if (append == NULL) { 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->base.parameters = i_parameters;
append->parent_id = i_parentId; append->parent_id = i_parentId;
append->subtype = i_subtype; append->argument = i_argument;
return append; 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 /* 80019D18-80019D98 014658 0080+00 2/2 0/0 0/0 .text
* fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */ * fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */
fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cXyz* i_pos, 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) { createFunc i_createFunc) {
fopAcM_prm_class* append = createAppend(i_setId, i_parameters, i_pos, i_roomNo, i_angle, 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) { if (append == NULL) {
return fpcM_ERROR_PROCESS_ID_e; 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 /* 80019D98-80019E04 0146D8 006C+00 3/3 11/11 70/70 .text
* fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc */ * fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc */
fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, 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, 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 /* 80019E04-80019E6C 014744 0068+00 5/5 6/6 18/18 .text
* fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv */ * fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv */
fopAc_ac_c* fopAcM_fastCreate(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, 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) { createFunc i_createFunc, void* i_createFuncData) {
fopAcM_prm_class* append = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, 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) { if (append == NULL) {
return NULL; return NULL;
} }
@@ -207,17 +207,17 @@ fopAc_ac_c* fopAcM_fastCreate(const char* i_actorname, u32 i_parameters, const c
return NULL; return NULL;
} }
return fopAcM_fastCreate(nameInfo->mProcName, i_parameters, i_pos, i_roomNo, i_angle, i_scale, return fopAcM_fastCreate(nameInfo->procname, i_parameters, i_pos, i_roomNo, i_angle, i_scale,
nameInfo->mSubtype, i_createFunc, i_createFuncData); nameInfo->argument, i_createFunc, i_createFuncData);
} }
/* 80019EF0-80019F78 014830 0088+00 0/0 1/1 105/105 .text /* 80019EF0-80019F78 014830 0088+00 0/0 1/1 105/105 .text
* fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */ * fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */
fpc_ProcID fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, 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_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, 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) { if (append == NULL) {
return fpcM_ERROR_PROCESS_ID_e; 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 */ * fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */
fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, 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_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) { createFunc i_createFunc) {
fopAc_ac_c* parent_actor = fopAcM_SearchByID(i_parentID); fopAc_ac_c* parent_actor = fopAcM_SearchByID(i_parentID);
s16 parent_angleY = parent_actor->current.angle.y; 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); pos.z += offset_pos.z * cM_scos(parent_angleY) - offset_pos.x * cM_ssin(parent_angleY);
fopAcM_prm_class* append = 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) { if (append == NULL) {
return fpcM_ERROR_PROCESS_ID_e; 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; 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))) { if (prm->prm0 == 0 || prm->prm1 == (prm->prm0 & fopAcM_GetParam(i_actor))) {
return i_actor; return i_actor;
} }
@@ -1943,8 +1943,8 @@ fopAc_ac_c* fopAcM_searchFromName(char const* name, u32 param0, u32 param1) {
return NULL; return NULL;
} }
prm.procname = objInf->mProcName; prm.procname = objInf->procname;
prm.subtype = objInf->mSubtype; prm.argument = objInf->argument;
return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObjectCB, &prm); 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; 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()) { if (prm->event_id < 0 || prm->event_id == i_actor->eventInfo.getIdx()) {
return i_actor; return i_actor;
} }
@@ -1993,8 +1993,8 @@ fopAc_ac_c* fopAcM_searchFromName4Event(char const* i_name, s16 i_eventID) {
return 0; return 0;
} }
prm.procname = objInf->mProcName; prm.procname = objInf->procname;
prm.subtype = objInf->mSubtype; prm.argument = objInf->argument;
return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObject4EventCB, &prm); return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObject4EventCB, &prm);
} }