D_a_obj_pfall matching (#769)

* bit too difficult for me for now, might go back later

* progress

* getmsg

* logic matching data isnt

* data section matches

* mathubcg 100%

* cleanup

* revert this change

* final cleanup and configure.py

* nevermind cleanup

* Equivalent onstead of matching

* removed padding

* cleanup code comments and a bit more

* close to matching

* matches

* added d/d_priority.h back

* configure.pu

* updated to match retail and cleanup
This commit is contained in:
Zeclos
2025-05-26 19:54:30 +02:00
committed by GitHub
parent c484eb490d
commit 693c92638f
3 changed files with 408 additions and 69 deletions
+38 -29
View File
@@ -4,6 +4,7 @@
#include "f_op/f_op_actor.h"
#include "d/d_bg_w.h"
#include "SSystem/SComponent/c_phase.h"
#include "m_Do/m_Do_ext.h"
class mDoExt_McaMorf;
@@ -11,7 +12,7 @@ class daObj_Pfall_c : public fopAc_ac_c {
public:
void setAnm();
void set_mtx();
void CreateHeap();
BOOL CreateHeap();
void CreateInit();
cPhs_State _create();
bool _delete();
@@ -30,43 +31,51 @@ public:
bool _execute();
void nz_draw();
bool _draw();
public:
/* 0x290 */ void* m290;
/* 0x294 */ cXyz m294[10];
/* 0x30C */ cXyz m30C[10];
/* 0x384 */ cXyz m384[2];
/* 0x39C */ void* m39C;
/* 0x3A0 */ void* m3A0;
/* 0x3A4 */ void* m3A4;
/* 0x3A8 */ void* m3A8;
/* 0x3AC */ void* m3AC;
/* 0x3B0 */ void* m3B0;
/* 0x3B4 */ void* m3B4;
/* 0x3B8 */ u8 m3B8[0x3BC - 0x3B8];
/* 0x290 */ void* field_0x290;
/* 0x294 */ cXyz field_0x294[10];
/* 0x30C */ cXyz field_0x30C[10];
/* 0x384 */ cXyz field_0x384[2];
/* 0x39C */ u8 field_0x39C[0x3A8 - 0x39C];
/* 0x3A8 */ int field_0x3A8;
/* 0x3AC */ int mTimer;
/* 0x3B0 */ int field_0x3B0;
/* 0x3B4 */ s16 field_0x3B4;
/* 0x3B6 */ u8 field_0x3B6[0x3B8 - 0x3B6];
/* 0x3B8 */ int field_0x3B8;
/* 0x3BC */ request_of_phase_process_class mPhsPfall;
/* 0x3C4 */ J3DModel* m3C4;
/* 0x3C8 */ dBgW* m3C8;
/* 0x3CC */ Mtx m3CC;
/* 0x3FC */ J3DModel* m3FC;
/* 0x400 */ dBgW* m400;
/* 0x404 */ Mtx m404;
/* 0x434 */ J3DModel* m434;
/* 0x438 */ u8 m438[0x43C - 0x438];
/* 0x43C */ mDoExt_McaMorf* m43C;
/* 0x440 */ u8 m440[0x444 - 0x440];
/* 0x444 */ void* vtbl;
/* 0x448 */ u8 m448[0x481 - 0x448];
/* 0x481 */ u8 mState;
/* 0x482 */ u8 m482[0x484 - 0x482];
};
/* 0x3C4 */ J3DModel* field_0x3C4;
/* 0x3C8 */ dBgW* mpBgW;
/* 0x3CC */ Mtx field_0x3CC;
/* 0x3FC */ J3DModel* field_0x3FC;
/* 0x400 */ dBgW* mpBgW2;
/* 0x404 */ Mtx field_0x404;
/* 0x434 */ J3DModel* mpHimoModel;
/* 0x438 */ f32 field_0x438;
/* 0x43C */ mDoExt_McaMorf* mpMorf;
/* 0x440 */ u8 field_0x440[0x444 - 0x440];
/* 0x444 */ mDoExt_3DlineMat1_c field_0x444;
/* 0x480 */ s8 mBckIdx;
/* 0x481 */ s8 field_0x481;
/* 0x482 */ s8 mOldAnmPrmIdx;
/* 0x483 */ bool field_0x483;
}; // Size: 0x484
class daObj_PfallHIO_c {
public:
daObj_PfallHIO_c();
virtual ~daObj_PfallHIO_c() {mNo = -1;}
public:
/* Place member variables here */
/* 0x04 */ s8 mNo;
/* 0x05 */ bool field_0x05;
/* 0x06 */ u8 field_0x06;
/* 0x07 */ u8 field_0x07;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ s16 field_0x0C;
};
#endif /* D_A_OBJ_PFALL_H */