mirror of https://github.com/zeldaret/tp.git
d_a_e_zh almost equivalent (#2548)
* work on create function * a bit more work * almost all functions worked on * All functions worked on and enums added * Fixed header brief * Can't figure out the last three small issues
This commit is contained in:
parent
ea1c649eb1
commit
7d4ec88f56
|
@ -1,29 +1,36 @@
|
||||||
#ifndef D_A_E_ZH_H
|
#ifndef D_A_E_ZH_H
|
||||||
#define D_A_E_ZH_H
|
#define D_A_E_ZH_H
|
||||||
|
|
||||||
|
#include "d/d_bg_s_acch.h"
|
||||||
|
#include "d/d_cc_d.h"
|
||||||
|
#include "d/d_cc_uty.h"
|
||||||
#include "f_op/f_op_actor_mng.h"
|
#include "f_op/f_op_actor_mng.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ingroup actors-enemies
|
* @ingroup actors-enemies
|
||||||
* @class daE_ZH_c
|
* @class daE_ZH_c
|
||||||
* @brief Zant Head
|
* @brief Ball Master
|
||||||
*
|
*
|
||||||
* @details
|
* @details
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
class daObjCarry_c;
|
||||||
|
|
||||||
class daE_ZH_c : public fopEn_enemy_c {
|
class daE_ZH_c : public fopEn_enemy_c {
|
||||||
/* 8082907C */ void draw();
|
public:
|
||||||
|
/* 8082907C */ int draw();
|
||||||
/* 808293A8 */ void setBck(int, u8, f32, f32);
|
/* 808293A8 */ void setBck(int, u8, f32, f32);
|
||||||
/* 80829454 */ void setActionMode(int, int);
|
/* 80829454 */ void setActionMode(int, int);
|
||||||
/* 80829570 */ void startDemoCheck();
|
/* 80829570 */ bool startDemoCheck();
|
||||||
/* 80829658 */ void mBallBGCheck();
|
/* 80829658 */ void mBallBGCheck();
|
||||||
/* 808298BC */ void mGateOpen();
|
/* 808298BC */ void mGateOpen();
|
||||||
/* 808299F8 */ void mColorSet(bool, f32, f32);
|
/* 808299F8 */ bool mColorSet(bool, f32, f32);
|
||||||
/* 80829AD8 */ void mReturnLineMove();
|
/* 80829AD8 */ bool mReturnLineMove();
|
||||||
/* 80829E44 */ void mBallBgLineCheck();
|
/* 80829E44 */ bool mBallBgLineCheck();
|
||||||
/* 8082A01C */ void mSearchMove(u8);
|
/* 8082A01C */ bool mSearchMove(u8);
|
||||||
/* 8082A390 */ void mStartParticleSet();
|
/* 8082A390 */ void mStartParticleSet();
|
||||||
/* 8082A4C8 */ void mCutTypeCheck();
|
/* 8082A4C8 */ bool mCutTypeCheck();
|
||||||
/* 8082A534 */ void damage_check();
|
/* 8082A534 */ void damage_check();
|
||||||
/* 8082A88C */ void executeStartDemo();
|
/* 8082A88C */ void executeStartDemo();
|
||||||
/* 8082ABDC */ void executeWait();
|
/* 8082ABDC */ void executeWait();
|
||||||
|
@ -42,22 +49,83 @@ class daE_ZH_c : public fopEn_enemy_c {
|
||||||
/* 8082DB84 */ void action();
|
/* 8082DB84 */ void action();
|
||||||
/* 8082DE18 */ void mtx_set();
|
/* 8082DE18 */ void mtx_set();
|
||||||
/* 8082DF44 */ void cc_set();
|
/* 8082DF44 */ void cc_set();
|
||||||
/* 8082E2FC */ void execute();
|
/* 8082E2FC */ int execute();
|
||||||
/* 8082E3E8 */ void _delete();
|
/* 8082E3E8 */ int _delete();
|
||||||
/* 8082E4E4 */ void CreateHeap();
|
/* 8082E4E4 */ int CreateHeap();
|
||||||
/* 8082E730 */ void create();
|
/* 8082E730 */ cPhs__Step create();
|
||||||
/* 8082ECEC */ daE_ZH_c();
|
/* 8082ECEC */ daE_ZH_c() {}
|
||||||
|
|
||||||
private:
|
/* 0x5AC */ request_of_phase_process_class mPhase;
|
||||||
/* 0x5ac */ u8 field_0x5ac[0xe08 - 0x5ac];
|
/* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
|
||||||
|
/* 0x5B8 */ J3DModel* mEntranceModel;
|
||||||
|
/* 0x5BC */ mDoExt_btkAnm* mpBtkAnm;
|
||||||
|
/* 0x5C0 */ Z2CreatureEnemy mSound;
|
||||||
|
/* 0x664 */ daObjCarry_c* mS_Ball;
|
||||||
|
/* 0x668 */ cXyz field_0x668;
|
||||||
|
/* 0x674 */ u8 field_0x674[0x680 - 0x674];
|
||||||
|
/* 0x680 */ cXyz field_0x680;
|
||||||
|
/* 0x68C */ cXyz field_0x68c;
|
||||||
|
/* 0x698 */ cXyz mRetrunStartLine;
|
||||||
|
/* 0x6A4 */ cXyz mRetrunEndLine;
|
||||||
|
/* 0x6B0 */ cXyz mBallHosei;
|
||||||
|
/* 0x6BC */ cXyz field_0x6bc;
|
||||||
|
/* 0x6C8 */ cXyz field_0x6c8[3];
|
||||||
|
/* 0x6EC */ int field_0x6ec[3];
|
||||||
|
/* 0x6F8 */ cXyz field_0x6f8[8];
|
||||||
|
/* 0x758 */ u8 field_0x758[8];
|
||||||
|
/* 0x760 */ f32 field_0x760;
|
||||||
|
/* 0x764 */ f32 field_0x764[3];
|
||||||
|
/* 0x770 */ f32 pmRoofPos;
|
||||||
|
/* 0x774 */ f32 field_0x774;
|
||||||
|
/* 0x778 */ f32 field_0x778;
|
||||||
|
/* 0x77C */ f32 field_0x77c;
|
||||||
|
/* 0x780 */ int mActionMode;
|
||||||
|
/* 0x784 */ int mMoveMode;
|
||||||
|
/* 0x788 */ u32 mShadowKey;
|
||||||
|
/* 0x78C */ int field_0x78c;
|
||||||
|
/* 0x790 */ int mAnm;
|
||||||
|
/* 0x794 */ int field_0x794[3];
|
||||||
|
/* 0x7A0 */ int field_0x7a0;
|
||||||
|
/* 0x7A4 */ int field_0x7a4;
|
||||||
|
/* 0x7A8 */ u8 field_0x7a8;
|
||||||
|
/* 0x7A9 */ u8 bitSw;
|
||||||
|
/* 0x7AA */ u8 bitSwEnd;
|
||||||
|
/* 0x7AB */ u8 arg0;
|
||||||
|
/* 0x7AC */ u8 field_0x7ac;
|
||||||
|
/* 0x7AD */ u8 field_0x7ad;
|
||||||
|
/* 0x7AE */ u8 field_0x7ae;
|
||||||
|
/* 0x7AF */ u8 field_0x7af;
|
||||||
|
/* 0x7B0 */ s16 mRollAngle;
|
||||||
|
/* 0x7B2 */ s16 field_0x7b2;
|
||||||
|
/* 0x7B4 */ dBgS_AcchCir mAcchCir;
|
||||||
|
/* 0x7F4 */ dBgS_ObjAcch mBgc;
|
||||||
|
/* 0x9CC */ dCcD_Stts mStts;
|
||||||
|
/* 0xA08 */ dCcD_Sph field_0xa08;
|
||||||
|
/* 0xB40 */ dCcD_Cyl field_0xb40;
|
||||||
|
/* 0xC7C */ dCcD_Cyl field_0xc7c;
|
||||||
|
/* 0xDB8 */ dCcU_AtInfo mAtInfo;
|
||||||
|
/* 0xDDC */ u32 field_0xddc[3];
|
||||||
|
/* 0xDE8 */ u32 field_0xde8;
|
||||||
|
/* 0xDEC */ cXyz mDemoCamEye;
|
||||||
|
/* 0xDF8 */ cXyz mDemoCamCenter;
|
||||||
|
/* 0xE04 */ u8 field_0xe04;
|
||||||
};
|
};
|
||||||
|
|
||||||
STATIC_ASSERT(sizeof(daE_ZH_c) == 0xe08);
|
STATIC_ASSERT(sizeof(daE_ZH_c) == 0xe08);
|
||||||
|
|
||||||
class daE_ZH_HIO_c {
|
class daE_ZH_HIO_c: public JORReflexible {
|
||||||
|
public:
|
||||||
/* 8082902C */ daE_ZH_HIO_c();
|
/* 8082902C */ daE_ZH_HIO_c();
|
||||||
/* 8082F160 */ ~daE_ZH_HIO_c();
|
/* 8082F160 */ virtual ~daE_ZH_HIO_c() {}
|
||||||
|
|
||||||
|
// ボールマスター (Ball Master)
|
||||||
|
/* 0x04 */ s8 field_0x4;
|
||||||
|
/* 0x08 */ f32 model_size; // モデルサイズ (Model Size)
|
||||||
|
/* 0x0C */ f32 ascent_rate; // 上昇速度(落下後)(Rate of ascent (after falling))
|
||||||
|
/* 0x10 */ f32 wandering_area; // うろうろ範囲 (Wandering Area)
|
||||||
|
/* 0x14 */ s16 wait_time; // 玉取られ後移動開始待ち時間 (Waiting time after the stone is taken and movement begins)
|
||||||
|
/* 0x16 */ s16 piyori_time; // ピヨリ時間 (Piyori Time)
|
||||||
|
/* 0x18 */ u8 dungeon_bit_check; // ダンジョンビットチェックON/OFF (Dungeon Bit Check ON/OFF)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif /* D_A_E_ZH_H */
|
#endif /* D_A_E_ZH_H */
|
||||||
|
|
|
@ -277,6 +277,10 @@ public:
|
||||||
void offDraw() { mDraw = 1; }
|
void offDraw() { mDraw = 1; }
|
||||||
void onDraw() { mDraw = 0; }
|
void onDraw() { mDraw = 0; }
|
||||||
bool isDraw() { return mDraw == false; }
|
bool isDraw() { return mDraw == false; }
|
||||||
|
void onCarryHookOK() { mCarryHookOK = 1; }
|
||||||
|
void offCarryHookOK() { mCarryHookOK = 0; }
|
||||||
|
BOOL checkRecover() { return mRecover; }
|
||||||
|
void reset() { mReset = 1; }
|
||||||
|
|
||||||
void setPower(fopAc_ac_c* cannon_actor, f32 my_0xde0, f32 my_0xde4, s16 my_0xde8) {
|
void setPower(fopAc_ac_c* cannon_actor, f32 my_0xde0, f32 my_0xde4, s16 my_0xde8) {
|
||||||
mpCannonActor = cannon_actor;
|
mpCannonActor = cannon_actor;
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue