falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_e_yg matching (#2770) 

* matching

* pr cleanup
This commit is contained in:
Carco_21 2025-11-05 16:39:53 -05:00 committed by GitHub
parent 2543ad18b6
commit 957a743742
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 1514 additions and 1450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/GZ2E01/rels/d_a_e_yg/symbols.txt
View File

@ -165,10 +165,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
lbl_250_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
l_initHIO = .bss:0x00000045; // type:object size:0x1 data:byte
@3817 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte
@3917 = .bss:0x00000070; // type:object size:0xC scope:local
init$1863 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1
@3920 = .bss:0x00000080; // type:object size:0xC scope:local
@3921 = .bss:0x0000008C; // type:object size:0xC scope:local
e_pos$3916 = .bss:0x00000098; // type:object size:0x24 scope:local
@ -203,6 +204,7 @@ ke_p = .bss:0x000001AC; // type:object size:0x9C scope:global align:4 data:float
@4714 = .bss:0x000002D8; // type:object size:0xC scope:local
ke_a = .bss:0x000002E4; // type:object size:0x4E scope:global data:2byte
@5031 = .bss:0x00000334; // type:object size:0xC scope:local
init$2973 = .bss:0x00000340; // type:object size:0x1 scope:local align:1
sc$5030 = .bss:0x00000344; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000350; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000354; // type:object size:0x4 scope:global

2
configure.py
View File

@ -1806,7 +1806,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_yc"),
ActorRel(NonMatching, "d_a_e_yd"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_yd_leaf"),
ActorRel(NonMatching, "d_a_e_yg"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_yg"),
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"),

69
include/d/actor/d_a_e_yg.h
View File

@ -1,5 +1,8 @@
#ifndef D_A_E_YG_H
#define D_A_E_YG_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"
/**
@ -9,23 +12,59 @@
*
* @details
*
*/
class e_yg_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0x18a0 - 0x5ac];
*/
struct yg_ke_s {
/* 0x00 */ cXyz field_0x0[10];
/* 0x78 */ cXyz field_0x78[10];
/* 0xF0 */ cXyz field_0xf0;
};
class e_yg_class {
public:
/* 0x0000 */ fopEn_enemy_c actor;
/* 0x05AC */ request_of_phase_process_class mPhase;
/* 0x05B4 */ s16 mActionMode;
/* 0x05B6 */ u8 arg0;
/* 0x05B7 */ u8 arg1;
/* 0x05B8 */ int mSwBit;
/* 0x05BC */ cXyz field_0x5bc;
/* 0x05C8 */ s16 mCurrentAngleYTarget;
/* 0x05CC */ mDoExt_McaMorfSO* mpMorf;
/* 0x05D0 */ int mAnm;
/* 0x05D4 */ u32 mShadowKey;
/* 0x05D8 */ Z2CreatureEnemy mSound;
/* 0x067C */ s16 mFrameCounter;
/* 0x067E */ s16 mAction;
/* 0x0680 */ f32 mPlayerDist;
/* 0x0684 */ s16 mPlayerAngleY;
/* 0x0686 */ s16 mTimers[4];
/* 0x068E */ s16 mInvulnerabilityTimer;
/* 0x0690 */ f32 mGroundCross;
/* 0x0694 */ f32 mCurrentPosYOffset;
/* 0x0698 */ dBgS_AcchCir mAcchCir;
/* 0x06D8 */ dBgS_ObjAcch mBgc;
/* 0x08B0 */ s8 mWaterFlag;
/* 0x08B4 */ dCcD_Stts mStts;
/* 0x08F0 */ dCcD_Sph mSph1;
/* 0x0A28 */ dCcD_Sph mSph2;
/* 0x0B60 */ dCcU_AtInfo mAtInfo;
/* 0x0B84 */ s8 mUnkFlag1;
/* 0x0B88 */ u32 mUnkPrtcl;
/* 0x0B8C */ u32 mDownWtrAPrtcls[4];
/* 0x0B9C */ u32 mHamonPrtcl;
/* 0x0BA0 */ u8 field_0xba0[0xba5 - 0xba0];
/* 0x0BA5 */ s8 mDispFlag;
/* 0x0BA6 */ s8 mUnkFlag2;
/* 0x0BA7 */ s8 mSplashTimer;
/* 0x0BA8 */ s8 mDeathFlag;
/* 0x0BAC */ f32 mDistance;
/* 0x0BB0 */ fpc_ProcID mSkullActorID;
/* 0x0BB4 */ yg_ke_s mYgKes[13];
/* 0x1880 */ mDoExt_3DlineMat0_c mLineMat;
/* 0x189C */ u8 mIsFirstSpawn;
};
STATIC_ASSERT(sizeof(e_yg_class) == 0x18a0);
class daE_YG_HIO_c {
/* 807F834C */ daE_YG_HIO_c();
/* 807FC168 */ ~daE_YG_HIO_c();
};
struct yg_ke_s {
/* 807FBE70 */ ~yg_ke_s();
/* 807FBEEC */ yg_ke_s();
};
#endif /* D_A_E_YG_H */

2889
src/d/actor/d_a_e_yg.cpp
View File

File diff suppressed because it is too large Load Diff