From f0526ace9097fb86606dcc8e6acd71e77fa5ee97 Mon Sep 17 00:00:00 2001 From: fig02 Date: Wed, 13 Sep 2023 00:51:01 -0400 Subject: [PATCH] match daPy_Create, rename headers --- include/d/actor/{daPy_py.h => d_a_player.h} | 22 ++++++++++++++----- .../d/actor/{daPy_lk.h => d_a_player_link.h} | 14 ++++-------- src/d/actor/d_a_item.cpp | 2 +- src/d/actor/d_a_player.cpp | 2 +- src/d/actor/d_a_player_main.cpp | 19 ++++++++-------- src/d/actor/d_a_tag_ret.cpp | 2 +- src/d/d_com_inf_game.cpp | 2 +- 7 files changed, 34 insertions(+), 29 deletions(-) rename include/d/actor/{daPy_py.h => d_a_player.h} (89%) rename include/d/actor/{daPy_lk.h => d_a_player_link.h} (99%) diff --git a/include/d/actor/daPy_py.h b/include/d/actor/d_a_player.h similarity index 89% rename from include/d/actor/daPy_py.h rename to include/d/actor/d_a_player.h index 1de78b7f7..35da93620 100644 --- a/include/d/actor/daPy_py.h +++ b/include/d/actor/d_a_player.h @@ -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 */ \ No newline at end of file +#endif /* D_A_PLAYER */ \ No newline at end of file diff --git a/include/d/actor/daPy_lk.h b/include/d/actor/d_a_player_link.h similarity index 99% rename from include/d/actor/daPy_lk.h rename to include/d/actor/d_a_player_link.h index 67fa5ac57..b966606af 100644 --- a/include/d/actor/daPy_lk.h +++ b/include/d/actor/d_a_player_link.h @@ -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 */ \ No newline at end of file +#endif /* D_A_PLAYER_LINK */ \ No newline at end of file diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index e6c61935e..cf78a68e0 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -6,7 +6,7 @@ #include "d/d_item.h" #include "d/d_item_data.h" #include "d/actor/d_a_item.h" -#include "d/actor/daPy_lk.h" +#include "d/actor/d_a_player_link.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "dolphin/types.h" diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 641e6f2f8..20b930285 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -3,8 +3,8 @@ // Translation Unit: d_a_player.cpp // -#include "daPy_lk.h" #include "dolphin/types.h" +#include "d/actor/d_a_player.h" /* 801028FC-80102940 .text changePlayer__9daPy_py_cFP10fopAc_ac_c */ void daPy_py_c::changePlayer(fopAc_ac_c*) { diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 8a353fdf0..a54255325 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -4,8 +4,9 @@ // #include "dolphin/types.h" -#include "d/actor/daPy_lk.h" +#include "d/actor/d_a_player_link.h" #include "d/d_com_inf_game.h" +#include "d/d_com_lib_game.h" /* 80102E8C-80102EAC .text daPy_createHeap__FP10fopAc_ac_c */ void daPy_createHeap(fopAc_ac_c*) { @@ -1504,15 +1505,15 @@ void phase_3(daPy_lk_c*) { /* Nonmatching */ } -/* 80127B70-80127BA0 .text daPy_Create__FP10fopAc_ac_c */ void daPy_Create(fopAc_ac_c* i_this) { - // static int (*l_method[3])(void*) = { - // (int (*)(void*))phase_1, - // (int (*)(void*))phase_2, - // (int (*)(void*))phase_3, - // }; - - // dComLbG_PhaseHandler(&((i_this)->mPhsLoad), l_method, i_this); + static int (*l_method[3])(void*) = { + (int (*)(void*))phase_1, + (int (*)(void*))phase_2, + (int (*)(void*))phase_3, + }; + daPy_lk_c* link = (daPy_lk_c*)i_this; + + dComLbG_PhaseHandler(&link->mPhsLoad, l_method, link); } /* 80127BA0-80127CC0 .text setSeAnime__9daPy_lk_cFPC14daPy_anmHeap_cP12J3DFrameCtrl */ diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index 2f431d0a2..3c0234003 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -9,7 +9,7 @@ #include "d/d_cc_d.h" #include "d/d_procname.h" #include "d/d_com_inf_game.h" -#include "d/actor/daPy_lk.h" +#include "d/actor/d_a_player_link.h" #include "JSystem/JKernel/JKRHeap.h" #include "dolphin/types.h" diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index ce6cd2105..8daaed286 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "MSL_C/string.h" #include "SSystem/SComponent/c_phase.h" -#include "d/actor/daPy_lk.h" +#include "d/actor/d_a_player_link.h" #include "d/d_com_lib_game.h" #include "d/d_demo.h" #include "d/d_flower.h"