mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 04:31:37 -04:00
d_a_obj_kwheel00, 01, & d_a_obj_klift00 Equivalent (weak func and/or vtable order) (#2291)
* d_a_obj_kwheel00, 01, & d_a_obj_klift00 Equivalent (weak func and/or vtable order) * Three rels equivalent * Basic documentation for the three rels * Define explicit constructor for dMdl_obj_c (needed for proper array creation in d_a_obj_klift00) * Modify d_a_obj_bky_rock to account for new explicit constructor of dMdl_obj_c * Specify weak func and/or vtable orders for rels in config.py * Cleanup includes and dol2asm artifacts * * Fix debug build * Restore incorrectly removed l_bmdidx * Fix US retail equivalency
This commit is contained in:
+309
-338
@@ -4,173 +4,130 @@
|
||||
*/
|
||||
|
||||
#include "d/actor/d_a_obj_kwheel00.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
#include "JSystem/JHostIO/JORMContext.h"
|
||||
#include "d/actor/d_a_obj_lv3Water.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
#include "m_Do/m_Do_hostIO.h"
|
||||
|
||||
static int daObjKWheel00_create1st(daObjKWheel00_c*);
|
||||
static int daObjKWheel00_MoveBGDelete(daObjKWheel00_c*);
|
||||
static int daObjKWheel00_MoveBGExecute(daObjKWheel00_c*);
|
||||
static int daObjKWheel00_MoveBGDraw(daObjKWheel00_c*);
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
#ifdef DEBUG
|
||||
static daObjKWheel00_HIO_c l_HIO;
|
||||
|
||||
extern "C" void create1st__15daObjKWheel00_cFv();
|
||||
extern "C" static void searchLv3Water__FPvPv();
|
||||
extern "C" void setMtx__15daObjKWheel00_cFv();
|
||||
extern "C" void CreateHeap__15daObjKWheel00_cFv();
|
||||
extern "C" void Create__15daObjKWheel00_cFv();
|
||||
extern "C" void Execute__15daObjKWheel00_cFPPA3_A4_f();
|
||||
extern "C" void Draw__15daObjKWheel00_cFv();
|
||||
extern "C" void Delete__15daObjKWheel00_cFv();
|
||||
extern "C" void eventStart__15daObjKWheel00_cFv();
|
||||
extern "C" static void daObjKWheel00_create1st__FP15daObjKWheel00_c();
|
||||
extern "C" void __dt__8dCcD_SphFv();
|
||||
extern "C" void __ct__8dCcD_SphFv();
|
||||
extern "C" void __dt__8cM3dGSphFv();
|
||||
extern "C" void __dt__8cM3dGAabFv();
|
||||
extern "C" void __dt__10dCcD_GSttsFv();
|
||||
extern "C" static void daObjKWheel00_MoveBGDelete__FP15daObjKWheel00_c();
|
||||
extern "C" static void daObjKWheel00_MoveBGExecute__FP15daObjKWheel00_c();
|
||||
extern "C" static void daObjKWheel00_MoveBGDraw__FP15daObjKWheel00_c();
|
||||
extern "C" void __dt__10cCcD_GSttsFv();
|
||||
extern "C" void __dt__17dEvLib_callback_cFv();
|
||||
extern "C" bool eventStart__17dEvLib_callback_cFv();
|
||||
extern "C" bool eventRun__17dEvLib_callback_cFv();
|
||||
extern "C" bool eventEnd__17dEvLib_callback_cFv();
|
||||
extern "C" void __dt__15daObjKWheel00_cFv();
|
||||
extern "C" static void func_80C4E7E8();
|
||||
extern "C" static void func_80C4E7F0();
|
||||
extern "C" extern char const* const d_a_obj_kwheel00__stringBase0;
|
||||
daObjKWheel00_HIO_c::daObjKWheel00_HIO_c() {
|
||||
mTargetZAngularSpeed = 64;
|
||||
mZAngularAcceleration = 2;
|
||||
}
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
void daObjKWheel00_HIO_c::genMessage(JORMContext* ctx) {
|
||||
// "Water wheel"
|
||||
ctx->genLabel("水車", 0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18);
|
||||
|
||||
extern "C" void mDoMtx_YrotM__FPA4_fs();
|
||||
extern "C" void mDoMtx_ZrotM__FPA4_fs();
|
||||
extern "C" void transM__14mDoMtx_stack_cFfff();
|
||||
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
|
||||
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
|
||||
extern "C" void __dt__10fopAc_ac_cFv();
|
||||
extern "C" void fopAc_IsActor__FPv();
|
||||
extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
|
||||
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 isSwitch__10dSv_info_cCFii();
|
||||
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
|
||||
extern "C" void eventUpdate__17dEvLib_callback_cFv();
|
||||
extern "C" void orderEvent__17dEvLib_callback_cFiii();
|
||||
extern "C" void
|
||||
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
|
||||
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 __ct__10dCcD_GSttsFv();
|
||||
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
|
||||
extern "C" void __ct__12dCcD_GObjInfFv();
|
||||
extern "C" void __dt__12dCcD_GObjInfFv();
|
||||
extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph();
|
||||
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
|
||||
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
|
||||
extern "C" void Set__4cCcSFP8cCcD_Obj();
|
||||
extern "C" void cM_rndFX__Ff();
|
||||
extern "C" void SetC__8cM3dGSphFRC4cXyz();
|
||||
extern "C" void SetR__8cM3dGSphFf();
|
||||
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void __destroy_arr();
|
||||
extern "C" void __construct_array();
|
||||
extern "C" void _savegpr_21();
|
||||
extern "C" void _savegpr_27();
|
||||
extern "C" void _restgpr_21();
|
||||
extern "C" void _restgpr_27();
|
||||
extern "C" extern void* __vt__16dBgS_MoveBgActor[10];
|
||||
extern "C" extern void* __vt__8dCcD_Sph[36];
|
||||
extern "C" extern void* __vt__9dCcD_Stts[11];
|
||||
extern "C" extern void* __vt__12cCcD_SphAttr[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" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
// "Rotational speed(short)"
|
||||
ctx->genSlider("回転速度(short)",&mTargetZAngularSpeed, 0, 0x4000, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
// "Rotational acceleration(short)"
|
||||
ctx->genSlider("回転加速度(short)",&mZAngularAcceleration, 0, 32, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C4E800-80C4E808 000000 0008+00 2/2 0/0 0/0 .rodata l_dzbidx */
|
||||
SECTION_RODATA static u8 const l_dzbidx[8] = {
|
||||
0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C4E800, &l_dzbidx);
|
||||
|
||||
/* 80C4E85C-80C4E85C 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80C4E85C = "K_Wheel00";
|
||||
SECTION_DEAD static char const* const stringBase_80C4E866 = "S_wheel00";
|
||||
#pragma pop
|
||||
static const u32 l_dzbidx[2] = {7, 7};
|
||||
|
||||
/* 80C4E870-80C4E878 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */
|
||||
SECTION_DATA static void* l_arcName[2] = {
|
||||
(void*)&d_a_obj_kwheel00__stringBase0,
|
||||
(void*)(((char*)&d_a_obj_kwheel00__stringBase0) + 0xA),
|
||||
};
|
||||
static const char* l_arcName[2] = { "K_Wheel00", "S_wheel00" }; // K = Kinto, S = Shirogane?
|
||||
|
||||
/* 80C4D6F8-80C4D7A8 000078 00B0+00 1/1 0/0 0/0 .text create1st__15daObjKWheel00_cFv */
|
||||
void daObjKWheel00_c::create1st() {
|
||||
// NONMATCHING
|
||||
int daObjKWheel00_c::create1st() {
|
||||
m_type = static_cast<Type_e>(getType());
|
||||
JUT_ASSERT(118, m_type == 0 || m_type == 1);
|
||||
|
||||
cPhs__Step phase = static_cast<cPhs__Step>(dComIfG_resLoad(this, l_arcName[m_type]));
|
||||
if(phase == cPhs_COMPLEATE_e) {
|
||||
setMtx();
|
||||
|
||||
phase = static_cast<cPhs__Step>(MoveBGCreate(l_arcName[m_type], l_dzbidx[m_type], NULL, 0x4000, &mNewBgMtx));
|
||||
|
||||
if(phase == cPhs_ERROR_e)
|
||||
return phase;
|
||||
|
||||
#ifdef DEBUG
|
||||
// "Water wheel(Lv3)"
|
||||
l_HIO.entryHIO("水車(Lv3)");
|
||||
#endif
|
||||
}
|
||||
return phase;
|
||||
|
||||
}
|
||||
|
||||
/* 80C4D7A8-80C4D86C 000128 00C4+00 1/1 0/0 0/0 .text searchLv3Water__FPvPv */
|
||||
static void searchLv3Water(void* param_0, void* param_1) {
|
||||
// NONMATCHING
|
||||
static void* searchLv3Water(void* param_0, void* i_this) {
|
||||
daLv3Water_c* const lv3Water = static_cast<daLv3Water_c*>(param_0);
|
||||
daObjKWheel00_c* const kWheel00 = static_cast<daObjKWheel00_c*>(i_this);
|
||||
|
||||
if(lv3Water && fopAcM_IsActor(lv3Water) && fopAcM_GetProfName(lv3Water) == PROC_Obj_Lv3Water) {
|
||||
if(
|
||||
(fopAcM_GetRoomNo(kWheel00) == 7 && lv3Water->getType() == 8) ||
|
||||
(fopAcM_GetRoomNo(kWheel00) == 11 && lv3Water->getType() == 14) ||
|
||||
(fopAcM_GetRoomNo(kWheel00) == 2 && ((kWheel00->getSwNo() == 9 && lv3Water->getType() == 13) || (kWheel00->getSwNo() == 18 && lv3Water->getType() == 12)))
|
||||
)
|
||||
{
|
||||
return param_0;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C4E808-80C4E810 000008 0008+00 1/1 0/0 0/0 .rodata l_bmdidx */
|
||||
SECTION_RODATA static u8 const l_bmdidx[8] = {
|
||||
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C4E808, &l_bmdidx);
|
||||
static const int l_bmdidx[2] = {4, 4};
|
||||
|
||||
/* 80C4E810-80C4E840 000010 0030+00 1/1 0/0 0/0 .rodata l_cull_box */
|
||||
SECTION_RODATA static u8 const l_cull_box[48] = {
|
||||
0xC4, 0x4F, 0x80, 0x00, 0xC4, 0x4F, 0x80, 0x00, 0xC5, 0x1C, 0x40, 0x00, 0x44, 0x4F, 0x80, 0x00,
|
||||
0x44, 0x4F, 0x80, 0x00, 0x43, 0x48, 0x00, 0x00, 0xC4, 0x0C, 0x00, 0x00, 0xC4, 0x0C, 0x00, 0x00,
|
||||
0xC3, 0xAF, 0x00, 0x00, 0x44, 0x0C, 0x00, 0x00, 0x44, 0x0C, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00,
|
||||
const Vec l_cull_box[4] = {
|
||||
{-830.0f, -830.0f, -2500.0f}, {830.0f, 830.0f, 200.0f}, // Type 0
|
||||
{-560.0f, -560.0f, -350.0f}, {560.0f, 560.0f, 350.0f} // Type 1
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C4E810, &l_cull_box);
|
||||
|
||||
/* 80C4E840-80C4E844 000040 0004+00 1/2 0/0 0/0 .rodata @3696 */
|
||||
SECTION_RODATA static f32 const lit_3696 = 1.0f;
|
||||
COMPILER_STRIP_GATE(0x80C4E840, &lit_3696);
|
||||
|
||||
/* 80C4E844-80C4E848 000044 0004+00 1/1 0/0 0/0 .rodata @3697 */
|
||||
SECTION_RODATA static f32 const lit_3697 = 1.0f / 10.0f;
|
||||
COMPILER_STRIP_GATE(0x80C4E844, &lit_3697);
|
||||
|
||||
/* 80C4D86C-80C4D9B8 0001EC 014C+00 2/2 0/0 0/0 .text setMtx__15daObjKWheel00_cFv */
|
||||
void daObjKWheel00_c::setMtx() {
|
||||
// NONMATCHING
|
||||
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
|
||||
mDoMtx_stack_c::YrotM(current.angle.y);
|
||||
mDoMtx_stack_c::ZrotM(current.angle.z);
|
||||
|
||||
MTXCopy(mDoMtx_stack_c::get(), mTransformMtx);
|
||||
MTXCopy(mDoMtx_stack_c::get(), mNewBgMtx);
|
||||
|
||||
if(mZAngularVelocity) {
|
||||
mDoMtx_stack_c::copy(mTransformMtx);
|
||||
|
||||
if(m_type == TYPE_LARGE_GOLD)
|
||||
mDoMtx_stack_c::transM(cM_rndFX(1.0f), cM_rndFX(1.0f), cM_rndFX(1.0f));
|
||||
else
|
||||
mDoMtx_stack_c::transM(cM_rndFX(0.1f), cM_rndFX(0.1f), cM_rndFX(0.1f));
|
||||
|
||||
MTXCopy(mDoMtx_stack_c::get(), mTransformMtx);
|
||||
}
|
||||
}
|
||||
|
||||
/* 80C4D9B8-80C4DA38 000338 0080+00 1/0 0/0 0/0 .text CreateHeap__15daObjKWheel00_cFv */
|
||||
void daObjKWheel00_c::CreateHeap() {
|
||||
// NONMATCHING
|
||||
int daObjKWheel00_c::CreateHeap() {
|
||||
J3DModelData* const model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName[m_type], l_bmdidx[m_type]));
|
||||
JUT_ASSERT(206, model_data != 0);
|
||||
|
||||
mpModel = mDoExt_J3DModel__create(model_data, (1 << 19), 0x11000084);
|
||||
return !mpModel ? 0 : 1;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C4E878-80C4E8B8 000008 0040+00 1/1 0/0 0/0 .data l_sphSrc */
|
||||
static dCcD_SrcSph l_sphSrc = {
|
||||
{
|
||||
{0x0, {{0x0, 0x1, 0x0}, {0xd8fbfdff, 0x0}, 0x79}}, // mObj
|
||||
{0x0, {{AT_TYPE_0, 0x1, 0x0}, {0xd8fbfdff, 0x0}, 0x79}}, // mObj
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x1}, // mGObjAt
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
@@ -181,89 +138,240 @@ static dCcD_SrcSph l_sphSrc = {
|
||||
};
|
||||
|
||||
/* 80C4E8B8-80C4E8C0 000048 0008+00 2/2 0/0 0/0 .data l_se_angle */
|
||||
SECTION_DATA static u8 l_se_angle[8] = {
|
||||
0x00, 0x00, 0x3F, 0xFF, 0x7F, 0xFF, 0xBF, 0xFF,
|
||||
};
|
||||
u16 l_se_angle[4] = {0, 0x3FFF, 0x7FFF, 0xBFFF}; // {0°, 90°, 180°, 270°}
|
||||
|
||||
/* 80C4DA38-80C4DBBC 0003B8 0184+00 1/0 0/0 0/0 .text Create__15daObjKWheel00_cFv */
|
||||
void daObjKWheel00_c::Create() {
|
||||
// NONMATCHING
|
||||
int daObjKWheel00_c::Create() {
|
||||
mpModel->setBaseTRMtx(mTransformMtx);
|
||||
fopAcM_SetMtx(this, mTransformMtx);
|
||||
|
||||
mZAngularVelocity = 0;
|
||||
if(getSwNo() != 0xFF && fopAcM_isSwitch(this, getSwNo())) {
|
||||
#ifdef DEBUG
|
||||
if(getArg0())
|
||||
mZAngularVelocity = l_HIO.mTargetZAngularSpeed;
|
||||
else
|
||||
mZAngularVelocity = -l_HIO.mTargetZAngularSpeed;
|
||||
#else
|
||||
if(getArg0())
|
||||
mZAngularVelocity = 64;
|
||||
else
|
||||
mZAngularVelocity = -64;
|
||||
#endif
|
||||
}
|
||||
|
||||
const u32 minCullIdx = m_type << 1;
|
||||
const u32 maxCullIdx = minCullIdx + 1;
|
||||
fopAcM_setCullSizeBox(this, l_cull_box[minCullIdx].x, l_cull_box[minCullIdx].y, l_cull_box[minCullIdx].z, l_cull_box[maxCullIdx].x, l_cull_box[maxCullIdx].y, l_cull_box[maxCullIdx].z);
|
||||
|
||||
if(m_type == TYPE_SMALL_PLATINUM)
|
||||
fopAcM_SetStatus(this, 0);
|
||||
|
||||
mStts.Init(254, 0, this);
|
||||
|
||||
for(int i = 0; i < 4; i++) {
|
||||
mLargeGearTeethSphereColliders[i].SetStts(&mStts);
|
||||
mLargeGearTeethSphereColliders[i].Set(l_sphSrc);
|
||||
}
|
||||
|
||||
mPrevQuadrantalZAngle = DEG_INVALID;
|
||||
|
||||
for(int i = 0; i < 4; i++) {
|
||||
if(current.angle.z == l_se_angle[i])
|
||||
mPrevQuadrantalZAngle = static_cast<QuadrantalAngle_e>(i);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C4E848-80C4E84C 000048 0004+00 0/1 0/0 0/0 .rodata @3904 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3904 = 830.0f;
|
||||
COMPILER_STRIP_GATE(0x80C4E848, &lit_3904);
|
||||
#pragma pop
|
||||
|
||||
/* 80C4E84C-80C4E850 00004C 0004+00 0/1 0/0 0/0 .rodata @3905 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3905 = 560.0f;
|
||||
COMPILER_STRIP_GATE(0x80C4E84C, &lit_3905);
|
||||
#pragma pop
|
||||
|
||||
/* 80C4E850-80C4E854 000050 0004+00 0/1 0/0 0/0 .rodata @3906 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3906 = -1.0f;
|
||||
COMPILER_STRIP_GATE(0x80C4E850, &lit_3906);
|
||||
#pragma pop
|
||||
|
||||
/* 80C4E854-80C4E858 000054 0004+00 0/1 0/0 0/0 .rodata @3907 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3907 = 160.0f;
|
||||
COMPILER_STRIP_GATE(0x80C4E854, &lit_3907);
|
||||
#pragma pop
|
||||
|
||||
/* 80C4E858-80C4E85C 000058 0004+00 0/1 0/0 0/0 .rodata @3908 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3908 = 140.0f;
|
||||
COMPILER_STRIP_GATE(0x80C4E858, &lit_3908);
|
||||
#pragma pop
|
||||
|
||||
/* 80C4E8C0-80C4E920 000050 0060+00 1/1 0/0 0/0 .data l_pos */
|
||||
SECTION_DATA static u8 l_pos[96] = {
|
||||
0x44, 0x4F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x44, 0x4F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x4F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x4F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x44, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x44, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
static Vec l_pos[8] = {
|
||||
{830.0f, 0.0f, 0.0f}, {0.0f, 830.0f, 0.0f},
|
||||
{-830.0f, 0.0f, 0.0f}, {0.0f, -830.0f, 0.0f},
|
||||
{560.0f, 0.0f, 0.0f}, {0.0f, 560.0f, 0.0f},
|
||||
{-560.0f, 0.0f, 0.0f}, {0.0f, -560.0f, 0.0f}
|
||||
};
|
||||
|
||||
/* 80C4DBBC-80C4E1B0 00053C 05F4+00 1/0 0/0 0/0 .text Execute__15daObjKWheel00_cFPPA3_A4_f */
|
||||
void daObjKWheel00_c::Execute(f32 (**param_0)[3][4]) {
|
||||
// NONMATCHING
|
||||
int daObjKWheel00_c::Execute(Mtx** i_mtx) {
|
||||
eventUpdate();
|
||||
|
||||
if(mZAngularVelocity == 0 && fopAcM_isSwitch(this, getSwNo())) {
|
||||
if(getEvent() != 0xFF)
|
||||
orderEvent(getEvent(), 0xFF, 1);
|
||||
else
|
||||
eventStart();
|
||||
}
|
||||
|
||||
// Only draw particles and play SFX if gear is moving
|
||||
if(mZAngularVelocity != 0) {
|
||||
// Increase angular velocity via an arithmetic sequence with a ratio of 2
|
||||
#ifdef DEBUG
|
||||
if(mZAngularVelocity > 0) {
|
||||
if(mZAngularVelocity < l_HIO.mTargetZAngularSpeed)
|
||||
mZAngularVelocity += l_HIO.mZAngularAcceleration;
|
||||
}
|
||||
else if(mZAngularVelocity > -l_HIO.mTargetZAngularSpeed) {
|
||||
mZAngularVelocity -= l_HIO.mZAngularAcceleration;
|
||||
}
|
||||
#else
|
||||
if(mZAngularVelocity > 0) {
|
||||
if(mZAngularVelocity < 64)
|
||||
mZAngularVelocity += 2;
|
||||
}
|
||||
else if(mZAngularVelocity > -64) {
|
||||
mZAngularVelocity -= 2;
|
||||
}
|
||||
#endif
|
||||
|
||||
cXyz sfxPos = current.pos;
|
||||
u32 wheelSfxID;
|
||||
if(m_type == TYPE_LARGE_GOLD) {
|
||||
sfxPos.y -= 830.0f; // Offset of tip of large gear tooth
|
||||
wheelSfxID = Z2SE_OBJ_WTR_WHL_1;
|
||||
}
|
||||
else {
|
||||
sfxPos.y -= 560.0f; // Offset of tip of large gear tooth
|
||||
wheelSfxID = Z2SE_OBJ_WTR_WHL_2;
|
||||
}
|
||||
|
||||
Z2GetAudioMgr()->seStartLevel(wheelSfxID, &sfxPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
|
||||
|
||||
u16 currentIntermediateZAngle = current.angle.z;
|
||||
s32 totalZAngleChange = mZAngularVelocity;
|
||||
|
||||
// Assume clockwise movement, change to counter-clockwise if angular velocity is negative
|
||||
s32 angleStep = 1;
|
||||
if(totalZAngleChange < 0) {
|
||||
totalZAngleChange *= -1;
|
||||
angleStep = -1;
|
||||
}
|
||||
|
||||
bool passedQuadrantalAngle = false;
|
||||
for(int angleOffset = 0; angleOffset < totalZAngleChange; angleOffset++) {
|
||||
for(int quadrantalAngle = DEG_0; quadrantalAngle < DEG_MAX; quadrantalAngle++) {
|
||||
// Only draw particles & make splash sfx if a quadrantal angle is passed (reults in larger gear teeth hitting water)
|
||||
if(currentIntermediateZAngle == l_se_angle[quadrantalAngle] && quadrantalAngle != mPrevQuadrantalZAngle) {
|
||||
passedQuadrantalAngle = true;
|
||||
mPrevQuadrantalZAngle = static_cast<QuadrantalAngle_e>(quadrantalAngle);
|
||||
|
||||
u32 splashSfxID;
|
||||
if(m_type == TYPE_LARGE_GOLD)
|
||||
splashSfxID = Z2SE_OBJ_WTR_WHL_1_SPLSH;
|
||||
else
|
||||
splashSfxID = Z2SE_OBJ_WTR_WHL_2_SPLSH;
|
||||
|
||||
Z2GetAudioMgr()->seStart(splashSfxID, &sfxPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
|
||||
|
||||
if(fopAcM_GetRoomNo(this) == 7) {
|
||||
daLv3Water_c* const lv3Water = static_cast<daLv3Water_c*>(fopAcM_Search(searchLv3Water, this));
|
||||
if(lv3Water) {
|
||||
dComIfGp_particle_set(0x8AB0,&lv3Water->current.pos,NULL, NULL);
|
||||
dComIfGp_particle_set(0x8AB1,&lv3Water->current.pos,NULL, NULL);
|
||||
}
|
||||
}
|
||||
else if(fopAcM_GetRoomNo(this) == 11) {
|
||||
daLv3Water_c* const lv3Water = static_cast<daLv3Water_c*>(fopAcM_Search(searchLv3Water, this));
|
||||
if(lv3Water) {
|
||||
dComIfGp_particle_set(0x8ABD,&lv3Water->current.pos,NULL, NULL);
|
||||
dComIfGp_particle_set(0x8ABE,&lv3Water->current.pos,NULL, NULL);
|
||||
}
|
||||
}
|
||||
else if(fopAcM_GetRoomNo(this) == 2) {
|
||||
daLv3Water_c* const lv3Water = static_cast<daLv3Water_c*>(fopAcM_Search(searchLv3Water, this));
|
||||
if(lv3Water) {
|
||||
if(getSwNo() == 9) {
|
||||
dComIfGp_particle_set(0x8B04,&lv3Water->current.pos,NULL, NULL);
|
||||
dComIfGp_particle_set(0x8B05,&lv3Water->current.pos,NULL, NULL);
|
||||
}
|
||||
else {
|
||||
dComIfGp_particle_set(0x8B06,&lv3Water->current.pos,NULL, NULL);
|
||||
dComIfGp_particle_set(0x8B07,&lv3Water->current.pos,NULL, NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(passedQuadrantalAngle == true) break;
|
||||
currentIntermediateZAngle += angleStep;
|
||||
}
|
||||
}
|
||||
|
||||
current.angle.z += mZAngularVelocity;
|
||||
setMtx();
|
||||
mpModel->setBaseTRMtx(mTransformMtx);
|
||||
*i_mtx = &mNewBgMtx;
|
||||
|
||||
// Only update colliders if gear is moving
|
||||
if(mZAngularVelocity) {
|
||||
for(int sphereColliderIdx = 0; sphereColliderIdx < 4; sphereColliderIdx++) {
|
||||
cXyz largeGearToothPos;
|
||||
MTXMultVec(mNewBgMtx, &l_pos[sphereColliderIdx + (m_type << 2)], &largeGearToothPos);
|
||||
mLargeGearTeethSphereColliders[sphereColliderIdx].SetC(largeGearToothPos);
|
||||
|
||||
if(m_type == TYPE_LARGE_GOLD)
|
||||
mLargeGearTeethSphereColliders[sphereColliderIdx].SetR(160.0f);
|
||||
else
|
||||
mLargeGearTeethSphereColliders[sphereColliderIdx].SetR(140.0f);
|
||||
|
||||
dComIfG_Ccsp()->Set(&mLargeGearTeethSphereColliders[sphereColliderIdx]);
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C4E1B0-80C4E254 000B30 00A4+00 1/0 0/0 0/0 .text Draw__15daObjKWheel00_cFv */
|
||||
void daObjKWheel00_c::Draw() {
|
||||
// NONMATCHING
|
||||
int daObjKWheel00_c::Draw() {
|
||||
g_env_light.settingTevStruct(16, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
|
||||
|
||||
dComIfGd_setListBG();
|
||||
mDoExt_modelUpdateDL(mpModel);
|
||||
dComIfGd_setList();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C4E254-80C4E298 000BD4 0044+00 1/0 0/0 0/0 .text Delete__15daObjKWheel00_cFv */
|
||||
void daObjKWheel00_c::Delete() {
|
||||
// NONMATCHING
|
||||
int daObjKWheel00_c::Delete() {
|
||||
dComIfG_resDelete(this, l_arcName[m_type]);
|
||||
|
||||
#ifdef DEBUG
|
||||
l_HIO.removeHIO();
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C4E298-80C4E2C0 000C18 0028+00 2/1 0/0 0/0 .text eventStart__15daObjKWheel00_cFv */
|
||||
void daObjKWheel00_c::eventStart() {
|
||||
// NONMATCHING
|
||||
BOOL daObjKWheel00_c::eventStart() {
|
||||
#if DEBUG
|
||||
if(getArg0())
|
||||
mZAngularVelocity = l_HIO.mZAngularAcceleration;
|
||||
else
|
||||
mZAngularVelocity = -l_HIO.mZAngularAcceleration;
|
||||
#else
|
||||
if(getArg0())
|
||||
mZAngularVelocity = 2;
|
||||
else
|
||||
mZAngularVelocity = -2;
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C4E920-80C4E940 -00001 0020+00 1/0 0/0 0/0 .data daObjKWheel00_METHODS */
|
||||
static actor_method_class daObjKWheel00_METHODS = {
|
||||
(process_method_func)daObjKWheel00_create1st__FP15daObjKWheel00_c,
|
||||
(process_method_func)daObjKWheel00_MoveBGDelete__FP15daObjKWheel00_c,
|
||||
(process_method_func)daObjKWheel00_MoveBGExecute__FP15daObjKWheel00_c,
|
||||
(process_method_func)daObjKWheel00_create1st,
|
||||
(process_method_func)daObjKWheel00_MoveBGDelete,
|
||||
(process_method_func)daObjKWheel00_MoveBGExecute,
|
||||
0,
|
||||
(process_method_func)daObjKWheel00_MoveBGDraw__FP15daObjKWheel00_c,
|
||||
(process_method_func)daObjKWheel00_MoveBGDraw,
|
||||
};
|
||||
|
||||
/* 80C4E940-80C4E970 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KWheel00 */
|
||||
@@ -284,164 +392,27 @@ extern actor_process_profile_definition g_profile_Obj_KWheel00 = {
|
||||
fopAc_CULLBOX_CUSTOM_e, // cullType
|
||||
};
|
||||
|
||||
/* 80C4E970-80C4E97C 000100 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */
|
||||
SECTION_DATA extern void* __vt__10cCcD_GStts[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__10cCcD_GSttsFv,
|
||||
};
|
||||
|
||||
/* 80C4E97C-80C4E988 00010C 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */
|
||||
SECTION_DATA extern void* __vt__10dCcD_GStts[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__10dCcD_GSttsFv,
|
||||
};
|
||||
|
||||
/* 80C4E988-80C4E994 000118 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */
|
||||
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__8cM3dGAabFv,
|
||||
};
|
||||
|
||||
/* 80C4E994-80C4E9A0 000124 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGSph */
|
||||
SECTION_DATA extern void* __vt__8cM3dGSph[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__8cM3dGSphFv,
|
||||
};
|
||||
|
||||
/* 80C4E9A0-80C4E9B8 000130 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */
|
||||
SECTION_DATA extern void* __vt__17dEvLib_callback_c[6] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__17dEvLib_callback_cFv,
|
||||
(void*)eventStart__17dEvLib_callback_cFv,
|
||||
(void*)eventRun__17dEvLib_callback_cFv,
|
||||
(void*)eventEnd__17dEvLib_callback_cFv,
|
||||
};
|
||||
|
||||
/* 80C4E9B8-80C4EA00 000148 0048+00 2/2 0/0 0/0 .data __vt__15daObjKWheel00_c */
|
||||
SECTION_DATA extern void* __vt__15daObjKWheel00_c[18] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)CreateHeap__15daObjKWheel00_cFv,
|
||||
(void*)Create__15daObjKWheel00_cFv,
|
||||
(void*)Execute__15daObjKWheel00_cFPPA3_A4_f,
|
||||
(void*)Draw__15daObjKWheel00_cFv,
|
||||
(void*)Delete__15daObjKWheel00_cFv,
|
||||
(void*)IsDelete__16dBgS_MoveBgActorFv,
|
||||
(void*)ToFore__16dBgS_MoveBgActorFv,
|
||||
(void*)ToBack__16dBgS_MoveBgActorFv,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)func_80C4E7F0,
|
||||
(void*)func_80C4E7E8,
|
||||
(void*)eventRun__17dEvLib_callback_cFv,
|
||||
(void*)eventEnd__17dEvLib_callback_cFv,
|
||||
(void*)__dt__15daObjKWheel00_cFv,
|
||||
(void*)eventStart__15daObjKWheel00_cFv,
|
||||
};
|
||||
|
||||
/* 80C4E2C0-80C4E394 000C40 00D4+00 1/0 0/0 0/0 .text daObjKWheel00_create1st__FP15daObjKWheel00_c
|
||||
*/
|
||||
static void daObjKWheel00_create1st(daObjKWheel00_c* param_0) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E394-80C4E460 000D14 00CC+00 2/2 0/0 0/0 .text __dt__8dCcD_SphFv */
|
||||
// dCcD_Sph::~dCcD_Sph() {
|
||||
extern "C" void __dt__8dCcD_SphFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E460-80C4E4E4 000DE0 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_SphFv */
|
||||
// dCcD_Sph::dCcD_Sph() {
|
||||
extern "C" void __ct__8dCcD_SphFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E4E4-80C4E52C 000E64 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
|
||||
// cM3dGSph::~cM3dGSph() {
|
||||
extern "C" void __dt__8cM3dGSphFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E52C-80C4E574 000EAC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
|
||||
// cM3dGAab::~cM3dGAab() {
|
||||
extern "C" void __dt__8cM3dGAabFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E574-80C4E5D0 000EF4 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */
|
||||
// dCcD_GStts::~dCcD_GStts() {
|
||||
extern "C" void __dt__10dCcD_GSttsFv() {
|
||||
// NONMATCHING
|
||||
static int daObjKWheel00_create1st(daObjKWheel00_c* i_this) {
|
||||
fopAcM_SetupActor(i_this, daObjKWheel00_c);
|
||||
return i_this->create1st();
|
||||
}
|
||||
|
||||
/* 80C4E5D0-80C4E5F0 000F50 0020+00 1/0 0/0 0/0 .text
|
||||
* daObjKWheel00_MoveBGDelete__FP15daObjKWheel00_c */
|
||||
static void daObjKWheel00_MoveBGDelete(daObjKWheel00_c* param_0) {
|
||||
// NONMATCHING
|
||||
static int daObjKWheel00_MoveBGDelete(daObjKWheel00_c* i_this) {
|
||||
return i_this->MoveBGDelete();
|
||||
}
|
||||
|
||||
/* 80C4E5F0-80C4E610 000F70 0020+00 1/0 0/0 0/0 .text
|
||||
* daObjKWheel00_MoveBGExecute__FP15daObjKWheel00_c */
|
||||
static void daObjKWheel00_MoveBGExecute(daObjKWheel00_c* param_0) {
|
||||
// NONMATCHING
|
||||
static int daObjKWheel00_MoveBGExecute(daObjKWheel00_c* i_this) {
|
||||
return i_this->MoveBGExecute();
|
||||
}
|
||||
|
||||
/* 80C4E610-80C4E63C 000F90 002C+00 1/0 0/0 0/0 .text
|
||||
* daObjKWheel00_MoveBGDraw__FP15daObjKWheel00_c */
|
||||
static void daObjKWheel00_MoveBGDraw(daObjKWheel00_c* param_0) {
|
||||
// NONMATCHING
|
||||
static int daObjKWheel00_MoveBGDraw(daObjKWheel00_c* i_this) {
|
||||
return i_this->MoveBGDraw();
|
||||
}
|
||||
|
||||
/* 80C4E63C-80C4E684 000FBC 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
|
||||
// cCcD_GStts::~cCcD_GStts() {
|
||||
extern "C" void __dt__10cCcD_GSttsFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E684-80C4E6CC 001004 0048+00 1/0 0/0 0/0 .text __dt__17dEvLib_callback_cFv */
|
||||
// dEvLib_callback_c::~dEvLib_callback_c() {
|
||||
extern "C" void __dt__17dEvLib_callback_cFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E6CC-80C4E6D4 00104C 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv
|
||||
*/
|
||||
// bool dEvLib_callback_c::eventStart()() {
|
||||
extern "C" bool eventStart__17dEvLib_callback_cFv() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80C4E6D4-80C4E6DC 001054 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */
|
||||
// bool dEvLib_callback_c::eventRun() {
|
||||
extern "C" bool eventRun__17dEvLib_callback_cFv() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80C4E6DC-80C4E6E4 00105C 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */
|
||||
// bool dEvLib_callback_c::eventEnd() {
|
||||
extern "C" bool eventEnd__17dEvLib_callback_cFv() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80C4E6E4-80C4E7E8 001064 0104+00 2/1 0/0 0/0 .text __dt__15daObjKWheel00_cFv */
|
||||
daObjKWheel00_c::~daObjKWheel00_c() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E7E8-80C4E7F0 001168 0008+00 1/0 0/0 0/0 .text @1448@eventStart__15daObjKWheel00_cFv */
|
||||
static void func_80C4E7E8() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E7F0-80C4E7F8 001170 0008+00 1/0 0/0 0/0 .text @1448@__dt__15daObjKWheel00_cFv */
|
||||
static void func_80C4E7F0() {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 80C4E85C-80C4E85C 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
Reference in New Issue
Block a user