summaryrefslogtreecommitdiff
path: root/rel
diff options
context:
space:
mode:
Diffstat (limited to 'rel')
-rw-r--r--rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp316
1 files changed, 103 insertions, 213 deletions
diff --git a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp
index ea876a8bda..fb47015fa2 100644
--- a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp
+++ b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp
@@ -1,93 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_obj_bbox
-//
+/**
+ * d_a_obj_bbox.cpp
+ * Object - Breakable Wooden Box
+ */
#include "rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h"
-#include "d/cc/d_cc_d.h"
+#include "JSystem/JKernel/JKRHeap.h"
+#include "d/d_procname.h"
#include "dol2asm.h"
//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct mDoMtx_stack_c {
- /* 8000CD64 */ void transS(cXyz const&);
-
- static u8 now[48];
-};
-
-struct fopAc_ac_c {};
-
-struct daObjBBox_c {
- /* 80BACD38 */ void initBaseMtx();
- /* 80BACD74 */ void setBaseMtx();
- /* 80BACDD8 */ void Create();
- /* 80BACE50 */ void CreateHeap();
- /* 80BACEC0 */ void create1st();
- /* 80BAD0C0 */ void Execute(f32 (**)[3][4]);
- /* 80BAD234 */ void Draw();
- /* 80BAD2D8 */ void Delete();
-};
-
-struct dSv_info_c {
- /* 80035200 */ void onSwitch(int, int);
- /* 80035360 */ void isSwitch(int, int) const;
-};
-
-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 dPa_levelEcallBack {};
-
-struct csXyz {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
- /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
- u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
- cXyz const*, f32);
-};
-
-struct dBgW {};
-
-struct cBgS_PolyInfo {};
-
-struct dBgS_MoveBgActor {
- /* 80078624 */ dBgS_MoveBgActor();
- /* 800786B0 */ bool IsDelete();
- /* 800786B8 */ bool ToFore();
- /* 800786C0 */ bool ToBack();
- /* 800787BC */ void MoveBGCreate(char const*, int,
- void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*,
- csXyz*, csXyz*),
- u32, f32 (*)[3][4]);
- /* 800788DC */ void MoveBGDelete();
- /* 80078950 */ void MoveBGExecute();
-};
-
-struct cCcS {
- /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct J3DModel {};
-
-//
// Forward References:
//
@@ -145,20 +66,14 @@ extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void SetC__8cM3dGCylFRC4cXyz();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
extern "C" void _savegpr_25();
extern "C" void _restgpr_25();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
@@ -166,70 +81,54 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* 80BACD38-80BACD74 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjBBox_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjBBox_c::initBaseMtx() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/initBaseMtx__11daObjBBox_cFv.s"
+void daObjBBox_c::initBaseMtx() {
+ mpModel->setBaseScale(mScale);
+ setBaseMtx();
}
-#pragma pop
/* 80BACD74-80BACDD8 0000B4 0064+00 2/2 0/0 0/0 .text setBaseMtx__11daObjBBox_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjBBox_c::setBaseMtx() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/setBaseMtx__11daObjBBox_cFv.s"
+void daObjBBox_c::setBaseMtx() {
+ mDoMtx_stack_c::transS(current.pos);
+ mDoMtx_stack_c::YrotM(shape_angle.y);
+ mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
+ MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
-#pragma pop
-/* ############################################################################################## */
/* 80BAD474-80BAD4B8 000000 0044+00 2/2 0/0 0/0 .rodata l_cyl_src */
const static dCcD_SrcCyl l_cyl_src = {
{
- {0x0, {{0x0, 0x0, 0x1f}, {0xd8000000, 0x11}, 0x78}}, // mObj
- {dCcD_SE_NONE, 0x1, 0x0, 0x0, 0x0}, // mGObjAt
- {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg
- {0x0}, // mGObjCo
- }, // mObjInf
+ {0x0, {{0x0, 0x0, 0x1f}, {0xd8000000, 0x11}, 0x78}}, // mObj
+ {dCcD_SE_NONE, 0x1, 0x0, 0x0, 0x0}, // mGObjAt
+ {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg
+ {0x0}, // mGObjCo
+ }, // mObjInf
{
- {0.0f, 0.0f, 0.0f}, // mCenter
- 90.0f, // mRadius
- 100.0f // mHeight
- } // mCyl
+ {0.0f, 0.0f, 0.0f}, // mCenter
+ 90.0f, // mRadius
+ 100.0f // mHeight
+ } // mCyl
};
/* 80BACDD8-80BACE50 000118 0078+00 1/0 0/0 0/0 .text Create__11daObjBBox_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjBBox_c::Create() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Create__11daObjBBox_cFv.s"
+int daObjBBox_c::Create() {
+ initBaseMtx();
+ fopAcM_SetMtx(this, mpModel->mBaseTransformMtx);
+ mStts.Init(0xff, 0xff, this);
+ mCyl.Set(l_cyl_src);
+ mCyl.SetStts(&mStts);
+ fopAcM_setCullSizeBox2(this, mpModel->getModelData());
+ return 1;
}
-#pragma pop
-
-/* ############################################################################################## */
-/* 80BAD4CC-80BAD4CC 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80BAD4CC = "M_BBox";
-#pragma pop
/* 80BAD4D4-80BAD4D8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
-SECTION_DATA static void* l_arcName = (void*)&d_a_obj_bbox__stringBase0;
+static char* l_arcName = "M_BBox";
/* 80BACE50-80BACEC0 000190 0070+00 1/0 0/0 0/0 .text CreateHeap__11daObjBBox_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjBBox_c::CreateHeap() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/CreateHeap__11daObjBBox_cFv.s"
+int daObjBBox_c::CreateHeap() {
+ J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
+ mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
+ return mpModel != NULL ? 1 : 0;
}
-#pragma pop
/* ############################################################################################## */
/* 80BAD4D8-80BAD4F8 -00001 0020+00 1/0 0/0 0/0 .data daObjBBox_METHODS */
@@ -283,14 +182,33 @@ SECTION_DATA extern void* __vt__11daObjBBox_c[10] = {
};
/* 80BACEC0-80BAD030 000200 0170+00 1/1 0/0 0/0 .text create1st__11daObjBBox_cFv */
+#ifdef NONMATCHING
+// vtable explosion
+int daObjBBox_c::create1st() {
+ fopAcM_SetupActor(this, daObjBBox_c);
+
+ if (i_fopAcM_isSwitch(this, getSwNo())) {
+ return cPhs_ERROR_e;
+ }
+ int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
+ if (phase == cPhs_COMPLEATE_e) {
+ phase = MoveBGCreate(l_arcName, 7, NULL, 0xC00, NULL);
+ if (phase == cPhs_ERROR_e) {
+ return phase;
+ }
+ }
+ return phase;
+}
+#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
-asm void daObjBBox_c::create1st() {
+asm int daObjBBox_c::create1st() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/create1st__11daObjBBox_cFv.s"
}
#pragma pop
+#endif
/* 80BAD030-80BAD078 000370 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */
#pragma push
@@ -314,110 +232,82 @@ extern "C" asm void __dt__8cM3dGAabFv() {
}
#pragma pop
-/* ############################################################################################## */
/* 80BAD4B8-80BAD4C4 000044 000A+02 0/1 0/0 0/0 .rodata particle_id$3793 */
#pragma push
#pragma force_active on
-SECTION_RODATA static u8 const particle_id[10 + 2 /* padding */] = {
- 0x83,
- 0xB0,
- 0x83,
- 0xB1,
- 0x83,
- 0xB2,
- 0x83,
- 0xB3,
- 0x83,
- 0xB4,
- /* padding */
- 0x00,
- 0x00,
+static const u16 particle_id[5] = {
+ 0x83B0, 0x83B1, 0x83B2, 0x83B3, 0x83B4,
};
-COMPILER_STRIP_GATE(0x80BAD4B8, &particle_id);
-#pragma pop
-
-/* 80BAD4C4-80BAD4C8 000050 0004+00 0/1 0/0 0/0 .rodata @3821 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3821 = 1.0f;
-COMPILER_STRIP_GATE(0x80BAD4C4, &lit_3821);
-#pragma pop
-
-/* 80BAD4C8-80BAD4CC 000054 0004+00 0/1 0/0 0/0 .rodata @3822 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3822 = -1.0f;
-COMPILER_STRIP_GATE(0x80BAD4C8, &lit_3822);
#pragma pop
/* 80BAD0C0-80BAD234 000400 0174+00 1/0 0/0 0/0 .text Execute__11daObjBBox_cFPPA3_A4_f */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjBBox_c::Execute(f32 (**param_0)[3][4]) {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Execute__11daObjBBox_cFPPA3_A4_f.s"
+int daObjBBox_c::Execute(Mtx** i_mtx) {
+ if (mCyl.ChkTgHit() != 0) {
+ cCcD_Obj* hitObj = mCyl.GetTgHitObj();
+ if (hitObj != NULL) {
+ if (hitObj->ChkAtType(0xd8000000)) {
+ for (int i = 0; i < 5; i++) {
+ dComIfGp_particle_set(particle_id[i], &current.pos, NULL, &mScale, 0xff, NULL,
+ -1, NULL, NULL, NULL);
+ }
+ fopAcM_seStart(this, Z2SE_OBJ_WOODBOX_BREAK, 0);
+ i_fopAcM_onSwitch(this, getSwNo());
+ fopAcM_delete(this);
+ }
+ }
+ }
+ *i_mtx = &mBgMtx;
+ setBaseMtx();
+ mCyl.SetC(current.pos);
+ dComIfG_Ccsp()->Set(&mCyl);
+ return 1;
}
-#pragma pop
/* 80BAD234-80BAD2D8 000574 00A4+00 1/0 0/0 0/0 .text Draw__11daObjBBox_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjBBox_c::Draw() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Draw__11daObjBBox_cFv.s"
+int daObjBBox_c::Draw() {
+ g_env_light.settingTevStruct(0x10, &current.pos, &mTevStr);
+ g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr);
+ dComIfGd_setListBG();
+ mDoExt_modelUpdateDL(mpModel);
+ dComIfGd_setList();
+ return 1;
}
-#pragma pop
/* 80BAD2D8-80BAD30C 000618 0034+00 1/0 0/0 0/0 .text Delete__11daObjBBox_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjBBox_c::Delete() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/Delete__11daObjBBox_cFv.s"
+int daObjBBox_c::Delete() {
+ dComIfG_resDelete(&mPhaseReq, l_arcName);
+ return 1;
}
-#pragma pop
/* 80BAD30C-80BAD400 00064C 00F4+00 1/0 0/0 0/0 .text daObjBBox_create1st__FP11daObjBBox_c */
+#ifdef NONMATCHING
+// vtable explosion
+static int daObjBBox_create1st(daObjBBox_c* i_this) {
+ fopAcM_SetupActor(i_this, daObjBBox_c);
+ return i_this->create1st();
+}
+#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
-static asm void daObjBBox_create1st(daObjBBox_c* param_0) {
+static asm int daObjBBox_create1st(daObjBBox_c* i_this) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_create1st__FP11daObjBBox_c.s"
}
#pragma pop
+#endif
/* 80BAD400-80BAD420 000740 0020+00 1/0 0/0 0/0 .text daObjBBox_MoveBGDelete__FP11daObjBBox_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjBBox_MoveBGDelete(daObjBBox_c* param_0) {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDelete__FP11daObjBBox_c.s"
+static int daObjBBox_MoveBGDelete(daObjBBox_c* i_this) {
+ return i_this->MoveBGDelete();
}
-#pragma pop
/* 80BAD420-80BAD440 000760 0020+00 1/0 0/0 0/0 .text daObjBBox_MoveBGExecute__FP11daObjBBox_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjBBox_MoveBGExecute(daObjBBox_c* param_0) {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGExecute__FP11daObjBBox_c.s"
+static int daObjBBox_MoveBGExecute(daObjBBox_c* i_this) {
+ return i_this->MoveBGExecute();
}
-#pragma pop
/* 80BAD440-80BAD46C 000780 002C+00 1/0 0/0 0/0 .text daObjBBox_MoveBGDraw__FP11daObjBBox_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjBBox_MoveBGDraw(daObjBBox_c* param_0) {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox/daObjBBox_MoveBGDraw__FP11daObjBBox_c.s"
+static int daObjBBox_MoveBGDraw(daObjBBox_c* i_this) {
+ return i_this->MoveBGDraw();
}
-#pragma pop
-
-/* 80BAD4CC-80BAD4CC 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-21 20:00:11 +0000