mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-24 15:43:13 -04:00
More debug fixes for 99% TUs (#3122)
* d_a_e_hp debug code 100% * d_a_npc_chin debug improvements * d_a_npc_du debug code 100% * d_a_npc_cdn3 debug code 100% * d_a_e_rdy GCN symbol fixes * d_a_kago debug code 100% * d_a_e_oc debug code 100% * d_a_e_yr debug code almost matching * d_a_e_bg debug code 100% * d_a_ykgr debug code 100% * d_a_tag_hjump debug data fixes * d_a_tag_attack_item debug data fixes * d_a_e_df debug code 100% * d_a_e_sh debug code 100% * d_a_L7op_demo_dr debug code 100% * d_a_L7low_dr debug code 100% * d_a_e_sm2 debug code 100% * d_a_movie_player debug code 100% * d_a_e_st debug code 100% * d_a_npc_aru debug code 100% * d_a_e_yg debug code 100% * d_a_door_spiral debug code 100% * d_a_bg debug code 100% (still has .data issues) * d_a_e_dn debug code 100% * d_a_tag_attention debug code 100% * d_a_e_bd debug code 100% * d_a_tag_camera debug .rodata fix * d_a_obj_movebox debug code 100% (array dtors are mismapped) * d_a_mg_rod debug improvements * d_a_e_rd debug symbol fixes
This commit is contained in:
+55
-53
@@ -28,52 +28,6 @@ public:
|
||||
u8 rangeDisplay;
|
||||
};
|
||||
|
||||
namespace {
|
||||
static dCcD_SrcCyl cc_hp_src = {
|
||||
{
|
||||
{0, {{0x0, 0x0, 0x0}, {0xd8000000, 0x3}, 0x0}},
|
||||
{dCcD_SE_13, 0, 0, 0, {0}},
|
||||
{dCcD_SE_NONE, 0, 0, 0, {6}},
|
||||
{0},
|
||||
},
|
||||
{
|
||||
{
|
||||
{0.0f, 0.0f, 0.0f},
|
||||
50.0f,
|
||||
300.0f,
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static dCcD_SrcSph cc_lamp_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj
|
||||
{dCcD_SE_13, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
}, // mObjInf
|
||||
{
|
||||
{{0.0f, 0.0f, 0.0f}, 40.0f} // mSph
|
||||
} // mSphAttr
|
||||
};
|
||||
|
||||
static dCcD_SrcCyl cc_hp_at_src = {
|
||||
{
|
||||
{0, {{0x400, 0x1, 0xd}, {0x0, 0x0}, 0x0}},
|
||||
{dCcD_SE_METAL, 0, 1, 0, {0}},
|
||||
{dCcD_SE_NONE, 0, 0, 0, {2}},
|
||||
{0},
|
||||
},
|
||||
{
|
||||
{
|
||||
{0.0f, 0.0f, 0.0f},
|
||||
50.0f,
|
||||
300.0f,
|
||||
}
|
||||
}
|
||||
};
|
||||
} // namespace
|
||||
|
||||
daE_HP_HIO_c::daE_HP_HIO_c() {
|
||||
mChild = -1;
|
||||
modelSize = 1.2f;
|
||||
@@ -95,6 +49,52 @@ void daE_HP_HIO_c::genMessage(JORMContext* ctx) {
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace {
|
||||
static dCcD_SrcCyl cc_hp_src = {
|
||||
{
|
||||
{0, {{0x0, 0x0, 0x0}, {0xd8000000, 0x3}, 0x0}},
|
||||
{dCcD_SE_13, 0, 0, 0, {0}},
|
||||
{dCcD_SE_NONE, 0, 0, 0, {6}},
|
||||
{0},
|
||||
},
|
||||
{
|
||||
{
|
||||
{0.0f, 0.0f, 0.0f},
|
||||
50.0f,
|
||||
300.0f,
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static dCcD_SrcSph cc_lamp_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj
|
||||
{dCcD_SE_13, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
}, // mObjInf
|
||||
{
|
||||
{{0.0f, 0.0f, 0.0f}, 40.0f} // mSph
|
||||
} // mSphAttr
|
||||
};
|
||||
|
||||
static dCcD_SrcCyl cc_hp_at_src = {
|
||||
{
|
||||
{0, {{0x400, 0x1, 0xd}, {0x0, 0x0}, 0x0}},
|
||||
{dCcD_SE_METAL, 0, 1, 0, {0}},
|
||||
{dCcD_SE_NONE, 0, 0, 0, {2}},
|
||||
{0},
|
||||
},
|
||||
{
|
||||
{
|
||||
{0.0f, 0.0f, 0.0f},
|
||||
50.0f,
|
||||
300.0f,
|
||||
}
|
||||
}
|
||||
};
|
||||
} // namespace
|
||||
|
||||
int daE_HP_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
|
||||
J3DJoint* joint = i_joint;
|
||||
s32 jointNo = joint->getJntNo();
|
||||
@@ -230,7 +230,8 @@ int daE_HP_c::draw() {
|
||||
mDoMtx_stack_c::multVec(&unkXyz1, &field_0x75c);
|
||||
mDoMtx_stack_c::transS(field_0x75c);
|
||||
|
||||
unkXyz1 = dComIfGp_getCamera(0)->view.lookat.eye - field_0x75c;
|
||||
camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
|
||||
unkXyz1 = camera->view.lookat.eye - field_0x75c;
|
||||
mDoMtx_stack_c::YrotM(unkXyz1.atan2sX_Z());
|
||||
mDoMtx_stack_c::XrotM((s16)unkXyz1.atan2sY_XZ());
|
||||
mDoMtx_stack_c::scaleM(l_HIO.modelSize, l_HIO.modelSize, l_HIO.modelSize);
|
||||
@@ -250,7 +251,7 @@ int daE_HP_c::draw() {
|
||||
}
|
||||
}
|
||||
|
||||
mpMorf->getModel();
|
||||
model = mpMorf->getModel();
|
||||
mpMorf->entryDL();
|
||||
|
||||
if (checkDownFlg()) {
|
||||
@@ -302,7 +303,8 @@ void daE_HP_c::setActionMode(int param_0, int i_mode) {
|
||||
}
|
||||
|
||||
bool daE_HP_c::mChkDistance(f32 param_0) {
|
||||
cXyz vecToPlayer = dComIfGp_getPlayer(0)->current.pos - current.pos;
|
||||
fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
|
||||
cXyz vecToPlayer = player->current.pos - current.pos;
|
||||
if (vecToPlayer.abs() < param_0) {
|
||||
return true;
|
||||
} else {
|
||||
@@ -677,8 +679,7 @@ void daE_HP_c::executeDown() {
|
||||
field_0x772.z = 0;
|
||||
|
||||
unkXyz1 = home.pos - current.pos;
|
||||
latDist = unkXyz1.atan2sX_Z();
|
||||
cMtx_YrotS(*calc_mtx, latDist);
|
||||
cMtx_YrotS(*calc_mtx, unkXyz1.atan2sX_Z());
|
||||
|
||||
unkXyz1.x = 0.0f;
|
||||
unkXyz1.y = 100.0f;
|
||||
@@ -812,7 +813,8 @@ void daE_HP_c::action() {
|
||||
break;
|
||||
}
|
||||
|
||||
if (checkBallModelDraw()) {
|
||||
fopEn_enemy_c* enemy = this;
|
||||
if (enemy->checkBallModelDraw()) {
|
||||
mSound2.startCreatureSoundLevel(Z2SE_EN_PO_SOUL, 0, -1);
|
||||
}
|
||||
|
||||
@@ -841,7 +843,7 @@ void daE_HP_c::action() {
|
||||
}
|
||||
|
||||
field_0x772.x = -cM_atan2s(planeNormal->z, planeNormal->y);
|
||||
field_0x772.z = cM_atan2s(planeNormal->x, planeNormal->y);
|
||||
field_0x772.z = (s16)cM_atan2s(planeNormal->x, planeNormal->y);
|
||||
}
|
||||
} else if (mAction != 1 && mAction != 3) {
|
||||
gravity = 0.0f;
|
||||
|
||||
Reference in New Issue
Block a user