mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 14:05:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

name cPhsUNK3_e

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-12-24 14:37:05 -08:00
parent ced4f69ee7
commit 2db35c0108
18 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_phase.h
+1 -1
View File
@@ -8,7 +8,7 @@ enum cPhs__Step {
/* 0x0 */ cPhs_INIT_e,
/* 0x1 */ cPhs_LOADING_e,
/* 0x2 */ cPhs_NEXT_e,
/* 0x3 */ cPhs_UNK3_e, // appears to be an alternate error code, unsure how it differs
/* 0x3 */ cPhs_STOP_e, // similar to error, except doesn't indicate anything bad
/* 0x4 */ cPhs_COMPLEATE_e,
/* 0x5 */ cPhs_ERROR_e,
};
src/SSystem/SComponent/c_phase.cpp
+2 -2
View File
@@ -62,9 +62,9 @@ int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData) {
return cPhs_Next(pPhase) == cPhs_LOADING_e ? cPhs_NEXT_e : cPhs_COMPLEATE_e;
case cPhs_COMPLEATE_e:
return cPhs_Compleate(pPhase);
case cPhs_UNK3_e:
case cPhs_STOP_e:
cPhs_UnCompleate(pPhase);
return cPhs_UNK3_e;
return cPhs_STOP_e;
case cPhs_ERROR_e:
cPhs_UnCompleate(pPhase);
return cPhs_ERROR_e;
src/d/actor/d_a_npc_people.cpp
+4 -4
View File
@@ -4117,7 +4117,7 @@ static s32 phase_1(daNpcPeople_c* i_this) {
case 0x6:
if(strcmp(dComIfGp_getStartStageName(), "Ocmera") == 0) {
if(dComIfGs_checkGetItem(COLLECT_MAP_20) || arg0 != dComIfGp_getStartStagePoint()) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
}
i_this->setEtcFlag(0x40);
@@ -4127,7 +4127,7 @@ static s32 phase_1(daNpcPeople_c* i_this) {
case 0x8:
case 0xA:
if(arg0 != 0xFF && (u32)((arg0 << 1) & 0xFE) != (dComIfGs_getEventReg(0xB907) & 6)) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
}
break;
@@ -4138,13 +4138,13 @@ static s32 phase_1(daNpcPeople_c* i_this) {
switch(arg0) {
case 0:
if(day == 5 || day == 6) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
}
break;
case 1:
if(day != 5 && day != 6) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
}
break;
src/d/actor/d_a_npc_roten.cpp
+1 -1
View File
@@ -1592,7 +1592,7 @@ static s32 phase_1(daNpcRoten_c* i_this) {
i_this->setNpcNo(i_this->getPrmNpcNo());
if(!dComIfGs_isEventBit(0x1108)) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
}
i_this->setResFlag(1);
src/d/actor/d_a_obj_Yboil.cpp
+2 -2
View File
@@ -87,7 +87,7 @@ s32 daObjYboil_c::_create() {
s32 ret;
if (dComIfGs_isEventBit(0x1902)) {
ret = cPhs_UNK3_e;
ret = cPhs_STOP_e;
} else {
ret = dComIfG_resLoad(&mPhs, "Yboil");
if (ret == cPhs_COMPLEATE_e) {
@@ -102,7 +102,7 @@ s32 daObjYboil_c::_create() {
}
bool daObjYboil_c::_delete() {
if (fpcM_CreateResult(this) != cPhs_UNK3_e) {
if (fpcM_CreateResult(this) != cPhs_STOP_e) {
dComIfG_resDelete(&mPhs, "Yboil");
}
return true;
src/d/actor/d_a_obj_eskban.cpp
+2 -2
View File
@@ -154,7 +154,7 @@ s32 daObjEskban::Act_c::Mthd_Create() {
s32 swSave = param_get_swSave();
if (fopAcM_isSwitch(this, swSave)) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
}
phase_state = dComIfG_resLoad(&mPhs, M_arcname);
if (phase_state == cPhs_COMPLEATE_e) {
@@ -178,7 +178,7 @@ BOOL daObjEskban::Act_c::Delete() {
/* 00000A10-00000A68 .text Mthd_Delete__Q211daObjEskban5Act_cFv */
BOOL daObjEskban::Act_c::Mthd_Delete() {
s32 result = MoveBGDelete();
if (fpcM_CreateResult(this) != cPhs_UNK3_e) {
if (fpcM_CreateResult(this) != cPhs_STOP_e) {
dComIfG_resDelete(&mPhs, M_arcname);
}
return result;
src/d/actor/d_a_obj_kanat.cpp
+2 -2
View File
@@ -36,7 +36,7 @@ s32 daObjKanat::Act_c::Mthd_Create() {
fopAcM_SetupActor(this, daObjKanat::Act_c);
if (fopAcM_isSwitch(this, prm_get_swSave())) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
}
s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname);
@@ -57,7 +57,7 @@ BOOL daObjKanat::Act_c::Delete() {
/* 0000031C-00000374 .text Mthd_Delete__Q210daObjKanat5Act_cFv */
BOOL daObjKanat::Act_c::Mthd_Delete() {
s32 result = MoveBGDelete();
if (fpcM_CreateResult(this) != cPhs_UNK3_e) {
if (fpcM_CreateResult(this) != cPhs_STOP_e) {
dComIfG_resDelete(&mPhs, M_arcname);
}
return result;
src/d/actor/d_a_obj_mknjd.cpp
+1 -1
View File
@@ -329,7 +329,7 @@ int daObjMknjD::Act_c::Delete() {
s32 daObjMknjD::Act_c::Mthd_Delete() {
int bgDeleteResult = MoveBGDelete();
if (fpcM_CreateResult(this) != cPhs_UNK3_e) {
if (fpcM_CreateResult(this) != cPhs_STOP_e) {
dComIfG_resDelete(&mPhs, M_arcname);
}
src/d/actor/d_a_obj_quake.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ s32 daObjQuake_c::_create() {
fopAcM_SetupActor(this, daObjQuake_c);
if (dComIfGs_isSymbol(1)) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
}
if (getPrmType() < 3) {
src/d/actor/d_a_obj_tower.cpp
+2 -2
View File
@@ -67,7 +67,7 @@ cPhs__Step daObjTower_c::_create() {
field_0x2d0 = 0;
if (!dComIfGs_isEventBit(0x1e40)) {
PVar3 = cPhs_UNK3_e;
PVar3 = cPhs_STOP_e;
} else {
PVar3 = (cPhs__Step)dComIfG_resLoad(&mPhs, "X_tower");
if (PVar3 == cPhs_COMPLEATE_e) {
@@ -91,7 +91,7 @@ BOOL daObjTower_c::_delete() {
dComIfG_Bgsp()->Release(mpBgW);
}
if (fpcM_CreateResult(this) != cPhs_UNK3_e) {
if (fpcM_CreateResult(this) != cPhs_STOP_e) {
dComIfG_resDelete(&(mPhs), "X_tower");
}
src/d/actor/d_a_obj_vfan.cpp
+2 -2
View File
@@ -89,7 +89,7 @@ s32 daObjVfan::Act_c::Mthd_Create() {
int phase_state;
if (fopAcM_isSwitch(this, prm_get_swSave())) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
} else {
phase_state = dComIfG_resLoad(&mPhs, M_arcname);
if (phase_state == cPhs_COMPLEATE_e) {
@@ -110,7 +110,7 @@ BOOL daObjVfan::Act_c::Delete() {
/* 00000590-000005E8 .text Mthd_Delete__Q29daObjVfan5Act_cFv */
BOOL daObjVfan::Act_c::Mthd_Delete() {
int res = MoveBGDelete();
if (fpcM_CreateResult(this) != cPhs_UNK3_e) {
if (fpcM_CreateResult(this) != cPhs_STOP_e) {
dComIfG_resDelete(&mPhs, M_arcname);
}
return res;
src/d/actor/d_a_tag_ret.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ namespace daTagRet {
fopAcM_SetupActor(this, daTagRet::Act_c);
if (checkItemGet(dItem_PEARL_FARORE_e, TRUE)) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
}
mStts.Init(0xFF, 0xFF, this);
src/d/d_com_lib_game.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ int dComLbG_PhaseHandler(request_of_phase_process_class* i_phaseReq, cPhs__Handl
phase = dComLbG_PhaseHandler(i_phaseReq, i_handler, i_data);
break;
case cPhs_LOADING_e:
case cPhs_UNK3_e:
case cPhs_STOP_e:
break;
}
src/f_op/f_op_overlap_mng.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ request_base_class* fopOvlpM_Request(s16 procName, u16 peekTime) {
void fopOvlpM_Management() {
if (l_fopOvlpM_overlap[0] != NULL) {
switch (fopOvlpReq_Handler(l_fopOvlpM_overlap[0])) {
case cPhs_UNK3_e:
case cPhs_STOP_e:
case cPhs_COMPLEATE_e:
case cPhs_ERROR_e:
l_fopOvlpM_overlap[0] = NULL;
src/f_op/f_op_overlap_req.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ s32 fopOvlpReq_Handler(overlap_request_class* i_this) {
return cPhs_INIT_e;
case cPhs_COMPLEATE_e:
return cPhs_COMPLEATE_e;
case cPhs_UNK3_e:
case cPhs_STOP_e:
case cPhs_ERROR_e:
return cPhs_ERROR_e;
default:
src/f_pc/f_pc_base.cpp
+3 -3
View File
@@ -124,9 +124,9 @@ s32 fpcBs_SubCreate(base_process_class* i_proc) {
i_proc->mInitState = 1;
i_proc->mCreateResult = cPhs_INIT_e;
return cPhs_INIT_e;
case cPhs_UNK3_e:
i_proc->mCreateResult = cPhs_UNK3_e;
return cPhs_UNK3_e;
case cPhs_STOP_e:
i_proc->mCreateResult = cPhs_STOP_e;
return cPhs_STOP_e;
case cPhs_ERROR_e:
default:
i_proc->mCreateResult = cPhs_ERROR_e;
src/f_pc/f_pc_fstcreate_req.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
/* 80040520-80040570 .text fpcFCtRq_Do__FP19fast_create_request */
s32 fpcFCtRq_Do(fast_create_request* i_createReq) {
if (i_createReq->mpFastCreateFunc != NULL && i_createReq->mpFastCreateFunc(i_createReq->base.mpRes, i_createReq->mpFastCreateData) == 0) {
return cPhs_UNK3_e;
return cPhs_STOP_e;
} else {
return cPhs_COMPLEATE_e;
}
src/f_pc/f_pc_node_req.cpp
+3 -3
View File
@@ -87,8 +87,8 @@ s32 fpcNdRq_Execute(node_create_request* i_NdCtReq) {
case cPhs_COMPLEATE_e:
return cPhs_NEXT_e;
case cPhs_ERROR_e:
case cPhs_UNK3_e:
return cPhs_UNK3_e;
case cPhs_STOP_e:
return cPhs_STOP_e;
default:
return result;
}
@@ -116,7 +116,7 @@ s32 fpcNdRq_Handler() {
while (currentNode != NULL) {
node_create_request* req = ((request_node_class*)currentNode)->mNodeCrReq;
switch (req->mpNodeCrReqMthCls->mpExecuteFunc(req)) {
case cPhs_UNK3_e:
case cPhs_STOP_e:
case cPhs_ERROR_e:
currentNode = NODE_GET_NEXT(currentNode);
if (fpcNdRq_Cancel(req) == 0) {