mirror of
https://github.com/zeldaret/tp
synced 2026-06-10 04:54:14 -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:
+18
-17
@@ -13,7 +13,7 @@
|
||||
class daE_DF_HIO_c : public JORReflexible {
|
||||
public:
|
||||
daE_DF_HIO_c();
|
||||
virtual ~daE_DF_HIO_c() {};
|
||||
virtual ~daE_DF_HIO_c() {}
|
||||
|
||||
void genMessage(JORMContext*);
|
||||
|
||||
@@ -23,18 +23,18 @@ public:
|
||||
|
||||
STATIC_ASSERT(sizeof(daE_DF_HIO_c) == 0xC);
|
||||
|
||||
#if DEBUG
|
||||
inline void daE_DF_HIO_c::genMessage(JORMContext* i_ctx) {
|
||||
i_ctx->genLabel("デクレシア", 0x80000001);
|
||||
i_ctx->genSlider("速度", &field_0x8, 0.0f, 100.0f);
|
||||
}
|
||||
#endif
|
||||
|
||||
daE_DF_HIO_c::daE_DF_HIO_c() {
|
||||
mNo = -1;
|
||||
field_0x8 = 0.0f;
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
void daE_DF_HIO_c::genMessage(JORMContext* i_ctx) {
|
||||
i_ctx->genLabel("デクレシア", 0x80000001);
|
||||
i_ctx->genSlider("速度", &field_0x8, 0.0f, 100.0f);
|
||||
}
|
||||
#endif
|
||||
|
||||
int daE_DF_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DF", 0xD);
|
||||
JUT_ASSERT(161, modelData != NULL);
|
||||
@@ -101,13 +101,13 @@ void daE_DF_c::CameraSet(f32 i_posz) {
|
||||
cXyz vec(0.0f, 0.0f, i_posz);
|
||||
|
||||
dBgS_LinChk line_chk;
|
||||
u16 angle = 0;
|
||||
s16 angle = 0;
|
||||
for (s16 i = 0; i < 4; i++) {
|
||||
cLib_offsetPos(&end, &start, angle, &vec);
|
||||
cLib_offsetPos(&end, &start, (s16)angle, &vec);
|
||||
line_chk.Set(&start, &end, NULL);
|
||||
|
||||
if (dComIfG_Bgsp().LineCross(&line_chk) == 0) {
|
||||
cLib_offsetPos(&end, ¢er, angle, &vec);
|
||||
cLib_offsetPos(&end, ¢er, (s16)angle, &vec);
|
||||
end.y += 400.0f;
|
||||
camera->mCamera.Set(center, end, mFovY, 0);
|
||||
|
||||
@@ -116,7 +116,7 @@ void daE_DF_c::CameraSet(f32 i_posz) {
|
||||
break;
|
||||
}
|
||||
|
||||
angle += 0x10000 - 0x8000;
|
||||
ANGLE_ADD_2(angle, 0x8000);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -409,10 +409,10 @@ void daE_DF_c::LinkEatAction() {
|
||||
cLib_chaseAngleS(&mChaseAngle.z, 0, 0x100);
|
||||
}
|
||||
|
||||
bool daE_DF_c::Mogu_Mogu() {
|
||||
u8 daE_DF_c::Mogu_Mogu() {
|
||||
if (mMoguCount > 4) {
|
||||
mMoguCount = 0;
|
||||
return true;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (mpMorfSO->isLoop()) {
|
||||
@@ -428,10 +428,10 @@ bool daE_DF_c::Mogu_Mogu() {
|
||||
} else {
|
||||
mCreatureSound.startCreatureSound(Z2SE_EN_DF_EAT_WAIT, 0, -1);
|
||||
}
|
||||
return false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void daE_DF_c::ObjEatAction() {
|
||||
@@ -494,7 +494,8 @@ void daE_DF_c::SearchAction() {
|
||||
if (obj_carry != NULL) {
|
||||
if (fopAcM_GetName(obj_carry) == fpcNm_Obj_Carry_e) {
|
||||
mEatObjType = EAT_TYPE_OBJ;
|
||||
mCarryType = obj_carry->getType();
|
||||
daObjCarry_c* obj_carry_copy = obj_carry;
|
||||
mCarryType = obj_carry_copy->getType();
|
||||
fopAcM_delete(obj_carry);
|
||||
cXyz* obj_pos = &fopAcM_GetPosition(obj_carry);
|
||||
Set_Angle(obj_pos);
|
||||
|
||||
Reference in New Issue
Block a user