mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-05 00:59:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)

Browse Source 
* typedef for cPhs_Step

* make sdk includes consistent

* d_menu_quit / d_msg_scrn_explain debug

* d_a_obj_testcube mostly done

* d_debug_pad mostly done

* jstudio tool library headers

* some JStudioCameraEditor headers

* d_jcam_editor mostly done

* try fixing some shield regressions

* d_bg_parts mostly done

* fix merge errors

* debug fix
This commit is contained in:
TakaRikka
2026-01-24 23:36:23 -08:00
committed by GitHub
parent 6f73e18bd2
commit c9e2a73dda
612 changed files with 4052 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -1132,7 +1132,7 @@ static void* daAlink_searchHorseZelda(fopAc_ac_c* param_0, void* param_1) {
return NULL;
}
cPhs__Step daArrow_c::create() {
cPhs_Step daArrow_c::create() {
fopAcM_ct(this, daArrow_c);
mArrowType = fopAcM_GetParamBit(this, 8, 8);
src/d/actor/d_a_b_ds.cpp
+3 -3
View File
@@ -5426,10 +5426,10 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return static_cast<daB_DS_c*>(i_this)->CreateHeap();
}
cPhs__Step daB_DS_c::create() {
cPhs_Step daB_DS_c::create() {
fopAcM_ct(this, daB_DS_c);
cPhs__Step phase_state = (cPhs__Step)dComIfG_resLoad(&mPhase, "B_DS");
cPhs_Step phase_state = dComIfG_resLoad(&mPhase, "B_DS");
if (phase_state == cPhs_COMPLEATE_e) {
if (arg0 == TYPE_BATTLE_1 && dComIfGs_isStageBossEnemy()) {
// "After B_DS defeated, so not re-setting\n"
@@ -5676,7 +5676,7 @@ cPhs__Step daB_DS_c::create() {
daB_DS_c::daB_DS_c() {}
static cPhs__Step daB_DS_Create(daB_DS_c* i_this) {
static cPhs_Step daB_DS_Create(daB_DS_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_b_tn.cpp
+2 -2
View File
@@ -5048,9 +5048,9 @@ int daB_TN_c::create() {
}
}
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq1, "B_tn");
cPhs_Step step = dComIfG_resLoad(&mPhaseReq1, "B_tn");
if (step == cPhs_COMPLEATE_e) {
step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq2, mArcName);
step = dComIfG_resLoad(&mPhaseReq2, mArcName);
if (step == cPhs_COMPLEATE_e) {
mBrkAnmFrame = fopAcM_GetParamBit(this, 16, 16);
src/d/actor/d_a_b_yo.cpp
+9 -9
View File
@@ -3242,9 +3242,9 @@ static int useHeapInit2(fopAc_ac_c* i_this) {
return static_cast<daB_YO_c*>(i_this)->CreateHeap2();
}
cPhs__Step daB_YO_c::create() {
cPhs_Step daB_YO_c::create() {
fopAcM_ct(this, daB_YO_c);
cPhs__Step step;
cPhs_Step step;
mSwNo = fopAcM_GetParam(this) & 0xff;
mSwNo2 = (fopAcM_GetParam(this) >> 8) & 0xff;
@@ -3258,7 +3258,7 @@ cPhs__Step daB_YO_c::create() {
mIsInactive2 = mIsInactive;
if (mIsInactive == 1) {
step = (cPhs__Step)dComIfG_resLoad(&mPhase2, "L5_R50");
step = dComIfG_resLoad(&mPhase2, "L5_R50");
if (step == cPhs_COMPLEATE_e) {
if (!daMirror_c::remove()) {
@@ -3292,11 +3292,11 @@ cPhs__Step daB_YO_c::create() {
return step;
} else {
if ((step = (cPhs__Step)dComIfG_resLoad(&mPhase1, "B_YO"), step == cPhs_COMPLEATE_e)
&& (step = (cPhs__Step)dComIfG_resLoad(&mPhase2, "L5_R50"), step == cPhs_COMPLEATE_e)
&& (step = (cPhs__Step)dComIfG_resLoad(&mPhase3, "ykW"), step == cPhs_COMPLEATE_e)
&& (step = (cPhs__Step)dComIfG_resLoad(&mPhase4, "ykW1"), step == cPhs_COMPLEATE_e)
&& (step = (cPhs__Step)dComIfG_resLoad(&mPhase5, "E_FZ"), step == cPhs_COMPLEATE_e))
if ((step = dComIfG_resLoad(&mPhase1, "B_YO"), step == cPhs_COMPLEATE_e)
&& (step = dComIfG_resLoad(&mPhase2, "L5_R50"), step == cPhs_COMPLEATE_e)
&& (step = dComIfG_resLoad(&mPhase3, "ykW"), step == cPhs_COMPLEATE_e)
&& (step = dComIfG_resLoad(&mPhase4, "ykW1"), step == cPhs_COMPLEATE_e)
&& (step = dComIfG_resLoad(&mPhase5, "E_FZ"), step == cPhs_COMPLEATE_e))
{
if (cDmr_SkipInfo != 0 && !daMirror_c::remove()) {
return cPhs_INIT_e;
@@ -3412,7 +3412,7 @@ cPhs__Step daB_YO_c::create() {
}
}
static cPhs__Step daB_YO_Create(daB_YO_c* i_this) {
static cPhs_Step daB_YO_Create(daB_YO_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_b_yo_ice.cpp
+3 -3
View File
@@ -1010,9 +1010,9 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
// data/rodata swap
cPhs__Step daB_YOI_c::create() {
cPhs_Step daB_YOI_c::create() {
fopAcM_ct(this, daB_YOI_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "B_YO");
cPhs_Step step = dComIfG_resLoad(&mPhase, "B_YO");
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x1CA0)) {
@@ -1087,7 +1087,7 @@ daB_YOI_c::daB_YOI_c() {
/* empty function */
}
static cPhs__Step daB_YOI_Create(daB_YOI_c* i_this) {
static cPhs_Step daB_YOI_Create(daB_YOI_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_bg.cpp
+1
View File
@@ -10,6 +10,7 @@
#include "d/d_com_static.h"
#include "d/actor/d_a_grass.h"
#include "d/d_bg_w.h"
#include "d/d_bg_parts.h"
#include "m_Do/m_Do_lib.h"
#include "d/d_demo.h"
#include "JSystem/JKernel/JKRExpHeap.h"
src/d/actor/d_a_bg_obj.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_bg_obj.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include <cstdio>
#include "dolphin/os.h"
#include <dolphin/os.h>
#include "d/actor/d_a_set_bgobj.h"
#include "d/d_s_play.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_cow.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_meter2_info.h"
#include "d/d_timer.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera_mng.h"
#include "m_Do/m_Do_ext.h"
src/d/actor/d_a_do.cpp
+2 -2
View File
@@ -2402,11 +2402,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daDo_Create(fopAc_ac_c* i_this) {
static cPhs_Step daDo_Create(fopAc_ac_c* i_this) {
do_class* _this = static_cast<do_class*>(i_this);
fopAcM_ct(i_this, do_class);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "Do");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "Do");
if (step == cPhs_COMPLEATE_e) {
_this->mParam0 = fopAcM_GetParam(i_this) & 7;
src/d/actor/d_a_door_boss.cpp
+3 -3
View File
@@ -104,9 +104,9 @@ int daBdoor_c::CreateInit() {
return 1;
}
cPhs__Step daBdoor_c::create() {
cPhs_Step daBdoor_c::create() {
fopAcM_ct(this, daBdoor_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, getArcName());
cPhs_Step step = dComIfG_resLoad(&mPhaseReq, getArcName());
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xa000)) {
return cPhs_ERROR_e;
@@ -404,7 +404,7 @@ static int daBdoor_Delete(daBdoor_c* i_this) {
return 1;
}
static cPhs__Step daBdoor_Create(fopAc_ac_c* i_this) {
static cPhs_Step daBdoor_Create(fopAc_ac_c* i_this) {
return static_cast<daBdoor_c*>(i_this)->create();
}
src/d/actor/d_a_e_ba.cpp
+2 -2
View File
@@ -989,7 +989,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
}
static cPhs__Step daE_BA_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_BA_Create(fopAc_ac_c* i_this) {
static char* arc_name[3] = {"E_ba", "E_fb", "E_ib"};
static dCcD_SrcSph cc_sph_src = {
@@ -1013,7 +1013,7 @@ static cPhs__Step daE_BA_Create(fopAc_ac_c* i_this) {
}
_this->mArcName = arc_name[_this->mType];
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, _this->mArcName);
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, _this->mArcName);
if (step == cPhs_COMPLEATE_e) {
int sw = fopAcM_GetParam(_this) >> 24;
src/d/actor/d_a_e_bee.cpp
+2 -2
View File
@@ -716,11 +716,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return true;
}
static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_Bee_Create(fopAc_ac_c* i_this) {
e_bee_class* _this = static_cast<e_bee_class*>(i_this);
fopAcM_ct(_this, e_bee_class);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_bee");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "E_bee");
if (step == cPhs_COMPLEATE_e) {
_this->mParam0 = (u8)fopAcM_GetParam(_this);
_this->mParam1 = (u8)(fopAcM_GetParam(_this) >> 8);
src/d/actor/d_a_e_bi.cpp
+2 -2
View File
@@ -864,11 +864,11 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 1;
}
static cPhs__Step daE_BI_Create(fopAc_ac_c* actor) {
static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) {
fopAcM_ct(actor, e_bi_class);
e_bi_class* i_this = (e_bi_class*)actor;
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->phase, "E_BI");
cPhs_Step phase = dComIfG_resLoad(&i_this->phase, "E_BI");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_BI PARAM %x\n", fopAcM_GetParam(actor));
src/d/actor/d_a_e_bug.cpp
+2 -2
View File
@@ -801,12 +801,12 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_Bug_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_Bug_Create(fopAc_ac_c* a_this) {
e_bug_class* i_this = (e_bug_class*)a_this;
fopAcM_ct(a_this, e_bug_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_bug");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_bug");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_BUG PARAM %x\n", fopAcM_GetParam(a_this));
i_this->field_0x570 = fopAcM_GetParam(a_this);
src/d/actor/d_a_e_dd.cpp
+2 -2
View File
@@ -1661,11 +1661,11 @@ static int kabe_initial_pos_set(e_dd_class* i_this) {
return 0;
}
static cPhs__Step daE_DD_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_DD_Create(fopAc_ac_c* a_this) {
e_dd_class* i_this = (e_dd_class*)a_this;
fopAcM_ct(a_this, e_dd_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_dd");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_dd");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_DD PARAM %x\n", fopAcM_GetParam(a_this));
src/d/actor/d_a_e_df.cpp
+1 -1
View File
@@ -649,7 +649,7 @@ static int daE_DF_Delete(daE_DF_c* i_this) {
int daE_DF_c::Create() {
fopAcM_ct(this, daE_DF_c);
cPhs__Step rv = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "E_DF");
cPhs_Step rv = dComIfG_resLoad(&mPhaseReq, "E_DF");
if (rv == cPhs_COMPLEATE_e) {
OS_REPORT("E_DF PARAM %x\n", fopAcM_GetParam(this));
mArg0 = (u8)fopAcM_GetParam(this);
src/d/actor/d_a_e_dn.cpp
+2 -2
View File
@@ -3358,12 +3358,12 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 1;
}
static cPhs__Step daE_DN_Create(fopAc_ac_c* actor) {
static cPhs_Step daE_DN_Create(fopAc_ac_c* actor) {
e_dn_class* i_this = (e_dn_class*)actor;
fopAcM_ct(actor, e_dn_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->phase, "E_dn");
cPhs_Step phase = dComIfG_resLoad(&i_this->phase, "E_dn");
if (phase == cPhs_COMPLEATE_e) {
int swBit = (fopAcM_GetParam(actor) & 0xFF000000) >> 24;
if (swBit != 0xFF) {
src/d/actor/d_a_e_dt.cpp
+5 -5
View File
@@ -2456,18 +2456,18 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return static_cast<daE_DT_c*>(i_this)->CreateHeap();
}
cPhs__Step daE_DT_c::create() {
cPhs_Step daE_DT_c::create() {
fopAcM_ct(this, daE_DT_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase[0], "E_DT");
cPhs_Step step = dComIfG_resLoad(&mPhase[0], "E_DT");
if (step != cPhs_COMPLEATE_e) {
return step;
}
step = (cPhs__Step)dComIfG_resLoad(&mPhase[1], "Dalways");
step = dComIfG_resLoad(&mPhase[1], "Dalways");
if (step != cPhs_COMPLEATE_e) {
return step;
}
step = (cPhs__Step)dComIfG_resLoad(&mPhase[2], "E_OT");
step = dComIfG_resLoad(&mPhase[2], "E_OT");
if (step != cPhs_COMPLEATE_e) {
return step;
}
@@ -2548,7 +2548,7 @@ cPhs__Step daE_DT_c::create() {
return step;
}
static cPhs__Step daE_DT_Create(daE_DT_c* i_this) {
static cPhs_Step daE_DT_Create(daE_DT_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_e_fb.cpp
+2 -2
View File
@@ -907,7 +907,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return a_this->CreateHeap();
}
cPhs__Step daE_FB_c::create() {
cPhs_Step daE_FB_c::create() {
fopAcM_ct(this, daE_FB_c);
mType = fopAcM_GetParam(this);
swBit0 = (fopAcM_GetParam(this) & 0xFF00) >> 8;
@@ -916,7 +916,7 @@ cPhs__Step daE_FB_c::create() {
mType = 0;
}
cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReq, "E_FL");
cPhs_Step phase = dComIfG_resLoad(&mPhaseReq, "E_FL");
if (phase == cPhs_COMPLEATE_e) {
if (mType == 10 || mType == 11) {
fopAcM_OffStatus(this, 0);
src/d/actor/d_a_e_fs.cpp
+2 -2
View File
@@ -718,10 +718,10 @@ static int useHeapIe_fst(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daE_Fs_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_Fs_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, e_fs_class);
e_fs_class* _this = (e_fs_class*)(i_this);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_FS");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "E_FS");
if (step == cPhs_COMPLEATE_e) {
_this->field_0x5b4 = fopAcM_GetParam(_this) & 0xff;
src/d/actor/d_a_e_gb.cpp
+2 -2
View File
@@ -1614,7 +1614,7 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 1;
}
static cPhs__Step daE_GB_Create(fopAc_ac_c* actor) {
static cPhs_Step daE_GB_Create(fopAc_ac_c* actor) {
static dCcD_SrcSph head_cc_sph_src = {
{
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
@@ -1646,7 +1646,7 @@ static cPhs__Step daE_GB_Create(fopAc_ac_c* actor) {
e_gb_class* i_this = (e_gb_class*)actor;
fopAcM_ct(&i_this->actor, e_gb_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->phase, "E_gb");
cPhs_Step phase = dComIfG_resLoad(&i_this->phase, "E_gb");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_gb PARAM %x\n", fopAcM_GetParam(actor));
u8 sw_bit = (fopAcM_GetParam(actor) & 0xFF0000) >> 16;
src/d/actor/d_a_e_gm.cpp
+4 -4
View File
@@ -1699,7 +1699,7 @@ static u16 const l_heapsize[4] = {
0x3120, 0x3120, 0x21E0, 0x2DE0,
};
cPhs__Step daE_GM_c::create() {
cPhs_Step daE_GM_c::create() {
fopAcM_ct(this, daE_GM_c);
mType = fopAcM_GetParam(this);
@@ -1727,11 +1727,11 @@ cPhs__Step daE_GM_c::create() {
field_0xa54 = uVar1 * 100.0f;
}
cPhs__Step phase;
cPhs_Step phase;
if (mType == TYPE_GOMA) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_mg");
phase = dComIfG_resLoad(&mPhase, "E_mg");
} else {
phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_gm");
phase = dComIfG_resLoad(&mPhase, "E_gm");
}
if (phase == cPhs_COMPLEATE_e) {
src/d/actor/d_a_e_mf.cpp
+2 -2
View File
@@ -3136,12 +3136,12 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_MF_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_MF_Create(fopAc_ac_c* a_this) {
e_mf_class* i_this = (e_mf_class*)a_this;
fopAcM_ct(a_this, e_mf_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_mf");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_mf");
if (phase == cPhs_COMPLEATE_e) {
int swBit = fopAcM_GetParam(a_this) >> 24;
if (swBit != 0xFF) {
src/d/actor/d_a_e_mm_mt.cpp
+1 -1
View File
@@ -750,7 +750,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
static int daE_MM_MT_Create(fopAc_ac_c* i_this) {
cPhs__Step cVar1;
cPhs_Step cVar1;
bool bVar2;
f32 fVar3;
src/d/actor/d_a_e_nest.cpp
+2 -2
View File
@@ -959,11 +959,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, e_nest_class);
e_nest_class* _this = static_cast<e_nest_class*>(i_this);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_nest");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "E_nest");
if (step == cPhs_COMPLEATE_e) {
_this->mBrokenSwitch = (u8)((u16)_this->current.angle.z >> 8);
_this->shape_angle.z = 0;
src/d/actor/d_a_e_oc.cpp
+3 -3
View File
@@ -2669,7 +2669,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return a_this->CreateHeap();
}
cPhs__Step daE_OC_c::create() {
cPhs_Step daE_OC_c::create() {
fopAcM_ct(this, daE_OC_c);
field_0x6b4 = fopAcM_GetParam(this) & 0xFF;
if (field_0x6b4 == 0xFF) {
@@ -2706,9 +2706,9 @@ cPhs__Step daE_OC_c::create() {
mName = "E_OC2";
}
cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReqs[0], mName);
cPhs_Step phase = dComIfG_resLoad(&mPhaseReqs[0], mName);
if (phase == cPhs_COMPLEATE_e) {
phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReqs[1], "E_ocb");
phase = dComIfG_resLoad(&mPhaseReqs[1], "E_ocb");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_OC PARAM %x\n", fopAcM_GetParam(this));
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x2e40)) {
src/d/actor/d_a_e_oct_bg.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "dolphin/types.h"
#include <dolphin/types.h>
#include "d/actor/d_a_e_oct_bg.h"
#include "f_op/f_op_actor_mng.h"
src/d/actor/d_a_e_ot.cpp
+3 -3
View File
@@ -741,10 +741,10 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return static_cast<daE_OT_c*>(i_this)->CreateHeap();
}
cPhs__Step daE_OT_c::create() {
cPhs_Step daE_OT_c::create() {
fopAcM_ct(this, daE_OT_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_OT");
cPhs_Step step = dComIfG_resLoad(&mPhase, "E_OT");
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x1f40)) {
return cPhs_ERROR_e;
@@ -825,7 +825,7 @@ cPhs__Step daE_OT_c::create() {
return step;
}
static cPhs__Step daE_OT_Create(daE_OT_c* i_this) {
static cPhs_Step daE_OT_Create(daE_OT_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_e_pm.cpp
+3 -3
View File
@@ -2794,9 +2794,9 @@ void daE_PM_c::SkipChk() {
}
}
cPhs__Step daE_PM_c::Create() {
cPhs_Step daE_PM_c::Create() {
fopAcM_ct(this, daE_PM_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_PM");
cPhs_Step step = dComIfG_resLoad(&mPhase, "E_PM");
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x45E0)) {
@@ -2855,7 +2855,7 @@ cPhs__Step daE_PM_c::Create() {
return step;
}
static cPhs__Step daE_PM_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_PM_Create(fopAc_ac_c* i_this) {
return static_cast<daE_PM_c*>(i_this)->Create();
}
src/d/actor/d_a_e_rd.cpp
+2 -2
View File
@@ -7274,7 +7274,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_RD_Create(fopAc_ac_c* a_this) {
e_rd_class* i_this = (e_rd_class*)a_this;
fopAcM_ct(&i_this->actor, e_rd_class);
@@ -7302,7 +7302,7 @@ static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
i_this->mResName = "E_RD";
}
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, i_this->mResName);
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, i_this->mResName);
if (phase == cPhs_COMPLEATE_e) {
if (strcmp(dComIfGp_getStartStageName(), "F_SP124") == 0) {
// Gerudo Desert
src/d/actor/d_a_e_rdy.cpp
+2 -2
View File
@@ -4869,7 +4869,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_RDY_Create(fopAc_ac_c* i_this) {
e_rdy_class* _this = (e_rdy_class*)i_this;
fopAcM_ct(&_this->actor, e_rdy_class);
@@ -4881,7 +4881,7 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) {
}
_this->mpArcName = "E_rdy";
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, _this->mpArcName);
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, _this->mpArcName);
if (step == cPhs_COMPLEATE_e) {
OS_REPORT("E_RDY PARAM %x\n", fopAcM_GetParam(i_this));
if (_this->field_0x5b8 != 3) {
src/d/actor/d_a_e_sb.cpp
+2 -2
View File
@@ -1094,9 +1094,9 @@ static int daE_SB_Delete(daE_SB_c* i_this) {
return i_this->Delete();
}
cPhs__Step daE_SB_c::Create() {
cPhs_Step daE_SB_c::Create() {
fopAcM_ct(this, daE_SB_c);
cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReq, "E_SB");
cPhs_Step phase = dComIfG_resLoad(&mPhaseReq, "E_SB");
if (phase == cPhs_COMPLEATE_e) {
field_0x61a = fopAcM_GetParam(this);
if (field_0x61a != 0xFF && dComIfGs_isSwitch(field_0x61a, fopAcM_GetRoomNo(this))) {
src/d/actor/d_a_e_sf.cpp
+2 -2
View File
@@ -1739,11 +1739,11 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_SF_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_SF_Create(fopAc_ac_c* a_this) {
e_sf_class* i_this = (e_sf_class*)a_this;
fopAcM_ct(a_this, e_sf_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_sf");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_sf");
if (phase == cPhs_COMPLEATE_e) {
i_this->mSwBit = a_this->current.angle.z & 0xFF;
if (i_this->mSwBit != 0xFF) {
src/d/actor/d_a_e_sg.cpp
+1 -1
View File
@@ -1163,7 +1163,7 @@ static int daE_SG_Create(fopAc_ac_c* i_this) {
e_sg_class* a_this = static_cast<e_sg_class*>(i_this);
fopAcM_ct(i_this, e_sg_class);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&a_this->mPhaseReq, "E_sg");
cPhs_Step step = dComIfG_resLoad(&a_this->mPhaseReq, "E_sg");
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 4000)) {
src/d/actor/d_a_e_sm.cpp
+2 -2
View File
@@ -1895,10 +1895,10 @@ void daE_SM_c::initCoSph() {
mCoCore.OnTgNoHitMark();
}
cPhs__Step daE_SM_c::Create() {
cPhs_Step daE_SM_c::Create() {
fopAcM_ct(this, daE_SM_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_SM");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_SM");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_SM PARAM %x\n", fopAcM_GetParam(this));
src/d/actor/d_a_e_st.cpp
+2 -2
View File
@@ -3005,11 +3005,11 @@ static BOOL roof_initial_pos_set(e_st_class* i_this) {
return FALSE;
}
static cPhs__Step daE_ST_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_ST_Create(fopAc_ac_c* a_this) {
e_st_class* i_this = (e_st_class*)a_this;
fopAcM_ct(&i_this->actor, e_st_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_st");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_st");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_st PARAM %x\n", fopAcM_GetParam(a_this));
i_this->arg0 = fopAcM_GetParam(a_this) & 0xF;
src/d/actor/d_a_e_sw.cpp
+2 -2
View File
@@ -1638,7 +1638,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return i_this->CreateHeap();
}
cPhs__Step daE_SW_c::create() {
cPhs_Step daE_SW_c::create() {
fopAcM_ct(this, daE_SW_c);
field_0x68c = fopAcM_GetParam(this) & 15;
@@ -1682,7 +1682,7 @@ cPhs__Step daE_SW_c::create() {
field_0x696 = 0xFF;
}
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_SW");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_SW");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_SW PARAM %x %d %d\n", fopAcM_GetParam(this), field_0x696, fopAcM_GetID(this));
shape_angle.x = 0;
src/d/actor/d_a_e_tk.cpp
+1 -1
View File
@@ -736,7 +736,7 @@ static int daE_TK_Create(fopAc_ac_c* actor) {
e_tk_class* i_this = (e_tk_class*)actor;
fopAcM_ct(i_this, e_tk_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhaseReq, "E_tk");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhaseReq, "E_tk");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_tk PARAM %x\n", fopAcM_GetParam(actor));
i_this->mArg0 = (fopAcM_GetParam(actor) & 0xFF) >> 0;
src/d/actor/d_a_e_tk2.cpp
+1 -1
View File
@@ -548,7 +548,7 @@ static int daE_TK2_Create(fopAc_ac_c* actor) {
e_tk2_class* i_this = (e_tk2_class*)actor;
fopAcM_ct(i_this, e_tk2_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhaseReq, "E_tk2");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhaseReq, "E_tk2");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_tk2 PARAM %x\n", fopAcM_GetParam(actor));
i_this->mArg0 = (fopAcM_GetParam(actor) & 0xFF) >> 0;
src/d/actor/d_a_e_tk_ball.cpp
+3 -3
View File
@@ -396,13 +396,13 @@ static int daE_TK_BALL_Create(fopAc_ac_c* i_this) {
actor->mType = TYPE_TK_BALL_WATER;
}
cPhs__Step phase;
cPhs_Step phase;
u32 size;
if (actor->mType == TYPE_TK_BALL_WATER) {
phase = (cPhs__Step)dComIfG_resLoad(&actor->mPhaseReq, "E_tk");
phase = dComIfG_resLoad(&actor->mPhaseReq, "E_tk");
size = 0x820;
} else {
phase = (cPhs__Step)dComIfG_resLoad(&actor->mPhaseReq, "E_tk2");
phase = dComIfG_resLoad(&actor->mPhaseReq, "E_tk2");
size = 0xEE0;
}
src/d/actor/d_a_e_yc.cpp
+2 -2
View File
@@ -752,11 +752,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daE_YC_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_YC_Create(fopAc_ac_c* i_this) {
e_yc_class* _this = static_cast<e_yc_class*>(i_this);
fopAcM_ct(i_this, e_yc_class);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_yc");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "E_yc");
if (step == cPhs_COMPLEATE_e) {
_this->mParam = (u8)fopAcM_GetParam(_this);
src/d/actor/d_a_e_yg.cpp
+2 -2
View File
@@ -1332,12 +1332,12 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_YG_Create(fopAc_ac_c* actor) {
static cPhs_Step daE_YG_Create(fopAc_ac_c* actor) {
e_yg_class* i_this = (e_yg_class*)actor;
fopAcM_ct(&i_this->actor, e_yg_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_YG");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_YG");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_YG PARAM %x\n", fopAcM_GetParam(actor));
src/d/actor/d_a_e_ymb.cpp
+2 -2
View File
@@ -3156,7 +3156,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return i_this->CreateHeap();
}
cPhs__Step daE_YMB_c::create() {
cPhs_Step daE_YMB_c::create() {
fopAcM_ct(this, daE_YMB_c);
mSwitchBit = fopAcM_GetParam(this);
@@ -3168,7 +3168,7 @@ cPhs__Step daE_YMB_c::create() {
}
}
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_YB");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_YB");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_YMB PARAM %x\n", fopAcM_GetParam(this));
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x5200)) {
src/d/actor/d_a_e_zh.cpp
+2 -2
View File
@@ -2165,10 +2165,10 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return i_this->CreateHeap();
}
cPhs__Step daE_ZH_c::create() {
cPhs_Step daE_ZH_c::create() {
fopAcM_ct(this, daE_ZH_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_ZH");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_ZH");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_ZH PARAM %x\n", fopAcM_GetParam(this));
arg0 = fopAcM_GetParam(this);
src/d/actor/d_a_e_zm.cpp
+2 -2
View File
@@ -904,10 +904,10 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return static_cast<daE_ZM_c*>(a_this)->CreateHeap();
}
cPhs__Step daE_ZM_c::create() {
cPhs_Step daE_ZM_c::create() {
fopAcM_ct(this, daE_ZM_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_ZM");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_ZM");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_ZM PARAM %x\n", fopAcM_GetParam(this));
src/d/actor/d_a_mg_fish.cpp
+2 -2
View File
@@ -3854,8 +3854,8 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) {
lit_1008 = 1;
#endif
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&a_this->mPhaseReq, a_this->mResName);
cPhs__Step retval = phase;
cPhs_Step phase = dComIfG_resLoad(&a_this->mPhaseReq, a_this->mResName);
cPhs_Step retval = phase;
if (phase == cPhs_COMPLEATE_e) {
s32 params_0 = fopAcM_GetParam(i_this) >> 24;
src/d/actor/d_a_midna.cpp
+3 -3
View File
@@ -541,9 +541,9 @@ daMidna_hio_c::daMidna_hio_c() {
}
#endif
cPhs__Step daMidna_c::create() {
cPhs_Step daMidna_c::create() {
fopAcM_ct(this, daMidna_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
cPhs_Step step = dComIfG_resLoad(&mPhase, l_arcName);
if (step == cPhs_COMPLEATE_e) {
if (dStage_roomControl_c::getDemoArcName()[0] != '\0' &&
@@ -663,7 +663,7 @@ cPhs__Step daMidna_c::create() {
return step;
}
static cPhs__Step daMidna_Create(fopAc_ac_c* i_this) {
static cPhs_Step daMidna_Create(fopAc_ac_c* i_this) {
daMidna_c* a_this = (daMidna_c*)i_this;
fopAcM_RegisterCreateID(i_this, "MIDNA");
return a_this->create();
src/d/actor/d_a_mirror.cpp
+2 -2
View File
@@ -10,8 +10,8 @@
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "dolphin/gf/GFGeometry.h"
#include "dolphin/gf/GFLight.h"
#include <dolphin/gf/GFGeometry.h>
#include <dolphin/gf/GFLight.h>
#include "m_Do/m_Do_lib.h"
static BOOL daMirror_c_createHeap(fopAc_ac_c* i_this) {
src/d/actor/d_a_myna.cpp
+1 -1
View File
@@ -333,7 +333,7 @@ daMyna_c::BaseMotionFunc daMyna_c::mBaseMotionTBL[] = {
int daMyna_c::create() {
fopAcM_ct(this, daMyna_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "Npc_myna");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "Npc_myna");
if (phase != cPhs_COMPLEATE_e) {
return phase;
}
src/d/actor/d_a_npc_aru.cpp
+2 -2
View File
@@ -382,7 +382,7 @@ daNpc_Aru_c::~daNpc_Aru_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
cPhs__Step daNpc_Aru_c::create() {
cPhs_Step daNpc_Aru_c::create() {
daNpcT_ct(this, daNpc_Aru_c, l_faceMotionAnmData, l_motionAnmData,
l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -390,7 +390,7 @@ cPhs__Step daNpc_Aru_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this),
mType, mFlowNodeNo, getPathID(), fopAcM_GetParam(this));
src/d/actor/d_a_npc_ash.cpp
+4 -4
View File
@@ -218,8 +218,8 @@ daNpcAsh_c::~daNpcAsh_c() {
}
}
cPhs__Step daNpcAsh_c::Create() {
cPhs__Step step;
cPhs_Step daNpcAsh_c::Create() {
cPhs_Step step;
fopAcM_ct(this, daNpcAsh_c);
@@ -249,7 +249,7 @@ cPhs__Step daNpcAsh_c::Create() {
u32 i = 0;
int arcIndex;
while (arcIndex = l_loadRes_list[mType][i], arcIndex >= 0) {
step = (cPhs__Step)dComIfG_resLoad(&mPhase[i], l_arcNames[arcIndex]);
step = dComIfG_resLoad(&mPhase[i], l_arcNames[arcIndex]);
if (step != cPhs_COMPLEATE_e) {
return step;
}
@@ -1195,7 +1195,7 @@ BOOL daNpcAsh_c::EvCut_WiretapEntrant(int i_staffID) {
return true;
}
static cPhs__Step daNpcAsh_Create(void* i_this) {
static cPhs_Step daNpcAsh_Create(void* i_this) {
return static_cast<daNpcAsh_c*>(i_this)->Create();
}
src/d/actor/d_a_npc_ashB.cpp
+4 -4
View File
@@ -115,8 +115,8 @@ daNpcAshB_c::~daNpcAshB_c() {
#endif
}
cPhs__Step daNpcAshB_c::Create() {
cPhs__Step step;
cPhs_Step daNpcAshB_c::Create() {
cPhs_Step step;
fopAcM_ct(this, daNpcAshB_c);
@@ -132,7 +132,7 @@ cPhs__Step daNpcAshB_c::Create() {
step = cPhs_ERROR_e;
for (int i = 0; i < 1; i++) {
step = (cPhs__Step)dComIfG_resLoad(&mPhase[i], l_arcNames[i]);
step = dComIfG_resLoad(&mPhase[i], l_arcNames[i]);
if (step != cPhs_COMPLEATE_e) {
return step;
}
@@ -1066,7 +1066,7 @@ BOOL daNpcAshB_c::EvCut_Appear(int i_staffID) {
return FALSE;
}
static cPhs__Step daNpcAshB_Create(void* i_this) {
static cPhs_Step daNpcAshB_Create(void* i_this) {
return static_cast<daNpcAshB_c*>(i_this)->Create();
}
src/d/actor/d_a_npc_bans.cpp
+2 -2
View File
@@ -372,7 +372,7 @@ daNpc_Bans_c::~daNpc_Bans_c() {
static NPC_BANS_HIO_CLASS l_HIO;
cPhs__Step daNpc_Bans_c::create() {
cPhs_Step daNpc_Bans_c::create() {
daNpcT_ct(this, daNpc_Bans_c, l_faceMotionAnmData, l_motionAnmData,
l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
l_evtList, l_resNameList);
@@ -380,7 +380,7 @@ cPhs__Step daNpc_Bans_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = dKy_darkworld_check();
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x, MaxItem:%d, group:%d<%08x> ", fopAcM_getProcNameString(this), mType, mFlowNodeNo,
getPathID(), getMaxNumItem(), getGroupId(), fopAcM_GetParam(this));
src/d/actor/d_a_npc_besu.cpp
+1 -1
View File
@@ -653,7 +653,7 @@ int daNpc_Besu_c::create() {
mTwilight = false;
}
cPhs__Step rv = (cPhs__Step) loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (rv == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x, BitSW:%02x<%08x> ",
fopAcM_getProcNameString(this), mType, mFlowNodeNo, getPathID(),
src/d/actor/d_a_npc_bouS.cpp
+3 -3
View File
@@ -330,14 +330,14 @@ daNpcBouS_HIOParam const daNpcBouS_Param_c::m = {
0,
};
cPhs__Step daNpcBouS_c::Create() {
cPhs_Step daNpcBouS_c::Create() {
fopAcM_ct(this, daNpcBouS_c);
mMsgNo = getMessageNo();
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; i < 2; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
phase = dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
src/d/actor/d_a_npc_chat.cpp
+10 -10
View File
@@ -2494,38 +2494,38 @@ bool daNpcChat_c::isM_() {
return a_jntNum == JntM_NUM_e;
}
cPhs__Step daNpcChat_c::loadResrc(int idx, int param_2) {
cPhs__Step rv = cPhs_COMPLEATE_e;
cPhs_Step daNpcChat_c::loadResrc(int idx, int param_2) {
cPhs_Step rv = cPhs_COMPLEATE_e;
if (mTwilight) {
rv = (cPhs__Step)dComIfG_resLoad(&mPhase1, l_resNameTbl[idx][1]);
rv = dComIfG_resLoad(&mPhase1, l_resNameTbl[idx][1]);
if (rv != cPhs_COMPLEATE_e) {
return rv;
}
} else {
rv = (cPhs__Step)dComIfG_resLoad(&mPhase1, l_resNameTbl[idx][0]);
rv = dComIfG_resLoad(&mPhase1, l_resNameTbl[idx][0]);
if (rv != cPhs_COMPLEATE_e) {
return rv;
}
}
rv = (cPhs__Step)dComIfG_resLoad(&mPhase2, l_resNameTbl[idx][2]);
rv = dComIfG_resLoad(&mPhase2, l_resNameTbl[idx][2]);
if (rv != cPhs_COMPLEATE_e) {
return rv;
}
if (param_2 != 0 || field_0xe51 == 1) {
rv = (cPhs__Step)dComIfG_resLoad(&mPhase3, l_resNameTbl[idx][3]);
rv = dComIfG_resLoad(&mPhase3, l_resNameTbl[idx][3]);
if (rv != cPhs_COMPLEATE_e) {
return rv;
}
if (mTwilight) {
rv = (cPhs__Step)dComIfG_resLoad(&mPhase4, l_resNameTbl[idx][5]);
rv = dComIfG_resLoad(&mPhase4, l_resNameTbl[idx][5]);
if (rv != cPhs_COMPLEATE_e) {
return rv;
}
} else {
rv = (cPhs__Step)dComIfG_resLoad(&mPhase4, l_resNameTbl[idx][4]);
rv = dComIfG_resLoad(&mPhase4, l_resNameTbl[idx][4]);
if (rv != cPhs_COMPLEATE_e) {
return rv;
}
@@ -2675,7 +2675,7 @@ inline f32 CylH(int type) {
return (f32)(type < 16 ? a_prmTbl_M[type].field_0x30 : a_prmTbl_W[type - 16].field_0x30);
}
cPhs__Step daNpcChat_c::Create() {
cPhs_Step daNpcChat_c::Create() {
fopAcM_ct(this, daNpcChat_c);
mTwilight = dKy_darkworld_check();
@@ -2701,7 +2701,7 @@ cPhs__Step daNpcChat_c::Create() {
mMsgNo = getMessageNo();
cPhs__Step phase = loadResrc(mType, mObjNum);
cPhs_Step phase = loadResrc(mType, mObjNum);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x800022E0)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_chin.cpp
+1 -1
View File
@@ -243,7 +243,7 @@ int daNpcChin_c::Create() {
int i = 0;
while (*idx >= 0) {
OS_REPORT("--- arc : %s\n", l_arcNames[*idx]);
phase_state = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[*idx]);
phase_state = dComIfG_resLoad(&mPhases[i], l_arcNames[*idx]);
if (phase_state != cPhs_COMPLEATE_e) {
return phase_state;
}
src/d/actor/d_a_npc_coach.cpp
+2 -2
View File
@@ -2009,10 +2009,10 @@ static int daNpcCoach_Create(fopAc_ac_c* a_this) {
return i_this->create();
}
cPhs__Step daNpcCoach_c::create() {
cPhs_Step daNpcCoach_c::create() {
fopAcM_ct(this, daNpcCoach_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
cPhs_Step phase = dComIfG_resLoad(&mPhase, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createSolidHeap, 0x7D60)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_df.cpp
+2 -2
View File
@@ -359,11 +359,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daNpc_Df_Create(fopAc_ac_c* i_this) {
static cPhs_Step daNpc_Df_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, npc_df_class);
npc_df_class* actor = (npc_df_class*)i_this;
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&actor->mPhase, "Npc_df");
cPhs_Step phase = dComIfG_resLoad(&actor->mPhase, "Npc_df");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("NPC_DF PARAM %x\n", fopAcM_GetParam(i_this));
actor->field_0x570 = fopAcM_GetParam(i_this);
src/d/actor/d_a_npc_doorboy.cpp
+3 -3
View File
@@ -185,14 +185,14 @@ daNpcDoorBoy_c::~daNpcDoorBoy_c() {
#endif
}
cPhs__Step daNpcDoorBoy_c::Create() {
cPhs_Step daNpcDoorBoy_c::Create() {
fopAcM_ct(this, daNpcDoorBoy_c);
mMessageNo = (s16)getMessageNo();
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; i < 2; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
phase = dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
src/d/actor/d_a_npc_du.cpp
+2 -2
View File
@@ -632,11 +632,11 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 1;
}
static cPhs__Step daNpc_Du_Create(fopAc_ac_c* a_this) {
static cPhs_Step daNpc_Du_Create(fopAc_ac_c* a_this) {
npc_du_class* i_this = (npc_du_class*)a_this;
fopAcM_ct(a_this, npc_du_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "Npc_Du");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "Npc_Du");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("NPC_DU PARAM %x\n", fopAcM_GetParam(a_this));
i_this->arg0 = fopAcM_GetParam(a_this);
src/d/actor/d_a_npc_fairy.cpp
+2 -2
View File
@@ -518,7 +518,7 @@ daNpc_Fairy_c::~daNpc_Fairy_c() {
static NPC_FAIRY_HIO_CLASS l_HIO;
cPhs__Step daNpc_Fairy_c::Create() {
cPhs_Step daNpc_Fairy_c::Create() {
daNpcT_ct(this, daNpc_Fairy_c, l_faceMotionAnmData, l_motionAnmData,
l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -526,7 +526,7 @@ cPhs__Step daNpc_Fairy_c::Create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x8000)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_fguard.cpp
+2 -2
View File
@@ -35,14 +35,14 @@ static int daNpcFgd_Create(void* a_this) {
return static_cast<daNpcFgd_c*>(a_this)->create();
}
cPhs__Step daNpcFgd_c::create() {
cPhs_Step daNpcFgd_c::create() {
fopAcM_ct(this, daNpcFgd_c);
mIsDarkWorld = dKy_darkworld_check();
m_type = getType();
mObjNum = getObjNum();
cPhs__Step phase = (cPhs__Step)loadResrc(m_type, mObjNum);
cPhs_Step phase = loadResrc(m_type, mObjNum);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x1910)) {
OS_REPORT("隊列兵士アクター生成失敗しました！\n"); // Failed to generate the squad soldier actor!
src/d/actor/d_a_npc_grc.cpp
+2 -2
View File
@@ -301,7 +301,7 @@ daNpc_grC_c::~daNpc_grC_c() {
#endif
}
cPhs__Step daNpc_grC_c::create() {
cPhs_Step daNpc_grC_c::create() {
fopAcM_ct(this, daNpc_grC_c);
mTwilight = dKy_darkworld_check();
@@ -320,7 +320,7 @@ cPhs__Step daNpc_grC_c::create() {
int res_count = 0;
int i = 0;
for (; l_loadRes_list[mType][i] >= 0; i++) {
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
cPhs_Step step = dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
if (step == cPhs_ERROR_e || step == cPhs_UNK3_e) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_grm.cpp
+3 -3
View File
@@ -169,7 +169,7 @@ daNpc_grM_c::~daNpc_grM_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
cPhs__Step daNpc_grM_c::create() {
cPhs_Step daNpc_grM_c::create() {
daNpcT_ct(this, daNpc_grM_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -177,7 +177,7 @@ cPhs__Step daNpc_grM_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x3730)) {
return cPhs_ERROR_e;
@@ -791,7 +791,7 @@ int daNpc_grM_c::shop(void* param_0) {
return 0;
}
static cPhs__Step daNpc_grM_Create(void* param_0) {
static cPhs_Step daNpc_grM_Create(void* param_0) {
return static_cast<daNpc_grM_c*>(param_0)->create();
}
src/d/actor/d_a_npc_grmc.cpp
+2 -2
View File
@@ -230,7 +230,7 @@ void daNpc_grMC_HIO_c::genMessage(JORMContext* ctx) {
}
#endif
cPhs__Step daNpc_grMC_c::create() {
cPhs_Step daNpc_grMC_c::create() {
daNpcT_ct(this, daNpc_grMC_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -238,7 +238,7 @@ cPhs__Step daNpc_grMC_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x35D0)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_gro.cpp
+3 -3
View File
@@ -390,7 +390,7 @@ daNpc_grO_HIOParam const daNpc_grO_Param_c::m = {
false,
};
cPhs__Step daNpc_grO_c::create() {
cPhs_Step daNpc_grO_c::create() {
fopAcM_ct(this, daNpc_grO_c);
mType = getTypeFromParam();
@@ -405,11 +405,11 @@ cPhs__Step daNpc_grO_c::create() {
return cPhs_ERROR_e;
}
cPhs__Step phase;
cPhs_Step phase;
int res = 0;
int i = 0;
for (; l_loadRes_list[mType][i] >= 0; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
phase = dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_npc_grr.cpp
+2 -2
View File
@@ -258,7 +258,7 @@ daNpc_grR_c::~daNpc_grR_c() {
#endif
}
cPhs__Step daNpc_grR_c::create() {
cPhs_Step daNpc_grR_c::create() {
fopAcM_ct(this, daNpc_grR_c);
mType = getTypeFromParam();
@@ -276,7 +276,7 @@ cPhs__Step daNpc_grR_c::create() {
int res_count = 0;
int i = 0;
for (; l_loadRes_list[mType][i] >= 0; i++) {
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
cPhs_Step phase = dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_npc_grz.cpp
+2 -2
View File
@@ -448,7 +448,7 @@ daNpc_Grz_HIOParam const daNpc_Grz_Param_c::m = {
500.0f,
};
cPhs__Step daNpc_Grz_c::create() {
cPhs_Step daNpc_Grz_c::create() {
fopAcM_ct(this, daNpc_Grz_c);
mType = getTypeFromParam();
@@ -467,7 +467,7 @@ cPhs__Step daNpc_Grz_c::create() {
int iVar1 = 0;
int i = 0;
for (; l_loadRes_list[mType][i] >= 0; i++) {
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
cPhs_Step phase = dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_npc_gwolf.cpp
+2 -2
View File
@@ -283,7 +283,7 @@ daNpc_GWolf_c::~daNpc_GWolf_c() {
#endif
}
cPhs__Step daNpc_GWolf_c::create() {
cPhs_Step daNpc_GWolf_c::create() {
fopAcM_ct(this, daNpc_GWolf_c);
mType = getTypeFromParam();
@@ -307,7 +307,7 @@ cPhs__Step daNpc_GWolf_c::create() {
int iVar1 = 0;
int i;
for (i = 0; l_loadRes_list[mType][i] >= 0; i++) {
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
cPhs_Step phase = dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_npc_henna.cpp
+1 -1
View File
@@ -2672,7 +2672,7 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, npc_henna_class);
npc_henna_class* a_this = (npc_henna_class*)i_this;
cPhs__Step loadResult = (cPhs__Step)dComIfG_resLoad(&a_this->phase, "Henna");
cPhs_Step loadResult = dComIfG_resLoad(&a_this->phase, "Henna");
if (loadResult == cPhs_COMPLEATE_e) {
OS_REPORT("NPC_HENNA PARAM %x\n", fopAcM_GetParam(i_this));
a_this->arg0 = fopAcM_GetParam(i_this);
src/d/actor/d_a_npc_ins.cpp
+3 -3
View File
@@ -383,7 +383,7 @@ daNpcIns_c::~daNpcIns_c() {
#endif
}
cPhs__Step daNpcIns_c::Create() {
cPhs_Step daNpcIns_c::Create() {
fopAcM_ct(this, daNpcIns_c);
mType = TYPE_0;
@@ -412,9 +412,9 @@ cPhs__Step daNpcIns_c::Create() {
}
}
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[l_loadRes_list[mType][i]]);
phase = dComIfG_resLoad(&mPhases[i], l_arcNames[l_loadRes_list[mType][i]]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
src/d/actor/d_a_npc_kasi_hana.cpp
+3 -3
View File
@@ -638,15 +638,15 @@ daNpcKasiHana_c::~daNpcKasiHana_c() {
#endif
}
cPhs__Step daNpcKasiHana_c::Create() {
cPhs_Step daNpcKasiHana_c::Create() {
fopAcM_ct(this, daNpcKasiHana_c);
mMessageNo = getMessageNo();
mType = getType();
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; i < 3; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
phase = dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
src/d/actor/d_a_npc_kasi_kyu.cpp
+3 -3
View File
@@ -210,15 +210,15 @@ daNpcKasiKyu_c::~daNpcKasiKyu_c() {
#endif
}
cPhs__Step daNpcKasiKyu_c::Create() {
cPhs_Step daNpcKasiKyu_c::Create() {
fopAcM_ct(this, daNpcKasiKyu_c);
mType = getType();
mMessageNo = getMessageNo();
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; i < 3; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
phase = dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
src/d/actor/d_a_npc_kasi_mich.cpp
+3 -3
View File
@@ -210,15 +210,15 @@ daNpcKasiMich_c::~daNpcKasiMich_c() {
#endif
}
cPhs__Step daNpcKasiMich_c::Create() {
cPhs_Step daNpcKasiMich_c::Create() {
fopAcM_ct(this, daNpcKasiMich_c);
mType = getType();
mMessageNo = getMessageNo();
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; i < 3; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
phase = dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
src/d/actor/d_a_npc_kolin.cpp
+2 -2
View File
@@ -415,7 +415,7 @@ daNpc_Kolin_c::~daNpc_Kolin_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
cPhs__Step daNpc_Kolin_c::create() {
cPhs_Step daNpc_Kolin_c::create() {
daNpcT_ct(this, daNpc_Kolin_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
mType = getType();
@@ -426,7 +426,7 @@ cPhs__Step daNpc_Kolin_c::create() {
mTwilight = false;
}
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x, BitSW:%02x<%08x> ", fopAcM_getProcNameString(this), mType, mFlowNodeNo,
(getPathID() >> 32) & 0xFF, getBitSW() & 0xFF, fopAcM_GetParam(this));
src/d/actor/d_a_npc_kolinb.cpp
+2 -2
View File
@@ -274,14 +274,14 @@ daNpc_Kolinb_c::~daNpc_Kolinb_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
cPhs__Step daNpc_Kolinb_c::create() {
cPhs_Step daNpc_Kolinb_c::create() {
daNpcT_ct(this, daNpc_Kolinb_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
mType = getType();
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d, modelType:%02x<%08x> ", fopAcM_getProcNameString(this), mType, mFlowNodeNo, (getModelType() >> 32) & 0xFF, fopAcM_GetParam(this));
src/d/actor/d_a_npc_lf.cpp
+2 -2
View File
@@ -261,11 +261,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daNPC_LF_Create(fopAc_ac_c* i_this) {
static cPhs_Step daNPC_LF_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, npc_lf_class);
npc_lf_class* a_this = static_cast<npc_lf_class*>(i_this);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&a_this->mPhase, "NPC_LF");
cPhs_Step phase = dComIfG_resLoad(&a_this->mPhase, "NPC_LF");
if (phase == cPhs_COMPLEATE_e) {
a_this->mParam1 = fopAcM_GetParam(a_this);
src/d/actor/d_a_npc_moir.cpp
+3 -3
View File
@@ -284,7 +284,7 @@ daNpcMoiR_c::~daNpcMoiR_c() {
#endif
}
cPhs__Step daNpcMoiR_c::Create() {
cPhs_Step daNpcMoiR_c::Create() {
fopAcM_ct(this, daNpcMoiR_c);
if (strcmp(dComIfGp_getStartStageName(), "R_SP116") == 0 && dComIfG_play_c::getLayerNo(0) == 4) {
@@ -315,9 +315,9 @@ cPhs__Step daNpcMoiR_c::Create() {
}
mMsgNo = getMessageNo();
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; l_loadRes_list[mMode][i] >= 0; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhase[i], l_arcNames[l_loadRes_list[mMode][i]]);
phase = dComIfG_resLoad(&mPhase[i], l_arcNames[l_loadRes_list[mMode][i]]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
}
src/d/actor/d_a_npc_ne.cpp
+2 -2
View File
@@ -3095,7 +3095,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) {
static cPhs_Step daNpc_Ne_Create(fopAc_ac_c* i_this) {
npc_ne_class* _this = static_cast<npc_ne_class*>(i_this);
fopAcM_ct(i_this, npc_ne_class);
@@ -3104,7 +3104,7 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) {
} else {
_this->mResName = "Npc_ne";
}
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, _this->mResName);
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, _this->mResName);
if (step == cPhs_COMPLEATE_e) {
_this->mBehavior = (u8)fopAcM_GetParam(_this);
src/d/actor/d_a_npc_pachi_besu.cpp
+2 -2
View File
@@ -542,7 +542,7 @@ daNpc_Pachi_Besu_c::~daNpc_Pachi_Besu_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
cPhs__Step daNpc_Pachi_Besu_c::create() {
cPhs_Step daNpc_Pachi_Besu_c::create() {
daNpcT_ct(this, daNpc_Pachi_Besu_c, l_faceMotionAnmData, l_motionAnmData,
l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
l_evtList, l_resNameList);
@@ -552,7 +552,7 @@ cPhs__Step daNpc_Pachi_Besu_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x35B0)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_pachi_maro.cpp
+2 -2
View File
@@ -550,7 +550,7 @@ daNpc_Pachi_Maro_HIOParam const daNpc_Pachi_Maro_Param_c::m = {
0,
};
cPhs__Step daNpc_Pachi_Maro_c::create() {
cPhs_Step daNpc_Pachi_Maro_c::create() {
daNpcT_ct(this, daNpc_Pachi_Maro_c, l_faceMotionAnmData, l_motionAnmData,
l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
l_evtList, l_resNameList);
@@ -559,7 +559,7 @@ cPhs__Step daNpc_Pachi_Maro_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x3310)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_pachi_taro.cpp
+2 -2
View File
@@ -777,7 +777,7 @@ daNpc_Pachi_Taro_HIOParam const daNpc_Pachi_Taro_Param_c::m = {
55.0f,
};
cPhs__Step daNpc_Pachi_Taro_c::create() {
cPhs_Step daNpc_Pachi_Taro_c::create() {
daNpcT_ct(this, daNpc_Pachi_Taro_c, l_faceMotionAnmData, l_motionAnmData,
l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
l_evtList, l_resNameList);
@@ -786,7 +786,7 @@ cPhs__Step daNpc_Pachi_Taro_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x48E0)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_passer.cpp
+2 -2
View File
@@ -42,7 +42,7 @@ static int createHeapCallBack(fopAc_ac_c* i_this) {
return actor->createHeap();
}
cPhs__Step daNpcPasser_c::create() {
cPhs_Step daNpcPasser_c::create() {
fopAcM_ct(this, daNpcPasser_c);
mIsDarkWorld = dKy_darkworld_check();
@@ -74,7 +74,7 @@ cPhs__Step daNpcPasser_c::create() {
return cPhs_ERROR_e;
}
cPhs__Step phase = (cPhs__Step)loadResrc(m_type, m_objNum);
cPhs_Step phase = loadResrc(m_type, m_objNum);
if (phase == cPhs_COMPLEATE_e) {
u32 i_size = 0;
#if DEBUG
src/d/actor/d_a_npc_passer2.cpp
+2 -2
View File
@@ -201,7 +201,7 @@ static int daNpcPasser2_Create(void* i_this) {
return static_cast<daNpcPasser2_c*>(i_this)->create();
}
cPhs__Step daNpcPasser2_c::create() {
cPhs_Step daNpcPasser2_c::create() {
fopAcM_ct(this, daNpcPasser2_c);
mIsDarkWorld = dKy_darkworld_check();
@@ -235,7 +235,7 @@ cPhs__Step daNpcPasser2_c::create() {
return cPhs_ERROR_e;
}
cPhs__Step phase = (cPhs__Step)loadResrc(m_type, m_objNum);
cPhs_Step phase = loadResrc(m_type, m_objNum);
if (phase == cPhs_COMPLEATE_e) {
u32 i_size = 0;
#if DEBUG
src/d/actor/d_a_npc_post.cpp
+2 -2
View File
@@ -385,7 +385,7 @@ daNpc_Post_HIOParam const daNpc_Post_Param_c::m = {
60,
};
cPhs__Step daNpc_Post_c::create() {
cPhs_Step daNpc_Post_c::create() {
daNpcT_ct(this, daNpc_Post_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -393,7 +393,7 @@ cPhs__Step daNpc_Post_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = dKy_darkworld_check();
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d, BitSW:%02x<%08x> ", fopAcM_getProcNameString(this), mType, mFlowNodeNo,
getBitSW(), fopAcM_GetParam(this));
src/d/actor/d_a_npc_raca.cpp
+2 -2
View File
@@ -229,7 +229,7 @@ daNpc_Raca_c::~daNpc_Raca_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
cPhs__Step daNpc_Raca_c::create() {
cPhs_Step daNpc_Raca_c::create() {
daNpcT_ct(this, daNpc_Raca_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -237,7 +237,7 @@ cPhs__Step daNpc_Raca_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = dKy_darkworld_check();
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x3A10)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_seirei.cpp
+2 -2
View File
@@ -226,7 +226,7 @@ daNpc_Seirei_c::~daNpc_Seirei_c() {
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
cPhs__Step daNpc_Seirei_c::create() {
cPhs_Step daNpc_Seirei_c::create() {
daNpcT_ct(this, daNpc_Seirei_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -235,7 +235,7 @@ cPhs__Step daNpc_Seirei_c::create() {
mTwilight = false;
arg0 = fopAcM_GetParam(this) >> 28;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
if (arg0 != 0 && !fopAcM_entrySolidHeap(this, createHeapCallBack, 0)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_shad.cpp
+3 -3
View File
@@ -340,7 +340,7 @@ daNpcShad_c::~daNpcShad_c() {
}
}
cPhs__Step daNpcShad_c::Create() {
cPhs_Step daNpcShad_c::Create() {
fopAcM_ct(this, daNpcShad_c);
if (strcmp(dComIfGp_getStartStageName(), "R_SP116") == 0 && dComIfG_play_c::getLayerNo(0) == 4) {
@@ -410,9 +410,9 @@ cPhs__Step daNpcShad_c::Create() {
field_0xe14 = sVar1;
field_0xe16 = field_0xe14;
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; l_loadRes_list[mMode][i] >= 0; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[l_loadRes_list[mMode][i]]);
phase = dComIfG_resLoad(&mPhases[i], l_arcNames[l_loadRes_list[mMode][i]]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
src/d/actor/d_a_npc_shaman.cpp
+2 -2
View File
@@ -236,7 +236,7 @@ daNpc_Sha_HIOParam const daNpc_Sha_Param_c::m = {
0.0,
};
cPhs__Step daNpc_Sha_c::create() {
cPhs_Step daNpc_Sha_c::create() {
daNpcT_ct(this, daNpc_Sha_c, l_faceMotionAnmData, l_motionAnmData,
l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -244,7 +244,7 @@ cPhs__Step daNpc_Sha_c::create() {
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
cPhs__Step phase = (cPhs__Step)loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
cPhs_Step phase = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d<%08x> ", fopAcM_getProcNameString(this), mType, mFlowNodeNo, fopAcM_GetParam(this));
src/d/actor/d_a_npc_shoe.cpp
+4 -4
View File
@@ -117,8 +117,8 @@ daNpcShoe_c::~daNpcShoe_c() {
}
}
cPhs__Step daNpcShoe_c::Create() {
cPhs__Step step;
cPhs_Step daNpcShoe_c::Create() {
cPhs_Step step;
fopAcM_ct(this, daNpcShoe_c);
@@ -126,7 +126,7 @@ cPhs__Step daNpcShoe_c::Create() {
step = cPhs_ERROR_e;
for (int i = 0; i < 3; i++) {
step = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
step = dComIfG_resLoad(&mPhases[i], l_arcNames[i]);
if (step != cPhs_COMPLEATE_e) {
return step;
}
@@ -634,7 +634,7 @@ bool daNpcShoe_c::demo(void* param_0) {
return 1;
}
static cPhs__Step daNpcShoe_Create(void* i_this) {
static cPhs_Step daNpcShoe_Create(void* i_this) {
return static_cast<daNpcShoe_c*>(i_this)->Create();
}
src/d/actor/d_a_npc_soldierA.cpp
+2 -2
View File
@@ -199,7 +199,7 @@ daNpc_SoldierA_HIOParam const daNpc_SoldierA_Param_c::m = {
false,
};
cPhs__Step daNpc_SoldierA_c::create() {
cPhs_Step daNpc_SoldierA_c::create() {
mTwilight = dKy_darkworld_check();
fopAcM_ct(this, daNpc_SoldierA_c);
@@ -219,7 +219,7 @@ cPhs__Step daNpc_SoldierA_c::create() {
int res_count = 0;
int i = 0;
for (; l_loadRes_list[mType][i] >= 0; i++) {
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
cPhs_Step phase = dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_npc_soldierB.cpp
+3 -3
View File
@@ -164,7 +164,7 @@ daNpc_SoldierB_HIOParam const daNpc_SoldierB_Param_c::m = {
false, // debug_info_ON
};
cPhs__Step daNpc_SoldierB_c::create() {
cPhs_Step daNpc_SoldierB_c::create() {
mTwilight = dKy_darkworld_check();
fopAcM_ct(this, daNpc_SoldierB_c);
@@ -184,8 +184,8 @@ cPhs__Step daNpc_SoldierB_c::create() {
int res_count = 0;
int i = 0;
for (; l_loadRes_list[mType][i] >= 0; i++) {
cPhs__Step phase =
(cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
cPhs_Step phase =
dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_npc_sq.cpp
+2 -2
View File
@@ -316,11 +316,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
1, 0, 1.0f, 0, -1) ? 1 : 0;
}
static cPhs__Step daNpc_Sq_Create(fopAc_ac_c* i_this) {
static cPhs_Step daNpc_Sq_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, npc_sq_class);
npc_sq_class* _this = static_cast<npc_sq_class*>(i_this);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhaseReq, "Sq");
cPhs_Step step = dComIfG_resLoad(&_this->mPhaseReq, "Sq");
if (step == cPhs_COMPLEATE_e) {
/* dSv_event_flag_c::D_0001 - Ordon Village - Stopped by squirrel in front of house at night */
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[25])) {
src/d/actor/d_a_npc_taro.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "d/d_msg_object.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_camera_mng.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
daNpc_Maro_c::actionFunc dummy_lit_3931() {
return &daNpc_Maro_c::choccai;
src/d/actor/d_a_npc_the.cpp
+4 -4
View File
@@ -924,11 +924,11 @@ BOOL daNpcThe_c::EvCut_Introduction(int i_staffID) {
return false;
}
static cPhs__Step daNpcThe_Create(void* i_this) {
static cPhs_Step daNpcThe_Create(void* i_this) {
return static_cast<daNpcThe_c*>(i_this)->create();
}
cPhs__Step daNpcThe_c::create() {
cPhs_Step daNpcThe_c::create() {
fopAcM_ct(this, daNpcThe_c);
mType = getTypeFromParam();
@@ -949,11 +949,11 @@ cPhs__Step daNpcThe_c::create() {
return cPhs_ERROR_e;
}
cPhs__Step step;
cPhs_Step step;
int resources_loaded = 0;
int i = 0;
for (; l_loadRes_list[mType][i] >= 0; i++) {
step = (cPhs__Step)dComIfG_resLoad(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]);
step = dComIfG_resLoad(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]);
if (step == cPhs_ERROR_e || step == cPhs_UNK3_e) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_npc_theB.cpp
+2 -2
View File
@@ -234,10 +234,10 @@ daNpcTheB_HIOParam const daNpcTheB_Param_c::m = {
false,
};
cPhs__Step daNpcTheB_c::create() {
cPhs_Step daNpcTheB_c::create() {
fopAcM_ct(this, daNpcTheB_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
cPhs_Step phase = dComIfG_resLoad(&mPhase, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x2CB0)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_tkc.cpp
+3 -3
View File
@@ -200,7 +200,7 @@ daNpcTkc_HIOParam const daNpcTkc_Param_c::m = {
0,
};
cPhs__Step daNpcTkc_c::Create() {
cPhs_Step daNpcTkc_c::Create() {
fopAcM_ct(this, daNpcTkc_c);
if (getType() != TYPE_2) {
@@ -216,8 +216,8 @@ cPhs__Step daNpcTkc_c::Create() {
}
}
cPhs__Step phase = cPhs_ERROR_e;
phase = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
cPhs_Step phase = cPhs_ERROR_e;
phase = dComIfG_resLoad(&mPhase, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x2030)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_tkj2.cpp
+2 -2
View File
@@ -1076,11 +1076,11 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) {
static cPhs_Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) {
fopAcM_ct(a_this, npc_tkj2_class);
npc_tkj2_class* i_this = (npc_tkj2_class*)a_this;
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "Tkj2");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "Tkj2");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("NPC_TKJ2 PARAM %x\n", fopAcM_GetParam(a_this));
src/d/actor/d_a_npc_tks.cpp
+3 -3
View File
@@ -284,7 +284,7 @@ daNpcTks_c::~daNpcTks_c() {
#endif
}
cPhs__Step daNpcTks_c::Create() {
cPhs_Step daNpcTks_c::Create() {
fopAcM_ct(this, daNpcTks_c);
if (dComIfGs_isStageBossEnemy()) {
@@ -311,9 +311,9 @@ cPhs__Step daNpcTks_c::Create() {
mMessageNo = getMessageNo();
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; l_loadRes_list[mTksTsubo.mTsuboType][i] >= 0; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_arcNames[l_loadRes_list[mTksTsubo.mTsuboType][i]]);
phase = dComIfG_resLoad(&mPhases[i], l_arcNames[l_loadRes_list[mTksTsubo.mTsuboType][i]]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
}

Some files were not shown because too many files have changed in this diff Show More