Rename HostIO mChildID to mNo

TP debug has an assert in d_a_obj showing the name of this variable is `M_no` there.
This commit is contained in:
LagoLunatic
2025-01-31 15:49:44 -05:00
parent 2ece7c9ce1
commit a52bb789da
32 changed files with 82 additions and 86 deletions
-1
View File
@@ -2,7 +2,6 @@
#define JMATRIGONOMETRIC_H
#include "dolphin/types.h"
#include "utility.h"
extern u32 jmaSinShift;
extern f32 *jmaSinTable;
+1 -1
View File
@@ -228,7 +228,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x004 */ s8 mChildID;
/* 0x004 */ s8 mNo;
/* 0x005 */ u8 m005;
/* 0x006 */ u8 m006;
/* 0x007 */ u8 m007;
+1 -1
View File
@@ -34,7 +34,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 m05[0x08 - 0x05];
/* 0x08 */ f32 mScale;
/* 0x0C */ bool m0C;
+1 -2
View File
@@ -81,8 +81,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x05 */ u8 m05[0x08 - 0x05];
/* 0x04 */ s8 mNo;
/* 0x08 */ int m08;
/* 0x0C */ daMozo_BeamChildHIO_c* mpBeamChild;
/* 0x10 */ daMozo_FireChildHIO_c* mpFireChild;
+1 -1
View File
@@ -110,7 +110,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x08 */ hio_prm_c prm;
/* 0x44 */ daNh_c* mpActor;
}; // Size: 0x48
+1 -1
View File
@@ -193,7 +193,7 @@ public:
public:
/* 0x000 */ // this.__vt
/* 0x004 */ s8 mChildId;
/* 0x004 */ s8 mNo;
/* 0x008 */ int m8;
/* 0x00C */ daNpc_Bs1_childHIO_c mChild[2];
}; // Size: 0x94
+1 -1
View File
@@ -94,7 +94,7 @@ public:
virtual ~daNpc_Btsw2_HIO_c() {}
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x08 */ dNpc_HIO_c mNpc;
/* 0x30 */ s16 m30;
/* 0x32 */ s16 m32;
+1 -1
View File
@@ -52,7 +52,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x08 */ hio_prm_c prm;
/* 0x20 */ daNpc_kam_c* mpActor;
/* 0x24 */ daNpc_kam_HIO1_c mHio1;
+1 -1
View File
@@ -95,7 +95,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x004 */ s8 mChildID;
/* 0x004 */ s8 mNo;
/* 0x005 */ u8 m005[0x008 - 0x005];
/* 0x008 */ daNpc_Md_HIO2_c m008;
/* 0x034 */ daNpc_Md_HIO3_c m034;
+1 -1
View File
@@ -41,7 +41,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
};
#endif /* D_A_OBJ_YGUSH00_H */
+1 -1
View File
@@ -42,7 +42,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x08 */ s32 field_0x08;
/* 0x0C */ u8 field_0x0C;
/* 0x0D */ u8 field_0x0D;
+3 -3
View File
@@ -52,7 +52,7 @@ public:
class daPirate_Flag_HIO_c : public JORReflexible {
public:
daPirate_Flag_HIO_c() {
mChildID = -1;
mNo = -1;
m06 = 0;
m1C = 0.0f;
m05 = 0;
@@ -64,13 +64,13 @@ public:
m18 = 0.45f;
}
virtual ~daPirate_Flag_HIO_c() {
mChildID = -1;
mNo = -1;
}
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 m05;
/* 0x06 */ u8 m06;
/* 0x07 */ u8 m07;
+3 -3
View File
@@ -67,20 +67,20 @@ public:
class daSail_HIO_c : public JORReflexible {
public:
daSail_HIO_c() {
mChildID = -1;
mNo = -1;
m05 = 1;
m06 = 1;
m10 = 0.0f;
m07 = 0;
}
virtual ~daSail_HIO_c() {
mChildID = -1;
mNo = -1;
}
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 m05;
/* 0x06 */ u8 m06;
/* 0x07 */ u8 m07;
+1 -3
View File
@@ -1,7 +1,6 @@
#ifndef D_JNT_HIT_H
#define D_JNT_HIT_H
#include "global.h"
#include "SSystem/SComponent/c_xyz.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
@@ -80,8 +79,7 @@ public:
virtual ~JntHit_HIO_c() {}
public:
/* 0x04 */ s8 mChildID;
/* 0x05 */ u8 m05[0x06 - 0x05];
/* 0x04 */ s8 mNo;
/* 0x06 */ s16 m06;
/* 0x08 */ s16 m08;
/* 0x0A */ u8 m0A[0x0C - 0x0A];
+1 -1
View File
@@ -102,7 +102,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
}; // Size: 0x08
+6 -6
View File
@@ -34,7 +34,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x05;
/* 0x06 */ u8 field_0x06;
/* 0x07 */ u8 field_0x07[0x08 - 0x07];
@@ -61,7 +61,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x05;
/* 0x06 */ u8 field_0x06;
/* 0x07 */ u8 field_0x07;
@@ -94,7 +94,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
@@ -121,7 +121,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 mIsUpdate;
/* 0x06 */ u8 field_0x06;
/* 0x07 */ u8 field_0x07;
@@ -146,7 +146,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x08 */ dScnPly_env_otherHIO_c mOther;
/* 0x50 */ dScnPly_env_debugHIO_c mEnvDebug;
};
@@ -155,7 +155,7 @@ class dScnPly_reg_HIO_c {
public:
virtual ~dScnPly_reg_HIO_c() {}
/* 0x4 */ s8 mChildID;
/* 0x4 */ s8 mNo;
/* 0x8 */ dScnPly_reg_childHIO_c mChild[22];
};
+1 -1
View File
@@ -16,7 +16,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ u8 mChildID;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x05;
/* 0x06 */ u8 mDisplayMeter;
/* 0x07 */ u8 mDisplayFlag;
+2 -2
View File
@@ -3278,7 +3278,7 @@ static BOOL daBk_Delete(bk_class* i_this) {
}
if (i_this->m121D) {
hio_set = 0;
mDoHIO_deleteChild(l_bkHIO.mChildID);
mDoHIO_deleteChild(l_bkHIO.mNo);
}
i_this->m0350.end();
i_this->dr.mParticleCallBack.end();
@@ -3554,7 +3554,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) {
}
if (!hio_set) {
l_bkHIO.mChildID = mDoHIO_createChild("ボコちゃん", &l_bkHIO); // "Boko-chan"
l_bkHIO.mNo = mDoHIO_createChild("ボコちゃん", &l_bkHIO); // "Boko-chan"
i_this->m121D = 1;
hio_set = 1;
}
+5 -5
View File
@@ -17,7 +17,7 @@ static daDr_HIO_c l_HIO;
/* 000000EC-00000148 .text __ct__10daDr_HIO_cFv */
daDr_HIO_c::daDr_HIO_c() {
mChildID = -1;
mNo = -1;
mScale = 1.0f;
m0C = false;
m0E = 10*30;
@@ -205,8 +205,8 @@ static BOOL daDr_IsDelete(dr_class* i_this) {
/* 00000A94-00000AE8 .text daDr_Delete__FP8dr_class */
static BOOL daDr_Delete(dr_class* i_this) {
dComIfG_resDelete(&i_this->mPhs, "Dr");
if (l_HIO.mChildID >= 0) {
mDoHIO_deleteChild(l_HIO.mChildID);
if (l_HIO.mNo >= 0) {
mDoHIO_deleteChild(l_HIO.mNo);
}
return TRUE;
}
@@ -245,8 +245,8 @@ static s32 daDr_Create(fopAc_ac_c* i_actor) {
daDr_setMtx(i_this);
if (l_HIO.mChildID < 0) {
l_HIO.mChildID = mDoHIO_createChild("ドラゴン", &l_HIO); // "Dragon"
if (l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_createChild("ドラゴン", &l_HIO); // "Dragon"
}
}
+3 -3
View File
@@ -23,7 +23,7 @@ daMozo_HIO_c::daMozo_HIO_c() {
m3C = 0.0f;
m40 = -300.0f;
m44 = 600.0f;
mChildID = -1;
mNo = -1;
m08 = -1;
mpBeamChild = &mBeamChild;
mpFireChild = &mFireChild;
@@ -198,8 +198,8 @@ s32 daMozo_c::CreateInit() {
mAnimMorf->calc();
wait_proc_init();
if (l_HIO.mChildID < 0) {
l_HIO.mChildID = mDoHIO_createChild("モ石像", &l_HIO); // "Mo Statue" (mo sekizou)
if (l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_createChild("モ石像", &l_HIO); // "Mo Statue" (mo sekizou)
}
return cPhs_COMPLEATE_e;
+6 -6
View File
@@ -50,7 +50,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* 800F95B8-800F9654 .text __ct__10daNh_HIO_cFv */
daNh_HIO_c::daNh_HIO_c() {
mChildID = -1;
mNo = -1;
static const hio_prm_c init_data = {
/* field_0x08 */ 200.0f,
/* field_0x0c */ 100.0f,
@@ -74,9 +74,9 @@ daNh_HIO_c::daNh_HIO_c() {
/* 800F9654-800F9874 .text __dt__6daNh_cFv */
daNh_c::~daNh_c() {
if (l_HIO.mChildID >= 0) {
mDoHIO_deleteChild(l_HIO.mChildID);
l_HIO.mChildID = -1;
if (l_HIO.mNo >= 0) {
mDoHIO_deleteChild(l_HIO.mNo);
l_HIO.mNo = -1;
}
}
@@ -134,8 +134,8 @@ s32 daNh_c::create() {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
if (l_HIO.mChildID < 0) {
l_HIO.mChildID = mDoHIO_createChild("森のほたる", &l_HIO); // "Forest Firefly" (mori no hotaru)
if (l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_createChild("森のほたる", &l_HIO); // "Forest Firefly" (mori no hotaru)
l_HIO.mpActor = this;
}
if (!init()) {
+3 -3
View File
@@ -106,7 +106,7 @@ daNpc_Bs1_HIO_c::daNpc_Bs1_HIO_c() {
mChild[1].m3C = 27.0f;
mChild[1].m40 = 20.0f;
mChildId = -1;
mNo = -1;
m8 = -1;
}
@@ -2102,7 +2102,7 @@ BOOL daNpc_Bs1_c::_delete() {
mpMorf->stopZelAnime();
}
if (l_HIO.m8 >= 0 && (l_HIO.m8 -= 1) < 0) {
mDoHIO_deleteChild(l_HIO.mChildId);
mDoHIO_deleteChild(l_HIO.mNo);
}
return TRUE;
}
@@ -2139,7 +2139,7 @@ s32 daNpc_Bs1_c::_create() {
} else {
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
if (l_HIO.m8 < 0) {
l_HIO.mChildId = mDoHIO_createChild("ボ−トショップ店員", &l_HIO); // "Boat Shopkeeper"
l_HIO.mNo = mDoHIO_createChild("ボ−トショップ店員", &l_HIO); // "Boat Shopkeeper"
}
l_HIO.m8 += 1;
if (!CreateInit()) {
+1 -1
View File
@@ -71,7 +71,7 @@ daNpc_Btsw2_HIO_c::daNpc_Btsw2_HIO_c() {
m38 = 0.95f;
m3C = 0x5A;
m3E = 0x5A;
mChildID = -1;
mNo = -1;
}
const char daNpc_Btsw2_c::m_arc_name[] = "Btsw";
+6 -6
View File
@@ -54,7 +54,7 @@ daNpc_kam_HIO1_c::daNpc_kam_HIO1_c() {
/* 00000174-000001F8 .text __ct__15daNpc_kam_HIO_cFv */
daNpc_kam_HIO_c::daNpc_kam_HIO_c() {
mChildID = -1;
mNo = -1;
static const hio_prm_c init_data = {
/* m08 */ 3000.0f,
/* m0C */ 1000.0f,
@@ -162,9 +162,9 @@ daNpc_kam_c::~daNpc_kam_c() {
mpMorf->stopZelAnime();
}
if (l_HIO.mChildID >= 0) {
mDoHIO_deleteChild(l_HIO.mChildID);
l_HIO.mChildID = -1;
if (l_HIO.mNo >= 0) {
mDoHIO_deleteChild(l_HIO.mNo);
l_HIO.mNo = -1;
}
offHyoiKamome();
@@ -267,8 +267,8 @@ s32 daNpc_kam_c::create() {
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
if (l_HIO.mChildID < 0) {
l_HIO.mChildID = mDoHIO_createChild("かもめ", &l_HIO); // "Seagull" (kamome)
if (l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_createChild("かもめ", &l_HIO); // "Seagull" (kamome)
l_HIO.mpActor = this;
}
+6 -6
View File
@@ -314,7 +314,7 @@ daNpc_Md_HIO_c::daNpc_Md_HIO_c() {
m1A8 = 3.0f;
m1AC = 1000.0f;
m1B0 = 1000.0f;
mChildID = -0x1;
mNo = -1;
}
/* 000006DC-000006FC .text daNpc_Md_XyCheckCB__FPvi */
@@ -455,8 +455,8 @@ s32 daNpc_Md_c::create() {
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
if (l_HIO.mChildID < 0) {
l_HIO.mChildID = mDoHIO_createChild("リト族(メドリ)", &l_HIO); // "Rito (Medli)" (Ritozoku (Medli))
if (l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_createChild("リト族(メドリ)", &l_HIO); // "Rito (Medli)" (Ritozoku (Medli))
l_HIO.mpActor = this;
}
@@ -3304,9 +3304,9 @@ daNpc_Md_c::~daNpc_Md_c() {
m3058.end();
m304C.end();
m3074.remove();
if (l_HIO.mChildID >= 0) {
mDoHIO_deleteChild(l_HIO.mChildID);
l_HIO.mChildID = -1;
if (l_HIO.mNo >= 0) {
mDoHIO_deleteChild(l_HIO.mNo);
l_HIO.mNo = -1;
}
m_flying = false;
m_mirror = false;
+5 -5
View File
@@ -91,8 +91,8 @@ s32 daObjYgush00_c::_create() {
scale.x * 80.0f, scale.y * 125.0f, scale.z * 80.0f);
#ifdef DEBUG
if (l_HIO.mChildID < 0) {
l_HIO.mChildID = mDoHIO_createChild("", &l_HIO);
if (l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_createChild("", &l_HIO);
}
#endif
} else {
@@ -108,9 +108,9 @@ bool daObjYgush00_c::_delete() {
dComIfG_resDelete(&mPhase, l_arcname);
#ifdef DEBUG
if (l_HIO.mChildID >= 0) {
mDoHIO_deleteChild(l_HIO.mChildID);
l_HIO.mChildID = -1;
if (l_HIO.mNo >= 0) {
mDoHIO_deleteChild(l_HIO.mNo);
l_HIO.mNo = -1;
}
#endif
+6 -6
View File
@@ -12,7 +12,7 @@ static daObjQuake_HIO_c l_HIO;
/* 000000EC-00000134 .text __ct__16daObjQuake_HIO_cFv */
daObjQuake_HIO_c::daObjQuake_HIO_c() {
mChildID = -1;
mNo = -1;
field_0x08 = 0;
field_0x0C = 0;
field_0x0D = 0;
@@ -50,8 +50,8 @@ s32 daObjQuake_c::_create() {
break;
}
if (l_HIO.mChildID < 0) {
l_HIO.mChildID = mDoHIO_createChild("振動効果", &l_HIO); // "Vibration Effect"
if (l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_createChild("振動効果", &l_HIO); // "Vibration Effect"
}
l_HIO.field_0x08 += 1;
@@ -79,11 +79,11 @@ BOOL daObjQuake_c::_is_delete() {
}
}
if (l_HIO.mChildID >= 0) {
if (l_HIO.mNo >= 0) {
l_HIO.field_0x08 -= 1;
if (l_HIO.field_0x08 == 0) {
mDoHIO_deleteChild(l_HIO.mChildID);
l_HIO.mChildID = -1;
mDoHIO_deleteChild(l_HIO.mNo);
l_HIO.mNo = -1;
}
}
+5 -5
View File
@@ -738,9 +738,9 @@ static BOOL daSail_Delete(sail_class* i_this) {
dComIfG_resDelete(&i_this->mClothPhase, "Cloth");
dComIfG_resDelete(&i_this->mKaizokusenPhase, "Kaizokusen");
if (l_HIO.mChildID >= 0) {
mDoHIO_root.m_subroot.deleteChild(l_HIO.mChildID);
l_HIO.mChildID = -1;
if (l_HIO.mNo >= 0) {
mDoHIO_root.m_subroot.deleteChild(l_HIO.mNo);
l_HIO.mNo = -1;
}
return TRUE;
@@ -779,8 +779,8 @@ static s32 daSail_Create(fopAc_ac_c* i_actor) {
int phase_state = cPhs_COMPLEATE_e;
if (fopAcM_entrySolidHeap(i_this, daSail_checkCreateHeap, 0x4C0)) {
if (l_HIO.mChildID < 0) {
l_HIO.mChildID = mDoHIO_root.m_subroot.createChild("海賊船の帆", &l_HIO); // "Pirate Ship's Sail"
if (l_HIO.mNo < 0) {
l_HIO.mNo = mDoHIO_root.m_subroot.createChild("海賊船の帆", &l_HIO); // "Pirate Ship's Sail"
}
i_this->mSailPacket.m1C44 = 0.0f;
+1 -1
View File
@@ -17,7 +17,7 @@ JntHit_HIO_c::JntHit_HIO_c() {
m1C = 0.0f;
m20 = 0.0f;
m24 = 100.0f;
mChildID = -1;
mNo = -1;
}
/* 80060C44-80060EC4 .text CreateInit__8JntHit_cFv */
+1 -1
View File
@@ -242,7 +242,7 @@ void dMenu_Option_c::_create() {
mE3A = 0xFF;
mE3B = 0xC0;
g_moHIO.mChildID = mDoHIO_createChild("オプション画面", &g_moHIO); // "Option Screen"
g_moHIO.mNo = mDoHIO_createChild("オプション画面", &g_moHIO); // "Option Screen"
}
/* 801D53F0-801D546C .text _delete__14dMenu_Option_cFv */
+6 -6
View File
@@ -1111,9 +1111,9 @@ static BOOL dScnPly_Delete(dScnPly_ply_c* i_this) {
g_msgDHIO.field_0x06 = 0;
g_msgDHIO.field_0x10 = -1;
mDoHIO_deleteChild(g_darkHIO.mChildID);
mDoHIO_deleteChild(g_envHIO.mChildID);
mDoHIO_deleteChild(g_msgDHIO.mChildID);
mDoHIO_deleteChild(g_darkHIO.mNo);
mDoHIO_deleteChild(g_envHIO.mNo);
mDoHIO_deleteChild(g_msgDHIO.mNo);
dComIfGp_setWindowNum(0);
@@ -1339,9 +1339,9 @@ s32 phase_4(dScnPly_ply_c* i_this) {
dStage_Create();
mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30);
g_darkHIO.mChildID = mDoHIO_createChild("暗闇スポット", &g_darkHIO); // "Darkness Spot"
g_envHIO.mChildID = mDoHIO_createChild("描画設定", &g_envHIO); // "Draw Settings"
g_msgDHIO.mChildID = mDoHIO_createChild("Message Data", &g_msgDHIO);
g_darkHIO.mNo = mDoHIO_createChild("暗闇スポット", &g_darkHIO); // "Darkness Spot"
g_envHIO.mNo = mDoHIO_createChild("描画設定", &g_envHIO); // "Draw Settings"
g_msgDHIO.mNo = mDoHIO_createChild("Message Data", &g_msgDHIO);
new(&dComIfGp_getAttention()) dAttention_c(dComIfGp_getPlayer(0), NULL);
dComIfGp_getVibration().Init();
+1 -1
View File
@@ -98,7 +98,7 @@ void fapGm_Create() {
fopDwTg_CreateQueue();
fopScnM_CreateReq(PROC_LOGO_SCENE, PROC_INVALID_e, 0, 0);
g_HIO.mChildID = mDoHIO_createChild("ゲームシステム", &g_HIO); // "Game System"
g_HIO.mNo = mDoHIO_createChild("ゲームシステム", &g_HIO); // "Game System"
}
/* 80023288-800232D0 .text __dt__11fapGm_HIO_cFv */