diff --git a/configure.py b/configure.py index fe7d68b619b..10c56328857 100755 --- a/configure.py +++ b/configure.py @@ -1624,7 +1624,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01"), "d_a_b_zant_sima"), ActorRel(NonMatching, "d_a_balloon_2D"), ActorRel(NonMatching, "d_a_bullet"), - ActorRel(NonMatching, "d_a_coach_2D"), + ActorRel(Equivalent, "d_a_coach_2D"), # weak func order ActorRel(MatchingFor("GZ2E01"), "d_a_coach_fire"), ActorRel(Equivalent, "d_a_cow"), ActorRel(NonMatching, "d_a_cstatue"), @@ -1671,7 +1671,7 @@ config.libs = [ ActorRel(Equivalent, "d_a_e_kk"), # weak func order ActorRel(NonMatching, "d_a_e_kr"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_mb"), - ActorRel(NonMatching, "d_a_e_md"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_md"), ActorRel(NonMatching, "d_a_e_mf"), ActorRel(NonMatching, "d_a_e_mk"), ActorRel(NonMatching, "d_a_e_mk_bo"), diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index 00724f14a33..2ef48562d0f 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -160,6 +160,11 @@ public: calcMtx(); } + void rotateY(f32 rotate) { + mRotateY = rotate; + calcMtx(); + } + int getKind() const { return mKind; } bool isVisible() const { return mVisible; } diff --git a/include/d/actor/d_a_coach_2D.h b/include/d/actor/d_a_coach_2D.h index 998b7a12048..aa281afaabb 100644 --- a/include/d/actor/d_a_coach_2D.h +++ b/include/d/actor/d_a_coach_2D.h @@ -1,8 +1,10 @@ #ifndef D_A_COACH_2D_H #define D_A_COACH_2D_H -#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" +#include "d/d_pane_class.h" +#include "d/d_msg_scrn_light.h" +#include "d/d_drawlist.h" /** * @ingroup actors-unsorted @@ -12,33 +14,144 @@ * @details * */ -class daCoach2D_c : public fopAc_ac_c { +class daCoach2D_c : public fopAc_ac_c, public request_of_phase_process_class { public: - struct c_list { - /* 806569CC */ void draw(); - /* 806577DC */ ~c_list(); + class c_list : public dDlst_base_c { + public: + c_list() { mpCoach2D = NULL; } + + /* 806569CC */ virtual void draw(); + /* 806577DC */ virtual ~c_list() {} + + void set(daCoach2D_c* i_coach2D) { + mpCoach2D = i_coach2D; + } + + /* 0x4 */ daCoach2D_c* mpCoach2D; }; - /* 80656A38 */ void createHeap(); - /* 80656D18 */ void create(); - /* 80656D94 */ void destroy(); - /* 80656DE4 */ void draw(); - /* 80656E94 */ void execute(); + /* 80656A38 */ int createHeap(); + /* 80656D18 */ int create(); + /* 80656D94 */ int destroy(); + /* 80656DE4 */ int draw(); + /* 80656E94 */ int execute(); /* 80656ED0 */ void drawMeter(); /* 8065722C */ void initiate(); /* 80657260 */ void update(); /* 80657490 */ void setBrkAnime(bool); - /* 80657824 */ ~daCoach2D_c(); -private: - /* 0x568 */ u8 field_0x568[0x784 - 0x568]; + daCoach2D_c() { initiate(); } + /* 80657824 */ virtual ~daCoach2D_c() {} + + void show() { mIsVisible = true; } + void hide() { mIsVisible = false; } + bool isVisible() { return mIsVisible ? true : false; } + + /* 0x574 */ J2DScreen* mpScrn; + /* 0x578 */ J2DAnmTevRegKey* mpFireIconBrk; + /* 0x57C */ dMsgScrnLight_c* mMsgLight; + /* 0x580 */ CPaneMgr* mpPaneAll; + /* 0x584 */ CPaneMgr* mpPaneBasha; + /* 0x588 */ CPaneMgr* mpPaneFire; + /* 0x58C */ CPaneMgr* mpPaneFireB; + struct { + /* 0x00 */ f32 pos_x; + /* 0x04 */ f32 pos_y; + /* 0x08 */ f32 pikari_pos_x; + /* 0x0C */ f32 pikari_pos_y; + /* 0x10 */ f32 pikari_anm_frame; + /* 0x14 */ u8 field_0x14; + /* 0x15 */ u8 field_0x15; + } + /* 0x590 */ mIconInfo[20]; + /* 0x770 */ c_list mList; + /* 0x778 */ f32 mBrkFrame; + /* 0x77C */ f32 mBrkSpeed; + /* 0x780 */ u8 mHitCount; + /* 0x781 */ u8 mMaxHitCount; + /* 0x782 */ u8 mIsVisible; }; STATIC_ASSERT(sizeof(daCoach2D_c) == 0x784); -class daCoach2D_HIO_c { +class daCoach2D_HIO_c : public mDoHIO_entry_c { public: - /* 80657738 */ ~daCoach2D_HIO_c(); + struct Param { + /* 0x00 */ f32 pos_x; + /* 0x04 */ f32 pos_y; + /* 0x08 */ f32 size; + /* 0x0C */ f32 alpha; + /* 0x10 */ f32 icon_space_x; + /* 0x14 */ f32 icon_pos_x; + /* 0x18 */ f32 icon_pos_y; + /* 0x1C */ f32 icon_size; + /* 0x20 */ f32 icon_alpha; + /* 0x24 */ f32 coach_pos_x; + /* 0x28 */ f32 coach_pos_y; + /* 0x2C */ f32 coach_size; + /* 0x30 */ f32 coach_alpha; + /* 0x34 */ f32 blink_speed_min; + /* 0x38 */ f32 blink_speed_max; + /* 0x3C */ f32 pikari_scale; + /* 0x40 */ f32 pikari_anim_speed; + /* 0x44 */ u8 pikari_moyaR0_R; + /* 0x45 */ u8 pikari_moyaR0_G; + /* 0x46 */ u8 pikari_moyaR0_B; + /* 0x47 */ u8 pikari_moyaR0_A; + /* 0x48 */ u8 pikari_moyaR1_R; + /* 0x49 */ u8 pikari_moyaR1_G; + /* 0x4A */ u8 pikari_moyaR1_B; + /* 0x4B */ u8 pikari_moyaR1_A; + /* 0x4C */ u8 unk_0x4C; + /* 0x4D */ u8 unk_0x4D; + /* 0x4E */ u8 unk_0x4E; + /* 0x4F */ u8 unk_0x4F; + /* 0x50 */ u8 unk_0x50; + /* 0x51 */ u8 unk_0x51; + /* 0x52 */ u8 unk_0x52; + /* 0x53 */ u8 unk_0x53; + /* 0x54 */ u8 debug_ON; + /* 0x55 */ u8 max_damage_num; + /* 0x56 */ u8 now_damage_num; + /* 0x57 */ u8 reverse_flag; + }; + + daCoach2D_HIO_c() { + static Param aParam = { + 45.0f, + -15.0f, + 1.0f, + 1.0f, + 7.5f, + -6.5f, + 0.0f, + 0.5f, + 1.0f, + 0.0f, + 0.0f, + 1.0f, + 1.0f, + 1.0f, + 5.0f, + 3.0f, + 8.0f, + 0xFF, 0xFF, 0xFF, 0xB9, + 0x00, 0x9B, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0x57, + 0x00, 0x73, 0x00, 0x00, + false, + 20, + 0, + 1, + }; + + memcpy(¶m, &aParam, sizeof(Param)); + } + + /* 80657738 */ virtual ~daCoach2D_HIO_c() {} + void genMessage(JORMContext*) {} + + /* 0x4 */ Param param; }; #endif /* D_A_COACH_2D_H */ diff --git a/include/d/actor/d_a_e_md.h b/include/d/actor/d_a_e_md.h index e78651edf79..d43a9199eab 100644 --- a/include/d/actor/d_a_e_md.h +++ b/include/d/actor/d_a_e_md.h @@ -1,6 +1,10 @@ #ifndef D_A_E_MD_H #define D_A_E_MD_H + #include "f_op/f_op_actor_mng.h" +#include "d/d_bg_s_acch.h" +#include "d/d_cc_d.h" +#include "d/d_cc_uty.h" /** * @ingroup actors-enemies @@ -11,6 +15,7 @@ * */ class daE_MD_c : public fopEn_enemy_c { +public: /* 80708DF8 */ void initCcCylinder(); /* 80708E70 */ void setCcCylinder(f32); /* 807091F0 */ void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32); @@ -18,16 +23,44 @@ class daE_MD_c : public fopEn_enemy_c { /* 80709378 */ void CheckHit(); /* 8070992C */ void WaitAction(); /* 8070994C */ void HalfBreakAction(); - /* 80709A04 */ void VibAction(); + /* 80709A04 */ bool VibAction(); /* 80709ABC */ void DummyAction(); /* 80709BB4 */ void RealAction(); /* 80709C3C */ void Action(); - /* 80709CFC */ void Execute(); - /* 80709D58 */ void Delete(); + /* 80709CFC */ int Execute(); + /* 80709D58 */ int Delete(); /* 80709DA8 */ void setBaseMtx(); - /* 8070A044 */ void create(); -private: - /* 0x5ac */ u8 field_0x5ac[0xa50 - 0x5ac]; + /* 8070A044 */ int create(); + + inline int CreateHeap(); + inline int Draw(); + + /* 0x5AC */ int mAction; + /* 0x5B0 */ int mType; + /* 0x5B4 */ int mInvulnerabilityTimer; + /* 0x5B8 */ int mAnm; + /* 0x5BC */ f32 field_0x5bc; + /* 0x5C0 */ u8 field_0x5C0[0x5C8 - 0x5C0]; + /* 0x5C8 */ s16 field_0x5c8; + /* 0x5CA */ s16 field_0x5ca; + /* 0x5CC */ s16 field_0x5cc; + /* 0x5CE */ s16 field_0x5ce; + /* 0x5D0 */ u8 mSwbit; + /* 0x5D4 */ int mBreakTimer; + /* 0x5D8 */ u8 mHalfBreakMode; + /* 0x5D9 */ u8 mCanCreateBu; + /* 0x5DC */ request_of_phase_process_class mPhase; + /* 0x5E4 */ Z2CreatureEnemy mSound; + /* 0x688 */ u32 mShadowId; + /* 0x68C */ mDoExt_McaMorfSO* mpModelMorf; + /* 0x690 */ mDoExt_McaMorfSO* mpYariModelMorf; + /* 0x694 */ J3DModel* mpTbModel; + /* 0x698 */ dBgS_AcchCir mAcchCir; + /* 0x6D8 */ dBgS_ObjAcch mAcch; + /* 0x8B0 */ dCcD_Stts mCcStts; + /* 0x8EC */ dCcD_Cyl mCyl; + /* 0xA28 */ dCcU_AtInfo mAtInfo; + /* 0xA4C */ u8 field_0xa4c[0xA50 - 0xA4C]; }; STATIC_ASSERT(sizeof(daE_MD_c) == 0xa50); diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index 9e70df7b66e..57c1cd5a949 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -4,235 +4,293 @@ */ #include "d/actor/d_a_coach_2D.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void draw__Q211daCoach2D_c6c_listFv(); -extern "C" static void daCoach2D_createHeap__FP10fopAc_ac_c(); -extern "C" void createHeap__11daCoach2D_cFv(); -extern "C" void create__11daCoach2D_cFv(); -extern "C" void destroy__11daCoach2D_cFv(); -extern "C" void draw__11daCoach2D_cFv(); -extern "C" void execute__11daCoach2D_cFv(); -extern "C" void drawMeter__11daCoach2D_cFv(); -extern "C" void initiate__11daCoach2D_cFv(); -extern "C" void update__11daCoach2D_cFv(); -extern "C" void setBrkAnime__11daCoach2D_cFb(); -extern "C" static void daCoach2D_create__FP11daCoach2D_c(); -extern "C" static void daCoach2D_destroy__FP11daCoach2D_c(); -extern "C" static void daCoach2D_execute__FP11daCoach2D_c(); -extern "C" static void daCoach2D_draw__FP11daCoach2D_c(); -extern "C" void draw__12dDlst_base_cFv(); -extern "C" void __dt__15daCoach2D_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void __dt__Q211daCoach2D_c6c_listFv(); -extern "C" void __dt__11daCoach2D_cFv(); -extern "C" void __sinit_d_a_coach_2D_cpp(); -extern "C" extern char const* const d_a_coach_2D__stringBase0; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getResInfo__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void getStatus__12dMsgObject_cFv(); -extern "C" void __ct__15dMsgScrnLight_cFUcUc(); -extern "C" void draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void show__13CPaneMgrAlphaFv(); -extern "C" void hide__13CPaneMgrAlphaFv(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void getBounds__7J2DPaneFv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" void animation__9J2DScreenFv(); -extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_29(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" void __register_global_object(); - -// -// Declarations: -// +#include "d/d_com_inf_game.h" +#include "d/d_meter2_info.h" +#include "d/d_msg_object.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" /* 806569CC-80656A18 0000EC 004C+00 1/0 0/0 0/0 .text draw__Q211daCoach2D_c6c_listFv */ void daCoach2D_c::c_list::draw() { - // NONMATCHING + dComIfGp_getCurrentGrafPort()->setup2D(); + mpCoach2D->drawMeter(); } /* 80656A18-80656A38 000138 0020+00 1/1 0/0 0/0 .text daCoach2D_createHeap__FP10fopAc_ac_c */ -static void daCoach2D_createHeap(fopAc_ac_c* param_0) { - // NONMATCHING +static int daCoach2D_createHeap(fopAc_ac_c* i_this) { + return ((daCoach2D_c*)i_this)->createHeap(); } -/* ############################################################################################## */ -/* 80657954-80657954 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80657954 = "Coach2D"; -SECTION_DEAD static char const* const stringBase_8065795C = "zelda_game_image_fire_icon.blo"; -SECTION_DEAD static char const* const stringBase_8065797B = "zelda_game_image_fire_icon.brk"; -#pragma pop - -/* 8065799C-806579F4 000000 0058+00 1/1 0/0 0/0 .data - * aParam$localstatic3$__ct__15daCoach2D_HIO_cFv */ -SECTION_DATA static u8 data_8065799C[88] = { - 0x42, 0x34, 0x00, 0x00, 0xC1, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, - 0x00, 0x40, 0xF0, 0x00, 0x00, 0xC0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, - 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, - 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xB9, 0x00, 0x9B, 0x00, - 0x00, 0xFF, 0xFF, 0xFF, 0x57, 0x00, 0x73, 0x00, 0x00, 0x00, 0x14, 0x00, 0x01, -}; - /* 806579F4-806579F8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_coach_2D__stringBase0; +static char* l_arcName = "Coach2D"; + +/* 80657A9C-80657AF8 000014 005C+00 5/5 0/0 0/0 .bss l_HOSTIO */ +static daCoach2D_HIO_c l_HOSTIO; /* 80656A38-80656D18 000158 02E0+00 1/1 0/0 0/0 .text createHeap__11daCoach2D_cFv */ -void daCoach2D_c::createHeap() { - // NONMATCHING +int daCoach2D_c::createHeap() { + mpScrn = new J2DScreen(); + if (mpScrn == NULL) { + return 0; + } + + dRes_info_c* resInfo = dComIfG_getObjectResInfo(l_arcName); + JUT_ASSERT(285, resInfo != 0); + + JKRArchive* archive = resInfo->getArchive(); + mpScrn->setPriority("zelda_game_image_fire_icon.blo", 0x20000, archive); + dPaneClass_showNullPane(mpScrn); + + void* res = dComIfG_getObjectRes(l_arcName, "zelda_game_image_fire_icon.brk"); + mpFireIconBrk = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(res); + mpFireIconBrk->searchUpdateMaterialID(mpScrn); + setBrkAnime(true); + + mpPaneAll = new CPaneMgr(mpScrn, 'n_all', 2, NULL); + mpPaneBasha = new CPaneMgr(mpScrn, 'basha_n', 2, NULL); + mpPaneFire = new CPaneMgr(mpScrn, 'fire_n', 2, NULL); + + mpScrn->search('fire_b_n')->move(mpPaneFire->getPosX(), mpPaneFire->getPosY()); + + mpPaneFireB = new CPaneMgr(mpScrn, 'fire_b_n', 2, NULL); + + mMsgLight = new dMsgScrnLight_c(6, 0xFF); + + if (mpPaneAll == NULL || mpPaneBasha == NULL || mpPaneFire == NULL || mpPaneFireB == NULL || mMsgLight == NULL) { + return 0; + } + + mList.set(this); + + if (fopAcM_GetParam(this) & 1) { + show(); + } else { + hide(); + } + + return 1; } /* 80656D18-80656D94 000438 007C+00 1/1 0/0 0/0 .text create__11daCoach2D_cFv */ -void daCoach2D_c::create() { - // NONMATCHING +int daCoach2D_c::create() { + int phase_state = dComIfG_resLoad(this, l_arcName); + if (phase_state == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, daCoach2D_createHeap, 0x5050)) { + return cPhs_ERROR_e; + } + +#ifdef DEBUG + l_HOSTIO.entryHIO("馬車アイコン"); +#endif + } + + return phase_state; } /* 80656D94-80656DE4 0004B4 0050+00 1/1 0/0 0/0 .text destroy__11daCoach2D_cFv */ -void daCoach2D_c::destroy() { - // NONMATCHING +int daCoach2D_c::destroy() { + dComIfG_resDelete(this, l_arcName); +#ifdef DEBUG + l_HOSTIO.removeHIO(); +#endif + + dMeter2Info_offSub2DStatus(0); + return 1; } /* 80656DE4-80656E94 000504 00B0+00 1/1 0/0 0/0 .text draw__11daCoach2D_cFv */ -void daCoach2D_c::draw() { - // NONMATCHING +int daCoach2D_c::draw() { + if (isVisible() && !dComIfGp_isPauseFlag() && !dMsgObject_isTalkNowCheck()) { + dComIfGd_set2DOpa(&mList); + dMeter2Info_onSub2DStatus(0); + } else { + dMeter2Info_offSub2DStatus(0); + } + + return 1; } /* 80656E94-80656ED0 0005B4 003C+00 1/1 0/0 0/0 .text execute__11daCoach2D_cFv */ -void daCoach2D_c::execute() { - // NONMATCHING +int daCoach2D_c::execute() { +#ifdef DEBUG + s32 freeSize = mDoExt_getCurrentHeap()->getTotalFreeSize(); +#endif + + setBrkAnime(false); + mpScrn->animation(); + + JUT_ASSERT(426, freeSize == mDoExt_getCurrentHeap()->getTotalFreeSize()); + return 1; } -/* ############################################################################################## */ -/* 80657924-80657928 000000 0004+00 2/2 0/0 0/0 .rodata @4003 */ -SECTION_RODATA static f32 const lit_4003 = 180.0f; -COMPILER_STRIP_GATE(0x80657924, &lit_4003); - -/* 80657928-8065792C 000004 0004+00 1/2 0/0 0/0 .rodata @4004 */ -SECTION_RODATA static u8 const lit_4004[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80657928, &lit_4004); - -/* 8065792C-80657930 000008 0004+00 0/1 0/0 0/0 .rodata @4005 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4005 = 1.0f; -COMPILER_STRIP_GATE(0x8065792C, &lit_4005); -#pragma pop - -/* 80657A90-80657A9C 000008 000C+00 1/1 0/0 0/0 .bss @3772 */ -static u8 lit_3772[12]; - -/* 80657A9C-80657AF8 000014 005C+00 5/5 0/0 0/0 .bss l_HOSTIO */ -static u8 l_HOSTIO[92]; - /* 80656ED0-8065722C 0005F0 035C+00 1/1 0/0 0/0 .text drawMeter__11daCoach2D_cFv */ void daCoach2D_c::drawMeter() { - // NONMATCHING + update(); + if (l_HOSTIO.param.reverse_flag) { + mpPaneAll->getPanePtr()->rotateY(180.0f); + } else { + mpPaneAll->getPanePtr()->rotateY(0.0f); + } + + for (int i = 0; i < mMaxHitCount; i++) { + mpPaneFire->paneTrans(mIconInfo[i].pos_x, mIconInfo[i].pos_y); + mpPaneFireB->paneTrans(mIconInfo[i].pos_x, mIconInfo[i].pos_y); + + if (i < mHitCount) { + mpPaneBasha->hide(); + mpPaneFire->show(); + mpPaneFireB->hide(); + + if (i == mHitCount - 1) { + mpPaneFire->scale(1.0f, 1.0f); + } else { + mpPaneFire->scale(l_HOSTIO.param.icon_size, l_HOSTIO.param.icon_size); + } + + mpScrn->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort()); + + if (mIconInfo[i].field_0x15 == 0xFF) { + mIconInfo[i].pikari_anm_frame = 0.0f; + mIconInfo[i].field_0x15 = 1; + } + + if (mIconInfo[i].field_0x15 == 1) { + Vec sp2C = mpPaneFire->getGlobalVtxCenter(false, 0); + mIconInfo[i].pikari_pos_x = sp2C.x; + mIconInfo[i].pikari_pos_y = sp2C.y; + } + } else { + mpPaneBasha->hide(); + mpPaneFire->hide(); + mpPaneFireB->show(); + + mpPaneFireB->scale(l_HOSTIO.param.icon_size, l_HOSTIO.param.icon_size); + mpScrn->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort()); + + if (mIconInfo[i].field_0x15 == 0) { + mIconInfo[i].field_0x15 = 0xFF; + } + } + } + + mpPaneBasha->show(); + mpPaneFire->hide(); + mpPaneFireB->hide(); + + mpPaneBasha->paneTrans(l_HOSTIO.param.coach_pos_x, l_HOSTIO.param.coach_pos_y); + mpScrn->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort()); + + for (int i = 0; i < mMaxHitCount; i++) { + if (mIconInfo[i].field_0x15 == 1) { + mMsgLight->draw(&mIconInfo[i].pikari_anm_frame, + mIconInfo[i].pikari_pos_x, mIconInfo[i].pikari_pos_y, + l_HOSTIO.param.pikari_scale, l_HOSTIO.param.pikari_scale, 1.0f, l_HOSTIO.param.pikari_anim_speed, + JUtility::TColor(l_HOSTIO.param.pikari_moyaR1_R, l_HOSTIO.param.pikari_moyaR1_G, l_HOSTIO.param.pikari_moyaR1_B, l_HOSTIO.param.pikari_moyaR1_A), + JUtility::TColor(l_HOSTIO.param.pikari_moyaR0_R, l_HOSTIO.param.pikari_moyaR0_G, l_HOSTIO.param.pikari_moyaR0_B, l_HOSTIO.param.pikari_moyaR0_A)); + + if (0.0f == mIconInfo[i].pikari_anm_frame) { + mIconInfo[i].field_0x15 = 0; + } + } + } } /* 8065722C-80657260 00094C 0034+00 1/1 0/0 0/0 .text initiate__11daCoach2D_cFv */ void daCoach2D_c::initiate() { - // NONMATCHING + for (int i = 0; i < 20; i++) { + mIconInfo[i].field_0x15 = 0xFF; + } + + mMaxHitCount = l_HOSTIO.param.max_damage_num; } -/* ############################################################################################## */ -/* 80657930-80657934 00000C 0004+00 0/1 0/0 0/0 .rodata @4050 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4050 = 4.0f; -COMPILER_STRIP_GATE(0x80657930, &lit_4050); -#pragma pop - -/* 80657934-80657938 000010 0004+00 0/1 0/0 0/0 .rodata @4051 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4051 = 255.0f; -COMPILER_STRIP_GATE(0x80657934, &lit_4051); -#pragma pop - -/* 80657938-8065793C 000014 0004+00 0/1 0/0 0/0 .rodata @4052 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4052 = 70.0f; -COMPILER_STRIP_GATE(0x80657938, &lit_4052); -#pragma pop - -/* 8065793C-80657944 000018 0004+04 0/1 0/0 0/0 .rodata @4053 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4053[1 + 1 /* padding */] = { - 185.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x8065793C, &lit_4053); -#pragma pop - -/* 80657944-8065794C 000020 0008+00 1/2 0/0 0/0 .rodata @4055 */ -SECTION_RODATA static u8 const lit_4055[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80657944, &lit_4055); - -/* 8065794C-80657954 000028 0008+00 1/2 0/0 0/0 .rodata @4056 */ -SECTION_RODATA static u8 const lit_4056[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8065794C, &lit_4056); - /* 80657260-80657490 000980 0230+00 1/1 0/0 0/0 .text update__11daCoach2D_cFv */ void daCoach2D_c::update() { - // NONMATCHING + f32 var_f29 = l_HOSTIO.param.icon_space_x; + f32 icon_pos_x = l_HOSTIO.param.icon_pos_x + ((mMaxHitCount - 1) * var_f29); + f32 var_f28 = l_HOSTIO.param.icon_pos_y; + + for (int i = 0; i < 20; i++) { + mIconInfo[i].pos_x = icon_pos_x; + mIconInfo[i].pos_y = var_f28; + icon_pos_x -= var_f29; + } + + f32 var_f30 = 4.0f * ((J2DPicture*)mpScrn->search('basha_p0'))->getWhite().r; + if (var_f30 > 255.0f) { + var_f30 = 255.0f; + } + + f32 temp_f27 = (70.0f + (185.0f * (var_f30 / 255.0f))) / 255.0f; + mpPaneAll->paneTrans(l_HOSTIO.param.pos_x, l_HOSTIO.param.pos_y); + mpPaneAll->scale(l_HOSTIO.param.size, l_HOSTIO.param.size); + mpPaneAll->setAlphaRate(l_HOSTIO.param.alpha); + mpPaneFire->setAlphaRate(temp_f27 * (l_HOSTIO.param.icon_alpha * l_HOSTIO.param.alpha)); + mpPaneFireB->setAlphaRate(l_HOSTIO.param.icon_alpha * l_HOSTIO.param.alpha); + mpPaneBasha->scale(l_HOSTIO.param.coach_size, l_HOSTIO.param.coach_size); + mpPaneBasha->setAlphaRate(l_HOSTIO.param.coach_alpha * l_HOSTIO.param.alpha); + + if (l_HOSTIO.param.debug_ON) { + mMaxHitCount = l_HOSTIO.param.max_damage_num; + mHitCount = l_HOSTIO.param.now_damage_num; + } } /* 80657490-8065764C 000BB0 01BC+00 2/2 0/0 0/0 .text setBrkAnime__11daCoach2D_cFb */ void daCoach2D_c::setBrkAnime(bool param_0) { - // NONMATCHING + if (mHitCount != 0) { + mBrkSpeed = l_HOSTIO.param.blink_speed_min + ((l_HOSTIO.param.blink_speed_max - l_HOSTIO.param.blink_speed_min) * ((f32)mHitCount / (f32)mMaxHitCount)); + } else { + mBrkSpeed = 0.0f; + } + + if (mBrkSpeed > 0.0f && !param_0) { + mBrkFrame += mBrkSpeed; + if (mBrkFrame >= mpFireIconBrk->getFrameMax()) { + mBrkFrame -= mpFireIconBrk->getFrameMax(); + } + mpScrn->search('basha_f0')->show(); + } else { + mpScrn->search('basha_f0')->hide(); + mBrkFrame = 0.0f; + } + + mpFireIconBrk->setFrame(mBrkFrame); + mpScrn->search('basha_p0')->setAnimation(mpFireIconBrk); +} + +/* 8065764C-806576D4 000D6C 0088+00 1/0 0/0 0/0 .text daCoach2D_create__FP11daCoach2D_c + */ +static int daCoach2D_create(daCoach2D_c* i_this) { + fopAcM_SetupActor(i_this, daCoach2D_c); + return i_this->create(); +} + +/* 806576D4-806576F4 000DF4 0020+00 1/0 0/0 0/0 .text daCoach2D_destroy__FP11daCoach2D_c + */ +static int daCoach2D_destroy(daCoach2D_c* i_this) { + return i_this->destroy(); +} + +/* 806576F4-80657714 000E14 0020+00 1/0 0/0 0/0 .text daCoach2D_execute__FP11daCoach2D_c + */ +static int daCoach2D_execute(daCoach2D_c* i_this) { + return i_this->execute(); +} + +/* 80657714-80657734 000E34 0020+00 1/0 0/0 0/0 .text daCoach2D_draw__FP11daCoach2D_c */ +static int daCoach2D_draw(daCoach2D_c* i_this) { + return i_this->draw(); } -/* ############################################################################################## */ /* 806579F8-80657A18 -00001 0020+00 1/0 0/0 0/0 .data daCoach2D_METHODS */ static actor_method_class daCoach2D_METHODS = { - (process_method_func)daCoach2D_create__FP11daCoach2D_c, - (process_method_func)daCoach2D_destroy__FP11daCoach2D_c, - (process_method_func)daCoach2D_execute__FP11daCoach2D_c, - 0, - (process_method_func)daCoach2D_draw__FP11daCoach2D_c, + (process_method_func)daCoach2D_create, + (process_method_func)daCoach2D_destroy, + (process_method_func)daCoach2D_execute, + NULL, + (process_method_func)daCoach2D_draw, }; /* 80657A18-80657A48 -00001 0030+00 0/0 0/0 1/0 .data g_profile_COACH2D */ @@ -252,102 +310,3 @@ extern actor_process_profile_definition g_profile_COACH2D = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType }; - -/* 80657A48-80657A54 0000AC 000C+00 1/1 0/0 0/0 .data __vt__12dDlst_base_c */ -SECTION_DATA extern void* __vt__12dDlst_base_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__12dDlst_base_cFv, -}; - -/* 80657A54-80657A60 0000B8 000C+00 2/2 0/0 0/0 .data __vt__11daCoach2D_c */ -SECTION_DATA extern void* __vt__11daCoach2D_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11daCoach2D_cFv, -}; - -/* 80657A60-80657A70 0000C4 0010+00 3/3 0/0 0/0 .data __vt__Q211daCoach2D_c6c_list */ -SECTION_DATA extern void* __vt__Q211daCoach2D_c6c_list[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__Q211daCoach2D_c6c_listFv, - (void*)__dt__Q211daCoach2D_c6c_listFv, -}; - -/* 8065764C-806576D4 000D6C 0088+00 1/0 0/0 0/0 .text daCoach2D_create__FP11daCoach2D_c - */ -static void daCoach2D_create(daCoach2D_c* param_0) { - // NONMATCHING -} - -/* 806576D4-806576F4 000DF4 0020+00 1/0 0/0 0/0 .text daCoach2D_destroy__FP11daCoach2D_c - */ -static void daCoach2D_destroy(daCoach2D_c* param_0) { - // NONMATCHING -} - -/* 806576F4-80657714 000E14 0020+00 1/0 0/0 0/0 .text daCoach2D_execute__FP11daCoach2D_c - */ -static void daCoach2D_execute(daCoach2D_c* param_0) { - // NONMATCHING -} - -/* 80657714-80657734 000E34 0020+00 1/0 0/0 0/0 .text daCoach2D_draw__FP11daCoach2D_c */ -static void daCoach2D_draw(daCoach2D_c* param_0) { - // NONMATCHING -} - -/* 80657734-80657738 000E54 0004+00 1/0 0/0 0/0 .text draw__12dDlst_base_cFv */ -// void dDlst_base_c::draw() { -extern "C" void draw__12dDlst_base_cFv() { - /* empty function */ -} - -/* ############################################################################################## */ -/* 80657A70-80657A7C 0000D4 000C+00 2/2 0/0 0/0 .data __vt__15daCoach2D_HIO_c */ -SECTION_DATA extern void* __vt__15daCoach2D_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daCoach2D_HIO_cFv, -}; - -/* 80657A7C-80657A88 0000E0 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; - -/* 80657738-80657794 000E58 005C+00 2/1 0/0 0/0 .text __dt__15daCoach2D_HIO_cFv */ -daCoach2D_HIO_c::~daCoach2D_HIO_c() { - // NONMATCHING -} - -/* 80657794-806577DC 000EB4 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -// mDoHIO_entry_c::~mDoHIO_entry_c() { -extern "C" void __dt__14mDoHIO_entry_cFv() { - // NONMATCHING -} - -/* 806577DC-80657824 000EFC 0048+00 1/0 0/0 0/0 .text __dt__Q211daCoach2D_c6c_listFv */ -daCoach2D_c::c_list::~c_list() { - // NONMATCHING -} - -/* 80657824-8065789C 000F44 0078+00 1/0 0/0 0/0 .text __dt__11daCoach2D_cFv */ -daCoach2D_c::~daCoach2D_c() { - // NONMATCHING -} - -/* 8065789C-80657910 000FBC 0074+00 0/0 1/0 0/0 .text __sinit_d_a_coach_2D_cpp */ -void __sinit_d_a_coach_2D_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8065789C, __sinit_d_a_coach_2D_cpp); -#pragma pop - -/* 80657954-80657954 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index 69bb3c13317..b8b0128ba34 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -4,346 +4,475 @@ */ #include "d/actor/d_a_e_md.h" -#include "d/d_cc_d.h" -#include "dol2asm.h" +#include "d/d_com_inf_game.h" +#include "d/d_s_play.h" +#include "c/c_damagereaction.h" +enum daE_MD_TYPE { + TYPE_DUMMY, + TYPE_REAL, + TYPE_LV9, +}; -// -// Forward References: -// - -extern "C" void initCcCylinder__8daE_MD_cFv(); -extern "C" void setCcCylinder__8daE_MD_cFf(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daE_MD_Create__FP10fopAc_ac_c(); -extern "C" void SetAnm__8daE_MD_cFP16mDoExt_McaMorfSOiiff(); -extern "C" static void daE_MD_Delete__FP8daE_MD_c(); -extern "C" void At_Check__8daE_MD_cFv(); -extern "C" void CheckHit__8daE_MD_cFv(); -extern "C" void WaitAction__8daE_MD_cFv(); -extern "C" void HalfBreakAction__8daE_MD_cFv(); -extern "C" void VibAction__8daE_MD_cFv(); -extern "C" void DummyAction__8daE_MD_cFv(); -extern "C" void RealAction__8daE_MD_cFv(); -extern "C" void Action__8daE_MD_cFv(); -extern "C" void Execute__8daE_MD_cFv(); -extern "C" void Delete__8daE_MD_cFv(); -extern "C" void setBaseMtx__8daE_MD_cFv(); -extern "C" static void daE_MD_Draw__FP8daE_MD_c(); -extern "C" static void daE_MD_Execute__FP8daE_MD_c(); -extern "C" void create__8daE_MD_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" static bool daE_MD_IsDelete__FP8daE_MD_c(); -extern "C" static void func_8070A4D4(); -extern "C" static void func_8070A4DC(); -extern "C" extern char const* const d_a_e_md__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void -__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); -extern "C" void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff(); -extern "C" void play__16mDoExt_McaMorfSOFUlSc(); -extern "C" void entryDL__16mDoExt_McaMorfSOFv(); -extern "C" void modelCalc__16mDoExt_McaMorfSOFv(); -extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void isDungeonItem__12dSv_memBit_cCFi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void addReal__21dDlst_shadowControl_cFUlP8J3DModel(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void getHitSeID__12dCcD_GObjInfFUci(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void at_power_check__FP11dCcU_AtInfo(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void GetAc__8cCcD_ObjFv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __ct__5csXyzFsss(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalcAngleS__FPsssss(); -extern "C" void cLib_chaseAngleS__FPsss(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __ct__15Z2CreatureEnemyFv(); -extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8070A4EC-8070A530 000000 0044+00 3/3 0/0 0/0 .rodata ccCylSrc$3765 */ -const static dCcD_SrcCyl ccCylSrc = { - { - {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x51}, 0x75}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x2, 0x0, 0x0, 0x1}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 60.0f, // mRadius - 350.0f // mHeight - } // mCyl +enum daE_MD_ACTION { + ACTION_WAIT, + ACTION_HALF_BREAK, + ACTION_BREAK, + ACTION_UNK_3, + ACTION_VIB, }; /* 80708DF8-80708E70 000078 0078+00 1/1 0/0 0/0 .text initCcCylinder__8daE_MD_cFv */ void daE_MD_c::initCcCylinder() { - // NONMATCHING -} + const static dCcD_SrcCyl ccCylSrc = { + { + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x51}, 0x75}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x2, 0x0, 0x0, 0x1}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 60.0f, // mRadius + 350.0f // mHeight + } // mCyl + }; -/* ############################################################################################## */ -/* 8070A530-8070A534 000044 0004+00 1/1 0/0 0/0 .rodata @3776 */ -SECTION_RODATA static f32 const lit_3776 = 80.0f; -COMPILER_STRIP_GATE(0x8070A530, &lit_3776); + mCcStts.Init(200, 0xFF, this); + mCyl.Set(ccCylSrc); + mCyl.SetStts(&mCcStts); + mCyl.SetC(current.pos); + mCyl.OnTgShield(); + mCyl.OnTgIronBallRebound(); +} /* 80708E70-80708EE8 0000F0 0078+00 3/3 0/0 0/0 .text setCcCylinder__8daE_MD_cFf */ -void daE_MD_c::setCcCylinder(f32 param_0) { - // NONMATCHING +void daE_MD_c::setCcCylinder(f32 i_height) { + mCyl.SetC(current.pos); + mCyl.SetR(80.0f); + mCyl.SetH(i_height); + dComIfG_Ccsp()->Set(&mCyl); } -/* ############################################################################################## */ -/* 8070A534-8070A538 000048 0004+00 3/4 0/0 0/0 .rodata @3858 */ -SECTION_RODATA static f32 const lit_3858 = 1.0f; -COMPILER_STRIP_GATE(0x8070A534, &lit_3858); +int daE_MD_c::CreateHeap() { + void* modelData; + if (mType != TYPE_LV9) { + modelData = dComIfG_getObjectRes("E_MD", 0xB); + } else if (mType == TYPE_LV9) { + modelData = dComIfG_getObjectRes("E_MD", 9); + } else { + modelData = dComIfG_getObjectRes("E_MD", 9); + } -/* 8070A570-8070A570 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8070A570 = "E_MD"; -#pragma pop + JUT_ASSERT(180, modelData != 0); + + mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { + return 0; + } + + if (mType == TYPE_DUMMY) { + modelData = dComIfG_getObjectRes("E_MD", 0xD); + mpYariModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); + if (mpYariModelMorf == NULL || mpYariModelMorf->getModel() == NULL) { + return 0; + } + } else if (mType == TYPE_LV9) { + modelData = dComIfG_getObjectRes("E_MD", 0xA); + mpYariModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); + if (mpYariModelMorf == NULL || mpYariModelMorf->getModel() == NULL) { + return 0; + } + } else { + mpTbModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("E_MD", 0xC), 0x80000, 0x11000084); + if (mpTbModel == NULL) { + return 0; + } + } + + return 1; +} /* 80708EE8-807091D0 000168 02E8+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -static void useHeapInit(fopAc_ac_c* param_0) { - // NONMATCHING +static int useHeapInit(fopAc_ac_c* i_this) { + daE_MD_c* a_this = (daE_MD_c*)i_this; + return a_this->CreateHeap(); } /* 807091D0-807091F0 000450 0020+00 1/0 0/0 0/0 .text daE_MD_Create__FP10fopAc_ac_c */ -static void daE_MD_Create(fopAc_ac_c* param_0) { - // NONMATCHING +static int daE_MD_Create(fopAc_ac_c* i_this) { + daE_MD_c* a_this = (daE_MD_c*)i_this; + fpc_ProcID id = fopAcM_GetID(a_this); + return a_this->create(); } -/* ############################################################################################## */ -/* 8070A538-8070A53C 00004C 0004+00 1/3 0/0 0/0 .rodata @3870 */ -SECTION_RODATA static u8 const lit_3870[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8070A538, &lit_3870); - -/* 8070A53C-8070A540 000050 0004+00 2/2 0/0 0/0 .rodata @3871 */ -SECTION_RODATA static f32 const lit_3871 = -1.0f; -COMPILER_STRIP_GATE(0x8070A53C, &lit_3871); - /* 807091F0-807092A4 000470 00B4+00 1/1 0/0 0/0 .text SetAnm__8daE_MD_cFP16mDoExt_McaMorfSOiiff */ -void daE_MD_c::SetAnm(mDoExt_McaMorfSO* param_0, int param_1, int param_2, f32 param_3, - f32 param_4) { - // NONMATCHING +void daE_MD_c::SetAnm(mDoExt_McaMorfSO* i_modelMorf, int i_anm, int i_mode, f32 i_morf, + f32 i_speed) { + i_modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_MD", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f); + mAnm = i_anm; } /* 807092A4-807092C8 000524 0024+00 1/0 0/0 0/0 .text daE_MD_Delete__FP8daE_MD_c */ -static void daE_MD_Delete(daE_MD_c* param_0) { - // NONMATCHING +static int daE_MD_Delete(daE_MD_c* i_this) { + fpc_ProcID id = fopAcM_GetID(i_this); + i_this->Delete(); + return 1; } /* 807092C8-80709378 000548 00B0+00 1/1 0/0 0/0 .text At_Check__8daE_MD_cFv */ void daE_MD_c::At_Check() { - // NONMATCHING + mAtInfo.mpCollider = mCyl.GetTgHitObj(); + mAtInfo.mpActor = at_power_check(&mAtInfo); + + if (mAtInfo.mpActor != NULL) { + if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { + mAtInfo.mAttackPower = 0; + } + + u8 at_se = ((dCcD_GObjInf*)mAtInfo.mpCollider)->GetAtSe(); + if (mAtInfo.mpSound != NULL && mAtInfo.field_0x18 != 0) { + mAtInfo.mpSound->startCollisionSE(dCcD_GObjInf::getHitSeID(at_se, 0), mAtInfo.field_0x18); + } + } } /* 80709378-8070992C 0005F8 05B4+00 4/4 0/0 0/0 .text CheckHit__8daE_MD_cFv */ void daE_MD_c::CheckHit() { - // NONMATCHING + if (mInvulnerabilityTimer > 0) { + mCyl.ClrTgHit(); + return; + } + + if (mCyl.ChkTgHit()) { + mInvulnerabilityTimer = 3; + mAtInfo.field_0x18 = 40; + mAtInfo.mpCollider = mCyl.GetTgHitObj(); + At_Check(); + + cCcD_Obj* hit_obj = mCyl.GetTgHitObj(); + fopAc_ac_c* hit_actor = dCc_GetAc(hit_obj->GetAc()); + if ((hit_obj->ChkAtType(AT_TYPE_IRON_BALL) || fopAcM_GetName(hit_actor) == PROC_E_TH_BALL || fopAcM_GetName(hit_actor) == PROC_B_TN) && (mType == TYPE_DUMMY || mType == TYPE_LV9)) { + if (mAction == ACTION_WAIT) { + mCyl.OffTgIronBallRebound(); + mAction = ACTION_HALF_BREAK; + field_0x5c8 = fopAcM_searchPlayerAngleY(this); + + csXyz eff_rot(0, field_0x5c8 + 0x8000, 0); + field_0x5ca = 380.0f + nREG_F(0); + field_0x5cc = 11280.0f + nREG_F(4); + dComIfGp_particle_set(0x8772, ¤t.pos, &tevStr, &eff_rot, NULL); + dComIfGp_particle_set(0x8773, ¤t.pos, &tevStr, &eff_rot, NULL); + dComIfGp_particle_set(0x8774, ¤t.pos, &tevStr, &eff_rot, NULL); + dComIfGp_particle_set(0x8775, ¤t.pos, &tevStr, &eff_rot, NULL); + + mBreakTimer = 10; + Z2GetAudioMgr()->seStart(Z2SE_OBJ_ARMOR_HIT, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + + u32 bu_params = (mSwbit << 0x18) | 0xFF0000 | 0x2FFF; + if (mCanCreateBu && mType == TYPE_DUMMY) { + fopAcM_create(PROC_E_BU, bu_params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); + } + } else if (mAction == ACTION_HALF_BREAK) { + mCyl.OffTgSetBit(); + mAction = ACTION_BREAK; + field_0x5c8 = fopAcM_searchPlayerAngleY(this); + + csXyz eff_rot(0, field_0x5c8 + 0x8000, 0); + dComIfGp_particle_set(0x8776, ¤t.pos, &tevStr, &eff_rot, NULL); + dComIfGp_particle_set(0x8777, ¤t.pos, &tevStr, &eff_rot, NULL); + dComIfGp_particle_set(0x8778, ¤t.pos, &tevStr, &eff_rot, NULL); + dComIfGp_particle_set(0x8779, ¤t.pos, &tevStr, &eff_rot, NULL); + Z2GetAudioMgr()->seStart(Z2SE_OBJ_ARMOR_BREAK, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + + //! @bug this switch may be set before E_BU actor creation finishes which causes E_BU to cancel creation + if (mSwbit != 0xFF && !dComIfGs_isSwitch(mSwbit, fopAcM_GetRoomNo(this))) { + dComIfGs_onSwitch(mSwbit, fopAcM_GetRoomNo(this)); + } + + mBreakTimer = 1; + } + } else if (mAction == ACTION_WAIT || mAction == ACTION_VIB) { + mAction = ACTION_VIB; + field_0x5c8 = fopAcM_searchPlayerAngleY(this); + field_0x5ca = 380.0f + nREG_F(0); + field_0x5cc = 11280.0f + nREG_F(4); + + Z2GetAudioMgr()->seStart(Z2SE_OBJ_ARMOR_SWING, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } } /* 8070992C-8070994C 000BAC 0020+00 2/2 0/0 0/0 .text WaitAction__8daE_MD_cFv */ void daE_MD_c::WaitAction() { - // NONMATCHING + CheckHit(); } -/* ############################################################################################## */ -/* 8070A540-8070A544 000054 0004+00 1/1 0/0 0/0 .rodata @4032 */ -SECTION_RODATA static f32 const lit_4032 = 5.0f; -COMPILER_STRIP_GATE(0x8070A540, &lit_4032); - /* 8070994C-80709A04 000BCC 00B8+00 1/1 0/0 0/0 .text HalfBreakAction__8daE_MD_cFv */ void daE_MD_c::HalfBreakAction() { - // NONMATCHING -} + CheckHit(); -/* ############################################################################################## */ -/* 8070A544-8070A54C 000058 0008+00 1/1 0/0 0/0 .rodata @4045 */ -SECTION_RODATA static u8 const lit_4045[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8070A544, &lit_4045); + switch (mHalfBreakMode) { + case 0: + mBreakTimer--; + VibAction(); + + if (mBreakTimer < 0) { + SetAnm(mpModelMorf, 4, 0, 5.0f, 1.0f); + SetAnm(mpYariModelMorf, 6, 0, 5.0f, 1.0f); + mHalfBreakMode = 1; + } + break; + case 1: + mpModelMorf->isStop(); + break; + } +} /* 80709A04-80709ABC 000C84 00B8+00 3/3 0/0 0/0 .text VibAction__8daE_MD_cFv */ -void daE_MD_c::VibAction() { - // NONMATCHING +bool daE_MD_c::VibAction() { + shape_angle.x = field_0x5ca * cM_ssin(field_0x5ce); + cLib_addCalcAngleS(&field_0x5cc, 0x10, 3.0f + nREG_F(3), 0x100, 0); + field_0x5ce += field_0x5cc; + + if (cLib_chaseAngleS(&field_0x5ca, 0, 0x10)) { + return 1; + } + + return 0; } -/* ############################################################################################## */ -/* 8070A54C-8070A550 000060 0004+00 3/3 0/0 0/0 .rodata @4064 */ -SECTION_RODATA static f32 const lit_4064 = 350.0f; -COMPILER_STRIP_GATE(0x8070A54C, &lit_4064); - -/* 8070A550-8070A554 000064 0004+00 1/3 0/0 0/0 .rodata @4065 */ -SECTION_RODATA static f32 const lit_4065 = 100.0f; -COMPILER_STRIP_GATE(0x8070A550, &lit_4065); - /* 80709ABC-80709BB4 000D3C 00F8+00 1/1 0/0 0/0 .text DummyAction__8daE_MD_cFv */ void daE_MD_c::DummyAction() { - // NONMATCHING + switch (mAction) { + case ACTION_WAIT: + WaitAction(); + setCcCylinder(350.0f); + break; + case ACTION_HALF_BREAK: + HalfBreakAction(); + setCcCylinder(100.0f); + break; + case ACTION_BREAK: + mBreakTimer--; + if (mBreakTimer < 0) { + if (mType == TYPE_LV9) { + fopAcM_delete(this); + } else { + fopAcM_delete(this); + } + } + break; + case ACTION_UNK_3: + setCcCylinder(350.0f); + break; + case ACTION_VIB: + CheckHit(); + if (VibAction()) { + mAction = ACTION_WAIT; + } + + setCcCylinder(350.0f); + break; + } } /* 80709BB4-80709C3C 000E34 0088+00 1/1 0/0 0/0 .text RealAction__8daE_MD_cFv */ void daE_MD_c::RealAction() { - // NONMATCHING + switch (mAction) { + case ACTION_WAIT: + WaitAction(); + setCcCylinder(350.0f); + break; + case ACTION_VIB: + CheckHit(); + if (VibAction()) { + mAction = ACTION_WAIT; + } + + setCcCylinder(350.0f); + break; + } } /* 80709C3C-80709CFC 000EBC 00C0+00 1/1 0/0 0/0 .text Action__8daE_MD_cFv */ void daE_MD_c::Action() { - // NONMATCHING + switch (mType) { + case TYPE_DUMMY: + case TYPE_LV9: + DummyAction(); + mpModelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mpYariModelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + break; + case TYPE_REAL: + RealAction(); + mpModelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + setCcCylinder(350.0f); + break; + } } /* 80709CFC-80709D58 000F7C 005C+00 1/1 0/0 0/0 .text Execute__8daE_MD_cFv */ -void daE_MD_c::Execute() { - // NONMATCHING +int daE_MD_c::Execute() { + mInvulnerabilityTimer--; + if (mInvulnerabilityTimer <= 0) { + mInvulnerabilityTimer = 0; + } + + Action(); + setBaseMtx(); + return 1; } /* 80709D58-80709DA8 000FD8 0050+00 1/1 0/0 0/0 .text Delete__8daE_MD_cFv */ -void daE_MD_c::Delete() { - // NONMATCHING +int daE_MD_c::Delete() { + dComIfG_resDelete(&mPhase, "E_MD"); + if (heap != NULL) { + mpModelMorf->stopZelAnime(); + } + + return 1; } /* 80709DA8-80709E6C 001028 00C4+00 1/1 0/0 0/0 .text setBaseMtx__8daE_MD_cFv */ void daE_MD_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(field_0x5c8); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::YrotM(-field_0x5c8); + mpModelMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); + mpModelMorf->modelCalc(); + + if (mType != TYPE_REAL) { + mpYariModelMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); + mpYariModelMorf->modelCalc(); + } else { + mpTbModel->setBaseTRMtx(mDoMtx_stack_c::get()); + } } -/* ############################################################################################## */ -/* 8070A554-8070A558 000068 0004+00 0/2 0/0 0/0 .rodata @4212 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4212 = 1000.0f; -COMPILER_STRIP_GATE(0x8070A554, &lit_4212); -#pragma pop +int daE_MD_c::Draw() { + J3DShape* mesh_shape = mpModelMorf->getModel()->getModelData()->getMaterialNodePointer(1)->getShape(); + if (mesh_shape != NULL) { + if (mAction == ACTION_HALF_BREAK || mAction == ACTION_BREAK) { + mesh_shape->hide(); + } else { + mesh_shape->show(); + } + } + + J3DModel* model = mpModelMorf->getModel(); + g_env_light.settingTevStruct(8, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model, &tevStr); + mpModelMorf->entryDL(); + + J3DModel* yari_model = NULL; + if (mType != TYPE_REAL) { + yari_model = mpYariModelMorf->getModel(); + g_env_light.setLightTevColorType_MAJI(yari_model, &tevStr); + mpYariModelMorf->entryDL(); + } else { + g_env_light.setLightTevColorType_MAJI(mpTbModel, &tevStr); + mDoExt_modelUpdateDL(mpTbModel); + } + + cXyz sp8; + sp8.set(current.pos.x, 100.0f + current.pos.y + yREG_F(0), current.pos.z); + mShadowId = dComIfGd_setShadow(mShadowId, 1, model, &sp8, 1000.0f + BREG_F(19), BREG_F(18), current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + + if (yari_model != NULL) { + dComIfGd_addRealShadow(mShadowId, yari_model); + } else { + dComIfGd_addRealShadow(mShadowId, mpTbModel); + } + + return 1; +} /* 80709E6C-8070A024 0010EC 01B8+00 1/0 0/0 0/0 .text daE_MD_Draw__FP8daE_MD_c */ -static void daE_MD_Draw(daE_MD_c* param_0) { - // NONMATCHING +static int daE_MD_Draw(daE_MD_c* i_this) { + return i_this->Draw(); } /* 8070A024-8070A044 0012A4 0020+00 2/1 0/0 0/0 .text daE_MD_Execute__FP8daE_MD_c */ -static void daE_MD_Execute(daE_MD_c* param_0) { - // NONMATCHING +static int daE_MD_Execute(daE_MD_c* i_this) { + return i_this->Execute(); } -/* ############################################################################################## */ -/* 8070A558-8070A55C 00006C 0004+00 0/1 0/0 0/0 .rodata @4411 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4411 = -1500.0f; -COMPILER_STRIP_GATE(0x8070A558, &lit_4411); -#pragma pop +/* 8070A044-8070A3CC 0012C4 0388+00 1/1 0/0 0/0 .text create__8daE_MD_cFv */ +int daE_MD_c::create() { + fopAcM_SetupActor(this, daE_MD_c); -/* 8070A55C-8070A560 000070 0004+00 0/1 0/0 0/0 .rodata @4412 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4412 = -950.0f; -COMPILER_STRIP_GATE(0x8070A55C, &lit_4412); -#pragma pop + int phase_state = dComIfG_resLoad(&mPhase, "E_MD"); + if (phase_state == cPhs_COMPLEATE_e) { + OS_REPORT("E_MD PARAM %x\n", fopAcM_GetParam(this)); + if (cDmr_SkipInfo != 0 && current.pos.z > -1500.0f) { + return cPhs_ERROR_e; + } -/* 8070A560-8070A564 000074 0004+00 0/1 0/0 0/0 .rodata @4413 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4413 = 560.0f; -COMPILER_STRIP_GATE(0x8070A560, &lit_4413); -#pragma pop + mSwbit = (fopAcM_GetParam(this) & 0xFF00) >> 8; -/* 8070A564-8070A568 000078 0004+00 0/1 0/0 0/0 .rodata @4414 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4414 = 10.0f; -COMPILER_STRIP_GATE(0x8070A564, &lit_4414); -#pragma pop + u8 type = fopAcM_GetParam(this) & 0xFF; + if (type == 1) { + mType = TYPE_DUMMY; + mCanCreateBu = TRUE; + } else if (type == 0) { + mType = TYPE_REAL; + } else if (type == 2) { + mType = TYPE_LV9; + } else { + mType = TYPE_DUMMY; + } -/* 8070A568-8070A56C 00007C 0004+00 0/1 0/0 0/0 .rodata @4415 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4415 = 1500.0f; -COMPILER_STRIP_GATE(0x8070A568, &lit_4415); -#pragma pop + if (mSwbit != 0xFF && dComIfGs_isSwitch(mSwbit, fopAcM_GetRoomNo(this))) { + return cPhs_ERROR_e; + } + if (dComIfGs_isStageMiddleBoss() && (-950.0f == current.pos.z || 560.0f == current.pos.z)) { + return cPhs_ERROR_e; + } + if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x2490)) { + return cPhs_ERROR_e; + } -/* 8070A56C-8070A570 000080 0004+00 0/1 0/0 0/0 .rodata @4416 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4416 = 200.0f; -COMPILER_STRIP_GATE(0x8070A56C, &lit_4416); -#pragma pop + fopAcM_SetMtx(this, mpModelMorf->getModel()->getBaseTRMtx()); + if (mType != TYPE_REAL) { + fopAcM_SetMtx(this, mpYariModelMorf->getModel()->getBaseTRMtx()); + } else { + fopAcM_SetMtx(this, mpTbModel->getBaseTRMtx()); + } + + mAcchCir.SetWall(100.0f, 10.0f); + fopAcM_setCullSizeBox(this, -1500.0f, 0.0f, -1500.0f, 1000.0f, 1500.0f, 1500.0f); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), NULL, NULL); + + cXyz sp1C(current.pos.x, 100.0f + current.pos.y, current.pos.z); + if (fopAcM_gc_c::gndCheck(&sp1C)) { + field_0x5bc = fopAcM_gc_c::getGroundY(); + } + + cXyz sp10(current.pos.x, 200.0f + current.pos.y, current.pos.z); + mSound.init(¤t.pos, &sp10, 3, 1); + mAtInfo.mpSound = &mSound; + + initCcCylinder(); + daE_MD_Execute(this); + } + + return phase_state; +} + +/* 8070A4CC-8070A4D4 00174C 0008+00 1/0 0/0 0/0 .text daE_MD_IsDelete__FP8daE_MD_c */ +static int daE_MD_IsDelete(daE_MD_c* i_this) { + return 1; +} /* 8070A578-8070A598 -00001 0020+00 1/0 0/0 0/0 .data l_daE_MD_Method */ static actor_method_class l_daE_MD_Method = { - (process_method_func)daE_MD_Create__FP10fopAc_ac_c, - (process_method_func)daE_MD_Delete__FP8daE_MD_c, - (process_method_func)daE_MD_Execute__FP8daE_MD_c, - (process_method_func)daE_MD_IsDelete__FP8daE_MD_c, - (process_method_func)daE_MD_Draw__FP8daE_MD_c, + (process_method_func)daE_MD_Create, + (process_method_func)daE_MD_Delete, + (process_method_func)daE_MD_Execute, + (process_method_func)daE_MD_IsDelete, + (process_method_func)daE_MD_Draw, }; /* 8070A598-8070A5C8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_MD */ @@ -363,70 +492,3 @@ extern actor_process_profile_definition g_profile_E_MD = { fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 8070A5C8-8070A5D4 000050 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 8070A5D4-8070A5E0 00005C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 8070A5E0-8070A604 000068 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_8070A4DC, - (void*)NULL, - (void*)NULL, - (void*)func_8070A4D4, -}; - -/* 8070A044-8070A3CC 0012C4 0388+00 1/1 0/0 0/0 .text create__8daE_MD_cFv */ -void daE_MD_c::create() { - // NONMATCHING -} - -/* 8070A3CC-8070A414 00164C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} - -/* 8070A414-8070A45C 001694 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} - -/* 8070A45C-8070A4CC 0016DC 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -// dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" void __dt__12dBgS_ObjAcchFv() { - // NONMATCHING -} - -/* 8070A4CC-8070A4D4 00174C 0008+00 1/0 0/0 0/0 .text daE_MD_IsDelete__FP8daE_MD_c */ -static bool daE_MD_IsDelete(daE_MD_c* param_0) { - return true; -} - -/* 8070A4D4-8070A4DC 001754 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -static void func_8070A4D4() { - // NONMATCHING -} - -/* 8070A4DC-8070A4E4 00175C 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -static void func_8070A4DC() { - // NONMATCHING -} - -/* 8070A570-8070A570 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */