encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

d_a_e_bg matching (#2567)

Browse Source
This commit is contained in:
Max Roncace
2025-08-05 11:37:09 +03:00
committed by GitHub
parent e49ed1213d
commit d629cc383b
5 changed files with 1386 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/rels/d_a_e_bg/symbols.txt
+1 -1
View File
@@ -105,6 +105,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global
__vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global
__vt__12daE_BG_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __vt__12daE_BG_HIO_c = .data:0x00000190; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_174_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte l_initHIO = .bss:0x00000008; // type:object size:0x1 data:byte
@3763 = .bss:0x0000000C; // type:object size:0xC scope:local @3763 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte
config/ShieldD/rels/d_a_e_bgD/symbols.txt
+1 -1
View File
@@ -142,5 +142,5 @@ lbl_165_data_298 = .data:0x00000298; // type:object size:0x24
@119823 = .data:0x000004A4; // type:object size:0x11 scope:local data:string @119823 = .data:0x000004A4; // type:object size:0x11 scope:local data:string
@119824 = .data:0x000004CC; // type:object size:0xD scope:local data:string @119824 = .data:0x000004CC; // type:object size:0xD scope:local data:string
lbl_165_data_4D9 = .data:0x000004D9; // type:object size:0x93 lbl_165_data_4D9 = .data:0x000004D9; // type:object size:0x93
lbl_165_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte l_initHIO = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte
configure.py
+1 -1
View File
@@ -1651,7 +1651,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_e_arrow"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_arrow"),
ActorRel(Equivalent, "d_a_e_ba"), # weak func order ActorRel(Equivalent, "d_a_e_ba"), # weak func order
ActorRel(NonMatching, "d_a_e_bee"), ActorRel(NonMatching, "d_a_e_bee"),
ActorRel(NonMatching, "d_a_e_bg"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_bg"),
ActorRel(NonMatching, "d_a_e_bi"), ActorRel(NonMatching, "d_a_e_bi"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_bi_leaf"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_bi_leaf"),
ActorRel(Equivalent, "d_a_e_bs"), # weak func order ActorRel(Equivalent, "d_a_e_bs"), # weak func order
include/d/actor/d_a_e_bg.h
+21 -24
View File
@@ -17,19 +17,19 @@
*/ */
class daE_BG_c : public fopEn_enemy_c { class daE_BG_c : public fopEn_enemy_c {
public: public:
/* 8068585C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8068585C */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 80685948 */ void JointCallBack(J3DJoint*, int); /* 80685948 */ static int JointCallBack(J3DJoint*, int);
/* 80685994 */ void draw(); /* 80685994 */ int draw();
/* 80685B70 */ void setBck(int, u8, f32, f32); /* 80685B70 */ void setBck(int, u8, f32, f32);
/* 80685C14 */ void setActionMode(int, int); /* 80685C14 */ void setActionMode(int, int);
/* 80685C2C */ void damage_check(); /* 80685C2C */ void damage_check();
/* 80685DBC */ void setSparkEffect(); /* 80685DBC */ void setSparkEffect();
/* 80685F04 */ void search_esa(); /* 80685F04 */ fopAc_ac_c* search_esa();
/* 80685F88 */ void executeBorn(); /* 80685F88 */ void executeBorn();
/* 80686210 */ void executeSwim(); /* 80686210 */ void executeSwim();
/* 80686C90 */ void executeAttack(); /* 80686C90 */ void executeAttack();
/* 80687B38 */ void executeDamage(); /* 80687B38 */ void executeDamage();
/* 80687CD8 */ void setBombCarry(int); /* 80687CD8 */ bool setBombCarry(int);
/* 80687DEC */ void executeBomb(); /* 80687DEC */ void executeBomb();
/* 80687FC4 */ void executeBirth(); /* 80687FC4 */ void executeBirth();
/* 8068838C */ void executeHook(); /* 8068838C */ void executeHook();
@@ -37,10 +37,10 @@ public:
/* 80689168 */ void action(); /* 80689168 */ void action();
/* 80689544 */ void mtx_set(); /* 80689544 */ void mtx_set();
/* 8068966C */ void cc_set(); /* 8068966C */ void cc_set();
/* 806897EC */ void execute(); /* 806897EC */ int execute();
/* 80689978 */ void _delete(); /* 80689978 */ int _delete();
/* 80689A0C */ void CreateHeap(); /* 80689A0C */ int CreateHeap();
/* 80689C38 */ void create(); /* 80689C38 */ int create();
void setBgId(u32 i_bgId) { mBgId = i_bgId; } void setBgId(u32 i_bgId) { mBgId = i_bgId; }
bool isBomb() { return mIsBomb; } bool isBomb() { return mIsBomb; }
@@ -55,7 +55,7 @@ private:
/* 0x670 */ s32 mActionMode; /* 0x670 */ s32 mActionMode;
/* 0x674 */ s32 mMoveMode; /* 0x674 */ s32 mMoveMode;
/* 0x678 */ u32 mShadowKey; /* 0x678 */ u32 mShadowKey;
/* 0x67C */ u8 field_0x67C[0x684 - 0x67C]; /* 0x67C */ u8 field_0x67c[0x684 - 0x67C];
/* 0x684 */ f32 field_0x684; /* 0x684 */ f32 field_0x684;
/* 0x688 */ f32 field_0x688; /* 0x688 */ f32 field_0x688;
/* 0x68C */ u8 field_0x68c; /* 0x68C */ u8 field_0x68c;
@@ -70,24 +70,21 @@ private:
/* 0x69E */ s16 field_0x69e; /* 0x69E */ s16 field_0x69e;
/* 0x6A0 */ s16 field_0x6a0; /* 0x6A0 */ s16 field_0x6a0;
/* 0x6A2 */ s16 field_0x6a2; /* 0x6A2 */ s16 field_0x6a2;
/* 0x6A4 */ s16 field_0x6a4; /* 0x6A4 */ s16 field_0x6a4[3];
/* 0x6A6 */ s16 field_0x6a6;
/* 0x6A8 */ s16 field_0x6a8;
/* 0x6AA */ s16 field_0x6aa; /* 0x6AA */ s16 field_0x6aa;
/* 0x6AC */ s16 field_0x6ac; /* 0x6AC */ s16 field_0x6ac;
/* 0x6AE */ u8 field_0x6ae; /* 0x6AE */ u8 field_0x6ae;
/* 0x6AF */ u8 field_0x6af; /* 0x6AF */ u8 field_0x6af;
/* 0x6B0 */ u8 field_0x6b0; /* 0x6B0 */ u8 field_0x6b0;
/* 0x6B1 */ bool mIsBomb; /* 0x6B1 */ bool mIsBomb;
/* 0x6B2 */ u8 field_0x6B2[0x6B4 - 0x6B2]; /* 0x6B2 */ u8 field_0x6b2[0x6B4 - 0x6B2];
/* 0x6B4 */ dBgS_AcchCir mAcchCir; /* 0x6B4 */ dBgS_AcchCir mAcchCir;
/* 0x6F4 */ dBgS_ObjAcch mObjAcch; /* 0x6F4 */ dBgS_ObjAcch mObjAcch;
/* 0x8CC */ dCcD_Stts mStts; /* 0x8CC */ dCcD_Stts mStts;
/* 0x908 */ dCcD_Sph mSphere; /* 0x908 */ dCcD_Sph mSphere;
/* 0xA40 */ dCcD_Sph mAtSphere; /* 0xA40 */ dCcD_Sph mAtSphere;
/* 0xB78 */ dCcU_AtInfo mAtInfo; /* 0xB78 */ dCcU_AtInfo mAtInfo;
/* 0xB9C */ u32 mParticle; /* 0xB9C */ u32 mParticle[5];
/* 0xBA0 */ u8 field_0xBA0[0xBB0 - 0xBA0];
/* 0xBB0 */ u32 mParticle2; /* 0xBB0 */ u32 mParticle2;
/* 0xBB4 */ u32 mParticle3; /* 0xBB4 */ u32 mParticle3;
/* 0xBB8 */ u8 mHIOInit; /* 0xBB8 */ u8 mHIOInit;
@@ -98,18 +95,18 @@ STATIC_ASSERT(sizeof(daE_BG_c) == 0xbbc);
class daE_BG_HIO_c : public JORReflexible { class daE_BG_HIO_c : public JORReflexible {
public: public:
/* 8068580C */ daE_BG_HIO_c(); /* 8068580C */ daE_BG_HIO_c();
/* 8068A19C */ virtual ~daE_BG_HIO_c(); /* 8068A19C */ virtual ~daE_BG_HIO_c() {}
void genMessage(JORMContext*); void genMessage(JORMContext*);
/* 0x04 */ s8 field_0x4; /* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 tracking_speed; /* 0x08 */ f32 mTrackingSpeed;
/* 0x0C */ f32 rush_speed; /* 0x0C */ f32 mRushSpeed;
/* 0x10 */ f32 waiting_distance_before_charging; /* 0x10 */ f32 mWaitDistanceBeforeCharging;
/* 0x14 */ f32 player_search_distance; /* 0x14 */ f32 mPlayerSearchDistance;
/* 0x18 */ f32 attack_range; /* 0x18 */ f32 mAttackRange;
/* 0x1C */ f32 swimming_range; /* 0x1C */ f32 mSwimRange;
/* 0x20 */ f32 spring_time; /* 0x20 */ f32 mJumpTime;
}; };
#endif /* D_A_E_BG_H */ #endif /* D_A_E_BG_H */
src/d/actor/d_a_e_bg.cpp
+1362 -733
View File
File diff suppressed because it is too large Load Diff