mirror of https://github.com/zeldaret/tp.git
d_a_b_mgn (Dark Beast Ganon) (#2348)
* Started work on d_a_b_mgn * Finished some of the smaller functions * A lot of work on the set_Effect methods * Work on CreateHeap * Work on calcBloodMove * Work on setHideSmokeEffect and _delete * damage_check at 50% * demo_skip 94% matching * Work on some execute functions and a couple others * Worked on last few functions and general cleanup * Cleanup for pull request * Last few pr review comments addressed
This commit is contained in:
Carco_21
GitHub
parent
137fe8b8df
commit
fcf83b895b
|
|
@ -1,22 +1,51 @@
|
|||
#ifndef D_A_B_MGN_H
|
||||
#define D_A_B_MGN_H
|
||||
|
||||
#include "d/d_bg_s_acch.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
|
||||
/**
|
||||
* @ingroup actors-enemies
|
||||
* @class daB_MGN_c
|
||||
* @brief Beast Ganon?
|
||||
* @brief Beast Ganon
|
||||
*
|
||||
* @details Hyrule Castle dungeon boss.
|
||||
*
|
||||
*/
|
||||
|
||||
class daB_MGN_HIO_c
|
||||
#ifdef DEBUG
|
||||
: public JORReflexible
|
||||
#endif
|
||||
{
|
||||
|
||||
public:
|
||||
/* 8060572C */ daB_MGN_HIO_c();
|
||||
/* 8060F8D0 */ ~daB_MGN_HIO_c();
|
||||
|
||||
#ifdef DEBUG
|
||||
virtual void genMessage(JORMContext*);
|
||||
#endif
|
||||
|
||||
/* 0x08 */ f32 field_0x08; // 1.2f
|
||||
/* 0x0C */ f32 field_0x0c; // 50.0f
|
||||
/* 0x10 */ f32 field_0x10; // 70.0f
|
||||
/* 0x14 */ f32 field_0x14; // 1.0f
|
||||
/* 0x18 */ f32 field_0x18; // 100.0f
|
||||
/* 0x1C */ f32 field_0x1c; // 100.0f
|
||||
/* 0x20 */ f32 field_0x20; // 100.0f
|
||||
/* 0x24 */ f32 field_0x24;
|
||||
/* 0x28 */ f32 field_0x28;
|
||||
/* 0x2C */ f32 field_0x2c;
|
||||
};
|
||||
|
||||
class daB_MGN_c : public fopEn_enemy_c {
|
||||
public:
|
||||
/* 8060577C */ void ctrlJoint(J3DJoint*, J3DModel*);
|
||||
/* 8060584C */ void JointCallBack(J3DJoint*, int);
|
||||
/* 80605898 */ void draw();
|
||||
/* 8060577C */ int ctrlJoint(J3DJoint*, J3DModel*);
|
||||
/* 8060584C */ static int JointCallBack(J3DJoint*, int);
|
||||
/* 80605898 */ int draw();
|
||||
/* 80605D78 */ void setDashSmokeEffect();
|
||||
/* 8060601C */ void setBackJumpEffect();
|
||||
/* 806062C0 */ void setSlideSmokeEffect();
|
||||
|
|
@ -26,21 +55,21 @@ public:
|
|||
/* 8060688C */ void setFallAttackEffect();
|
||||
/* 80606A10 */ void setHeadLightEffect();
|
||||
/* 80606AEC */ void setHeadHitEffect();
|
||||
/* 80606C6C */ void setHideSmokeEffect(cXyz*, u8);
|
||||
/* 80606C6C */ int setHideSmokeEffect(cXyz*, u8);
|
||||
/* 80606D60 */ void calcHideSmokeEffect();
|
||||
/* 806071C4 */ void drawHideSmokeEffect();
|
||||
/* 8060729C */ void setBloodEffect();
|
||||
/* 80607498 */ void calcBloodMove();
|
||||
/* 8060778C */ void checkDownBeforeBG();
|
||||
/* 80607924 */ void setBck(int, u8, f32, f32);
|
||||
/* 806079CC */ void checkBck(int);
|
||||
/* 806079CC */ BOOL checkBck(int);
|
||||
/* 80607A2C */ void setActionMode(int, int);
|
||||
/* 80607A80 */ void setExitMode(int);
|
||||
/* 80607B50 */ void onBodyShield();
|
||||
/* 80607B80 */ void offBodyShield();
|
||||
/* 80607BB0 */ void onBodySlideAt();
|
||||
/* 80607BB0 */ void onBodySlideAt();
|
||||
/* 80607BFC */ void offBodySlideAt();
|
||||
/* 80607C20 */ void checkHitSlideAt();
|
||||
/* 80607C20 */ bool checkHitSlideAt();
|
||||
/* 80607CB0 */ void onBodyFallAt();
|
||||
/* 80607CE4 */ void offBodyFallAt();
|
||||
/* 80607D08 */ void onBodyCo();
|
||||
|
|
@ -58,7 +87,7 @@ public:
|
|||
/* 8060B430 */ void executeWarp();
|
||||
/* 8060B544 */ void executeFall();
|
||||
/* 8060BE6C */ void demo_skip(int);
|
||||
/* 8060C034 */ void DemoSkipCallBack(void*, int);
|
||||
/* 8060C034 */ static int DemoSkipCallBack(void*, int);
|
||||
/* 8060C068 */ void executeOpening();
|
||||
/* 8060D078 */ void executeDeath();
|
||||
/* 8060D880 */ void executeJump();
|
||||
|
|
@ -66,26 +95,116 @@ public:
|
|||
/* 8060DDA0 */ void action();
|
||||
/* 8060E158 */ void mtx_set();
|
||||
/* 8060E1D0 */ void cc_set();
|
||||
/* 8060E820 */ void execute();
|
||||
/* 8060EA38 */ void _delete();
|
||||
/* 8060EAE0 */ void CreateHeap();
|
||||
/* 8060F0D0 */ void create();
|
||||
/* 8060E820 */ int execute();
|
||||
/* 8060EA38 */ int _delete();
|
||||
/* 8060EAE0 */ int CreateHeap();
|
||||
/* 8060F0D0 */ int create();
|
||||
|
||||
bool isDown() { return field_0xb01 != 0; }
|
||||
|
||||
private:
|
||||
/* 0x05AC */ u8 field_0x5ac[0xB01 - 0x5AC];
|
||||
/* 0x05AC */ request_of_phase_process_class field_0x5ac;
|
||||
/* 0x05B4 */ request_of_phase_process_class field_0x5b4;
|
||||
/* 0x05BC */ mDoExt_McaMorfSO* mpModelMorf;
|
||||
/* 0x05C0 */ mDoExt_brkAnm* field_0x5c0;
|
||||
/* 0x05C4 */ mDoExt_btkAnm* field_0x5c4;
|
||||
/* 0x05C8 */ f32 field_0x5c8;
|
||||
/* 0x05CC */ u8 field_0x5cc;
|
||||
/* 0x05CD */ u8 field_0x5cd[0x5cf - 0x5cd];
|
||||
/* 0x05D0 */ J3DModel* field_0x5d0[20];
|
||||
/* 0x0620 */ cXyz field_0x620[20];
|
||||
/* 0x0714 */ cXyz field_0x710[20];
|
||||
/* 0x0800 */ cXyz field_0x800[20];
|
||||
/* 0x08F0 */ f32 field_0x8f0[20];
|
||||
/* 0x0940 */ u8 field_0x940[0x990 - 0x940];
|
||||
/* 0x0990 */ int field_0x990[20];
|
||||
/* 0x09E0 */ Z2CreatureEnemy mSound;
|
||||
/* 0x0A84 */ cXyz field_0xa84;
|
||||
/* 0x0A90 */ s16 field_0xa90;
|
||||
/* 0x0A92 */ s16 field_0xa92;
|
||||
/* 0x0A94 */ u32 field_0xa94;
|
||||
/* 0x0A98 */ u16 field_0xa98;
|
||||
/* 0x0A9A */ u8 field_0xa9a[0xa9c - 0xa9a];
|
||||
/* 0x0A9C */ int field_0xa9c;
|
||||
/* 0x0AA0 */ int field_0xaa0;
|
||||
/* 0x0AA4 */ int field_0xaa4;
|
||||
/* 0x0AA8 */ int field_0xaa8;
|
||||
/* 0x0AAC */ int field_0xaac;
|
||||
/* 0x0AB0 */ cXyz field_0xab0;
|
||||
/* 0x0ABC */ cXyz field_0xabc;
|
||||
/* 0x0AC8 */ cXyz field_0xac8;
|
||||
/* 0x0AD4 */ f32 field_0xad4;
|
||||
/* 0x0AD4 */ f32 field_0xad8;
|
||||
/* 0x0ADC */ f32 field_0xadc;
|
||||
/* 0x0AE0 */ s16 field_0xae0;
|
||||
/* 0x0AE2 */ s16 field_0xae2;
|
||||
/* 0x0AE4 */ u8 field_0xae4[0xae8 - 0xae4];
|
||||
/* 0x0AE8 */ f32 field_0xae8;
|
||||
/* 0x0AEC */ u8 field_0xaec[0xaf0 - 0xaec];
|
||||
/* 0x0AF0 */ f32 field_0xaf0;
|
||||
/* 0x0AF4 */ f32 field_0xaf4;
|
||||
/* 0x0AF8 */ u8 field_0xaf8;
|
||||
/* 0x0AF9 */ u8 field_0xaf9;
|
||||
/* 0x0AFA */ u8 field_0xafa;
|
||||
/* 0x0AFB */ u8 field_0xafb;
|
||||
/* 0x0AFC */ u8 field_0xafc;
|
||||
/* 0x0AFD */ u8 field_0xafd;
|
||||
/* 0x0AFE */ u8 field_0xafe;
|
||||
/* 0x0AFF */ u8 field_0xaff;
|
||||
/* 0x0B00 */ u8 field_0xb00;
|
||||
/* 0x0B01 */ u8 field_0xb01;
|
||||
/* 0x0B02 */ u8 field_0xb02[0x26CC - 0xB02];
|
||||
/* 0x0B02 */ u8 field_0xb02;
|
||||
/* 0x0B03 */ u8 field_0xb03;
|
||||
/* 0x0B04 */ u8 field_0xb04;
|
||||
/* 0x0B05 */ u8 field_0xb05;
|
||||
/* 0x0B06 */ u8 field_0xb06;
|
||||
/* 0x0B07 */ u8 field_0xb07;
|
||||
/* 0x0B06 */ u8 field_0xb08;
|
||||
/* 0x0B09 */ u8 field_0xb09;
|
||||
/* 0x0B0A */ u8 field_0xb0a;
|
||||
/* 0x0B0B */ u8 field_0xb0b;
|
||||
/* 0x0B0C */ u8 field_0xb0c;
|
||||
/* 0x0B0D */ u8 field_0xb0d[0xB10 - 0xB0d];
|
||||
/* 0x0B10 */ int field_0xb10;
|
||||
/* 0x0B14 */ s16 field_0xb14;
|
||||
/* 0x0B16 */ s16 field_0xb16;
|
||||
/* 0x0B18 */ s16 field_0xb18;
|
||||
/* 0x0B1A */ u8 field_0xb1a;
|
||||
/* 0x0B1C */ dBgS_AcchCir field_0xb1c;
|
||||
/* 0x0B5C */ dBgS_ObjAcch field_0xb5c;
|
||||
/* 0x0D34 */ dCcD_Stts field_0xd34;
|
||||
/* 0x0D70 */ dCcD_Sph field_0xd70[15];
|
||||
/* 0x1FB8 */ u32 field_0x1fb8;
|
||||
/* 0x1FBC */ dCcD_Sph field_0x1fbc;
|
||||
/* 0x20F4 */ dCcD_Sph field_0x20f4[2];
|
||||
/* 0x2364 */ dCcD_Sph field_0x2364[2];
|
||||
/* 0x25D4 */ u32 field_0x25d4;
|
||||
/* 0x25D4 */ u8 field_0x25d8[0x25dc - 0x25d8];
|
||||
/* 0x25DC */ Z2CreatureEnemy* field_0x25dc;
|
||||
/* 0x25E0 */ u8 field_0x25e0[0x25f0 - 0x25e0];
|
||||
/* 0x25F0 */ u16 field_0x25f0;
|
||||
/* 0x25F2 */ u8 field_0x25f2;
|
||||
/* 0x25F3 */ u8 field_0x25f3;
|
||||
/* 0x25F4 */ u8 field_0x25f4[0x25f8 - 0x25f4];
|
||||
/* 0x25F8 */ u32 field_0x25f8[4];
|
||||
/* 0x2608 */ u32 field_0x2608[4];
|
||||
/* 0x2618 */ u32 field_0x2618;
|
||||
/* 0x261C */ u32 field_0x261c;
|
||||
/* 0x2620 */ u32 field_0x2620;
|
||||
/* 0x2624 */ mDoExt_McaMorfSO* field_0x2624[4];
|
||||
/* 0x2634 */ mDoExt_brkAnm* field_0x2634[4];
|
||||
/* 0x2644 */ mDoExt_brkAnm* field_0x2644[4];
|
||||
/* 0x2654 */ mDoExt_btkAnm* field_0x2654[4];
|
||||
/* 0x2664 */ cXyz field_0x2664[4];
|
||||
/* 0x2670 */ u8 field_0x2694[0x26b4 - 0x2694];
|
||||
/* 0x26B4 */ u8 field_0x26b4[4];
|
||||
/* 0x26B8 */ u8 field_0x26b8[4];
|
||||
/* 0x26BC */ u8 field_0x26bc[4];
|
||||
/* 0x26C0 */ s16 field_0x26c0[4];
|
||||
/* 0x26C8 */ u8 field_0x26c8;
|
||||
/* 0x26C9 */ u8 field_0x26c9[0x26cc - 0x26c9];
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daB_MGN_c) == 0x26cc);
|
||||
|
||||
class daB_MGN_HIO_c {
|
||||
public:
|
||||
/* 8060572C */ daB_MGN_HIO_c();
|
||||
/* 8060F8D0 */ ~daB_MGN_HIO_c();
|
||||
};
|
||||
|
||||
|
||||
#endif /* D_A_B_MGN_H */
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
/**
|
||||
* @ingroup actors-objects
|
||||
* @class daObjBHASHI_c
|
||||
* @brief Morpheel Room Pillar?
|
||||
* @brief Pillar
|
||||
*
|
||||
* @details
|
||||
*
|
||||
|
|
|
|||
|
|
@ -265,6 +265,7 @@ public:
|
|||
bool checkDownFlg() const { return mFlags & 0x1; }
|
||||
bool checkCutDownHitFlg() const { return mFlags & 0x2; }
|
||||
bool checkDeadFlg() const { return mFlags & 0x8; }
|
||||
bool checkThrowMode(u8 param_1) const { return mThrowMode & param_1; }
|
||||
|
||||
u32* getMidnaBindID(int i_idx) { return mMidnaBindID + i_idx; }
|
||||
u8 getMidnaBindMode() { return mMidnaBindMode; }
|
||||
|
|
@ -285,6 +286,7 @@ public:
|
|||
void offDownFlg() { mFlags &= ~0x17; }
|
||||
void offWolfNoLock() { mFlags &= ~0x200; }
|
||||
void offHeadLockFlg() { mFlags &= ~0x80; }
|
||||
void offThrowMode(u8 throwMode) { mThrowMode &= throwMode; }
|
||||
|
||||
void setMidnaBindMode(u8 i_bindMode) { mMidnaBindMode = i_bindMode; }
|
||||
void setMidnaBindID(u8 i_idx, u32 i_bindID) { mMidnaBindID[i_idx] = i_bindID; }
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue