mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-05 18:57:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

matching (#2767)

Browse Source
This commit is contained in:
Carco_21
2025-11-01 18:19:23 -04:00
committed by GitHub
parent df5c66943a
commit 78d3687ed3
3 changed files with 435 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1853,7 +1853,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_clerkb"),
ActorRel(NonMatching, "d_a_npc_clerkt"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_coach"),
ActorRel(NonMatching, "d_a_npc_df"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_df"),
ActorRel(NonMatching, "d_a_npc_doc"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_doorboy", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_drainSol"),
include/d/actor/d_a_npc_df.h
+45 -13
View File
@@ -1,28 +1,60 @@
#ifndef D_A_NPC_DF_H
#define D_A_NPC_DF_H
#include "d/actor/d_a_npc.h"
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_phase.h"
/**
* @ingroup actors-npcs
* @class npc_df_class
* @brief ???
* @brief Dragonfly
*
* @details
*
*/
class npc_df_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0xd44 - 0x568];
*/
struct df_s {
public:
/* 0x00 */ J3DModel* mpModels[2];
/* 0x08 */ cXyz field_0x8;
/* 0x14 */ cXyz field_0x14;
/* 0x20 */ cXyz field_0x20;
/* 0x2C */ cXyz field_0x2c;
/* 0x38 */ cXyz field_0x38;
/* 0x44 */ csXyz field_0x44;
/* 0x4A */ csXyz field_0x4a;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ f32 field_0x60;
/* 0x64 */ f32 field_0x64;
/* 0x68 */ f32 field_0x68;
/* 0x6C */ s16 field_0x6c;
/* 0x6E */ s16 field_0x6e;
/* 0x70 */ s16 field_0x70;
/* 0x72 */ s16 field_0x72;
/* 0x74 */ s8 field_0x74;
/* 0x75 */ s8 field_0x75;
/* 0x76 */ u8 field_0x76;
/* 0x77 */ u8 field_0x77;
/* 0x78 */ u8 field_0x78[3];
/* 0x7B */ u8 field_0x7b;
};
class npc_df_class {
public:
/* 0x000 */ fopAc_ac_c actor;
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ u8 field_0x570;
/* 0x571 */ u8 field_0x571;
/* 0x572 */ u8 field_0x572;
/* 0x573 */ u8 field_0x573;
/* 0x574 */ df_s mDfs[16];
/* 0xD34 */ cXyz field_0xd34;
/* 0xD40 */ int mDragonflyCount;
};
STATIC_ASSERT(sizeof(npc_df_class) == 0xd44);
struct df_s {
public:
/* 809A6728 */ ~df_s();
/* 809A6764 */ df_s();
};
#endif /* D_A_NPC_DF_H */
src/d/actor/d_a_npc_df.cpp
+389 -730
View File
File diff suppressed because it is too large Load Diff