falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_itamato & d_a_obj_kaisou matching (#2756) 

* initial work

* itamato matching

* obj_kaisou matching

* pr cleanup

* fixed error

* error should actually be fixed now
This commit is contained in:
Carco_21 2025-10-27 22:25:42 -04:00 committed by GitHub
parent 54f989f16e
commit 577747e228
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 864 additions and 1041 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.py
View File

@ -2042,12 +2042,12 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_ikada"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_inobone"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_ita"),
ActorRel(NonMatching, "d_a_obj_itamato"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_itamato"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kabuto"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kag"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kage"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kago"),
ActorRel(NonMatching, "d_a_obj_kaisou"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kaisou"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kamakiri"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kantera"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_katatsumuri"),

127
include/d/actor/d_a_obj_itamato.h
View File

@ -1,6 +1,7 @@
#ifndef D_A_OBJ_ITAMATO_H
#define D_A_OBJ_ITAMATO_H
#include "JSystem/JHostIO/JORFile.h"
#include "f_op/f_op_actor_mng.h"
#include "d/actor/d_a_arrow.h"
#include "d/d_cc_d.h"
@ -12,46 +13,58 @@
*
* @details
*
*/
*/
class daObj_ItaMato_HIO_c;
class daObj_ItaMato_c : public fopAc_ac_c {
private:
/* 0x568 */ daObj_ItaMato_HIO_c* mHIO;
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ J3DModel* mpModels[2];
/* 0x57C */ dBgS_ObjAcch mBgc;
/* 0x754 */ dCcD_Stts mStts;
/* 0x790 */ dBgS_AcchCir mAcchCir;
/* 0x7D0 */ cBgS_GndChk mGndChk;
/* 0x80C */ dCcD_Sph mSph;
/* 0x944 */ cM3dGLin mLin;
/* 0x960 */ dBgS_LinChk mLinChk;
/* 0x9D0 */ csXyz field_0x9d0[3];
/* 0x9E4 */ int mCutType;
/* 0x9E8 */ int field_0x9e8;
/* 0x9EC */ f32 mGroundH;
/* 0x9F0 */ f32 field_0x9f0[3];
/* 0x9FC */ s16 field_0x9fc[3];
/* 0xA02 */ s16 field_0xa02;
/* 0xA04 */ u32 mShadowKey;
/* 0xA08 */ u32 mPrtcls[3];
/* 0xA14 */ u8 mType;
/* 0xA15 */ u8 field_0xa15;
/* 0xA15 */ u8 field_0xa16;
/* 0xA17 */ u8 field_0xa17;
/* 0xA18 */ u8 field_0xa18;
/* 0xA19 */ u8 mFake;
public:
/* 80C294EC */ ~daObj_ItaMato_c();
/* 80C2971C */ void create();
/* 80C29CD8 */ void CreateHeap();
/* 80C29DAC */ void Delete();
/* 80C29DE0 */ void Execute();
/* 80C2A44C */ void Draw();
/* 80C2A5D0 */ void createHeapCallBack(fopAc_ac_c*);
/* 80C2A5F0 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80C2A620 */ void getResName();
daObj_ItaMato_c() {}
/* 80C294EC */ virtual ~daObj_ItaMato_c();
/* 80C2971C */ cPhs__Step create();
/* 80C29CD8 */ int CreateHeap();
/* 80C29DAC */ int Delete();
/* 80C29DE0 */ int Execute();
/* 80C2A44C */ int Draw();
/* 80C2A5D0 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80C2A5F0 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80C2A620 */ const char* getResName();
/* 80C2A630 */ void setSwayParam(fopAc_ac_c*);
/* 80C2A7C4 */ void setPrtcls();
/* 80C2A890 */ void setEnvTevColor();
/* 80C2A8EC */ void setRoomNo();
/* 80C2A930 */ void setMtx();
int checkCrs(fopAc_ac_c* param_0, cXyz param_1, cXyz param_2, f32 param_3) {
daArrow_c* arrow_p = (daArrow_c*)param_0;
cM3dGSph sp38;
cXyz sp2C;
cXyz sp20;
u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
JUT_ASSERT(170, NULL != arrow_p);
if (field_0xa16 != 0 || health == 0) {
return 0;
}
sp38.Set(field_0x80c.GetShapeP()->GetC(), field_0x80c.GetShapeP()->GetR() + (arrow_p->getArrowAtR() * 2.0f));
if ((param_1 - current.pos).abs() < param_3) {
field_0x944.SetStartEnd(param_1, param_2);
if (cM3d_Cross_LinSph(&field_0x944, &sp38)) {
return 3;
}
}
return 0;
}
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
int getNo() {
u8 var_r31 = fopAcM_GetParam(this) & 0xFF;
@ -66,6 +79,33 @@ public:
return no;
}
u8 getType() { return 0; }
void setCutType(u8 i_cutType) { mCutType = i_cutType; }
int checkCrs(fopAc_ac_c* param_0, cXyz param_1, cXyz param_2, f32 param_3) {
daArrow_c* arrow_p = (daArrow_c*)param_0;
cM3dGSph sp38;
cXyz sp2C;
cXyz sp20;
JUT_ASSERT(170, NULL != arrow_p);
if (field_0xa16 != 0 || health == 0) {
return 0;
}
sp38.Set(mSph.GetShapeP()->GetC(), mSph.GetShapeP()->GetR() + (arrow_p->getArrowAtR() * 2.0f));
if ((param_1 - current.pos).abs() < param_3) {
mLin.SetStartEnd(param_1, param_2);
if (cM3d_Cross_LinSph(&mLin, &sp38)) {
return 3;
}
}
return 0;
}
BOOL checkBrk() {
if (field_0xa15 != 0) {
return 4;
@ -75,33 +115,8 @@ public:
}
void onFake() { mFake = true; }
private:
/* 0x568 */ u8 field_0x568[0x57C - 0x568];
/* 0x57C */ dBgS_ObjAcch field_0x57c;
/* 0x754 */ dCcD_Stts field_0x754;
/* 0x790 */ dBgS_AcchCir field_0x790;
/* 0x7D0 */ cBgS_GndChk field_0x7d0;
/* 0x80C */ dCcD_Sph field_0x80c;
/* 0x944 */ cM3dGLin field_0x944;
/* 0x960 */ dBgS_LinChk field_0x960;
/* 0x9D0 */ csXyz field_0x9d0[3];
/* 0x9e2 */ u8 field_0x9e2[0xA15 - 0x9E2];
/* 0xA15 */ u8 field_0xa15;
/* 0xA15 */ u8 field_0xa16;
/* 0xA17 */ u8 field_0xa17[0xA19 - 0xA17];
/* 0xA19 */ u8 mFake;
/* 0xA1A */ u8 field_0xa1a[0xA20 - 0xA1A];
};
STATIC_ASSERT(sizeof(daObj_ItaMato_c) == 0xa20);
class daObj_ItaMato_Param_c {
public:
/* 80C2AB04 */ ~daObj_ItaMato_Param_c();
static u8 const m[20];
};
#endif /* D_A_OBJ_ITAMATO_H */

44
include/d/actor/d_a_obj_kaisou.h
View File

@ -1,7 +1,10 @@
#ifndef D_A_OBJ_KAISOU_H
#define D_A_OBJ_KAISOU_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
#include "d/d_cc_uty.h"
#include "f_op/f_op_actor.h"
/**
* @ingroup actors-objects
@ -10,20 +13,47 @@
*
* @details
*
*/
*/
class daObjKaisou_c : public fopAc_ac_c {
public:
/* 80C34058 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 80C34058 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 80C34390 */ void initCcCylinder();
/* 80C343F0 */ void setCcCylinder();
/* 80C34438 */ void ObjHit();
/* 80C34824 */ void Execute();
/* 80C34A98 */ void Delete();
/* 80C34824 */ int Execute();
/* 80C34A98 */ int Delete();
/* 80C34ACC */ void setBaseMtx();
/* 80C34BD8 */ void create();
/* 80C34BD8 */ cPhs__Step create();
inline int CreateHeap();
inline int Draw();
private:
/* 0x568 */ u8 field_0x568[0x79c - 0x568];
/* 0x568 */ u8 field_0x568;
/* 0x569 */ u8 field_0x569;
/* 0x56A */ u8 field_0x56a[0x56e - 0x56a];
/* 0x56E */ s16 mJoint1ZRot;
/* 0x570 */ s16 mJoint2ZRot;
/* 0x572 */ s16 mJoint3ZRot;
/* 0x574 */ s16 field_0x574;
/* 0x576 */ s16 field_0x576;
/* 0x578 */ s16 field_0x578;
/* 0x57A */ s16 field_0x57a;
/* 0x57C */ s16 field_0x57c;
/* 0x57E */ s16 field_0x57e;
/* 0x580 */ s16 field_0x580;
/* 0x582 */ s16 field_0x582;
/* 0x584 */ s16 mJointYRot;
/* 0x588 */ Z2SoundObjSimple mSound;
/* 0x5A8 */ s16 mInvulnerabilityTimer;
/* 0x5AA */ u8 field_0x5aa[0x5b0 - 0x5aa];
/* 0x5B0 */ J3DModel* mpModel;
/* 0x5B4 */ request_of_phase_process_class mPhase;
/* 0x5BC */ dBgS_AcchCir mAcchCir;
/* 0x5FC */ dCcD_Stts mStts;
/* 0x638 */ dCcD_Cyl mCyl;
/* 0x774 */ dCcU_AtInfo mAtInfo;
/* 0x798 */ u8 field_0x798[0x79c - 0x798];
};
STATIC_ASSERT(sizeof(daObjKaisou_c) == 0x79c);

1100
src/d/actor/d_a_obj_itamato.cpp
View File

File diff suppressed because it is too large Load Diff

630
src/d/actor/d_a_obj_kaisou.cpp
View File

@ -7,394 +7,314 @@
#include "d/actor/d_a_obj_kaisou.h"
#include "d/d_cc_d.h"
#include "dol2asm.h"
#include "d/actor/d_a_player.h"
#include "d/d_s_play.h"
//
// Forward References:
//
extern "C" void ctrlJoint__13daObjKaisou_cFP8J3DJointP8J3DModel();
extern "C" static void JointCallBack__FP8J3DJointi();
extern "C" static void useHeapInit__FP10fopAc_ac_c();
extern "C" static void daObjKaisou_Create__FP10fopAc_ac_c();
extern "C" static void daObjKaisou_Delete__FP13daObjKaisou_c();
extern "C" void initCcCylinder__13daObjKaisou_cFv();
extern "C" void setCcCylinder__13daObjKaisou_cFv();
extern "C" void ObjHit__13daObjKaisou_cFv();
extern "C" void Execute__13daObjKaisou_cFv();
extern "C" void Delete__13daObjKaisou_cFv();
extern "C" void setBaseMtx__13daObjKaisou_cFv();
extern "C" static void daObjKaisou_Draw__FP13daObjKaisou_c();
extern "C" static void daObjKaisou_Execute__FP13daObjKaisou_c();
extern "C" void create__13daObjKaisou_cFv();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" static bool daObjKaisou_IsDelete__FP13daObjKaisou_c();
extern "C" extern char const* const d_a_obj_kaisou__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void mDoMtx_ZrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
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 fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c();
extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void isDungeonItem__12dSv_memBit_cCFi();
extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci();
extern "C" void __ct__12dBgS_AcchCirFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void ChkTgHit__12dCcD_GObjInfFv();
extern "C" void ChkCoHit__12dCcD_GObjInfFv();
extern "C" void GetCoHitObj__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
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 SetC__8cM3dGCylFRC4cXyz();
extern "C" void cLib_addCalcAngleS__FPsssss();
extern "C" void __ct__16Z2SoundObjSimpleFv();
extern "C" void __dl__FPv();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
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" u8 mCurrentMtx__6J3DSys[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" f32 mGroundY__11fopAcM_gc_c;
//
// Declarations:
//
/* ############################################################################################## */
/* 80C34EEC-80C34EF0 000000 0004+00 4/4 0/0 0/0 .rodata @3806 */
SECTION_RODATA static f32 const lit_3806 = 7.0f / 10.0f;
COMPILER_STRIP_GATE(0x80C34EEC, &lit_3806);
/* 80C34EF0-80C34EF4 000004 0004+00 1/1 0/0 0/0 .rodata @3807 */
SECTION_RODATA static f32 const lit_3807 = 0.5f;
COMPILER_STRIP_GATE(0x80C34EF0, &lit_3807);
/* 80C34EF4-80C34EFC 000008 0008+00 1/3 0/0 0/0 .rodata @3809 */
SECTION_RODATA static u8 const lit_3809[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
enum Joint {
/* 0x0 */ JNT_JOINT1,
/* 0x1 */ JNT_JOINT2,
/* 0x2 */ JNT_JOINT3,
};
COMPILER_STRIP_GATE(0x80C34EF4, &lit_3809);
/* 80C34058-80C34288 000078 0230+00 1/1 0/0 0/0 .text
* ctrlJoint__13daObjKaisou_cFP8J3DJointP8J3DModel */
void daObjKaisou_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) {
// NONMATCHING
/* 80C34058-80C34288 000078 0230+00 1/1 0/0 0/0 .text ctrlJoint__13daObjKaisou_cFP8J3DJointP8J3DModel */
int daObjKaisou_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
J3DJoint* joint = i_joint;
int jntNo = joint->getJntNo();
mDoMtx_stack_c::copy(i_model->getAnmMtx(jntNo));
switch (jntNo) {
case JNT_JOINT1:
mDoMtx_stack_c::ZrotM((s16)mJoint1ZRot);
mDoMtx_stack_c::YrotM((s16)mJointYRot);
mDoMtx_stack_c::XrotM(mJoint1ZRot + field_0x578 * 0.7f);
mDoMtx_stack_c::YrotM(-mJointYRot);
break;
case JNT_JOINT2:
mDoMtx_stack_c::ZrotM((s16)mJoint2ZRot);
mDoMtx_stack_c::YrotM((s16)mJointYRot);
mDoMtx_stack_c::XrotM(mJoint2ZRot + field_0x578 * 0.5f);
mDoMtx_stack_c::YrotM(-mJointYRot);
break;
case JNT_JOINT3:
mDoMtx_stack_c::ZrotM((s16)mJoint3ZRot);
mDoMtx_stack_c::YrotM((s16)mJointYRot);
mDoMtx_stack_c::XrotM((s16)mJoint3ZRot);
mDoMtx_stack_c::YrotM(-mJointYRot);
break;
}
i_model->setAnmMtx(jntNo, mDoMtx_stack_c::get());
#if DEBUG
cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
#else
MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
#endif
return 1;
}
/* 80C34288-80C342D4 0002A8 004C+00 1/1 0/0 0/0 .text JointCallBack__FP8J3DJointi */
static void JointCallBack(J3DJoint* param_0, int param_1) {
// NONMATCHING
}
static int JointCallBack(J3DJoint* i_joint, int param_2) {
if (param_2 == 0) {
J3DModel* model = j3dSys.getModel();
daObjKaisou_c* i_this = (daObjKaisou_c*)model->getUserArea();
if (i_this != NULL) {
i_this->ctrlJoint(i_joint, model);
}
}
/* ############################################################################################## */
/* 80C34FA0-80C34FA0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80C34FA0 = "M_kaisou";
SECTION_DEAD static char const* const stringBase_80C34FA9 = "M_kaisou.bmd";
#pragma pop
return 1;
}
/* 80C34FC0-80C34FC4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
SECTION_DATA static void* l_arcName = (void*)&d_a_obj_kaisou__stringBase0;
static char* l_arcName = "M_kaisou";
/* 80C342D4-80C3434C 0002F4 0078+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static void useHeapInit(fopAc_ac_c* param_0) {
// NONMATCHING
int daObjKaisou_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_kaisou.bmd");
JUT_ASSERT(174, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpModel == NULL) {
return 0;
}
return 1;
}
/* 80C3434C-80C3436C 00036C 0020+00 1/0 0/0 0/0 .text daObjKaisou_Create__FP10fopAc_ac_c
*/
static void daObjKaisou_Create(fopAc_ac_c* param_0) {
// NONMATCHING
/* 80C342D4-80C3434C 0002F4 0078+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static int useHeapInit(fopAc_ac_c* a_this) {
daObjKaisou_c* i_this = (daObjKaisou_c*)a_this;
return i_this->CreateHeap();
}
/* 80C3434C-80C3436C 00036C 0020+00 1/0 0/0 0/0 .text daObjKaisou_Create__FP10fopAc_ac_c */
static int daObjKaisou_Create(fopAc_ac_c* a_this) {
daObjKaisou_c* i_this = (daObjKaisou_c*)a_this;
fpc_ProcID id = fopAcM_GetID(a_this);
return i_this->create();
}
/* 80C3436C-80C34390 00038C 0024+00 1/0 0/0 0/0 .text daObjKaisou_Delete__FP13daObjKaisou_c */
static void daObjKaisou_Delete(daObjKaisou_c* param_0) {
// NONMATCHING
static int daObjKaisou_Delete(daObjKaisou_c* i_this) {
fpc_ProcID id = fopAcM_GetID(i_this);
i_this->Delete();
return 1;
}
/* ############################################################################################## */
/* 80C34EFC-80C34F40 000010 0044+00 1/1 0/0 0/0 .rodata ccCylSrc$3850 */
const static dCcD_SrcCyl ccCylSrc = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x2, 0x11}, 0x79}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x4}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
50.0f, // mRadius
100.0f // mHeight
} // mCyl
};
/* 80C34390-80C343F0 0003B0 0060+00 1/1 0/0 0/0 .text initCcCylinder__13daObjKaisou_cFv
*/
/* 80C34390-80C343F0 0003B0 0060+00 1/1 0/0 0/0 .text initCcCylinder__13daObjKaisou_cFv */
void daObjKaisou_c::initCcCylinder() {
// NONMATCHING
mStts.Init(1, 0xFF, this);
const static dCcD_SrcCyl ccCylSrc = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x2, 0x11}, 0x79}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x4}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
50.0f, // mRadius
100.0f // mHeight
} // mCyl
};
mCyl.Set(ccCylSrc);
mCyl.SetStts(&mStts);
mCyl.SetC(current.pos);
}
/* 80C343F0-80C34438 000410 0048+00 1/1 0/0 0/0 .text setCcCylinder__13daObjKaisou_cFv */
void daObjKaisou_c::setCcCylinder() {
// NONMATCHING
mCyl.SetC(current.pos);
dComIfG_Ccsp()->Set(&mCyl);
}
/* ############################################################################################## */
/* 80C34F40-80C34F44 000054 0004+00 0/1 0/0 0/0 .rodata @3963 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3963[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80C34F40, &lit_3963);
#pragma pop
/* 80C34F44-80C34F4C 000058 0008+00 0/1 0/0 0/0 .rodata @3964 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3964[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80C34F44, &lit_3964);
#pragma pop
/* 80C34F4C-80C34F54 000060 0008+00 0/1 0/0 0/0 .rodata @3965 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3965[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80C34F4C, &lit_3965);
#pragma pop
/* 80C34F54-80C34F5C 000068 0008+00 0/1 0/0 0/0 .rodata @3966 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3966[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80C34F54, &lit_3966);
#pragma pop
/* 80C34F5C-80C34F60 000070 0004+00 0/2 0/0 0/0 .rodata @3967 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3967 = 4.0f;
COMPILER_STRIP_GATE(0x80C34F5C, &lit_3967);
#pragma pop
/* 80C34F60-80C34F64 000074 0004+00 0/1 0/0 0/0 .rodata @3968 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3968 = 6.0f / 5.0f;
COMPILER_STRIP_GATE(0x80C34F60, &lit_3968);
#pragma pop
/* 80C34F64-80C34F68 000078 0004+00 0/1 0/0 0/0 .rodata @3969 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3969 = 120.0f;
COMPILER_STRIP_GATE(0x80C34F64, &lit_3969);
#pragma pop
/* 80C34F68-80C34F6C 00007C 0004+00 0/1 0/0 0/0 .rodata @3970 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3970 = 4096.0f;
COMPILER_STRIP_GATE(0x80C34F68, &lit_3970);
#pragma pop
/* 80C34FC4-80C35038 -00001 0074+00 1/1 0/0 0/0 .data @3975 */
SECTION_DATA static void* lit_3975[29] = {
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x34C),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x360),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x360),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x34C),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x360),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x374),
(void*)(((char*)ObjHit__13daObjKaisou_cFv) + 0x34C),
};
/* 80C34438-80C34824 000458 03EC+00 2/1 0/0 0/0 .text ObjHit__13daObjKaisou_cFv */
void daObjKaisou_c::ObjHit() {
// NONMATCHING
daPy_py_c* player = daPy_getPlayerActorClass();
f32 playerSpeedF = fopAcM_GetSpeedF(player);
f32 absXZ = current.pos.absXZ(fopAcM_GetPosition(player));
if (mInvulnerabilityTimer > 0) {
mCyl.ClrTgHit();
mCyl.OffTgSetBit();
} else {
mCyl.OnTgSetBit();
if (mCyl.ChkCoHit()) {
if (mCyl.GetCoHitObj()->GetStts()->GetWeightUc() != 1) {
field_0x576 += playerSpeedF * (yREG_F(1) + 4.0f);
field_0x580 += playerSpeedF * (yREG_F(2) + 1.2f);
if (field_0x580 > 0x135) {
field_0x580 = 0x135;
}
field_0x57a = yREG_F(3) + 6144.0f;
cLib_addCalcAngleS(&field_0x582, (s16)(fopAcM_searchPlayerAngleY(this) + 0x8000), 0x50, 0x1000, 0);
}
}
if (mCyl.ChkTgHit()) {
if (absXZ < 120.0f) {
field_0x568++;
}
field_0x580 = 0x136;
field_0x57a += (aREG_F(2) + 4096.0f);
field_0x576 += (aREG_F(3) + 4096.0f);
mInvulnerabilityTimer = 20;
daPy_getPlayerActorClass()->getCutType();
switch (daPy_getPlayerActorClass()->getCutType()) {
case daPy_py_c::CUT_TYPE_NM_RIGHT:
case daPy_py_c::CUT_TYPE_FINISH_RIGHT:
case daPy_py_c::CUT_TYPE_MORTAL_DRAW_B:
field_0x582 = fopAcM_searchPlayerAngleY(this) + 0x4000;
break;
case daPy_py_c::CUT_TYPE_NM_LEFT:
case daPy_py_c::CUT_TYPE_FINISH_LEFT:
case daPy_py_c::CUT_TYPE_TURN_LEFT:
field_0x582 = fopAcM_searchPlayerAngleY(this) - 0x4000;
break;
default:
field_0x582 = fopAcM_searchPlayerAngleY(this) + 0x8000;
break;
}
}
if (field_0x57a == 0) {
field_0x569 = 0;
}
if (field_0x57a > 0x2000) {
field_0x57a = 0x2000;
}
if (field_0x576 > 0x1500) {
field_0x576 = 0x1500;
}
}
}
/* ############################################################################################## */
/* 80C34F6C-80C34F74 000080 0004+04 0/1 0/0 0/0 .rodata @3995 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3995[1 + 1 /* padding */] = {
16384.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80C34F6C, &lit_3995);
#pragma pop
/* 80C34F74-80C34F7C 000088 0008+00 0/1 0/0 0/0 .rodata @3996 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3996[8] = {
0x3F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80C34F74, &lit_3996);
#pragma pop
/* 80C34F7C-80C34F80 000090 0004+00 0/1 0/0 0/0 .rodata @3997 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3997 = 32768.0f;
COMPILER_STRIP_GATE(0x80C34F7C, &lit_3997);
#pragma pop
/* 80C34F80-80C34F84 000094 0004+00 0/1 0/0 0/0 .rodata @3998 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3998 = 9.0f / 5.0f;
COMPILER_STRIP_GATE(0x80C34F80, &lit_3998);
#pragma pop
/* 80C34824-80C34A98 000844 0274+00 1/1 0/0 0/0 .text Execute__13daObjKaisou_cFv */
void daObjKaisou_c::Execute() {
// NONMATCHING
int daObjKaisou_c::Execute() {
mInvulnerabilityTimer--;
if (mInvulnerabilityTimer <= 0) {
mInvulnerabilityTimer = 0;
}
ObjHit();
field_0x57c += field_0x57e;
mJoint1ZRot = field_0x574 * (HREG_F(0) + 1.0f) * cM_ssin(field_0x57c * 4.0f);
mJoint2ZRot = field_0x574 * (HREG_F(1) + 1.5) * cM_ssin(field_0x57c * 4.0f - 16384.0f);
mJoint3ZRot = field_0x574 * (HREG_F(2) + 1.8f) * cM_ssin(field_0x57c * 4.0f - 32768.0f);
cLib_addCalcAngleS(&field_0x57e, field_0x580, 0x15, 0x1000, 0);
cLib_addCalcAngleS(&field_0x580, 0x80, 0x15, 0x1000, 0);
cLib_addCalcAngleS(&field_0x574, field_0x576, 0x15, 0x1000, 0);
cLib_addCalcAngleS(&field_0x578, field_0x57a, 0x15, 0x1000, 0);
cLib_addCalcAngleS(&field_0x57a, 0, 0x15, 0x1000, 0);
cLib_addCalcAngleS(&field_0x576, 0x500, 0x20, 0x1000, 0);
cLib_addCalcAngleS(&field_0x582, 0x1000, 0x20, 0x1000, 0);
setCcCylinder();
setBaseMtx();
return 1;
}
/* 80C34A98-80C34ACC 000AB8 0034+00 1/1 0/0 0/0 .text Delete__13daObjKaisou_cFv */
void daObjKaisou_c::Delete() {
// NONMATCHING
int daObjKaisou_c::Delete() {
dComIfG_resDelete(&mPhase, l_arcName);
return 1;
}
/* ############################################################################################## */
/* 80C34F84-80C34F88 000098 0004+00 1/1 0/0 0/0 .rodata @4022 */
SECTION_RODATA static f32 const lit_4022 = 2.0f;
COMPILER_STRIP_GATE(0x80C34F84, &lit_4022);
/* 80C34ACC-80C34B34 000AEC 0068+00 1/1 0/0 0/0 .text setBaseMtx__13daObjKaisou_cFv */
void daObjKaisou_c::setBaseMtx() {
// NONMATCHING
cXyz scale(yREG_F(5) + 2.0f, yREG_F(5) + 2.0f, yREG_F(5) + 2.0f);
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::scaleM(scale);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80C34B34-80C34BB8 000B54 0084+00 1/0 0/0 0/0 .text daObjKaisou_Draw__FP13daObjKaisou_c
*/
static void daObjKaisou_Draw(daObjKaisou_c* param_0) {
// NONMATCHING
int daObjKaisou_c::Draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
return 1;
}
/* 80C34B34-80C34BB8 000B54 0084+00 1/0 0/0 0/0 .text daObjKaisou_Draw__FP13daObjKaisou_c */
static int daObjKaisou_Draw(daObjKaisou_c* i_this) {
return i_this->Draw();
}
/* 80C34BB8-80C34BD8 000BD8 0020+00 2/1 0/0 0/0 .text daObjKaisou_Execute__FP13daObjKaisou_c */
static void daObjKaisou_Execute(daObjKaisou_c* param_0) {
// NONMATCHING
static int daObjKaisou_Execute(daObjKaisou_c* i_this) {
return i_this->Execute();
}
/* ############################################################################################## */
/* 80C34F88-80C34F8C 00009C 0004+00 0/1 0/0 0/0 .rodata @4157 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4157 = -9.0f;
COMPILER_STRIP_GATE(0x80C34F88, &lit_4157);
#pragma pop
/* 80C34BD8-80C34E4C 000BF8 0274+00 1/1 0/0 0/0 .text create__13daObjKaisou_cFv */
cPhs__Step daObjKaisou_c::create() {
fopAcM_ct(this, daObjKaisou_c);
/* 80C34F8C-80C34F90 0000A0 0004+00 0/1 0/0 0/0 .rodata @4158 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4158 = 100.0f;
COMPILER_STRIP_GATE(0x80C34F8C, &lit_4158);
#pragma pop
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
if (dComIfGs_isStageBossEnemy() && dComIfGp_getStartStageRoomNo() == 50) {
if (strcmp("D_MN01A", dComIfGp_getStartStageName()) == 0) {
return cPhs_ERROR_e;
}
}
/* 80C34F90-80C34F94 0000A4 0004+00 0/1 0/0 0/0 .rodata @4159 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4159 = -1000.0f;
COMPILER_STRIP_GATE(0x80C34F90, &lit_4159);
#pragma pop
OS_REPORT("Kaisou PARAM %x\n", fopAcM_GetParam(this));
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x8D0)) {
return cPhs_ERROR_e;
}
/* 80C34F94-80C34F98 0000A8 0004+00 0/1 0/0 0/0 .rodata @4160 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4160 = -500.0f;
COMPILER_STRIP_GATE(0x80C34F94, &lit_4160);
#pragma pop
gravity = nREG_F(0) + -9.0f;
/* 80C34F98-80C34F9C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4161 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4161 = 1000.0f;
COMPILER_STRIP_GATE(0x80C34F98, &lit_4161);
#pragma pop
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
cXyz pos(current.pos.x, current.pos.y + 100.0f, current.pos.z);
if (fopAcM_gc_c::gndCheck(&pos)) {
current.pos.y = fopAcM_gc_c::getGroundY();
}
/* 80C34F9C-80C34FA0 0000B0 0004+00 0/1 0/0 0/0 .rodata @4162 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4162 = 500.0f;
COMPILER_STRIP_GATE(0x80C34F9C, &lit_4162);
#pragma pop
mpModel->setUserArea((uintptr_t)this);
for (u16 i = 0; i < mpModel->getModelData()->getJointNum(); i++) {
mpModel->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
}
/* 80C34FA0-80C34FA0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80C34FB6 = "D_MN01A";
#pragma pop
field_0x57e = 0x80;
field_0x574 = 0x500;
field_0x576 = 0x500;
field_0x57a = 0;
initCcCylinder();
fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
daObjKaisou_Execute(this);
}
return phase;
}
/* 80C34EDC-80C34EE4 000EFC 0008+00 1/0 0/0 0/0 .text daObjKaisou_IsDelete__FP13daObjKaisou_c */
static int daObjKaisou_IsDelete(daObjKaisou_c* i_this) {
return 1;
}
/* 80C35038-80C35058 -00001 0020+00 1/0 0/0 0/0 .data l_daObjKaisou_Method */
static actor_method_class l_daObjKaisou_Method = {
(process_method_func)daObjKaisou_Create__FP10fopAc_ac_c,
(process_method_func)daObjKaisou_Delete__FP13daObjKaisou_c,
(process_method_func)daObjKaisou_Execute__FP13daObjKaisou_c,
(process_method_func)daObjKaisou_IsDelete__FP13daObjKaisou_c,
(process_method_func)daObjKaisou_Draw__FP13daObjKaisou_c,
(process_method_func)daObjKaisou_Create,
(process_method_func)daObjKaisou_Delete,
(process_method_func)daObjKaisou_Execute,
(process_method_func)daObjKaisou_IsDelete,
(process_method_func)daObjKaisou_Draw,
};
/* 80C35058-80C35088 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Kaisou */
@ -414,41 +334,3 @@ extern actor_process_profile_definition g_profile_Obj_Kaisou = {
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80C35088-80C35094 0000C8 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */
SECTION_DATA extern void* __vt__8cM3dGCyl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGCylFv,
};
/* 80C35094-80C350A0 0000D4 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 80C34BD8-80C34E4C 000BF8 0274+00 1/1 0/0 0/0 .text create__13daObjKaisou_cFv */
void daObjKaisou_c::create() {
// NONMATCHING
}
/* 80C34E4C-80C34E94 000E6C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */
// cM3dGCyl::~cM3dGCyl() {
extern "C" void __dt__8cM3dGCylFv() {
// NONMATCHING
}
/* 80C34E94-80C34EDC 000EB4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 80C34EDC-80C34EE4 000EFC 0008+00 1/0 0/0 0/0 .text daObjKaisou_IsDelete__FP13daObjKaisou_c */
static bool daObjKaisou_IsDelete(daObjKaisou_c* param_0) {
return true;
}
/* 80C34FA0-80C34FA0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */