mirror of https://github.com/zeldaret/tp.git
d_a_e_yh OK (#2727)
This commit is contained in:
hatal175
GitHub
parent
23a6cf91cd
commit
8a99c051d1
|
|
@ -167,6 +167,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl
|
|||
__vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global
|
||||
__vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global
|
||||
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
|
||||
lbl_251_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
|
||||
l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
|
||||
@3918 = .bss:0x0000000C; // type:object size:0xC scope:local
|
||||
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte
|
||||
|
|
|
|||
|
|
@ -166,6 +166,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl
|
|||
__vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global
|
||||
__vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global
|
||||
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
|
||||
lbl_251_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
|
||||
l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
|
||||
@3918 = .bss:0x0000000C; // type:object size:0xC scope:local
|
||||
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte
|
||||
|
|
|
|||
|
|
@ -166,6 +166,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl
|
|||
__vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global
|
||||
__vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global
|
||||
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
|
||||
lbl_251_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
|
||||
l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
|
||||
@3918 = .bss:0x0000000C; // type:object size:0xC scope:local
|
||||
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte
|
||||
|
|
|
|||
|
|
@ -148,6 +148,6 @@ lbl_251_data_3FC = .data:0x000003FC; // type:object size:0x1C
|
|||
@95827 = .data:0x00000418; // type:object size:0xC scope:local
|
||||
lbl_251_data_424 = .data:0x00000424; // type:object size:0xCC
|
||||
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
|
||||
lbl_251_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
|
||||
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local
|
||||
@94134 = .bss:0x0000000C; // type:object size:0xC scope:local
|
||||
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte
|
||||
|
|
|
|||
|
|
@ -158,6 +158,6 @@ __RTTI__15cBgS_GrpPassChk = .data:0x0000046C; // type:object size:0x58 scope:glo
|
|||
__RTTI__13JORReflexible = .data:0x000004C4; // type:object size:0x8 scope:global align:4
|
||||
__vt__12J3DFrameCtrl = .data:0x000004CC; // type:object size:0x24 scope:global align:4
|
||||
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global align:4
|
||||
lbl_251_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
|
||||
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local
|
||||
@94134 = .bss:0x0000000C; // type:object size:0xC scope:local align:4
|
||||
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global align:4 data:byte
|
||||
|
|
|
|||
|
|
@ -1790,7 +1790,7 @@ config.libs = [
|
|||
ActorRel(NonMatching, "d_a_e_yd"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_yd_leaf"),
|
||||
ActorRel(NonMatching, "d_a_e_yg"),
|
||||
ActorRel(NonMatching, "d_a_e_yh"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_yh"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_yk"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_ym"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_ym_tag"),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
#ifndef D_A_E_YH_H
|
||||
#define D_A_E_YH_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"
|
||||
|
||||
/**
|
||||
|
|
@ -10,17 +13,72 @@
|
|||
* @details
|
||||
*
|
||||
*/
|
||||
class e_yh_class : public fopEn_enemy_c {
|
||||
private:
|
||||
/* 0x5ac */ u8 field_0x5ac[0x1274 - 0x5ac];
|
||||
class e_yh_class {
|
||||
public:
|
||||
/* 0x0000 */ fopEn_enemy_c enemy;
|
||||
/* 0x05AC */ request_of_phase_process_class mPhase;
|
||||
/* 0x05B4 */ u8 field_0x5b4;
|
||||
/* 0x05B5 */ u8 field_0x5b5;
|
||||
/* 0x05B6 */ u8 field_0x5b6;
|
||||
/* 0x05B7 */ u8 field_0x5b7;
|
||||
/* 0x05B8 */ mDoExt_McaMorfSO* mpMorf;
|
||||
/* 0x05BC */ Z2CreatureEnemy mSound;
|
||||
/* 0x0660 */ mDoExt_brkAnm* mBrk;
|
||||
/* 0x0664 */ int field_0x664;
|
||||
/* 0x0668 */ int mShadowKey;
|
||||
/* 0x066C */ s16 field_0x66c;
|
||||
/* 0x066E */ s16 field_0x66e;
|
||||
/* 0x0670 */ s16 field_0x670;
|
||||
/* 0x0674 */ f32 field_0x674;
|
||||
/* 0x0678 */ cXyz field_0x678;
|
||||
/* 0x0684 */ s16 field_0x684;
|
||||
/* 0x0686 */ s16 field_0x686;
|
||||
/* 0x0688 */ s16 field_0x688;
|
||||
/* 0x068C */ f32 field_0x68c;
|
||||
/* 0x0690 */ f32 field_0x690;
|
||||
/* 0x0694 */ f32 field_0x694;
|
||||
/* 0x0698 */ s16 field_0x698[3];
|
||||
/* 0x069E */ s16 field_0x69e;
|
||||
/* 0x06A0 */ cXyz field_0x6a0[12];
|
||||
/* 0x0730 */ csXyz field_0x730[12];
|
||||
/* 0x0730 */ J3DModel* mModels[12];
|
||||
/* 0x07A8 */ f32 field_0x7a8[12];
|
||||
/* 0x07D8 */ f32 field_0x7d8[12];
|
||||
/* 0x0808 */ mDoExt_3DlineMat1_c mLine;
|
||||
/* 0x0844 */ f32 field_0x844;
|
||||
/* 0x0848 */ f32 field_0x848;
|
||||
/* 0x084C */ f32 field_0x84c;
|
||||
/* 0x0850 */ s16 field_0x850;
|
||||
/* 0x0852 */ s16 field_0x852;
|
||||
/* 0x0854 */ s8 field_0x854;
|
||||
/* 0x0855 */ s8 field_0x855;
|
||||
/* 0x0858 */ f32 field_0x858;
|
||||
/* 0x085C */ f32 field_0x85c;
|
||||
/* 0x085C */ s16 field_0x860;
|
||||
/* 0x0862 */ s16 field_0x862;
|
||||
/* 0x0864 */ s16 field_0x864;
|
||||
/* 0x0868 */ f32 field_0x868;
|
||||
/* 0x086C */ dCcD_Stts mStts;
|
||||
/* 0x08A8 */ dCcD_Sph mCcSph;
|
||||
/* 0x09E0 */ dCcD_Sph mAtSph;
|
||||
/* 0x0B18 */ s8 field_0xb18;
|
||||
/* 0x0B19 */ s8 field_0xb19;
|
||||
/* 0x0B1C */ dCcD_Sph mKukiSphs[4];
|
||||
/* 0x0FFC */ dCcU_AtInfo mAtInfo;
|
||||
/* 0x1020 */ dBgS_AcchCir mAcchCir;
|
||||
/* 0x1060 */ dBgS_ObjAcch mAcch;
|
||||
/* 0x1238 */ fpc_ProcID mChildID;
|
||||
/* 0x123C */ s8 field_0x123c;
|
||||
/* 0x123D */ s8 field_0x123d;
|
||||
/* 0x1240 */ u32 mParticleIds[3];
|
||||
/* 0x124C */ u32 mParticleIds2[3];
|
||||
/* 0x125C */ f32 field_0x1258;
|
||||
/* 0x125C */ u32 field_0x125c;
|
||||
/* 0x1260 */ u32 field_0x1260;
|
||||
/* 0x1260 */ u8 field_0x1264[0x1270 - 0x1264];
|
||||
/* 0x1270 */ bool mIsHIOOwner;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(e_yh_class) == 0x1274);
|
||||
|
||||
class daE_YH_HIO_c {
|
||||
/* 807FD4CC */ daE_YH_HIO_c();
|
||||
/* 80803D48 */ ~daE_YH_HIO_c();
|
||||
};
|
||||
|
||||
|
||||
#endif /* D_A_E_YH_H */
|
||||
|
|
|
|||
|
|
@ -109,26 +109,26 @@ enum fopAc_attention_type {
|
|||
};
|
||||
|
||||
enum fopAc_AttentionFlag_e {
|
||||
fopAc_AttnFlag_LOCK_e = (1 << fopAc_attn_LOCK_e),
|
||||
fopAc_AttnFlag_TALK_e = (1 << fopAc_attn_TALK_e),
|
||||
fopAc_AttnFlag_BATTLE_e = (1 << fopAc_attn_BATTLE_e),
|
||||
/* 0x00000001 */ fopAc_AttnFlag_LOCK_e = (1 << fopAc_attn_LOCK_e),
|
||||
/* 0x00000002 */ fopAc_AttnFlag_TALK_e = (1 << fopAc_attn_TALK_e),
|
||||
/* 0x00000004 */ fopAc_AttnFlag_BATTLE_e = (1 << fopAc_attn_BATTLE_e),
|
||||
|
||||
fopAc_AttnFlag_SPEAK_e = (1 << fopAc_attn_SPEAK_e),
|
||||
fopAc_AttnFlag_CARRY_e = (1 << fopAc_attn_CARRY_e),
|
||||
fopAc_AttnFlag_DOOR_e = (1 << fopAc_attn_DOOR_e),
|
||||
fopAc_AttnFlag_JUEL_e = (1 << fopAc_attn_JUEL_e),
|
||||
fopAc_AttnFlag_ETC_e = (1 << fopAc_attn_ETC_e),
|
||||
/* 0x00000008 */ fopAc_AttnFlag_SPEAK_e = (1 << fopAc_attn_SPEAK_e),
|
||||
/* 0x00000010 */ fopAc_AttnFlag_CARRY_e = (1 << fopAc_attn_CARRY_e),
|
||||
/* 0x00000020 */ fopAc_AttnFlag_DOOR_e = (1 << fopAc_attn_DOOR_e),
|
||||
/* 0x00000040 */ fopAc_AttnFlag_JUEL_e = (1 << fopAc_attn_JUEL_e),
|
||||
/* 0x00000080 */ fopAc_AttnFlag_ETC_e = (1 << fopAc_attn_ETC_e),
|
||||
|
||||
fopAc_AttnFlag_CHECK_e = (1 << fopAc_attn_CHECK_e),
|
||||
/* 0x00000100 */fopAc_AttnFlag_CHECK_e = (1 << fopAc_attn_CHECK_e),
|
||||
|
||||
fopAc_AttnFlag_UNK_0x200000 = 0x200000,
|
||||
fopAc_AttnFlag_UNK_0x400000 = 0x400000,
|
||||
fopAc_AttnFlag_UNK_0x800000 = 0x800000,
|
||||
fopAc_AttnFlag_NOTALK_e = 0x2000000,
|
||||
fopAc_AttnFlag_ENEMY_NOLOCK_e = 0x4000000,
|
||||
fopAc_AttnFlag_UNK_0x8000000 = 0x8000000,
|
||||
fopAc_AttnFlag_TALKCHECK_e = 0x20000000,
|
||||
fopAc_AttnFlag_TALKREAD_e = 0x40000000,
|
||||
/* 0x00200000 */ fopAc_AttnFlag_UNK_0x200000 = 0x200000,
|
||||
/* 0x00400000 */ fopAc_AttnFlag_UNK_0x400000 = 0x400000,
|
||||
/* 0x00800000 */ fopAc_AttnFlag_UNK_0x800000 = 0x800000,
|
||||
/* 0x02000000 */ fopAc_AttnFlag_NOTALK_e = 0x2000000,
|
||||
/* 0x04000000 */ fopAc_AttnFlag_ENEMY_NOLOCK_e = 0x4000000,
|
||||
/* 0x08000000 */ fopAc_AttnFlag_UNK_0x8000000 = 0x8000000,
|
||||
/* 0x20000000 */ fopAc_AttnFlag_TALKCHECK_e = 0x20000000,
|
||||
/* 0x40000000 */ fopAc_AttnFlag_TALKREAD_e = 0x40000000,
|
||||
};
|
||||
|
||||
#define fopAc_AttnFlags_LOCK (fopAc_AttnFlag_LOCK_e | fopAc_AttnFlag_TALK_e | fopAc_AttnFlag_BATTLE_e)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue