mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-03 18:03:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

match daPy_Create, rename headers

Browse Source
This commit is contained in:
fig02
2023-09-13 00:51:01 -04:00
parent 60b9661107
commit f0526ace90
7 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/daPy_py.h → include/d/actor/d_a_player.h
+16 -6
View File
@@ -1,8 +1,9 @@
#ifndef D_A_PY_PY
#define D_A_PY_PY
#ifndef D_A_PLAYER
#define D_A_PLAYER
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "d/d_cc_d.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daPy_matAnm_c : public J3DMaterialAnm {
@@ -15,6 +16,17 @@ public:
virtual void calc(J3DMaterial*) const;
};
class daPy_mtxFollowEcallBack_c {
public:
void execute(JPABaseEmitter*);
void end();
void makeEmitter(unsigned short, float(*)[4], const cXyz*, const cXyz*);
void makeEmitterColor(unsigned short, float(*)[4], const cXyz*, const _GXColor*, const _GXColor*);
void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char);
/* 0x0 */ u8 field_0x0[0xC];
};
class daPy_HIO_c {
public:
};
@@ -51,9 +63,7 @@ private:
class daPy_py_c : public fopAc_ac_c {
public:
enum daPy_PROC {
/* 0x000 */ PROC_0,
};
enum daPy_PROC {};
/* 0x290 */ u8 mAttackState;
/* 0x291 */ u8 field_0x291;
@@ -128,4 +138,4 @@ public:
void getRopePos() const;
};
#endif /* D_A_PY_PY */
#endif /* D_A_PLAYER */
include/d/actor/daPy_lk.h → include/d/actor/d_a_player_link.h
+4 -10
View File
@@ -1,5 +1,5 @@
#ifndef D_A_PY_LK
#define D_A_PY_LK
#ifndef D_A_PLAYER_LINK
#define D_A_PLAYER_LINK
#include "JAZelAudio/JAIZelBasic.h"
#include "d/d_attention.h"
@@ -7,8 +7,7 @@
#include "d/d_bg_s_lin_chk.h"
#include "d/d_drawlist.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_com_inf_game.h"
#include "d/actor/daPy_py.h"
#include "d/actor/d_a_player.h"
class mDoExt_MtxCalcOldFrame;
@@ -97,11 +96,6 @@ public:
/* 0x0 */ u8 field_0x0[0x28];
};
class daPy_mtxFollowEcallBack_c {
public:
/* 0x0 */ u8 field_0x0[0xC];
};
class dPa_smokeEcallBack {
public:
/* 0x0 */ u8 field_0x0[0x20];
@@ -1306,4 +1300,4 @@ public:
/* 0x4AF0 */ dCcD_Cps field_0x4af0;
};
#endif /* D_A_PY_LK */
#endif /* D_A_PLAYER_LINK */