mirror of https://github.com/zeldaret/tp.git
d_a_e_st matching (#2730)
* initial work * initial work * almost matching * action func done * matching * PR cleanup
This commit is contained in:
parent
3077f6a971
commit
8b48bb658f
|
|
@ -235,7 +235,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
|
|||
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
|
||||
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
|
||||
small = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte
|
||||
lbl_233_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte
|
||||
l_initHIO = .bss:0x0000004C; // type:object size:0x1 data:byte
|
||||
@3919 = .bss:0x00000050; // type:object size:0xC scope:local
|
||||
l_HIO = .bss:0x0000005C; // type:object size:0x24 scope:global data:byte
|
||||
@6303 = .bss:0x00000080; // type:object size:0xC scope:local
|
||||
|
|
|
|||
|
|
@ -1772,7 +1772,7 @@ config.libs = [
|
|||
ActorRel(NonMatching, "d_a_e_sh"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_sm"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_sm2"),
|
||||
ActorRel(NonMatching, "d_a_e_st"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_st"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_st_line"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_sw"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_th"),
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
#ifndef D_A_E_ST_H
|
||||
#define D_A_E_ST_H
|
||||
#include "f_op/f_op_actor_mng.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.h"
|
||||
|
||||
/**
|
||||
* @ingroup actors-enemies
|
||||
|
|
@ -9,23 +12,101 @@
|
|||
*
|
||||
* @details
|
||||
*
|
||||
*/
|
||||
class e_st_class : public fopEn_enemy_c {
|
||||
/* 807A5CF4 */ e_st_class();
|
||||
private:
|
||||
/* 0x5ac */ u8 field_0x5ac[0x1068 - 0x5ac];
|
||||
*/
|
||||
|
||||
struct st_foot {
|
||||
/* 0x0 */ f32 field_0x0;
|
||||
/* 0x4 */ s16 mAngles[3];
|
||||
/* 0xC */ cXyz mPos;
|
||||
};
|
||||
|
||||
class e_st_class {
|
||||
public:
|
||||
/* 0x0000 */ fopEn_enemy_c actor;
|
||||
/* 0x05AC */ request_of_phase_process_class mPhase;
|
||||
/* 0x05B4 */ u8 arg0;
|
||||
/* 0x05B5 */ u8 arg1;
|
||||
/* 0x05B6 */ u8 arg2;
|
||||
/* 0x05B7 */ u8 arg3;
|
||||
/* 0x05B8 */ u8 mSwBit;
|
||||
/* 0x05BC */ cXyz field_0x5bc;
|
||||
/* 0x05C8 */ s16 mAngleFromPlayer;
|
||||
/* 0x05CC */ mDoExt_McaMorfSO* mpModelMorf;
|
||||
/* 0x05D0 */ Z2CreatureEnemy mSound;
|
||||
/* 0x0674 */ int mAnm;
|
||||
/* 0x0678 */ u32 mShadowKey;
|
||||
/* 0x067C */ s16 mFrameCounter;
|
||||
/* 0x067E */ s16 mAction;
|
||||
/* 0x0680 */ s16 mActionPhase;
|
||||
/* 0x0682 */ s16 mTimers[4];
|
||||
/* 0x068A */ s16 mInvulnerabilityTimer;
|
||||
/* 0x068C */ s16 mDefTimer;
|
||||
/* 0x0690 */ cXyz mBgPos;
|
||||
/* 0x069C */ csXyz field_0x69c;
|
||||
/* 0x06A2 */ s16 field_0x6a2;
|
||||
/* 0x06A4 */ s16 field_0x6a4;
|
||||
/* 0x06A6 */ csXyz field_0x6a6;
|
||||
/* 0x06AC */ s16 field_0x6ac;
|
||||
/* 0x06AE */ s16 field_0x6ae;
|
||||
/* 0x06B0 */ cXyz field_0x6b0;
|
||||
/* 0x06BC */ cXyz field_0x6bc;
|
||||
/* 0x06C8 */ cXyz field_0x6c8;
|
||||
/* 0x06D4 */ cXyz field_0x6d4;
|
||||
/* 0x06E0 */ cXyz field_0x6e0[3];
|
||||
/* 0x0704 */ cXyz field_0x704;
|
||||
/* 0x0710 */ cXyz field_0x710;
|
||||
/* 0x071C */ f32 field_0x71c;
|
||||
/* 0x0720 */ s8 field_0x720;
|
||||
/* 0x0724 */ f32 field_0x724;
|
||||
/* 0x0728 */ mDoExt_3DlineMat0_c mLineMat1;
|
||||
/* 0x0744 */ cXyz field_0x744;
|
||||
/* 0x0750 */ cXyz field_0x750;
|
||||
/* 0x075C */ f32 field_0x75c;
|
||||
/* 0x0760 */ s8 field_0x760;
|
||||
/* 0x0764 */ f32 field_0x764;
|
||||
/* 0x0768 */ mDoExt_3DlineMat0_c mLineMat2;
|
||||
/* 0x0784 */ u8 field_0x784[0x788 - 0x784];
|
||||
/* 0x0788 */ f32 field_0x788;
|
||||
/* 0x078C */ u8 field_0x78c[0x7d4 - 0x78c];
|
||||
/* 0x07D4 */ s16 field_0x7d4;
|
||||
/* 0x07D8 */ f32 field_0x7d8;
|
||||
/* 0x07DC */ u8 mHorizHitDir;
|
||||
/* 0x07DD */ u8 field_0x7dd;
|
||||
/* 0x07DE */ s16 mHitDirectionY;
|
||||
/* 0x07E0 */ f32 field_0x7e0;
|
||||
/* 0x07E4 */ s8 mDeathFlag;
|
||||
/* 0x07E8 */ f32 mColor;
|
||||
/* 0x07EC */ f32 field_0x7ec;
|
||||
/* 0x07F0 */ s16 field_0x7f0;
|
||||
/* 0x07F2 */ s16 field_0x7f2;
|
||||
/* 0x07F4 */ f32 field_0x7f4;
|
||||
/* 0x07F8 */ f32 mPlayerDistance;
|
||||
/* 0x07FC */ u8 field_0x7fc[0x800 - 0x7fc];
|
||||
/* 0x0800 */ dBgS_AcchCir mAcchCir;
|
||||
/* 0x0840 */ dBgS_ObjAcch mBgc;
|
||||
/* 0x0A18 */ f32 mGroundCross;
|
||||
/* 0x0A1C */ dCcD_Stts mStts;
|
||||
/* 0x0A58 */ s8 field_0xa58;
|
||||
/* 0x0A5C */ dCcD_Sph mSph;
|
||||
/* 0x0B94 */ s8 field_0xb94;
|
||||
/* 0x0B98 */ dCcD_Sph mAtSph;
|
||||
/* 0x0CD0 */ dCcU_AtInfo mAtInfo;
|
||||
/* 0x0CF4 */ s8 field_0xcf4;
|
||||
/* 0x0CF8 */ dCcD_Sph mDefSph;
|
||||
/* 0x0E30 */ dCcD_Cyl mLineCyl;
|
||||
/* 0x0F6C */ u32 field_0xf6c;
|
||||
/* 0x0F70 */ u32 field_0xf70;
|
||||
/* 0x0F74 */ u32 mPrtcls[2];
|
||||
/* 0x0F7C */ u32 field_0xf7c;
|
||||
/* 0x0F80 */ u8 field_0xf80[0xf84 - 0xf80];
|
||||
/* 0x0F84 */ u8 mParameters;
|
||||
/* 0x0F85 */ s8 field_0xf85;
|
||||
/* 0x0F88 */ cXyz field_0xf88;
|
||||
/* 0x0F94 */ st_foot mStFeet[8];
|
||||
/* 0x1054 */ u8 field_0x1054[0x1064 - 0x1054];
|
||||
/* 0x1064 */ bool mIsFirstSpawn;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(e_st_class) == 0x1068);
|
||||
|
||||
class daE_ST_HIO_c {
|
||||
/* 8079DDEC */ daE_ST_HIO_c();
|
||||
/* 807A61FC */ ~daE_ST_HIO_c();
|
||||
};
|
||||
|
||||
struct st_foot {
|
||||
/* 807A5F5C */ ~st_foot();
|
||||
/* 807A5F98 */ st_foot();
|
||||
};
|
||||
|
||||
#endif /* D_A_E_ST_H */
|
||||
|
|
|
|||
|
|
@ -51,7 +51,8 @@ enum dCcG_At_Spl {
|
|||
/* 0x0 */ dCcG_At_Spl_UNK_0,
|
||||
/* 0x1 */ dCcG_At_Spl_UNK_1,
|
||||
/* 0x7 */ dCcG_At_Spl_UNK_7 = 0x7,
|
||||
/* 0xD */ dCcG_At_Spl_UNK_D = 0xD,
|
||||
/* 0xC */ dCcG_At_Spl_UNK_C = 0xC,
|
||||
/* 0xD */ dCcG_At_Spl_UNK_D,
|
||||
};
|
||||
|
||||
enum dCcG_Tg_Spl {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue