diff --git a/include/d/actor/d_a_cc.h b/include/d/actor/d_a_cc.h index 6e579c040..59c176943 100644 --- a/include/d/actor/d_a_cc.h +++ b/include/d/actor/d_a_cc.h @@ -25,7 +25,7 @@ public: /* 0x2F0 */ u8 mBehaviorType; /* 0x2F1 */ u8 mColorType; /* 0x2F2 */ u8 mNoticeRangeByte; - /* 0x2F3 */ u8 mDisableSpawnSwitchIndex; + /* 0x2F3 */ u8 mDisableSpawnSwitchNo; /* 0x2F4 */ u8 mCurrAction; /* 0x2F5 */ u8 m2F5; /* 0x2F6 */ u8 m2F6[0x2F7 - 0x2F6]; @@ -90,6 +90,6 @@ public: /* 0xA34 */ u8 mA34[0xBD4 - 0xA34]; /* 0xBD4 */ enemyfire mEnemyFire; /* 0xDFC */ u8 mDFC[0xE04 - 0xDFC]; -}; +}; // Size: 0xE04 #endif /* D_A_CC_H */ diff --git a/include/d/actor/d_a_ep.h b/include/d/actor/d_a_ep.h index da1524d6e..b6df7a6ef 100644 --- a/include/d/actor/d_a_ep.h +++ b/include/d/actor/d_a_ep.h @@ -36,7 +36,7 @@ public: /* 0x502 */ s16 mAlphaModelRotY; /* 0x504 */ u8 mType; /* 0x505 */ u8 m505; - /* 0x506 */ u8 mOnSwitchId; + /* 0x506 */ u8 mOnSwitchNo; /* 0x507 */ u8 m507; /* 0x508 */ u8 m508; /* 0x509 */ u8 m509[0x50C - 0x509]; @@ -72,6 +72,6 @@ public: /* 0x894 */ u8 m894[0x910 - 0x894]; /* 0x910 */ u8 mGroundCheckTimer; /* 0x911 */ u8 m911[0x914 - 0x911]; -}; +}; // Size: 0x914 #endif /* D_A_EP_H */ diff --git a/include/d/actor/d_a_kamome.h b/include/d/actor/d_a_kamome.h index 3994092ee..171922c89 100644 --- a/include/d/actor/d_a_kamome.h +++ b/include/d/actor/d_a_kamome.h @@ -17,11 +17,11 @@ public: /* 0x2A0 */ u8 mType; /* 0x2A1 */ u8 mKoMaxCount; /* 0x2A2 */ u8 mPathIdx; - /* 0x2A3 */ u8 mSwitchIdArg; + /* 0x2A3 */ u8 mSwitchNoPrm; /* 0x2A4 */ int mGlobalTimer; /* 0x2A8 */ u8 mAnimState; /* 0x2A9 */ u8 mMoveState; - /* 0x2AA */ u8 mSwitchId; + /* 0x2AA */ u8 mSwitchNo; /* 0x2AB */ u8 m2AB; /* 0x2AC */ s16 mJointRotY; /* 0x2AE */ s16 mJointRotZ; @@ -66,6 +66,6 @@ public: /* 0x55C */ dCcD_Sph mSph; /* 0x688 */ u8 m688; /* 0x689 */ u8 m689[0x68C - 0x689]; -}; +}; // Size: 0x68C #endif /* D_A_KAMOME_H */ diff --git a/include/d/actor/d_a_kantera.h b/include/d/actor/d_a_kantera.h index e3055cd52..10ce024a3 100644 --- a/include/d/actor/d_a_kantera.h +++ b/include/d/actor/d_a_kantera.h @@ -27,7 +27,7 @@ public: /* 0x298 */ u8 mParam0; /* 0x299 */ u8 mParam1; /* 0x29A */ u8 mParam2; - /* 0x29B */ u8 mSwitchID; + /* 0x29B */ u8 mSwitchNo; /* 0x29C */ J3DModel* mpModel; /* 0x2A0 */ J3DModel* mpModel2; /* 0x2A4 */ fpc_ProcID mTargetActorID; @@ -67,6 +67,6 @@ public: /* 0x6F0 */ dPa_followEcallBack mPtclCallBack1; /* 0x704 */ cXyz mParticleScale; /* 0x710 */ mo_ga_s mGa[2]; -}; +}; // Size: 0x770 #endif /* D_A_KANTERA_H */ diff --git a/include/d/actor/d_a_kytag03.h b/include/d/actor/d_a_kytag03.h index b0f31b252..b39095fdb 100644 --- a/include/d/actor/d_a_kytag03.h +++ b/include/d/actor/d_a_kytag03.h @@ -10,14 +10,13 @@ class kytag03_class : public fopAc_ac_c { public: /* 0x290 */ request_of_phase_process_class mPhs; /* 0x298 */ mDoExt_McaMorf* mpModel; - /* 0x29C */ u32 field_0x29c; + /* 0x29C */ u8 m29C[0x2A0 - 0x29C]; /* 0x2A0 */ u8 field_0x2a0; - /* 0x2A1 */ u8 mSwitchID; + /* 0x2A1 */ u8 mSwitchNo; /* 0x2A2 */ u8 mbRoomActive; /* 0x2A3 */ u8 mbVisible; /* 0x2A4 */ u8 mbIsActive; - /* 0x2A5 */ u8 m2A5; /* 0x2A8 */ f32 field_0x2a8; -}; +}; // Size: 0x2AC #endif /* D_A_KYTAG03_H */ diff --git a/include/d/actor/d_a_tsubo.h b/include/d/actor/d_a_tsubo.h index d706dec2b..ab0e345f9 100644 --- a/include/d/actor/d_a_tsubo.h +++ b/include/d/actor/d_a_tsubo.h @@ -200,7 +200,7 @@ namespace daTsubo { /* 0x638 */ dCcD_Stts mStts; /* 0x674 */ int mType; /* 0x678 */ int m678; - /* 0x67C */ u16 mSwitchId; + /* 0x67C */ u16 mSwitchNo; /* 0x67E */ u8 m67E[0x67F - 0x67E]; /* 0x67F */ u8 m67F; /* 0x680 */ u8 m680[0x682 - 0x680]; @@ -231,7 +231,7 @@ namespace daTsubo { /* 0x802 */ u8 m802[0x814 - 0x802]; /* 0x814 */ cXyz m814; /* 0x820 */ u8 m820[0xF00 - 0x820]; - }; + }; // Size: 0xF00 namespace Method { s32 Create(void*); diff --git a/include/d/actor/d_a_wall.h b/include/d/actor/d_a_wall.h index a1de6341f..8de4d6594 100644 --- a/include/d/actor/d_a_wall.h +++ b/include/d/actor/d_a_wall.h @@ -24,6 +24,14 @@ public: void set_se(); bool _draw(); + static GXColor m_smoke_color; + static const s16 m_heapsize[3]; + static const char* m_arcname[3]; + static const Vec m_cull_size[][2]; + static const Vec m_tri_vtx[3][4]; + static const s16 m_bmdname[3]; + static const s16 m_dzbname[3]; + public: /* 0x290 */ request_of_phase_process_class mPhs; /* 0x298 */ J3DModel* mpModel; @@ -36,16 +44,8 @@ public: /* 0x5D0 */ JPABaseEmitter* mpEmitter; /* 0x5D4 */ f32 mDst; /* 0x5D8 */ u8 mBreakCounter; - /* 0x5DC */ s32 mSwitchIndex; + /* 0x5DC */ s32 mSwitchNo; /* 0x5E0 */ u8 mType; - - static GXColor m_smoke_color; - static const s16 m_heapsize[3]; - static const char* m_arcname[3]; - static const Vec m_cull_size[][2]; - static const Vec m_tri_vtx[3][4]; - static const s16 m_bmdname[3]; - static const s16 m_dzbname[3]; -}; +}; // Size: 0x5E4 #endif /* D_A_WALL_H */ diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index c89fb9829..152811cd8 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -50,8 +50,8 @@ static BOOL daKytag03_Execute(kytag03_class* i_this) { if (!dComIfGp_event_runCheck() || !dComIfGp_event_chkEventFlag(dEvtFlag_STAFF_ALL_e)) { if (i_this->tevStr.mRoomNo == dStage_roomControl_c::getStayNo()) { i_this->mbRoomActive = true; - if (i_this->mSwitchID != 0xFF) { - if (dComIfGs_isSwitch(i_this->mSwitchID, dStage_roomControl_c::getStayNo())) { + if (i_this->mSwitchNo != 0xFF) { + if (dComIfGs_isSwitch(i_this->mSwitchNo, dStage_roomControl_c::getStayNo())) { if (!dKy_contrast_flg_get()) { dKy_contrast_flg_set(true); dKy_change_colpat(4); @@ -70,8 +70,8 @@ static BOOL daKytag03_Execute(kytag03_class* i_this) { } } else if (!i_this->mbRoomActive) { if (i_this->tevStr.mRoomNo != dStage_roomControl_c::getStayNo()) { - if (i_this->mSwitchID != 0xFF) { - if (dComIfGs_isSwitch(i_this->mSwitchID, i_this->tevStr.mRoomNo)) { + if (i_this->mSwitchNo != 0xFF) { + if (dComIfGs_isSwitch(i_this->mSwitchNo, i_this->tevStr.mRoomNo)) { if (!dKy_contrast_flg_get()) { dKy_contrast_flg_set(true); dKy_change_colpat(4); @@ -135,7 +135,7 @@ static s32 daKytag03_Create(fopAc_ac_c* i_ac) { i_this->field_0x2a0 = 0; i_this->field_0x2a8 = 0.0f; - i_this->mSwitchID = fopAcM_GetParam(i_this); + i_this->mSwitchNo = fopAcM_GetParam(i_this); i_this->mbRoomActive = false; i_this->mbIsActive = false; i_this->mbVisible = false; diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 8e0820e17..a52b3090b 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -132,7 +132,7 @@ void daWall_c::CreateInit() { dComIfG_Bgsp()->Regist(mpBgW, this); set_mtx(); mpBgW->Move(); - mSwitchIndex = fopAcM_GetParam(this) & 0xFF; + mSwitchNo = fopAcM_GetParam(this) & 0xFF; mState = false; } @@ -140,9 +140,9 @@ void daWall_c::CreateInit() { s32 daWall_c::_create() { fopAcM_SetupActor(this, daWall_c); mType = fopAcM_GetParam(this) >> 8; - mSwitchIndex = fopAcM_GetParam(this) & 0xFF; - bool isSwitch = dComIfGs_isSwitch(mSwitchIndex, fopAcM_GetHomeRoomNo(this)); - if (isSwitch || mSwitchIndex == 0xff) { + mSwitchNo = fopAcM_GetParam(this) & 0xFF; + bool isSwitch = dComIfGs_isSwitch(mSwitchNo, fopAcM_GetHomeRoomNo(this)); + if (isSwitch || mSwitchNo == 0xff) { return cPhs_ERROR_e; } @@ -293,8 +293,8 @@ void daWall_c::set_effect() { mBreakCounter = 1; mState = 1; dComIfG_Bgsp()->Release(mpBgW); - if (mSwitchIndex != 0xFF) - dComIfGs_onSwitch(mSwitchIndex, fopAcM_GetHomeRoomNo(this)); + if (mSwitchNo != 0xFF) + dComIfGs_onSwitch(mSwitchNo, fopAcM_GetHomeRoomNo(this)); } /* 00000F74-00000FE4 .text set_se__8daWall_cFv */