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

d_a_obj_sekizo OK (#2092)

Browse Source 
* Test commit.

* Match initBaseMtx and setBaseMtx

* Match Create, Draw. Execute almost matched.

* Match Execute and simpler functions.

* Misc changes for pause.

* Match CreateHeap and Delete. Start cleanup.

* Match create(). Update inherited fopAc_ac_c members.

* Most of sekizo matched, but .data has extra zeros (param_c underutilized?).

* Minor cleanup.

* Remove unused asm and update progress.

* Fix progress.

* Casting and cullMtx feedback.
This commit is contained in:
ErraticOocca
2024-03-10 16:12:33 -07:00
committed by GitHub
parent dd0fd674f9
commit 86af5df121
15 changed files with 141 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp
+108 -205
View File
@@ -4,83 +4,8 @@
*/
#include "rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "d/bg/d_bg_s.h"
#include "d/bg/d_bg_w.h"
#include "d/d_procname.h"
#include "dol2asm.h"
class daObj_Sekizo_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
public:
/* 80CCDC0C */ int create();
/* 80CCDD00 */ int CreateHeap();
/* 80CCDD8C */ int Create();
/* 80CCDDE8 */ int Delete();
/* 80CCDE3C */ int Execute(Mtx**);
/* 80CCDEF4 */ int Draw();
/* 80CCDFA4 */ void initBaseMtx();
/* 80CCDFE0 */ void setBaseMtx();
/* 0x5AC */ J3DModel* mpModel;
/* 0x5B0 */ u8 field_0x5b0;
/* 0x5B1 */ u8 field_0x5b1;
/* 0x5B2 */ u8 field_0x5b2;
}; // Size: 0x5B4
class daObj_Sekizo_Param_c {
public:
/* 80CCE118 */ virtual ~daObj_Sekizo_Param_c() {}
};
//
// Forward References:
//
extern "C" void create__14daObj_Sekizo_cFv();
extern "C" void CreateHeap__14daObj_Sekizo_cFv();
extern "C" void Create__14daObj_Sekizo_cFv();
extern "C" void Delete__14daObj_Sekizo_cFv();
extern "C" void Execute__14daObj_Sekizo_cFPPA3_A4_f();
extern "C" void Draw__14daObj_Sekizo_cFv();
extern "C" void initBaseMtx__14daObj_Sekizo_cFv();
extern "C" void setBaseMtx__14daObj_Sekizo_cFv();
extern "C" static void daObj_Sekizo_Create__FPv();
extern "C" static void daObj_Sekizo_Delete__FPv();
extern "C" static void daObj_Sekizo_Execute__FPv();
extern "C" static void daObj_Sekizo_Draw__FPv();
extern "C" static bool daObj_Sekizo_IsDelete__FPv();
extern "C" void __sinit_d_a_obj_sekizo_cpp();
extern "C" void __dt__20daObj_Sekizo_Param_cFv();
extern "C" extern char const* const d_a_obj_sekizo__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void Release__4cBgSFP9dBgW_Base();
extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz();
extern "C" void __ct__16dBgS_MoveBgActorFv();
extern "C" bool IsDelete__16dBgS_MoveBgActorFv();
extern "C" bool ToFore__16dBgS_MoveBgActorFv();
extern "C" bool ToBack__16dBgS_MoveBgActorFv();
extern "C" void
MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void __dl__FPv();
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" void __register_global_object();
#include "d/com/d_com_inf_game.h"
/* 80CCE17C-80CCE188 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
static u8 cNullVec__6Z2Calc[12] = {
@@ -88,9 +13,7 @@ static u8 cNullVec__6Z2Calc[12] = {
};
/* 80CCE188-80CCE19C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
@@ -98,176 +21,132 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x3FE00000,
0x00000000,
};
#pragma pop
/* 80CCE19C-80CCE1A4 000020 0008+00 2/3 0/0 0/0 .data l_bmdData */
static u32 l_bmdData[2] = {4, 1};
static struct {
u32 bmdIdx;
u32 resIdx;
} l_bmdData[1] = {4, 1};
/* 80CCE1A4-80CCE1AC 000028 0008+00 0/1 0/0 0/0 .data l_dzbData */
#pragma push
#pragma force_active on
static u32 l_dzbData[2] = {7, 1};
#pragma pop
static struct {
u32 dzbIdx;
u32 resIdx;
} l_dzbData[1] = {7, 1};
/* 80CCE1AC-80CCE1B4 -00001 0008+00 2/3 0/0 0/0 .data l_resNameList */
static char* l_resNameList[2] = {"", "Sekizo"};
/* 80CCE1B4-80CCE1D4 -00001 0020+00 1/0 0/0 0/0 .data daObj_Sekizo_MethodTable */
SECTION_DATA static void* daObj_Sekizo_MethodTable[8] = {
(void*)daObj_Sekizo_Create__FPv,
(void*)daObj_Sekizo_Delete__FPv,
(void*)daObj_Sekizo_Execute__FPv,
(void*)daObj_Sekizo_IsDelete__FPv,
(void*)daObj_Sekizo_Draw__FPv,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 80CCE1D4-80CCE204 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SEKIZO */
SECTION_DATA extern void* g_profile_OBJ_SEKIZO[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x01330000, (void*)&g_fpcLf_Method,
(void*)0x000005B4, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x00580000, (void*)&daObj_Sekizo_MethodTable,
(void*)0x00044000, (void*)0x000E0000,
};
/* 80CCE204-80CCE22C 000088 0028+00 1/1 0/0 0/0 .data __vt__14daObj_Sekizo_c */
SECTION_DATA extern void* __vt__14daObj_Sekizo_c[10] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)CreateHeap__14daObj_Sekizo_cFv,
(void*)Create__14daObj_Sekizo_cFv,
(void*)Execute__14daObj_Sekizo_cFPPA3_A4_f,
(void*)Draw__14daObj_Sekizo_cFv,
(void*)Delete__14daObj_Sekizo_cFv,
(void*)IsDelete__16dBgS_MoveBgActorFv,
(void*)ToFore__16dBgS_MoveBgActorFv,
(void*)ToBack__16dBgS_MoveBgActorFv,
};
/* 80CCDC0C-80CCDD00 0000EC 00F4+00 1/1 0/0 0/0 .text create__14daObj_Sekizo_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObj_Sekizo_c::create() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/create__14daObj_Sekizo_cFv.s"
cPhs__Step daObj_Sekizo_c::create() {
fopAcM_SetupActor(this, daObj_Sekizo_c);
field_0x5b0 = 0;
cPhs__Step step =
(cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_resNameList[l_bmdData[field_0x5b0].resIdx]);
if (step == cPhs_COMPLEATE_e) {
step = (cPhs__Step)MoveBGCreate(l_resNameList[l_dzbData[field_0x5b0].resIdx],
l_dzbData[field_0x5b0].dzbIdx, dBgS_MoveBGProc_TypicalRotY,
0x4000, NULL);
if (step == cPhs_ERROR_e) {
return step;
}
}
return step;
}
#pragma pop
/* 80CCDD00-80CCDD8C 0001E0 008C+00 1/0 0/0 0/0 .text CreateHeap__14daObj_Sekizo_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObj_Sekizo_c::CreateHeap() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/CreateHeap__14daObj_Sekizo_cFv.s"
int daObj_Sekizo_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(
l_resNameList[l_bmdData[field_0x5b0].resIdx], l_bmdData[field_0x5b0].bmdIdx);
mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
if (mpModel == NULL) {
return false;
}
return true;
}
#pragma pop
/* 80CCDD8C-80CCDDE8 00026C 005C+00 1/0 0/0 0/0 .text Create__14daObj_Sekizo_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObj_Sekizo_c::Create() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/func_80CCDD8C.s"
int daObj_Sekizo_c::Create() {
initBaseMtx();
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
fopAcM_setCullSizeBox2(this, mpModel->getModelData());
field_0x5b2 = false;
field_0x5b1 = true;
return 1;
}
#pragma pop
/* 80CCDDE8-80CCDE3C 0002C8 0054+00 1/0 0/0 0/0 .text Delete__14daObj_Sekizo_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObj_Sekizo_c::Delete() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/Delete__14daObj_Sekizo_cFv.s"
int daObj_Sekizo_c::Delete() {
dComIfG_resDelete(&mPhaseReq, l_resNameList[l_bmdData[field_0x5b0].resIdx]);
return 1;
}
#pragma pop
/* 80CCDE3C-80CCDEF4 00031C 00B8+00 1/0 0/0 0/0 .text Execute__14daObj_Sekizo_cFPPA3_A4_f
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObj_Sekizo_c::Execute(Mtx** i_mtx) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/Execute__14daObj_Sekizo_cFPPA3_A4_f.s"
int daObj_Sekizo_c::Execute(Mtx** i_mtx) {
if (home.roomNo == dComIfGp_roomControl_getStayNo()) {
*i_mtx = &mBgMtx;
setBaseMtx();
if (field_0x5b2) {
if (field_0x5b1) {
dComIfG_Bgsp().Release(mpBgW);
field_0x5b1 = false;
}
} else if (!field_0x5b1) {
dComIfG_Bgsp().Regist(mpBgW, this);
field_0x5b1 = true;
}
}
return 1;
}
#pragma pop
/* 80CCDEF4-80CCDFA4 0003D4 00B0+00 1/0 0/0 0/0 .text Draw__14daObj_Sekizo_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObj_Sekizo_c::Draw() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/Draw__14daObj_Sekizo_cFv.s"
int daObj_Sekizo_c::Draw() {
if (!field_0x5b2) {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
}
return 1;
}
#pragma pop
/* 80CCDFA4-80CCDFE0 000484 003C+00 1/1 0/0 0/0 .text initBaseMtx__14daObj_Sekizo_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObj_Sekizo_c::initBaseMtx() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/initBaseMtx__14daObj_Sekizo_cFv.s"
void daObj_Sekizo_c::initBaseMtx() {
mpModel->setBaseScale(scale);
setBaseMtx();
}
#pragma pop
/* 80CCDFE0-80CCE044 0004C0 0064+00 2/2 0/0 0/0 .text setBaseMtx__14daObj_Sekizo_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObj_Sekizo_c::setBaseMtx() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/setBaseMtx__14daObj_Sekizo_cFv.s"
void daObj_Sekizo_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
}
#pragma pop
/* 80CCE044-80CCE064 000524 0020+00 1/0 0/0 0/0 .text daObj_Sekizo_Create__FPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm int daObj_Sekizo_Create(void* i_this) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/daObj_Sekizo_Create__FPv.s"
static int daObj_Sekizo_Create(void* i_this) {
return static_cast<daObj_Sekizo_c*>(i_this)->create();
}
#pragma pop
/* 80CCE064-80CCE084 000544 0020+00 1/0 0/0 0/0 .text daObj_Sekizo_Delete__FPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm int daObj_Sekizo_Delete(void* i_this) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/daObj_Sekizo_Delete__FPv.s"
static int daObj_Sekizo_Delete(void* i_this) {
return static_cast<daObj_Sekizo_c*>(i_this)->MoveBGDelete();
}
#pragma pop
/* 80CCE084-80CCE0A4 000564 0020+00 1/0 0/0 0/0 .text daObj_Sekizo_Execute__FPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm int daObj_Sekizo_Execute(void* i_this) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/daObj_Sekizo_Execute__FPv.s"
static int daObj_Sekizo_Execute(void* i_this) {
return static_cast<daObj_Sekizo_c*>(i_this)->MoveBGExecute();
}
#pragma pop
/* 80CCE0A4-80CCE0D0 000584 002C+00 1/0 0/0 0/0 .text daObj_Sekizo_Draw__FPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm int daObj_Sekizo_Draw(void* i_this) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/daObj_Sekizo_Draw__FPv.s"
static int daObj_Sekizo_Draw(void* i_this) {
return static_cast<daObj_Sekizo_c*>(i_this)->MoveBGDraw();
}
#pragma pop
/* 80CCE0D0-80CCE0D8 0005B0 0008+00 1/0 0/0 0/0 .text daObj_Sekizo_IsDelete__FPv */
static int daObj_Sekizo_IsDelete(void* i_this) {
@@ -279,3 +158,27 @@ static u8 lit_3800[12];
/* 80CCE24C-80CCE250 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
static daObj_Sekizo_Param_c l_HIO;
/* 80CCE1B4-80CCE1D4 -00001 0020+00 1/0 0/0 0/0 .data daObj_Sekizo_MethodTable */
static actor_method_class daObj_Sekizo_MethodTable = {
(process_method_func)daObj_Sekizo_Create, (process_method_func)daObj_Sekizo_Delete,
(process_method_func)daObj_Sekizo_Execute, (process_method_func)daObj_Sekizo_IsDelete,
(process_method_func)daObj_Sekizo_Draw};
/* 80CCE1D4-80CCE204 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SEKIZO */
extern actor_process_profile_definition g_profile_OBJ_SEKIZO = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_OBJ_SEKIZO, // mProcName
&g_fpcLf_Method.mBase, // sub_method
sizeof(daObj_Sekizo_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
88, // mPriority
&daObj_Sekizo_MethodTable, // mSubMtd
0x44000, // status
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};