diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2023-11-18 23:23:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-19 06:23:27 +0200 |
| commit | 5cc47d7212a12c842e610cdada9822623a804de9 (patch) | |
| tree | 12275cb8c8852df39ca9e6dc970637964e8e5fe3 /rel | |
| parent | c31a6f988c3489f15a640cf798d26846302cd0b0 (diff) | |
d_a_obj_bed OK (#1989)
Diffstat (limited to 'rel')
| -rw-r--r-- | rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp | 707 |
1 files changed, 156 insertions, 551 deletions
diff --git a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp index a5c3ad11a0..389f00ecf5 100644 --- a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp +++ b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp @@ -4,616 +4,221 @@ // #include "rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_Bed_c { - /* 80BAD66C */ ~daObj_Bed_c(); - /* 80BAD790 */ void create(); - /* 80BADB70 */ void CreateHeap(); - /* 80BADC80 */ void Delete(); - /* 80BADCB4 */ void Execute(); - /* 80BADDF4 */ void Draw(); - /* 80BADEB8 */ void createHeapCallBack(fopAc_ac_c*); - /* 80BADED8 */ bool getType(); - /* 80BADEE0 */ void getResName(); - /* 80BADEF0 */ void isDelete(); - /* 80BADF34 */ void setEnvTevColor(); - /* 80BADF90 */ void setRoomNo(); - /* 80BADFD0 */ void setMtx(); -}; - -struct daObj_Bed_Param_c { - /* 80BAE0FC */ ~daObj_Bed_Param_c(); - - static u8 const m[16]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BADB00 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80BADA90 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGLin { - /* 80BADA00 */ ~cM3dGLin(); -}; - -struct cM3dGCyl { - /* 80BADA48 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct _GXTexObj {}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __dt__11daObj_Bed_cFv(); -extern "C" void create__11daObj_Bed_cFv(); -extern "C" void __dt__8cM3dGLinFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void CreateHeap__11daObj_Bed_cFv(); -extern "C" void Delete__11daObj_Bed_cFv(); -extern "C" void Execute__11daObj_Bed_cFv(); -extern "C" void Draw__11daObj_Bed_cFv(); -extern "C" void createHeapCallBack__11daObj_Bed_cFP10fopAc_ac_c(); -extern "C" bool getType__11daObj_Bed_cFv(); -extern "C" void getResName__11daObj_Bed_cFv(); -extern "C" void isDelete__11daObj_Bed_cFv(); -extern "C" void setEnvTevColor__11daObj_Bed_cFv(); -extern "C" void setRoomNo__11daObj_Bed_cFv(); -extern "C" void setMtx__11daObj_Bed_cFv(); -extern "C" static void daObj_Bed_Create__FPv(); -extern "C" static void daObj_Bed_Delete__FPv(); -extern "C" static void daObj_Bed_Execute__FPv(); -extern "C" static void daObj_Bed_Draw__FPv(); -extern "C" static bool daObj_Bed_IsDelete__FPv(); -extern "C" void __sinit_d_a_obj_bed_cpp(); -extern "C" void __dt__17daObj_Bed_Param_cFv(); -extern "C" static void func_80BAE144(); -extern "C" static void func_80BAE14C(); -extern "C" u8 const m__17daObj_Bed_Param_c[16]; -extern "C" extern char const* const d_a_obj_bed__stringBase0; - -// -// External References: -// - -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -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 GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void daNpcT_chkEvtBit__FUl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __ct__11cBgS_GndChkFv(); -extern "C" void __dt__11cBgS_GndChkFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BAE190-80BAE190 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BAE190 = "KH_Bed"; -#pragma pop +#include "JSystem/JKernel/JKRHeap.h" +#include "d/bg/d_bg_s.h" +#include "d/d_drawlist.h" +#include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "m_Do/m_Do_ext.h" +#include "d/a/d_a_npc.h" +#include "d/d_procname.h" /* 80BAE198-80BAE19C -00001 0004+00 1/1 0/0 0/0 .data l_resName */ -SECTION_DATA static void* l_resName = (void*)&d_a_obj_bed__stringBase0; - -/* 80BAE19C-80BAE1BC -00001 0020+00 1/0 0/0 0/0 .data daObj_Bed_MethodTable */ -SECTION_DATA static void* daObj_Bed_MethodTable[8] = { - (void*)daObj_Bed_Create__FPv, - (void*)daObj_Bed_Delete__FPv, - (void*)daObj_Bed_Execute__FPv, - (void*)daObj_Bed_IsDelete__FPv, - (void*)daObj_Bed_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80BAE1BC-80BAE1EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_BED */ -SECTION_DATA extern void* g_profile_OBJ_BED[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x012C0000, (void*)&g_fpcLf_Method, - (void*)0x00000844, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x004F0000, (void*)&daObj_Bed_MethodTable, - (void*)0x00044100, (void*)0x000E0000, -}; +static char* l_resName = "KH_Bed"; -/* 80BAE1EC-80BAE210 000054 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80BAE14C, - (void*)NULL, - (void*)NULL, - (void*)func_80BAE144, -}; - -/* 80BAE210-80BAE21C 000078 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80BAE21C-80BAE228 000084 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80BAE228-80BAE234 000090 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGLin */ -SECTION_DATA extern void* __vt__8cM3dGLin[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGLinFv, -}; - -/* 80BAE234-80BAE240 00009C 000C+00 2/2 0/0 0/0 .data __vt__11daObj_Bed_c */ -SECTION_DATA extern void* __vt__11daObj_Bed_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11daObj_Bed_cFv, -}; +/* 80BAE168-80BAE178 000000 0010+00 2/2 0/0 0/0 .rodata m__17daObj_Bed_Param_c */ +daObj_Bed_Param_c::params const daObj_Bed_Param_c::m = {NULL, -3.0f, 1.0f, 600.0f}; /* 80BAD66C-80BAD790 0000EC 0124+00 1/0 0/0 0/0 .text __dt__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Bed_c::~daObj_Bed_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/__dt__11daObj_Bed_cFv.s" +daObj_Bed_c::~daObj_Bed_c() { + if (mpCollider != NULL) { + dComIfG_Bgsp().Release(mpCollider); + } + dComIfG_resDelete(&mPhase, getResName()); } -#pragma pop - -/* ############################################################################################## */ -/* 80BAE168-80BAE178 000000 0010+00 2/2 0/0 0/0 .rodata m__17daObj_Bed_Param_c */ -SECTION_RODATA u8 const daObj_Bed_Param_c::m[16] = { - 0x00, 0x00, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BAE168, &daObj_Bed_Param_c::m); - -/* 80BAE178-80BAE17C 000010 0004+00 0/1 0/0 0/0 .rodata @3902 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3902 = -200.0f; -COMPILER_STRIP_GATE(0x80BAE178, &lit_3902); -#pragma pop - -/* 80BAE17C-80BAE180 000014 0004+00 0/1 0/0 0/0 .rodata @3903 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3903 = -100.0f; -COMPILER_STRIP_GATE(0x80BAE17C, &lit_3903); -#pragma pop - -/* 80BAE180-80BAE184 000018 0004+00 0/1 0/0 0/0 .rodata @3904 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3904 = 200.0f; -COMPILER_STRIP_GATE(0x80BAE180, &lit_3904); -#pragma pop - -/* 80BAE184-80BAE188 00001C 0004+00 1/3 0/0 0/0 .rodata @3905 */ -SECTION_RODATA static f32 const lit_3905 = -1000000000.0f; -COMPILER_STRIP_GATE(0x80BAE184, &lit_3905); /* 80BAD790-80BADA00 000210 0270+00 1/1 0/0 0/0 .text create__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/create__11daObj_Bed_cFv.s" -} -#pragma pop - -/* 80BADA00-80BADA48 000480 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGLinFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGLin::~cM3dGLin() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/__dt__8cM3dGLinFv.s" -} -#pragma pop - -/* 80BADA48-80BADA90 0004C8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/__dt__8cM3dGCylFv.s" +cPhs__Step daObj_Bed_c::create() { + fopAcM_SetupActor(this, daObj_Bed_c); + mType = getType(); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, getResName()); + if (step == cPhs_COMPLEATE_e) { + if (isDelete()) { + return cPhs_ERROR_e; + } + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x2520)) { + return cPhs_ERROR_e; + } + if (mpCollider != NULL) { + if (dComIfG_Bgsp().Regist(mpCollider, this) == true) { + return cPhs_ERROR_e; + } + } + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 200.0f, 200.0f); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, + &speed, ¤t.angle, &shape_angle); + mAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mAcch.m_gnd; + mGroundH = mAcch.GetGroundH(); + if (mGroundH != -1e9f) { + setEnvTevColor(); + setRoomNo(); + } + Execute(); + } + return step; } -#pragma pop - -/* 80BADA90-80BADB00 000510 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 80BADB00-80BADB70 000580 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop /* 80BADB70-80BADC80 0005F0 0110+00 1/1 0/0 0/0 .text CreateHeap__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/CreateHeap__11daObj_Bed_cFv.s" +int daObj_Bed_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(getResName(), 4); + if (model_data == NULL) { + return 0; + } + mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + mpCollider = new dBgW(); + if (mpCollider == NULL) { + return 0; + } + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(getResName(), 7); + if (mpCollider->Set(dzb, 1, &mMtx) == true) { + return 0; + } + mpCollider->SetCrrFunc(dBgS_MoveBGProc_Typical); + return 1; } -#pragma pop /* 80BADC80-80BADCB4 000700 0034+00 1/1 0/0 0/0 .text Delete__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/Delete__11daObj_Bed_cFv.s" +int daObj_Bed_c::Delete() { + this->~daObj_Bed_c(); + return 1; } -#pragma pop /* 80BADCB4-80BADDF4 000734 0140+00 2/2 0/0 0/0 .text Execute__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/Execute__11daObj_Bed_cFv.s" +int daObj_Bed_c::Execute() { + mAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mAcch.m_gnd; + mGroundH = mAcch.GetGroundH(); + if (mGroundH != -1e9f) { + setEnvTevColor(); + setRoomNo(); + } + setMtx(); + if (mpCollider != NULL) { + PSMTXCopy(mpModel->getBaseTRMtx(), mMtx); + mpCollider->Move(); + } + mEyePos = mAttentionInfo.mPosition = current.pos; + mAttentionInfo.mFlags = 0; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BAE188-80BAE18C 000020 0004+00 0/1 0/0 0/0 .rodata @3985 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3985 = 20.0f; -COMPILER_STRIP_GATE(0x80BAE188, &lit_3985); -#pragma pop - -/* 80BAE18C-80BAE190 000024 0004+00 0/1 0/0 0/0 .rodata @3986 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3986 = 1.0f; -COMPILER_STRIP_GATE(0x80BAE18C, &lit_3986); -#pragma pop /* 80BADDF4-80BADEB8 000874 00C4+00 1/1 0/0 0/0 .text Draw__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/Draw__11daObj_Bed_cFv.s" +int daObj_Bed_c::Draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + mDoExt_modelUpdateDL(mpModel); + if (mGroundH != -1e9f) { + mShadow = dComIfGd_setShadow(mShadow, 1, mpModel, ¤t.pos, + daObj_Bed_Param_c::m.field_0xc, 20.0f, + current.pos.y, mGroundH, mGndChk, &mTevStr, 0, + 1.0f, &dDlst_shadowControl_c::mSimpleTexObj); + } + return 1; } -#pragma pop /* 80BADEB8-80BADED8 000938 0020+00 1/1 0/0 0/0 .text * createHeapCallBack__11daObj_Bed_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::createHeapCallBack(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/createHeapCallBack__11daObj_Bed_cFP10fopAc_ac_c.s" +int daObj_Bed_c::createHeapCallBack(fopAc_ac_c* i_this) { + return static_cast<daObj_Bed_c*>(i_this)->CreateHeap(); } -#pragma pop /* 80BADED8-80BADEE0 000958 0008+00 1/1 0/0 0/0 .text getType__11daObj_Bed_cFv */ -bool daObj_Bed_c::getType() { - return false; +u8 daObj_Bed_c::getType() { + return 0; } /* 80BADEE0-80BADEF0 000960 0010+00 3/3 0/0 0/0 .text getResName__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::getResName() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/getResName__11daObj_Bed_cFv.s" +char* daObj_Bed_c::getResName() { + return l_resName; } -#pragma pop /* 80BADEF0-80BADF34 000970 0044+00 1/1 0/0 0/0 .text isDelete__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::isDelete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/isDelete__11daObj_Bed_cFv.s" +int daObj_Bed_c::isDelete() { + switch (mType) { + case 0: + return daNpcT_chkEvtBit(0x108) == 0; + default: + return 0; + } } -#pragma pop /* 80BADF34-80BADF90 0009B4 005C+00 2/2 0/0 0/0 .text setEnvTevColor__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::setEnvTevColor() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/setEnvTevColor__11daObj_Bed_cFv.s" +void daObj_Bed_c::setEnvTevColor() { + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); } -#pragma pop /* 80BADF90-80BADFD0 000A10 0040+00 2/2 0/0 0/0 .text setRoomNo__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::setRoomNo() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/setRoomNo__11daObj_Bed_cFv.s" +void daObj_Bed_c::setRoomNo() { + fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk)); } -#pragma pop /* 80BADFD0-80BAE034 000A50 0064+00 1/1 0/0 0/0 .text setMtx__11daObj_Bed_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Bed_c::setMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/setMtx__11daObj_Bed_cFv.s" +void daObj_Bed_c::setMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::scaleM(mScale); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* 80BAE034-80BAE054 000AB4 0020+00 1/0 0/0 0/0 .text daObj_Bed_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Bed_Create(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/daObj_Bed_Create__FPv.s" + +static cPhs__Step daObj_Bed_Create(void* i_this) { + return static_cast<daObj_Bed_c*>(i_this)->create(); } -#pragma pop /* 80BAE054-80BAE074 000AD4 0020+00 1/0 0/0 0/0 .text daObj_Bed_Delete__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Bed_Delete(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/daObj_Bed_Delete__FPv.s" +static int daObj_Bed_Delete(void* i_this) { + return static_cast<daObj_Bed_c*>(i_this)->Delete(); } -#pragma pop /* 80BAE074-80BAE094 000AF4 0020+00 1/0 0/0 0/0 .text daObj_Bed_Execute__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Bed_Execute(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/daObj_Bed_Execute__FPv.s" +static int daObj_Bed_Execute(void* i_this) { + return static_cast<daObj_Bed_c*>(i_this)->Execute(); } -#pragma pop /* 80BAE094-80BAE0B4 000B14 0020+00 1/0 0/0 0/0 .text daObj_Bed_Draw__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Bed_Draw(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/daObj_Bed_Draw__FPv.s" +static int daObj_Bed_Draw(void* i_this) { + return static_cast<daObj_Bed_c*>(i_this)->Draw(); } -#pragma pop /* 80BAE0B4-80BAE0BC 000B34 0008+00 1/0 0/0 0/0 .text daObj_Bed_IsDelete__FPv */ -static bool daObj_Bed_IsDelete(void* param_0) { - return true; +static int daObj_Bed_IsDelete(void* param_0) { + return 1; } -/* ############################################################################################## */ -/* 80BAE240-80BAE24C 0000A8 000C+00 2/2 0/0 0/0 .data __vt__17daObj_Bed_Param_c */ -SECTION_DATA extern void* __vt__17daObj_Bed_Param_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17daObj_Bed_Param_cFv, -}; - -/* 80BAE258-80BAE264 000008 000C+00 1/1 0/0 0/0 .bss @3805 */ -static u8 lit_3805[12]; - /* 80BAE264-80BAE268 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[4]; - -/* 80BAE0BC-80BAE0FC 000B3C 0040+00 0/0 1/0 0/0 .text __sinit_d_a_obj_bed_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_bed_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/__sinit_d_a_obj_bed_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80BAE0BC, __sinit_d_a_obj_bed_cpp); -#pragma pop - -/* 80BAE0FC-80BAE144 000B7C 0048+00 2/1 0/0 0/0 .text __dt__17daObj_Bed_Param_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Bed_Param_c::~daObj_Bed_Param_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/__dt__17daObj_Bed_Param_cFv.s" -} -#pragma pop +static daObj_Bed_Param_c l_HIO; -/* 80BAE144-80BAE14C 000BC4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BAE144() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/func_80BAE144.s" -} -#pragma pop - -/* 80BAE14C-80BAE154 000BCC 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BAE14C() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed/func_80BAE14C.s" -} -#pragma pop +/* 80BAE19C-80BAE1BC -00001 0020+00 1/0 0/0 0/0 .data daObj_Bed_MethodTable */ +static actor_method_class daObj_Bed_MethodTable = { + (process_method_func)daObj_Bed_Create, + (process_method_func)daObj_Bed_Delete, + (process_method_func)daObj_Bed_Execute, + (process_method_func)daObj_Bed_IsDelete, + (process_method_func)daObj_Bed_Draw, +}; -/* 80BAE190-80BAE190 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80BAE1BC-80BAE1EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_BED */ +extern actor_process_profile_definition g_profile_OBJ_BED = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_OBJ_BED, + &g_fpcLf_Method.mBase, + sizeof(daObj_Bed_c), + 0, + 0, + &g_fopAc_Method.base, + 0x4F, + &daObj_Bed_MethodTable, + 0x44100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; |
