mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-17 13:00:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bosses: Demo matches + more cleanup (#972)

Browse Source 
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
This commit is contained in:
123456789758
2026-05-07 22:58:39 -04:00
committed by GitHub
parent 0bff98c469
commit e0d06d07c5
15 changed files with 2890 additions and 2693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_bmd.h
+10 -10
View File
@@ -11,15 +11,15 @@
struct bmd_class {
/* 0x000 */ fopEn_enemy_c actor;
/* 0x2AC */ request_of_phase_process_class mPhs;
/* 0x2B4 */ mDoExt_McaMorf* mpMorf;
/* 0x2B4 */ mDoExt_McaMorf* mpBodyMorf;
/* 0x2B8 */ mDoExt_brkAnm* mpBrkAnm;
/* 0x2BC */ mDoExt_btkAnm* mpBtkAnm;
/* 0x2C0 */ mDoExt_McaMorf* m2C0;
/* 0x2C4 */ mDoExt_McaMorf* m2C4;
/* 0x2C8 */ mDoExt_McaMorf* m2C8;
/* 0x2CC */ J3DModel* m2CC;
/* 0x2D0 */ J3DModel* m2D0;
/* 0x2D4 */ mDoExt_brkAnm* m2D4;
/* 0x2C0 */ mDoExt_McaMorf* mpHeadMorf;
/* 0x2C4 */ mDoExt_McaMorf* mpHeadDeadMorf;
/* 0x2C8 */ mDoExt_McaMorf* mpMakarMorf;
/* 0x2CC */ J3DModel* mpMakarFaceModel;
/* 0x2D0 */ J3DModel* mpR00_EFModel;
/* 0x2D4 */ mDoExt_brkAnm* mpR00_EFBrk;
/* 0x2D8 */ f32 m2D8;
/* 0x2DC */ s8 m2DC;
/* 0x2DD */ u8 m2DD[0x2E0 - 0x2DD];
@@ -76,12 +76,12 @@ struct bmd_class {
/* 0xA88 */ s16 mA88[2];
/* 0xA8C */ s16 mA8C;
/* 0xA8E */ u8 mA8E[0xA90 - 0xA8E];
/* 0xA90 */ dPa_smokeEcallBack mA90[7];
/* 0xA90 */ dPa_smokeEcallBack mSmokeCb[7];
/* 0xB70 */ u8 mB70;
/* 0xB71 */ s8 mB71;
#if VERSION > VERSION_DEMO
#if VERSION > VERSION_DEMO
/* 0xB72 */ s16 mB72;
#endif
#endif
/* 0xB74 */ s16 mB74;
/* 0xB76 */ s16 mB76;
/* 0xB78 */ s16 mB78;
include/d/actor/d_a_bmdfoot.h
+11 -13
View File
@@ -5,12 +5,10 @@
#include "d/d_particle.h"
#include "f_op/f_op_actor.h"
class bmdfoot_class {
public:
/* 0x000 */ fopAc_ac_c actor;
/* 0x290 */ u8 m290[0x2AC - 0x290];
/* 0x2AC */ request_of_phase_process_class m2AC;
/* 0x2B4 */ mDoExt_McaMorf* m2B4;
struct bmdfoot_class {
/* 0x000 */ fopEn_enemy_c actor;
/* 0x2AC */ request_of_phase_process_class mPhase;
/* 0x2B4 */ mDoExt_McaMorf* mpBodyVineMorf;
/* 0x2B8 */ s16 m2B8;
/* 0x2BA */ s16 m2BA;
/* 0x2BC */ s16 m2BC;
@@ -25,15 +23,15 @@ public:
/* 0x3F4 */ u8 m3F4;
/* 0x3F5 */ u8 m3F5[0x3F8 - 0x3F5];
/* 0x3F8 */ cXyz m3F8[3];
/* 0x41C */ dPa_followEcallBack m41C[3];
/* 0x458 */ dPa_smokeEcallBack m458[2];
/* 0x41C */ dPa_followEcallBack mAsiWaitFollowCB[3];
/* 0x458 */ dPa_smokeEcallBack mLAttackSmoke00CB[2];
/* 0x498 */ cXyz m498[2];
/* 0x4B0 */ dPa_smokeEcallBack m4B0;
/* 0x4D0 */ dCcD_Stts m4D0;
/* 0x50C */ dCcD_Sph m50C[5];
/* 0x4B0 */ dPa_smokeEcallBack mLAttackSmoke01CB;
/* 0x4D0 */ dCcD_Stts mStts;
/* 0x50C */ dCcD_Sph mSph[5];
/* 0xAE8 */ cXyz mAE8;
/* 0xAF4 */ mDoExt_McaMorf* mAF4;
/* 0xAF8 */ dKy_tevstr_c mAF8;
/* 0xAF4 */ mDoExt_McaMorf* mpFloorVineMorf;
/* 0xAF8 */ dKy_tevstr_c mTevstr;
/* 0xBA8 */ u8 mBA8;
/* 0xBA9 */ u8 mBA9[0xBAC - 0xBA9];
/* 0xBAC */ cXyz mBAC;
include/d/actor/d_a_bmdhand.h
+4 -4
View File
@@ -13,8 +13,8 @@ struct hand_s {
struct bmdhand_class {
/* 0x000 */ fopEn_enemy_c actor;
/* 0x2AC */ request_of_phase_process_class m2AC;
/* 0x2B4 */ mDoExt_McaMorf* m2B4;
/* 0x2AC */ request_of_phase_process_class mPhase;
/* 0x2B4 */ mDoExt_McaMorf* mpMorf;
/* 0x2B8 */ s16 m2B8;
/* 0x2BA */ s16 m2BA;
/* 0x2BC */ s16 m2BC;
@@ -39,8 +39,8 @@ struct bmdhand_class {
/* 0x31C */ f32 m31C;
/* 0x320 */ f32 m320;
/* 0x324 */ hand_s m324[20];
/* 0x554 */ mDoExt_3DlineMat1_c m554;
/* 0x590 */ dCcD_Stts m590;
/* 0x554 */ mDoExt_3DlineMat1_c mLineMat;
/* 0x590 */ dCcD_Stts mStts;
/* 0x5CC */ dCcD_Sph m5CC;
/* 0x6F8 */ dCcD_Sph m6F8;
/* 0x824 */ u8 m824;
include/d/actor/d_a_bpw.h
+21 -54
View File
@@ -7,49 +7,16 @@
#include "d/d_particle.h"
struct bpw_class {
enum Actor_Type_e {
Actor_Type_BODY_e = 0,
Actor_Type_KANTERA_e = 1,
Actor_Type_DAMAGE_BALL_e = 2,
Actor_Type_TORITUKI_e = 3,
};
enum Damage_Action_e {
Damage_Action_LINE_e = 0,
Damage_Action_DAMAGE_BALL_e = 1,
};
enum Action_e {
Action_MOVE_DOUSA_e = 0,
Action_ATTACK_KOUGEKI_e = 1,
Action_BODY_DOWN_KARADA_TAORE_e = 2,
Action_DAMAGE_e = 3,
Action_SEPARATION_BUNRI_DOUSA_e = 4,
Action_START_DEMO_e = 20,
};
enum Action_State_Type_e {
Action_State_DAMAGE_CARRIED_e = 0x54,
Action_State_DAMAGE_THROWN_e = 0x55,
Action_State_DAMAGE_HIT_e = 0x65,
Action_State_SEPARATE_BUNRI_DOUSA_INIT_e = 0x6E,
Action_State_SEPARATE_BUNRI_DOUSA_EXECUTE_e = 0x6F,
Action_State_SEPARATE_BUNRI_DOUSA_END_INIT_e = 0x72,
Action_State_SEPARATE_BUNRI_DOUSA_END_GATHER_e = 0x73,
Action_State_SEPARATE_BUNRI_DOUSA_END_GROW_e = 0x74,
Action_State_SEPARATE_BUNRI_DOUSA_END_FINISH_e = 0x75,
};
/* 0x000 */ fopEn_enemy_c actor;
/* 0x2AC */ request_of_phase_process_class m2AC;
/* 0x2B4 */ mDoExt_McaMorf* mpAnim;
/* 0x2AC */ request_of_phase_process_class mPhase;
/* 0x2B4 */ mDoExt_McaMorf* mpMorf;
/* 0x2B8 */ u8 m2B8[0x2BC - 0x2B8];
/* 0x2BC */ mDoExt_brkAnm* mBrkAnim;
/* 0x2C0 */ mDoExt_brkAnm* mKanteraAnim;
/* 0x2C4 */ mDoExt_brkAnm* m2C4;
/* 0x2C8 */ mDoExt_brkAnm* m2C8;
/* 0x2CC */ mDoExt_brkAnm* m2CC;
/* 0x2D0 */ mDoExt_brkAnm* m2D0;
/* 0x2BC */ mDoExt_brkAnm* mpLightFreezeBrkAnm; // Freezing before falling to the ground
/* 0x2C0 */ mDoExt_brkAnm* mpLanternGlowBrkAnm;
/* 0x2C4 */ mDoExt_brkAnm* mpLightStunBrkAnm; // Hit with light from the Mirror Shield before freezing
/* 0x2C8 */ mDoExt_brkAnm* mpCurseStartBrkAnm; // Falling on Link and inverting the controls
/* 0x2CC */ mDoExt_brkAnm* mpCurseEndBrkAnm;
/* 0x2D0 */ mDoExt_brkAnm* mpDefaultBrkAnm;
/* 0x2D4 */ Mtx m2D4;
/* 0x304 */ cXyz m304[3];
/* 0x328 */ cXyz m328[3];
@@ -73,7 +40,7 @@ struct bpw_class {
/* 0x3DC */ u8 mType;
/* 0x3DD */ u8 mUnknownParam2;
/* 0x3DE */ u8 mLightState;
/* 0x3DF */ u8 m3DF;
/* 0x3DF */ u8 mHitType;
/* 0x3E0 */ u8 m3E0;
/* 0x3E1 */ u8 m3E1;
/* 0x3E2 */ u8 m3E2;
@@ -94,9 +61,9 @@ struct bpw_class {
/* 0x3FC */ fpc_ProcID m3FC;
/* 0x400 */ fpc_ProcID m400;
/* 0x404 */ fpc_ProcID m404;
#if VERSION > VERSION_DEMO
#if VERSION > VERSION_DEMO
/* 0x408 */ s16 m408;
#endif
#endif
/* 0x40C */ cXyz m40C;
/* 0x418 */ cXyz m418;
/* 0x424 */ cXyz m424;
@@ -131,31 +98,31 @@ struct bpw_class {
/* 0x4A4 */ f32 m4A4;
/* 0x4A8 */ f32 m4A8;
/* 0x4AC */ int mChildPoeIds[15];
/* 0x4E8 */ u32 m4E8;
/* 0x4EC */ LIGHT_INFLUENCE m4EC;
#if VERSION == VERSION_DEMO
/* 0x4E8 */ u32 mShadowId;
/* 0x4EC */ LIGHT_INFLUENCE mLightInfluence;
#if VERSION == VERSION_DEMO
/* 0x508 */ JPABaseEmitter* m508_demo;
/* 0x50C */ JPABaseEmitter* m50C_demo;
/* 0x510 */ JPABaseEmitter* m510_demo;
#endif
#endif
/* 0x50C */ dPa_smokeEcallBack m50C;
#if VERSION == VERSION_DEMO
#if VERSION == VERSION_DEMO
/* 0x534 */ JPABaseEmitter* m534_demo;
/* 0x538 */ JPABaseEmitter* m538_demo;
/* 0x53C */ JPABaseEmitter* m53C_demo;
/* 0x540 */ JPABaseEmitter* m540_demo;
#else
#else
/* 0x52C */ dPa_followEcallBack m52C;
/* 0x540 */ dPa_followEcallBack m540;
#endif
#endif
/* 0x554 */ dPa_followEcallBack m554;
/* 0x568 */ dPa_followEcallBack mFire1Dousa_Pa_followEcallBack;
/* 0x57C */ dPa_followEcallBack mFire1Dousa_Pa_followEcallBack2;
/* 0x590 */ dPa_followEcallBack m590;
#if VERSION == VERSION_DEMO
#if VERSION == VERSION_DEMO
/* 0x594 */ JPABaseEmitter* m594_demo;
/* 0x598 */ JPABaseEmitter* m598_demo;
#endif
#endif
/* 0x5A4 */ dPa_followEcallBack mFireDousa2_Pa_followEcallBack;
/* 0x5B8 */ dPa_followEcallBack mFireDousa2_Pa_followEcallBack2;
/* 0x5CC */ dPa_followEcallBack m5CC;
@@ -175,7 +142,7 @@ struct bpw_class {
/* 0x9F4 */ dCcD_Sph mBodyAtSph;
/* 0xB20 */ dCcD_Sph mKanteraCoSph;
/* 0xC4C */ dCcD_Sph mDamageBallCoSph;
/* 0xD78 */ mDoExt_invisibleModel mD78;
/* 0xD78 */ mDoExt_invisibleModel mInvisibleModel;
};
#endif /* D_A_BPW_H */
include/d/actor/d_a_btd.h
+19 -19
View File
@@ -27,17 +27,17 @@ struct btd_sibuki_s {
struct btd_class {
/* 0x0000 */ fopEn_enemy_c actor;
/* 0x02AC */ request_of_phase_process_class m02AC;
/* 0x02B4 */ request_of_phase_process_class m02B4;
/* 0x02BC */ mDoExt_McaMorf* m02BC;
/* 0x02C0 */ mDoExt_btkAnm* btk;
/* 0x02C4 */ mDoExt_brkAnm* brk;
/* 0x02C8 */ mDoExt_McaMorf* m02C8;
/* 0x02CC */ mDoExt_btkAnm* btkS;
/* 0x02D0 */ mDoExt_brkAnm* brkS;
/* 0x02D4 */ mDoExt_McaMorf* m02D4;
/* 0x02D8 */ mDoExt_btkAnm* m02D8;
/* 0x02DC */ mDoExt_brkAnm* m02DC;
/* 0x02AC */ request_of_phase_process_class mPhaseBtd;
/* 0x02B4 */ request_of_phase_process_class mPhaseMagma;
/* 0x02BC */ mDoExt_McaMorf* mpPhase1Morf;
/* 0x02C0 */ mDoExt_btkAnm* btk; // First phase
/* 0x02C4 */ mDoExt_brkAnm* brk; // First phase
/* 0x02C8 */ mDoExt_McaMorf* mpPhase2Morf;
/* 0x02CC */ mDoExt_btkAnm* btkS; // Second phase
/* 0x02D0 */ mDoExt_brkAnm* brkS; // Second phase
/* 0x02D4 */ mDoExt_McaMorf* mpDeadHeadMorf;
/* 0x02D8 */ mDoExt_btkAnm* mpDeadHeadBtkAnm;
/* 0x02DC */ mDoExt_brkAnm* mpDeadHeadBrkAnm;
/* 0x02E0 */ u8 m02E0;
/* 0x02E1 */ s8 m02E1;
/* 0x02E2 */ s16 m02E2;
@@ -57,12 +57,12 @@ struct btd_class {
/* 0x02FA */ s16 m02FA;
/* 0x02FC */ cXyz m02FC[19];
/* 0x03E0 */ cXyz m03E0;
/* 0x03EC */ dCcD_Stts m03EC;
/* 0x0428 */ dCcD_Sph m0428[19];
/* 0x1A6C */ dCcD_Sph m1A6C;
/* 0x1B98 */ dCcD_Sph m1B98;
/* 0x1CC4 */ dCcD_Sph m1CC4[50];
/* 0x575C */ dCcD_Cyl m575C[6];
/* 0x03EC */ dCcD_Stts mStts;
/* 0x0428 */ dCcD_Sph mAtSphs[19];
/* 0x1A6C */ dCcD_Sph mEyeSph;
/* 0x1B98 */ dCcD_Sph mFireSph;
/* 0x1CC4 */ dCcD_Sph mSibukiSphs[50];
/* 0x575C */ dCcD_Cyl mHandCyls[6];
/* 0x5E7C */ u8 m5E7C;
/* 0x5E7D */ u8 m5E7D[0x5E80 - 0x5E7D];
/* 0x5E80 */ f32 m5E80;
@@ -97,7 +97,7 @@ struct btd_class {
/* 0x6048 */ csXyz m6048;
/* 0x604E */ u8 m604E[0x6050 - 0x604E];
/* 0x6050 */ dPa_smokeEcallBack mPa_SmokeEcallBack[3];
/* 0x60B0 */ LIGHT_INFLUENCE m60B0;
/* 0x60B0 */ LIGHT_INFLUENCE mLightInfluence;
/* 0x60D0 */ f32 m60D0;
/* 0x60D4 */ f32 m60D4;
/* 0x60D8 */ u8 m60D8;
@@ -106,7 +106,7 @@ struct btd_class {
/* 0x60DB */ u8 mKankyoState;
/* 0x60DC */ s16 mKankyoTimer;
/* 0x60DE */ u8 m60DE[0x60E0 - 0x60DE];
/* 0x60E0 */ dKy_tevstr_c m60E0;
/* 0x60E0 */ dKy_tevstr_c mTevstr;
/* 0x6190 */ u8 m6190;
/* 0x6191 */ u8 m6191[0x6194 - 0x6191];
/* 0x6194 */ btd_hahen_s hahen[35];
include/d/actor/d_a_bwd.h
+21 -17
View File
@@ -20,14 +20,14 @@ struct bwd_class {
/* 0x02B4 */ request_of_phase_process_class mPhaseBwds;
/* 0x02BC */ u8 m02BC;
/* 0x02BD */ u8 m02BD[0x02BF - 0x02BD];
/* 0x02C0 */ mDoExt_McaMorf* m02C0;
/* 0x02C4 */ mDoExt_brkAnm* m02C4;
/* 0x02C0 */ mDoExt_McaMorf* mpHeadMorf;
/* 0x02C4 */ mDoExt_brkAnm* mpHeadBrkAnm;
/* 0x02C8 */ f32 m02C8;
/* 0x02CC */ J3DModel* m02CC;
/* 0x02D0 */ u8 m02D0[0x02D4 - 0x02D0];
/* 0x02D4 */ J3DModel* m02D4[20];
/* 0x02D4 */ J3DModel* mpBodyModel[20];
/* 0x0324 */ J3DModel* m0324[20];
/* 0x0374 */ mDoExt_brkAnm* m0374[20];
/* 0x0374 */ mDoExt_brkAnm* mpBodyMorf[20];
/* 0x0374 */ f32 m03C4[20];
/* 0x0414 */ s32 m0414;
/* 0x0418 */ cXyz m0418[20];
@@ -51,14 +51,14 @@ struct bwd_class {
/* 0x17EA */ u8 m17EA[0x17EC - 0x17EA];
/* 0x17EC */ J3DModel* m17EC[2];
/* 0x17F4 */ mDoExt_btkAnm* m17F4[2];
/* 0x17FC */ Mtx m17FC[2];
/* 0x185C */ dBgW* m185C[2];
/* 0x17FC */ Mtx mBgwMtx1[2];
/* 0x185C */ dBgW* mpBgW1[2];
/* 0x1864 */ s8 m1864;
/* 0x1865 */ s8 m1865;
/* 0x1866 */ u8 m1866[0x1868 - 0x1866];
/* 0x1868 */ J3DModel* m1868;
/* 0x186C */ Mtx m186C;
/* 0x189C */ dBgW* m189C;
/* 0x1868 */ J3DModel* mpTriforcePlatformModel;
/* 0x186C */ Mtx mBgwMtx2;
/* 0x189C */ dBgW* mpBgW2;
/* 0x18A0 */ cXyz m18A0;
/* 0x18AC */ s16 m18AC;
/* 0x18AE */ s16 m18AE;
@@ -83,7 +83,7 @@ struct bwd_class {
/* 0x1900 */ s16 m1900;
/* 0x1902 */ s16 m1902;
/* 0x1904 */ s32 m1904;
/* 0x1908 */ sita_s m1908[32];
/* 0x1908 */ sita_s mTongueSegments[32];
/* 0x1B88 */ cXyz m1B88;
/* 0x1B94 */ cXyz m1B94;
/* 0x1BA0 */ f32 m1BA0;
@@ -103,10 +103,10 @@ struct bwd_class {
#if VERSION == VERSION_USA
/* 0x1BC0 */ fpc_ProcID m1BC0;
#endif
/* 0x1BC4 */ dCcD_Stts mCcD_Stts;
/* 0x1C00 */ dCcD_Sph mDamageSpheres[19];
/* 0x3244 */ dCcD_Sph mCcD_Sph;
/* 0x3370 */ dCcD_Sph mCcD_Sph_Array5[5];
/* 0x1BC4 */ dCcD_Stts mStts;
/* 0x1C00 */ dCcD_Sph mBodySph[19];
/* 0x3244 */ dCcD_Sph mTongueSph;
/* 0x3370 */ dCcD_Sph mTongueCoSph[5];
/* 0x394C */ s8 m394C;
/* 0x394D */ u8 m394D[0x3954 - 0x394D];
/* 0x3954 */ cXyz m3954;
@@ -128,9 +128,9 @@ struct bwd_class {
/* 0x3B08 */ s8 m3B08[2];
/* 0x3B0A */ u8 m3B0A[0x3B0C - 0x3B0A];
/* 0x3B0C */ cXyz m3B0C[2];
/* 0x3B24 */ mDoExt_McaMorf* m3B24[2];
/* 0x3B34 */ mDoExt_btkAnm* m3B2C[2];
/* 0x3B34 */ mDoExt_brkAnm* m3B34[2];
/* 0x3B24 */ mDoExt_McaMorf* mpGspMorf[2];
/* 0x3B34 */ mDoExt_btkAnm* mpGspBtkAnm[2];
/* 0x3B34 */ mDoExt_brkAnm* mpGspBrkAnm[2];
/* 0x3B3C */ f32 m3B3C;
/* 0x3B40 */ f32 m3B40;
/* 0x3B44 */ f32 m3B44;
@@ -140,12 +140,16 @@ struct bwd_class {
/* 0x3C15 */ s8 m3C15;
/* 0x3C16 */ u8 m3C16[0x3C18 - 0x3C16];
/* 0x3C18 */ f32 m3C18;
#if VERSION > VERSION_DEMO
/* 0x3C1C */ s16 m3C1C;
#endif
/* 0x3C1E */ s16 m3C1E;
/* 0x3C20 */ s16 m3C20;
/* 0x3C22 */ s16 m3C22;
/* 0x3C24 */ s8 m3C24;
#if VERSION > VERSION_DEMO
/* 0x3C25 */ u8 m3C25[0x3C28 - 0x3C25];
#endif
/* 0x3C28 */ cXyz m3C28;
/* 0x3C34 */ cXyz m3C34;
/* 0x3C40 */ u8 m3C40[0x3C44 - 0x3C40];