From 96513abb0ac2d5084ef40049137204f0c4533ed8 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 30 Dec 2023 18:59:57 -0500 Subject: [PATCH] various fixes to get more actors to compile --- include/d/actor/d_a_bdk.h | 8 ++ include/d/actor/d_a_bdkobj.h | 4 + include/d/actor/d_a_bo.h | 5 + include/d/actor/d_a_bridge.h | 38 ++++++++ include/d/actor/d_a_coming2.h | 6 ++ include/d/actor/d_a_demo00.h | 33 ++++++- include/d/actor/d_a_dk.h | 4 + include/d/actor/d_a_gnd.h | 4 + include/d/actor/d_a_npc_ah.h | 4 + include/d/actor/d_a_npc_auction.h | 4 + include/d/actor/d_a_npc_ba1.h | 22 ++--- include/d/actor/d_a_npc_bj1.h | 15 +++ include/d/actor/d_a_npc_bm1.h | 13 +++ include/d/actor/d_a_npc_bmsw.h | 42 +++++++++ include/d/actor/d_a_npc_btsw.h | 35 +++++++ include/d/actor/d_a_npc_cb1.h | 1 + include/d/actor/d_a_npc_co1.h | 5 + include/d/actor/d_a_npc_gp1.h | 2 + include/d/actor/d_a_npc_mn.h | 5 + include/d/actor/d_a_npc_photo.h | 5 + include/d/actor/d_a_npc_tt.h | 5 + include/d/actor/d_a_npc_zl1.h | 135 ++++++++++++++++++++++++++- include/d/actor/d_a_obj_barrel.h | 8 ++ include/d/actor/d_a_obj_barrel2.h | 8 ++ include/d/actor/d_a_obj_coming.h | 8 +- include/d/actor/d_a_obj_flame.h | 8 ++ include/d/actor/d_a_obj_kanoke.h | 5 + include/d/actor/d_a_obj_magmarock.h | 13 +++ include/d/actor/d_a_obj_otble.h | 8 ++ include/d/actor/d_a_obj_pirateship.h | 10 +- include/d/actor/d_a_obj_search.h | 9 ++ include/d/actor/d_a_obj_shmrgrd.h | 1 + include/d/actor/d_a_obj_swlight.h | 4 + include/d/actor/d_a_obj_table.h | 4 +- include/d/actor/d_a_obj_vyasi.h | 3 + include/d/actor/d_a_pz.h | 10 ++ include/d/actor/d_a_salvage_tbox.h | 17 ++++ include/d/actor/d_a_ss.h | 4 + include/d/actor/d_a_stone.h | 74 ++++++++++++++- include/d/actor/d_a_tsubo.h | 8 ++ src/d/actor/d_a_bb.cpp | 2 +- src/d/actor/d_a_bdk.cpp | 2 +- src/d/actor/d_a_bdkobj.cpp | 2 +- src/d/actor/d_a_bmdfoot.cpp | 2 +- src/d/actor/d_a_bo.cpp | 15 --- src/d/actor/d_a_bridge.cpp | 2 +- src/d/actor/d_a_bst.cpp | 2 +- src/d/actor/d_a_btd.cpp | 2 +- src/d/actor/d_a_canon.cpp | 2 +- src/d/actor/d_a_daiocta.cpp | 2 +- src/d/actor/d_a_daiocta_eye.cpp | 2 +- src/d/actor/d_a_dk.cpp | 2 +- src/d/actor/d_a_dr2.cpp | 2 +- src/d/actor/d_a_gm.cpp | 2 +- src/d/actor/d_a_icelift.cpp | 2 +- src/d/actor/d_a_jbo.cpp | 2 +- src/d/actor/d_a_kamome.cpp | 2 +- src/d/actor/d_a_kb.cpp | 2 +- src/d/actor/d_a_ki.cpp | 2 +- src/d/actor/d_a_kita.cpp | 2 +- src/d/actor/d_a_klft.cpp | 2 +- src/d/actor/d_a_leaflift.cpp | 3 +- src/d/actor/d_a_lwood.cpp | 2 +- src/d/actor/d_a_machine.cpp | 2 +- src/d/actor/d_a_mflft.cpp | 2 +- src/d/actor/d_a_msw.cpp | 2 +- src/d/actor/d_a_mt.cpp | 2 +- src/d/actor/d_a_npc_ah.cpp | 2 +- src/d/actor/d_a_npc_auction.cpp | 2 +- src/d/actor/d_a_npc_ba1.cpp | 22 ++--- src/d/actor/d_a_npc_bj1.cpp | 30 +++--- src/d/actor/d_a_npc_bm1.cpp | 26 +++--- src/d/actor/d_a_npc_btsw.cpp | 2 +- src/d/actor/d_a_npc_btsw2.cpp | 2 +- src/d/actor/d_a_npc_cb1.cpp | 46 --------- src/d/actor/d_a_npc_co1.cpp | 10 +- src/d/actor/d_a_npc_gp1.cpp | 4 +- src/d/actor/d_a_npc_kp1.cpp | 2 +- src/d/actor/d_a_npc_mk.cpp | 2 +- src/d/actor/d_a_npc_mn.cpp | 2 +- src/d/actor/d_a_npc_p1.cpp | 2 +- src/d/actor/d_a_npc_photo.cpp | 2 +- src/d/actor/d_a_npc_tc.cpp | 2 +- src/d/actor/d_a_npc_tt.cpp | 2 +- src/d/actor/d_a_npc_uk.cpp | 2 +- src/d/actor/d_a_npc_zl1.cpp | 2 +- src/d/actor/d_a_obj_balancelift.cpp | 2 +- src/d/actor/d_a_obj_barrel.cpp | 10 +- src/d/actor/d_a_obj_barrel2.cpp | 10 +- src/d/actor/d_a_obj_flame.cpp | 10 +- src/d/actor/d_a_obj_leaves.cpp | 4 +- src/d/actor/d_a_obj_magmarock.cpp | 10 +- src/d/actor/d_a_obj_otble.cpp | 10 +- src/d/actor/d_a_obj_pirateship.cpp | 12 ++- src/d/actor/d_a_obj_rflw.cpp | 2 +- src/d/actor/d_a_obj_search.cpp | 10 +- src/d/actor/d_a_obj_stair.cpp | 2 +- src/d/actor/d_a_obj_table.cpp | 6 +- src/d/actor/d_a_obj_warpt.cpp | 2 +- src/d/actor/d_a_oq.cpp | 2 +- src/d/actor/d_a_salvage_tbox.cpp | 6 -- src/d/actor/d_a_ship.cpp | 41 -------- src/d/actor/d_a_sk.cpp | 2 +- src/d/actor/d_a_sk2.cpp | 2 +- src/d/actor/d_a_ss.cpp | 2 +- src/d/actor/d_a_ssk.cpp | 2 +- src/d/actor/d_a_stone.cpp | 10 +- src/d/actor/d_a_swpropeller.cpp | 2 +- src/d/actor/d_a_syan.cpp | 2 +- src/d/actor/d_a_tn.cpp | 2 +- src/d/actor/d_a_toge.cpp | 2 +- src/d/actor/d_a_tornado.cpp | 2 +- src/d/actor/d_a_tsubo.cpp | 10 +- src/d/actor/d_a_windmill.cpp | 2 +- src/d/actor/d_a_wz.cpp | 2 +- src/d/actor/d_a_ykgr.cpp | 16 ---- 116 files changed, 728 insertions(+), 298 deletions(-) diff --git a/include/d/actor/d_a_bdk.h b/include/d/actor/d_a_bdk.h index 73864203b..620bca413 100644 --- a/include/d/actor/d_a_bdk.h +++ b/include/d/actor/d_a_bdk.h @@ -3,6 +3,14 @@ #include "f_op/f_op_actor.h" +struct bdk_tail_s { + +}; + +struct bdk_eff_s { + +}; + class bdk_class : public fopAc_ac_c { public: /* Place member variables here */ diff --git a/include/d/actor/d_a_bdkobj.h b/include/d/actor/d_a_bdkobj.h index efaa4f784..1c3e71b05 100644 --- a/include/d/actor/d_a_bdkobj.h +++ b/include/d/actor/d_a_bdkobj.h @@ -4,6 +4,10 @@ #include "f_op/f_op_actor.h" #include "d/d_particle.h" +struct bdo_eff_s { + +}; + class bdkobj_class : public fopAc_ac_c { public: /* 0x290 */ u8 m290[0x918 - 0x290]; diff --git a/include/d/actor/d_a_bo.h b/include/d/actor/d_a_bo.h index 917657f7f..6646ef2e0 100644 --- a/include/d/actor/d_a_bo.h +++ b/include/d/actor/d_a_bo.h @@ -4,6 +4,11 @@ #include "f_op/f_op_actor.h" #include "c/c_damagereaction.h" +class yodare_ato_PcallBack_c : public dPa_smokePcallBack { +public: + void execute(JPABaseEmitter*, JPABaseParticle*); +}; + class bo_class : public fopEn_enemy_c { public: /* 0x2AC */ u8 m2AC[0x9FC - 0x2AC]; diff --git a/include/d/actor/d_a_bridge.h b/include/d/actor/d_a_bridge.h index 7cc21380d..b2c5cddbd 100644 --- a/include/d/actor/d_a_bridge.h +++ b/include/d/actor/d_a_bridge.h @@ -6,6 +6,44 @@ #include "m_Do/m_Do_ext.h" #include "SSystem/SComponent/c_phase.h" +class dBgWSv; +class JPABaseEmitter; + +struct br_s { + /* 0x000 */ J3DModel* mpModel; + /* 0x004 */ u8 m004[0x0B4 - 0x004]; + /* 0x0B4 */ J3DModel* mpModelRope1; + /* 0x0B8 */ J3DModel* mpModelRope0; + /* 0x0BC */ mDoExt_3DlineMat1_c mLineMat1; + /* 0x0F8 */ cXyz m0F8[3]; + /* 0x11C */ cXyz m11C[3]; + /* 0x140 */ dCcD_Cyl mCyl[2]; + /* 0x3A0 */ s16 m3A0[2]; + /* 0x3A4 */ u8 m3A4; + /* 0x3A5 */ u8 m3A5; + /* 0x3A6 */ u8 m3A6[0x3A8 - 0x3A6]; + /* 0x3A8 */ cXyz m3A8[2]; + /* 0x3C0 */ s16 m3C0; + /* 0x3C2 */ s16 m3C2; + /* 0x3C4 */ JPABaseEmitter* m3C4; + /* 0x3C8 */ JPABaseEmitter* m3C8; + /* 0x3CC */ cXyz m3CC; + /* 0x3D8 */ cXyz mPosition; + /* 0x3E4 */ csXyz mRotation; + /* 0x3EA */ s16 mRotationYExtra; + /* 0x3EC */ f32 m3EC; + /* 0x3F0 */ f32 m3F0; + /* 0x3F4 */ f32 m3F4; + /* 0x3F8 */ u8 m3F8[0x3FC - 0x3F8]; + /* 0x3FC */ f32 m3FC; + /* 0x400 */ u8 m400[0x408 - 0x400]; + /* 0x408 */ u8 m408; + /* 0x409 */ u8 m409[0x40C - 0x409]; + /* 0x40C */ cXyz mScale; + /* 0x418 */ s16 m418; + /* 0x41A */ u8 m41A[0x41C - 0x41A]; +}; + class bridge_class : public fopAc_ac_c { public: /* 0x0290 */ request_of_phase_process_class mPhsBridge; diff --git a/include/d/actor/d_a_coming2.h b/include/d/actor/d_a_coming2.h index 148a10eb1..2e57e2e7e 100644 --- a/include/d/actor/d_a_coming2.h +++ b/include/d/actor/d_a_coming2.h @@ -2,8 +2,14 @@ #define D_A_COMING2_H #include "f_op/f_op_actor.h" +#include "d/actor/d_a_obj_barrel2.h" namespace daComing2 { + static void get_speed(fopAc_ac_c*); + static void position_is_safety_call_back(void*, void*); + static void position_is_none_obj(cXyz*); + static void checkLineCrossXZ(cXyz*, cXyz*, cXyz*, cXyz*); + class Act_c : public fopAc_ac_c { public: void get_coming_point() {} diff --git a/include/d/actor/d_a_demo00.h b/include/d/actor/d_a_demo00.h index 31741d7ee..861beaf6b 100644 --- a/include/d/actor/d_a_demo00.h +++ b/include/d/actor/d_a_demo00.h @@ -3,14 +3,41 @@ #include "f_op/f_op_actor.h" -class daDemo00_resID_c : public fopAc_ac_c { -public: - void operator=(const daDemo00_resID_c&) {} +class dDemo_actor_c; +class daDemo00_model_c { +public: void reset(); public: /* Place member variables here */ }; +class daDemo00_resID_c { +public: + void reset(); + +public: + /* Place member variables here */ +}; + +class daDemo00_c : public fopAc_ac_c { +public: + void action(dDemo_actor_c*) {} + void setAction(int (daDemo00_c::*)(dDemo_actor_c*)) {} + + void setBaseMtx(); + void setShadowSize(); + void createHeap(); + void actStandby(dDemo_actor_c*); + void actPerformance(dDemo_actor_c*); + void actLeaving(dDemo_actor_c*); + inline BOOL create(); + BOOL draw(); + BOOL execute(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_DEMO00_H */ diff --git a/include/d/actor/d_a_dk.h b/include/d/actor/d_a_dk.h index 9e2b8efe0..b37530964 100644 --- a/include/d/actor/d_a_dk.h +++ b/include/d/actor/d_a_dk.h @@ -3,6 +3,10 @@ #include "f_op/f_op_actor.h" +struct tail_s { + +}; + class dk_class : public fopAc_ac_c { public: /* Place member variables here */ diff --git a/include/d/actor/d_a_gnd.h b/include/d/actor/d_a_gnd.h index 9da944a7d..5319b8450 100644 --- a/include/d/actor/d_a_gnd.h +++ b/include/d/actor/d_a_gnd.h @@ -3,6 +3,10 @@ #include "f_op/f_op_actor.h" +struct gnd_ke_s { + +}; + class gnd_class : public fopEn_enemy_c { public: /* 0x02AC */ u8 m02AC[0x13CF - 0x02AC]; diff --git a/include/d/actor/d_a_npc_ah.h b/include/d/actor/d_a_npc_ah.h index 9298b6aad..f7eeab65c 100644 --- a/include/d/actor/d_a_npc_ah.h +++ b/include/d/actor/d_a_npc_ah.h @@ -4,6 +4,10 @@ #include "f_op/f_op_actor.h" #include "d/d_cc_d.h" +struct sAhAnmDat { + +}; + class daNpcAh_c : public fopAc_ac_c { public: void getPhaseP() {} diff --git a/include/d/actor/d_a_npc_auction.h b/include/d/actor/d_a_npc_auction.h index ac46ab07a..521bcdc51 100644 --- a/include/d/actor/d_a_npc_auction.h +++ b/include/d/actor/d_a_npc_auction.h @@ -3,6 +3,10 @@ #include "f_op/f_op_actor.h" +struct sAnmDat { + +}; + class daNpcAuction_c : public fopAc_ac_c { public: inline s32 _create(); diff --git a/include/d/actor/d_a_npc_ba1.h b/include/d/actor/d_a_npc_ba1.h index 6fcd59862..c05f67316 100644 --- a/include/d/actor/d_a_npc_ba1.h +++ b/include/d/actor/d_a_npc_ba1.h @@ -59,21 +59,21 @@ public: void checkCommandTalk(); void charDecide(int); void eInit_SET_PLYER_GOL_(); - void eInit_PLYER_INI_POS(); - void eInit_USE_FAIRY_END(); - void eInit_MOV_POS(); - void eInit_SET_PLYER_TRN_ANG(); - void eInit_ACTOR_DRW_CONTROL(int*, int*); + void eInit_PLYER_INI_POS_(); + void eInit_USE_FAIRY_END_(); + void eInit_MOV_POS_(); + void eInit_SET_PLYER_TRN_ANG_(); + void eInit_ACTOR_DRW_CONTROL_(int*, int*); void eInit_setEvTimer(int*); - void eInit_CHK_FAIRY(int*); + void eInit_CHK_FAIRY_(int*); void eInit_prmFloat(float*, float); - void eInit_SET_EYE_OFF(float*); - void eInit_EYE_OFF_ZRO(float*); + void eInit_SET_EYE_OFF_(float*); + void eInit_EYE_OFF_ZRO_(float*); void eInit_CHK_FAIRY_MOV_1(int*); void event_actionInit(int); - void eMove_MOV_POS(); - void eMove_CHK_FAIRY(); - void eMove_EYE_OFF_ZRO(); + void eMove_MOV_POS_(); + void eMove_CHK_FAIRY_(); + void eMove_EYE_OFF_ZRO_(); void eMove_CHK_FAIRY_MOV_1(); void event_action(); void cut_init_START_TALE1(int); diff --git a/include/d/actor/d_a_npc_bj1.h b/include/d/actor/d_a_npc_bj1.h index c8bfe6abb..d1a61ec16 100644 --- a/include/d/actor/d_a_npc_bj1.h +++ b/include/d/actor/d_a_npc_bj1.h @@ -58,6 +58,7 @@ public: void searchByID(unsigned int); void partner_srch_sub(void* (*)(void*, void*)); void partner_srch(); + void setCollision_SP_(); void set_pthPoint(unsigned char); void bj_clcFlySpd(); void bj_movPass(bool); @@ -79,7 +80,21 @@ public: void eInit_setEvTimer(int*); void eInit_calcRelativPos(cXyz*, int*); void eInit_prmFloat(float*, float); + void eInit_ATTENTION_(int*, int*, int*, cXyz*, int*, int*, int*); + void eInit_PLYER_MOV_1_(); + void eInit_MOV_(float*, float*, float*, int*); + void eInit_JMP_(float*, float*); + void eInit_CHG_PTH_(int*, int*); + void eInit_END_MOV_(); + void eInit_SET_TNE_(); + void eInit_DEL_TNE_(); + void eInit_SET_ANM_(int*, float*); void event_actionInit(int); + void eMove_ATTENTION_(); + void eMove_MOV_(); + void eMove_JMP_(); + void eMove_SET_TNE_(); + void eMove_PTH_MOV_(); void event_action(); void privateCut(int); void endEvent(); diff --git a/include/d/actor/d_a_npc_bm1.h b/include/d/actor/d_a_npc_bm1.h index 524b8a40a..b4dd74ad4 100644 --- a/include/d/actor/d_a_npc_bm1.h +++ b/include/d/actor/d_a_npc_bm1.h @@ -108,8 +108,21 @@ public: void eInit_setShapeAngleY(int*, short); void eInit_setEvTimer(int*); void eInit_calcRelativPos(cXyz*, int*); + void eInit_ATTENTION_(int*, int*, int*, cXyz*, int*, int*, int*); + void eInit_SET_PLYER_GOL_(int*, cXyz*, int*); void eInit_prmFloat(float*, float); + void eInit_FLY_(int*, float*, float*, float*, float*); + void eInit_DEL_ACTOR_(); + void eInit_WLK_(int*, float*, float*, cXyz*, int*, int*, int*); + void eInit_INI_EVN_1_(); + void eInit_SET_NXT_PTH_INF_(); + void eInit_SET_ANM_(int*); + void eInit_MOV_PTH_POINT_(int*, int*, int*, int*); void event_actionInit(int); + void eMove_ATTENTION_(); + void eMove_KMA_FLY_(); + void eMove_FLY_(); + void eMove_WLK_(); void event_action(); void cut_init_360_TRN(int); void cut_move_360_TRN(); diff --git a/include/d/actor/d_a_npc_bmsw.h b/include/d/actor/d_a_npc_bmsw.h index 8c7c2579d..6b259c274 100644 --- a/include/d/actor/d_a_npc_bmsw.h +++ b/include/d/actor/d_a_npc_bmsw.h @@ -45,6 +45,48 @@ public: /* 0x96C */ u8 m96C[0x9E4 - 0x96C]; }; +class SwMail_c { +public: + void CheckProc(void (SwMail_c::*)()) {} + void SetProc(void (SwMail_c::*)()) {} + + void MailCreateInit(cXyz*, cXyz*); + void getNextNo(unsigned char); + void init(); + void set_mtx(); + void set_mtx_throw(); + void DummyInit(); + void Dummy(); + void AppearInit(); + void Appear(); + void WaitInit(); + void Wait(); + void ThrowInit(cXyz, unsigned char); + void Throw(); + void EndInit(); + void End(); + void SeDelete(); + void move(); + void draw(dKy_tevstr_c*); + +public: + /* Place member variables here */ +}; + +class SwCam_c { +public: + void ActiveOff() {} + void ActiveOn() {} + void getCenterP() {} + void getEyeP() {} + void setAimIdx(signed char, signed char) {} + + void Move(); + +public: + /* Place member variables here */ +}; + class daNpc_Bmsw_HIO_c { public: daNpc_Bmsw_HIO_c(); diff --git a/include/d/actor/d_a_npc_btsw.h b/include/d/actor/d_a_npc_btsw.h index fd364ef58..8cebff782 100644 --- a/include/d/actor/d_a_npc_btsw.h +++ b/include/d/actor/d_a_npc_btsw.h @@ -39,6 +39,41 @@ public: /* Place member variables here */ }; +class SwMail2_c { +public: + void CheckProc(void (SwMail2_c::*)()) {} + void SetProc(void (SwMail2_c::*)()) {} + + void MailCreateInit(cXyz*, cXyz*); + void getNextNo(unsigned char); + void init(); + void set_mtx(); + void set_mtx_throw(); + void DummyInit(); + void Dummy(); + void AppearInit(); + void Appear(); + void WaitInit(); + void Wait(); + void ThrowInit(cXyz, unsigned char); + void Throw(); + void EndInit(); + void End(); + void SeDelete(); + void move(); + void draw(dKy_tevstr_c*); +}; + +class SwCam2_c { + void ActiveOff() {} + void ActiveOn() {} + void getCenterP() {} + void getEyeP() {} + void setAimIdx(signed char, signed char) {} + + void Move(); +}; + class daNpc_Btsw_HIO_c { public: daNpc_Btsw_HIO_c(); diff --git a/include/d/actor/d_a_npc_cb1.h b/include/d/actor/d_a_npc_cb1.h index 78ac9527d..6147bebb8 100644 --- a/include/d/actor/d_a_npc_cb1.h +++ b/include/d/actor/d_a_npc_cb1.h @@ -74,6 +74,7 @@ public: static s16 getMaxFlyingTimer(); static bool isPlayerRoom() { return m_playerRoom; } + ~daNpc_Cb1_c(); void isTagCheckOK(); void setMessageAnimation(unsigned char); s32 create(); diff --git a/include/d/actor/d_a_npc_co1.h b/include/d/actor/d_a_npc_co1.h index 12d86cfe5..02c3b0690 100644 --- a/include/d/actor/d_a_npc_co1.h +++ b/include/d/actor/d_a_npc_co1.h @@ -34,6 +34,7 @@ public: void anmAtr(unsigned short); void eventOrder(); void checkOrder(); + void setCollision_SP_(); void set_target(int); void chk_talk(); void chk_partsNotMove(); @@ -44,7 +45,11 @@ public: void chkAttention(); void setAttention(bool); void charDecide(int); + void eInit_MDR_(); + void eInit_RED_LTR_(); void event_actionInit(int); + void eMove_MDR_(); + void eMove_RED_LTR_(); void event_action(); void privateCut(int); void endEvent(); diff --git a/include/d/actor/d_a_npc_gp1.h b/include/d/actor/d_a_npc_gp1.h index 35d581dc3..f2697aa11 100644 --- a/include/d/actor/d_a_npc_gp1.h +++ b/include/d/actor/d_a_npc_gp1.h @@ -50,6 +50,8 @@ public: void gp_nMove(); void create_rupee(); void charDecide(int); + void eInit_INI_KAERE_KAERE_(); + void eInit_END_KAERE_KAERE_(); void event_actionInit(int); void event_action(); void privateCut(int); diff --git a/include/d/actor/d_a_npc_mn.h b/include/d/actor/d_a_npc_mn.h index 3456e7143..b4c24d307 100644 --- a/include/d/actor/d_a_npc_mn.h +++ b/include/d/actor/d_a_npc_mn.h @@ -4,6 +4,10 @@ #include "f_op/f_op_actor.h" #include "d/d_cc_d.h" +struct sMnAnmDat { + +}; + class daNpcMn_c : public fopAc_ac_c { public: void getNpcNo() {} @@ -11,6 +15,7 @@ public: void getPosFlag() {} void setResFlag(unsigned char) {} + daNpcMn_c(); s32 _create(); void createHeap(); void createInit(); diff --git a/include/d/actor/d_a_npc_photo.h b/include/d/actor/d_a_npc_photo.h index ae8dc9f68..97de393b0 100644 --- a/include/d/actor/d_a_npc_photo.h +++ b/include/d/actor/d_a_npc_photo.h @@ -4,6 +4,10 @@ #include "f_op/f_op_actor.h" #include "d/d_cc_d.h" +struct sPhotoAnmDat { + +}; + class daNpcPhoto_c : public fopAc_ac_c { public: void getPhaseP() {} @@ -14,6 +18,7 @@ public: void setPosFlag(unsigned char) {} void setResFlag(unsigned char) {} + daNpcPhoto_c(); s32 _create(); void createHeap(); void createInit(); diff --git a/include/d/actor/d_a_npc_tt.h b/include/d/actor/d_a_npc_tt.h index 50f296342..317dfc207 100644 --- a/include/d/actor/d_a_npc_tt.h +++ b/include/d/actor/d_a_npc_tt.h @@ -3,6 +3,11 @@ #include "f_op/f_op_actor.h" +struct tt_ke_s { + void ke_control(float); + void ke_pos_set(cXyz*); +}; + class daNpc_Tt_c : public fopAc_ac_c { public: void ChkOrder(unsigned char) {} diff --git a/include/d/actor/d_a_npc_zl1.h b/include/d/actor/d_a_npc_zl1.h index 90f9c97d9..0a2d51dc1 100644 --- a/include/d/actor/d_a_npc_zl1.h +++ b/include/d/actor/d_a_npc_zl1.h @@ -4,20 +4,153 @@ #include "f_op/f_op_actor.h" class J3DMaterial; +class J3DNode; -class daNpc_Zl1_matAnm_c : public fopAc_ac_c { +class daNpc_Zl1_matAnm_c { public: void clrMoveFlag() {} void getNowOffsetX() {} void getNowOffsetY() {} void setMoveFlag() {} + daNpc_Zl1_matAnm_c(); void calc(J3DMaterial*) const; public: /* Place member variables here */ }; +class daNpc_Zl1_c : public fopAc_ac_c { +public: + struct anm_prm_c { + + }; + + void _nodeCB_Head(J3DNode*, J3DModel*); + void _nodeCB_BackBone(J3DNode*, J3DModel*); + void set_startPos(int); + void init_ZL1_0(); + void init_ZL1_1(); + void init_ZL1_2(); + void init_ZL1_3(); + void init_ZL1_4(); + void init_ZL1_5(); + void init_ZL1_6(); + void init_ZL1_7(); + void createInit(); + void play_animation(); + void swoon_OnShip(); + void setMtx(bool); + void bckResID(int); + void btpResID(int); + void btkResID(int); + void setBtp(signed char, bool); + void setMat(); + void setBtk(signed char, bool); + void init_texPttrnAnm(signed char, bool); + void play_btp_anm(); + void eye_ctrl(); + void play_btk_anm(); + void setAnm_anm(daNpc_Zl1_c::anm_prm_c*); + void setAnm_NUM(int, int); + void setAnm(); + void chngAnmTag(); + void ctrlAnmTag(); + void chngAnmAtr(unsigned char); + void ctrlAnmAtr(); + void setAnm_ATR(); + void anmAtr(unsigned short); + void next_msgStatus(unsigned long*); + void getMsg_ZL1_2(); + void getMsg_ZL1_4(); + void getMsg_ZL1_5(); + void getMsg(); + void eventOrder(); + void checkOrder(); + void chk_talk(); + void chk_parts_notMov(); + void searchByID(unsigned int, int*); + void partner_search_sub(void* (*)(void*, void*)); + void partner_search(); + void setEyeCtrl(); + void clrEyeCtrl(); + void lookBack(); + void chkAttention(); + void setAttention(bool); + void decideType(int); + void get_prmFloat(float*, float); + void set_LightPos(); + void init_Light(); + void incEnvironment(); + void decEnvironment(); + void darkProc(); + void cut_init_LOK_PLYER(int); + void cut_move_LOK_PLYER(); + void cut_init_LOK_PARTNER(int); + void cut_move_LOK_PARTNER(); + void cut_init_CHG_ANM_ATR(int); + void cut_move_CHG_ANM_ATR(); + void cut_init_PLYER_TRN_PARTNER(int); + void cut_move_PLYER_TRN_PARTNER(); + void cut_init_PLYER_TRN_TETRA(int); + void cut_move_PLYER_TRN_TETRA(); + void cut_init_MAJYU_START(int); + void cut_move_MAJYU_START(); + void cut_init_OKIRU(int); + void cut_move_OKIRU(); + void cut_init_OKIRU_2(int); + void cut_move_OKIRU_2(); + void cut_init_DRW_ONOFF(int); + void cut_move_DRW_ONOFF(); + void cut_init_PLYER_DRW_ONOFF(int); + void cut_move_PLYER_DRW_ONOFF(); + void cut_init_JMP_OFF(int); + void cut_move_JMP_OFF(); + void cut_init_OMAMORI_ONOFF(int); + void cut_move_OMAMORI_ONOFF(); + void cut_init_SURPRISED(int); + void cut_move_SURPRISED(); + void privateCut(int); + void endEvent(); + void isEventEntry(); + void event_proc(int); + void set_action(int (daNpc_Zl1_c::*)(void*), void*); + void setStt(signed char); + void chk_areaIN(float, float, short, cXyz); + void setWaterRipple(); + void setWaterSplash(); + void set_simpleLand(bool); + void setEff(); + void setFrontWallType(); + void move_jmp(); + void kyoroPos(int); + void kyorokyoro(); + void wait_1(); + void talk_1(); + void demo_1(); + void demo_2(); + void demo_3(); + void demo_4(); + void optn_1(); + void optn_2(); + void optn_3(); + void wait_action1(void*); + void demo_action1(void*); + void demo_action2(void*); + void optn_action1(void*); + void demo(); + void shadowDraw(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); + void bodyCreateHeap(); + void itemCreateHeap(); + void CreateHeap(); +public: + /* Place member variables here */ +}; + class daNpc_Zl1_HIO_c { public: daNpc_Zl1_HIO_c(); diff --git a/include/d/actor/d_a_obj_barrel.h b/include/d/actor/d_a_obj_barrel.h index 036b6a1ec..3ab981f48 100644 --- a/include/d/actor/d_a_obj_barrel.h +++ b/include/d/actor/d_a_obj_barrel.h @@ -55,6 +55,14 @@ namespace daObjBarrel { public: /* Place member variables here */ }; + + namespace Method { + s32 Create(void*); + BOOL Delete(void*); + BOOL Execute(void*); + BOOL Draw(void*); + BOOL IsDelete(void*); + }; }; #endif /* D_A_OBJ_BARREL_H */ diff --git a/include/d/actor/d_a_obj_barrel2.h b/include/d/actor/d_a_obj_barrel2.h index 81bc0bc31..cf739d7b4 100644 --- a/include/d/actor/d_a_obj_barrel2.h +++ b/include/d/actor/d_a_obj_barrel2.h @@ -79,6 +79,14 @@ namespace daObjBarrel2 { public: /* Place member variables here */ }; + + namespace Method { + s32 Create(void*); + BOOL Delete(void*); + BOOL Execute(void*); + BOOL Draw(void*); + BOOL IsDelete(void*); + }; }; #endif /* D_A_OBJ_BARREL2_H */ diff --git a/include/d/actor/d_a_obj_coming.h b/include/d/actor/d_a_obj_coming.h index 40ab82179..7481aea3f 100644 --- a/include/d/actor/d_a_obj_coming.h +++ b/include/d/actor/d_a_obj_coming.h @@ -8,8 +8,14 @@ namespace daObjComing { }; + class Act_c; + struct Ctrl_c { - + void init(const daObjComing::Act_c*); + void init_timer(const daObjComing::Act_c*); + void set_wait_timer(const daObjComing::Act_c*); + void set_retry_timer(const daObjComing::Act_c*); + void set_appear_timer(const daObjComing::Act_c*); }; class Act_c : public fopAc_ac_c { diff --git a/include/d/actor/d_a_obj_flame.h b/include/d/actor/d_a_obj_flame.h index 2d593214f..4d5810461 100644 --- a/include/d/actor/d_a_obj_flame.h +++ b/include/d/actor/d_a_obj_flame.h @@ -89,6 +89,14 @@ namespace daObjFlame { /* 0x474 */ cXyz mOrigScale; /* 0x480 */ u8 m480[0x500 - 0x480]; }; + + namespace Method { + s32 Create(void*); + BOOL Delete(void*); + BOOL Execute(void*); + BOOL Draw(void*); + BOOL IsDelete(void*); + }; }; #endif /* D_A_OBJ_FLAME_H */ diff --git a/include/d/actor/d_a_obj_kanoke.h b/include/d/actor/d_a_obj_kanoke.h index cd552d021..82658897f 100644 --- a/include/d/actor/d_a_obj_kanoke.h +++ b/include/d/actor/d_a_obj_kanoke.h @@ -5,6 +5,11 @@ class daObjKanoke_c : public fopAc_ac_c { public: + enum Prm_e { + + }; + + daObjKanoke_c(); s32 _create(); void createHeap(); void createInit(); diff --git a/include/d/actor/d_a_obj_magmarock.h b/include/d/actor/d_a_obj_magmarock.h index 357a6ed00..747aeacf2 100644 --- a/include/d/actor/d_a_obj_magmarock.h +++ b/include/d/actor/d_a_obj_magmarock.h @@ -3,7 +3,12 @@ #include "f_op/f_op_actor.h" +class dBgW; + namespace daObjMagmarock { + static void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + static void CheckCreateHeap(fopAc_ac_c*); + class Act_c : public fopAc_ac_c { public: void MeltDownRequest() {} @@ -37,6 +42,14 @@ namespace daObjMagmarock { public: /* Place member variables here */ }; + + namespace Method { + s32 Create(void*); + BOOL Delete(void*); + BOOL Execute(void*); + BOOL Draw(void*); + BOOL IsDelete(void*); + }; }; #endif /* D_A_OBJ_MAGMAROCK_H */ diff --git a/include/d/actor/d_a_obj_otble.h b/include/d/actor/d_a_obj_otble.h index 7e766cfcf..fd807f7c4 100644 --- a/include/d/actor/d_a_obj_otble.h +++ b/include/d/actor/d_a_obj_otble.h @@ -19,6 +19,14 @@ namespace daObj_Otble { public: /* Place member variables here */ }; + + namespace Mthd { + s32 Create(void*); + BOOL Delete(void*); + BOOL Execute(void*); + BOOL Draw(void*); + BOOL IsDelete(void*); + }; }; #endif /* D_A_OBJ_OTBLE_H */ diff --git a/include/d/actor/d_a_obj_pirateship.h b/include/d/actor/d_a_obj_pirateship.h index 806fa4027..264f3bf7a 100644 --- a/include/d/actor/d_a_obj_pirateship.h +++ b/include/d/actor/d_a_obj_pirateship.h @@ -4,6 +4,8 @@ #include "f_op/f_op_actor.h" namespace daObjPirateship { + static f32 getShipOffsetY(s16*, s16*, f32); + class Act_c : public fopAc_ac_c { public: inline s32 _create(); @@ -34,7 +36,13 @@ namespace daObjPirateship { /* 0x2D4 */ u8 m2D4[0x6D4 - 0x2D4]; }; - static f32 getShipOffsetY(s16*, s16*, f32); + namespace Method { + s32 Create(void*); + BOOL Delete(void*); + BOOL Execute(void*); + BOOL Draw(void*); + BOOL IsDelete(void*); + }; }; #endif /* D_A_OBJ_PIRATESHIP_H */ diff --git a/include/d/actor/d_a_obj_search.h b/include/d/actor/d_a_obj_search.h index bda38c7f4..051bb5b05 100644 --- a/include/d/actor/d_a_obj_search.h +++ b/include/d/actor/d_a_obj_search.h @@ -70,8 +70,17 @@ namespace daObj_Search { class Bgc_c { public: + Bgc_c(); void wall_pos(const daObj_Search::Act_c*, cXyz*, cXyz*, bool*, float*); }; + + namespace Mthd { + s32 Create(void*); + BOOL Delete(void*); + BOOL Execute(void*); + BOOL Draw(void*); + BOOL IsDelete(void*); + }; }; #endif /* D_A_OBJ_SEARCH_H */ diff --git a/include/d/actor/d_a_obj_shmrgrd.h b/include/d/actor/d_a_obj_shmrgrd.h index 842cb0d83..518215408 100644 --- a/include/d/actor/d_a_obj_shmrgrd.h +++ b/include/d/actor/d_a_obj_shmrgrd.h @@ -12,6 +12,7 @@ public: void on_switch() const {} void prm_get_swSave() const {} + daObjShmrgrd_c(); void solidHeapCB(fopAc_ac_c*); void create_heap(); s32 _create(); diff --git a/include/d/actor/d_a_obj_swlight.h b/include/d/actor/d_a_obj_swlight.h index 60e52012e..95e81f905 100644 --- a/include/d/actor/d_a_obj_swlight.h +++ b/include/d/actor/d_a_obj_swlight.h @@ -4,8 +4,12 @@ #include "f_op/f_op_actor.h" class J3DNode; +class J3DMaterial; namespace daObjSwlight { + static void setMaterial(J3DMaterial*, unsigned char); + static void setMaterial_Before_mirror(J3DMaterial*, unsigned char); + class Act_c : public fopAc_ac_c { public: void get_power() const {} diff --git a/include/d/actor/d_a_obj_table.h b/include/d/actor/d_a_obj_table.h index a23182642..5b0939a75 100644 --- a/include/d/actor/d_a_obj_table.h +++ b/include/d/actor/d_a_obj_table.h @@ -10,14 +10,14 @@ namespace daObjTable { public: void prm_get_mdl() const {} - int CreateHeap(); + BOOL CreateHeap(); int Create(); void Mthd_Create(); BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); - int Execute(float(**)[3][4]); + int Execute(Mtx**); BOOL Draw(); public: diff --git a/include/d/actor/d_a_obj_vyasi.h b/include/d/actor/d_a_obj_vyasi.h index 9d3659f4f..615963ced 100644 --- a/include/d/actor/d_a_obj_vyasi.h +++ b/include/d/actor/d_a_obj_vyasi.h @@ -7,8 +7,11 @@ class J3DAnmTransformKey; class mDoExt_McaMorf; +class J3DNode; namespace daObjVyasi { + static void JointNodeCallBack(J3DNode*, int); + class Act_c : public fopAc_ac_c { public: void is_switch() const {} diff --git a/include/d/actor/d_a_pz.h b/include/d/actor/d_a_pz.h index 9da04a7ad..36518f26b 100644 --- a/include/d/actor/d_a_pz.h +++ b/include/d/actor/d_a_pz.h @@ -5,6 +5,16 @@ #include "c/c_damagereaction.h" #include "SSystem/SComponent/c_phase.h" +class daPz_matAnm_c { + void clrMoveFlag() {} + void getNowOffsetX() {} + void getNowOffsetY() {} + void setMoveFlag() {} + + daPz_matAnm_c(); + void calc(J3DMaterial*) const; +}; + class daPz_c : public fopAc_ac_c { public: enum Proc_e { diff --git a/include/d/actor/d_a_salvage_tbox.h b/include/d/actor/d_a_salvage_tbox.h index 75e6a097d..31bf76bfa 100644 --- a/include/d/actor/d_a_salvage_tbox.h +++ b/include/d/actor/d_a_salvage_tbox.h @@ -2,6 +2,23 @@ #define D_A_SALVAGE_TBOX_H #include "f_op/f_op_actor.h" +#include "d/d_particle.h" + +class daSTBox_shadowEcallBack_c : public dPa_levelEcallBack { +public: + void deleteCallBack() {} + void getEmitter() {} + void setDepth(float) {} + void setIndirectTexData(float, float) {} + void setPos(cXyz&) {} + void setWaterFlatY(float) {} + void setWaterY(float) {} + void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {} + + void getMaxWaterY(JGeometry::TVec3*); + void execute(JPABaseEmitter*); + void draw(JPABaseEmitter*); +}; class daSTBox_c : public fopAc_ac_c { public: diff --git a/include/d/actor/d_a_ss.h b/include/d/actor/d_a_ss.h index 04249c974..73679b086 100644 --- a/include/d/actor/d_a_ss.h +++ b/include/d/actor/d_a_ss.h @@ -3,6 +3,10 @@ #include "f_op/f_op_actor.h" +struct ss_s { + +}; + class ss_class : public fopAc_ac_c { public: /* Place member variables here */ diff --git a/include/d/actor/d_a_stone.h b/include/d/actor/d_a_stone.h index 399140583..90121bfd3 100644 --- a/include/d/actor/d_a_stone.h +++ b/include/d/actor/d_a_stone.h @@ -3,12 +3,76 @@ #include "f_op/f_op_actor.h" -class daStone : public fopAc_ac_c { -public: +namespace daStone { void CreateHeapCB(fopAc_ac_c*); - -public: - /* Place member variables here */ + + struct Data_c { + + }; + + class Act_c : public fopAc_ac_c { + public: + void data() {} + void prm_get_cull() const {} + void prm_get_itemNo() const {} + void prm_get_itemSave() const {} + void prm_get_moveBg() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} + void prm_off_moveBg() {} + + void create_heap(); + void chk_appear(); + s32 _create(); + BOOL _delete(); + void mode_wait_init(); + void mode_wait(); + void mode_carry_init(); + void mode_carry(); + void mode_drop_init(); + void mode_drop(); + void mode_sink_init(); + void mode_sink(); + void mode_proc_call(); + void cull_set_draw(); + void cull_set_move(); + void damaged(int); + void damage_cc_proc(); + void damage_bg_proc(); + void damage_bg_proc_directly(); + void set_mtx(); + void init_mtx(); + void init_rot_throw(); + void init_rot_clean(); + void set_drop_rot(); + void set_sink_rot(); + void eff_break(); + void eff_hit_water_splash(); + void eff_hit_lava_splash(); + void eff_land_smoke(); + void bg_crr_water(); + void bg_crr_lava(); + void chk_sink_lava(); + void chk_sink_water(); + void water_tention(); + void se_fall_water(); + void se_fall_lava(); + void set_senv(int, int) const; + void cam_lockoff() const; + BOOL _execute(); + BOOL _draw(); + + public: + /* Place member variables here */ + }; + + namespace Method { + s32 Create(void*); + BOOL Delete(void*); + BOOL Execute(void*); + BOOL Draw(void*); + BOOL IsDelete(void*); + }; }; #endif /* D_A_STONE_H */ diff --git a/include/d/actor/d_a_tsubo.h b/include/d/actor/d_a_tsubo.h index 8efd5026a..0eb2f4210 100644 --- a/include/d/actor/d_a_tsubo.h +++ b/include/d/actor/d_a_tsubo.h @@ -201,6 +201,14 @@ namespace daTsubo { /* 0x814 */ cXyz m814; /* 0x820 */ u8 m820[0xF00 - 0x820]; }; + + namespace Method { + s32 Create(void*); + BOOL Delete(void*); + BOOL Execute(void*); + BOOL Draw(void*); + BOOL IsDelete(void*); + }; }; #endif /* D_A_TSUBO_H */ diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index dd3fd7d69..6695791ec 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_bb.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000003C8 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 1a3d00092..19039500a 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_bdk.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-0000015C .text __ct__11daBdk_HIO_cFv */ daBdk_HIO_c::daBdk_HIO_c() { diff --git a/src/d/actor/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp index a804138d0..9d2e7443b 100644 --- a/src/d/actor/d_a_bdkobj.cpp +++ b/src/d/actor/d_a_bdkobj.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_bdkobj.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" /* 000000EC-00000104 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index db1b22039..c8e771e05 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_bmdfoot.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000114 .text __ct__15daBmdfoot_HIO_cFv */ daBmdfoot_HIO_c::daBmdfoot_HIO_c() { diff --git a/src/d/actor/d_a_bo.cpp b/src/d/actor/d_a_bo.cpp index a5110ac53..6fd67f708 100644 --- a/src/d/actor/d_a_bo.cpp +++ b/src/d/actor/d_a_bo.cpp @@ -135,18 +135,3 @@ static BOOL useHeapInit(fopAc_ac_c*) { static s32 daBO_Create(fopAc_ac_c*) { /* Nonmatching */ } - -/* 00005C60-00005C64 .text draw__54JPACallBackBase2FP14JPABaseEmitterP15JPABaseParticle */ -void JPACallBackBase2::draw(JPABaseEmitter*, JPABaseParticle*) { - /* Nonmatching */ -} - -/* 00005C64-00005C68 .text execute__54JPACallBackBase2FP14JPABaseEmitterP15JPABaseParticle */ -void JPACallBackBase2::execute(JPABaseEmitter*, JPABaseParticle*) { - /* Nonmatching */ -} - -/* 00005C68-00005C6C .text init__54JPACallBackBase2FP14JPABaseEmitterP15JPABaseParticle */ -void JPACallBackBase2::init(JPABaseEmitter*, JPABaseParticle*) { - /* Nonmatching */ -} diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp index 0f02939cd..c1e29b7ac 100644 --- a/src/d/actor/d_a_bridge.cpp +++ b/src/d/actor/d_a_bridge.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_bridge.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" /* 00000078-00000504 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index b01d37c7a..4e2bb578e 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_bst.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000110 .text __ct__11daBst_HIO_cFv */ daBst_HIO_c::daBst_HIO_c() { diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index a87382be8..04d84b1d9 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_btd.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000001C8 .text __ct__11daBtd_HIO_cFv */ daBtd_HIO_c::daBtd_HIO_c() { diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp index c45d59cdf..9f3fe4848 100644 --- a/src/d/actor/d_a_canon.cpp +++ b/src/d/actor/d_a_canon.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_canon.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000002C8 .text set_mtx__9daCanon_cFv */ void daCanon_c::set_mtx() { diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index 07951a882..20dd0fc94 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_daiocta.h" -#include "dolphin/types.h" +#include "d/d_cc_d.h" /* 000000EC-000002B0 .text __ct__15daDaiocta_HIO_cFv */ daDaiocta_HIO_c::daDaiocta_HIO_c() { diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index a5282e7b0..0ce2a4065 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/src/d/actor/d_a_daiocta_eye.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_daiocta_eye.h" -#include "dolphin/types.h" +#include "d/d_cc_d.h" /* 000000EC-000001B0 .text __ct__19daDaiocta_Eye_HIO_cFv */ daDaiocta_Eye_HIO_c::daDaiocta_Eye_HIO_c() { diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp index 57fff6586..a546ab18a 100644 --- a/src/d/actor/d_a_dk.cpp +++ b/src/d/actor/d_a_dk.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_dk.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000130 .text __ct__10daDk_HIO_cFv */ daDk_HIO_c::daDk_HIO_c() { diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index 094d97943..6bd93a50b 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/src/d/actor/d_a_dr2.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_dr2.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000110 .text __ct__11daDr2_HIO_cFv */ daDr2_HIO_c::daDr2_HIO_c() { diff --git a/src/d/actor/d_a_gm.cpp b/src/d/actor/d_a_gm.cpp index 4b391cbc8..8f8fd6eb6 100644 --- a/src/d/actor/d_a_gm.cpp +++ b/src/d/actor/d_a_gm.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_gm.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-0000032C .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_icelift.cpp b/src/d/actor/d_a_icelift.cpp index 746c4b04a..947fa14fe 100644 --- a/src/d/actor/d_a_icelift.cpp +++ b/src/d/actor/d_a_icelift.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_icelift.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" /* 00000078-000000E0 .text _delete__9daIlift_cFv */ BOOL daIlift_c::_delete() { diff --git a/src/d/actor/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp index ab8659a24..b47456449 100644 --- a/src/d/actor/d_a_jbo.cpp +++ b/src/d/actor/d_a_jbo.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_jbo.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000108 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp index e33e90118..00d0ce8bf 100644 --- a/src/d/actor/d_a_kamome.cpp +++ b/src/d/actor/d_a_kamome.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_kamome.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000001E4 .text anm_init__FP12kamome_classifUcfi */ void anm_init(kamome_class*, int, float, unsigned char, float, int) { diff --git a/src/d/actor/d_a_kb.cpp b/src/d/actor/d_a_kb.cpp index 47adeca6f..445cb550a 100644 --- a/src/d/actor/d_a_kb.cpp +++ b/src/d/actor/d_a_kb.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_kb.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-000001A4 .text anm_init__FP8kb_classifUcfi */ void anm_init(kb_class*, int, float, unsigned char, float, int) { diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index 35620ef73..ab6a0e86d 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_ki.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000001B4 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_kita.cpp b/src/d/actor/d_a_kita.cpp index 0c9f271a2..e298e90b2 100644 --- a/src/d/actor/d_a_kita.cpp +++ b/src/d/actor/d_a_kita.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_kita.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" /* 00000078-0000032C .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { diff --git a/src/d/actor/d_a_klft.cpp b/src/d/actor/d_a_klft.cpp index 6571b7cb7..2e7ab3ed0 100644 --- a/src/d/actor/d_a_klft.cpp +++ b/src/d/actor/d_a_klft.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_klft.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000374 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index 26e587036..6d62eba9d 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -4,7 +4,8 @@ // #include "d/actor/d_a_leaflift.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" +#include "d/d_bg_w.h" /* 000000EC-000001C0 .text _delete__9daLlift_cFv */ BOOL daLlift_c::_delete() { diff --git a/src/d/actor/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp index 751f9abf4..132cbcf88 100644 --- a/src/d/actor/d_a_lwood.cpp +++ b/src/d/actor/d_a_lwood.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_lwood.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { diff --git a/src/d/actor/d_a_machine.cpp b/src/d/actor/d_a_machine.cpp index 184c65099..e0af1f64d 100644 --- a/src/d/actor/d_a_machine.cpp +++ b/src/d/actor/d_a_machine.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_machine.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-000000A8 .text _delete__11daMachine_cFv */ BOOL daMachine_c::_delete() { diff --git a/src/d/actor/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp index 8114283cf..6b74ee44e 100644 --- a/src/d/actor/d_a_mflft.cpp +++ b/src/d/actor/d_a_mflft.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_mflft.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" /* 00000078-00000170 .text setLiftUp__11mflft_classF4cXyz */ void mflft_class::setLiftUp(cXyz) { diff --git a/src/d/actor/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp index 4f54aa9bc..453b7d00e 100644 --- a/src/d/actor/d_a_msw.cpp +++ b/src/d/actor/d_a_msw.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_msw.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" /* 00000078-000002D4 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { diff --git a/src/d/actor/d_a_mt.cpp b/src/d/actor/d_a_mt.cpp index 1343aa5c2..9b28f48c3 100644 --- a/src/d/actor/d_a_mt.cpp +++ b/src/d/actor/d_a_mt.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_mt.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000001E8 .text __ct__10daMt_HIO_cFv */ daMt_HIO_c::daMt_HIO_c() { diff --git a/src/d/actor/d_a_npc_ah.cpp b/src/d/actor/d_a_npc_ah.cpp index be7339a71..bdafa7717 100644 --- a/src/d/actor/d_a_npc_ah.cpp +++ b/src/d/actor/d_a_npc_ah.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_ah.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000210 .text __ct__9daNpcAh_cFv */ daNpcAh_c::daNpcAh_c() { diff --git a/src/d/actor/d_a_npc_auction.cpp b/src/d/actor/d_a_npc_auction.cpp index 07e77adfd..8861068ef 100644 --- a/src/d/actor/d_a_npc_auction.cpp +++ b/src/d/actor/d_a_npc_auction.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_auction.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000268 .text __ct__14daNpcAuction_cFv */ daNpcAuction_c::daNpcAuction_c() { diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp index f23b874c8..b562da5be 100644 --- a/src/d/actor/d_a_npc_ba1.cpp +++ b/src/d/actor/d_a_npc_ba1.cpp @@ -262,27 +262,27 @@ void daNpc_Ba1_c::eInit_SET_PLYER_GOL_() { } /* 00001E10-00001ECC .text eInit_PLYER_INI_POS___11daNpc_Ba1_cFv */ -void daNpc_Ba1_c::eInit_PLYER_INI_POS() { +void daNpc_Ba1_c::eInit_PLYER_INI_POS_() { /* Nonmatching */ } /* 00001ECC-00001EE8 .text eInit_USE_FAIRY_END___11daNpc_Ba1_cFv */ -void daNpc_Ba1_c::eInit_USE_FAIRY_END() { +void daNpc_Ba1_c::eInit_USE_FAIRY_END_() { /* Nonmatching */ } /* 00001EE8-00001F04 .text eInit_MOV_POS___11daNpc_Ba1_cFv */ -void daNpc_Ba1_c::eInit_MOV_POS() { +void daNpc_Ba1_c::eInit_MOV_POS_() { /* Nonmatching */ } /* 00001F04-00001F48 .text eInit_SET_PLYER_TRN_ANG___11daNpc_Ba1_cFv */ -void daNpc_Ba1_c::eInit_SET_PLYER_TRN_ANG() { +void daNpc_Ba1_c::eInit_SET_PLYER_TRN_ANG_() { /* Nonmatching */ } /* 00001F48-000020AC .text eInit_ACTOR_DRW_CONTROL___11daNpc_Ba1_cFPiPi */ -void daNpc_Ba1_c::eInit_ACTOR_DRW_CONTROL(int*, int*) { +void daNpc_Ba1_c::eInit_ACTOR_DRW_CONTROL_(int*, int*) { /* Nonmatching */ } @@ -292,7 +292,7 @@ void daNpc_Ba1_c::eInit_setEvTimer(int*) { } /* 000020C8-000020E8 .text eInit_CHK_FAIRY___11daNpc_Ba1_cFPi */ -void daNpc_Ba1_c::eInit_CHK_FAIRY(int*) { +void daNpc_Ba1_c::eInit_CHK_FAIRY_(int*) { /* Nonmatching */ } @@ -302,12 +302,12 @@ void daNpc_Ba1_c::eInit_prmFloat(float*, float) { } /* 000020F8-00002130 .text eInit_SET_EYE_OFF___11daNpc_Ba1_cFPf */ -void daNpc_Ba1_c::eInit_SET_EYE_OFF(float*) { +void daNpc_Ba1_c::eInit_SET_EYE_OFF_(float*) { /* Nonmatching */ } /* 00002130-00002168 .text eInit_EYE_OFF_ZRO___11daNpc_Ba1_cFPf */ -void daNpc_Ba1_c::eInit_EYE_OFF_ZRO(float*) { +void daNpc_Ba1_c::eInit_EYE_OFF_ZRO_(float*) { /* Nonmatching */ } @@ -322,17 +322,17 @@ void daNpc_Ba1_c::event_actionInit(int) { } /* 00002358-00002518 .text eMove_MOV_POS___11daNpc_Ba1_cFv */ -void daNpc_Ba1_c::eMove_MOV_POS() { +void daNpc_Ba1_c::eMove_MOV_POS_() { /* Nonmatching */ } /* 00002518-00002574 .text eMove_CHK_FAIRY___11daNpc_Ba1_cFv */ -void daNpc_Ba1_c::eMove_CHK_FAIRY() { +void daNpc_Ba1_c::eMove_CHK_FAIRY_() { /* Nonmatching */ } /* 00002574-00002608 .text eMove_EYE_OFF_ZRO___11daNpc_Ba1_cFv */ -void daNpc_Ba1_c::eMove_EYE_OFF_ZRO() { +void daNpc_Ba1_c::eMove_EYE_OFF_ZRO_() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bj1.cpp b/src/d/actor/d_a_npc_bj1.cpp index 8e7cad4e7..81c535e5d 100644 --- a/src/d/actor/d_a_npc_bj1.cpp +++ b/src/d/actor/d_a_npc_bj1.cpp @@ -267,7 +267,7 @@ void daNpc_Bj1_c::partner_srch() { } /* 00002724-000027B0 .text setCollision_SP___11daNpc_Bj1_cFv */ -void setCollision_SP___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::setCollision_SP_() { /* Nonmatching */ } @@ -377,47 +377,47 @@ void daNpc_Bj1_c::eInit_prmFloat(float*, float) { } /* 00003B20-00003D3C .text eInit_ATTENTION___11daNpc_Bj1_cFPiPiPiP4cXyzPiPiPi */ -void eInit_ATTENTION___11daNpc_Bj1_cFPiPiPiP4cXyzPiPiPi { +void daNpc_Bj1_c::eInit_ATTENTION_(int*, int*, int*, cXyz*, int*, int*, int*) { /* Nonmatching */ } /* 00003D3C-00003E24 .text eInit_PLYER_MOV_1___11daNpc_Bj1_cFv */ -void eInit_PLYER_MOV_1___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::eInit_PLYER_MOV_1_() { /* Nonmatching */ } /* 00003E24-00003F04 .text eInit_MOV___11daNpc_Bj1_cFPfPfPfPi */ -void eInit_MOV___11daNpc_Bj1_cFPfPfPfPi { +void daNpc_Bj1_c::eInit_MOV_(float*, float*, float*, int*) { /* Nonmatching */ } /* 00003F04-00003F74 .text eInit_JMP___11daNpc_Bj1_cFPfPf */ -void eInit_JMP___11daNpc_Bj1_cFPfPf { +void daNpc_Bj1_c::eInit_JMP_(float*, float*) { /* Nonmatching */ } /* 00003F74-0000406C .text eInit_CHG_PTH___11daNpc_Bj1_cFPiPi */ -void eInit_CHG_PTH___11daNpc_Bj1_cFPiPi { +void daNpc_Bj1_c::eInit_CHG_PTH_(int*, int*) { /* Nonmatching */ } /* 0000406C-000040BC .text eInit_END_MOV___11daNpc_Bj1_cFv */ -void eInit_END_MOV___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::eInit_END_MOV_() { /* Nonmatching */ } /* 000040BC-000040F4 .text eInit_SET_TNE___11daNpc_Bj1_cFv */ -void eInit_SET_TNE___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::eInit_SET_TNE_() { /* Nonmatching */ } /* 000040F4-00004114 .text eInit_DEL_TNE___11daNpc_Bj1_cFv */ -void eInit_DEL_TNE___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::eInit_DEL_TNE_() { /* Nonmatching */ } /* 00004114-0000417C .text eInit_SET_ANM___11daNpc_Bj1_cFPiPf */ -void eInit_SET_ANM___11daNpc_Bj1_cFPiPf { +void daNpc_Bj1_c::eInit_SET_ANM_(int*, float*) { /* Nonmatching */ } @@ -427,27 +427,27 @@ void daNpc_Bj1_c::event_actionInit(int) { } /* 000044E4-00004530 .text eMove_ATTENTION___11daNpc_Bj1_cFv */ -void eMove_ATTENTION___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::eMove_ATTENTION_() { /* Nonmatching */ } /* 00004530-00004580 .text eMove_MOV___11daNpc_Bj1_cFv */ -void eMove_MOV___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::eMove_MOV_() { /* Nonmatching */ } /* 00004580-00004594 .text eMove_JMP___11daNpc_Bj1_cFv */ -void eMove_JMP___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::eMove_JMP_() { /* Nonmatching */ } /* 00004594-000045F0 .text eMove_SET_TNE___11daNpc_Bj1_cFv */ -void eMove_SET_TNE___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::eMove_SET_TNE_() { /* Nonmatching */ } /* 000045F0-00004678 .text eMove_PTH_MOV___11daNpc_Bj1_cFv */ -void eMove_PTH_MOV___11daNpc_Bj1_cFv { +void daNpc_Bj1_c::eMove_PTH_MOV_() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp index 37e7bb6f7..83c0bcf5c 100644 --- a/src/d/actor/d_a_npc_bm1.cpp +++ b/src/d/actor/d_a_npc_bm1.cpp @@ -487,12 +487,12 @@ void daNpc_Bm1_c::eInit_calcRelativPos(cXyz*, int*) { } /* 00004B30-00004D10 .text eInit_ATTENTION___11daNpc_Bm1_cFPiPiPiP4cXyzPiPiPi */ -void eInit_ATTENTION___11daNpc_Bm1_cFPiPiPiP4cXyzPiPiPi { +void daNpc_Bm1_c::eInit_ATTENTION_(int*, int*, int*, cXyz*, int*, int*, int*) { /* Nonmatching */ } /* 00004D10-00004DC4 .text eInit_SET_PLYER_GOL___11daNpc_Bm1_cFPiP4cXyzPi */ -void eInit_SET_PLYER_GOL___11daNpc_Bm1_cFPiP4cXyzPi { +void daNpc_Bm1_c::eInit_SET_PLYER_GOL_(int*, cXyz*, int*) { /* Nonmatching */ } @@ -502,37 +502,37 @@ void daNpc_Bm1_c::eInit_prmFloat(float*, float) { } /* 00004DD4-00004FB8 .text eInit_FLY___11daNpc_Bm1_cFPiPfPfPfPf */ -void eInit_FLY___11daNpc_Bm1_cFPiPfPfPfPf { +void daNpc_Bm1_c::eInit_FLY_(int*, float*, float*, float*, float*) { /* Nonmatching */ } /* 00004FB8-00004FD8 .text eInit_DEL_ACTOR___11daNpc_Bm1_cFv */ -void eInit_DEL_ACTOR___11daNpc_Bm1_cFv { +void daNpc_Bm1_c::eInit_DEL_ACTOR_() { /* Nonmatching */ } /* 00004FD8-00005190 .text eInit_WLK___11daNpc_Bm1_cFPiPfPfP4cXyzPiPiPi */ -void eInit_WLK___11daNpc_Bm1_cFPiPfPfP4cXyzPiPiPi { +void daNpc_Bm1_c::eInit_WLK_(int*, float*, float*, cXyz*, int*, int*, int*) { /* Nonmatching */ } /* 00005190-0000519C .text eInit_INI_EVN_1___11daNpc_Bm1_cFv */ -void eInit_INI_EVN_1___11daNpc_Bm1_cFv { +void daNpc_Bm1_c::eInit_INI_EVN_1_() { /* Nonmatching */ } /* 0000519C-000051EC .text eInit_SET_NXT_PTH_INF___11daNpc_Bm1_cFv */ -void eInit_SET_NXT_PTH_INF___11daNpc_Bm1_cFv { +void daNpc_Bm1_c::eInit_SET_NXT_PTH_INF_() { /* Nonmatching */ } /* 000051EC-0000522C .text eInit_SET_ANM___11daNpc_Bm1_cFPi */ -void eInit_SET_ANM___11daNpc_Bm1_cFPi { +void daNpc_Bm1_c::eInit_SET_ANM_(int*) { /* Nonmatching */ } /* 0000522C-00005368 .text eInit_MOV_PTH_POINT___11daNpc_Bm1_cFPiPiPiPi */ -void eInit_MOV_PTH_POINT___11daNpc_Bm1_cFPiPiPiPi { +void daNpc_Bm1_c::eInit_MOV_PTH_POINT_(int*, int*, int*, int*) { /* Nonmatching */ } @@ -542,22 +542,22 @@ void daNpc_Bm1_c::event_actionInit(int) { } /* 00005650-0000569C .text eMove_ATTENTION___11daNpc_Bm1_cFv */ -void eMove_ATTENTION___11daNpc_Bm1_cFv { +void daNpc_Bm1_c::eMove_ATTENTION_() { /* Nonmatching */ } /* 0000569C-000056A4 .text eMove_KMA_FLY___11daNpc_Bm1_cFv */ -void eMove_KMA_FLY___11daNpc_Bm1_cFv { +void daNpc_Bm1_c::eMove_KMA_FLY_() { /* Nonmatching */ } /* 000056A4-000056C0 .text eMove_FLY___11daNpc_Bm1_cFv */ -void eMove_FLY___11daNpc_Bm1_cFv { +void daNpc_Bm1_c::eMove_FLY_() { /* Nonmatching */ } /* 000056C0-00005734 .text eMove_WLK___11daNpc_Bm1_cFv */ -void eMove_WLK___11daNpc_Bm1_cFv { +void daNpc_Bm1_c::eMove_WLK_() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index 8072a6257..89c7eeac3 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_btsw.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000001E8 .text __ct__16daNpc_Btsw_HIO_cFv */ daNpc_Btsw_HIO_c::daNpc_Btsw_HIO_c() { diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 8f7878cf7..d8323d460 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_btsw2.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000001A8 .text __ct__17daNpc_Btsw2_HIO_cFv */ daNpc_Btsw2_HIO_c::daNpc_Btsw2_HIO_c() { diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index d0c70e805..3fd6f7047 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -560,49 +560,3 @@ static BOOL daNpc_Cb1_Draw(daNpc_Cb1_c*) { static BOOL daNpc_Cb1_IsDelete(daNpc_Cb1_c*) { /* Nonmatching */ } - -/* 0000A130-0000A138 .text getGroundY__11daNpc_Cb1_cFv */ -void daNpc_Cb1_c::getGroundY() { - /* Nonmatching */ -} - -/* 0000A138-0000A140 .text getLeftHandMatrix__11daNpc_Cb1_cFv */ -void daNpc_Cb1_c::getLeftHandMatrix() { - /* Nonmatching */ -} - -/* 0000A140-0000A148 .text getRightHandMatrix__11daNpc_Cb1_cFv */ -void daNpc_Cb1_c::getRightHandMatrix() { - /* Nonmatching */ -} - -/* 0000A148-0000A154 .text getBaseAnimeFrameRate__11daNpc_Cb1_cFv */ -void daNpc_Cb1_c::getBaseAnimeFrameRate() { - /* Nonmatching */ -} - -/* 0000A154-0000A160 .text getBaseAnimeFrame__11daNpc_Cb1_cFv */ -void daNpc_Cb1_c::getBaseAnimeFrame() { - /* Nonmatching */ -} - -/* 0000A160-0000A19C .text restartPoint__11daNpc_Cb1_cFs */ -void daNpc_Cb1_c::restartPoint(short) { - /* Nonmatching */ -} - -/* 0000A278-0000A27C .text restartPoint__10daPy_npc_cFs */ -void daPy_npc_c::restartPoint(short) { - /* Nonmatching */ -} - -/* 0000A27C-0000A284 .text isTagCheckOK__10daPy_npc_cFv */ -void daPy_npc_c::isTagCheckOK() { - /* Nonmatching */ -} - -/* 0000A284-0000A288 .text setMessageAnimation__10daPy_npc_cFUc */ -void daPy_npc_c::setMessageAnimation(unsigned char) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_npc_co1.cpp b/src/d/actor/d_a_npc_co1.cpp index f871089df..01f33e6b7 100644 --- a/src/d/actor/d_a_npc_co1.cpp +++ b/src/d/actor/d_a_npc_co1.cpp @@ -132,7 +132,7 @@ void daNpc_Co1_c::checkOrder() { } /* 00001288-000013AC .text setCollision_SP___11daNpc_Co1_cFv */ -void setCollision_SP___11daNpc_Co1_cFv { +void daNpc_Co1_c::setCollision_SP_() { /* Nonmatching */ } @@ -187,12 +187,12 @@ void daNpc_Co1_c::charDecide(int) { } /* 00001A60-00001A9C .text eInit_MDR___11daNpc_Co1_cFv */ -void eInit_MDR___11daNpc_Co1_cFv { +void daNpc_Co1_c::eInit_MDR_() { /* Nonmatching */ } /* 00001A9C-00001AC4 .text eInit_RED_LTR___11daNpc_Co1_cFv */ -void eInit_RED_LTR___11daNpc_Co1_cFv { +void daNpc_Co1_c::eInit_RED_LTR_() { /* Nonmatching */ } @@ -202,12 +202,12 @@ void daNpc_Co1_c::event_actionInit(int) { } /* 00001B50-00001BA8 .text eMove_MDR___11daNpc_Co1_cFv */ -void eMove_MDR___11daNpc_Co1_cFv { +void daNpc_Co1_c::eMove_MDR_() { /* Nonmatching */ } /* 00001BA8-00001C34 .text eMove_RED_LTR___11daNpc_Co1_cFv */ -void eMove_RED_LTR___11daNpc_Co1_cFv { +void daNpc_Co1_c::eMove_RED_LTR_() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_gp1.cpp b/src/d/actor/d_a_npc_gp1.cpp index 307a86c12..03b4cb07b 100644 --- a/src/d/actor/d_a_npc_gp1.cpp +++ b/src/d/actor/d_a_npc_gp1.cpp @@ -217,12 +217,12 @@ void daNpc_Gp1_c::charDecide(int) { } /* 00001EF4-00001F40 .text eInit_INI_KAERE_KAERE___11daNpc_Gp1_cFv */ -void eInit_INI_KAERE_KAERE___11daNpc_Gp1_cFv { +void daNpc_Gp1_c::eInit_INI_KAERE_KAERE_() { /* Nonmatching */ } /* 00001F40-00001F4C .text eInit_END_KAERE_KAERE___11daNpc_Gp1_cFv */ -void eInit_END_KAERE_KAERE___11daNpc_Gp1_cFv { +void daNpc_Gp1_c::eInit_END_KAERE_KAERE_() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_kp1.cpp b/src/d/actor/d_a_npc_kp1.cpp index 8f8e39826..9e2fde463 100644 --- a/src/d/actor/d_a_npc_kp1.cpp +++ b/src/d/actor/d_a_npc_kp1.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_kp1.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000150 .text __ct__15daNpc_Kp1_HIO_cFv */ daNpc_Kp1_HIO_c::daNpc_Kp1_HIO_c() { diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 62c1429f8..7cea85e39 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_mk.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000230 .text nodeCallBack_Mk__FP7J3DNodei */ static BOOL nodeCallBack_Mk(J3DNode*, int) { diff --git a/src/d/actor/d_a_npc_mn.cpp b/src/d/actor/d_a_npc_mn.cpp index 116e14335..2431b987c 100644 --- a/src/d/actor/d_a_npc_mn.cpp +++ b/src/d/actor/d_a_npc_mn.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_mn.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000230 .text __ct__9daNpcMn_cFv */ daNpcMn_c::daNpcMn_c() { diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp index 85f54c602..a45b7820f 100644 --- a/src/d/actor/d_a_npc_p1.cpp +++ b/src/d/actor/d_a_npc_p1.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_p1.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000264 .text __ct__14daNpc_P1_HIO_cFv */ daNpc_P1_HIO_c::daNpc_P1_HIO_c() { diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index 49f583414..d5cfcb4d6 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_photo.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000002D0 .text __ct__12daNpcPhoto_cFv */ daNpcPhoto_c::daNpcPhoto_c() { diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp index fbaa88262..e1a4b4c3a 100644 --- a/src/d/actor/d_a_npc_tc.cpp +++ b/src/d/actor/d_a_npc_tc.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_tc.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000394 .text __ct__14daNpc_Tc_HIO_cFv */ daNpc_Tc_HIO_c::daNpc_Tc_HIO_c() { diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp index 8f543dbfa..9d3afa7d5 100644 --- a/src/d/actor/d_a_npc_tt.cpp +++ b/src/d/actor/d_a_npc_tt.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_tt.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000098 .text daNpc_tt_XyCheckCB__FPvi */ void daNpc_tt_XyCheckCB(void*, int) { diff --git a/src/d/actor/d_a_npc_uk.cpp b/src/d/actor/d_a_npc_uk.cpp index 6686815e0..c2ec4729a 100644 --- a/src/d/actor/d_a_npc_uk.cpp +++ b/src/d/actor/d_a_npc_uk.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_uk.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000000F8 .text getType__10daNpc_Uk_cFv */ void daNpc_Uk_c::getType() { diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index b61bd8e5e..0970d9026 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_zl1.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000150 .text __ct__15daNpc_Zl1_HIO_cFv */ daNpc_Zl1_HIO_c::daNpc_Zl1_HIO_c() { diff --git a/src/d/actor/d_a_obj_balancelift.cpp b/src/d/actor/d_a_obj_balancelift.cpp index a7a84531d..2592fd7d2 100644 --- a/src/d/actor/d_a_obj_balancelift.cpp +++ b/src/d/actor/d_a_obj_balancelift.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_obj_balancelift.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" /* 000000EC-00000160 .text __ct__19daBalancelift_HIO_cFv */ daBalancelift_HIO_c::daBalancelift_HIO_c() { diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index 32608a680..799ddf228 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/src/d/actor/d_a_obj_barrel.cpp @@ -202,26 +202,26 @@ BOOL daObjBarrel::Act_c::_draw() { } /* 0000241C-0000243C .text Create__Q211daObjBarrel6MethodFPv */ -void daObjBarrel::Method::Create(void*) { +s32 daObjBarrel::Method::Create(void*) { /* Nonmatching */ } /* 0000243C-00002460 .text Delete__Q211daObjBarrel6MethodFPv */ -void daObjBarrel::Method::Delete(void*) { +BOOL daObjBarrel::Method::Delete(void*) { /* Nonmatching */ } /* 00002460-00002484 .text Execute__Q211daObjBarrel6MethodFPv */ -void daObjBarrel::Method::Execute(void*) { +BOOL daObjBarrel::Method::Execute(void*) { /* Nonmatching */ } /* 00002484-000024A8 .text Draw__Q211daObjBarrel6MethodFPv */ -void daObjBarrel::Method::Draw(void*) { +BOOL daObjBarrel::Method::Draw(void*) { /* Nonmatching */ } /* 000024A8-000024B0 .text IsDelete__Q211daObjBarrel6MethodFPv */ -void daObjBarrel::Method::IsDelete(void*) { +BOOL daObjBarrel::Method::IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index 0d45a452b..1c89ef6c9 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/src/d/actor/d_a_obj_barrel2.cpp @@ -247,27 +247,27 @@ BOOL daObjBarrel2::Act_c::_draw() { } /* 00002F78-00002F98 .text Create__Q212daObjBarrel26MethodFPv */ -void daObjBarrel2::Method::Create(void*) { +s32 daObjBarrel2::Method::Create(void*) { /* Nonmatching */ } /* 00002F98-00002FBC .text Delete__Q212daObjBarrel26MethodFPv */ -void daObjBarrel2::Method::Delete(void*) { +BOOL daObjBarrel2::Method::Delete(void*) { /* Nonmatching */ } /* 00002FBC-00002FE0 .text Execute__Q212daObjBarrel26MethodFPv */ -void daObjBarrel2::Method::Execute(void*) { +BOOL daObjBarrel2::Method::Execute(void*) { /* Nonmatching */ } /* 00002FE0-00003004 .text Draw__Q212daObjBarrel26MethodFPv */ -void daObjBarrel2::Method::Draw(void*) { +BOOL daObjBarrel2::Method::Draw(void*) { /* Nonmatching */ } /* 00003004-0000300C .text IsDelete__Q212daObjBarrel26MethodFPv */ -void daObjBarrel2::Method::IsDelete(void*) { +BOOL daObjBarrel2::Method::IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_flame.cpp b/src/d/actor/d_a_obj_flame.cpp index 1a3ae70cb..a374a52b5 100644 --- a/src/d/actor/d_a_obj_flame.cpp +++ b/src/d/actor/d_a_obj_flame.cpp @@ -132,7 +132,7 @@ void daObjFlame::Act_c::mode_proc_call() { } /* 00001EAC-00001ECC .text Create__Q210daObjFlame6MethodFPv */ -void daObjFlame::Method::Create(void*) { +s32 daObjFlame::Method::Create(void*) { /* Nonmatching */ } @@ -142,21 +142,21 @@ s32 daObjFlame::Act_c::_create() { } /* 00002484-000024B4 .text Delete__Q210daObjFlame6MethodFPv */ -void daObjFlame::Method::Delete(void*) { +BOOL daObjFlame::Method::Delete(void*) { /* Nonmatching */ } /* 000024B4-00002638 .text Execute__Q210daObjFlame6MethodFPv */ -void daObjFlame::Method::Execute(void*) { +BOOL daObjFlame::Method::Execute(void*) { /* Nonmatching */ } /* 00002638-00002710 .text Draw__Q210daObjFlame6MethodFPv */ -void daObjFlame::Method::Draw(void*) { +BOOL daObjFlame::Method::Draw(void*) { /* Nonmatching */ } /* 00002710-000027B0 .text IsDelete__Q210daObjFlame6MethodFPv */ -void daObjFlame::Method::IsDelete(void*) { +BOOL daObjFlame::Method::IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp index 8afd5ebb1..353324d20 100644 --- a/src/d/actor/d_a_obj_leaves.cpp +++ b/src/d/actor/d_a_obj_leaves.cpp @@ -4,7 +4,9 @@ // #include "d/actor/d_a_obj_leaves.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" + +class J3DMaterial; /* 00000078-000000D8 .text chk_appear__13daObjLeaves_cFv */ void daObjLeaves_c::chk_appear() { diff --git a/src/d/actor/d_a_obj_magmarock.cpp b/src/d/actor/d_a_obj_magmarock.cpp index 6d5b59064..7872c37df 100644 --- a/src/d/actor/d_a_obj_magmarock.cpp +++ b/src/d/actor/d_a_obj_magmarock.cpp @@ -112,17 +112,17 @@ void daObjMagmarock::Act_c::calc_ground_quat() { } /* 000017DC-0000198C .text Create__Q214daObjMagmarock6MethodFPv */ -void daObjMagmarock::Method::Create(void*) { +s32 daObjMagmarock::Method::Create(void*) { /* Nonmatching */ } /* 00001A90-00001B14 .text Delete__Q214daObjMagmarock6MethodFPv */ -void daObjMagmarock::Method::Delete(void*) { +BOOL daObjMagmarock::Method::Delete(void*) { /* Nonmatching */ } /* 00001B14-00001B38 .text Execute__Q214daObjMagmarock6MethodFPv */ -void daObjMagmarock::Method::Execute(void*) { +BOOL daObjMagmarock::Method::Execute(void*) { /* Nonmatching */ } @@ -132,12 +132,12 @@ BOOL daObjMagmarock::Act_c::_execute() { } /* 00001EC0-00002128 .text Draw__Q214daObjMagmarock6MethodFPv */ -void daObjMagmarock::Method::Draw(void*) { +BOOL daObjMagmarock::Method::Draw(void*) { /* Nonmatching */ } /* 00002128-00002130 .text IsDelete__Q214daObjMagmarock6MethodFPv */ -void daObjMagmarock::Method::IsDelete(void*) { +BOOL daObjMagmarock::Method::IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_otble.cpp b/src/d/actor/d_a_obj_otble.cpp index b638c23a9..394f1c8c6 100644 --- a/src/d/actor/d_a_obj_otble.cpp +++ b/src/d/actor/d_a_obj_otble.cpp @@ -37,26 +37,26 @@ void daObj_Otble::Act_c::CreateInit() { } /* 000005A0-000006AC .text Create__Q211daObj_Otble4MthdFPv */ -void daObj_Otble::Mthd::Create(void*) { +s32 daObj_Otble::Mthd::Create(void*) { /* Nonmatching */ } /* 0000071C-0000079C .text Delete__Q211daObj_Otble4MthdFPv */ -void daObj_Otble::Mthd::Delete(void*) { +BOOL daObj_Otble::Mthd::Delete(void*) { /* Nonmatching */ } /* 0000079C-000007BC .text Execute__Q211daObj_Otble4MthdFPv */ -void daObj_Otble::Mthd::Execute(void*) { +BOOL daObj_Otble::Mthd::Execute(void*) { /* Nonmatching */ } /* 000007BC-000007DC .text Draw__Q211daObj_Otble4MthdFPv */ -void daObj_Otble::Mthd::Draw(void*) { +BOOL daObj_Otble::Mthd::Draw(void*) { /* Nonmatching */ } /* 000007DC-000007E4 .text IsDelete__Q211daObj_Otble4MthdFPv */ -void daObj_Otble::Mthd::IsDelete(void*) { +BOOL daObj_Otble::Mthd::IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index b68d04bfe..d67e07990 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -6,6 +6,8 @@ #include "d/actor/d_a_obj_pirateship.h" #include "dolphin/types.h" +class dBgW; + /* 000000EC-000000FC .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { /* Nonmatching */ @@ -82,7 +84,7 @@ void daObjPirateship::Act_c::demo_move() { } /* 00000EF0-00000F10 .text Create__Q215daObjPirateship6MethodFPv */ -void daObjPirateship::Method::Create(void*) { +s32 daObjPirateship::Method::Create(void*) { /* Nonmatching */ } @@ -97,22 +99,22 @@ BOOL daObjPirateship::Act_c::_execute() { } /* 00001E8C-00001F50 .text Delete__Q215daObjPirateship6MethodFPv */ -void daObjPirateship::Method::Delete(void*) { +BOOL daObjPirateship::Method::Delete(void*) { /* Nonmatching */ } /* 00001F50-00001F74 .text Execute__Q215daObjPirateship6MethodFPv */ -void daObjPirateship::Method::Execute(void*) { +BOOL daObjPirateship::Method::Execute(void*) { /* Nonmatching */ } /* 00001F74-00001FAC .text Draw__Q215daObjPirateship6MethodFPv */ -void daObjPirateship::Method::Draw(void*) { +BOOL daObjPirateship::Method::Draw(void*) { /* Nonmatching */ } /* 00001FAC-00001FB4 .text IsDelete__Q215daObjPirateship6MethodFPv */ -void daObjPirateship::Method::IsDelete(void*) { +BOOL daObjPirateship::Method::IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_rflw.cpp b/src/d/actor/d_a_obj_rflw.cpp index f1fc58b5f..7540a3ebc 100644 --- a/src/d/actor/d_a_obj_rflw.cpp +++ b/src/d/actor/d_a_obj_rflw.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_obj_rflw.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { diff --git a/src/d/actor/d_a_obj_search.cpp b/src/d/actor/d_a_obj_search.cpp index 595af6218..eb40965bf 100644 --- a/src/d/actor/d_a_obj_search.cpp +++ b/src/d/actor/d_a_obj_search.cpp @@ -232,26 +232,26 @@ BOOL daObj_Search::Act_c::_isdelete() { } /* 80102844-80102864 .text Create__Q212daObj_Search4MthdFPv */ -void daObj_Search::Mthd::Create(void*) { +s32 daObj_Search::Mthd::Create(void*) { /* Nonmatching */ } /* 80102864-80102884 .text Delete__Q212daObj_Search4MthdFPv */ -void daObj_Search::Mthd::Delete(void*) { +BOOL daObj_Search::Mthd::Delete(void*) { /* Nonmatching */ } /* 80102884-801028A4 .text Execute__Q212daObj_Search4MthdFPv */ -void daObj_Search::Mthd::Execute(void*) { +BOOL daObj_Search::Mthd::Execute(void*) { /* Nonmatching */ } /* 801028A4-801028C4 .text Draw__Q212daObj_Search4MthdFPv */ -void daObj_Search::Mthd::Draw(void*) { +BOOL daObj_Search::Mthd::Draw(void*) { /* Nonmatching */ } /* 801028C4-801028E4 .text IsDelete__Q212daObj_Search4MthdFPv */ -void daObj_Search::Mthd::IsDelete(void*) { +BOOL daObj_Search::Mthd::IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index 1f1fbaa70..8f5e4ed34 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_obj_stair.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" /* 000000EC-00000130 .text __ct__16daobj_stairHIO_cFv */ daobj_stairHIO_c::daobj_stairHIO_c() { diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 06f59c49c..cac5c007d 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -7,12 +7,12 @@ #include "dolphin/types.h" /* 00000078-000001B8 .text CreateHeap__Q210daObjTable5Act_cFv */ -void daObjTable::Act_c::CreateHeap() { +BOOL daObjTable::Act_c::CreateHeap() { /* Nonmatching */ } /* 000001B8-00000284 .text Create__Q210daObjTable5Act_cFv */ -s32 daObjTable::Act_c::Create() { +int daObjTable::Act_c::Create() { /* Nonmatching */ } @@ -42,7 +42,7 @@ void daObjTable::Act_c::init_mtx() { } /* 000004C4-00000500 .text Execute__Q210daObjTable5Act_cFPPA3_A4_f */ -void daObjTable::Act_c::Execute(float(**)[3][4]) { +int daObjTable::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index 5817ec05c..8084b8576 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_obj_warpt.h" -#include "dolphin/types.h" +#include "d/d_bg_w.h" /* 000000EC-00000190 .text __ct__17daObj_Warpt_HIO_cFv */ daObj_Warpt_HIO_c::daObj_Warpt_HIO_c() { diff --git a/src/d/actor/d_a_oq.cpp b/src/d/actor/d_a_oq.cpp index eb0ab6d2c..73c5a3632 100644 --- a/src/d/actor/d_a_oq.cpp +++ b/src/d/actor/d_a_oq.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_oq.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000208 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_salvage_tbox.cpp b/src/d/actor/d_a_salvage_tbox.cpp index a5478b746..f514bd419 100644 --- a/src/d/actor/d_a_salvage_tbox.cpp +++ b/src/d/actor/d_a_salvage_tbox.cpp @@ -135,9 +135,3 @@ static BOOL daSTBox_Execute(void*) { static BOOL daSTBox_IsDelete(void*) { /* Nonmatching */ } - -/* 000015BC-000015D0 .text setup__25daSTBox_shadowEcallBack_cFP14JPABaseEmitterPC4cXyzPC5csXyzSc */ -void daSTBox_shadowEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 3fc3db65f..224d5423f 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -460,44 +460,3 @@ s32 daShip_c::create() { static s32 daShip_Create(fopAc_ac_c*) { /* Nonmatching */ } - -/* 0000D3FC-0000D41C .text checkNoControll__9daPy_lk_cCFv */ -void daPy_lk_c::checkNoControll() const { - /* Nonmatching */ -} - -/* 0000D498-0000D4CC .text Center__9dCamera_cFv */ -void dCamera_c::Center() { - /* Nonmatching */ -} - -/* 0000D4CC-0000D500 .text Eye__9dCamera_cFv */ -void dCamera_c::Eye() { - /* Nonmatching */ -} - -/* 0000D5EC-0000D5FC .text force_calc_wind_rel_angle__8daGrid_cFs */ -void daGrid_c::force_calc_wind_rel_angle(short) { - /* Nonmatching */ -} - -/* 0000D61C-0000D638 .text __as__5csXyzFRC5csXyz */ -void csXyz::operator=(const csXyz&) { - /* Nonmatching */ -} - -/* 0000D698-0000D6A8 .text set__5csXyzFsss */ -void csXyz::set(short, short, short) { - /* Nonmatching */ -} - -/* 0000D6A8-0000D6C0 .text getCannonAngleX__8daShip_cCFv */ -void daShip_c::getCannonAngleX() const { - /* Nonmatching */ -} - -/* 0000D968-0000D990 .text checkForceMove__8daShip_cCFv */ -void daShip_c::checkForceMove() const { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_sk.cpp b/src/d/actor/d_a_sk.cpp index 0d9543ecf..aa6e3b5cc 100644 --- a/src/d/actor/d_a_sk.cpp +++ b/src/d/actor/d_a_sk.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_sk.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000240 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_sk2.cpp b/src/d/actor/d_a_sk2.cpp index bc3052f1e..00cbdc961 100644 --- a/src/d/actor/d_a_sk2.cpp +++ b/src/d/actor/d_a_sk2.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_sk2.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000194 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_ss.cpp b/src/d/actor/d_a_ss.cpp index 488f3b3e0..89431a9be 100644 --- a/src/d/actor/d_a_ss.cpp +++ b/src/d/actor/d_a_ss.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_ss.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000001DC .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp index ebb342de9..dcd81d2c5 100644 --- a/src/d/actor/d_a_ssk.cpp +++ b/src/d/actor/d_a_ssk.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_ssk.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000194 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index c6e504723..863e06a94 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -212,26 +212,26 @@ BOOL daStone::Act_c::_draw() { } /* 0000344C-0000346C .text Create__Q27daStone6MethodFPv */ -void daStone::Method::Create(void*) { +s32 daStone::Method::Create(void*) { /* Nonmatching */ } /* 0000346C-00003490 .text Delete__Q27daStone6MethodFPv */ -void daStone::Method::Delete(void*) { +BOOL daStone::Method::Delete(void*) { /* Nonmatching */ } /* 00003490-000034B4 .text Execute__Q27daStone6MethodFPv */ -void daStone::Method::Execute(void*) { +BOOL daStone::Method::Execute(void*) { /* Nonmatching */ } /* 000034B4-000034D8 .text Draw__Q27daStone6MethodFPv */ -void daStone::Method::Draw(void*) { +BOOL daStone::Method::Draw(void*) { /* Nonmatching */ } /* 000034D8-000034E0 .text IsDelete__Q27daStone6MethodFPv */ -void daStone::Method::IsDelete(void*) { +BOOL daStone::Method::IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_swpropeller.cpp b/src/d/actor/d_a_swpropeller.cpp index f7dcfabd4..443ffbcad 100644 --- a/src/d/actor/d_a_swpropeller.cpp +++ b/src/d/actor/d_a_swpropeller.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_swpropeller.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-000000B8 .text _delete__10daSwProp_cFv */ BOOL daSwProp_c::_delete() { diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index 0d7e0dcb7..2e87b731d 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_syan.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-000002D4 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index e37eff2fe..44f5da1c9 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_tn.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000220 .text anm_init__FP8tn_classifUcfi */ void anm_init(tn_class*, int, float, unsigned char, float, int) { diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp index 1d3c5bf0e..bc4c112e3 100644 --- a/src/d/actor/d_a_toge.cpp +++ b/src/d/actor/d_a_toge.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_toge.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-0000013C .text _delete__8daToge_cFv */ BOOL daToge_c::_delete() { diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index 01c4ba6ad..8bba62752 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_tornado.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000260 .text jointCallBack__11daTornado_cFi */ void daTornado_c::jointCallBack(int) { diff --git a/src/d/actor/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp index 9eec027d5..1efa601d9 100644 --- a/src/d/actor/d_a_tsubo.cpp +++ b/src/d/actor/d_a_tsubo.cpp @@ -587,26 +587,26 @@ BOOL daTsubo::Act_c::_draw() { } /* 00007D2C-00007D4C .text Create__Q27daTsubo6MethodFPv */ -void daTsubo::Method::Create(void*) { +s32 daTsubo::Method::Create(void*) { /* Nonmatching */ } /* 00007D4C-00007D70 .text Delete__Q27daTsubo6MethodFPv */ -void daTsubo::Method::Delete(void*) { +BOOL daTsubo::Method::Delete(void*) { /* Nonmatching */ } /* 00007D70-00007D94 .text Execute__Q27daTsubo6MethodFPv */ -void daTsubo::Method::Execute(void*) { +BOOL daTsubo::Method::Execute(void*) { /* Nonmatching */ } /* 00007D94-00007DB8 .text Draw__Q27daTsubo6MethodFPv */ -void daTsubo::Method::Draw(void*) { +BOOL daTsubo::Method::Draw(void*) { /* Nonmatching */ } /* 00007DB8-00007DDC .text IsDelete__Q27daTsubo6MethodFPv */ -void daTsubo::Method::IsDelete(void*) { +BOOL daTsubo::Method::IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp index 717cb1140..93f9bd1e2 100644 --- a/src/d/actor/d_a_windmill.cpp +++ b/src/d/actor/d_a_windmill.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_windmill.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-000000E8 .text _delete__12daWindMill_cFv */ BOOL daWindMill_c::_delete() { diff --git a/src/d/actor/d_a_wz.cpp b/src/d/actor/d_a_wz.cpp index 433439f48..a9e8cbd5b 100644 --- a/src/d/actor/d_a_wz.cpp +++ b/src/d/actor/d_a_wz.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_wz.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000140 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index e403a8d8f..9bc47ad86 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -40,19 +40,3 @@ static BOOL daYkgrDraw(void*) { static BOOL daYkgrIsDelete(void*) { /* Nonmatching */ } - -/* 000009FC-00000A00 .text execute__54JPACallBackBase2FP14JPABaseEmitterP15JPABaseParticle */ -void JPACallBackBase2::execute(JPABaseEmitter*, JPABaseParticle*) { - /* Nonmatching */ -} - -/* 00000A00-00000A04 .text init__54JPACallBackBase2FP14JPABaseEmitterP15JPABaseParticle */ -void JPACallBackBase2::init(JPABaseEmitter*, JPABaseParticle*) { - /* Nonmatching */ -} - -/* 00000A04-00000A08 .text draw__54JPACallBackBase2FP14JPABaseEmitterP15JPABaseParticle */ -void JPACallBackBase2::draw(JPABaseEmitter*, JPABaseParticle*) { - /* Nonmatching */ -} -