diff options
| author | Carco_21 <144170194+carter-ktb21@users.noreply.github.com> | 2025-12-05 21:37:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-05 18:37:17 -0800 |
| commit | e6b1f3a4f2ffd7403d4949d0875f7827cd2846f2 (patch) | |
| tree | 6f19b493135d0dcc84ef06f64c8d4bd570885b0b /include/d | |
| parent | 4e4d89eab6a808b3df0fcb876bcfdc946e9f4a14 (diff) | |
d_a_e_mk debug work + documentation (#2913)
* initial work
* documentation
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/actor/d_a_e_mk.h | 159 | ||||
| -rw-r--r-- | include/d/actor/d_a_e_mk_bo.h | 5 |
2 files changed, 85 insertions, 79 deletions
diff --git a/include/d/actor/d_a_e_mk.h b/include/d/actor/d_a_e_mk.h index 9bdb6a0b68..f9c5c2abd7 100644 --- a/include/d/actor/d_a_e_mk.h +++ b/include/d/actor/d_a_e_mk.h @@ -15,7 +15,8 @@ * * @details * - */ +*/ + class e_mk_class { public: enum e_mk_ACTION { @@ -30,98 +31,102 @@ public: ACT_R04_DEMO = 35, }; - /* 0x000 */ fopEn_enemy_c enemy; - /* 0x5AC */ request_of_phase_process_class mPhase; - /* 0x5B4 */ s16 mMode; - /* 0x5B6 */ u8 mParam; - /* 0x5B7 */ u8 field_0x5b7; - /* 0x5B8 */ cXyz field_0x5b8; + enum Demo_Mode { + /* 0x0 */ DEMO_MODE_NONE, + /* 0x1 */ DEMO_MODE_START, + /* 0x2 */ DEMO_MODE_END, + /* 0x3 */ DEMO_MODE_R04, + /* 0x4 */ DEMO_MODE_BOHIT, + /* 0xA */ DEMO_MODE_FINISH = 0xA, + }; + + /* 0x000 */ fopEn_enemy_c actor; + /* 0x5AC */ request_of_phase_process_class phase; + /* 0x5B4 */ s16 mode; + /* 0x5B6 */ u8 arg0; + /* 0x5B8 */ cXyz posTarget; /* 0x5C4 */ u8 field_0x5c4[0x5c8 - 0x5c4]; - /* 0x5C8 */ mDoExt_McaMorfSO* mpModelMorf; - /* 0x5CC */ int mAnm; - /* 0x5D0 */ mDoExt_btpAnm* mBtp; + /* 0x5C8 */ mDoExt_McaMorfSO* anmP; + /* 0x5CC */ int anmNo; + /* 0x5D0 */ mDoExt_btpAnm* btpP; /* 0x5D4 */ s16 field_0x5d4; - /* 0x5D8 */ f32 field_0x5d8; - /* 0x5DC */ mDoExt_McaMorf* mpCrownModelMorf; - /* 0x5E0 */ s8 field_0x5e0; - /* 0x5E4 */ cXyz field_0x5e4; - /* 0x5F0 */ csXyz field_0x5f0; - /* 0x5F6 */ u8 field_0x5f6[0x5fc - 0x5f6]; + /* 0x5D8 */ f32 btpFrame; + /* 0x5DC */ mDoExt_McaMorf* crownAnmP; + /* 0x5E0 */ s8 unkFlag1; + /* 0x5E4 */ cXyz crownPos; + /* 0x5F0 */ csXyz unkRotation; + /* 0x5F6 */ csXyz field_0x5f6; /* 0x5FC */ f32 field_0x5fc; /* 0x600 */ f32 field_0x600; /* 0x604 */ f32 field_0x604; - /* 0x608 */ J3DModel* mpBoomerangModel; - /* 0x60C */ s8 field_0x60c; - /* 0x60D */ s8 field_0x60d; - /* 0x60E */ s8 field_0x60e; - /* 0x60F */ u8 field_0x60f; - /* 0x610 */ Z2CreatureEnemy mSound; + /* 0x608 */ J3DModel* boomerangModelP; + /* 0x60C */ s8 crownStatus; + /* 0x60D */ s8 boomerangStatus; + /* 0x60E */ s8 btpFrameFlag; + /* 0x610 */ Z2CreatureEnemy sound; /* 0x6B4 */ s16 field_0x6b4; - /* 0x6B6 */ s16 mAction; - /* 0x6B8 */ f32 mDistToPlayer; - /* 0x6BC */ s16 mAngleToPlayer; - /* 0x6BE */ s8 field_0x6be; - /* 0x6BF */ u8 field_0x6bf; - /* 0x6C0 */ cXyz field_0x6c0; - /* 0x6CC */ cXyz field_0x6cc; - /* 0x6D8 */ f32 field_0x6d8; - /* 0x6DC */ cXyz field_0x6dc; - /* 0x6E8 */ daPillar_c* mPillar; - /* 0x6EC */ daPillar_c* mHasira; - /* 0x6F0 */ u32 mShadowKey1; - /* 0x6F4 */ u32 mShadowKey2; - /* 0x6F8 */ s8 field_0x6f8; - /* 0x6F9 */ u8 field_0x6f9; - /* 0x6FA */ s16 field_0x6fa; - /* 0x6FC */ s16 field_0x6fc[4]; - /* 0x704 */ s16 field_0x704; - /* 0x706 */ s8 field_0x706; - /* 0x707 */ s8 field_0x707; - /* 0x708 */ fpc_ProcID field_0x708; - /* 0x70C */ e_db_class* field_0x70c; - /* 0x710 */ fpc_ProcID mBabaChildID; - /* 0x714 */ fpc_ProcID mBabaChildID2; - /* 0x718 */ s8 field_0x718; - /* 0x719 */ s8 field_0x719; - /* 0x71A */ s8 field_0x71a; - /* 0x71B */ s8 field_0x71b; - /* 0x71C */ s8 field_0x71c; - /* 0x71D */ s8 field_0x71d; - /* 0x71E */ s8 field_0x71e; - /* 0x71F */ u8 field_0x71f; - /* 0x720 */ dBgS_AcchCir mAcchCir; - /* 0x760 */ dBgS_ObjAcch mAcch; - /* 0x938 */ dCcU_AtInfo mAtInfo; - /* 0x95C */ dCcD_Stts field_0x95c; - /* 0x998 */ dCcD_Sph field_0x998; - /* 0xAD0 */ dCcD_Sph field_0xad0; + /* 0x6B6 */ s16 action; + /* 0x6B8 */ f32 distToPl; + /* 0x6BC */ s16 angleToPl; + /* 0x6BE */ s8 unkFlag2; + /* 0x6C0 */ cXyz prevPos; + /* 0x6CC */ cXyz prevPosTarget; + /* 0x6D8 */ f32 PosYTransOffset; + /* 0x6DC */ cXyz posTargetStep; + /* 0x6E8 */ daPillar_c* prevHasira; + /* 0x6EC */ daPillar_c* hasira; + /* 0x6F0 */ u32 shadowKey1; + /* 0x6F4 */ u32 shadowKey2; + /* 0x6F8 */ s8 unkFlag3; + /* 0x6FA */ s16 unkCounter1; + /* 0x6FC */ s16 timer[4]; + /* 0x704 */ s16 invulnerabilityTimer; + /* 0x706 */ s8 tubaTimer; + /* 0x707 */ s8 unkFlag4; + /* 0x708 */ fpc_ProcID boomerangId; + /* 0x70C */ e_db_class* db; + /* 0x710 */ fpc_ProcID dbId1; + /* 0x714 */ fpc_ProcID dbId2; + /* 0x718 */ s8 unkFlag5; + /* 0x719 */ s8 unkCounter2; + /* 0x71A */ s8 unkTimer1; + /* 0x71B */ s8 setSmokeFlag; + /* 0x71C */ s8 unkCounter3; + /* 0x71D */ s8 firstHasiraFlag; + /* 0x71E */ s8 demoHasiraFlag; + /* 0x720 */ dBgS_AcchCir acchcir; + /* 0x760 */ dBgS_ObjAcch acch; + /* 0x938 */ dCcU_AtInfo atInfo; + /* 0x95C */ dCcD_Stts stts; + /* 0x998 */ dCcD_Sph sph; + /* 0xAD0 */ dCcD_Sph tgSph; /* 0xC08 */ u32 field_0xc08; /* 0xC0C */ u32 field_0xc0c; /* 0xC10 */ u32 field_0xc10; /* 0xC14 */ u32 field_0xc14; - /* 0xC18 */ u32 field_0xc18[2]; - /* 0xC20 */ u32 field_0xc20[4]; - /* 0xC30 */ s16 field_0xc30; - /* 0xC32 */ s16 mDemoMode; - /* 0xC34 */ s16 mDemoCamTimer; - /* 0xC38 */ cXyz mCamEye; - /* 0xC44 */ cXyz mCamCenter; - /* 0xC50 */ cXyz field_0xc50; - /* 0xC5C */ cXyz field_0xc5c; - /* 0xC68 */ cXyz field_0xc68; - /* 0xC74 */ cXyz field_0xc74; - /* 0xC80 */ f32 mDemoCamFovy; - /* 0xC84 */ f32 field_0xc84; - /* 0xC88 */ f32 field_0xc88; + /* 0xC18 */ u32 boEno1Prtcls[2]; + /* 0xC20 */ u32 boEno0Prtcls[4]; + /* 0xC30 */ s16 demoMode; + /* 0xC32 */ s16 demoSubMode; + /* 0xC34 */ s16 demoCamCounter; + /* 0xC38 */ cXyz camEye; + /* 0xC44 */ cXyz camCenter; + /* 0xC50 */ cXyz camEyeTarget; + /* 0xC5C */ cXyz camCenterTarget; + /* 0xC68 */ cXyz distToCamEyeTarget; + /* 0xC74 */ cXyz distToCamCenterTarget; + /* 0xC80 */ f32 demoCamFovy; + /* 0xC84 */ f32 camStepScale1; + /* 0xC88 */ f32 camStepScale2; /* 0xC8C */ f32 field_0xc8c; /* 0xC90 */ f32 field_0xc90; /* 0xC94 */ u8 field_0xc94[0xc98 - 0xc94]; /* 0xC98 */ f32 field_0xc98; /* 0xC9C */ f32 field_0xc9c; - /* 0xCA0 */ s16 field_0xca0; - /* 0xCA4 */ dMsgFlow_c mMsgFlow; + /* 0xCA0 */ s16 prevPlShapeAngle; + /* 0xCA4 */ dMsgFlow_c msgFlow; /* 0xCF0 */ u8 field_0xcf0[0xcf5 - 0xcf0]; - /* 0xCF5 */ u8 field_0xcf5; + /* 0xCF5 */ u8 hioInit; }; STATIC_ASSERT(sizeof(e_mk_class) == 0xcf8); diff --git a/include/d/actor/d_a_e_mk_bo.h b/include/d/actor/d_a_e_mk_bo.h index b532df2e23..b53fe1c904 100644 --- a/include/d/actor/d_a_e_mk_bo.h +++ b/include/d/actor/d_a_e_mk_bo.h @@ -12,7 +12,8 @@ * * @details * - */ +*/ + class e_mk_bo_class { public: /* 0x000 */ fopEn_enemy_c enemy; @@ -21,7 +22,7 @@ public: /* 0x5B8 */ Z2SoundObjSimple sound; /* 0x5D8 */ s16 counter; /* 0x5DA */ s16 action; - /* 0x5DC */ s16 field_0x5dc; + /* 0x5DC */ s16 mode; /* 0x5E0 */ cXyz field_0x5e0; /* 0x5EC */ s16 field_0x5ec; /* 0x5EE */ s16 field_0x5ee; |
