From 7309bd9ab103b0f932a31ee785eb09332805e0c6 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 8 Jan 2024 18:58:38 -0500 Subject: [PATCH] Get more actors compiling --- include/d/actor/d_a_goal_flag.h | 9 +++++++++ include/d/actor/d_a_hys.h | 2 +- include/d/actor/d_a_npc_ji1.h | 1 + include/d/actor/d_a_npc_mt.h | 1 + include/d/actor/d_a_npc_people.h | 15 ++++++++++++++- include/d/actor/d_a_npc_roten.h | 5 +++++ include/d/actor/d_a_npc_sv.h | 5 +++++ include/d/actor/d_a_obj_Vds.h | 2 ++ include/d/actor/d_a_obj_swhammer.h | 1 + include/d/actor/d_a_pedestal.h | 15 +++++++++++++++ include/d/actor/d_a_wind_tag.h | 2 ++ src/d/actor/d_a_npc_ds1.cpp | 16 ---------------- src/d/actor/d_a_npc_ji1.cpp | 2 +- src/d/actor/d_a_npc_kg1.cpp | 2 +- src/d/actor/d_a_npc_kg2.cpp | 2 +- src/d/actor/d_a_npc_km1.cpp | 2 +- src/d/actor/d_a_npc_mk.cpp | 10 ---------- src/d/actor/d_a_npc_p2.cpp | 2 +- src/d/actor/d_a_npc_people.cpp | 8 +------- src/d/actor/d_a_npc_pm1.cpp | 2 +- src/d/actor/d_a_npc_roten.cpp | 8 ++------ src/d/actor/d_a_npc_rsh1.cpp | 18 +----------------- src/d/actor/d_a_npc_sarace.cpp | 2 +- src/d/actor/d_a_npc_sv.cpp | 8 ++------ src/d/actor/d_a_npc_uk.cpp | 10 ---------- src/d/actor/d_a_nz.cpp | 2 +- src/d/actor/d_a_pedestal.cpp | 12 ++++++------ 27 files changed, 76 insertions(+), 88 deletions(-) diff --git a/include/d/actor/d_a_goal_flag.h b/include/d/actor/d_a_goal_flag.h index 822dedbcc..a8b87f1cf 100644 --- a/include/d/actor/d_a_goal_flag.h +++ b/include/d/actor/d_a_goal_flag.h @@ -28,4 +28,13 @@ public: /* Place member variables here */ }; +class daGFlag_packet_c { +public: + void setTexObj(unsigned char); + void setToonTexObj(); + void draw(); + void setBackNrm(); + void setNrmVtx(cXyz*, int, int); +}; + #endif /* D_A_GOAL_FLAG_H */ diff --git a/include/d/actor/d_a_hys.h b/include/d/actor/d_a_hys.h index 948582d03..7663eb1dd 100644 --- a/include/d/actor/d_a_hys.h +++ b/include/d/actor/d_a_hys.h @@ -6,7 +6,7 @@ class daHys_c : public fopAc_ac_c { public: inline s32 _create(); - void set_mtx() {} + void set_mtx(); BOOL Delete(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_ji1.h b/include/d/actor/d_a_npc_ji1.h index 3ac4467e0..46dd9271e 100644 --- a/include/d/actor/d_a_npc_ji1.h +++ b/include/d/actor/d_a_npc_ji1.h @@ -2,6 +2,7 @@ #define D_A_NPC_JI1_H #include "f_op/f_op_actor.h" +#include "d/d_cc_d.h" class daNpc_Ji1_c : public fopAc_ac_c { public: diff --git a/include/d/actor/d_a_npc_mt.h b/include/d/actor/d_a_npc_mt.h index 9f4fbc348..51d5f406b 100644 --- a/include/d/actor/d_a_npc_mt.h +++ b/include/d/actor/d_a_npc_mt.h @@ -19,6 +19,7 @@ public: void getPhaseP() {} void setResFlag(unsigned char) {} + daNpcMt_c(); s32 _create(); void createHeap(); void createInit(); diff --git a/include/d/actor/d_a_npc_people.h b/include/d/actor/d_a_npc_people.h index 3603f6c7c..04b23bf65 100644 --- a/include/d/actor/d_a_npc_people.h +++ b/include/d/actor/d_a_npc_people.h @@ -7,6 +7,18 @@ #include "SSystem/SComponent/c_phase.h" #include "d/d_npc.h" +struct sUbMsgDat { + +}; + +struct sPeopleAnmDat { + +}; + +struct daNpcPeople_c__l_npc_dat { + +}; + class daNpcPeople_c : public fopAc_ac_c { public: void getNpcNo() {} @@ -18,6 +30,7 @@ public: void setResFlag(unsigned char) {} void setTalk(unsigned char) {} + daNpcPeople_c(); s32 _create(); void createHeap(); void createInit(); @@ -185,7 +198,7 @@ public: /* 0x78E */ u8 m78E[0x78F - 0x78E]; /* 0x78F */ u8 m78F; /* 0x790 */ u8 m790; - /* 0x791 */ daNpcPeople_c__NpcType mNpcType; + /* 0x791 */ u8 mNpcType; /* 0x792 */ u8 m792[0x793 - 0x792]; /* 0x793 */ u8 m793; /* 0x794 */ u8 m794; diff --git a/include/d/actor/d_a_npc_roten.h b/include/d/actor/d_a_npc_roten.h index c6acb5b6a..9398327c1 100644 --- a/include/d/actor/d_a_npc_roten.h +++ b/include/d/actor/d_a_npc_roten.h @@ -3,6 +3,10 @@ #include "f_op/f_op_actor.h" +struct sRotenAnmDat { + +}; + class daNpcRoten_c : public fopAc_ac_c { public: void getPhaseP() {} @@ -10,6 +14,7 @@ public: void setNpcNo(unsigned char) {} void setResFlag(unsigned char) {} + daNpcRoten_c(); s32 _create(); void createHeap(); void createInit(); diff --git a/include/d/actor/d_a_npc_sv.h b/include/d/actor/d_a_npc_sv.h index fcd684cd5..3b37ba9e5 100644 --- a/include/d/actor/d_a_npc_sv.h +++ b/include/d/actor/d_a_npc_sv.h @@ -4,6 +4,10 @@ #include "f_op/f_op_actor.h" #include "d/d_cc_d.h" +struct sSvAnmDat { + +}; + class daNpcSv_c : public fopAc_ac_c { public: void getMsgPtn() {} @@ -11,6 +15,7 @@ public: void getPhaseP() {} void setResFlag(unsigned char) {} + daNpcSv_c(); s32 _create(); void createHeap(); void createInit(); diff --git a/include/d/actor/d_a_obj_Vds.h b/include/d/actor/d_a_obj_Vds.h index 95e3aae4a..cc07b3234 100644 --- a/include/d/actor/d_a_obj_Vds.h +++ b/include/d/actor/d_a_obj_Vds.h @@ -6,6 +6,8 @@ class J3DAnmTransformKey; namespace daObjVds { + static void ds_search_switchCB(void*, void*); + class Act_c : public fopAc_ac_c { public: void is_switch() const {} diff --git a/include/d/actor/d_a_obj_swhammer.h b/include/d/actor/d_a_obj_swhammer.h index 0f7cda3aa..2a2ecee25 100644 --- a/include/d/actor/d_a_obj_swhammer.h +++ b/include/d/actor/d_a_obj_swhammer.h @@ -14,6 +14,7 @@ namespace daObjSwhammer { void prm_get_swSave() const {} void prm_get_swSave2() const {} + Act_c(); void CreateHeap(); s32 Create(); s32 _create(); diff --git a/include/d/actor/d_a_pedestal.h b/include/d/actor/d_a_pedestal.h index 4842706a2..de5ee7a6c 100644 --- a/include/d/actor/d_a_pedestal.h +++ b/include/d/actor/d_a_pedestal.h @@ -3,9 +3,17 @@ #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" +#include "d/d_particle.h" #include "m_Do/m_Do_ext.h" namespace daPedestal { + static BOOL CheckCreateHeap(fopAc_ac_c*); + static s32 daPds_Create(void*); + static BOOL daPds_Delete(void*); + static BOOL daPds_Draw(void*); + static BOOL daPds_Execute(void*); + static BOOL daPds_IsDelete(void*); + class daPds_c : public fopAc_ac_c { public: BOOL _delete(); @@ -39,6 +47,13 @@ namespace daPedestal { /* 0x2E4 */ dBgW* mpBgW; /* 0x2E8 */ u8 m2E8[0x324 - 0x2E8]; }; + + class daPds_infiniteEcallBack_c : public dPa_levelEcallBack { + void execute(JPABaseEmitter*); + void end(); + void makeEmitter(unsigned short, const cXyz*, const csXyz*, const cXyz*); + void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char); + }; }; #endif /* D_A_PEDESTAL_H */ diff --git a/include/d/actor/d_a_wind_tag.h b/include/d/actor/d_a_wind_tag.h index 45071ac43..044053487 100644 --- a/include/d/actor/d_a_wind_tag.h +++ b/include/d/actor/d_a_wind_tag.h @@ -4,6 +4,8 @@ #include "f_op/f_op_actor.h" namespace daWindTag { + static void CheckCreateHeap(fopAc_ac_c*); + class daWindTag_c : public fopAc_ac_c { public: void getCurLength() const {} diff --git a/src/d/actor/d_a_npc_ds1.cpp b/src/d/actor/d_a_npc_ds1.cpp index 8c3e96905..631c3b772 100644 --- a/src/d/actor/d_a_npc_ds1.cpp +++ b/src/d/actor/d_a_npc_ds1.cpp @@ -295,19 +295,3 @@ static BOOL daNpc_Ds1_Draw(daNpc_Ds1_c*) { static BOOL daNpc_Ds1_IsDelete(daNpc_Ds1_c*) { /* Nonmatching */ } - -/* 000057B0-000057CC .text setEyePos__11daNpc_Ds1_cF4cXyz */ -void daNpc_Ds1_c::setEyePos(cXyz) { - /* Nonmatching */ -} - -/* 000057CC-000057E8 .text setAttentionBasePos__11daNpc_Ds1_cF4cXyz */ -void daNpc_Ds1_c::setAttentionBasePos(cXyz) { - /* Nonmatching */ -} - -/* 00005824-00005904 .text getItemZoomPos__16ShopCam_action_cFf */ -void ShopCam_action_c::getItemZoomPos(float) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 67c28f5c2..8e02ba177 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_ji1.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000380 .text __ct__15daNpc_Ji1_HIO_cFv */ daNpc_Ji1_HIO_c::daNpc_Ji1_HIO_c() { diff --git a/src/d/actor/d_a_npc_kg1.cpp b/src/d/actor/d_a_npc_kg1.cpp index 1618638e1..6185f396d 100644 --- a/src/d/actor/d_a_npc_kg1.cpp +++ b/src/d/actor/d_a_npc_kg1.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_kg1.h" -#include "dolphin/types.h" +#include "d/d_lib.h" /* 000000EC-000001E0 .text __ct__15daNpc_Kg1_HIO_cFv */ daNpc_Kg1_HIO_c::daNpc_Kg1_HIO_c() { diff --git a/src/d/actor/d_a_npc_kg2.cpp b/src/d/actor/d_a_npc_kg2.cpp index c5f16e1d1..5dddcd71d 100644 --- a/src/d/actor/d_a_npc_kg2.cpp +++ b/src/d/actor/d_a_npc_kg2.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_kg2.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000194 .text __ct__15daNpc_Kg2_HIO_cFv */ daNpc_Kg2_HIO_c::daNpc_Kg2_HIO_c() { diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index babbf467e..11412a4b0 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_km1.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000144 .text __ct__15daNpc_Km1_HIO_cFv */ daNpc_Km1_HIO_c::daNpc_Km1_HIO_c() { diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 7cea85e39..1951ef37e 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -325,13 +325,3 @@ static BOOL daNpc_Mk_Draw(daNpc_Mk_c*) { static BOOL daNpc_Mk_IsDelete(daNpc_Mk_c*) { /* Nonmatching */ } -/* 00004C38-00004C54 .text setEyePos__10daNpc_Mk_cF4cXyz */ -void daNpc_Mk_c::setEyePos(cXyz) { - /* Nonmatching */ -} - -/* 00004C54-00004C70 .text setAttentionBasePos__10daNpc_Mk_cF4cXyz */ -void daNpc_Mk_c::setAttentionBasePos(cXyz) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 312ba1502..7e14ef71a 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_p2.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-0000020C .text __ct__19daNpc_P2_childHIO_cFv */ daNpc_P2_childHIO_c::daNpc_P2_childHIO_c() { diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index 97dcac66a..b5cedec67 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_people.h" -#include "dolphin/types.h" +#include "d/actor/d_a_kb.h" /* 00000078-00000274 .text __ct__13daNpcPeople_cFv */ daNpcPeople_c::daNpcPeople_c() { @@ -650,9 +650,3 @@ static BOOL daNpc_PeopleDraw(void*) { static BOOL daNpc_PeopleIsDelete(void*) { /* Nonmatching */ } - -/* 00009B90-00009BB4 .text taura_pos_set__8kb_classF4cXyz */ -void kb_class::taura_pos_set(cXyz) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_npc_pm1.cpp b/src/d/actor/d_a_npc_pm1.cpp index dfa40882e..5f0bfdcf5 100644 --- a/src/d/actor/d_a_npc_pm1.cpp +++ b/src/d/actor/d_a_npc_pm1.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_pm1.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000144 .text __ct__15daNpc_Pm1_HIO_cFv */ daNpc_Pm1_HIO_c::daNpc_Pm1_HIO_c() { diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index fb51f25c9..f7cc79c48 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -4,7 +4,8 @@ // #include "d/actor/d_a_npc_roten.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" +#include "d/actor/d_a_demo_item.h" /* 00000078-000002F0 .text __ct__12daNpcRoten_cFv */ daNpcRoten_c::daNpcRoten_c() { @@ -320,8 +321,3 @@ static BOOL daNpc_RotenDraw(void*) { static BOOL daNpc_RotenIsDelete(void*) { /* Nonmatching */ } - -/* 00003F9C-00003FB8 .text setOffsetPos__9daDitem_cF4cXyz */ -void daDitem_c::setOffsetPos(cXyz) { - /* Nonmatching */ -} diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp index a939f6e32..f2a506370 100644 --- a/src/d/actor/d_a_npc_rsh1.cpp +++ b/src/d/actor/d_a_npc_rsh1.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_rsh1.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-0000021C .text __ct__16daNpc_Rsh1_HIO_cFv */ daNpc_Rsh1_HIO_c::daNpc_Rsh1_HIO_c() { @@ -295,19 +295,3 @@ static BOOL daNpc_Rsh1_Draw(daNpc_Rsh1_c*) { static BOOL daNpc_Rsh1_IsDelete(daNpc_Rsh1_c*) { /* Nonmatching */ } - -/* 00004FE0-00004FFC .text setEyePos__12daNpc_Rsh1_cF4cXyz */ -void daNpc_Rsh1_c::setEyePos(cXyz) { - /* Nonmatching */ -} - -/* 00004FFC-00005018 .text setAttentionBasePos__12daNpc_Rsh1_cF4cXyz */ -void daNpc_Rsh1_c::setAttentionBasePos(cXyz) { - /* Nonmatching */ -} - -/* 00005018-000050F8 .text getItemZoomPos__16ShopCam_action_cFf */ -void ShopCam_action_c::getItemZoomPos(float) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_npc_sarace.cpp b/src/d/actor/d_a_npc_sarace.cpp index 463f7c8a1..3b4277b7d 100644 --- a/src/d/actor/d_a_npc_sarace.cpp +++ b/src/d/actor/d_a_npc_sarace.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_npc_sarace.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000198 .text __ct__18daNpc_Sarace_HIO_cFv */ daNpc_Sarace_HIO_c::daNpc_Sarace_HIO_c() { diff --git a/src/d/actor/d_a_npc_sv.cpp b/src/d/actor/d_a_npc_sv.cpp index d58b38172..4996b0200 100644 --- a/src/d/actor/d_a_npc_sv.cpp +++ b/src/d/actor/d_a_npc_sv.cpp @@ -4,7 +4,8 @@ // #include "d/actor/d_a_npc_sv.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" +#include "d/actor/d_a_obj_ikada.h" /* 00000078-0000021C .text __ct__9daNpcSv_cFv */ daNpcSv_c::daNpcSv_c() { @@ -250,8 +251,3 @@ static BOOL daNpc_PeopleDraw(void*) { static BOOL daNpc_PeopleIsDelete(void*) { /* Nonmatching */ } - -/* 00002C0C-00002C28 .text getCranePos__13daObj_Ikada_cFv */ -void daObj_Ikada_c::getCranePos() { - /* Nonmatching */ -} diff --git a/src/d/actor/d_a_npc_uk.cpp b/src/d/actor/d_a_npc_uk.cpp index c2ec4729a..8cfaa2a97 100644 --- a/src/d/actor/d_a_npc_uk.cpp +++ b/src/d/actor/d_a_npc_uk.cpp @@ -355,13 +355,3 @@ static BOOL daNpc_Uk_Draw(daNpc_Uk_c*) { static BOOL daNpc_Uk_IsDelete(daNpc_Uk_c*) { /* Nonmatching */ } -/* 00005A0C-00005A28 .text setEyePos__10daNpc_Uk_cF4cXyz */ -void daNpc_Uk_c::setEyePos(cXyz) { - /* Nonmatching */ -} - -/* 00005A28-00005A44 .text setAttentionBasePos__10daNpc_Uk_cF4cXyz */ -void daNpc_Uk_c::setAttentionBasePos(cXyz) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_nz.cpp b/src/d/actor/d_a_nz.cpp index 78f8ad2bc..3a8ccb318 100644 --- a/src/d/actor/d_a_nz.cpp +++ b/src/d/actor/d_a_nz.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_nz.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 000000EC-00000138 .text __ct__10daNZ_HIO_cFv */ daNZ_HIO_c::daNZ_HIO_c() { diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index c8408e1e0..170088ace 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -12,7 +12,7 @@ BOOL daPedestal::daPds_c::_delete() { } /* 000000DC-000000FC .text CheckCreateHeap__10daPedestalFP10fopAc_ac_c */ -void daPedestal::CheckCreateHeap(fopAc_ac_c*) { +BOOL daPedestal::CheckCreateHeap(fopAc_ac_c*) { /* Nonmatching */ } @@ -122,27 +122,27 @@ BOOL daPedestal::daPds_c::_draw() { } /* 00000F10-00000F30 .text daPds_Create__10daPedestalFPv */ -void daPedestal::daPds_Create(void*) { +s32 daPedestal::daPds_Create(void*) { /* Nonmatching */ } /* 00000F30-00000F54 .text daPds_Delete__10daPedestalFPv */ -void daPedestal::daPds_Delete(void*) { +BOOL daPedestal::daPds_Delete(void*) { /* Nonmatching */ } /* 00000F54-00000F78 .text daPds_Draw__10daPedestalFPv */ -void daPedestal::daPds_Draw(void*) { +BOOL daPedestal::daPds_Draw(void*) { /* Nonmatching */ } /* 00000F78-00000F9C .text daPds_Execute__10daPedestalFPv */ -void daPedestal::daPds_Execute(void*) { +BOOL daPedestal::daPds_Execute(void*) { /* Nonmatching */ } /* 00000F9C-00000FA4 .text daPds_IsDelete__10daPedestalFPv */ -void daPedestal::daPds_IsDelete(void*) { +BOOL daPedestal::daPds_IsDelete(void*) { /* Nonmatching */ }