From d84ec1c3d73c9548671fa9f4aa309538b814a666 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 30 Dec 2023 17:15:03 -0500 Subject: [PATCH] Add autogenerated HIO class defs to actor headers --- include/d/actor/d_a_agb.h | 2 +- include/d/actor/d_a_bdk.h | 8 ++ include/d/actor/d_a_beam.h | 8 ++ include/d/actor/d_a_bgn.h | 16 ++++ include/d/actor/d_a_bgn2.h | 8 ++ include/d/actor/d_a_bgn3.h | 22 ++++++ include/d/actor/d_a_bmd.h | 8 ++ include/d/actor/d_a_bmdfoot.h | 8 ++ include/d/actor/d_a_bmdhand.h | 8 ++ include/d/actor/d_a_bst.h | 8 ++ include/d/actor/d_a_btd.h | 8 ++ include/d/actor/d_a_bwd.h | 8 ++ include/d/actor/d_a_bwds.h | 8 ++ include/d/actor/d_a_daiocta.h | 8 ++ include/d/actor/d_a_daiocta_eye.h | 8 ++ include/d/actor/d_a_dk.h | 8 ++ include/d/actor/d_a_dr.h | 1 + include/d/actor/d_a_dr2.h | 8 ++ include/d/actor/d_a_fganon.h | 8 ++ include/d/actor/d_a_fm.h | 8 ++ include/d/actor/d_a_gnd.h | 8 ++ include/d/actor/d_a_gy.h | 8 ++ include/d/actor/d_a_gy_ctrl.h | 8 ++ include/d/actor/d_a_himo2.h | 12 +++ include/d/actor/d_a_kanban.h | 8 ++ include/d/actor/d_a_mt.h | 8 ++ include/d/actor/d_a_npc_ac1.h | 8 ++ include/d/actor/d_a_npc_aj1.h | 8 ++ include/d/actor/d_a_npc_ba1.h | 20 +++++ include/d/actor/d_a_npc_bj1.h | 16 ++++ include/d/actor/d_a_npc_bm1.h | 16 ++++ include/d/actor/d_a_npc_bms1.h | 18 +++++ include/d/actor/d_a_npc_bmsw.h | 11 +++ include/d/actor/d_a_npc_bs1.h | 17 ++++ include/d/actor/d_a_npc_btsw.h | 8 ++ include/d/actor/d_a_npc_btsw2.h | 8 ++ include/d/actor/d_a_npc_cb1.h | 8 ++ include/d/actor/d_a_npc_co1.h | 8 ++ include/d/actor/d_a_npc_de1.h | 8 ++ include/d/actor/d_a_npc_ds1.h | 16 ++++ include/d/actor/d_a_npc_fa1.h | 33 ++++++++ include/d/actor/d_a_npc_gk1.h | 8 ++ include/d/actor/d_a_npc_gp1.h | 8 ++ include/d/actor/d_a_npc_hi1.h | 8 ++ include/d/actor/d_a_npc_jb1.h | 8 ++ include/d/actor/d_a_npc_ji1.h | 8 ++ include/d/actor/d_a_npc_kf1.h | 8 ++ include/d/actor/d_a_npc_kg1.h | 8 ++ include/d/actor/d_a_npc_kg2.h | 8 ++ include/d/actor/d_a_npc_kk1.h | 8 ++ include/d/actor/d_a_npc_km1.h | 8 ++ include/d/actor/d_a_npc_ko1.h | 16 ++++ include/d/actor/d_a_npc_kp1.h | 8 ++ include/d/actor/d_a_npc_ls1.h | 109 +++++++++++++++++++++++++- include/d/actor/d_a_npc_nz.h | 8 ++ include/d/actor/d_a_npc_ob1.h | 8 ++ include/d/actor/d_a_npc_os.h | 26 ++++++ include/d/actor/d_a_npc_p1.h | 16 ++++ include/d/actor/d_a_npc_p2.h | 16 ++++ include/d/actor/d_a_npc_pf1.h | 8 ++ include/d/actor/d_a_npc_pm1.h | 8 ++ include/d/actor/d_a_npc_rsh1.h | 10 +++ include/d/actor/d_a_npc_sarace.h | 8 ++ include/d/actor/d_a_npc_so.h | 8 ++ include/d/actor/d_a_npc_tc.h | 8 ++ include/d/actor/d_a_npc_ym1.h | 16 ++++ include/d/actor/d_a_npc_yw1.h | 16 ++++ include/d/actor/d_a_npc_zk1.h | 8 ++ include/d/actor/d_a_npc_zl1.h | 8 ++ include/d/actor/d_a_nz.h | 8 ++ include/d/actor/d_a_obj_balancelift.h | 8 ++ include/d/actor/d_a_obj_bemos.h | 8 ++ include/d/actor/d_a_obj_canon.h | 8 ++ include/d/actor/d_a_obj_hsehi1.h | 8 ++ include/d/actor/d_a_obj_ikada.h | 8 ++ include/d/actor/d_a_obj_majyuu_door.h | 8 ++ include/d/actor/d_a_obj_pbco.h | 8 ++ include/d/actor/d_a_obj_pfall.h | 8 ++ include/d/actor/d_a_obj_quake.h | 8 ++ include/d/actor/d_a_obj_roten.h | 8 ++ include/d/actor/d_a_obj_stair.h | 8 ++ include/d/actor/d_a_obj_swflat.h | 8 ++ include/d/actor/d_a_obj_tapestry.h | 8 ++ include/d/actor/d_a_obj_warpt.h | 8 ++ include/d/actor/d_a_oship.h | 8 ++ include/d/actor/d_a_pt.h | 8 ++ include/d/actor/d_a_pz.h | 8 ++ include/d/actor/d_a_scene_change.h | 6 +- include/d/actor/d_a_shand.h | 8 ++ include/d/actor/d_a_sie_flag.h | 8 ++ include/d/actor/d_a_tag_ba1.h | 8 ++ include/d/actor/d_a_tag_kf1.h | 8 ++ include/d/actor/d_a_tag_kk1.h | 8 ++ include/d/actor/d_a_tag_md_cb.h | 8 ++ include/d/actor/d_a_tag_so.h | 8 ++ include/d/actor/d_a_tori_flag.h | 8 ++ include/d/actor/d_a_yougan.h | 8 ++ src/d/actor/d_a_bgn.cpp | 3 +- src/d/actor/d_a_himo2.cpp | 10 --- src/d/actor/d_a_npc_ba1.cpp | 24 +++--- src/d/actor/d_a_npc_bms1.cpp | 24 +++--- src/d/actor/d_a_npc_fa1.cpp | 13 +-- src/d/actor/d_a_npc_os.cpp | 41 ---------- 103 files changed, 1053 insertions(+), 93 deletions(-) diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h index c582af0ef..aa916ca4c 100644 --- a/include/d/actor/d_a_agb.h +++ b/include/d/actor/d_a_agb.h @@ -231,4 +231,4 @@ public: /* 0x684 */ dPa_followEcallBack field_0x684; }; -#endif /* D_A_AGB_H */ \ No newline at end of file +#endif /* D_A_AGB_H */ diff --git a/include/d/actor/d_a_bdk.h b/include/d/actor/d_a_bdk.h index e5f6378ea..73864203b 100644 --- a/include/d/actor/d_a_bdk.h +++ b/include/d/actor/d_a_bdk.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daBdk_HIO_c { +public: + daBdk_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BDK_H */ diff --git a/include/d/actor/d_a_beam.h b/include/d/actor/d_a_beam.h index a3dd16fdf..11b041472 100644 --- a/include/d/actor/d_a_beam.h +++ b/include/d/actor/d_a_beam.h @@ -36,4 +36,12 @@ public: /* Place member variables here */ }; +class daBeam_HIO_c { +public: + daBeam_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BEAM_H */ diff --git a/include/d/actor/d_a_bgn.h b/include/d/actor/d_a_bgn.h index 00857a61f..ee3739332 100644 --- a/include/d/actor/d_a_bgn.h +++ b/include/d/actor/d_a_bgn.h @@ -3,9 +3,25 @@ #include "f_op/f_op_actor.h" +struct part_s { + +}; + +struct move_s { + +}; + class bgn_class : public fopAc_ac_c { public: /* Place member variables here */ }; +class daBgn_HIO_c { +public: + daBgn_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BGN_H */ diff --git a/include/d/actor/d_a_bgn2.h b/include/d/actor/d_a_bgn2.h index 4539397d4..def74a24c 100644 --- a/include/d/actor/d_a_bgn2.h +++ b/include/d/actor/d_a_bgn2.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daBgn2_HIO_c { +public: + daBgn2_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BGN2_H */ diff --git a/include/d/actor/d_a_bgn3.h b/include/d/actor/d_a_bgn3.h index 0090da8a6..6b42fab26 100644 --- a/include/d/actor/d_a_bgn3.h +++ b/include/d/actor/d_a_bgn3.h @@ -5,6 +5,20 @@ #include "d/d_cc_d.h" #include "m_Do/m_Do_ext.h" +struct bgn3_ke_s { + /* 0x00 */ cXyz m00[5]; + /* 0x3C */ cXyz m3C[5]; + /* 0x78 */ u8 m78[0x84 - 0x78]; +}; + +struct part_s3 { + /* 0x0000 */ u8 m0000[0x00F8 - 0x0000]; + /* 0x00F8 */ dCcD_GObjInf m00F8; + /* 0x01F0 */ u8 m01F0[0x023C - 0x01F0]; + /* 0x023C */ bgn3_ke_s mHairs[40]; + /* 0x16DC */ mDoExt_3DlineMat0_c mLineMat; +}; + class bgn3_class : public fopAc_ac_c { public: /* 0x00290 */ u8 m00290[0x002E4 - 0x00290]; @@ -20,4 +34,12 @@ public: /* 0x10020 */ u8 m10020[0x100B4 - 0x10020]; }; +class daBgn3_HIO_c { +public: + daBgn3_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BGN3_H */ diff --git a/include/d/actor/d_a_bmd.h b/include/d/actor/d_a_bmd.h index c0c50f7a4..06f935921 100644 --- a/include/d/actor/d_a_bmd.h +++ b/include/d/actor/d_a_bmd.h @@ -94,4 +94,12 @@ public: /* 0xBE1 */ u8 mBE1[0xBE4 - 0xBE1]; }; +class daBmd_HIO_c { +public: + daBmd_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BMD_H */ diff --git a/include/d/actor/d_a_bmdfoot.h b/include/d/actor/d_a_bmdfoot.h index 58b7d5473..591d5534c 100644 --- a/include/d/actor/d_a_bmdfoot.h +++ b/include/d/actor/d_a_bmdfoot.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daBmdfoot_HIO_c { +public: + daBmdfoot_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BMDFOOT_H */ diff --git a/include/d/actor/d_a_bmdhand.h b/include/d/actor/d_a_bmdhand.h index a717133ab..82d87d7f4 100644 --- a/include/d/actor/d_a_bmdhand.h +++ b/include/d/actor/d_a_bmdhand.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daBmdhand_HIO_c { +public: + daBmdhand_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BMDHAND_H */ diff --git a/include/d/actor/d_a_bst.h b/include/d/actor/d_a_bst.h index e16011a19..e6f7349f7 100644 --- a/include/d/actor/d_a_bst.h +++ b/include/d/actor/d_a_bst.h @@ -68,4 +68,12 @@ public: /* 0x2E9D */ u8 m2E9D[0x2FE4 - 0x2E9D]; }; +class daBst_HIO_c { +public: + daBst_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BST_H */ diff --git a/include/d/actor/d_a_btd.h b/include/d/actor/d_a_btd.h index 20f3c8464..a03aa0a29 100644 --- a/include/d/actor/d_a_btd.h +++ b/include/d/actor/d_a_btd.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daBtd_HIO_c { +public: + daBtd_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BTD_H */ diff --git a/include/d/actor/d_a_bwd.h b/include/d/actor/d_a_bwd.h index 51a8d30af..e3c436c98 100644 --- a/include/d/actor/d_a_bwd.h +++ b/include/d/actor/d_a_bwd.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daBwd_HIO_c { +public: + daBwd_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BWD_H */ diff --git a/include/d/actor/d_a_bwds.h b/include/d/actor/d_a_bwds.h index 5b28b3adc..3aed3a37e 100644 --- a/include/d/actor/d_a_bwds.h +++ b/include/d/actor/d_a_bwds.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daBwds_HIO_c { +public: + daBwds_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_BWDS_H */ diff --git a/include/d/actor/d_a_daiocta.h b/include/d/actor/d_a_daiocta.h index 7d2d47a8b..584d75119 100644 --- a/include/d/actor/d_a_daiocta.h +++ b/include/d/actor/d_a_daiocta.h @@ -70,4 +70,12 @@ public: /* 0x574 */ u8 mSwitchNo; }; +class daDaiocta_HIO_c { +public: + daDaiocta_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_DAIOCTA_H */ diff --git a/include/d/actor/d_a_daiocta_eye.h b/include/d/actor/d_a_daiocta_eye.h index 781963946..7a230d617 100644 --- a/include/d/actor/d_a_daiocta_eye.h +++ b/include/d/actor/d_a_daiocta_eye.h @@ -31,4 +31,12 @@ public: /* Place member variables here */ }; +class daDaiocta_Eye_HIO_c { +public: + daDaiocta_Eye_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_DAIOCTA_EYE_H */ diff --git a/include/d/actor/d_a_dk.h b/include/d/actor/d_a_dk.h index eecab282b..9e2b8efe0 100644 --- a/include/d/actor/d_a_dk.h +++ b/include/d/actor/d_a_dk.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daDk_HIO_c { +public: + daDk_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_DK_H */ diff --git a/include/d/actor/d_a_dr.h b/include/d/actor/d_a_dr.h index 6d0564fb7..8e394f645 100644 --- a/include/d/actor/d_a_dr.h +++ b/include/d/actor/d_a_dr.h @@ -30,6 +30,7 @@ class daDr_HIO_c : public JORReflexible { public: daDr_HIO_c(); virtual ~daDr_HIO_c() {} + public: /* 0x04 */ s8 mChildID; /* 0x05 */ u8 m05[0x08 - 0x05]; diff --git a/include/d/actor/d_a_dr2.h b/include/d/actor/d_a_dr2.h index 21ebaa048..2a5d7eb2e 100644 --- a/include/d/actor/d_a_dr2.h +++ b/include/d/actor/d_a_dr2.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daDr2_HIO_c { +public: + daDr2_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_DR2_H */ diff --git a/include/d/actor/d_a_fganon.h b/include/d/actor/d_a_fganon.h index ab8798e68..7204e9d05 100644 --- a/include/d/actor/d_a_fganon.h +++ b/include/d/actor/d_a_fganon.h @@ -60,4 +60,12 @@ public: /* 0xB8B */ u8 mB8B[0xB8C - 0xB8B]; }; +class daFganon_HIO_c { +public: + daFganon_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_FGANON_H */ diff --git a/include/d/actor/d_a_fm.h b/include/d/actor/d_a_fm.h index f5212bd0f..9978fc426 100644 --- a/include/d/actor/d_a_fm.h +++ b/include/d/actor/d_a_fm.h @@ -134,4 +134,12 @@ public: /* 0xAE8 */ enemyice mEnemyIce; }; +class daFm_HIO_c { +public: + daFm_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_FM_H */ diff --git a/include/d/actor/d_a_gnd.h b/include/d/actor/d_a_gnd.h index a01f8ae32..9da944a7d 100644 --- a/include/d/actor/d_a_gnd.h +++ b/include/d/actor/d_a_gnd.h @@ -12,4 +12,12 @@ public: /* 0x13D2 */ u8 m13D2[0x15E4 - 0x13D2]; }; +class daGnd_HIO_c { +public: + daGnd_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_GND_H */ diff --git a/include/d/actor/d_a_gy.h b/include/d/actor/d_a_gy.h index 7d8bb62b3..e6399aed1 100644 --- a/include/d/actor/d_a_gy.h +++ b/include/d/actor/d_a_gy.h @@ -81,4 +81,12 @@ public: /* 0xE6C */ u8 mE6C[0xE90 - 0xE6C]; }; +class daGy_HIO_c { +public: + daGy_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_GY_H */ diff --git a/include/d/actor/d_a_gy_ctrl.h b/include/d/actor/d_a_gy_ctrl.h index b3ddd77d2..13d9e6812 100644 --- a/include/d/actor/d_a_gy_ctrl.h +++ b/include/d/actor/d_a_gy_ctrl.h @@ -44,4 +44,12 @@ public: /* Place member variables here */ }; +class daGy_Ctrl_HIO_c { +public: + daGy_Ctrl_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_GY_CTRL_H */ diff --git a/include/d/actor/d_a_himo2.h b/include/d/actor/d_a_himo2.h index 5abe8d860..d3452b5ba 100644 --- a/include/d/actor/d_a_himo2.h +++ b/include/d/actor/d_a_himo2.h @@ -3,6 +3,10 @@ #include "f_op/f_op_actor.h" +struct himo2_s { + +}; + class himo2_class : public fopAc_ac_c { public: void setTargetPos(cXyz*, float*, float*); @@ -11,4 +15,12 @@ public: /* Place member variables here */ }; +class himo2HIO_c { +public: + ~himo2HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_HIMO2_H */ diff --git a/include/d/actor/d_a_kanban.h b/include/d/actor/d_a_kanban.h index ea208777e..7f085915c 100644 --- a/include/d/actor/d_a_kanban.h +++ b/include/d/actor/d_a_kanban.h @@ -17,4 +17,12 @@ public: /* 0x5B0 */ dCcD_Cyl m5B0; }; +class daKanban_HIO_c { +public: + daKanban_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_KANBAN_H */ diff --git a/include/d/actor/d_a_mt.h b/include/d/actor/d_a_mt.h index 9cde2133d..951bb5263 100644 --- a/include/d/actor/d_a_mt.h +++ b/include/d/actor/d_a_mt.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daMt_HIO_c { +public: + daMt_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_MT_H */ diff --git a/include/d/actor/d_a_npc_ac1.h b/include/d/actor/d_a_npc_ac1.h index 050e5afb1..991425db9 100644 --- a/include/d/actor/d_a_npc_ac1.h +++ b/include/d/actor/d_a_npc_ac1.h @@ -128,4 +128,12 @@ public: /* 0x87A */ u8 m87A[0x87C - 0x87A]; }; +class daNpc_Ac1_HIO_c { +public: + daNpc_Ac1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_AC1_H */ diff --git a/include/d/actor/d_a_npc_aj1.h b/include/d/actor/d_a_npc_aj1.h index e0fb6fa06..ba98933eb 100644 --- a/include/d/actor/d_a_npc_aj1.h +++ b/include/d/actor/d_a_npc_aj1.h @@ -101,4 +101,12 @@ public: /* Place member variables here */ }; +class daNpc_Aj1_HIO_c { +public: + daNpc_Aj1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_AJ1_H */ diff --git a/include/d/actor/d_a_npc_ba1.h b/include/d/actor/d_a_npc_ba1.h index 08a93beb0..6fcd59862 100644 --- a/include/d/actor/d_a_npc_ba1.h +++ b/include/d/actor/d_a_npc_ba1.h @@ -58,10 +58,22 @@ public: void check_useFairyArea(); 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_setEvTimer(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_CHK_FAIRY_MOV_1(int*); void event_actionInit(int); + 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); @@ -98,4 +110,12 @@ public: /* Place member variables here */ }; +class daNpc_Ba1_HIO_c { +public: + daNpc_Ba1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_BA1_H */ diff --git a/include/d/actor/d_a_npc_bj1.h b/include/d/actor/d_a_npc_bj1.h index 653e94a4f..c8bfe6abb 100644 --- a/include/d/actor/d_a_npc_bj1.h +++ b/include/d/actor/d_a_npc_bj1.h @@ -114,4 +114,20 @@ public: /* Place member variables here */ }; +class daNpc_Bj1_childHIO_c { +public: + daNpc_Bj1_childHIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Bj1_HIO_c { +public: + daNpc_Bj1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_BJ1_H */ diff --git a/include/d/actor/d_a_npc_bm1.h b/include/d/actor/d_a_npc_bm1.h index 1bf078b7b..524b8a40a 100644 --- a/include/d/actor/d_a_npc_bm1.h +++ b/include/d/actor/d_a_npc_bm1.h @@ -201,4 +201,20 @@ public: /* 0x904 */ u8 m904[0x908 - 0x904]; }; +class daNpc_Bm1_childHIO_c { +public: + daNpc_Bm1_childHIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Bm1_HIO_c { +public: + daNpc_Bm1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_BM1_H */ diff --git a/include/d/actor/d_a_npc_bms1.h b/include/d/actor/d_a_npc_bms1.h index 0248ee92b..31d9f721a 100644 --- a/include/d/actor/d_a_npc_bms1.h +++ b/include/d/actor/d_a_npc_bms1.h @@ -2,6 +2,8 @@ #define D_A_NPC_BMS1_H #include "f_op/f_op_actor.h" +#include "d/d_npc.h" +#include "d/d_shop.h" class daNpc_Bms1_c : public fopAc_ac_c { public: @@ -65,4 +67,20 @@ public: /* 0x898 */ u8 m898[0x8A8 - 0x898]; }; +class daNpc_Bms1_childHIO_c { +public: + daNpc_Bms1_childHIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Bms1_HIO_c { +public: + daNpc_Bms1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_BMS1_H */ diff --git a/include/d/actor/d_a_npc_bmsw.h b/include/d/actor/d_a_npc_bmsw.h index cac0e40f8..8c7c2579d 100644 --- a/include/d/actor/d_a_npc_bmsw.h +++ b/include/d/actor/d_a_npc_bmsw.h @@ -2,6 +2,9 @@ #define D_A_NPC_BMSW_H #include "f_op/f_op_actor.h" +#include "d/d_npc.h" + +class ShopCursor_c; class daNpc_Bmsw_c : public fopAc_ac_c { public: @@ -42,4 +45,12 @@ public: /* 0x96C */ u8 m96C[0x9E4 - 0x96C]; }; +class daNpc_Bmsw_HIO_c { +public: + daNpc_Bmsw_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_BMSW_H */ diff --git a/include/d/actor/d_a_npc_bs1.h b/include/d/actor/d_a_npc_bs1.h index 3ee93ec6e..54da339f4 100644 --- a/include/d/actor/d_a_npc_bs1.h +++ b/include/d/actor/d_a_npc_bs1.h @@ -2,6 +2,7 @@ #define D_A_NPC_BS1_H #include "f_op/f_op_actor.h" +#include "d/d_shop.h" class daNpc_Bs1_c : public fopAc_ac_c { public: @@ -81,4 +82,20 @@ public: /* 0x834 */ u8 m834[0x844 - 0x834]; }; +class daNpc_Bs1_childHIO_c { +public: + daNpc_Bs1_childHIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Bs1_HIO_c { +public: + daNpc_Bs1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_BS1_H */ diff --git a/include/d/actor/d_a_npc_btsw.h b/include/d/actor/d_a_npc_btsw.h index 83b5a68b3..fd364ef58 100644 --- a/include/d/actor/d_a_npc_btsw.h +++ b/include/d/actor/d_a_npc_btsw.h @@ -39,4 +39,12 @@ public: /* Place member variables here */ }; +class daNpc_Btsw_HIO_c { +public: + daNpc_Btsw_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_BTSW_H */ diff --git a/include/d/actor/d_a_npc_btsw2.h b/include/d/actor/d_a_npc_btsw2.h index 61b8fadde..9d3f96847 100644 --- a/include/d/actor/d_a_npc_btsw2.h +++ b/include/d/actor/d_a_npc_btsw2.h @@ -34,4 +34,12 @@ public: /* Place member variables here */ }; +class daNpc_Btsw2_HIO_c { +public: + daNpc_Btsw2_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_BTSW2_H */ diff --git a/include/d/actor/d_a_npc_cb1.h b/include/d/actor/d_a_npc_cb1.h index 7d83eaa79..78ac9527d 100644 --- a/include/d/actor/d_a_npc_cb1.h +++ b/include/d/actor/d_a_npc_cb1.h @@ -212,4 +212,12 @@ public: /* 0x928 */ cBgS_PolyInfo m928; }; +class daNpc_Cb1_HIO_c { +public: + daNpc_Cb1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_CB1_H */ diff --git a/include/d/actor/d_a_npc_co1.h b/include/d/actor/d_a_npc_co1.h index b1ddfaeac..12d86cfe5 100644 --- a/include/d/actor/d_a_npc_co1.h +++ b/include/d/actor/d_a_npc_co1.h @@ -75,4 +75,12 @@ public: /* Place member variables here */ }; +class daNpc_Co1_HIO_c { +public: + daNpc_Co1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_CO1_H */ diff --git a/include/d/actor/d_a_npc_de1.h b/include/d/actor/d_a_npc_de1.h index 80e989db3..d831ca959 100644 --- a/include/d/actor/d_a_npc_de1.h +++ b/include/d/actor/d_a_npc_de1.h @@ -63,4 +63,12 @@ public: /* Place member variables here */ }; +class daNpc_De1_HIO_c { +public: + daNpc_De1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_DE1_H */ diff --git a/include/d/actor/d_a_npc_ds1.h b/include/d/actor/d_a_npc_ds1.h index 6b733af0e..4cc1567b9 100644 --- a/include/d/actor/d_a_npc_ds1.h +++ b/include/d/actor/d_a_npc_ds1.h @@ -71,4 +71,20 @@ public: /* 0x884 */ u8 m884[0x8A0 - 0x884]; }; +class daNpc_Ds1_childHIO_c { +public: + daNpc_Ds1_childHIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Ds1_HIO_c { +public: + daNpc_Ds1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_DS1_H */ diff --git a/include/d/actor/d_a_npc_fa1.h b/include/d/actor/d_a_npc_fa1.h index f110b6488..84901dbda 100644 --- a/include/d/actor/d_a_npc_fa1.h +++ b/include/d/actor/d_a_npc_fa1.h @@ -5,6 +5,12 @@ #include "d/d_bg_s_gnd_chk.h" #include "d/d_particle.h" +class daNpc_Fa1_McaMorfCallBack1_c : public mDoExt_McaMorfCallBack1_c { +public: + daNpc_Fa1_McaMorfCallBack1_c(); + bool execute(unsigned short, J3DTransformInfo*); +}; + class daNpc_Fa1_c : public fopAc_ac_c { public: void checkStatus(unsigned char) {} @@ -99,4 +105,31 @@ public: /* 0x795 */ u8 m795[0x7A4 - 0x795]; }; +class daNpc_Fa1_HIO3_c { +public: + daNpc_Fa1_HIO3_c(); + ~daNpc_Fa1_HIO3_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Fa1_HIO2_c { +public: + daNpc_Fa1_HIO2_c(); + ~daNpc_Fa1_HIO2_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Fa1_HIO_c { +public: + daNpc_Fa1_HIO_c(); + ~daNpc_Fa1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_FA1_H */ diff --git a/include/d/actor/d_a_npc_gk1.h b/include/d/actor/d_a_npc_gk1.h index 45aea6eda..d4d8fc868 100644 --- a/include/d/actor/d_a_npc_gk1.h +++ b/include/d/actor/d_a_npc_gk1.h @@ -68,4 +68,12 @@ public: /* Place member variables here */ }; +class daNpc_Gk1_HIO_c { +public: + daNpc_Gk1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_GK1_H */ diff --git a/include/d/actor/d_a_npc_gp1.h b/include/d/actor/d_a_npc_gp1.h index 12b6dbce8..35d581dc3 100644 --- a/include/d/actor/d_a_npc_gp1.h +++ b/include/d/actor/d_a_npc_gp1.h @@ -76,4 +76,12 @@ public: /* Place member variables here */ }; +class daNpc_Gp1_HIO_c { +public: + daNpc_Gp1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_GP1_H */ diff --git a/include/d/actor/d_a_npc_hi1.h b/include/d/actor/d_a_npc_hi1.h index 164256bb9..21d927747 100644 --- a/include/d/actor/d_a_npc_hi1.h +++ b/include/d/actor/d_a_npc_hi1.h @@ -68,4 +68,12 @@ public: /* Place member variables here */ }; +class daNpc_Hi1_HIO_c { +public: + daNpc_Hi1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_HI1_H */ diff --git a/include/d/actor/d_a_npc_jb1.h b/include/d/actor/d_a_npc_jb1.h index ee1d9f42a..1752a11a3 100644 --- a/include/d/actor/d_a_npc_jb1.h +++ b/include/d/actor/d_a_npc_jb1.h @@ -70,4 +70,12 @@ public: /* 0x8F2 */ u8 m8F2[0x924 - 0x8F2]; }; +class daNpc_Jb1_HIO_c { +public: + daNpc_Jb1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_JB1_H */ diff --git a/include/d/actor/d_a_npc_ji1.h b/include/d/actor/d_a_npc_ji1.h index 52c79a807..3ac4467e0 100644 --- a/include/d/actor/d_a_npc_ji1.h +++ b/include/d/actor/d_a_npc_ji1.h @@ -118,4 +118,12 @@ public: /* 0x290 */ u8 m290[0xD88 - 0x290]; }; +class daNpc_Ji1_HIO_c { +public: + daNpc_Ji1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_JI1_H */ diff --git a/include/d/actor/d_a_npc_kf1.h b/include/d/actor/d_a_npc_kf1.h index 800c107a5..a59c1f988 100644 --- a/include/d/actor/d_a_npc_kf1.h +++ b/include/d/actor/d_a_npc_kf1.h @@ -101,4 +101,12 @@ public: /* 0x710 */ u8 m710[0x800 - 0x710]; }; +class daNpc_Kf1_HIO_c { +public: + daNpc_Kf1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_KF1_H */ diff --git a/include/d/actor/d_a_npc_kg1.h b/include/d/actor/d_a_npc_kg1.h index d84c4d9d3..e42d0aa59 100644 --- a/include/d/actor/d_a_npc_kg1.h +++ b/include/d/actor/d_a_npc_kg1.h @@ -68,4 +68,12 @@ public: /* 0x78A */ u8 m78A[0x78C - 0x78A]; }; +class daNpc_Kg1_HIO_c { +public: + daNpc_Kg1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_KG1_H */ diff --git a/include/d/actor/d_a_npc_kg2.h b/include/d/actor/d_a_npc_kg2.h index 72810778e..bcdb49ffb 100644 --- a/include/d/actor/d_a_npc_kg2.h +++ b/include/d/actor/d_a_npc_kg2.h @@ -48,4 +48,12 @@ public: /* Place member variables here */ }; +class daNpc_Kg2_HIO_c { +public: + daNpc_Kg2_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_KG2_H */ diff --git a/include/d/actor/d_a_npc_kk1.h b/include/d/actor/d_a_npc_kk1.h index 078e5ba9c..1d5b466a5 100644 --- a/include/d/actor/d_a_npc_kk1.h +++ b/include/d/actor/d_a_npc_kk1.h @@ -134,4 +134,12 @@ public: /* 0x81F */ u8 m81F[0x824 - 0x81F]; }; +class daNpc_Kk1_HIO_c { +public: + daNpc_Kk1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_KK1_H */ diff --git a/include/d/actor/d_a_npc_km1.h b/include/d/actor/d_a_npc_km1.h index 9e1ad6d4b..f14ae7ecf 100644 --- a/include/d/actor/d_a_npc_km1.h +++ b/include/d/actor/d_a_npc_km1.h @@ -81,4 +81,12 @@ public: /* 0x7C8 */ u8 m7C8[0x7D8 - 0x7C8]; }; +class daNpc_Km1_HIO_c { +public: + daNpc_Km1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_KM1_H */ diff --git a/include/d/actor/d_a_npc_ko1.h b/include/d/actor/d_a_npc_ko1.h index 2b8242280..f0e289c6e 100644 --- a/include/d/actor/d_a_npc_ko1.h +++ b/include/d/actor/d_a_npc_ko1.h @@ -141,4 +141,20 @@ public: /* 0x6C4 */ u8 m6C4[0x8AC - 0x6C4]; }; +class daNpc_Ko1_childHIO_c { +public: + daNpc_Ko1_childHIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Ko1_HIO_c { +public: + daNpc_Ko1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_KO1_H */ diff --git a/include/d/actor/d_a_npc_kp1.h b/include/d/actor/d_a_npc_kp1.h index 8de3e0720..1d9806aaa 100644 --- a/include/d/actor/d_a_npc_kp1.h +++ b/include/d/actor/d_a_npc_kp1.h @@ -66,4 +66,12 @@ public: /* Place member variables here */ }; +class daNpc_Kp1_HIO_c { +public: + daNpc_Kp1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_KP1_H */ diff --git a/include/d/actor/d_a_npc_ls1.h b/include/d/actor/d_a_npc_ls1.h index 2dbf183e1..706b73f07 100644 --- a/include/d/actor/d_a_npc_ls1.h +++ b/include/d/actor/d_a_npc_ls1.h @@ -4,9 +4,11 @@ #include "f_op/f_op_actor.h" class J3DMaterial; +class J3DNode; -class daNpc_Ls1_matAnm_c : public fopAc_ac_c { +class daNpc_Ls1_matAnm_c { public: + daNpc_Ls1_matAnm_c(); void clrMoveFlag() {} void getNowOffsetX() {} void getNowOffsetY() {} @@ -18,4 +20,109 @@ public: /* Place member variables here */ }; +class daNpc_Ls1_c : public fopAc_ac_c { +public: + struct anm_prm_c { + + }; + + void _nodeCB_Head(J3DNode*, J3DModel*); + void _nodeCB_BackBone(J3DNode*, J3DModel*); + void _nodeCB_Hand_L(J3DNode*, J3DModel*); + void _nodeCB_Hand_R(J3DNode*, J3DModel*); + void _Ls_hand_nodeCB_Hand_L(J3DNode*, J3DModel*); + void _Ls_hand_nodeCB_Hand_R(J3DNode*, J3DModel*); + void init_LS1_0(); + void init_LS1_1(); + void init_LS1_2(); + void init_LS1_3(); + void init_LS1_4(); + void createInit(); + void play_animation(); + 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_Ls1_c::anm_prm_c*); + void setAnm_NUM(int, int); + void setAnm(); + void chngAnmTag(); + void ctrlAnmTag(); + void chngAnmAtr(unsigned char); + void ctrlAnmAtr(); + void setAnm_ATR(int); + void anmAtr(unsigned short); + void next_msgStatus(unsigned long*); + void getMsg_LS1_0(); + void getMsg_LS1_3(); + 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 cut_init_LOK_PLYER(int); + void cut_move_LOK_PLYER(); + void cut_init_PLYER_MOV(int); + void cut_move_PLYER_MOV(); + void cut_init_WAI(int); + void cut_move_WAI(); + void cut_init_ANM_CHG(int); + void cut_move_ANM_CHG(); + void privateCut(int); + void endEvent(); + void isEventEntry(); + void event_proc(int); + void set_action(int (daNpc_Ls1_c::*)(void*), void*); + void setStt(signed char); + void chk_areaIN(float, float, short, cXyz); + void get_playerEvnPos(int); + void chkTelescope_sph(cXyz, float, float); + void chkTelescope(cXyz, float, float); + void telescope_proc(); + void wait_1(); + void wait_2(); + void wait_3(); + void wait_4(); + void talk_1(); + void wait_action1(void*); + void demo_action1(void*); + void demo(); + void shadowDraw(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); + void bodyCreateHeap(); + void handCreateHeap(); + void itemCreateHeap(); + void CreateHeap(); + +public: + /* Place member variables here */ +}; + +class daNpc_Ls1_HIO_c { +public: + daNpc_Ls1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_LS1_H */ diff --git a/include/d/actor/d_a_npc_nz.h b/include/d/actor/d_a_npc_nz.h index 61b4895d5..797f022fa 100644 --- a/include/d/actor/d_a_npc_nz.h +++ b/include/d/actor/d_a_npc_nz.h @@ -64,4 +64,12 @@ public: /* Place member variables here */ }; +class daNpc_Nz_HIO_c { +public: + daNpc_Nz_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_NZ_H */ diff --git a/include/d/actor/d_a_npc_ob1.h b/include/d/actor/d_a_npc_ob1.h index a5afd8326..7c42d41ac 100644 --- a/include/d/actor/d_a_npc_ob1.h +++ b/include/d/actor/d_a_npc_ob1.h @@ -85,4 +85,12 @@ public: /* Place member variables here */ }; +class daNpc_Ob1_HIO_c { +public: + daNpc_Ob1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_OB1_H */ diff --git a/include/d/actor/d_a_npc_os.h b/include/d/actor/d_a_npc_os.h index 734585a2d..e99f94041 100644 --- a/include/d/actor/d_a_npc_os.h +++ b/include/d/actor/d_a_npc_os.h @@ -7,11 +7,21 @@ #include "SSystem/SComponent/c_phase.h" #include "d/d_npc.h" #include "d/actor/d_a_pedestal.h" +#include "d/d_particle.h" class mDoExt_McaMorf; +class daNpc_Os_infiniteEcallBack_c : public dPa_levelEcallBack { +public: + void end(); + void makeEmitter(unsigned short, const cXyz*, const csXyz*, const cXyz*); + void execute(JPABaseEmitter*); + void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char); +}; + class daNpc_Os_c : public fopAc_ac_c { public: + ~daNpc_Os_c(); void chkNpcAction(int (daNpc_Os_c::*)(void*)) {} void chkPlayerAction(int (daNpc_Os_c::*)(void*)) {} void clearStatus() {} @@ -163,4 +173,20 @@ public: /* 0x7FC */ cBgS_PolyInfo m7FC; }; +class daNpc_Os_HIO2_c { +public: + daNpc_Os_HIO2_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Os_HIO_c { +public: + daNpc_Os_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_OS_H */ diff --git a/include/d/actor/d_a_npc_p1.h b/include/d/actor/d_a_npc_p1.h index 9033e74f5..c507e7540 100644 --- a/include/d/actor/d_a_npc_p1.h +++ b/include/d/actor/d_a_npc_p1.h @@ -40,4 +40,20 @@ public: /* Place member variables here */ }; +class daNpc_P1_HIO_c { +public: + daNpc_P1_HIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_P1_childHIO_c { +public: + daNpc_P1_childHIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_P1_H */ diff --git a/include/d/actor/d_a_npc_p2.h b/include/d/actor/d_a_npc_p2.h index bd683c1d3..b5014715c 100644 --- a/include/d/actor/d_a_npc_p2.h +++ b/include/d/actor/d_a_npc_p2.h @@ -108,4 +108,20 @@ public: /* Place member variables here */ }; +class daNpc_P2_childHIO_c { +public: + daNpc_P2_childHIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_P2_HIO_c { +public: + daNpc_P2_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_P2_H */ diff --git a/include/d/actor/d_a_npc_pf1.h b/include/d/actor/d_a_npc_pf1.h index e7acbd5ff..bf4a872ea 100644 --- a/include/d/actor/d_a_npc_pf1.h +++ b/include/d/actor/d_a_npc_pf1.h @@ -78,4 +78,12 @@ public: /* Place member variables here */ }; +class daNpc_Pf1_HIO_c { +public: + daNpc_Pf1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_PF1_H */ diff --git a/include/d/actor/d_a_npc_pm1.h b/include/d/actor/d_a_npc_pm1.h index 994a0704a..05fdc3dc9 100644 --- a/include/d/actor/d_a_npc_pm1.h +++ b/include/d/actor/d_a_npc_pm1.h @@ -63,4 +63,12 @@ public: /* Place member variables here */ }; +class daNpc_Pm1_HIO_c { +public: + daNpc_Pm1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_PM1_H */ diff --git a/include/d/actor/d_a_npc_rsh1.h b/include/d/actor/d_a_npc_rsh1.h index 3f25f72e6..ec17013ff 100644 --- a/include/d/actor/d_a_npc_rsh1.h +++ b/include/d/actor/d_a_npc_rsh1.h @@ -3,6 +3,8 @@ #include "f_op/f_op_actor.h" +class ShopItems_c; + class daNpc_Rsh1_c : public fopAc_ac_c { public: void chkAction(int (daNpc_Rsh1_c::*)(void*)) {} @@ -69,4 +71,12 @@ public: /* 0x814 */ u8 m814[0x968 - 0x814]; }; +class daNpc_Rsh1_HIO_c { +public: + daNpc_Rsh1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_RSH1_H */ diff --git a/include/d/actor/d_a_npc_sarace.h b/include/d/actor/d_a_npc_sarace.h index c7847de36..7b8006017 100644 --- a/include/d/actor/d_a_npc_sarace.h +++ b/include/d/actor/d_a_npc_sarace.h @@ -40,4 +40,12 @@ public: /* Place member variables here */ }; +class daNpc_Sarace_HIO_c { +public: + daNpc_Sarace_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_SARACE_H */ diff --git a/include/d/actor/d_a_npc_so.h b/include/d/actor/d_a_npc_so.h index 39761cd62..b14f3c69a 100644 --- a/include/d/actor/d_a_npc_so.h +++ b/include/d/actor/d_a_npc_so.h @@ -129,4 +129,12 @@ public: /* Place member variables here */ }; +class daNpc_So_HIO_c { +public: + daNpc_So_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_SO_H */ diff --git a/include/d/actor/d_a_npc_tc.h b/include/d/actor/d_a_npc_tc.h index 158e2e108..f41a16a6a 100644 --- a/include/d/actor/d_a_npc_tc.h +++ b/include/d/actor/d_a_npc_tc.h @@ -104,4 +104,12 @@ public: /* Place member variables here */ }; +class daNpc_Tc_HIO_c { +public: + daNpc_Tc_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_TC_H */ diff --git a/include/d/actor/d_a_npc_ym1.h b/include/d/actor/d_a_npc_ym1.h index 943301d0d..93e860d80 100644 --- a/include/d/actor/d_a_npc_ym1.h +++ b/include/d/actor/d_a_npc_ym1.h @@ -128,4 +128,20 @@ public: /* 0x8B2 */ u8 m8B2[0x8B4 - 0x8B2]; }; +class daNpc_Ym1_childHIO_c { +public: + daNpc_Ym1_childHIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Ym1_HIO_c { +public: + daNpc_Ym1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_YM1_H */ diff --git a/include/d/actor/d_a_npc_yw1.h b/include/d/actor/d_a_npc_yw1.h index 1cffa8039..0ac039f05 100644 --- a/include/d/actor/d_a_npc_yw1.h +++ b/include/d/actor/d_a_npc_yw1.h @@ -86,4 +86,20 @@ public: /* Place member variables here */ }; +class daNpc_Yw1_childHIO_c { +public: + daNpc_Yw1_childHIO_c(); + +public: + /* Place member variables here */ +}; + +class daNpc_Yw1_HIO_c { +public: + daNpc_Yw1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_YW1_H */ diff --git a/include/d/actor/d_a_npc_zk1.h b/include/d/actor/d_a_npc_zk1.h index d161e3e51..c07495a18 100644 --- a/include/d/actor/d_a_npc_zk1.h +++ b/include/d/actor/d_a_npc_zk1.h @@ -68,4 +68,12 @@ public: /* 0x75C */ u8 m75C[0x7B4 - 0x75C]; }; +class daNpc_Zk1_HIO_c { +public: + daNpc_Zk1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_ZK1_H */ diff --git a/include/d/actor/d_a_npc_zl1.h b/include/d/actor/d_a_npc_zl1.h index 4f8a35064..90f9c97d9 100644 --- a/include/d/actor/d_a_npc_zl1.h +++ b/include/d/actor/d_a_npc_zl1.h @@ -18,4 +18,12 @@ public: /* Place member variables here */ }; +class daNpc_Zl1_HIO_c { +public: + daNpc_Zl1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NPC_ZL1_H */ diff --git a/include/d/actor/d_a_nz.h b/include/d/actor/d_a_nz.h index d05cd394a..e99f9170f 100644 --- a/include/d/actor/d_a_nz.h +++ b/include/d/actor/d_a_nz.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daNZ_HIO_c { +public: + daNZ_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_NZ_H */ diff --git a/include/d/actor/d_a_obj_balancelift.h b/include/d/actor/d_a_obj_balancelift.h index 797479b40..17638e9f2 100644 --- a/include/d/actor/d_a_obj_balancelift.h +++ b/include/d/actor/d_a_obj_balancelift.h @@ -20,4 +20,12 @@ public: /* Place member variables here */ }; +class daBalancelift_HIO_c { +public: + daBalancelift_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_BALANCELIFT_H */ diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h index e97da350e..0ae7dabd4 100644 --- a/include/d/actor/d_a_obj_bemos.h +++ b/include/d/actor/d_a_obj_bemos.h @@ -51,4 +51,12 @@ public: /* Place member variables here */ }; +class daBemos_HIO_c { +public: + daBemos_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_BEMOS_H */ diff --git a/include/d/actor/d_a_obj_canon.h b/include/d/actor/d_a_obj_canon.h index 5481a2e2d..39d183f30 100644 --- a/include/d/actor/d_a_obj_canon.h +++ b/include/d/actor/d_a_obj_canon.h @@ -45,4 +45,12 @@ public: /* Place member variables here */ }; +class daObj_Canon_HIO_c { +public: + daObj_Canon_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_CANON_H */ diff --git a/include/d/actor/d_a_obj_hsehi1.h b/include/d/actor/d_a_obj_hsehi1.h index 6ae073bb7..b54621de8 100644 --- a/include/d/actor/d_a_obj_hsehi1.h +++ b/include/d/actor/d_a_obj_hsehi1.h @@ -67,4 +67,12 @@ public: /* Place member variables here */ }; +class daObj_hsh_HIO_c { +public: + daObj_hsh_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_HSEHI1_H */ diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h index 2a28550a4..787283b7d 100644 --- a/include/d/actor/d_a_obj_ikada.h +++ b/include/d/actor/d_a_obj_ikada.h @@ -175,4 +175,12 @@ public: /* 0x1328 */ cXyz mInitPos; }; +class daObj_Ikada_HIO_c { +public: + daObj_Ikada_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_IKADA_H */ diff --git a/include/d/actor/d_a_obj_majyuu_door.h b/include/d/actor/d_a_obj_majyuu_door.h index a5e97ea5a..2bef58625 100644 --- a/include/d/actor/d_a_obj_majyuu_door.h +++ b/include/d/actor/d_a_obj_majyuu_door.h @@ -26,4 +26,12 @@ public: /* Place member variables here */ }; +class daObj_MjDoorHIO_c { +public: + daObj_MjDoorHIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_MAJYUU_DOOR_H */ diff --git a/include/d/actor/d_a_obj_pbco.h b/include/d/actor/d_a_obj_pbco.h index 465da043a..2fdd85a55 100644 --- a/include/d/actor/d_a_obj_pbco.h +++ b/include/d/actor/d_a_obj_pbco.h @@ -18,4 +18,12 @@ public: /* Place member variables here */ }; +class daObj_Pbco_HIO_c { +public: + daObj_Pbco_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_PBCO_H */ diff --git a/include/d/actor/d_a_obj_pfall.h b/include/d/actor/d_a_obj_pfall.h index 43e20c980..717a19b68 100644 --- a/include/d/actor/d_a_obj_pfall.h +++ b/include/d/actor/d_a_obj_pfall.h @@ -61,4 +61,12 @@ public: /* 0x482 */ u8 m482[0x484 - 0x482]; }; +class daObj_PfallHIO_c { +public: + daObj_PfallHIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_PFALL_H */ diff --git a/include/d/actor/d_a_obj_quake.h b/include/d/actor/d_a_obj_quake.h index 4d313ae51..db74865dd 100644 --- a/include/d/actor/d_a_obj_quake.h +++ b/include/d/actor/d_a_obj_quake.h @@ -17,4 +17,12 @@ public: /* Place member variables here */ }; +class daObjQuake_HIO_c { +public: + daObjQuake_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_QUAKE_H */ diff --git a/include/d/actor/d_a_obj_roten.h b/include/d/actor/d_a_obj_roten.h index e1ce58b78..1c2c26af7 100644 --- a/include/d/actor/d_a_obj_roten.h +++ b/include/d/actor/d_a_obj_roten.h @@ -18,4 +18,12 @@ public: /* Place member variables here */ }; +class daObj_Roten_HIO_c { +public: + daObj_Roten_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_ROTEN_H */ diff --git a/include/d/actor/d_a_obj_stair.h b/include/d/actor/d_a_obj_stair.h index b183d0183..02e6a22a8 100644 --- a/include/d/actor/d_a_obj_stair.h +++ b/include/d/actor/d_a_obj_stair.h @@ -21,4 +21,12 @@ public: /* Place member variables here */ }; +class daobj_stairHIO_c { +public: + daobj_stairHIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_STAIR_H */ diff --git a/include/d/actor/d_a_obj_swflat.h b/include/d/actor/d_a_obj_swflat.h index 4360711e2..f1445662a 100644 --- a/include/d/actor/d_a_obj_swflat.h +++ b/include/d/actor/d_a_obj_swflat.h @@ -26,4 +26,12 @@ namespace daObjSwflat { }; }; +class daObjSwflat_HIO_c { +public: + daObjSwflat_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_SWFLAT_H */ diff --git a/include/d/actor/d_a_obj_tapestry.h b/include/d/actor/d_a_obj_tapestry.h index 4e15fa58a..17eb0fd28 100644 --- a/include/d/actor/d_a_obj_tapestry.h +++ b/include/d/actor/d_a_obj_tapestry.h @@ -14,4 +14,12 @@ public: /* Place member variables here */ }; +class daObjTapestry_HIO_c { +public: + daObjTapestry_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_TAPESTRY_H */ diff --git a/include/d/actor/d_a_obj_warpt.h b/include/d/actor/d_a_obj_warpt.h index 004cce4bd..f32c8ff6f 100644 --- a/include/d/actor/d_a_obj_warpt.h +++ b/include/d/actor/d_a_obj_warpt.h @@ -52,4 +52,12 @@ public: /* Place member variables here */ }; +class daObj_Warpt_HIO_c { +public: + daObj_Warpt_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OBJ_WARPT_H */ diff --git a/include/d/actor/d_a_oship.h b/include/d/actor/d_a_oship.h index d5da26629..7cc6986e6 100644 --- a/include/d/actor/d_a_oship.h +++ b/include/d/actor/d_a_oship.h @@ -123,4 +123,12 @@ public: /* 0xD94 */ dBgS_LinChk mLinChk; }; +class daOship_HIO_c { +public: + daOship_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_OSHIP_H */ diff --git a/include/d/actor/d_a_pt.h b/include/d/actor/d_a_pt.h index 14c44de0f..44e23af73 100644 --- a/include/d/actor/d_a_pt.h +++ b/include/d/actor/d_a_pt.h @@ -89,4 +89,12 @@ public: /* 0xDC5 */ u8 mDC5[0xDC8 - 0xDC5]; }; +class daPt_HIO_c { +public: + daPt_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_PT_H */ diff --git a/include/d/actor/d_a_pz.h b/include/d/actor/d_a_pz.h index e9e87f3bc..9da04a7ad 100644 --- a/include/d/actor/d_a_pz.h +++ b/include/d/actor/d_a_pz.h @@ -133,4 +133,12 @@ public: /* 0x0FD0 */ u8 m0FD0[0x1049 - 0x0FD0]; }; +class daPz_HIO_c { +public: + daPz_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_PZ_H */ diff --git a/include/d/actor/d_a_scene_change.h b/include/d/actor/d_a_scene_change.h index e3b51d974..aeca091ca 100644 --- a/include/d/actor/d_a_scene_change.h +++ b/include/d/actor/d_a_scene_change.h @@ -15,9 +15,9 @@ public: m0004 = -1; } - s8 m0004; - s8 m0005; - f32 m0008; + /* 0x04 */ s8 m0004; + /* 0x05 */ s8 m0005; + /* 0x08 */ f32 m0008; }; #endif /* D_A_SCENE_CHANGE_H */ diff --git a/include/d/actor/d_a_shand.h b/include/d/actor/d_a_shand.h index 01f7cd745..86dda3470 100644 --- a/include/d/actor/d_a_shand.h +++ b/include/d/actor/d_a_shand.h @@ -8,4 +8,12 @@ public: /* Place member variables here */ }; +class daShand_HIO_c { +public: + daShand_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_SHAND_H */ diff --git a/include/d/actor/d_a_sie_flag.h b/include/d/actor/d_a_sie_flag.h index 150b34e25..e453c817e 100644 --- a/include/d/actor/d_a_sie_flag.h +++ b/include/d/actor/d_a_sie_flag.h @@ -27,4 +27,12 @@ public: /* 0x3A0 */ dCcD_Cyl mCyl; }; +class daSie_Flag_HIO_c { +public: + daSie_Flag_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_SIE_FLAG_H */ diff --git a/include/d/actor/d_a_tag_ba1.h b/include/d/actor/d_a_tag_ba1.h index e4bcbf6dc..945f78fad 100644 --- a/include/d/actor/d_a_tag_ba1.h +++ b/include/d/actor/d_a_tag_ba1.h @@ -17,4 +17,12 @@ public: /* Place member variables here */ }; +class daTag_Ba1_HIO_c { +public: + daTag_Ba1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_TAG_BA1_H */ diff --git a/include/d/actor/d_a_tag_kf1.h b/include/d/actor/d_a_tag_kf1.h index adf071ee5..d9be746d0 100644 --- a/include/d/actor/d_a_tag_kf1.h +++ b/include/d/actor/d_a_tag_kf1.h @@ -35,4 +35,12 @@ public: /* Place member variables here */ }; +class daTag_Kf1_HIO_c { +public: + daTag_Kf1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_TAG_KF1_H */ diff --git a/include/d/actor/d_a_tag_kk1.h b/include/d/actor/d_a_tag_kk1.h index 7f248e29f..efce8a0f1 100644 --- a/include/d/actor/d_a_tag_kk1.h +++ b/include/d/actor/d_a_tag_kk1.h @@ -15,4 +15,12 @@ public: /* Place member variables here */ }; +class daTag_Kk1_HIO_c { +public: + daTag_Kk1_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_TAG_KK1_H */ diff --git a/include/d/actor/d_a_tag_md_cb.h b/include/d/actor/d_a_tag_md_cb.h index 390a3c5ac..7da85f4f0 100644 --- a/include/d/actor/d_a_tag_md_cb.h +++ b/include/d/actor/d_a_tag_md_cb.h @@ -42,4 +42,12 @@ public: /* Place member variables here */ }; +class daTag_MdCb_HIO_c { +public: + daTag_MdCb_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_TAG_MD_CB_H */ diff --git a/include/d/actor/d_a_tag_so.h b/include/d/actor/d_a_tag_so.h index fb6634174..b3390bcd4 100644 --- a/include/d/actor/d_a_tag_so.h +++ b/include/d/actor/d_a_tag_so.h @@ -21,4 +21,12 @@ public: /* Place member variables here */ }; +class daTag_So_HIO_c { +public: + daTag_So_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_TAG_SO_H */ diff --git a/include/d/actor/d_a_tori_flag.h b/include/d/actor/d_a_tori_flag.h index 3d10c9dc6..d5ebf1f4f 100644 --- a/include/d/actor/d_a_tori_flag.h +++ b/include/d/actor/d_a_tori_flag.h @@ -29,4 +29,12 @@ public: /* 0x4D0 */ dCcD_Cyl mCyl2; }; +class daTori_Flag_HIO_c { +public: + daTori_Flag_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_TORI_FLAG_H */ diff --git a/include/d/actor/d_a_yougan.h b/include/d/actor/d_a_yougan.h index 2a9f5b394..77350483e 100644 --- a/include/d/actor/d_a_yougan.h +++ b/include/d/actor/d_a_yougan.h @@ -16,4 +16,12 @@ public: /* Place member variables here */ }; +class daYOUGAN_HIO_c { +public: + daYOUGAN_HIO_c(); + +public: + /* Place member variables here */ +}; + #endif /* D_A_YOUGAN_H */ diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index 2ed23c7f0..c6127d190 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -4,7 +4,8 @@ // #include "d/actor/d_a_bgn.h" -#include "dolphin/types.h" +#include "d/actor/d_a_bgn2.h" +#include "d/actor/d_a_bgn3.h" /* 000000EC-000003F0 .text __ct__11daBgn_HIO_cFv */ daBgn_HIO_c::daBgn_HIO_c() { diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index 7b6e8f85c..dddad25e9 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -110,13 +110,3 @@ static s32 daHimo2_Create(fopAc_ac_c*) { himo2HIO_c::~himo2HIO_c() { /* Nonmatching */ } - -/* 800F0C54-800F0C70 .text show__8daYkgr_cFv */ -void daYkgr_c::show() { - /* Nonmatching */ -} - -/* 800F0C70-800F0C8C .text hide__8daYkgr_cFv */ -void daYkgr_c::hide() { - /* Nonmatching */ -} diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp index 01c343879..f23b874c8 100644 --- a/src/d/actor/d_a_npc_ba1.cpp +++ b/src/d/actor/d_a_npc_ba1.cpp @@ -257,32 +257,32 @@ void daNpc_Ba1_c::charDecide(int) { } /* 00001D7C-00001E10 .text eInit_SET_PLYER_GOL___11daNpc_Ba1_cFv */ -void eInit_SET_PLYER_GOL___11daNpc_Ba1_cFv { +void daNpc_Ba1_c::eInit_SET_PLYER_GOL_() { /* Nonmatching */ } /* 00001E10-00001ECC .text eInit_PLYER_INI_POS___11daNpc_Ba1_cFv */ -void eInit_PLYER_INI_POS___11daNpc_Ba1_cFv { +void daNpc_Ba1_c::eInit_PLYER_INI_POS() { /* Nonmatching */ } /* 00001ECC-00001EE8 .text eInit_USE_FAIRY_END___11daNpc_Ba1_cFv */ -void eInit_USE_FAIRY_END___11daNpc_Ba1_cFv { +void daNpc_Ba1_c::eInit_USE_FAIRY_END() { /* Nonmatching */ } /* 00001EE8-00001F04 .text eInit_MOV_POS___11daNpc_Ba1_cFv */ -void eInit_MOV_POS___11daNpc_Ba1_cFv { +void daNpc_Ba1_c::eInit_MOV_POS() { /* Nonmatching */ } /* 00001F04-00001F48 .text eInit_SET_PLYER_TRN_ANG___11daNpc_Ba1_cFv */ -void eInit_SET_PLYER_TRN_ANG___11daNpc_Ba1_cFv { +void daNpc_Ba1_c::eInit_SET_PLYER_TRN_ANG() { /* Nonmatching */ } /* 00001F48-000020AC .text eInit_ACTOR_DRW_CONTROL___11daNpc_Ba1_cFPiPi */ -void eInit_ACTOR_DRW_CONTROL___11daNpc_Ba1_cFPiPi { +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 eInit_CHK_FAIRY___11daNpc_Ba1_cFPi { +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 eInit_SET_EYE_OFF___11daNpc_Ba1_cFPf { +void daNpc_Ba1_c::eInit_SET_EYE_OFF(float*) { /* Nonmatching */ } /* 00002130-00002168 .text eInit_EYE_OFF_ZRO___11daNpc_Ba1_cFPf */ -void eInit_EYE_OFF_ZRO___11daNpc_Ba1_cFPf { +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 eMove_MOV_POS___11daNpc_Ba1_cFv { +void daNpc_Ba1_c::eMove_MOV_POS() { /* Nonmatching */ } /* 00002518-00002574 .text eMove_CHK_FAIRY___11daNpc_Ba1_cFv */ -void eMove_CHK_FAIRY___11daNpc_Ba1_cFv { +void daNpc_Ba1_c::eMove_CHK_FAIRY() { /* Nonmatching */ } /* 00002574-00002608 .text eMove_EYE_OFF_ZRO___11daNpc_Ba1_cFv */ -void eMove_EYE_OFF_ZRO___11daNpc_Ba1_cFv { +void daNpc_Ba1_c::eMove_EYE_OFF_ZRO() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bms1.cpp b/src/d/actor/d_a_npc_bms1.cpp index 16f026d3e..a02e42cd0 100644 --- a/src/d/actor/d_a_npc_bms1.cpp +++ b/src/d/actor/d_a_npc_bms1.cpp @@ -256,18 +256,18 @@ static BOOL daNpc_Bms1_IsDelete(daNpc_Bms1_c*) { /* Nonmatching */ } -/* 000047AC-000047C8 .text setEyePos__12daNpc_Bms1_cF4cXyz */ -void daNpc_Bms1_c::setEyePos(cXyz) { - /* Nonmatching */ -} +// /* 000047AC-000047C8 .text setEyePos__12daNpc_Bms1_cF4cXyz */ +// void daNpc_Bms1_c::setEyePos(cXyz) { +// /* Nonmatching */ +// } -/* 000047C8-000047E4 .text setAttentionBasePos__12daNpc_Bms1_cF4cXyz */ -void daNpc_Bms1_c::setAttentionBasePos(cXyz) { - /* Nonmatching */ -} +// /* 000047C8-000047E4 .text setAttentionBasePos__12daNpc_Bms1_cF4cXyz */ +// void daNpc_Bms1_c::setAttentionBasePos(cXyz) { +// /* Nonmatching */ +// } -/* 00004820-00004900 .text getItemZoomPos__16ShopCam_action_cFf */ -void ShopCam_action_c::getItemZoomPos(float) { - /* Nonmatching */ -} +// /* 00004820-00004900 .text getItemZoomPos__16ShopCam_action_cFf */ +// void ShopCam_action_c::getItemZoomPos(float) { +// /* Nonmatching */ +// } diff --git a/src/d/actor/d_a_npc_fa1.cpp b/src/d/actor/d_a_npc_fa1.cpp index 482101b74..adfb573e9 100644 --- a/src/d/actor/d_a_npc_fa1.cpp +++ b/src/d/actor/d_a_npc_fa1.cpp @@ -37,7 +37,7 @@ daNpc_Fa1_McaMorfCallBack1_c::daNpc_Fa1_McaMorfCallBack1_c() { } /* 800FB22C-800FB24C .text execute__28daNpc_Fa1_McaMorfCallBack1_cFUsP16J3DTransformInfo */ -void daNpc_Fa1_McaMorfCallBack1_c::execute(unsigned short, J3DTransformInfo*) { +bool daNpc_Fa1_McaMorfCallBack1_c::execute(unsigned short, J3DTransformInfo*) { /* Nonmatching */ } @@ -315,14 +315,3 @@ static BOOL daNpc_Fa1_IsDelete(daNpc_Fa1_c*) { daNpc_Fa1_HIO_c::~daNpc_Fa1_HIO_c() { /* Nonmatching */ } - -/* 800FD7F4-800FD868 .text cLib_getRndValue__FUcUc */ -void cLib_getRndValue(unsigned char, unsigned char) { - /* Nonmatching */ -} - -/* 800FD868-800FD8DC .text cLib_getRndValue__FUsUs */ -void cLib_getRndValue(unsigned short, unsigned short) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index bd0b7dbbc..0fc918299 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -520,44 +520,3 @@ void daNpc_Os_infiniteEcallBack_c::execute(JPABaseEmitter*) { void daNpc_Os_infiniteEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) { /* Nonmatching */ } - -/* 00007B18-00007B20 .text getGroundY__10daNpc_Os_cFv */ -void daNpc_Os_c::getGroundY() { - /* Nonmatching */ -} - -/* 00007B20-00007B28 .text getLeftHandMatrix__10daNpc_Os_cFv */ -void daNpc_Os_c::getLeftHandMatrix() { - /* Nonmatching */ -} - -/* 00007B28-00007B30 .text getRightHandMatrix__10daNpc_Os_cFv */ -void daNpc_Os_c::getRightHandMatrix() { - /* Nonmatching */ -} - -/* 00007B30-00007B3C .text getBaseAnimeFrameRate__10daNpc_Os_cFv */ -void daNpc_Os_c::getBaseAnimeFrameRate() { - /* Nonmatching */ -} - -/* 00007B3C-00007B48 .text getBaseAnimeFrame__10daNpc_Os_cFv */ -void daNpc_Os_c::getBaseAnimeFrame() { - /* Nonmatching */ -} - -/* 00007B48-00007B4C .text restartPoint__10daPy_npc_cFs */ -void daPy_npc_c::restartPoint(short) { - /* Nonmatching */ -} - -/* 00007B4C-00007B54 .text isTagCheckOK__10daPy_npc_cFv */ -void daPy_npc_c::isTagCheckOK() { - /* Nonmatching */ -} - -/* 00007B54-00007B58 .text setMessageAnimation__10daPy_npc_cFUc */ -void daPy_npc_c::setMessageAnimation(unsigned char) { - /* Nonmatching */ -} -