mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_e_hm matching (#2764)

Browse Source
This commit is contained in:
Max Roncace
2025-11-01 01:04:10 -04:00
committed by GitHub
parent b0952f9818
commit 1be8e6c6c8
7 changed files with 1494 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/rels/d_a_e_hm/symbols.txt
+1 -1
View File
@@ -181,7 +181,7 @@ __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_199_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte
@3807 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte
s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float
config/GZ2J01/rels/d_a_e_hm/symbols.txt
+1 -1
View File
@@ -180,7 +180,7 @@ __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_199_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte
@3807 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte
s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float
config/GZ2P01/rels/d_a_e_hm/symbols.txt
+1 -1
View File
@@ -180,7 +180,7 @@ __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_199_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte
@3807 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte
s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float
configure.py
+1 -1
View File
@@ -1755,7 +1755,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_gob"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_gs"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_hb_leaf"),
ActorRel(NonMatching, "d_a_e_hm"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_hm"),
ActorRel(NonMatching, "d_a_e_hp"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_hz"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_hzelda"),
include/d/actor/d_a_e_hm.h
+59 -20
View File
@@ -3,27 +3,30 @@
#include "f_op/f_op_actor_mng.h"
#include <d/d_cc_uty.h>
/**
* @ingroup actors-enemies
* @class daE_HM_c
* @brief Torch Slug
*
* @details
*
*
* @details
*
*/
class daE_HM_c : public fopEn_enemy_c {
/* 806E043C */ void CreateHeap();
public:
/* 806E043C */ int CreateHeap();
/* 806E06C0 */ void initCcCylinder();
/* 806E074C */ void setCcCylinder();
/* 806E0958 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 806E0958 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 806E0DB0 */ void Particle_Set(u32&, u16);
/* 806E0E8C */ void SetAnm(int, int, f32, f32);
/* 806E0F38 */ void W_TargetAngle(cXyz, cXyz);
/* 806E0F38 */ s16 W_TargetAngle(cXyz, cXyz);
/* 806E0FF4 */ void W_DeathSpSet();
/* 806E1118 */ void W_DeathAction();
/* 806E1370 */ void W_DeathMotion();
/* 806E155C */ void W_MoveCheckWall();
/* 806E18A0 */ void W_WallCheck();
/* 806E155C */ int W_MoveCheckWall();
/* 806E18A0 */ int W_WallCheck();
/* 806E1A00 */ void WallExecute();
/* 806E1AA0 */ void WallCreateExecute();
/* 806E1B5C */ void CreateExecute();
@@ -32,8 +35,8 @@ class daE_HM_c : public fopEn_enemy_c {
/* 806E20FC */ void UpMoveAction();
/* 806E2410 */ void UpWaitAction();
/* 806E2568 */ void UpExecute();
/* 806E25E8 */ void WallCheck();
/* 806E2694 */ void MoveCheck();
/* 806E25E8 */ int WallCheck();
/* 806E2694 */ int MoveCheck();
/* 806E29B8 */ void ShippuAction();
/* 806E2B80 */ void ShieldMotion();
/* 806E2C50 */ void ShieldAction();
@@ -54,24 +57,60 @@ class daE_HM_c : public fopEn_enemy_c {
/* 806E3BE4 */ void ActionMode();
/* 806E4008 */ void Yazirushi();
/* 806E40B8 */ void setStabPos();
/* 806E40D4 */ void Execute();
/* 806E434C */ void Draw();
/* 806E44F0 */ void Delete();
/* 806E40D4 */ int Execute();
/* 806E434C */ int Draw();
/* 806E44F0 */ int Delete();
/* 806E4558 */ void setBaseMtx();
/* 806E4620 */ void CheckRoof();
/* 806E486C */ void CheckWall();
/* 806E4CCC */ void CreateStyle();
/* 806E4E64 */ void Create();
/* 806E4E64 */ int Create();
private:
/* 0x5ac */ u8 field_0x5ac[0xa88 - 0x5ac];
/* 0x5AC */ u8 field_0x5ac;
/* 0x5AD */ u8 field_0x5ad;
/* 0x5AE */ u8 field_0x5ae;
/* 0x5AF */ u8 field_0x5af;
/* 0x5B0 */ f32 field_0x5b0;
/* 0x5B4 */ s16 field_0x5b4;
/* 0x5B8 */ s32 field_0x5b8;
/* 0x5BC */ s32 field_0x5bc;
/* 0x5C0 */ s16 field_0x5c0;
/* 0x5C2 */ s16 field_0x5c2;
/* 0x5C4 */ fpc_ProcID field_0x5c4;
/* 0x5C8 */ u8 field_0x5c8[0x5cc - 0x5c8];
/* 0x5CC */ csXyz field_0x5cc;
/* 0x5D2 */ s16 field_0x5d2;
/* 0x5D4 */ s16 field_0x5d4;
/* 0x5D6 */ s16 field_0x5d6;
/* 0x5D8 */ u8 field_0x5d8[0x5da - 0x5d8];
/* 0x5DA */ u8 field_0x5da;
/* 0x5DC */ cXyz field_0x5dc;
/* 0x5E8 */ cXyz field_0x5e8;
/* 0x5F4 */ f32 field_0x5f4;
/* 0x5F8 */ f32 field_0x5f8;
/* 0x5FC */ u32 field_0x5fc;
/* 0x600 */ u32 field_0x600;
/* 0x604 */ s32 field_0x604;
/* 0x608 */ u32 field_0x608;
/* 0x60C */ u8 field_0x60c;
/* 0x60D */ u8 field_0x60d;
/* 0x610 */ mDoExt_brkAnm* mpBrkAnm;
/* 0x614 */ mDoExt_btkAnm* mpBtkAnm;
/* 0x618 */ mDoExt_McaMorfSO* mAnm_p;
/* 0x61C */ s32 field_0x61c;
/* 0x620 */ u8 field_0x620;
/* 0x624 */ request_of_phase_process_class mPhase;
/* 0x62C */ u32 field_0x62c;
/* 0x630 */ Z2CreatureEnemy mSound;
/* 0x6D4 */ dBgS_AcchCir mAcchCir;
/* 0x714 */ dBgS_ObjAcch mAcch;
/* 0x8EC */ dCcD_Stts mStts;
/* 0x928 */ dCcD_Sph mSph;
/* 0xA60 */ dCcU_AtInfo mAtInfo;
/* 0xA84 */ u8 field_0xa84;
};
STATIC_ASSERT(sizeof(daE_HM_c) == 0xa88);
class daE_HM_HIO_c {
/* 806E03EC */ daE_HM_HIO_c();
/* 806E53F8 */ ~daE_HM_HIO_c();
};
#endif /* D_A_E_HM_H */
include/d/d_bg_s.h
+1
View File
@@ -139,6 +139,7 @@ public:
u32 GetMtrlSndId(const cBgS_PolyInfo& param_0) { return dKy_pol_sound_get(&param_0); }
void DebugDrawPoly(dBgW_Base *param_1) {}
fopAc_ac_c* GetActorPointer(cBgS_PolyInfo const& param_0) const { return cBgS::GetActorPointer(param_0); }
bool LineCross(cBgS_LinChk* i_linChk) { return ((cBgS*)this)->LineCross(i_linChk); }
f32 GroundCross(cBgS_GndChk* i_gndChk) { return (f32)((cBgS*)this)->GroundCross(i_gndChk); }
void ChkDeleteActorRegist(fopAc_ac_c*);
src/d/actor/d_a_e_hm.cpp
+1430 -1090
View File
File diff suppressed because it is too large Load Diff