mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 05:22:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_daiocta and d_a_daiocta_eye matching (#934)

Browse Source 
* Initial work; 25% matching in .text

* 27% matching in .text

* Match daDaiocta_c::modeProc

* 56% matching in .text

* 61% matching in .text

* 69% matching in .text

* 74% matching in .text

* 84% matching in .text

* daDaiocta_Eye_c 31%

* Match daDaiocta_Eye_c node callbacks

* daDaiocta_Eye_c 69%

* daDaiocta_Eye_c 85%

* daDaiocta_Eye_c 100% for retail and demo

* daDaiocta_c 96%

* daDaiocta_c 100% for retail and demo

* Field name cleanup

* More field naming

* Implement {is_, to_, to_dis}appear daObjAuzu inlines

* Misc code formatting changes

* Use JntHitType enum (d_a_daiocta)

* Apply suggestions from code review

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

* Use fopAcM_SetMtx inline

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Roland
2026-02-27 13:04:36 -06:00
committed by GitHub
parent 1d96a4c988
commit 034b90bfdc
6 changed files with 2090 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_daiocta.cpp
+1470 -68
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_daiocta_eye.cpp
+370 -27
View File
@@ -5,9 +5,19 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_daiocta_eye.h"
#include "d/actor/d_a_daiocta.h"
#include "d/actor/d_a_bomb.h"
#include "d/actor/d_a_player.h"
#include "d/d_bg_s_func.h"
#include "d/d_cc_d.h"
#include "d/d_lib.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/res/res_daiocta.h"
const s32 daDaiocta_Eye_c::m_heapsize = 2848;
const char daDaiocta_Eye_c::m_arc_name[] = "daiocta";
const s32 daDaiocta_Eye_c::m_scale_damage_time = 8;
static dCcD_SrcSph l_sph_src = {
// dCcD_SrcGObjInf
@@ -38,110 +48,443 @@ static dCcD_SrcSph l_sph_src = {
}},
};
static daDaiocta_Eye_HIO_c l_HIO;
/* 000000EC-000001B0 .text __ct__19daDaiocta_Eye_HIO_cFv */
daDaiocta_Eye_HIO_c::daDaiocta_Eye_HIO_c() {
/* Nonmatching */
mSphRadius = 195.0f;
m04 = 0xF; // unused
m08 = 5.0f; // unused
m0C = 8.0f; // unused
mParticleTranslationX = 0.0f;
mParticleTranslationY = 0.0f;
mParticleTranslationZ = 30.0f;
mEyeRotStep = 0x1000;
mEyeRotScale = 0x4;
m24 = 0x4000;
m26 = 0x1000;
m28 = 0x1000;
mEyeRndRotMaxX = 0x7FFF;
mEyeRndRotMaxY = 0x2000;
mEyeRndRotMaxZ = 0x2000;
}
/* 000001B0-000001FC .text nodeControl_CB__FP7J3DNodei */
static BOOL nodeControl_CB(J3DNode*, int) {
/* Nonmatching */
static BOOL nodeControl_CB(J3DNode* i_nodeP, int i_calcTiming) {
if (i_calcTiming == J3DNodeCBCalcTiming_In) {
J3DModel* model_p = j3dSys.getModel();
daDaiocta_Eye_c* this_p = (daDaiocta_Eye_c *) model_p->getUserArea();
if (this_p) {
this_p->_nodeControl(i_nodeP, model_p);
}
}
return TRUE;
}
/* 000001FC-000002B8 .text _nodeControl__15daDaiocta_Eye_cFP7J3DNodeP8J3DModel */
void daDaiocta_Eye_c::_nodeControl(J3DNode*, J3DModel*) {
/* Nonmatching */
void daDaiocta_Eye_c::_nodeControl(J3DNode* i_nodeP, J3DModel* i_modelP) {
J3DJoint* jnt_p = (J3DJoint *) i_nodeP;
s32 jnt_no = jnt_p->getJntNo();
cXyz dummy(0.0f, 0.0f, 0.0f);
mDoMtx_stack_c::copy(i_modelP->getAnmMtx(jnt_no));
if (jnt_no == 2) {
mDoMtx_stack_c::ZXYrotM(mCurEyeRot);
mDoMtx_stack_c::scaleM(mEyeScale);
}
cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
i_modelP->setAnmMtx(jnt_no, mDoMtx_stack_c::get());
}
/* 000002B8-000002D8 .text createHeap_CB__FP10fopAc_ac_c */
static BOOL createHeap_CB(fopAc_ac_c*) {
/* Nonmatching */
static BOOL createHeap_CB(fopAc_ac_c* i_this) {
return ((daDaiocta_Eye_c *)i_this)->_createHeap();
}
/* 000002D8-000004E4 .text _createHeap__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::_createHeap() {
/* Nonmatching */
BOOL daDaiocta_Eye_c::_createHeap() {
static Vec eye_sph_offset[] = {
{ 0.0f, 0.0f, 0.0f },
};
static __jnt_hit_data_c search_data[] = {
{
/* mShapeType */ JntHitType_SPH_e,
/* mJointIndex */ 2,
/* mRadius */ 110.0f,
/* mpOffsets */ eye_sph_offset
}
};
J3DModelData* modelData = static_cast<J3DModelData *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BDL_DO_EYE1));
JUT_ASSERT(0xE9, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
if (!mpModel) {
return FALSE;
}
mpModel->setUserArea((u32)this);
mpBrk = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_DAMAGE_EYE_A1));
if (!mpBrk) {
return FALSE;
}
int init_result = init_result = mBrkAnm.init(
modelData, mpBrk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
0, -1, false, FALSE
);
if (init_result == 0) {
return FALSE;
}
mpBtk = static_cast<J3DAnmTextureSRTKey *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_DAMAGE_EYE_A1));
if (!mpBtk) {
return FALSE;
}
init_result = mBtkAnm.init(
modelData, mpBtk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
0, -1, false, FALSE
);
if (init_result == 0) {
return FALSE;
}
for (int i = 0; i < 3; i++) {
if (i == 2) modelData->getJointNodePointer(i)->setCallBack(nodeControl_CB);
}
mpJntHit = JntHit_create(mpModel, search_data, ARRAY_SSIZE(search_data));
if (mpJntHit) {
jntHit = mpJntHit;
} else {
return FALSE;
}
return TRUE;
}
/* 000004E4-00000510 .text coHit_CB__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
void coHit_CB(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*) {
/* Nonmatching */
void coHit_CB(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* i_actor, dCcD_GObjInf*) {
if(i_actor) {
((daDaiocta_Eye_c *)i_this)->_coHit(i_actor);
}
}
/* 00000510-000005D0 .text _coHit__15daDaiocta_Eye_cFP10fopAc_ac_c */
void daDaiocta_Eye_c::_coHit(fopAc_ac_c*) {
/* Nonmatching */
void daDaiocta_Eye_c::_coHit(fopAc_ac_c* i_actor) {
if (fpcM_GetName(i_actor) == PROC_BOMB) {
daBomb_c* bomb_p = (daBomb_c *) i_actor;
if (bomb_p->chk_state(daBomb_c::STATE_4)) {
if (!mbIsDead) {
health = 0;
mbIsDead = true;
m295 = true;
dComIfGp_particle_set(
dPa_name::ID_SCENE_8206, &mParticlePos, &shape_angle,
NULL, 0xFF, &mParticleCallback, fopAcM_GetRoomNo(this)
);
modeDeathInit();
} else {
mbIsDamagedBomb = true;
}
}
}
}
/* 000005D0-000006C0 .text setMtx__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::setMtx() {
/* Nonmatching */
mpModel->setBaseScale(scale);
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::transM(
l_HIO.mParticleTranslationX,
l_HIO.mParticleTranslationY,
l_HIO.mParticleTranslationZ
);
mDoMtx_stack_c::multVecZero(&mParticlePos);
}
/* 000006C0-00000A6C .text checkTgHit__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::checkTgHit() {
/* Nonmatching */
mStts.Move();
cCcD_Obj* tg_hit_obj_p = mSph.GetTgHitObj();
if (tg_hit_obj_p) {
mDoAud_onEnemyDamage();
bool damaged = false;
if (tg_hit_obj_p->ChkAtType(AT_TYPE_NORMAL_ARROW)) {
fopAcM_seStart(this, JA_SE_LK_MS_WEP_HIT, 32);
health -= 2;
damaged = true;
} else if (tg_hit_obj_p->ChkAtType(AT_TYPE_ICE_ARROW)) {
fopAcM_seStart(this, JA_SE_LK_MS_WEP_HIT, 32);
health -= 2;
damaged = true;
} else if (tg_hit_obj_p->ChkAtType(AT_TYPE_FIRE_ARROW)) {
fopAcM_seStart(this, JA_SE_LK_MS_WEP_HIT, 32);
health -= 2;
damaged = true;
} else if (tg_hit_obj_p->ChkAtType(AT_TYPE_LIGHT_ARROW)) {
fopAcM_seStart(this, JA_SE_LK_MS_WEP_HIT, 32);
health -= 4;
damaged = true;
} else if (tg_hit_obj_p->ChkAtType(AT_TYPE_HOOKSHOT)) {
fopAcM_seStart(this, JA_SE_LK_MS_WEP_HIT, 32);
health -= 2;
damaged = true;
} else if (tg_hit_obj_p->ChkAtType(AT_TYPE_BOOMERANG)) {
fopAcM_seStart(this, JA_SE_LK_W_WEP_HIT, 32);
health--;
damaged = true;
}
if (damaged == true) {
daPy_py_c* player_p = daPy_getPlayerActorClass();
cXyz tg_hit_pos = *mSph.GetTgHitPosP();
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &tg_hit_pos);
if (health <= 0) {
cXyz hit_particle_scale(2.0f, 2.0f, 2.0f);
dComIfGp_particle_set(
dPa_name::ID_COMMON_BIG_HIT,
&tg_hit_pos,
&player_p->shape_angle,
&hit_particle_scale
);
fopAcM_seStart(this, JA_SE_LK_LAST_HIT, 0);
health = 0;
modeDeathInit();
} else {
modeDamageInit();
}
}
}
}
/* 00000A6C-00000A78 .text modeWaitInit__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::modeWaitInit() {
/* Nonmatching */
mMode = MODE_WAIT;
}
/* 00000A78-00000A98 .text modeWait__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::modeWait() {
/* Nonmatching */
checkTgHit();
}
/* 00000A98-00000BD8 .text modeDamageInit__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::modeDamageInit() {
/* Nonmatching */
mMode = MODE_DAMAGE;
mScaleAnimeIdx = m_scale_damage_time;
mbIsDamaged = true;
J3DModelData* model_data_p = mpModel->getModelData();
mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_DAMAGE_EYE_A1);
mBrkAnm.init(
model_data_p, mpBrk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
0, -1, true, FALSE
);
mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_DAMAGE_EYE_A1);
mBtkAnm.init(
model_data_p, mpBtk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
0, -1, true, FALSE
);
fopAcM_monsSeStart(mpParentActor, JA_SE_CV_DO_DAMAGE, 0);
}
/* 00000BD8-00000CD0 .text modeDamage__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::modeDamage() {
/* Nonmatching */
static float scale_table[] = {
1.0f, 0.975f,
1.0f, 0.95f,
1.0f, 0.9f,
1.0f, 0.85f
};
dLib_scaleAnime(
&mEyeScale.x, scale_table,
ARRAY_SSIZE(scale_table), &mScaleAnimeIdx,
0.2f, 10.0f, 0.025f
);
mEyeScale.y = mEyeScale.x;
mEyeScale.z = mEyeScale.x;
if (mBtkAnm.isStop() && mBrkAnm.isStop() && mScaleAnimeIdx == 0) {
modeWaitInit();
} else if (mScaleAnimeIdx == 0) {
mScaleAnimeIdx = m_scale_damage_time;
}
}
/* 00000CD0-00000E20 .text modeDeathInit__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::modeDeathInit() {
/* Nonmatching */
mMode = MODE_DEATH;
mbIsDamaged = true;
mEyeScale.setall(1.0f);
mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_DAMAGE_EYE_B1);
mBrkAnm.init(
mpModel->getModelData(), mpBrk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
0, -1, true, FALSE
);
mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_DAMAGE_EYE_B1);
mBtkAnm.init(
mpModel->getModelData(), mpBtk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
0, -1, true, FALSE
);
fopAcM_monsSeStart(mpParentActor, JA_SE_CV_DO_EYE_LOSE, 0);
}
/* 00000E20-00000E2C .text modeDeath__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::modeDeath() {
/* Nonmatching */
mbIsDead = true;
}
/* 00000E2C-00000ED0 .text modeProcCall__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::modeProcCall() {
/* Nonmatching */
static ModeProcFunc mode_proc[] = {
&daDaiocta_Eye_c::modeWait,
&daDaiocta_Eye_c::modeDamage,
&daDaiocta_Eye_c::modeDeath,
};
(this->*mode_proc[mMode])();
}
/* 00000ED0-00001120 .text _execute__15daDaiocta_Eye_cFv */
bool daDaiocta_Eye_c::_execute() {
/* Nonmatching */
if (!mbAppear) {
return false;
}
if (mbIsDead == true) {
mSph.OffTgSPrmBit(cCcD_TgSPrm_Set_e);
}
m2EC = l_HIO.m24;
m2EE = l_HIO.m26;
m2F0 = l_HIO.m28;
mEyeRndRotMaxX = l_HIO.mEyeRndRotMaxX;
mEyeRndRotMaxY = l_HIO.mEyeRndRotMaxY;
mEyeRndRotMaxZ = l_HIO.mEyeRndRotMaxZ;
mBrkAnm.play();
mBtkAnm.play();
mbIsDamaged = false;
mbIsDamagedBomb = false;
modeProcCall();
setMtx();
attention_info.position = current.pos;
attention_info.position.y += 100.0f;
eyePos = current.pos;
cLib_addCalcAngleS2(&mCurEyeRot.x, mEyeRotTargetX, l_HIO.mEyeRotScale + 1, l_HIO.mEyeRotStep);
cLib_addCalcAngleS2(&mCurEyeRot.y, mEyeRotTargetY, l_HIO.mEyeRotScale + 1, l_HIO.mEyeRotStep);
cLib_addCalcAngleS2(&mCurEyeRot.z, mEyeRotTargetZ, l_HIO.mEyeRotScale + 1, l_HIO.mEyeRotStep);
mSph.SetR(l_HIO.mSphRadius);
mSph.SetC(current.pos);
dComIfG_Ccsp()->Set(&mSph);
m498.set(0, shape_angle.y, 0);
cXyz current_pos = current.pos;
current_pos.y += 1000.0f;
f32 water_height = dBgS_GetWaterHeight(current_pos);
if (current.pos.y < water_height) {
if (mParticleCallback.getEmitter()) {
mParticleCallback.end();
}
} else if (mMode != MODE_DEATH) {
attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 34;
}
if (mMode == MODE_DEATH || dComIfGp_event_runCheck()) {
attention_info.flags = 0;
}
return false;
}
/* 00001120-000011EC .text _draw__15daDaiocta_Eye_cFv */
bool daDaiocta_Eye_c::_draw() {
/* Nonmatching */
if (!mbAppear) {
return false;
}
g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mpModel, &tevStr);
mBtkAnm.entry(mpModel->getModelData());
mBrkAnm.entry(mpModel->getModelData());
mDoExt_modelUpdateDL(mpModel);
mBtkAnm.remove(mpModel->getModelData());
mBrkAnm.remove(mpModel->getModelData());
return true;
}
/* 000011EC-000012D4 .text createInit__15daDaiocta_Eye_cFv */
void daDaiocta_Eye_c::createInit() {
/* Nonmatching */
mbAppear = false;
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
mStts.Init(0, 0, this);
mSph.Set(l_sph_src);
mSph.SetStts(&mStts);
mSph.SetCoHitCallback(coHit_CB);
max_health = 4;
health = max_health;
mEyeScale.setall(1.0f);
if (parentActorID != fpcM_ERROR_PROCESS_ID_e) {
fopAc_ac_c* parent_p = fopAcM_SearchByID(parentActorID);
if (parent_p && fopAc_IsActor(parent_p) && fpcM_GetName(parent_p) == PROC_DAIOCTA) {
mpParentActor = (daDaiocta_c *) parent_p;
}
}
}
/* 000012D4-00001450 .text _create__15daDaiocta_Eye_cFv */
cPhs_State daDaiocta_Eye_c::_create() {
/* Nonmatching */
fopAcM_SetupActor(this, daDaiocta_Eye_c);
cPhs_State result = dComIfG_resLoad(&mPhs, m_arc_name);
if (result == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeap_CB, m_heapsize)) {
return cPhs_ERROR_e;
}
createInit();
}
return result;
}
/* 00001764-000017B4 .text _delete__15daDaiocta_Eye_cFv */
bool daDaiocta_Eye_c::_delete() {
/* Nonmatching */
dComIfG_resDelete(&mPhs, m_arc_name);
mParticleCallback.remove();
return true;
}
/* 000017B4-000017D4 .text daDaiocta_EyeCreate__FPv */