From d87b01b34a3f14d8c7741e8af54e5f4ca18d42bb Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 24 Nov 2023 16:26:18 -0500 Subject: [PATCH] Fix missing const inlines in actor headers --- include/d/actor/d_a_agbsw0.h | 2 + include/d/actor/d_a_bomb.h | 2 + include/d/actor/d_a_bomb2.h | 8 +++ include/d/actor/d_a_branch.h | 3 + include/d/actor/d_a_dai_item.h | 2 + include/d/actor/d_a_hookshot.h | 13 ++++ include/d/actor/d_a_lwood.h | 2 + include/d/actor/d_a_mgameboard.h | 8 ++- include/d/actor/d_a_obj_Itnak.h | 4 ++ include/d/actor/d_a_obj_Vds.h | 2 + include/d/actor/d_a_obj_YLzou.h | 2 + include/d/actor/d_a_obj_Yboil.h | 1 + include/d/actor/d_a_obj_Ygush00.h | 2 + include/d/actor/d_a_obj_akabe.h | 6 ++ include/d/actor/d_a_obj_ashut.h | 4 ++ include/d/actor/d_a_obj_auzu.h | 6 ++ include/d/actor/d_a_obj_aygr.h | 2 + include/d/actor/d_a_obj_barrel.h | 2 + include/d/actor/d_a_obj_barrel2.h | 8 +++ include/d/actor/d_a_obj_buoyflag.h | 6 +- include/d/actor/d_a_obj_buoyrace.h | 3 + include/d/actor/d_a_obj_coming.h | 9 ++- include/d/actor/d_a_obj_correct.h | 4 ++ include/d/actor/d_a_obj_drift.h | 2 + include/d/actor/d_a_obj_eayogn.h | 2 + include/d/actor/d_a_obj_ebomzo.h | 2 + include/d/actor/d_a_obj_eff.h | 1 + include/d/actor/d_a_obj_ekskz.h | 2 + include/d/actor/d_a_obj_eskban.h | 2 + include/d/actor/d_a_obj_ferris.h | 4 ++ include/d/actor/d_a_obj_firewall.h | 2 + include/d/actor/d_a_obj_flame.h | 8 +++ include/d/actor/d_a_obj_ftree.h | 2 +- include/d/actor/d_a_obj_gryw00.h | 2 + include/d/actor/d_a_obj_hami2.h | 2 + include/d/actor/d_a_obj_hami3.h | 4 ++ include/d/actor/d_a_obj_hami4.h | 1 + include/d/actor/d_a_obj_hbrf1.h | 4 ++ include/d/actor/d_a_obj_hcbh.h | 5 ++ include/d/actor/d_a_obj_hlift.h | 5 ++ include/d/actor/d_a_obj_homen.h | 8 +++ include/d/actor/d_a_obj_homensmoke.h | 4 ++ include/d/actor/d_a_obj_ice.h | 2 + include/d/actor/d_a_obj_jump.h | 2 + include/d/actor/d_a_obj_kanat.h | 2 + include/d/actor/d_a_obj_ladder.h | 4 ++ include/d/actor/d_a_obj_leaves.h | 5 ++ include/d/actor/d_a_obj_lpalm.h | 1 + include/d/actor/d_a_obj_mkie.h | 5 ++ include/d/actor/d_a_obj_mkiek.h | 3 + include/d/actor/d_a_obj_mknjd.h | 5 ++ include/d/actor/d_a_obj_msdan.h | 5 ++ include/d/actor/d_a_obj_msdan2.h | 2 + include/d/actor/d_a_obj_msdan_sub.h | 4 ++ include/d/actor/d_a_obj_msdan_sub2.h | 3 + include/d/actor/d_a_obj_mshokki.h | 2 + include/d/actor/d_a_obj_mtest.h | 5 ++ include/d/actor/d_a_obj_ohatch.h | 2 + include/d/actor/d_a_obj_ospbox.h | 3 + include/d/actor/d_a_obj_otble.h | 1 + include/d/actor/d_a_obj_paper.h | 4 ++ include/d/actor/d_a_obj_rcloud.h | 2 + include/d/actor/d_a_obj_shelf.h | 2 + include/d/actor/d_a_obj_shmrgrd.h | 3 + include/d/actor/d_a_obj_smplbg.h | 2 + include/d/actor/d_a_obj_swflat.h | 4 ++ include/d/actor/d_a_obj_swhammer.h | 6 ++ include/d/actor/d_a_obj_swheavy.h | 8 +++ include/d/actor/d_a_obj_swlight.h | 8 +++ include/d/actor/d_a_obj_swpush.h | 12 ++++ include/d/actor/d_a_obj_table.h | 2 + include/d/actor/d_a_obj_tenmado.h | 3 + include/d/actor/d_a_obj_tide.h | 3 + include/d/actor/d_a_obj_timer.h | 2 + include/d/actor/d_a_obj_tntrap.h | 5 ++ include/d/actor/d_a_obj_toripost.h | 7 +- include/d/actor/d_a_obj_trap.h | 1 + include/d/actor/d_a_obj_tribox.h | 5 ++ include/d/actor/d_a_obj_try.h | 5 ++ include/d/actor/d_a_obj_vfan.h | 2 + include/d/actor/d_a_obj_vmc.h | 1 + include/d/actor/d_a_obj_vmsms.h | 3 +- include/d/actor/d_a_obj_volcano.h | 2 + include/d/actor/d_a_obj_vtil.h | 3 +- include/d/actor/d_a_obj_vyasi.h | 2 + include/d/actor/d_a_obj_zouK.h | 1 + include/d/actor/d_a_player_main.h | 97 ++++++++++++++++++++++++++++ include/d/actor/d_a_ship.h | 26 +++++++- include/d/actor/d_a_shop_item.h | 3 + include/d/actor/d_a_stone2.h | 7 ++ include/d/actor/d_a_swhit0.h | 2 + include/d/actor/d_a_tag_attention.h | 5 +- include/d/actor/d_a_tag_evsw.h | 4 ++ include/d/actor/d_a_tag_kb_item.h | 2 + include/d/actor/d_a_tag_light.h | 9 +++ include/d/actor/d_a_tag_volcano.h | 5 ++ include/d/actor/d_a_tag_waterlevel.h | 1 + include/d/actor/d_a_tornado.h | 3 + include/d/actor/d_a_tsubo.h | 12 ++++ include/d/actor/d_a_wind_tag.h | 3 + include/d/actor/d_a_windmill.h | 4 ++ include/d/actor/d_a_ygcwp.h | 5 +- 102 files changed, 491 insertions(+), 14 deletions(-) diff --git a/include/d/actor/d_a_agbsw0.h b/include/d/actor/d_a_agbsw0.h index e7592d7ab..d675a7535 100644 --- a/include/d/actor/d_a_agbsw0.h +++ b/include/d/actor/d_a_agbsw0.h @@ -64,6 +64,8 @@ public: s16 getParamNo() { return current.angle.x & 0xFFFF; } + + void deleteSub() {} static void incTclDispose(); static void incTclBeat(); diff --git a/include/d/actor/d_a_bomb.h b/include/d/actor/d_a_bomb.h index 46789792d..f45fa19d1 100644 --- a/include/d/actor/d_a_bomb.h +++ b/include/d/actor/d_a_bomb.h @@ -136,6 +136,8 @@ public: PRM_VERSION_S = 0x1F, }; + void attrType() const {} + s16 getBombRestTime(); s16 getBombCheck_Flag(); void setBombCheck_Flag(); diff --git a/include/d/actor/d_a_bomb2.h b/include/d/actor/d_a_bomb2.h index 969b3880b..389a33f07 100644 --- a/include/d/actor/d_a_bomb2.h +++ b/include/d/actor/d_a_bomb2.h @@ -66,8 +66,16 @@ namespace daBomb2 { /* 0x50 */ f32 field_0x50; }; // Size 0x54 + enum Start_e { + + }; + class Act_c : public fopAc_ac_c { public: + void prm_get_start() const {} + void prm_get_stick() const {} + void prm_make(Start_e, bool) {} + Act_c(); //d_a_bomb_static functions diff --git a/include/d/actor/d_a_branch.h b/include/d/actor/d_a_branch.h index db5149646..d4bb8a1c3 100644 --- a/include/d/actor/d_a_branch.h +++ b/include/d/actor/d_a_branch.h @@ -18,6 +18,9 @@ public: dComIfG_resDelete(&mPhs, m_arcname); } + void create() {} + void draw() {} + void execute() {} void set_mtx(); void set_anim(int, int, int); diff --git a/include/d/actor/d_a_dai_item.h b/include/d/actor/d_a_dai_item.h index 47a7f6f35..6da617544 100644 --- a/include/d/actor/d_a_dai_item.h +++ b/include/d/actor/d_a_dai_item.h @@ -11,6 +11,8 @@ class daStandItem_c : public fopAc_ac_c { public: + void getItemNo() const {} + void _delete(); void CreateHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_hookshot.h b/include/d/actor/d_a_hookshot.h index 99da72971..d4c8ace7b 100644 --- a/include/d/actor/d_a_hookshot.h +++ b/include/d/actor/d_a_hookshot.h @@ -23,6 +23,19 @@ public: void offObjHookFlg() {} void setObjSightCrossPos(const cXyz*) {} void getObjSightCrossPos() {} + void checkPull() {} + void checkReturn() {} + void checkShipRideFlg() const {} + void checkShot() {} + void checkWait() {} + void getCarryActorID() const {} + void getHookAngle() {} + void getMtxTop() {} + void getObjHookFlg() const {} + void getSightHit() const {} + void setCarryOffset(const cXyz*) {} + void setReturn() {} + void setShot() {} daHookshot_c() {} BOOL draw(); diff --git a/include/d/actor/d_a_lwood.h b/include/d/actor/d_a_lwood.h index d5e2d7f19..e8f4313f7 100644 --- a/include/d/actor/d_a_lwood.h +++ b/include/d/actor/d_a_lwood.h @@ -9,6 +9,8 @@ public: void _delete() {} void _draw() {} void _execute() {} + void getYureScale() const {} + void getYureTimer() const {} void setMoveBGMtx() {} void set_mtx() {} diff --git a/include/d/actor/d_a_mgameboard.h b/include/d/actor/d_a_mgameboard.h index 623d62e97..ccba0adea 100644 --- a/include/d/actor/d_a_mgameboard.h +++ b/include/d/actor/d_a_mgameboard.h @@ -11,6 +11,12 @@ class dDlst_2DObject_c; class daMgBoard_c : public fopAc_ac_c { public: + void _create() {} + void _delete() {} + void _draw() {} + void reqClearGame() {} + void set_mtx() {} + void checkClearGame(); void getScore(); void reqStartGame(); @@ -21,13 +27,11 @@ public: void set_2dposition(); void CreateInit(); void MiniGameInit(); - void set_mtx(); void _execute(); void execGameMain(); void execEndGame(); void MinigameMain(); void CursorMove(); - void _draw(); /* 0x290 */ request_of_phase_process_class mPhase; /* 0x298 */ J3DModel* mpBoardModel; diff --git a/include/d/actor/d_a_obj_Itnak.h b/include/d/actor/d_a_obj_Itnak.h index f439b048d..4b19df46c 100644 --- a/include/d/actor/d_a_obj_Itnak.h +++ b/include/d/actor/d_a_obj_Itnak.h @@ -7,6 +7,10 @@ namespace daObjItnak { class Act_c : public fopAc_ac_c { public: + void is_switch() const {} + void param_get_arg0() const {} + void param_get_swbit() const {} + void solidHeapCB(fopAc_ac_c*); void create_heap(); void _create(); diff --git a/include/d/actor/d_a_obj_Vds.h b/include/d/actor/d_a_obj_Vds.h index 9d50ba956..f0cbac0ee 100644 --- a/include/d/actor/d_a_obj_Vds.h +++ b/include/d/actor/d_a_obj_Vds.h @@ -7,6 +7,8 @@ namespace daObjVds { class Act_c : public fopAc_ac_c { public: + void is_switch() const {} + void SetLoopJointAnimation(J3DAnmTransformKey*, J3DAnmTransformKey*, float, float); void PlayLoopJointAnimation(); void set_first_process(); diff --git a/include/d/actor/d_a_obj_YLzou.h b/include/d/actor/d_a_obj_YLzou.h index 8aab121d9..907f890bb 100644 --- a/include/d/actor/d_a_obj_YLzou.h +++ b/include/d/actor/d_a_obj_YLzou.h @@ -5,6 +5,8 @@ class daObjYLzou_c : public fopAc_ac_c { public: + void param_get_swSave() const {} + void set_start_type(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_Yboil.h b/include/d/actor/d_a_obj_Yboil.h index e80577e98..13cc28001 100644 --- a/include/d/actor/d_a_obj_Yboil.h +++ b/include/d/actor/d_a_obj_Yboil.h @@ -10,6 +10,7 @@ public: void _delete() {} void _draw() {} void _execute() {} + void prm_get_swSave() const {} void set_sea_material(J3DMaterial*) {} void CreateHeap(); diff --git a/include/d/actor/d_a_obj_Ygush00.h b/include/d/actor/d_a_obj_Ygush00.h index b8bd639dd..5458a2dd5 100644 --- a/include/d/actor/d_a_obj_Ygush00.h +++ b/include/d/actor/d_a_obj_Ygush00.h @@ -13,6 +13,8 @@ public: PRM_TYPE_S = 0, }; + void param_get_arg() const {} + s32 _create(); bool _delete(); bool _execute(); diff --git a/include/d/actor/d_a_obj_akabe.h b/include/d/actor/d_a_obj_akabe.h index 3b3698734..190eef440 100644 --- a/include/d/actor/d_a_obj_akabe.h +++ b/include/d/actor/d_a_obj_akabe.h @@ -7,6 +7,12 @@ namespace daObjAkabe { class Act_c : public fopAc_ac_c { + public: + void prm_get_always() const {} + void prm_get_arg0() const {} + void prm_get_scl() const {} + void prm_get_swSave() const {} + public: /* 0x290 */ request_of_phase_process_class mPhs; /* 0x298 */ dBgW* mpBgW; diff --git a/include/d/actor/d_a_obj_ashut.h b/include/d/actor/d_a_obj_ashut.h index 0f83abfc9..3ca681952 100644 --- a/include/d/actor/d_a_obj_ashut.h +++ b/include/d/actor/d_a_obj_ashut.h @@ -6,6 +6,10 @@ namespace daObjAshut { class Act_c : public fopAc_ac_c { public: + void is_switch() const {} + void prm_get_evId() const {} + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_auzu.h b/include/d/actor/d_a_obj_auzu.h index dc020b72a..5e84ccc6d 100644 --- a/include/d/actor/d_a_obj_auzu.h +++ b/include/d/actor/d_a_obj_auzu.h @@ -7,6 +7,12 @@ namespace daObjAuzu { class Act_c : public fopAc_ac_c { public: + void attr() const {} + void is_appear() const {} + void prm_get_appear() const {} + void prm_get_linkID() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} void prm_make_squid() {} void to_appear() {} void to_disappear() {} diff --git a/include/d/actor/d_a_obj_aygr.h b/include/d/actor/d_a_obj_aygr.h index cbc076f61..3b13e5e5f 100644 --- a/include/d/actor/d_a_obj_aygr.h +++ b/include/d/actor/d_a_obj_aygr.h @@ -6,6 +6,8 @@ namespace daObjAygr { class Act_c : public fopAc_ac_c { public: + void prm_get_mdl() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_barrel.h b/include/d/actor/d_a_obj_barrel.h index 5b9b5bd13..b33ed81c7 100644 --- a/include/d/actor/d_a_obj_barrel.h +++ b/include/d/actor/d_a_obj_barrel.h @@ -6,8 +6,10 @@ namespace daObjBarrel { class Act_c : public fopAc_ac_c { public: + void attr() const {} void get_slant_angle() {} void pos_init() {} + void prm_get_cull() const {} void set_slant_angle(short) {} void solidHeapCB(fopAc_ac_c*); diff --git a/include/d/actor/d_a_obj_barrel2.h b/include/d/actor/d_a_obj_barrel2.h index 65b004595..4534879ca 100644 --- a/include/d/actor/d_a_obj_barrel2.h +++ b/include/d/actor/d_a_obj_barrel2.h @@ -7,11 +7,19 @@ namespace daObjBarrel2 { class Act_c : public fopAc_ac_c { public: + void attr() const {} + void chk_item_give() const {} void delete_req() {} void exit_req() {} void get_item_id() {} void make_coming(cXyz*, int, daObjBarrel2::Type_e, int, bool, short, daObjBuoyflag::Texture_e) {} void make_prm(daObjBarrel2::Type_e, int, bool, bool, daObjBuoyflag::Texture_e) {} + void prm_get_buoy() const {} + void prm_get_coming() const {} + void prm_get_itemNo() const {} + void prm_get_itemSave() const {} + void prm_get_texture() const {} + void prm_get_type() const {} void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h index 83354dcaa..28225d154 100644 --- a/include/d/actor/d_a_obj_buoyflag.h +++ b/include/d/actor/d_a_obj_buoyflag.h @@ -37,9 +37,11 @@ namespace daObjBuoyflag { void jump_to_sea(float, float, short) {} void make_barrel2_mine(unsigned int, cXyz*, int, csXyz*, daObjBuoyflag::Texture_e, bool) {} void make_barrel2_norm(unsigned int, cXyz*, int, csXyz*, daObjBuoyflag::Texture_e) {} + void attr_type() const {} + void prm_get_noCull() const {} + void prm_get_texture() const {} + void prm_get_type() const {} - void prm_get_texture() const; - void attr_type() const; void mtx_init(); void mode_afl(); void mode_jumpToSea(); diff --git a/include/d/actor/d_a_obj_buoyrace.h b/include/d/actor/d_a_obj_buoyrace.h index ff1a160b8..5ae6069a9 100644 --- a/include/d/actor/d_a_obj_buoyrace.h +++ b/include/d/actor/d_a_obj_buoyrace.h @@ -10,6 +10,9 @@ namespace daObjBuoyrace { void _delete() {} void _draw() {} void _execute() {} + void attr() const {} + void prm_get_id() const {} + void prm_get_line() const {} void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_coming.h b/include/d/actor/d_a_obj_coming.h index eaf0bd1f1..2dd0c9f01 100644 --- a/include/d/actor/d_a_obj_coming.h +++ b/include/d/actor/d_a_obj_coming.h @@ -6,7 +6,14 @@ namespace daObjComing { class Act_c : public fopAc_ac_c { public: - void prm_get_waitTime() const; + void prm_get_always() const {} + void prm_get_makeNum() const {} + void prm_get_range() const {} + void prm_get_swSave() const {} + void prm_get_tblNum() const {} + void prm_get_type() const {} + void prm_get_waitTime() const {} + void chk_switch(); void _create(); void _delete(); diff --git a/include/d/actor/d_a_obj_correct.h b/include/d/actor/d_a_obj_correct.h index 34f2bec77..69103ef5d 100644 --- a/include/d/actor/d_a_obj_correct.h +++ b/include/d/actor/d_a_obj_correct.h @@ -7,6 +7,10 @@ namespace daObjCorrect { class Act_c : public fopAc_ac_c { public: + void prm_get_evId() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} + void _create(); void _delete(); void chk_try_actor0(fopAc_ac_c*); diff --git a/include/d/actor/d_a_obj_drift.h b/include/d/actor/d_a_obj_drift.h index 061bcf00f..b21b9c6fa 100644 --- a/include/d/actor/d_a_obj_drift.h +++ b/include/d/actor/d_a_obj_drift.h @@ -7,6 +7,8 @@ namespace daObjDrift { class Act_c : public fopAc_ac_c { public: + void prm_get_type() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_eayogn.h b/include/d/actor/d_a_obj_eayogn.h index 134213255..e80fa4e7c 100644 --- a/include/d/actor/d_a_obj_eayogn.h +++ b/include/d/actor/d_a_obj_eayogn.h @@ -5,6 +5,8 @@ class daObjEayogn_c : public fopAc_ac_c { public: + void check_ev_bit() const {} + void init_mtx(); public: diff --git a/include/d/actor/d_a_obj_ebomzo.h b/include/d/actor/d_a_obj_ebomzo.h index 6d2233d19..f716e03ca 100644 --- a/include/d/actor/d_a_obj_ebomzo.h +++ b/include/d/actor/d_a_obj_ebomzo.h @@ -6,6 +6,8 @@ namespace daObjEbomzo { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h index 30e948337..ae3014a6c 100644 --- a/include/d/actor/d_a_obj_eff.h +++ b/include/d/actor/d_a_obj_eff.h @@ -12,6 +12,7 @@ namespace daObjEff { void make_skull_smoke(cXyz*) {} void make_stool_smoke(cXyz*) {} void make_woodBox_smoke(cXyz*) {} + void prm_get_type() const {} void solidHeapCB(fopAc_ac_c*); void create_heap_barrel_smoke(); diff --git a/include/d/actor/d_a_obj_ekskz.h b/include/d/actor/d_a_obj_ekskz.h index 2941b5be8..56c22e86d 100644 --- a/include/d/actor/d_a_obj_ekskz.h +++ b/include/d/actor/d_a_obj_ekskz.h @@ -11,6 +11,8 @@ namespace daObjEkskz { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_eskban.h b/include/d/actor/d_a_obj_eskban.h index d7eebd5c3..749f1a953 100644 --- a/include/d/actor/d_a_obj_eskban.h +++ b/include/d/actor/d_a_obj_eskban.h @@ -6,6 +6,8 @@ namespace daObjEskban { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_ferris.h b/include/d/actor/d_a_obj_ferris.h index 196bbc4b3..3a0fae449 100644 --- a/include/d/actor/d_a_obj_ferris.h +++ b/include/d/actor/d_a_obj_ferris.h @@ -7,6 +7,10 @@ namespace daObjFerris { class Act_c : public fopAc_ac_c { public: + void is_switch() const {} + void off_switch() const {} + void param_get_swSave() const {} + void solidHeapCB(fopAc_ac_c*); void create_heap(); void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*); diff --git a/include/d/actor/d_a_obj_firewall.h b/include/d/actor/d_a_obj_firewall.h index 064259473..62dfb75bb 100644 --- a/include/d/actor/d_a_obj_firewall.h +++ b/include/d/actor/d_a_obj_firewall.h @@ -5,6 +5,8 @@ class daObjFirewall_c : public fopAc_ac_c { public: + void param_get_swSave() const {} + void init_mtx(); void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_flame.h b/include/d/actor/d_a_obj_flame.h index 3fdc3c40b..7c0bd2ca8 100644 --- a/include/d/actor/d_a_obj_flame.h +++ b/include/d/actor/d_a_obj_flame.h @@ -15,6 +15,14 @@ namespace daObjFlame { void _draw() {} void _execute() {} void _is_delete() {} + void attr_base() const {} + void attr_scl() const {} + void prm_get_haze() const {} + void prm_get_kiCycle() const {} + void prm_get_kiNum() const {} + void prm_get_sch() const {} + void prm_get_scl() const {} + void prm_get_swSave() const {} void set_switch(); void solidHeapCB(fopAc_ac_c*); diff --git a/include/d/actor/d_a_obj_ftree.h b/include/d/actor/d_a_obj_ftree.h index 954ef270d..dbdfc856c 100644 --- a/include/d/actor/d_a_obj_ftree.h +++ b/include/d/actor/d_a_obj_ftree.h @@ -17,6 +17,7 @@ namespace daObjFtree { void check_heart() {} void check_water() {} void init_water() {} + void param_get_tree_idx() const {} void set_heart(short) {} void set_water(short) {} void tree_brouht(int) {} @@ -29,7 +30,6 @@ namespace daObjFtree { void XyEvent_init(); void XyEvent_set(short); void XyEvent_exe(); - void param_get_tree_idx() const; void SetJointAnimation(int, float, float, int); void PlayStopJointAnimation(); void PlayStopColorAnimation(); diff --git a/include/d/actor/d_a_obj_gryw00.h b/include/d/actor/d_a_obj_gryw00.h index abeeba4f7..476a4ab4c 100644 --- a/include/d/actor/d_a_obj_gryw00.h +++ b/include/d/actor/d_a_obj_gryw00.h @@ -5,6 +5,8 @@ class daObjGryw00_c : public fopAc_ac_c { public: + void param_get_swSave() const {} + f32 get_draw_water_lv(void*); void setup_high_water_level_btk_anm(); void particle_set(); diff --git a/include/d/actor/d_a_obj_hami2.h b/include/d/actor/d_a_obj_hami2.h index df07cf61e..56f2062d2 100644 --- a/include/d/actor/d_a_obj_hami2.h +++ b/include/d/actor/d_a_obj_hami2.h @@ -6,6 +6,8 @@ namespace daObjHami2 { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_hami3.h b/include/d/actor/d_a_obj_hami3.h index 2bb03956d..4e7e3bea9 100644 --- a/include/d/actor/d_a_obj_hami3.h +++ b/include/d/actor/d_a_obj_hami3.h @@ -6,6 +6,10 @@ namespace daObjHami3 { class Act_c : public fopAc_ac_c { public: + void prm_get_sound() const {} + void prm_get_swSave() const {} + void prm_get_swSave2() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_hami4.h b/include/d/actor/d_a_obj_hami4.h index 0f9f79b6c..da2416b15 100644 --- a/include/d/actor/d_a_obj_hami4.h +++ b/include/d/actor/d_a_obj_hami4.h @@ -9,6 +9,7 @@ public: void _delete() {} void _draw() {} void _execute() {} + void prm_get_swSave() const {} void CreateHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_obj_hbrf1.h b/include/d/actor/d_a_obj_hbrf1.h index 85d5e503a..722cd465d 100644 --- a/include/d/actor/d_a_obj_hbrf1.h +++ b/include/d/actor/d_a_obj_hbrf1.h @@ -6,6 +6,10 @@ namespace daObjHbrf1 { class Act_c : public fopAc_ac_c { public: + void prm_get_Event() const {} + void prm_get_Type() const {} + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_hcbh.h b/include/d/actor/d_a_obj_hcbh.h index a6768a385..78661fa9d 100644 --- a/include/d/actor/d_a_obj_hcbh.h +++ b/include/d/actor/d_a_obj_hcbh.h @@ -6,6 +6,11 @@ class daObjHcbh_c : public fopAc_ac_c { public: + void param_get_itemNo() const {} + void param_get_itemSaveBitNo() const {} + void param_get_swSave() const {} + void param_on_swSave() const {} + void chk_appear(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_hlift.h b/include/d/actor/d_a_obj_hlift.h index b5a43e1a7..02a8e59ff 100644 --- a/include/d/actor/d_a_obj_hlift.h +++ b/include/d/actor/d_a_obj_hlift.h @@ -6,6 +6,11 @@ namespace daObjHlift { class Act_c : public fopAc_ac_c { public: + void prm_get_dist() const {} + void prm_get_evId() const {} + void prm_get_size() const {} + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_homen.h b/include/d/actor/d_a_obj_homen.h index db54705ef..a8eb3a731 100644 --- a/include/d/actor/d_a_obj_homen.h +++ b/include/d/actor/d_a_obj_homen.h @@ -6,6 +6,14 @@ namespace daObjHomen { class Act_c : public fopAc_ac_c { public: + void is_switch() const {} + void on_switch() const {} + void param_get_arg0() const {} + void param_get_enemy() const {} + void param_get_item() const {} + void param_get_itembit() const {} + void param_get_sw() const {} + void solidHeapCB(fopAc_ac_c*); void create_heap(); void _create(); diff --git a/include/d/actor/d_a_obj_homensmoke.h b/include/d/actor/d_a_obj_homensmoke.h index 0ece205de..f056ed871 100644 --- a/include/d/actor/d_a_obj_homensmoke.h +++ b/include/d/actor/d_a_obj_homensmoke.h @@ -5,6 +5,10 @@ namespace daObjHomensmoke { class Act_c : public fopAc_ac_c { + public: + void param_get_arg0() const {} + void param_get_axis() const {} + public: /* Place member variables here */ }; diff --git a/include/d/actor/d_a_obj_ice.h b/include/d/actor/d_a_obj_ice.h index 0cf539e5b..c083d3b74 100644 --- a/include/d/actor/d_a_obj_ice.h +++ b/include/d/actor/d_a_obj_ice.h @@ -6,6 +6,8 @@ class daObjIce_c : public fopAc_ac_c { public: + void param_get_swSave() const {} + void param_on_swSave() const {} void setEffectMtx() {} void chk_appear(); diff --git a/include/d/actor/d_a_obj_jump.h b/include/d/actor/d_a_obj_jump.h index b0cfb62a6..19eaa8910 100644 --- a/include/d/actor/d_a_obj_jump.h +++ b/include/d/actor/d_a_obj_jump.h @@ -16,6 +16,8 @@ namespace daObjJump { current.pos = *pos; m336 = 1; } + void attr() const {} + void prm_get_type() const {} void CreateHeap(); void Create(); diff --git a/include/d/actor/d_a_obj_kanat.h b/include/d/actor/d_a_obj_kanat.h index 0c86da01f..5c96b10d6 100644 --- a/include/d/actor/d_a_obj_kanat.h +++ b/include/d/actor/d_a_obj_kanat.h @@ -6,6 +6,8 @@ namespace daObjKanat { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_ladder.h b/include/d/actor/d_a_obj_ladder.h index 29f7e5585..604929034 100644 --- a/include/d/actor/d_a_obj_ladder.h +++ b/include/d/actor/d_a_obj_ladder.h @@ -6,6 +6,10 @@ namespace daObjLadder { class Act_c : public fopAc_ac_c { public: + void prm_get_evId() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_leaves.h b/include/d/actor/d_a_obj_leaves.h index f644ce835..194942f59 100644 --- a/include/d/actor/d_a_obj_leaves.h +++ b/include/d/actor/d_a_obj_leaves.h @@ -6,6 +6,11 @@ class daObjLeaves_c : public fopAc_ac_c { public: + void param_get_itemNo() const {} + void param_get_itemSaveBitNo() const {} + void param_get_swSave() const {} + void param_on_swSave() const {} + void chk_appear(); void init_mtx(); void birthEffect(int, cXyz*, csXyz*, _GXColor*); diff --git a/include/d/actor/d_a_obj_lpalm.h b/include/d/actor/d_a_obj_lpalm.h index 1c0efbda2..d9408010d 100644 --- a/include/d/actor/d_a_obj_lpalm.h +++ b/include/d/actor/d_a_obj_lpalm.h @@ -11,6 +11,7 @@ public: void _delete() {} void _draw() {} void _execute() {} + void attr() const {} void set_mtx() {} void CreateHeap(); diff --git a/include/d/actor/d_a_obj_mkie.h b/include/d/actor/d_a_obj_mkie.h index 1eff8a519..bd8317fed 100644 --- a/include/d/actor/d_a_obj_mkie.h +++ b/include/d/actor/d_a_obj_mkie.h @@ -14,6 +14,11 @@ namespace daObjMkie { current.pos = *pos; mF58 = 1; } + void attr() const {} + void prm_get_correct() const {} + void prm_get_evId() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} void CreateHeap(); void init_cc(); diff --git a/include/d/actor/d_a_obj_mkiek.h b/include/d/actor/d_a_obj_mkiek.h index 6ddfa2465..8652ded6f 100644 --- a/include/d/actor/d_a_obj_mkiek.h +++ b/include/d/actor/d_a_obj_mkiek.h @@ -6,6 +6,9 @@ namespace daObjMkiek { class Act_c : public fopAc_ac_c { public: + void prm_get_sound() const {} + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_mknjd.h b/include/d/actor/d_a_obj_mknjd.h index 998501814..679dbe34a 100644 --- a/include/d/actor/d_a_obj_mknjd.h +++ b/include/d/actor/d_a_obj_mknjd.h @@ -12,6 +12,11 @@ class msg_class; namespace daObjMknjD { class Act_c : public dBgS_MoveBgActor { public: + void anmAtr(unsigned short) {} + void getMsg() {} + void prm_get_Type() const {} + void prm_get_swSave() const {} + s32 Mthd_Create(); s32 Mthd_Delete(); diff --git a/include/d/actor/d_a_obj_msdan.h b/include/d/actor/d_a_obj_msdan.h index bdaf377a9..d9f54925c 100644 --- a/include/d/actor/d_a_obj_msdan.h +++ b/include/d/actor/d_a_obj_msdan.h @@ -6,6 +6,11 @@ namespace daObjMsdan { class Act_c : public fopAc_ac_c { public: + void prm_get_evId() const {} + void prm_get_size() const {} + void prm_get_sound() const {} + void prm_get_swSave() const {} + void Mthd_Create(); void Mthd_Execute(); void Mthd_Delete(); diff --git a/include/d/actor/d_a_obj_msdan2.h b/include/d/actor/d_a_obj_msdan2.h index 890f9097b..8f1e9b780 100644 --- a/include/d/actor/d_a_obj_msdan2.h +++ b/include/d/actor/d_a_obj_msdan2.h @@ -6,6 +6,8 @@ namespace daObjMsdan2 { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void Mthd_Create(); void Mthd_Execute(); void Mthd_Delete(); diff --git a/include/d/actor/d_a_obj_msdan_sub.h b/include/d/actor/d_a_obj_msdan_sub.h index 3342be92d..a5f4d24e7 100644 --- a/include/d/actor/d_a_obj_msdan_sub.h +++ b/include/d/actor/d_a_obj_msdan_sub.h @@ -6,6 +6,10 @@ namespace daObjMsdanSub { class Act_c : public fopAc_ac_c { public: + void prm_get_objNo() const {} + void prm_get_size() const {} + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_msdan_sub2.h b/include/d/actor/d_a_obj_msdan_sub2.h index 7554ffb7c..c124d94ab 100644 --- a/include/d/actor/d_a_obj_msdan_sub2.h +++ b/include/d/actor/d_a_obj_msdan_sub2.h @@ -6,6 +6,9 @@ namespace daObjMsdanSub2 { class Act_c : public fopAc_ac_c { public: + void prm_get_objNo() const {} + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_mshokki.h b/include/d/actor/d_a_obj_mshokki.h index b3a733aa9..b16d5c621 100644 --- a/include/d/actor/d_a_obj_mshokki.h +++ b/include/d/actor/d_a_obj_mshokki.h @@ -6,6 +6,8 @@ class daObjMshokki_c : public fopAc_ac_c { public: + void param_get_arg() const {} + void set_mtx(); void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_mtest.h b/include/d/actor/d_a_obj_mtest.h index 120e4a0c5..187b53ec9 100644 --- a/include/d/actor/d_a_obj_mtest.h +++ b/include/d/actor/d_a_obj_mtest.h @@ -6,6 +6,11 @@ namespace daObjMtest { class Act_c : public fopAc_ac_c { public: + void prm_get_arg0() const {} + void prm_get_arg1() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} + void chk_appear(); void CreateHeap(); void Create(); diff --git a/include/d/actor/d_a_obj_ohatch.h b/include/d/actor/d_a_obj_ohatch.h index 08d8899d2..9456175f3 100644 --- a/include/d/actor/d_a_obj_ohatch.h +++ b/include/d/actor/d_a_obj_ohatch.h @@ -5,6 +5,8 @@ class daObjOhatch_c : public fopAc_ac_c { public: + void param_get_swSave() const {} + void set_mtx(); void init_mtx(); void solidHeapCB(fopAc_ac_c*); diff --git a/include/d/actor/d_a_obj_ospbox.h b/include/d/actor/d_a_obj_ospbox.h index 6f0dd94ba..55866118b 100644 --- a/include/d/actor/d_a_obj_ospbox.h +++ b/include/d/actor/d_a_obj_ospbox.h @@ -6,6 +6,9 @@ namespace daObjOspbox { class Act_c : public fopAc_ac_c { public: + void prm_get_itemNo() const {} + void prm_get_spec() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_otble.h b/include/d/actor/d_a_obj_otble.h index 775de1d53..c99118f68 100644 --- a/include/d/actor/d_a_obj_otble.h +++ b/include/d/actor/d_a_obj_otble.h @@ -8,6 +8,7 @@ namespace daObj_Otble { public: void _create() {} void _delete() {} + void attr() const {} void set_mtx(); void _execute(); diff --git a/include/d/actor/d_a_obj_paper.h b/include/d/actor/d_a_obj_paper.h index 4faedb281..4d37fd16a 100644 --- a/include/d/actor/d_a_obj_paper.h +++ b/include/d/actor/d_a_obj_paper.h @@ -8,6 +8,10 @@ namespace daObjPaper { class Act_c : public fopAc_ac_c { + public: + void prm_get_msgNo() const {} + void prm_get_type() const {} + public: /* 0x290 */ request_of_phase_process_class mPhs; /* 0x298 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_rcloud.h b/include/d/actor/d_a_obj_rcloud.h index 9a3719761..87f8bafc2 100644 --- a/include/d/actor/d_a_obj_rcloud.h +++ b/include/d/actor/d_a_obj_rcloud.h @@ -7,6 +7,8 @@ class daObjRcloud_c : public fopAc_ac_c { public: + void param_get_arg() const {} + void init_mtx(); void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_shelf.h b/include/d/actor/d_a_obj_shelf.h index 797508341..6e788a419 100644 --- a/include/d/actor/d_a_obj_shelf.h +++ b/include/d/actor/d_a_obj_shelf.h @@ -6,6 +6,8 @@ namespace daObjShelf { class Act_c : public fopAc_ac_c { public: + void prm_get_groundma() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_shmrgrd.h b/include/d/actor/d_a_obj_shmrgrd.h index acfac5af3..7cf58af83 100644 --- a/include/d/actor/d_a_obj_shmrgrd.h +++ b/include/d/actor/d_a_obj_shmrgrd.h @@ -7,6 +7,9 @@ class daObjShmrgrd_c : public fopAc_ac_c { public: void get_mode() {} + void is_switch() const {} + void on_switch() const {} + void prm_get_swSave() const {} void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_smplbg.h b/include/d/actor/d_a_obj_smplbg.h index 1cb5af58d..5f2c54a51 100644 --- a/include/d/actor/d_a_obj_smplbg.h +++ b/include/d/actor/d_a_obj_smplbg.h @@ -6,9 +6,11 @@ namespace daObjSmplbg { class Act_c : public fopAc_ac_c { public: + void attr() const {} void isStop() {} void offStop() {} void onStop() {} + void prm_get_type() const {} void CreateHeap(); void Create(); diff --git a/include/d/actor/d_a_obj_swflat.h b/include/d/actor/d_a_obj_swflat.h index 17ebd6d79..b407a6104 100644 --- a/include/d/actor/d_a_obj_swflat.h +++ b/include/d/actor/d_a_obj_swflat.h @@ -6,6 +6,10 @@ namespace daObjSwflat { class Act_c : public fopAc_ac_c { public: + void prmGetSwNo() const {} + void prmGetSwNo2() const {} + void prmGetType() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_swhammer.h b/include/d/actor/d_a_obj_swhammer.h index 9a7ad3251..a1a4aeadd 100644 --- a/include/d/actor/d_a_obj_swhammer.h +++ b/include/d/actor/d_a_obj_swhammer.h @@ -7,6 +7,12 @@ namespace daObjSwhammer { class Act_c : public fopAc_ac_c { public: + void is_switch() const {} + void off_switch2() const {} + void on_switch() const {} + void prm_get_swSave() const {} + void prm_get_swSave2() const {} + void CreateHeap(); void Create(); void _create(); diff --git a/include/d/actor/d_a_obj_swheavy.h b/include/d/actor/d_a_obj_swheavy.h index 73ef7391b..aba2f110e 100644 --- a/include/d/actor/d_a_obj_swheavy.h +++ b/include/d/actor/d_a_obj_swheavy.h @@ -7,6 +7,14 @@ namespace daObjSwheavy { class Act_c : public fopAc_ac_c { public: + void attr() const {} + void is_switch() const {} + void off_switch() const {} + void on_switch() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} + void rev_switch() const {} + void solidHeapCB(fopAc_ac_c*); void create_heap(); void _create(); diff --git a/include/d/actor/d_a_obj_swlight.h b/include/d/actor/d_a_obj_swlight.h index a43c9ba92..e45e2ffa1 100644 --- a/include/d/actor/d_a_obj_swlight.h +++ b/include/d/actor/d_a_obj_swlight.h @@ -7,6 +7,14 @@ namespace daObjSwlight { class Act_c : public fopAc_ac_c { public: + void get_power() const {} + void is_switch() const {} + void off_switch() const {} + void on_switch() const {} + void prm_get_swSave() const {} + void prm_get_swSave2() const {} + void prm_get_type() const {} + void is_switch2() const; void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_swpush.h b/include/d/actor/d_a_obj_swpush.h index c9df786c9..548673893 100644 --- a/include/d/actor/d_a_obj_swpush.h +++ b/include/d/actor/d_a_obj_swpush.h @@ -8,6 +8,18 @@ namespace daObjSwpush { class Act_c : public fopAc_ac_c { public: + void attr() const {} + void is_switch() const {} + void off_switch() const {} + void on_switch() const {} + void prmZ_get_swSave2() const {} + void prm_get_evId() const {} + void prm_get_mdl() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} + void prm_get_version() const {} + void rev_switch() const {} + void prmZ_init(); void is_switch2() const; void solidHeapCB(fopAc_ac_c*); diff --git a/include/d/actor/d_a_obj_table.h b/include/d/actor/d_a_obj_table.h index 87a2765e7..ed1647349 100644 --- a/include/d/actor/d_a_obj_table.h +++ b/include/d/actor/d_a_obj_table.h @@ -8,6 +8,8 @@ namespace daObjTable { class Act_c : public fopAc_ac_c { public: + void prm_get_mdl() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_tenmado.h b/include/d/actor/d_a_obj_tenmado.h index 0cdd4923d..f22cde8ba 100644 --- a/include/d/actor/d_a_obj_tenmado.h +++ b/include/d/actor/d_a_obj_tenmado.h @@ -6,6 +6,9 @@ namespace daObjTenmado { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void prm_get_swSave2() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_tide.h b/include/d/actor/d_a_obj_tide.h index 2a901222b..13e81412d 100644 --- a/include/d/actor/d_a_obj_tide.h +++ b/include/d/actor/d_a_obj_tide.h @@ -6,6 +6,9 @@ namespace daObjTide { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void prm_get_type() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_timer.h b/include/d/actor/d_a_obj_timer.h index 90180a077..e7993e60f 100644 --- a/include/d/actor/d_a_obj_timer.h +++ b/include/d/actor/d_a_obj_timer.h @@ -6,6 +6,8 @@ namespace daObjTimer { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void prm_get_time() const {} void stopTimer() {} void _create(); diff --git a/include/d/actor/d_a_obj_tntrap.h b/include/d/actor/d_a_obj_tntrap.h index f491fe76b..8de5cbd7b 100644 --- a/include/d/actor/d_a_obj_tntrap.h +++ b/include/d/actor/d_a_obj_tntrap.h @@ -5,6 +5,11 @@ class daObjTnTrap_c : public fopAc_ac_c { public: + void param_get_arg0() const {} + void param_get_mapType() const {} + void param_get_swSave() const {} + void param_get_swSave2() const {} + void chk_appear(); void set_mtx(); void solidHeapCB(fopAc_ac_c*); diff --git a/include/d/actor/d_a_obj_toripost.h b/include/d/actor/d_a_obj_toripost.h index 1c1044087..7e853e473 100644 --- a/include/d/actor/d_a_obj_toripost.h +++ b/include/d/actor/d_a_obj_toripost.h @@ -18,6 +18,11 @@ public: PROC_EXEC = 1 }; + void eventSet(signed char) {} + inline s32 getSendPrice() { return m_send_price[mPayType]; } + void isAnm(signed char) {} + void modeProcInit(int) {} + BOOL _createHeap(); void cutProc(); void cutPresentStart(int staffIdx); @@ -59,8 +64,6 @@ public: int _create(); bool _delete(); - inline s32 getSendPrice() { return m_send_price[mPayType]; } - static const char m_arc_name[]; static const daObjTpost_c__letter_data m_letter[]; static const dCcD_SrcCyl m_cyl_src; diff --git a/include/d/actor/d_a_obj_trap.h b/include/d/actor/d_a_obj_trap.h index ac2701c33..f5a603a52 100644 --- a/include/d/actor/d_a_obj_trap.h +++ b/include/d/actor/d_a_obj_trap.h @@ -5,6 +5,7 @@ class daObjTrap_c : public fopAc_ac_c { public: + void check_shine() const {} void start_shine() {} void stop_shine() {} diff --git a/include/d/actor/d_a_obj_tribox.h b/include/d/actor/d_a_obj_tribox.h index cad8723da..8d2674ba9 100644 --- a/include/d/actor/d_a_obj_tribox.h +++ b/include/d/actor/d_a_obj_tribox.h @@ -7,6 +7,11 @@ namespace daObjTribox { class Act_c : public fopAc_ac_c { public: + void is_switch() const {} + void on_switch() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} + void set_state(); void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_try.h b/include/d/actor/d_a_obj_try.h index 8d3552456..9b57412ad 100644 --- a/include/d/actor/d_a_obj_try.h +++ b/include/d/actor/d_a_obj_try.h @@ -6,6 +6,11 @@ namespace daObjTry { class Act_c : public fopAc_ac_c { public: + void attr() const {} + void prm_chk_type_tryStatue() const {} + void prm_get_dummy() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} void to_correct_pos(const cXyz*, short, bool, bool) {} void prm_set_swSave(int); diff --git a/include/d/actor/d_a_obj_vfan.h b/include/d/actor/d_a_obj_vfan.h index 18b52677d..41209e637 100644 --- a/include/d/actor/d_a_obj_vfan.h +++ b/include/d/actor/d_a_obj_vfan.h @@ -9,6 +9,8 @@ namespace daObjVfan { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void CreateHeap(); void Create(); void Mthd_Create(); diff --git a/include/d/actor/d_a_obj_vmc.h b/include/d/actor/d_a_obj_vmc.h index a74e9caa1..47ce9d0d9 100644 --- a/include/d/actor/d_a_obj_vmc.h +++ b/include/d/actor/d_a_obj_vmc.h @@ -7,6 +7,7 @@ namespace daObjVmc { class Act_c : public fopAc_ac_c { public: void daObjVmc_ChangeGrow() {} + void prm_get_swSave() const {} void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_obj_vmsms.h b/include/d/actor/d_a_obj_vmsms.h index 20a217af4..a4a0f76f4 100644 --- a/include/d/actor/d_a_obj_vmsms.h +++ b/include/d/actor/d_a_obj_vmsms.h @@ -5,12 +5,13 @@ class daObjVmsms_c : public fopAc_ac_c { public: + void check_demo() const {} + void solidHeapCB(fopAc_ac_c*); void create_heap(); void _create(); void _delete(); void init_mtx(); - void check_demo() const; void _execute(); void _draw(); diff --git a/include/d/actor/d_a_obj_volcano.h b/include/d/actor/d_a_obj_volcano.h index 42aa2f55a..8dfce4543 100644 --- a/include/d/actor/d_a_obj_volcano.h +++ b/include/d/actor/d_a_obj_volcano.h @@ -7,6 +7,8 @@ namespace daObjVolcano { class Act_c : public fopAc_ac_c { public: + void prm_get_swSave() const {} + void StartFire(); void StopFire(); void CreateHeap(); diff --git a/include/d/actor/d_a_obj_vtil.h b/include/d/actor/d_a_obj_vtil.h index 1f5411ee7..c85b31c1e 100644 --- a/include/d/actor/d_a_obj_vtil.h +++ b/include/d/actor/d_a_obj_vtil.h @@ -6,12 +6,13 @@ class daObjVtil_c : public fopAc_ac_c { public: void camera_off() {} + void check_ev_bit() const {} + void prm_get_type() const {} void solidHeapCB(fopAc_ac_c*); void create_heap(); void _create(); void _delete(); - void check_ev_bit() const; void tell_agb_attack(); void tell_agb_sink(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_vyasi.h b/include/d/actor/d_a_obj_vyasi.h index 76ea1a77e..f243afe83 100644 --- a/include/d/actor/d_a_obj_vyasi.h +++ b/include/d/actor/d_a_obj_vyasi.h @@ -10,6 +10,8 @@ namespace daObjVyasi { class Act_c : public fopAc_ac_c { public: + void is_switch() const {} + void SetStopJointAnimation(J3DAnmTransformKey*, float, float); void PlayStopJointAnimation(); void set_first_process(); diff --git a/include/d/actor/d_a_obj_zouK.h b/include/d/actor/d_a_obj_zouK.h index 96267d107..f0a0ee636 100644 --- a/include/d/actor/d_a_obj_zouK.h +++ b/include/d/actor/d_a_obj_zouK.h @@ -12,6 +12,7 @@ namespace daObjZouk { class Act_c : public fopAc_ac_c { public: + void param_get_arg0() const {} void setEffectMtx(const cXyz*, float) {} void solidHeapCB(fopAc_ac_c*); diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index c7999bbee..903a91d9a 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -2089,6 +2089,103 @@ public: request_of_phase_process_class* getPhase() { return &mPhsLoad; } + // void allTrigger() const {} + // void cancelTrigger() const {} + // void checkAttentionLock() {} + // void checkBoomerangCatchAnime() const {} + // void checkBoomerangReadyAnime() const {} + // void checkBoomerangRock() {} + // void checkBoomerangThrowAnime() const {} + // void checkBothItemEquipAnime() const {} + // void checkBowReloadAnime() const {} + // void checkBowShootAnime() const {} + // void checkBowWaitAnime() const {} + // void checkCarryActionNow() const {} + // void checkCrawlWaterIn() {} + // void checkDashDamageAnime() const {} + // void checkDoubleItemEquipAnime() const {} + // void checkFaceTypeNot() const {} + // void checkGrabAnime() const {} + // void checkGrabAnimeHeavy() const {} + // void checkGrabAnimeLight() const {} + // void checkGuardSlip() const {} + // void checkHookshotReadyAnime() const {} + // void checkIsland() const {} + // void checkMirrorShieldEquip() const {} + // void checkModeFlg(unsigned long) const {} + // void checkNoControll() const {} + // void checkNoDamageMode() const {} + // void checkNoUpperAnime() const {} + // void checkPlayerDemoMode() const {} + // void checkPowerGloveEquip() const {} + // void checkRopeThrowAnime() const {} + // void checkShieldEquip() const {} + // void checkShipGetOff() {} + // void checkSpecialDemoMode() const {} + // void checkSwordEquip() const {} + // void checkSwordEquipAnime() const {} + // void checkTinkleHover() const {} + // void checkTinkleShield() const {} + // void checkUpperAnime(unsigned short) const {} + // void checkUpperGuardAnime() const {} + // void clearDamageWait() {} + // void decrementBombCnt() {} + // void doButton() const {} + // void doTrigger() const {} + // void exchangeGrabActor(fopAc_ac_c*) {} + // void getAnmSpeedStickRate(float, float) {} + // void getBombBrk() {} + // void getBombWaterPillarBrk() {} + // void getBombWaterPillarBtk() {} + // void getBoomerangCatchPos() const {} + // void getDekuLeafWindPos() const {} + // void getHookshotRootPos() const {} + // void getIceArrowBtk() {} + // void getIceParticleBtk() {} + // void getIceWaterParticleBtk() {} + // void getLightArrowBtk() {} + // void getLineTopPos() {} + // void getModelJointMtx(unsigned short) {} + // void getNowAnmPackUnder(daPy_lk_c::daPy_UNDER) {} + // void getNowAnmPackUpper(daPy_lk_c::daPy_UPPER) {} + // void getPhase() {} + // void getShadowID() const {} + // void getStartEvent() {} + // void getStartMode() {} + // void getStartModeFromParam(unsigned long) {} + // void getStartRoomNo() {} + // void getTactLeftHandPos() const {} + // void itemButtonX() const {} + // void itemButtonY() const {} + // void itemButtonZ() const {} + // void itemTriggerX() const {} + // void itemTriggerY() const {} + // void itemTriggerZ() const {} + // void npcStartRestartRoom() {} + // void offModeFlg(unsigned long) {} + // void offShipTact() {} + // void onModeFlg(unsigned long) {} + // void onShipDrop(short) {} + // void onShipTact() {} + // void otherWeaponTrigger() const {} + // void seStartSystem(unsigned long) {} + // void setDaiokutaEnd() {} + // void setFootEffectPosType(unsigned char) {} + // void setHoverBoots(short) {} + // void setSpeedAndAngleBoomerang() {} + // void setSpeedAndAngleBow() {} + // void setSpeedAndAngleHookshot() {} + // void setSpeedAndAngleRope() {} + // void setTinkleShield(short) {} + // void setWhirlId(unsigned int) {} + // void spActionButton() const {} + // void spActionTrigger() const {} + // void spBattleTrigger() const {} + // void spLTrigger() const {} + // void swordButton() const {} + // void swordTrigger() const {} + // void talkTrigger() const {} + virtual MtxP getLeftHandMatrix() { return mpCLModel->getAnmMtx(0x08); } // cl_LhandA joint virtual MtxP getRightHandMatrix() { return mpCLModel->getAnmMtx(0x0C); } // cl_RhandA joint virtual f32 getGroundY() { return mAcch.GetGroundH(); } diff --git a/include/d/actor/d_a_ship.h b/include/d/actor/d_a_ship.h index c5a068dde..211e66e69 100644 --- a/include/d/actor/d_a_ship.h +++ b/include/d/actor/d_a_ship.h @@ -16,16 +16,41 @@ public: }; + void checkCraneMode() const {} + void checkCraneUpEnd() const {} void checkForceMove() {} + void checkHeadNoDraw() const {} + void checkJumpOkFlg() const {} + void checkRopeCntMax() const {} + void checkRopeDownStart() const {} + void checkSalvageDemo() const {} + void checkShootCannon() const {} + void checkStateFlg(daSHIP_SFLG) const {} + void checkTornadoFlg() const {} + void checkTornadoUp() const {} + void getBeltSpeed() const {} void getBodyMtx() {} + void getCannonAngleX() const {} + void getCannonAngleY() const {} + void getCraneAngle() const {} + void getCraneBaseAngle() const {} + void getCraneHookAngleY() const {} + void getCraneRipplePosX() const {} + void getCraneRipplePosY() const {} + void getCraneRipplePosZ() const {} void getCraneTop() {} void getFlyFlg() {} void getHeadJntMtx() {} + void getJumpFlg() const {} void getJumpRate() {} + void getLandFlg() const {} + void getPart() const {} + void getRopeCnt() const {} void getSailAngle() {} void getSailOn() {} void getTactJntMtx() {} void getTactWarpID() {} + void getTactWarpPosNum() const {} void getTillerAngleRate() {} void getTillerTopPosP() {} void getTornadoActor() {} @@ -142,7 +167,6 @@ public: void shipDelete(); void createHeap(); void create(); - void getCannonAngleX() const; void checkForceMove() const; void initStartPos(cXyz const*, s16); diff --git a/include/d/actor/d_a_shop_item.h b/include/d/actor/d_a_shop_item.h index a417861d2..579373d94 100644 --- a/include/d/actor/d_a_shop_item.h +++ b/include/d/actor/d_a_shop_item.h @@ -11,6 +11,9 @@ struct daShopItem_c_m_data { }; struct daShopItem_c : public daItemBase_c { + void _delete() {} + void setTevType(int) {} + char* getShopArcname(); s16 getShopBmdIdx(); void CreateInit(); diff --git a/include/d/actor/d_a_stone2.h b/include/d/actor/d_a_stone2.h index ee2fea118..2954e60b7 100644 --- a/include/d/actor/d_a_stone2.h +++ b/include/d/actor/d_a_stone2.h @@ -7,6 +7,13 @@ namespace daStone2 { class Act_c : public fopAc_ac_c { public: void attr() {} + void prmZ_get_evId() const {} + void prm_get_cull() const {} + void prm_get_itemNo() const {} + void prm_get_itemSave() const {} + void prm_get_shadow() const {} + void prm_get_swSave() const {} + void prm_get_type() const {} void prmZ_init(); void is_switch() const; diff --git a/include/d/actor/d_a_swhit0.h b/include/d/actor/d_a_swhit0.h index 5e23b49fb..c3930f6ac 100644 --- a/include/d/actor/d_a_swhit0.h +++ b/include/d/actor/d_a_swhit0.h @@ -13,6 +13,7 @@ public: } inline s32 draw(); + void execute() {} s32 getSwNo(); u8 getEvNo(); @@ -60,6 +61,7 @@ public: void onFlag(u16 flag) { mFlags |= flag; } void offFlag(u16 flag) { mFlags &= ~flag; } s32 checkFlag(u16 flag) { return mFlags & flag; } + void setActio(unsigned char) {} }; #endif diff --git a/include/d/actor/d_a_tag_attention.h b/include/d/actor/d_a_tag_attention.h index fbdbf0768..d8c9ee966 100644 --- a/include/d/actor/d_a_tag_attention.h +++ b/include/d/actor/d_a_tag_attention.h @@ -6,9 +6,12 @@ namespace daTagAttention { class Act_c : public fopAc_ac_c { public: + void chk_inside(cXyz*) const {} + void prm_get_Type() const {} + void prm_get_swSave() const {} + void _create(); void _execute(); - void chk_inside(cXyz*) const; public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_evsw.h b/include/d/actor/d_a_tag_evsw.h index 661213e12..1b6e9bb1e 100644 --- a/include/d/actor/d_a_tag_evsw.h +++ b/include/d/actor/d_a_tag_evsw.h @@ -6,6 +6,10 @@ namespace daTagEvsw { class Act_c : public fopAc_ac_c { public: + void prm_get_Type() const {} + void prm_get_eventbitID() const {} + void prm_get_swSave() const {} + void _create(); void _delete(); void _execute(); diff --git a/include/d/actor/d_a_tag_kb_item.h b/include/d/actor/d_a_tag_kb_item.h index 8e70a891f..7d44289b6 100644 --- a/include/d/actor/d_a_tag_kb_item.h +++ b/include/d/actor/d_a_tag_kb_item.h @@ -5,6 +5,8 @@ class daTagKbItem_c : public fopAc_ac_c { public: + void getR() {} + void kb_dig(fopAc_ac_c*); void dig_main(); bool _delete(); diff --git a/include/d/actor/d_a_tag_light.h b/include/d/actor/d_a_tag_light.h index 998d2afc6..8ef28bc6b 100644 --- a/include/d/actor/d_a_tag_light.h +++ b/include/d/actor/d_a_tag_light.h @@ -7,6 +7,15 @@ namespace daTagLight { class Act_c : public fopAc_ac_c { public: + void chk_inside(const cXyz*) const {} + void prm_get_ccR() const {} + void prm_get_coneRatio() const {} + void prm_get_fadeType() const {} + void prm_get_sch() const {} + void prm_get_swSave() const {} + void prm_get_swSave2() const {} + void prm_get_type() const {} + void get_cc_r() const; void solidHeapCB(fopAc_ac_c*); void create_heap(); diff --git a/include/d/actor/d_a_tag_volcano.h b/include/d/actor/d_a_tag_volcano.h index fddb90cc7..57de44cc8 100644 --- a/include/d/actor/d_a_tag_volcano.h +++ b/include/d/actor/d_a_tag_volcano.h @@ -6,6 +6,11 @@ namespace daTagvolcano { class Act_c : public fopAc_ac_c { public: + void prm_get_bitTRB() const {} + void prm_get_swSave() const {} + void prm_get_timer() const {} + void prm_get_type() const {} + void _create(); void check_timer_clear(); void _delete(); diff --git a/include/d/actor/d_a_tag_waterlevel.h b/include/d/actor/d_a_tag_waterlevel.h index 78856629b..c260671a0 100644 --- a/include/d/actor/d_a_tag_waterlevel.h +++ b/include/d/actor/d_a_tag_waterlevel.h @@ -8,6 +8,7 @@ namespace daTagWaterlevel { public: void get_now() {} void get_state() {} + void prm_get_sch() const {} void _create(); void _delete(); diff --git a/include/d/actor/d_a_tornado.h b/include/d/actor/d_a_tornado.h index ddb9c4642..59a144e09 100644 --- a/include/d/actor/d_a_tornado.h +++ b/include/d/actor/d_a_tornado.h @@ -5,6 +5,9 @@ class daTornado_c : public fopAc_ac_c { public: + void getJointXPos(int) const {} + void getJointYPos(int) const {} + void getJointZPos(int) const {} void getScaleEnd() {} void getSmallScaleEnd() {} void setScaleOn() {} diff --git a/include/d/actor/d_a_tsubo.h b/include/d/actor/d_a_tsubo.h index 2a3942a56..19bc8a867 100644 --- a/include/d/actor/d_a_tsubo.h +++ b/include/d/actor/d_a_tsubo.h @@ -15,8 +15,19 @@ namespace daTsubo { class Act_c : public fopAc_ac_c { public: void attrSpine() {} + void data() const {} void data_spec_boko(int) {} + void is_switch() const {} void pos_init() {} + void prmZ_get_swSave() const {} + void prm_chk_type_kutani() const {} + void prm_get_cull() const {} + void prm_get_itemNo() const {} + void prm_get_itemSave() const {} + void prm_get_moveBg() const {} + void prm_get_spec() const {} + void prm_get_stick() const {} + void prm_get_type() const {} void prm_make_acorn(bool, int, int) {} void prm_make_skull() {} void prm_make_yw1() {} @@ -25,6 +36,7 @@ namespace daTsubo { void prm_set_cull_non() {} void prm_set_itemNo(int) {} void set_drop_spd_y0(float) {} + void spec_chk_prm_boko() const {} void prmZ_init(); void solidHeapCB(fopAc_ac_c*); diff --git a/include/d/actor/d_a_wind_tag.h b/include/d/actor/d_a_wind_tag.h index a0507e9a6..0540a47f2 100644 --- a/include/d/actor/d_a_wind_tag.h +++ b/include/d/actor/d_a_wind_tag.h @@ -6,6 +6,9 @@ namespace daWindTag { class daWindTag_c : public fopAc_ac_c { public: + void getCurLength() const {} + void getMaxLength() const {} + void _delete(); void CreateHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_windmill.h b/include/d/actor/d_a_windmill.h index 5d97bf41e..6af335b0e 100644 --- a/include/d/actor/d_a_windmill.h +++ b/include/d/actor/d_a_windmill.h @@ -5,6 +5,10 @@ class daWindMill_c : public fopAc_ac_c { public: + void getMaxRotSpeed() const {} + void getRotSpeed() const {} + void getType() const {} + void _delete(); void CreateHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_ygcwp.h b/include/d/actor/d_a_ygcwp.h index 8497602aa..01cfbeb94 100644 --- a/include/d/actor/d_a_ygcwp.h +++ b/include/d/actor/d_a_ygcwp.h @@ -5,12 +5,13 @@ class daYgcwp_c : public fopAc_ac_c { public: + void check_ev() const {} + void off_ev() const {} + void solidHeapCB(fopAc_ac_c*); void create_heap(); void _create(); void _delete(); - void check_ev() const; - void off_ev() const; void init_mtx(); void make_shine(); void set_timer();