mirror of https://github.com/zeldaret/tp.git
d_a_b_mgn debug almost equivalent (#2842)
* debug almost equivalent * PR cleanup
This commit is contained in:
Carco_21
GitHub
parent
8d362b7e14
commit
4d4444ca18
|
|
@ -295,5 +295,5 @@ lbl_139_data_440 = .data:0x00000440; // type:object size:0x24
|
|||
@123083 = .data:0x0000066C; // type:object size:0x11 scope:local data:string
|
||||
@123084 = .data:0x00000694; // type:object size:0xD scope:local data:string
|
||||
lbl_139_data_6A1 = .data:0x000006A1; // type:object size:0x93
|
||||
lbl_139_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
|
||||
l_initHIO = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte
|
||||
l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
*
|
||||
* @details Hyrule Castle dungeon boss.
|
||||
*
|
||||
*/
|
||||
*/
|
||||
|
||||
class daB_MGN_c : public fopEn_enemy_c {
|
||||
public:
|
||||
|
|
@ -89,8 +89,8 @@ public:
|
|||
/* 8060EAE0 */ int CreateHeap();
|
||||
/* 8060F0D0 */ int create();
|
||||
|
||||
bool isDown() { return field_0xb01 != 0; }
|
||||
bool isAppear() { return field_0xb05 != 0; }
|
||||
bool isDown() { return mDownFlag != 0; }
|
||||
bool isAppear() { return mAppearFlag != 0; }
|
||||
|
||||
private:
|
||||
/* 0x05AC */ request_of_phase_process_class mMgnPhase;
|
||||
|
|
@ -111,18 +111,18 @@ private:
|
|||
/* 0x0A84 */ cXyz field_0xa84;
|
||||
/* 0x0A90 */ s16 field_0xa90;
|
||||
/* 0x0A92 */ s16 field_0xa92;
|
||||
/* 0x0A94 */ u32 field_0xa94;
|
||||
/* 0x0A94 */ u32 mShadowKey;
|
||||
/* 0x0A98 */ u16 mDamageInvulnerabilityTimer;
|
||||
/* 0x0A9C */ int field_0xa9c;
|
||||
/* 0x0AA0 */ int field_0xaa0;
|
||||
/* 0x0AA4 */ int field_0xaa4;
|
||||
/* 0x0AA4 */ int mBloodEffTimer;
|
||||
/* 0x0AA8 */ int field_0xaa8;
|
||||
/* 0x0AAC */ int field_0xaac;
|
||||
/* 0x0AB0 */ cXyz mNextGdgatePos;
|
||||
/* 0x0ABC */ cXyz mDemoCamEye;
|
||||
/* 0x0AC8 */ cXyz mDemoCamCenter;
|
||||
/* 0x0AD4 */ f32 mDemoCamFovy;
|
||||
/* 0x0AD4 */ f32 field_0xad8;
|
||||
/* 0x0AD4 */ f32 mDemoCamEyeStep;
|
||||
/* 0x0ADC */ f32 field_0xadc;
|
||||
/* 0x0AE0 */ s16 field_0xae0;
|
||||
/* 0x0AE2 */ s16 field_0xae2;
|
||||
|
|
@ -134,34 +134,33 @@ private:
|
|||
/* 0x0AF8 */ u8 mKankyoColMode;
|
||||
/* 0x0AF9 */ u8 mActionMode;
|
||||
/* 0x0AFA */ u8 mMoveMode;
|
||||
/* 0x0AFB */ u8 field_0xafb;
|
||||
/* 0x0AFC */ u8 field_0xafc;
|
||||
/* 0x0AFB */ u8 mSwBit;
|
||||
/* 0x0AFC */ u8 mLeftRightFlag;
|
||||
/* 0x0AFD */ u8 field_0xafd;
|
||||
/* 0x0AFE */ u8 field_0xafe;
|
||||
/* 0x0AFF */ u8 field_0xaff;
|
||||
/* 0x0B00 */ u8 field_0xb00;
|
||||
/* 0x0B01 */ u8 field_0xb01;
|
||||
/* 0x0B01 */ u8 mDownFlag;
|
||||
/* 0x0B02 */ u8 mGdgateNum;
|
||||
/* 0x0B03 */ u8 field_0xb03;
|
||||
/* 0x0B04 */ u8 field_0xb04;
|
||||
/* 0x0B05 */ u8 field_0xb05;
|
||||
/* 0x0B05 */ u8 mAppearFlag;
|
||||
/* 0x0B06 */ u8 field_0xb06;
|
||||
/* 0x0B07 */ u8 field_0xb07;
|
||||
/* 0x0B06 */ u8 field_0xb08;
|
||||
/* 0x0B09 */ u8 field_0xb09;
|
||||
/* 0x0B0A */ u8 field_0xb0a;
|
||||
/* 0x0B09 */ u8 mHeadLightEffFlag;
|
||||
/* 0x0B0A */ u8 mHeadHitEffTimer;
|
||||
/* 0x0B0B */ u8 field_0xb0b;
|
||||
/* 0x0B0C */ u8 field_0xb0c;
|
||||
/* 0x0B10 */ int field_0xb10;
|
||||
/* 0x0B10 */ int mGdgateStatusIdx;
|
||||
/* 0x0B14 */ s16 field_0xb14;
|
||||
/* 0x0B16 */ s16 field_0xb16;
|
||||
/* 0x0B18 */ s16 field_0xb18;
|
||||
/* 0x0B1A */ u8 field_0xb1a;
|
||||
/* 0x0B1C */ dBgS_AcchCir mAcchCir;
|
||||
/* 0x0B5C */ dBgS_ObjAcch mAcch;
|
||||
/* 0x0D34 */ dCcD_Stts mCcStts;
|
||||
/* 0x0D70 */ dCcD_Sph mBodyCcSph[15];
|
||||
/* 0x1FB8 */ u32 field_0x1fb8;
|
||||
/* 0x1FB8 */ u32 mTgType;
|
||||
/* 0x1FBC */ dCcD_Sph mAtSph;
|
||||
/* 0x20F4 */ dCcD_Sph field_0x20f4[2];
|
||||
/* 0x2364 */ dCcD_Sph field_0x2364[2];
|
||||
|
|
@ -177,7 +176,7 @@ private:
|
|||
/* 0x2654 */ mDoExt_btkAnm* mpGdgateBtk[4];
|
||||
/* 0x2664 */ cXyz mGdgatePos[4];
|
||||
/* 0x2670 */ u8 field_0x2694[0x26a4 - 0x2694];
|
||||
/* 0x26A4 */ u32 field_0x26a4[4];
|
||||
/* 0x26A4 */ u32 mGdgateStartEffID[4];
|
||||
/* 0x26B4 */ u8 field_0x26b4[4];
|
||||
/* 0x26B8 */ u8 mGdgateStatus[4];
|
||||
/* 0x26BC */ u8 mGdgateType[4];
|
||||
|
|
|
|||
|
|
@ -1174,7 +1174,7 @@ public:
|
|||
// static void onWolfEnemyCatch(fopAc_ac_c* i_actorP) { onWolfEnemyBiteAll(i_actorP,8);}
|
||||
|
||||
bool checkWolfEnemyCatchOwn(fopAc_ac_c* i_actorP) { return checkWolfEnemyBiteAllOwn(i_actorP); }
|
||||
bool checkWolfEnemyHangBiteOwn(fopAc_ac_c* i_actorP) const { return checkWolfEnemyBiteAllOwn(i_actorP); }
|
||||
bool checkWolfEnemyHangBiteOwn(const fopAc_ac_c* i_actorP) const { return checkWolfEnemyBiteAllOwn(i_actorP); }
|
||||
bool checkWolfEnemyLeftThrow() const { return checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); }
|
||||
|
||||
void onWolfLightDropGet() {
|
||||
|
|
|
|||
|
|
@ -311,13 +311,13 @@ public:
|
|||
|
||||
bool checkWolfNoLock() const { return mFlags & fopEn_flag_WolfNoLock; }
|
||||
bool checkHeadLockFlg() const { return mFlags & fopEn_flag_HeadLock; }
|
||||
bool checkWolfBiteDamage() const { return mFlags & fopEn_flag_WolfBiteDamage; }
|
||||
BOOL checkWolfBiteDamage() const { return mFlags & fopEn_flag_WolfBiteDamage; }
|
||||
bool checkWolfDownPullFlg() const { return mFlags & fopEn_flag_WolfDownPull; }
|
||||
bool checkDownFlg() { return mFlags & fopEn_flag_Down; }
|
||||
bool checkCutDownHitFlg() const { return mFlags & fopEn_flag_CutDownHit; }
|
||||
bool checkWolfDownStartFlg() const { return mFlags & fopEn_flag_WolfDownStart; }
|
||||
bool checkDeadFlg() const { return mFlags & fopEn_flag_Dead; }
|
||||
bool checkThrowMode(u8 param_1) const { return mThrowMode & param_1; }
|
||||
BOOL checkThrowMode(u8 param_1) const { return mThrowMode & param_1; }
|
||||
|
||||
u32* getMidnaBindID(int i_idx) { return mMidnaBindID + i_idx; }
|
||||
u8 getMidnaBindMode() { return mMidnaBindMode; }
|
||||
|
|
@ -332,13 +332,25 @@ public:
|
|||
void onDownFlg() { mFlags |= fopEn_flag_Down; }
|
||||
void onHeadLockFlg() { mFlags |= fopEn_flag_HeadLock; }
|
||||
|
||||
#if DEBUG
|
||||
void offWolfBiteDamage() { mFlags &= (u16)~fopEn_flag_WolfBiteDamage; }
|
||||
#else
|
||||
void offWolfBiteDamage() { mFlags &= ~fopEn_flag_WolfBiteDamage; }
|
||||
#endif
|
||||
void offCutDownHitFlg() { mFlags &= ~fopEn_flag_CutDownHit; }
|
||||
void offWolfDownPullFlg() { mFlags &= ~fopEn_flag_WolfDownPull; }
|
||||
void offDownFlg() { mFlags &= ~(fopEn_flag_WolfDownPull | fopEn_flag_WolfDownStart | fopEn_flag_CutDownHit | fopEn_flag_Down); }
|
||||
#if DEBUG
|
||||
void offWolfNoLock() { mFlags &= (u16)~fopEn_flag_WolfNoLock; }
|
||||
#else
|
||||
void offWolfNoLock() { mFlags &= ~fopEn_flag_WolfNoLock; }
|
||||
#endif
|
||||
void offHeadLockFlg() { mFlags &= ~fopEn_flag_HeadLock; }
|
||||
void offThrowMode(u8 throwMode) { mThrowMode &= ~throwMode; }
|
||||
#if DEBUG
|
||||
void offThrowMode(u8 throwMode) { mThrowMode &= (u8)~throwMode; }
|
||||
#else
|
||||
void offThrowMode(u8 throwMode) { mThrowMode &= ~(throwMode & 0xFF); }
|
||||
#endif
|
||||
|
||||
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