d_a_ks 100% (#746)

* initial progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* symbol cleanup

* more progress

* more progress

* d_a_ks 100%

* more symbol cleanup

* likely real-match for `useHeapInit`

* removed `csXyz` type from class member

* changed int to BOOL for `HEAVY_IN`

* documented matching issue

* PR changes
This commit is contained in:
Mattias Blum
2025-05-09 15:18:16 -04:00
committed by GitHub
parent cbbd4c2dc0
commit 95f230eb15
5 changed files with 1592 additions and 55 deletions
+1 -1
View File
@@ -1468,7 +1468,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_kantera"),
ActorRel(NonMatching, "d_a_kn"),
ActorRel(NonMatching, "d_a_kokiie"),
ActorRel(NonMatching, "d_a_ks"),
ActorRel(NonMatching, "d_a_ks"), # code 100%, possible issue unique to this TU
ActorRel(NonMatching, "d_a_kt"), # regalloc, weak func order
ActorRel(NonMatching, "d_a_mflft"),
ActorRel(NonMatching, "d_a_npc_cb1"),
+3 -1
View File
@@ -7,7 +7,9 @@ class gm_class : public fopEn_enemy_c {
public:
/* 0x2AC */ u8 m2AC[0x2CD - 0x2AC];
/* 0x2CD */ u8 m2CD;
/* 0x2CE */ u8 m2CE[0x3D0 - 0x2CE];
/* 0x2CE */ u8 m2CE[0x31E - 0x2CE];
/* 0x31E */ s16 m31E;
/* 0x320 */ u8 m320[0x3D0 - 0x320];
/* 0x3D0 */ f32 z;
/* 0x3D4 */ u8 m3D4[0x3DC - 0x3D4];
/* 0x3DC */ f32 m3DC;
+50 -4
View File
@@ -2,13 +2,59 @@
#define D_A_KS_H
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_bg_s_poly_info.h"
#include "c/c_damagereaction.h"
class mDoExt_McaMorf;
class mDoExt_brkAnm;
class mDoExt_btkAnm;
class daPy_lk_c;
class ks_class : public fopEn_enemy_c {
public:
/* 0x2AC */ u8 m2AC[0x44C - 0x2AC];
/* 0x44C */ cBgS_PolyInfo m44C;
/* 0x45C */ u8 m45C[0xC88 - 0x45C];
/* 0x2AC */ request_of_phase_process_class mPhs;
/* 0x2B4 */ mDoExt_McaMorf* mpBodyMorf;
/* 0x2B8 */ mDoExt_McaMorf* mpEyeMorf;
/* 0x2BC */ mDoExt_btkAnm* mpEyeBtkAnm;
/* 0x2C0 */ mDoExt_brkAnm* mpBodyBrkAnm;
/* 0x2C4 */ mDoExt_brkAnm* mpEyeBrkAnm;
/* 0x2C8 */ u8 m2C8;
/* 0x2C9 */ u8 m2C9;
/* 0x2CA */ u8 m2CA;
/* 0x2CB */ u8 m2CB;
/* 0x2CC */ u8 m2CC;
/* 0x2CD */ u8 m2CD;
/* 0x2CE */ u8 m2CE;
/* 0x2CF */ u8 m2CF;
/* 0x2D0 */ u8 m2D0;
/* 0x2D1 */ u8 m2D1;
/* 0x2D2 */ u8 m2D2;
/* 0x2D3 */ u8 m2D3;
/* 0x2D4 */ fpc_ProcID mGmID; // Mothula
/* 0x2D8 */ fpc_ProcID mKsID; // Morth
/* 0x2DC */ cXyz m2DC;
/* 0x2E8 */ s16 m2E8[4];
/* 0x2F0 */ s16 m2F0[5];
/* 0x2FA */ s16 m2FA;
/* 0x2FC */ s16 m2FC;
/* 0x2FE */ s16 m2FE;
/* 0x300 */ s16 m300;
/* 0x302 */ s16 m302;
/* 0x304 */ f32 m304;
/* 0x308 */ f32 m308;
/* 0x30C */ f32 m30C;
/* 0x310 */ f32 m310;
/* 0x314 */ f32 m314;
/* 0x318 */ f32 m318;
/* 0x31C */ f32 m31C;
/* 0x320 */ f32 m320;
/* 0x324 */ dBgS_AcchCir mAcchCir;
/* 0x364 */ dBgS_ObjAcch mAcch;
/* 0x528 */ MtxP m528;
/* 0x52C */ dPa_rippleEcallBack m52C;
/* 0x540 */ dCcD_Stts mStts;
/* 0x57C */ dCcD_Sph mSph;
/* 0x6A8 */ enemyice mEnemyIce;
/* 0xA60 */ enemyfire mEnemyFire;
};
#endif /* D_A_KS_H */
+1 -1
View File
@@ -184,7 +184,7 @@ enum {
/* 0xB0 */ DSNAP_TYPE_UNKB0,
/* 0xB1 */ DSNAP_TYPE_UNKB1,
/* 0xB2 */ DSNAP_TYPE_UNKB2,
/* 0xB3 */ DSNAP_TYPE_UNKB3,
/* 0xB3 */ DSNAP_TYPE_KS,
/* 0xB4 */ DSNAP_TYPE_UNKB4,
/* 0xB5 */ DSNAP_TYPE_UNKB5,
/* 0xB6 */ DSNAP_TYPE_AM2,
+1537 -48
View File
File diff suppressed because it is too large Load Diff