diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-10-08 08:35:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-08 18:35:58 +0300 |
| commit | 3077f6a9716c2be2475a31828c0212d9bd7777db (patch) | |
| tree | f8293311bc947140af4e3d3220a5903b45080e34 /src/d | |
| parent | fc6c0fd88c64a0f67f30547713088c7f93cd1566 (diff) | |
knBullet / lv6Lblock done, lv6ChangeGate equivalent (#2729)
* knBullet / lv6Lblock done, lv6ChangeGate equivalent
* d_a_e_mm matching
* debug fix
* obj_kage matching
Diffstat (limited to 'src/d')
| -rw-r--r-- | src/d/actor/d_a_e_mm.cpp | 1699 | ||||
| -rw-r--r-- | src/d/actor/d_a_obj_kage.cpp | 278 | ||||
| -rw-r--r-- | src/d/actor/d_a_obj_knBullet.cpp | 398 | ||||
| -rw-r--r-- | src/d/actor/d_a_obj_lv6ChangeGate.cpp | 754 | ||||
| -rw-r--r-- | src/d/actor/d_a_obj_lv6Lblock.cpp | 427 |
5 files changed, 1748 insertions, 1808 deletions
diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index 92bf65baa9..41192eb68b 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -6,697 +6,1180 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_mm.h" -#include "d/d_cc_d.h" -#include "dol2asm.h" -#include "f_op/f_op_actor_enemy.h" - - -// -// Forward References: -// - -extern "C" void __ct__12daE_MM_HIO_cFv(); -extern "C" static void anm_init__FP10e_mm_classifUcf(); -extern "C" static void daE_MM_Draw__FP10e_mm_class(); -extern "C" static void pl_check__FP10e_mm_classfs(); -extern "C" static void damage_checkMetOn__FP10e_mm_class(); -extern "C" static void damage_check__FP10e_mm_class(); -extern "C" static void wall_check__FP10e_mm_classf(); -extern "C" static void mGround_WaterEffSet__FP10e_mm_class(); -extern "C" static void mWaterEffSet__FP10e_mm_classb(); -extern "C" static void way_gake_check__FP10e_mm_class(); -extern "C" static void e_mm_normal__FP10e_mm_class(); -extern "C" static void e_mm_dash__FP10e_mm_class(); -extern "C" static void e_mm_defence__FP10e_mm_class(); -extern "C" static void e_mm_magne_wait__FP10e_mm_class(); -extern "C" static void e_mm_turn__FP10e_mm_class(); -extern "C" static void e_mm_damage__FP10e_mm_class(); -extern "C" static void action__FP10e_mm_class(); -extern "C" static void daE_MM_Execute__FP10e_mm_class(); -extern "C" static bool daE_MM_IsDelete__FP10e_mm_class(); -extern "C" static void daE_MM_Delete__FP10e_mm_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daE_MM_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__12daE_MM_HIO_cFv(); -extern "C" void __sinit_d_a_e_mm_cpp(); -extern "C" static void func_80722804(); -extern "C" static void func_8072280C(); -extern "C" extern char const* const d_a_e_mm__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -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 __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_SearchByID__FUiPP10fopAc_ac_c(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_createDisappear__FPC10fopAc_ac_cPC4cXyzUcUcUc(); -extern "C" void fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_wayBgCheck__FPC10fopAc_ac_cff(); -extern "C" void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(); -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 onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); -extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); -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 CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_GndChkFv(); -extern "C" void __ct__11dBgS_LinChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void GetAtHitObj__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void cc_at_check__FP10fopAc_ac_cP11dCcU_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 dKy_darkworld_check__Fv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void atan2sX_Z__4cXyzCFv(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void cLib_addCalc0__FPfff(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void MtxPosition__FP4cXyzP4cXyz(); -extern "C" void func_802807E0(); -extern "C" void __ct__15Z2CreatureEnemyFv(); -extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc(); -extern "C" void setLinkSearch__15Z2CreatureEnemyFb(); -extern "C" void setEnemyName__15Z2CreatureEnemyFPCc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_19(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_19(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[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" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80722C68-80722C6C 00002C 0004+00 0/1 0/0 0/0 .rodata @3810 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3810 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(0x80722C68, &lit_3810); -#pragma pop - -/* 80722C6C-80722C70 000030 0004+00 1/2 0/0 0/0 .rodata @3811 */ -SECTION_RODATA static f32 const lit_3811 = 2.0f; -COMPILER_STRIP_GATE(0x80722C6C, &lit_3811); - -/* 80722C70-80722C74 000034 0004+00 0/1 0/0 0/0 .rodata @3812 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3812 = 15.0f; -COMPILER_STRIP_GATE(0x80722C70, &lit_3812); -#pragma pop - -/* 80722C74-80722C78 000038 0004+00 0/1 0/0 0/0 .rodata @3813 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3813 = 1000.0f; -COMPILER_STRIP_GATE(0x80722C74, &lit_3813); -#pragma pop - -/* 80722C78-80722C7C 00003C 0004+00 0/1 0/0 0/0 .rodata @3814 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3814 = 2.5f; -COMPILER_STRIP_GATE(0x80722C78, &lit_3814); -#pragma pop - -/* 80722C7C-80722C80 000040 0004+00 0/2 0/0 0/0 .rodata @3815 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3815 = 8.0f; -COMPILER_STRIP_GATE(0x80722C7C, &lit_3815); -#pragma pop - -/* 80722C80-80722C84 000044 0004+00 0/6 0/0 0/0 .rodata @3816 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3816 = 10.0f; -COMPILER_STRIP_GATE(0x80722C80, &lit_3816); -#pragma pop - -/* 80722D2C-80722D34 000038 0008+00 1/1 0/0 0/0 .data mDropEff$4000 */ -SECTION_DATA static u8 mDropEff[8] = { - 0x01, 0xB8, 0x01, 0xB9, 0x01, 0xBA, 0x01, 0xBB, -}; +#include "d/d_s_play.h" -/* 80722D34-80722D40 000040 000C+00 1/1 0/0 0/0 .data mDushEff$4038 */ -SECTION_DATA static u8 mDushEff[12] = { - 0x87, 0x7A, 0x87, 0x7B, 0x87, 0x7C, 0x01, 0xAF, 0x01, 0xB0, 0x01, 0xB1, -}; - -/* 80722D40-80722D6C -00001 002C+00 1/1 0/0 0/0 .data @4621 */ -SECTION_DATA static void* lit_4621[11] = { - (void*)(((char*)action__FP10e_mm_class) + 0x94), - (void*)(((char*)action__FP10e_mm_class) + 0xA0), - (void*)(((char*)action__FP10e_mm_class) + 0xB0), - (void*)(((char*)action__FP10e_mm_class) + 0xBC), - (void*)(((char*)action__FP10e_mm_class) + 0xC8), - (void*)(((char*)action__FP10e_mm_class) + 0xDC), - (void*)(((char*)action__FP10e_mm_class) + 0xDC), - (void*)(((char*)action__FP10e_mm_class) + 0xDC), - (void*)(((char*)action__FP10e_mm_class) + 0xDC), - (void*)(((char*)action__FP10e_mm_class) + 0xDC), - (void*)(((char*)action__FP10e_mm_class) + 0xD4), -}; - -/* 80722D6C-80722DAC 000078 0040+00 1/1 0/0 0/0 .data cc_sph_src$4753 */ -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj - {dCcD_SE_SOFT_BODY, 0x0, 0x1, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x406}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - -/* 80722DAC-80722DEC 0000B8 0040+00 1/1 0/0 0/0 .data cc_wind_sph_src$4754 */ -static dCcD_SrcSph cc_wind_sph_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x200, 0x11}, 0x0}}, // mObj - {dCcD_SE_SOFT_BODY, 0x0, 0x1, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x4}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - -/* 80722DEC-80722E0C -00001 0020+00 1/0 0/0 0/0 .data l_daE_MM_Method */ -static actor_method_class l_daE_MM_Method = { - (process_method_func)daE_MM_Create__FP10fopAc_ac_c, - (process_method_func)daE_MM_Delete__FP10e_mm_class, - (process_method_func)daE_MM_Execute__FP10e_mm_class, - (process_method_func)daE_MM_IsDelete__FP10e_mm_class, - (process_method_func)daE_MM_Draw__FP10e_mm_class, -}; - -/* 80722E0C-80722E3C -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_MM */ -extern actor_process_profile_definition g_profile_E_MM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 167, // mPriority - &l_daE_MM_Method, // sub_method - 0x00040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType -}; - -/* 80722E3C-80722E48 000148 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80722E48-80722E54 000154 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80722E54-80722E60 000160 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80722E60-80722E6C 00016C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; +#include "f_op/f_op_actor_enemy.h" -/* 80722E6C-80722E78 000178 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, -}; +enum daE_MM_ACTION { + ACTION_NORMAL, + ACTION_DASH, + ACTION_DEFENCE, + ACTION_MAGNE_WAIT, + ACTION_TURN, -/* 80722E78-80722E9C 000184 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_8072280C, - (void*)NULL, - (void*)NULL, - (void*)func_80722804, + ACTION_DAMAGE = 10, }; -/* 80722E9C-80722EA8 0001A8 000C+00 2/2 0/0 0/0 .data __vt__12daE_MM_HIO_c */ -SECTION_DATA extern void* __vt__12daE_MM_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12daE_MM_HIO_cFv, +class daE_MM_HIO_c : public JORReflexible { +public: + /* 8071F9CC */ daE_MM_HIO_c(); + /* 80722780 */ virtual ~daE_MM_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 id; + /* 0x08 */ f32 base_size; + /* 0x0C */ f32 move_speed; + /* 0x10 */ f32 charge_speed; + /* 0x14 */ f32 pl_search_range; + /* 0x18 */ s16 reflect_chance_time; + /* 0x1C */ f32 donketsu_base_size; + /* 0x20 */ f32 donketsu_move_speed; + /* 0x24 */ f32 donketsu_charge_speed; + /* 0x28 */ f32 donketsu_pl_search_range; + /* 0x2C */ f32 donketsu_reflect_speed; + /* 0x30 */ s16 donketsu_reflect_chance_time; + /* 0x32 */ s16 donketsu_angle; }; /* 8071F9CC-8071FA44 0000EC 0078+00 1/1 0/0 0/0 .text __ct__12daE_MM_HIO_cFv */ daE_MM_HIO_c::daE_MM_HIO_c() { - // NONMATCHING + id = -1; + base_size = 1.4f; + move_speed = 2.0f; + charge_speed = 15.0f; + pl_search_range = 1000.0f; + reflect_chance_time = 50; + donketsu_base_size = 2.5f; + donketsu_move_speed = 2.0f; + donketsu_charge_speed = 8.0f; + donketsu_pl_search_range = 1000.0f; + donketsu_reflect_speed = 10.0f; + donketsu_reflect_chance_time = 75; + donketsu_angle = 300; } -/* ############################################################################################## */ -/* 80722C84-80722C88 000048 0004+00 1/4 0/0 0/0 .rodata @3830 */ -SECTION_RODATA static f32 const lit_3830 = -1.0f; -COMPILER_STRIP_GATE(0x80722C84, &lit_3830); - -/* 80722CE8-80722CE8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80722CE8 = "E_MM"; -#pragma pop - /* 8071FA44-8071FAF0 000164 00AC+00 8/8 0/0 0/0 .text anm_init__FP10e_mm_classifUcf */ -static void anm_init(e_mm_class* param_0, int param_1, f32 param_2, u8 param_3, f32 param_4) { - // NONMATCHING +static void anm_init(e_mm_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) { + i_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_MM", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f); + i_this->anm = i_anm; } -/* ############################################################################################## */ -/* 80722C88-80722C8C 00004C 0004+00 0/1 0/0 0/0 .rodata @3860 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3860 = 700.0f; -COMPILER_STRIP_GATE(0x80722C88, &lit_3860); -#pragma pop - /* 8071FAF0-8071FBC4 000210 00D4+00 1/0 0/0 0/0 .text daE_MM_Draw__FP10e_mm_class */ -static void daE_MM_Draw(e_mm_class* param_0) { - // NONMATCHING +static int daE_MM_Draw(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + J3DModel* model = i_this->modelMorf->getModel(); + + g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr); + i_this->modelMorf->entryDL(); + + cXyz spC; + spC.set(actor->current.pos.x, 100.0f + actor->current.pos.y, actor->current.pos.z); + i_this->shadowId = dComIfGd_setShadow(i_this->shadowId, 1, model, &spC, 700.0f, 0.0f, actor->current.pos.y, i_this->acch.GetGroundH(), i_this->acch.m_gnd, &actor->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + return 1; } /* 8071FBC4-8071FC24 0002E4 0060+00 1/1 0/0 0/0 .text pl_check__FP10e_mm_classfs */ -static void pl_check(e_mm_class* param_0, f32 param_1, s16 param_2) { - // NONMATCHING -} +static BOOL pl_check(e_mm_class* i_this, f32 i_range, s16) { + fopAc_ac_c* actor = &i_this->enemy; -/* ############################################################################################## */ -/* 80722C8C-80722C90 000050 0004+00 0/7 0/0 0/0 .rodata @3909 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3909 = 3.0f; -COMPILER_STRIP_GATE(0x80722C8C, &lit_3909); -#pragma pop - -/* 80722C90-80722C94 000054 0004+00 0/3 0/0 0/0 .rodata @3910 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3910 = -20.0f; -COMPILER_STRIP_GATE(0x80722C90, &lit_3910); -#pragma pop - -/* 80722C94-80722C98 000058 0004+00 0/2 0/0 0/0 .rodata @3911 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3911 = 25.0f; -COMPILER_STRIP_GATE(0x80722C94, &lit_3911); -#pragma pop + if (i_this->dist_to_pl < i_range && !fopAcM_otherBgCheck(actor, dComIfGp_getPlayer(0)) && !dComIfGp_checkPlayerStatus0(0, 0x100)) { + return 1; + } -/* 80722EB0-80722EB4 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80722EB0[4]; + return 0; +} -/* 80722EB4-80722EC0 00000C 000C+00 1/1 0/0 0/0 .bss @3805 */ -static u8 lit_3805[12]; +/* 80722EB0-80722EB4 000008 0004+00 2/2 0/0 0/0 .bss None */ +static u8 l_HIOInit; /* 80722EC0-80722EF4 000018 0034+00 7/7 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[52]; +static daE_MM_HIO_c l_HIO; /* 8071FC24-8071FE98 000344 0274+00 1/1 0/0 0/0 .text damage_checkMetOn__FP10e_mm_class */ -static void damage_checkMetOn(e_mm_class* param_0) { - // NONMATCHING +static void damage_checkMetOn(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + + if (actor->health <= 0 || i_this->action == ACTION_DAMAGE) { + return; + } + + fopEn_enemy_c* enemy = &i_this->enemy; + setMidnaBindEffect(enemy, &i_this->sound, &actor->current.pos, &actor->scale); + + if ((i_this->field_0xb99 & 4) && i_this->action != ACTION_MAGNE_WAIT) { + i_this->field_0x6a4 = 10; + i_this->field_0x672 = 0; + + anm_init(i_this, 0xB, 3.0f, 0, 1.0f); + + i_this->ccSph.OffTgNoHitMark(); + i_this->action = ACTION_MAGNE_WAIT; + i_this->mode = 0; + + i_this->ccSph.SetTgType(0xD8FBFFFF); + i_this->sound.startCreatureSound(Z2SE_EN_MM_MET_TAKEN, 0, -1); + return; + } + + if (i_this->field_0x6a4 == 0) { + if (i_this->field_0xb99 & 1) { + actor->speedF = -20.0f + BREG_F(14); + if (actor->argument == 1) { + actor->speedF = -1.0f * l_HIO.donketsu_reflect_speed; + } + + i_this->action = ACTION_DASH; + i_this->mode = 5; + i_this->field_0x6a4 = 10; + + anm_init(i_this, 0xD, 10.0f, 2, 1.0f); + i_this->ccSph.SetTgHitMark(CcG_Tg_UNK_MARK_2); + + if (actor->argument == 1) { + i_this->timers[0] = l_HIO.donketsu_reflect_chance_time; + } else { + i_this->timers[0] = l_HIO.reflect_chance_time; + } + + i_this->field_0xb99 &= ~1; + } else if (i_this->field_0xb99 & 2) { + i_this->field_0x6a4 = 10; + i_this->action = ACTION_DEFENCE; + i_this->field_0xb99 &= ~2; + i_this->mode = 0; + } else if (i_this->field_0xb99 & 8) { + i_this->action = ACTION_DAMAGE; + i_this->mode = 3; + i_this->field_0x6a8 = 25.0f; + i_this->field_0x6a4 = 10; + actor->speedF = 0.0f; + } else if (i_this->field_0xb99 & 16) { + i_this->action = ACTION_DAMAGE; + i_this->mode = 0; + i_this->field_0x6a8 = 25.0f; + actor->speedF = 0.0f; + i_this->field_0x6a4 = 10; + i_this->mode = 0; + actor->health = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_DEAD, -1); + } + } } -/* ############################################################################################## */ -/* 80722C98-80722C9C 00005C 0004+00 0/2 0/0 0/0 .rodata @3961 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3961 = 0.5f; -COMPILER_STRIP_GATE(0x80722C98, &lit_3961); -#pragma pop - -/* 80722C9C-80722CA0 000060 0004+00 0/2 0/0 0/0 .rodata @3962 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3962 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80722C9C, &lit_3962); -#pragma pop - /* 8071FE98-807201A0 0005B8 0308+00 1/1 0/0 0/0 .text damage_check__FP10e_mm_class */ -static void damage_check(e_mm_class* param_0) { - // NONMATCHING +static void damage_check(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + fopAc_ac_c* player = dComIfGp_getPlayer(0); + + if (actor->health > 0) { + fopEn_enemy_c* enemy = &i_this->enemy; + setMidnaBindEffect(enemy, &i_this->sound, &actor->current.pos, &actor->scale); + + if (i_this->field_0x6a4 == 0) { + i_this->ccStts.Move(); + + if (i_this->ccSph.ChkAtShieldHit()) { + actor->speedF = -20.0f + BREG_F(14); + if (actor->argument == 1) { + actor->speedF = -1.0f * l_HIO.donketsu_reflect_speed; + } + + i_this->action = ACTION_DASH; + i_this->mode = 5; + anm_init(i_this, 0xD, 10.0f, 2, 1.0f); + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_NO_DAMAGE, -1); + + if (actor->argument == 1) { + i_this->timers[0] = l_HIO.donketsu_reflect_chance_time; + } else { + i_this->timers[0] = l_HIO.reflect_chance_time; + } + + i_this->atInfo.mpCollider = i_this->ccSph.GetAtHitObj(); + cCcD_Obj* sp20 = i_this->atInfo.mpCollider; + i_this->field_0x6a4 = 10; + return; + } + + if (i_this->ccSph.ChkTgHit()) { + i_this->atInfo.mpCollider = i_this->ccSph.GetTgHitObj(); + s16 prev_hp = actor->health; + cc_at_check(actor, &i_this->atInfo); + + i_this->action = ACTION_DAMAGE; + actor->speedF = 0.0f; + i_this->mode = 3; + i_this->field_0x6a4 = 10; + + if (prev_hp == actor->health) { + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_NO_DAMAGE, -1); + } else { + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_DAMAGE, -1); + } + + i_this->field_0x6a8 = 25.0f; + i_this->field_0x6ac = i_this->atInfo.mHitDirection.y; + } + + if (actor->health <= 1) { + fopAcM_OffStatus(actor, 0); + actor->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; + + i_this->ccSph.OffAtSetBit(); + i_this->ccSph.OffTgSetBit(); + + i_this->action = ACTION_DAMAGE; + i_this->mode = 0; + i_this->field_0x6a4 = 1000; + actor->health = 0; + + i_this->ccSph.SetTgHitMark(CcG_Tg_UNK_MARK_3); + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_DEAD, -1); + } + + if (i_this->ccWindSph.ChkTgHit()) { + dCcD_GObjInf* hit_gobj = i_this->ccWindSph.GetTgHitGObj(); + if (hit_gobj->GetAtMtrl() == dCcD_MTRL_WIND) { + cXyz* hit_vec_p = hit_gobj->GetAtVecP(); + *hit_vec_p *= 0.5f + NREG_F(2); + + cLib_addCalc(&i_this->field_0xbf4.x, hit_vec_p->x, 0.1f, 100.0f, 0.0f); + cLib_addCalc(&i_this->field_0xbf4.y, hit_vec_p->y, 0.1f, 100.0f, 0.0f); + cLib_addCalc(&i_this->field_0xbf4.z, hit_vec_p->z, 0.1f, 100.0f, 0.0f); + actor->current.pos += i_this->field_0xbf4; + } + } + } + + } } -/* ############################################################################################## */ -/* 80722CA0-80722CA4 000064 0004+00 1/2 0/0 0/0 .rodata @3995 */ -SECTION_RODATA static f32 const lit_3995 = 40.0f; -COMPILER_STRIP_GATE(0x80722CA0, &lit_3995); - -/* 80722CA4-80722CA8 000068 0004+00 0/1 0/0 0/0 .rodata @3996 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3996 = -50.0f; -COMPILER_STRIP_GATE(0x80722CA4, &lit_3996); -#pragma pop - /* 807201A0-807202F0 0008C0 0150+00 2/2 0/0 0/0 .text wall_check__FP10e_mm_classf */ -static void wall_check(e_mm_class* param_0, f32 param_1) { - // NONMATCHING +static bool wall_check(e_mm_class* i_this, f32 param_1) { + fopAc_ac_c* actor = &i_this->enemy; + dBgS_LinChk linchk; + cXyz sp24; + cXyz start; + cXyz end; + + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + + sp24.x = 0.0f; + sp24.y = 40.0f + BREG_F(8); + sp24.z = -50.0f + BREG_F(9); + MtxPosition(&sp24, &start); + start += actor->current.pos; + i_this->field_0xbc4.set(start); + + sp24.x = 0.0f; + sp24.y = 40.0f + BREG_F(8); + sp24.z = param_1; + MtxPosition(&sp24, &end); + end += actor->current.pos; + i_this->field_0xbd0.set(end); + + linchk.Set(&start, &end, actor); + + if (!dComIfG_Bgsp().LineCross(&linchk)) { + return FALSE; + } + + return TRUE; } /* 807202F0-807203E0 000A10 00F0+00 2/2 0/0 0/0 .text mGround_WaterEffSet__FP10e_mm_class */ -static void mGround_WaterEffSet(e_mm_class* param_0) { - // NONMATCHING +static void mGround_WaterEffSet(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + J3DModel* model = i_this->modelMorf->getModel(); + + for (int i = 0; i < 4; i++) { + static u16 mDropEff[] = { + ID_ZI_J_DOWNWTRA_A, + ID_ZI_J_DOWNWTRA_B, + ID_ZI_J_DOWNWTRA_C, + ID_ZI_J_DOWNWTRA_D, + }; + + i_this->waterEffEmtIds[i] = dComIfGp_particle_set(i_this->waterEffEmtIds[i], mDropEff[i], &actor->current.pos, NULL, NULL); + + JPABaseEmitter* emt = dComIfGp_particle_getEmitter(i_this->waterEffEmtIds[i]); + if (emt != NULL) { + emt->setGlobalRTMatrix(model->getAnmMtx(0)); + } + } } /* 807203E0-80720590 000B00 01B0+00 1/1 0/0 0/0 .text mWaterEffSet__FP10e_mm_classb */ -static void mWaterEffSet(e_mm_class* param_0, bool param_1) { - // NONMATCHING +static void mWaterEffSet(e_mm_class* i_this, bool param_1) { + fopAc_ac_c* actor = &i_this->enemy; + J3DModel* model = i_this->modelMorf->getModel(); + + if (i_this->acch.ChkWaterHit()) { + for (int i = 0; i < 6; i++) { + if (!param_1 || i != 2) { + static u16 mDushEff[] = { + dPa_RM(ID_ZF_S_MMRUNWAVE00), + dPa_RM(ID_ZF_S_MMRUNWAVE01), + dPa_RM(ID_ZF_S_MMRUNWAVE02), + ID_ZI_J_DASHWTRA_A, + ID_ZI_J_DASHWTRA_B, + ID_ZI_J_DASHWTRA_C, + }; + + i_this->field_0xb9c[i] = dComIfGp_particle_set(i_this->field_0xb9c[i], mDushEff[i], &actor->current.pos, NULL, NULL); + + JPABaseEmitter* emt = dComIfGp_particle_getEmitter(i_this->field_0xb9c[i]); + if (emt != NULL) { + emt->setGlobalRTMatrix(model->getAnmMtx(0)); + if (param_1 && i == 1) { + emt->setRate(2.0f); + } + } + } + } + + if (param_1 && i_this->field_0xc01 == 0) { + i_this->field_0xc01 = 1; + + JPABaseEmitter* emt = dComIfGp_particle_set(dPa_RM(ID_ZF_S_MMSTOPWAVE00), &actor->current.pos, NULL, NULL); + if (emt != NULL) { + emt->setGlobalRTMatrix(model->getAnmMtx(0)); + } + } + } } -/* ############################################################################################## */ -/* 80722CA8-80722CAC 00006C 0004+00 0/2 0/0 0/0 .rodata @4141 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4141 = 200.0f; -COMPILER_STRIP_GATE(0x80722CA8, &lit_4141); -#pragma pop - -/* 80722CAC-80722CB0 000070 0004+00 0/1 0/0 0/0 .rodata @4142 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4142 = -G_CM3D_F_INF; -COMPILER_STRIP_GATE(0x80722CAC, &lit_4142); -#pragma pop - /* 80720590-807206FC 000CB0 016C+00 3/3 0/0 0/0 .text way_gake_check__FP10e_mm_class */ -static void way_gake_check(e_mm_class* param_0) { - // NONMATCHING +static bool way_gake_check(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + dBgS_GndChk gndchk; + cXyz sp14; + cXyz sp8; + + if (wall_check(i_this, 200.0f + BREG_F(10)) || i_this->acch.ChkWallHit()) { + return FALSE; + } + + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + sp14.x = 0.0f; + sp14.y = 200.0f + BREG_F(11); + sp14.z = 200.0f + BREG_F(12); + MtxPosition(&sp14, &sp8); + sp8 += actor->current.pos; + + i_this->field_0xbdc.set(sp8); + gndchk.SetPos(&sp8); + + sp8.y = dComIfG_Bgsp().GroundCross(&gndchk); + if (-G_CM3D_F_INF == sp8.y) { + return TRUE; + } + + i_this->field_0xbe8.set(sp8); + if (actor->current.pos.y - sp8.y > 200.0f) { + return TRUE; + } + + return FALSE; } -/* ############################################################################################## */ -/* 80722CB0-80722CB4 000074 0004+00 0/1 0/0 0/0 .rodata @4227 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4227 = 32768.0f; -COMPILER_STRIP_GATE(0x80722CB0, &lit_4227); -#pragma pop - -/* 80722CB4-80722CB8 000078 0004+00 0/1 0/0 0/0 .rodata @4228 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4228 = 10000.0f; -COMPILER_STRIP_GATE(0x80722CB4, &lit_4228); -#pragma pop - -/* 80722CB8-80722CBC 00007C 0004+00 1/3 0/0 0/0 .rodata @4229 */ -SECTION_RODATA static f32 const lit_4229 = 50.0f; -COMPILER_STRIP_GATE(0x80722CB8, &lit_4229); - -/* 80722CBC-80722CC4 000080 0004+04 0/1 0/0 0/0 .rodata @4230 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4230[1 + 1 /* padding */] = { - 600.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80722CBC, &lit_4230); -#pragma pop - -/* 80722CC4-80722CCC 000088 0008+00 0/1 0/0 0/0 .rodata @4232 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4232[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80722CC4, &lit_4232); -#pragma pop - /* 807206FC-80720B50 000E1C 0454+00 1/1 0/0 0/0 .text e_mm_normal__FP10e_mm_class */ -static void e_mm_normal(e_mm_class* param_0) { - // NONMATCHING +static void e_mm_normal(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + cXyz sp38; + cXyz sp2C; + + f32 move_speed = 0.0f; + + if (way_gake_check(i_this)) { + anm_init(i_this, 0xE, 10.0f, 2, 1.0f); + i_this->target_ya = actor->current.angle.y + (s16)(32768.0f + cM_rndFX(10000.0f)); + i_this->mode = 0; + i_this->action = ACTION_TURN; + return; + } + + switch (i_this->mode) { + case 0: + if (actor->argument == 1) { + move_speed = l_HIO.donketsu_move_speed; + } else { + move_speed = l_HIO.move_speed; + } + + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 8, 0x100); + + if ((int)i_this->modelMorf->getFrame() == 15 || (int)i_this->modelMorf->getFrame() == 28) { + u32 sp1C = 1; + if (i_this->field_0x672 == 0) { + sp1C = 2; + } + + if (!i_this->acch.ChkWaterHit()) { + i_this->sound.startCreatureSound(Z2SE_EN_MM_WALK_LND, sp1C, -1); + } else { + i_this->sound.startCreatureSound(Z2SE_EN_MM_WALK_WTR, sp1C, -1); + } + } + + if (i_this->timers[0] == 0 || (i_this->timers[1] == 0 && fopAcM_wayBgCheck(actor, 200.0f, 50.0f))) { + i_this->mode = 1; + i_this->timers[0] = 50.0f + cM_rndF(100.0f); + anm_init(i_this, 8, 10.0f, 2, 1.0f); + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_KYORO, -1); + } + break; + case 1: + if (!i_this->modelMorf->getFrame()) { + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_KYORO, -1); + } + + s16 sp8; + if (i_this->timers[0] == 0) { + s16 var_r27; + if (fopAcM_wayBgCheck(actor, 200.0f, 50.0f)) { + var_r27 = 32768.0f + cM_rndFX(10000.0f); + i_this->timers[1] = TREG_S(5) + 80; + } else { + sp2C.x = actor->home.pos.x + cM_rndFX(600.0f); + sp2C.y = actor->home.pos.y; + sp2C.z = actor->home.pos.z + cM_rndFX(600.0f); + sp38 = sp2C - actor->current.pos; + + var_r27 = sp38.atan2sX_Z() - actor->current.angle.y; + if (var_r27 > 0x3000) { + var_r27 = 0x3000; + } else if (var_r27 < -0x3000) { + var_r27 = -0x3000; + } + } + + i_this->target_ya = actor->current.angle.y + var_r27; + anm_init(i_this, 0xE, 10.0f, 2, 1.0f); + i_this->mode = 0; + i_this->timers[0] = 100.0f + cM_rndF(100.0f); + } else { + sp8 = 0x6000; + } + break; + } + + cLib_addCalc2(&actor->speedF, move_speed, 1.0f, 3.0f); + + f32 pl_search_range; + if (actor->argument == 1) { + pl_search_range = l_HIO.donketsu_pl_search_range; + } else { + pl_search_range = l_HIO.pl_search_range; + } + + if (i_this->field_0x5b4 != 0xFF && i_this->field_0x5b4 != 0) { + pl_search_range = 10.0f * i_this->field_0x5b4; + } + + if (pl_check(i_this, pl_search_range, 0x5000) && fopAcM_searchActorDistanceY(actor, dComIfGp_getPlayer(0)) < 100.0f) { + i_this->action = ACTION_DASH; + i_this->mode = 0; + } } -/* ############################################################################################## */ -/* 80722CCC-80722CD0 000090 0004+00 0/1 0/0 0/0 .rodata @4358 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4358 = 1.5f; -COMPILER_STRIP_GATE(0x80722CCC, &lit_4358); -#pragma pop - -/* 80722CD0-80722CD4 000094 0004+00 0/2 0/0 0/0 .rodata @4359 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4359 = 20.0f; -COMPILER_STRIP_GATE(0x80722CD0, &lit_4359); -#pragma pop - /* 80720B50-807211CC 001270 067C+00 1/1 0/0 0/0 .text e_mm_dash__FP10e_mm_class */ -static void e_mm_dash(e_mm_class* param_0) { - // NONMATCHING +static void e_mm_dash(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + cXyz sp40; + cXyz sp34; + + f32 move_speed = 0.0f; + f32 var_f30 = 3.0f; + s16 spA = 0; + s16 sp8 = 0; + int var_r27 = 1; + + if (i_this->mode != 4 && way_gake_check(i_this)) { + i_this->mode = 4; + anm_init(i_this, 0xA, 3.0f, 0, 1.0f); + mWaterEffSet(i_this, 1); + } + + switch (i_this->mode) { + case 0: + i_this->field_0xc01 = 0; + anm_init(i_this, 7, 3.0f, 0, 1.0f); + i_this->mode = 1; + break; + case 1: + if ((int)i_this->modelMorf->getFrame() == 3) { + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_FIND, -1); + } + + if (i_this->modelMorf->isStop()) { + anm_init(i_this, 0xC, 3.0f, 2, 1.0f); + i_this->mode = 2; + } + break; + case 2: + if (i_this->field_0x672 == 0) { + var_r27 = 2; + } + + if ((int)i_this->modelMorf->getFrame() == 9 || (int)i_this->modelMorf->getFrame() == 19) { + if (!i_this->acch.ChkWaterHit()) { + i_this->sound.startCreatureSound(Z2SE_EN_MM_WALK_LND, var_r27, -1); + } else { + i_this->sound.startCreatureSound(Z2SE_EN_MM_WALK_WTR, var_r27, -1); + } + } + + i_this->target_ya = i_this->angle_to_pl; + spA = 0x300; + sp8 = (i_this->target_ya - actor->current.angle.y); + if (sp8 < 0x200 && sp8 > -0x200) { + anm_init(i_this, 9, 3.0f, 2, 1.0f); + i_this->mode = 3; + i_this->timers[0] = 70; + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_RUSH, -1); + } + break; + case 3: + spA = 0x300; + if (actor->argument == 1) { + move_speed = l_HIO.donketsu_charge_speed; + } else { + move_speed = l_HIO.charge_speed; + } + + i_this->field_0xb98 = 1; + + if ((i_this->timers[0] & 3) == 0) { + fopAcM_effSmokeSet2(&i_this->field_0xc04, &i_this->field_0xc08, &actor->current.pos, &actor->shape_angle, 1.5f * actor->scale.x, &actor->tevStr); + } + + if (i_this->field_0x672 == 0) { + var_r27 = 2; + } + + mWaterEffSet(i_this, 0); + + if ((int)i_this->modelMorf->getFrame() == 5 || (int)i_this->modelMorf->getFrame() == 8) { + if (!i_this->acch.ChkWaterHit()) { + i_this->sound.startCreatureSound(Z2SE_EN_MM_RUN_LND, var_r27, -1); + } else { + i_this->sound.startCreatureSound(Z2SE_EN_MM_RUN_WTR, var_r27, -1); + } + } + + if (wall_check(i_this, 100.0f + BREG_F(13))) { + actor->speedF = -20.0f + BREG_F(14); + if (actor->argument == 1) { + actor->speedF = -1.0f * l_HIO.donketsu_reflect_speed; + } + + i_this->mode = 5; + anm_init(i_this, 0xD, 10.0f, 2, 1.0f); + + if (actor->argument == 1) { + i_this->timers[0] = l_HIO.donketsu_reflect_chance_time; + } else { + i_this->timers[0] = l_HIO.reflect_chance_time; + } + + if (i_this->field_0x672 != 0) { + i_this->sound.startCreatureSound(Z2SE_EN_MM_R2W_MET, 0, -1); + } else { + i_this->sound.startCreatureSound(Z2SE_EN_MM_R2W_NOMET, 0, -1); + } + } + + if (i_this->timers[0] == 0) { + if (!i_this->acch.ChkWaterHit()) { + i_this->sound.startCreatureSound(Z2SE_EN_MM_BRAKE_LND, 0, -1); + } else { + i_this->sound.startCreatureSound(Z2SE_EN_MM_BRAKE_WTR, 0, -1); + } + + i_this->mode = 4; + anm_init(i_this, 0xA, 3.0f, 0, 1.0f); + } + break; + case 4: + move_speed = 0.0f; + var_f30 = 1.0f + TREG_F(13); + + if (actor->speedF < 0.1f) { + i_this->action = ACTION_NORMAL; + i_this->mode = 0; + i_this->timers[0] = 0; + anm_init(i_this, 0xE, 20.0f, 2, 1.0f); + } + + mWaterEffSet(i_this, 1); + + if ((i_this->timers[0] & 3) == 0) { + fopAcM_effSmokeSet2(&i_this->field_0xc04, &i_this->field_0xc08, &actor->current.pos, &actor->shape_angle, 1.5f + XREG_F(3), &actor->tevStr); + } + break; + case 5: + move_speed = 0.0f; + var_f30 = 1.0f + TREG_F(13); + + if (actor->speedF >= 1.0f) { + mWaterEffSet(i_this, 1); + } + + if (actor->speedF < 0.1f && i_this->timers[0] == 0) { + i_this->action = ACTION_NORMAL; + i_this->mode = 0; + } + break; + } + + if (actor->argument == 1) { + spA = l_HIO.donketsu_angle; + } + + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 1, spA); + cLib_addCalc2(&actor->speedF, move_speed, 1.0f, var_f30); } /* 807211CC-807212C8 0018EC 00FC+00 1/1 0/0 0/0 .text e_mm_defence__FP10e_mm_class */ -static void e_mm_defence(e_mm_class* param_0) { - // NONMATCHING +static void e_mm_defence(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + cXyz sp14; + cXyz sp8; + + switch (i_this->mode) { + case 0: + if (actor->argument == 1) { + anm_init(i_this, 5, 3.0f, 2, 0.5f); + } else { + anm_init(i_this, 5, 3.0f, 2, 1.0f); + } + + i_this->mode = 1; + i_this->timers[0] = 30; + break; + case 1: + if (i_this->timers[0] == 0 && !i_this->modelMorf->isStop()) { + i_this->action = ACTION_DASH; + i_this->mode = 0; + } + break; + } + + cLib_addCalc0(&actor->speedF, 1.0f, 3.0f); } /* 807212C8-807213BC 0019E8 00F4+00 1/1 0/0 0/0 .text e_mm_magne_wait__FP10e_mm_class */ -static void e_mm_magne_wait(e_mm_class* param_0) { - // NONMATCHING +static void e_mm_magne_wait(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + cXyz sp18; + cXyz spC; + + switch (i_this->mode) { + case 0: + if ((int)i_this->modelMorf->getFrame() == 16) { + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_SURPRISE, -1); + } + + if (i_this->modelMorf->isStop()) { + i_this->action = ACTION_NORMAL; + i_this->mode = 0; + i_this->timers[0] = 0; + anm_init(i_this, 0xE, 20.0f, 2, 1.0f); + } + } + + cLib_addCalc0(&actor->speedF, 1.0f, 3.0f); } /* 807213BC-80721538 001ADC 017C+00 1/1 0/0 0/0 .text e_mm_turn__FP10e_mm_class */ -static void e_mm_turn(e_mm_class* param_0) { - // NONMATCHING +static void e_mm_turn(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 8, 0x200); + + if ((int)i_this->modelMorf->getFrame() == 9 || (int)i_this->modelMorf->getFrame() == 19) { + u32 var_r27 = 1; + if (i_this->field_0x672 == 0) { + var_r27 = 2; + } + + if (!i_this->acch.ChkWaterHit()) { + i_this->sound.startCreatureSound(Z2SE_EN_MM_WALK_LND, var_r27, -1); + } else { + i_this->sound.startCreatureSound(Z2SE_EN_MM_WALK_WTR, var_r27, -1); + } + } + + if (BREG_S(1) != 0) { + OS_REPORT("abs ( actor->current.angle.sy - i_this->target_ya ) %x\n", abs ( actor->current.angle.y - i_this->target_ya )); + } + + if (abs(actor->current.angle.y - i_this->target_ya) < 0x400) { + if (!way_gake_check(i_this)) { + i_this->mode = 1; + i_this->timers[0] = 50.0f + cM_rndF(100.0f); + anm_init(i_this, 8, 10.0f, 2, 1.0f); + i_this->action = ACTION_NORMAL; + return; + } + + i_this->target_ya += 0x2000; + } + + cLib_addCalc0(&actor->speedF, 1.0f, 3.0f); } /* 80721538-807217F4 001C58 02BC+00 1/1 0/0 0/0 .text e_mm_damage__FP10e_mm_class */ -static void e_mm_damage(e_mm_class* param_0) { - // NONMATCHING +static void e_mm_damage(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + + switch (i_this->mode) { + case 0: + anm_init(i_this, 6, 3.0f, 0, 1.0f); + i_this->mode = 1; + break; + case 1: + if ((int)i_this->modelMorf->getFrame() == 25) { + if (!i_this->acch.ChkWaterHit()) { + i_this->sound.startCreatureSound(Z2SE_CM_BODYFALL_S, 0, -1); + } else { + i_this->sound.startCreatureSound(Z2SE_CM_BODYFALL_ASASE_S, 0, -1); + } + + if (i_this->acch.ChkWaterHit()) { + mGround_WaterEffSet(i_this); + } + } + + if (i_this->modelMorf->isStop()) { + i_this->timers[0] = 18; + i_this->mode = 2; + } + break; + case 2: + if (i_this->timers[0] == 0) { + i_this->field_0x672 = 0; + + fopAc_ac_c* armor_actor; + if (actor->argument == 1 && fopAcM_SearchByID(i_this->armorChildId, &armor_actor) && armor_actor != NULL) { + fopAcM_delete(armor_actor); + } + + if (actor->argument == 1) { + fopAcM_createDisappear(actor, &actor->current.pos, 8.0f * actor->scale.x, 0, 0x25); + } else { + fopAcM_createDisappear(actor, &actor->current.pos, 8.0f * actor->scale.x, 0, 0x14); + } + + if (i_this->bitSw != 0xFF) { + fopAcM_onSwitch(actor, i_this->bitSw); + } + + fopAcM_delete(actor); + } + break; + case 3: + anm_init(i_this, 4, 3.0f, 0, 1.0f); + i_this->mode = 4; + break; + case 4: + if (i_this->modelMorf->isStop()) { + i_this->field_0xb99 ^= 8; + i_this->action = ACTION_DASH; + i_this->mode = 0; + } + break; + } + + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->field_0x6ac, 2, 0x800); } /* 807217F4-80721D44 001F14 0550+00 2/1 0/0 0/0 .text action__FP10e_mm_class */ -static void action(e_mm_class* param_0) { - // NONMATCHING +static void action(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + cXyz sp40; + cXyz sp34; + + i_this->angle_to_pl = fopAcM_searchPlayerAngleY(actor); + i_this->dist_to_pl = fopAcM_searchPlayerDistance(actor); + + if (i_this->field_0x672 != 0) { + damage_checkMetOn(i_this); + } else { + damage_check(i_this); + } + + i_this->field_0xb98 = 0; + BOOL sp30 = FALSE; + + switch (i_this->action) { + case ACTION_NORMAL: + e_mm_normal(i_this); + break; + case ACTION_DASH: + e_mm_dash(i_this); + sp30 = TRUE; + break; + case ACTION_DEFENCE: + e_mm_defence(i_this); + break; + case ACTION_MAGNE_WAIT: + e_mm_magne_wait(i_this); + break; + case ACTION_TURN: + e_mm_turn(i_this); + break; + case ACTION_DAMAGE: + e_mm_damage(i_this); + break; + } + + i_this->sound.setLinkSearch(sp30); + + cXyz* cc_move_p = i_this->ccStts.GetCCMoveP(); + if (cc_move_p != NULL) { + actor->current.pos.x += cc_move_p->x; + actor->current.pos.y += cc_move_p->y; + actor->current.pos.z += cc_move_p->z; + } + + cMtx_YrotS(*calc_mtx, actor->current.angle.y); + + sp40.x = 0.0f; + sp40.y = 0.0f; + sp40.z = actor->speedF * actor->scale.x; + MtxPosition(&sp40, &sp34); + actor->speed.x = sp34.x; + actor->speed.z = sp34.z; + actor->speed.y -= 3.0f; + actor->current.pos += actor->speed; + + if (i_this->field_0x6a8 > 0.1f) { + sp40.x = 0.0f; + sp40.y = 0.0f; + sp40.z = -i_this->field_0x6a8; + cMtx_YrotS(*calc_mtx, i_this->field_0x6ac); + MtxPosition(&sp40, &sp34); + actor->current.pos += sp34; + + cLib_addCalc0(&i_this->field_0x6a8, 1.0f, 3.0f + TREG_F(12)); + } + + cLib_addCalcAngleS2(&actor->shape_angle.y, actor->current.angle.y, 4, 0x1000); + actor->shape_angle.x = actor->current.angle.x; + i_this->acchcir.SetWall(50.0f, 80.0f); + actor->current.pos += i_this->field_0x674; + i_this->acch.CrrPos(dComIfG_Bgsp()); + + if (actor->health > 1) { + if (-G_CM3D_F_INF == i_this->acch.GetGroundH()) { + if (actor->current.pos.y < actor->home.pos.y - 3000.0f) { + i_this->sound.startCreatureSound(Z2SE_EN_MM_FALL_LND, 0, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_DEAD, -1); + + i_this->field_0x6a8 = 0.0f; + actor->speedF = 0.0f; + actor->health = 0; + + fopAc_ac_c* armor_actor; + if (i_this->field_0x672 != 0 && fopAcM_SearchByID(i_this->armorChildId, &armor_actor) && armor_actor != NULL) { + fopAcM_delete(armor_actor); + } + + fopAcM_createDisappear(actor, &actor->current.pos, 8.0f * actor->scale.x, 0, 0xFF); + + if (i_this->bitSw != 0xFF) { + fopAcM_onSwitch(actor, i_this->bitSw); + } + + fopAcM_delete(actor); + } + } else if (i_this->acch.ChkWaterHit() && i_this->acch.m_wtr.GetHeight() - 50.0f > actor->current.pos.y) { + i_this->action = 10; + i_this->mode = 0; + i_this->sound.startCreatureSound(Z2SE_EN_MM_FALL_WTR, 0, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_DEAD, -1); + mGround_WaterEffSet(i_this); + i_this->field_0x6a8 = 0.0f; + actor->speedF = 0.0f; + actor->health = 0; + return; + } + + if (i_this->acch.ChkGroundHit()) { + if (i_this->field_0x698 - 500.0f > actor->current.pos.y) { + i_this->action = ACTION_DAMAGE; + i_this->mode = 0; + i_this->sound.startCreatureSound(Z2SE_EN_MM_FALL_LND, 0, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_MM_V_DEAD, -1); + i_this->field_0x6a8 = 0.0f; + actor->speedF = 0.0f; + actor->health = 0; + } else if (i_this->field_0x698 - 100.0f > actor->current.pos.y) { + if (!i_this->acch.ChkWaterHit()) { + i_this->sound.startCreatureSound(Z2SE_EN_MM_FALL_LND, 0, -1); + } else { + i_this->sound.startCreatureSound(Z2SE_EN_MM_FALL_WTR, 0, -1); + } + + mGround_WaterEffSet(i_this); + } + + i_this->field_0x698 = actor->current.pos.y; + } + } } -/* ############################################################################################## */ -/* 80722CD4-80722CD8 000098 0004+00 0/0 0/0 0/0 .rodata @4618 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4618 = 80.0f; -COMPILER_STRIP_GATE(0x80722CD4, &lit_4618); -#pragma pop - -/* 80722CD8-80722CDC 00009C 0004+00 0/0 0/0 0/0 .rodata @4619 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4619 = 3000.0f; -COMPILER_STRIP_GATE(0x80722CD8, &lit_4619); -#pragma pop - -/* 80722CDC-80722CE0 0000A0 0004+00 0/0 0/0 0/0 .rodata @4620 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4620 = 500.0f; -COMPILER_STRIP_GATE(0x80722CDC, &lit_4620); -#pragma pop - -/* 80722CE0-80722CE4 0000A4 0004+00 1/1 0/0 0/0 .rodata @4701 */ -SECTION_RODATA static f32 const lit_4701 = 35353.0f; -COMPILER_STRIP_GATE(0x80722CE0, &lit_4701); - /* 80721D44-80722004 002464 02C0+00 2/1 0/0 0/0 .text daE_MM_Execute__FP10e_mm_class */ -static void daE_MM_Execute(e_mm_class* param_0) { - // NONMATCHING +static int daE_MM_Execute(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; + cXyz sp20; + cXyz sp14; + + if (actor->argument == 1) { + actor->scale.set(l_HIO.donketsu_base_size, l_HIO.donketsu_base_size, l_HIO.donketsu_base_size); + fopAc_ac_c* armor_actor; + if (i_this->armorChildId != 0 && fopAcM_SearchByID(i_this->armorChildId, &armor_actor) && armor_actor != NULL) { + armor_actor->scale.set(l_HIO.donketsu_base_size, l_HIO.donketsu_base_size, l_HIO.donketsu_base_size); + } + } + + i_this->lifetime++; + + for (int i = 0; i < 4; i++) { + if (i_this->timers[i] != 0) { + i_this->timers[i]--; + } + } + + if (i_this->field_0x6a4 != 0) { + i_this->field_0x6a4--; + } + + action(i_this); + + mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y, actor->current.pos.z); + mDoMtx_stack_c::YrotM(actor->shape_angle.y); + mDoMtx_stack_c::XrotM(actor->shape_angle.x); + mDoMtx_stack_c::scaleM(actor->scale.x, actor->scale.y, actor->scale.z); + + J3DModel* model = i_this->modelMorf->getModel(); + model->setBaseTRMtx(mDoMtx_stack_c::get()); + + int sp8 = 0; + if (actor->argument == 1) { + sp8 = 3; + } + + i_this->modelMorf->play(sp8, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); + i_this->modelMorf->modelCalc(); + + actor->eyePos = actor->current.pos; + actor->eyePos.y += (40.0f + JREG_F(2)) * actor->scale.x; + actor->attention_info.position = actor->eyePos; + actor->attention_info.position.y += 40.0f * actor->scale.x; + + if (i_this->field_0x672 == 0) { + sp14 = actor->current.pos; + sp14.y += (40.0f + JREG_F(4)) * actor->scale.x; + + if (i_this->field_0x6a4 != 0) { + sp14.x += 35353.0f; + } + + i_this->ccSph.SetC(sp14); + i_this->ccSph.SetR((40.0f + JREG_F(3)) * actor->scale.x); + dComIfG_Ccsp()->Set(&i_this->ccSph); + + i_this->ccWindSph.SetC(sp14); + i_this->ccWindSph.SetR((40.0f + JREG_F(3)) * actor->scale.x); + dComIfG_Ccsp()->Set(&i_this->ccWindSph); + + if (i_this->field_0xb98 != 0) { + i_this->ccSph.OnAtSetBit(); + } else { + i_this->ccSph.OffAtSetBit(); + } + } + + return 1; } /* 80722004-8072200C 002724 0008+00 1/0 0/0 0/0 .text daE_MM_IsDelete__FP10e_mm_class */ -static bool daE_MM_IsDelete(e_mm_class* param_0) { - return true; +static int daE_MM_IsDelete(e_mm_class* i_this) { + return 1; } /* 8072200C-80722080 00272C 0074+00 1/0 0/0 0/0 .text daE_MM_Delete__FP10e_mm_class */ -static void daE_MM_Delete(e_mm_class* param_0) { - // NONMATCHING -} +static int daE_MM_Delete(e_mm_class* i_this) { + fopAc_ac_c* actor = &i_this->enemy; -/* 80722080-8072218C 0027A0 010C+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -static void useHeapInit(fopAc_ac_c* param_0) { - // NONMATCHING -} + fopAcM_GetID(actor); + dComIfG_resDelete(&i_this->phase, "E_MM"); -/* ############################################################################################## */ -/* 80722CE4-80722CE8 0000A8 0004+00 1/1 0/0 0/0 .rodata @4886 */ -SECTION_RODATA static f32 const lit_4886 = 60.0f; -COMPILER_STRIP_GATE(0x80722CE4, &lit_4886); + if (i_this->field_0xc00) { + l_HIOInit = 0; + } -/* 80722CE8-80722CE8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80722CED = "E_mm"; -#pragma pop + if (actor->heap != NULL) { + i_this->sound.deleteObject(); + } -/* 8072218C-8072256C 0028AC 03E0+00 1/0 0/0 0/0 .text daE_MM_Create__FP10fopAc_ac_c */ -static void daE_MM_Create(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 8072256C-807225B4 002C8C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -// cM3dGSph::~cM3dGSph() { -extern "C" void __dt__8cM3dGSphFv() { - // NONMATCHING -} - -/* 807225B4-807225FC 002CD4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} - -/* 807225FC-80722658 002D1C 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -// dCcD_GStts::~dCcD_GStts() { -extern "C" void __dt__10dCcD_GSttsFv() { - // NONMATCHING + return 1; } -/* 80722658-807226C8 002D78 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -// dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" void __dt__12dBgS_ObjAcchFv() { - // NONMATCHING -} +/* 80722080-8072218C 0027A0 010C+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + e_mm_class* a_this = (e_mm_class*)i_this; -/* 807226C8-80722738 002DE8 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -// dBgS_AcchCir::~dBgS_AcchCir() { -extern "C" void __dt__12dBgS_AcchCirFv() { - // NONMATCHING -} + int bmd_index = 0x13; + if (i_this->argument == 1) { + bmd_index = 0x12; + } -/* 80722738-80722780 002E58 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -// cCcD_GStts::~cCcD_GStts() { -extern "C" void __dt__10cCcD_GSttsFv() { - // NONMATCHING -} + a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_MM", bmd_index), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_MM", 0xD), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); + if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) { + return 0; + } -/* 80722780-807227C8 002EA0 0048+00 2/1 0/0 0/0 .text __dt__12daE_MM_HIO_cFv */ -daE_MM_HIO_c::~daE_MM_HIO_c() { - // NONMATCHING + return 1; } -/* 807227C8-80722804 002EE8 003C+00 0/0 1/0 0/0 .text __sinit_d_a_e_mm_cpp */ -void __sinit_d_a_e_mm_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x807227C8, __sinit_d_a_e_mm_cpp); -#pragma pop - -/* 80722804-8072280C 002F24 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -static void func_80722804() { - // NONMATCHING +/* 8072218C-8072256C 0028AC 03E0+00 1/0 0/0 0/0 .text daE_MM_Create__FP10fopAc_ac_c */ +static int daE_MM_Create(fopAc_ac_c* actor) { + fopAcM_SetupActor(actor, e_mm_class); + e_mm_class* i_this = (e_mm_class*)actor; + + int phase_state = dComIfG_resLoad(&i_this->phase, "E_MM"); + if (phase_state == cPhs_COMPLEATE_e) { + OS_REPORT("E_MM PARAM %x\n", fopAcM_GetParam(actor)); + i_this->field_0x5b4 = fopAcM_GetParam(actor); + i_this->bitSw = (fopAcM_GetParam(actor) & 0xFF00) >> 8; + + if (i_this->bitSw != 0xFF && fopAcM_isSwitch(actor, i_this->bitSw)) { + return cPhs_ERROR_e; + } + + OS_REPORT("E_MM・i_this->bitSw %x\n", i_this->bitSw); + OS_REPORT("E_MM//////////////E_MM SET 1 !!\n"); + + u32 heap_size = 0x1AF0; + if (actor->argument == 1) { + heap_size = 0x1BB0; + } + + if (!fopAcM_entrySolidHeap(actor, useHeapInit, heap_size)) { + OS_REPORT("//////////////E_MM SET NON !!\n"); + return cPhs_ERROR_e; + } + + OS_REPORT("//////////////E_MM SET 2 !!\n"); + + if (!l_HIOInit) { + i_this->field_0xc00 = TRUE; + l_HIOInit = TRUE; + l_HIO.id = mDoHIO_CREATE_CHILD("マグネメット", &l_HIO); + } + + actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e; + fopAcM_SetMtx(actor, i_this->modelMorf->getModel()->getBaseTRMtx()); + + i_this->ccStts.Init(100, 0, actor); + + actor->health = 20; + actor->field_0x560 = 20; + + static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj + {dCcD_SE_SOFT_BODY, 0x0, 0x1, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x406}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr + }; + + static dCcD_SrcSph cc_wind_sph_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x200, 0x11}, 0x0}}, // mObj + {dCcD_SE_SOFT_BODY, 0x0, 0x1, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x4}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr + }; + + i_this->ccSph.Set(cc_sph_src); + i_this->ccSph.SetStts(&i_this->ccStts); + i_this->ccWindSph.Set(cc_wind_sph_src); + i_this->ccWindSph.SetStts(&i_this->ccStts); + + i_this->acch.Set(fopAcM_GetPosition_p(actor), fopAcM_GetOldPosition_p(actor), actor, 1, &i_this->acchcir, fopAcM_GetSpeed_p(actor), NULL, NULL); + i_this->acchcir.SetWall(50.0f, 60.0f); + + i_this->field_0x698 = actor->current.pos.y; + i_this->sound.init(&actor->current.pos, &actor->eyePos, 3, 1); + i_this->sound.setEnemyName("E_mm"); + i_this->atInfo.mpSound = &i_this->sound; + i_this->atInfo.mPowerType = 9; + + if (BREG_S(0) != 0) { + actor->argument = 1; + } + + if (actor->argument == 1) { + i_this->ccStts.SetWeight(254); + i_this->ccSph.SetAtAtp(2); + + actor->scale.set(l_HIO.donketsu_base_size, l_HIO.donketsu_base_size, l_HIO.donketsu_base_size); + actor->health = 40; + actor->field_0x560 = 40; + } else { + i_this->ccStts.SetWeight(200); + actor->scale.set(l_HIO.base_size, l_HIO.base_size, l_HIO.base_size); + } + + i_this->armorChildId = fopAcM_createChild(PROC_E_MM_MT, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, &actor->scale, actor->argument, NULL); + i_this->field_0x672 = 1; + + daE_MM_Execute(i_this); + } + + return phase_state; } -/* 8072280C-80722814 002F2C 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -static void func_8072280C() { - // NONMATCHING -} +/* 80722DEC-80722E0C -00001 0020+00 1/0 0/0 0/0 .data l_daE_MM_Method */ +static actor_method_class l_daE_MM_Method = { + (process_method_func)daE_MM_Create, + (process_method_func)daE_MM_Delete, + (process_method_func)daE_MM_Execute, + (process_method_func)daE_MM_IsDelete, + (process_method_func)daE_MM_Draw, +}; -/* 80722CE8-80722CE8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80722E0C-80722E3C -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_MM */ +extern actor_process_profile_definition g_profile_E_MM = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_E_MM, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(e_mm_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 167, // mPriority + &l_daE_MM_Method, // sub_method + 0x00040120, // mStatus + fopAc_ENEMY_e, // mActorType + fopAc_CULLBOX_0_e, // cullType +}; diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp index 5044b87a7f..27c482b7a2 100644 --- a/src/d/actor/d_a_obj_kage.cpp +++ b/src/d/actor/d_a_obj_kage.cpp @@ -6,198 +6,136 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kage.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" static void daObj_Kage_Draw__FP14obj_kage_class(); -extern "C" static void daObj_Kage_Execute__FP14obj_kage_class(); -extern "C" static bool daObj_Kage_IsDelete__FP14obj_kage_class(); -extern "C" static void daObj_Kage_Delete__FP14obj_kage_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daObj_Kage_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_obj_kage__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cM_rndF__Ff(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 sincosTable___5JMath[65536]; - -// -// Declarations: -// +#include "d/actor/d_a_player.h" +#include "d/d_s_play.h" /* 80C314D8-80C3153C 000078 0064+00 1/0 0/0 0/0 .text daObj_Kage_Draw__FP14obj_kage_class */ -static void daObj_Kage_Draw(obj_kage_class* param_0) { - // NONMATCHING -} +static int daObj_Kage_Draw(obj_kage_class* i_this) { + fopAc_ac_c* actor = &i_this->actor; -/* ############################################################################################## */ -/* 80C3195C-80C31960 000000 0004+00 2/2 0/0 0/0 .rodata @3854 */ -SECTION_RODATA static u8 const lit_3854[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C3195C, &lit_3854); - -/* 80C31960-80C31964 000004 0004+00 0/1 0/0 0/0 .rodata @3855 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3855 = 0.5f; -COMPILER_STRIP_GATE(0x80C31960, &lit_3855); -#pragma pop - -/* 80C31964-80C31968 000008 0004+00 0/1 0/0 0/0 .rodata @3856 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3856 = 40.0f; -COMPILER_STRIP_GATE(0x80C31964, &lit_3856); -#pragma pop - -/* 80C31968-80C3196C 00000C 0004+00 0/1 0/0 0/0 .rodata @3857 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3857 = 120.0f; -COMPILER_STRIP_GATE(0x80C31968, &lit_3857); -#pragma pop - -/* 80C3196C-80C31970 000010 0004+00 0/1 0/0 0/0 .rodata @3858 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3858 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C3196C, &lit_3858); -#pragma pop - -/* 80C31970-80C31974 000014 0004+00 0/1 0/0 0/0 .rodata @3859 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3859 = 2.0f; -COMPILER_STRIP_GATE(0x80C31970, &lit_3859); -#pragma pop - -/* 80C31974-80C31978 000018 0004+00 0/1 0/0 0/0 .rodata @3860 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3860 = -120.0f; -COMPILER_STRIP_GATE(0x80C31974, &lit_3860); -#pragma pop - -/* 80C31978-80C3197C 00001C 0004+00 0/2 0/0 0/0 .rodata @3861 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3861 = 200.0f; -COMPILER_STRIP_GATE(0x80C31978, &lit_3861); -#pragma pop - -/* 80C3197C-80C31980 000020 0004+00 0/1 0/0 0/0 .rodata @3862 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3862 = 500.0f; -COMPILER_STRIP_GATE(0x80C3197C, &lit_3862); -#pragma pop - -/* 80C31980-80C31984 000024 0004+00 0/1 0/0 0/0 .rodata @3863 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3863 = 1.0f; -COMPILER_STRIP_GATE(0x80C31980, &lit_3863); -#pragma pop - -/* 80C31984-80C31988 000028 0004+00 0/1 0/0 0/0 .rodata @3864 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3864 = 10.0f; -COMPILER_STRIP_GATE(0x80C31984, &lit_3864); -#pragma pop + g_env_light.settingTevStruct(16, &actor->current.pos, &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->model, &actor->tevStr); + mDoExt_modelUpdateDL(i_this->model); + return 1; +} /* 80C3153C-80C31764 0000DC 0228+00 2/1 0/0 0/0 .text daObj_Kage_Execute__FP14obj_kage_class */ -static void daObj_Kage_Execute(obj_kage_class* param_0) { - // NONMATCHING +static int daObj_Kage_Execute(obj_kage_class* i_this) { + fopAc_ac_c* actor = &i_this->actor; + cXyz sp14; + cXyz sp8; + + i_this->counter++; + + for (int i = 0; i < 2; i++) { + if (i_this->timers[i] != 0) { + i_this->timers[i]--; + } + } + + if (i_this->field_0x59e != 0) { + i_this->field_0x59e--; + } + + f32 var_f31 = 0.0f; + s16 angle_x; + s16 angle_z; + if (i_this->field_0x574 != 1) { + angle_x = i_this->field_0x5a4 * cM_ssin(i_this->counter * 1700); + angle_z = i_this->field_0x5a4 * cM_ssin(i_this->counter * 1500); + cLib_addCalc2(&i_this->field_0x5a4, i_this->field_0x5a8, 0.5f, 40.0f); + cLib_addCalc2(&i_this->field_0x5a8, 120.0f + KREG_F(11), 0.1f, 2.0f); + } else { + var_f31 = -120.0f + XREG_F(16); + if (daPy_getPlayerActorClass()->checkFrontRollCrash() && fopAcM_searchPlayerDistanceXZ(actor) < 200.0f) { + i_this->field_0x5a4 = 500.0f + XREG_F(17); + } + + angle_x = i_this->field_0x5a4 * cM_ssin(i_this->counter * 4700); + angle_z = i_this->field_0x5a4 * cM_ssin(i_this->counter * 4400); + cLib_addCalc2(&i_this->field_0x5a4, 0.0f, 1.0f, 10.0f); + } + + actor->shape_angle.x = angle_x; + actor->shape_angle.z = angle_z; + + mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y + var_f31, actor->current.pos.z); + mDoMtx_stack_c::YrotM(actor->shape_angle.y); + mDoMtx_stack_c::XrotM(actor->shape_angle.x); + mDoMtx_stack_c::ZrotM(actor->shape_angle.z); + mDoMtx_stack_c::transM(0.0f, -var_f31, 0.0f); + i_this->model->setBaseTRMtx(mDoMtx_stack_c::get()); + return 1; } /* 80C31764-80C3176C 000304 0008+00 1/0 0/0 0/0 .text daObj_Kage_IsDelete__FP14obj_kage_class */ -static bool daObj_Kage_IsDelete(obj_kage_class* param_0) { - return true; +static int daObj_Kage_IsDelete(obj_kage_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80C31990-80C31990 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C31990 = "Obj_kage"; -#pragma pop - /* 80C3176C-80C3179C 00030C 0030+00 1/0 0/0 0/0 .text daObj_Kage_Delete__FP14obj_kage_class */ -static void daObj_Kage_Delete(obj_kage_class* param_0) { - // NONMATCHING +static int daObj_Kage_Delete(obj_kage_class* i_this) { + fopAc_ac_c* actor = &i_this->actor; + fpc_ProcID id = fopAcM_GetID(i_this); + dComIfG_resDelete(&i_this->phase, "Obj_kage"); + return 1; } /* 80C3179C-80C31808 00033C 006C+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* actor) { + obj_kage_class* i_this = (obj_kage_class*)actor; + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_kage", 3); + JUT_ASSERT(267, modelData != NULL); -/* ############################################################################################## */ -/* 80C31988-80C3198C 00002C 0004+00 0/1 0/0 0/0 .rodata @3926 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3926 = 65536.0f; -COMPILER_STRIP_GATE(0x80C31988, &lit_3926); -#pragma pop - -/* 80C3198C-80C31990 000030 0004+00 0/1 0/0 0/0 .rodata @3927 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3927 = -200.0f; -COMPILER_STRIP_GATE(0x80C3198C, &lit_3927); -#pragma pop + i_this->model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (i_this->model == NULL) { + return 0; + } + + return 1; +} /* 80C31808-80C31954 0003A8 014C+00 1/0 0/0 0/0 .text daObj_Kage_Create__FP10fopAc_ac_c */ -static void daObj_Kage_Create(fopAc_ac_c* param_0) { - // NONMATCHING +static int daObj_Kage_Create(fopAc_ac_c* actor) { + fopAcM_SetupActor(actor, obj_kage_class); + obj_kage_class* i_this = (obj_kage_class*)actor; + + int phase_state = dComIfG_resLoad(&i_this->phase, "Obj_kage"); + if (phase_state == cPhs_COMPLEATE_e) { + OS_REPORT("OBJ_KAGE PARAM %x\n", fopAcM_GetParam(actor)); + i_this->field_0x574 = fopAcM_GetParam(actor); + + OS_REPORT("OBJ_KAGE//////////////OBJ_KAGE SET 1 !!\n"); + if (!fopAcM_entrySolidHeap(actor, useHeapInit, 0xEC0)) { + OS_REPORT("//////////////OBJ_KAGE SET NON !!\n"); + return cPhs_ERROR_e; + } + + OS_REPORT("//////////////OBJ_KAGE SET 2 !!\n"); + i_this->counter = cM_rndF(65536.0f); + + fopAcM_SetMtx(actor, i_this->model->getBaseTRMtx()); + fopAcM_SetMin(actor, -200.0f, -200.0f, -200.0f); + fopAcM_SetMax(actor, 200.0f, 200.0f, 200.0f); + + i_this->inko_child_id = fopAcM_createChild(PROC_NPC_INKO, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); + + daObj_Kage_Execute(i_this); + } + + return phase_state; } -/* ############################################################################################## */ /* 80C3199C-80C319BC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Kage_Method */ static actor_method_class l_daObj_Kage_Method = { - (process_method_func)daObj_Kage_Create__FP10fopAc_ac_c, - (process_method_func)daObj_Kage_Delete__FP14obj_kage_class, - (process_method_func)daObj_Kage_Execute__FP14obj_kage_class, - (process_method_func)daObj_Kage_IsDelete__FP14obj_kage_class, - (process_method_func)daObj_Kage_Draw__FP14obj_kage_class, + (process_method_func)daObj_Kage_Create, + (process_method_func)daObj_Kage_Delete, + (process_method_func)daObj_Kage_Execute, + (process_method_func)daObj_Kage_IsDelete, + (process_method_func)daObj_Kage_Draw, }; /* 80C319BC-80C319EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_KAGE */ @@ -217,5 +155,3 @@ extern actor_process_profile_definition g_profile_OBJ_KAGE = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C31990-80C31990 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp index 92f2cf145d..e0e8ffbd0d 100644 --- a/src/d/actor/d_a_obj_knBullet.cpp +++ b/src/d/actor/d_a_obj_knBullet.cpp @@ -6,85 +6,14 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_knBullet.h" -#include "d/d_cc_d.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" void Create__15daObjKnBullet_cFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void Execute__15daObjKnBullet_cFv(); -extern "C" bool Draw__15daObjKnBullet_cFv(); -extern "C" bool Delete__15daObjKnBullet_cFv(); -extern "C" void setBaseMtx__15daObjKnBullet_cFv(); -extern "C" void col_init__15daObjKnBullet_cFv(); -extern "C" void col_chk__15daObjKnBullet_cFv(); -extern "C" void hitPrtclSet__15daObjKnBullet_cFv(); -extern "C" static void daObjKnBullet_Execute__FP15daObjKnBullet_c(); -extern "C" static void daObjKnBullet_Draw__FP15daObjKnBullet_c(); -extern "C" static bool daObjKnBullet_IsDelete__FP15daObjKnBullet_c(); -extern "C" static void daObjKnBullet_Delete__FP15daObjKnBullet_c(); -extern "C" static void daObjKnBullet_create__FP10fopAc_ac_c(); -extern "C" void func_80C4792C(void* _this, s16*); - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void XYZrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fpcEx_SearchByID__FUi(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkAtHit__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void normalizeZP__4cXyzFv(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void deleteAllParticle__14JPABaseEmitterFv(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[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" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ +#include "d/actor/d_a_npc_kn.h" + /* 80C47950-80C4795C 000000 000C+00 4/4 0/0 0/0 .rodata l_DATA */ -SECTION_RODATA static u8 const l_DATA[12] = { - 0x41, 0xF0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, +static const daObjKnBullet_Hio_Param_c l_DATA = { + 30.0f, + 20.0f, + 150 }; -COMPILER_STRIP_GATE(0x80C47950, &l_DATA); /* 80C4795C-80C4799C 00000C 0040+00 1/1 0/0 0/0 .rodata l_sph_src */ const static dCcD_SrcSph l_sph_src = { @@ -99,211 +28,212 @@ const static dCcD_SrcSph l_sph_src = { } // mSphAttr }; -/* 80C4799C-80C479A0 00004C 0004+00 0/1 0/0 0/0 .rodata @3907 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3907 = -300.0f; -COMPILER_STRIP_GATE(0x80C4799C, &lit_3907); -#pragma pop - -/* 80C479A0-80C479A4 000050 0004+00 0/1 0/0 0/0 .rodata @3908 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3908 = -50.0f; -COMPILER_STRIP_GATE(0x80C479A0, &lit_3908); -#pragma pop - -/* 80C479A4-80C479A8 000054 0004+00 0/1 0/0 0/0 .rodata @3909 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3909 = 300.0f; -COMPILER_STRIP_GATE(0x80C479A4, &lit_3909); -#pragma pop - -/* 80C479A8-80C479AC 000058 0004+00 0/1 0/0 0/0 .rodata @3910 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3910 = 450.0f; -COMPILER_STRIP_GATE(0x80C479A8, &lit_3910); -#pragma pop - -/* 80C479CC-80C479EC -00001 0020+00 1/0 0/0 0/0 .data l_daObjKnBullet_Method */ -static actor_method_class l_daObjKnBullet_Method = { - (process_method_func)daObjKnBullet_create__FP10fopAc_ac_c, - (process_method_func)daObjKnBullet_Delete__FP15daObjKnBullet_c, - (process_method_func)daObjKnBullet_Execute__FP15daObjKnBullet_c, - (process_method_func)daObjKnBullet_IsDelete__FP15daObjKnBullet_c, - (process_method_func)daObjKnBullet_Draw__FP15daObjKnBullet_c, -}; +/* 80C47118-80C47270 000078 0158+00 1/1 0/0 0/0 .text Create__15daObjKnBullet_cFv */ +int daObjKnBullet_c::Create() { + fopAcM_SetupActor(this, daObjKnBullet_c); -/* 80C479EC-80C47A1C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KN_BULLET */ -extern actor_process_profile_definition g_profile_KN_BULLET = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KN_BULLET, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKnBullet_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 348, // mPriority - &l_daObjKnBullet_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; + setBaseMtx(); + fopAcM_SetMtx(this, mMtx); + mTimer = l_DATA.lifetime + 30; + fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); -/* 80C47A1C-80C47A28 000050 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; + col_init(); + mActionMode = 0; -/* 80C47A28-80C47A34 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, -}; + for (int i = 0; i < 3; i++) { + mEmtIds[i] = -1; + } -/* 80C47118-80C47270 000078 0158+00 1/1 0/0 0/0 .text Create__15daObjKnBullet_cFv */ -void daObjKnBullet_c::Create() { - // NONMATCHING + return cPhs_COMPLEATE_e; } -/* 80C47270-80C472B8 0001D0 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -// cM3dGSph::~cM3dGSph() { -extern "C" void __dt__8cM3dGSphFv() { - // NONMATCHING -} +/* 80C47300-80C47480 000260 0180+00 1/1 0/0 0/0 .text Execute__15daObjKnBullet_cFv */ +int daObjKnBullet_c::Execute() { + if (!col_chk()) { + return 1; + } -/* 80C472B8-80C47300 000218 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} + fopAcM_posMove(this, NULL); + setBaseMtx(); -/* ############################################################################################## */ -/* 80C479AC-80C479B4 00005C 0006+02 0/1 0/0 0/0 .rodata l_prticles_id$3986 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_prticles_id_3986[6 + 2 /* padding */] = { - 0x8B, - 0x7F, - 0x8B, - 0x80, - 0x8B, - 0x81, - /* padding */ - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C479AC, &l_prticles_id_3986); -#pragma pop + if (cLib_calcTimer<s16>(&mTimer) == 0) { + fopAcM_delete(this); + return 1; + } -/* 80C479B4-80C479B8 000064 0004+00 1/2 0/0 0/0 .rodata @4021 */ -SECTION_RODATA static f32 const lit_4021 = 1.0f; -COMPILER_STRIP_GATE(0x80C479B4, &lit_4021); + for (int i = 0; i < 3; i++) { + static const u16 l_prticles_id[] = { + dPa_RM(ID_ZI_S_KN_MAGICBALL_A), + dPa_RM(ID_ZI_S_KN_MAGICBALL_B), + dPa_RM(ID_ZI_S_KN_MAGICBALL_C), + }; -/* 80C479B8-80C479BC 000068 0004+00 0/1 0/0 0/0 .rodata @4022 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4022 = -1.0f; -COMPILER_STRIP_GATE(0x80C479B8, &lit_4022); -#pragma pop + mEmtIds[i] = dComIfGp_particle_set(mEmtIds[i], l_prticles_id[i], ¤t.pos, ¤t.angle, NULL); + JPABaseEmitter* emt = dComIfGp_particle_getEmitter(mEmtIds[i]); + if (emt != NULL) { + emt->setGlobalTranslation(current.pos.x, current.pos.y, current.pos.z); + } + } -/* 80C47300-80C47480 000260 0180+00 1/1 0/0 0/0 .text Execute__15daObjKnBullet_cFv */ -void daObjKnBullet_c::Execute() { - // NONMATCHING + Z2GetAudioMgr()->seStartLevel(Z2SE_KN_BALL_LEVEL, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)), 1.0f, 1.0f, -1.0f, -1.0f, 0); + return 1; } /* 80C47480-80C47488 0003E0 0008+00 1/1 0/0 0/0 .text Draw__15daObjKnBullet_cFv */ -bool daObjKnBullet_c::Draw() { - return true; +int daObjKnBullet_c::Draw() { + return 1; } /* 80C47488-80C47490 0003E8 0008+00 1/1 0/0 0/0 .text Delete__15daObjKnBullet_cFv */ -bool daObjKnBullet_c::Delete() { - return true; +int daObjKnBullet_c::Delete() { + return 1; } /* 80C47490-80C474E8 0003F0 0058+00 2/2 0/0 0/0 .text setBaseMtx__15daObjKnBullet_cFv */ void daObjKnBullet_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::XYZrotM(shape_angle); + MTXCopy(mDoMtx_stack_c::get(), mMtx); } /* 80C474E8-80C47558 000448 0070+00 1/1 0/0 0/0 .text col_init__15daObjKnBullet_cFv */ void daObjKnBullet_c::col_init() { - // NONMATCHING + mCcStts.Init(0xFF, 0xFF, this); + mCcSph.Set(l_sph_src); + mCcSph.SetStts(&mCcStts); + mCcSph.SetC(current.pos); + mCcSph.SetR(l_DATA.radius); } -/* ############################################################################################## */ -/* 80C479BC-80C479C0 00006C 0004+00 0/1 0/0 0/0 .rodata @4129 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4129[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C479BC, &lit_4129); -#pragma pop - -/* 80C479C0-80C479C4 000070 0004+00 0/1 0/0 0/0 .rodata @4130 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4130 = 150.0f; -COMPILER_STRIP_GATE(0x80C479C0, &lit_4130); -#pragma pop - /* 80C47558-80C477B4 0004B8 025C+00 1/1 0/0 0/0 .text col_chk__15daObjKnBullet_cFv */ -void daObjKnBullet_c::col_chk() { - // NONMATCHING +BOOL daObjKnBullet_c::col_chk() { + if (mActionMode == 0) { + return TRUE; + } + + if (mActionMode == 1) { + cXyz move_vec(0.0f, 0.0f, l_DATA.move_speed); + mDoMtx_stack_c::YrotS(shape_angle.y); + mDoMtx_stack_c::multVec(&move_vec, &speed); + + if ((mCcSph.ChkTgShieldHit() || mCcSph.ChkAtShieldHit()) && daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_GUARD_ATTACK) { + daNpc_Kn_c* parent = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID); + if (parent != NULL) { + cXyz sp20(parent->current.pos); + sp20.y += 150.0f; + speed = sp20 - current.pos; + speed.normalizeZP(); + speed *= l_DATA.move_speed; + + mCcSph.SetAtSPrm(0x13); + mActionMode = 2; + mTimer = l_DATA.lifetime; + } else { + hitPrtclSet(); + fopAcM_delete(this); + return FALSE; + } + } else if (mCcSph.ChkAtShieldHit()) { + daNpc_Kn_c* parent = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID); + if (parent != NULL) { + parent->setTalkFlag(2); + hitPrtclSet(); + fopAcM_delete(this); + return FALSE; + } + } else if (mCcSph.ChkAtHit()) { + daNpc_Kn_c* parent = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID); + if (parent != NULL) { + parent->setTalkFlag(1); + hitPrtclSet(); + fopAcM_delete(this); + return FALSE; + } + } + } else if (mActionMode == 2 && mCcSph.ChkAtHit()) { + hitPrtclSet(); + fopAcM_delete(this); + speed.set(0.0f, 0.0f, 0.0f); + return FALSE; + } + + mCcSph.SetC(current.pos); + mCcSph.SetR(l_DATA.radius); + dComIfG_Ccsp()->Set(&mCcSph); + return TRUE; } -/* ############################################################################################## */ -/* 80C479C4-80C479CA 000074 0006+00 1/1 0/0 0/0 .rodata l_prticles_id$4141 */ -SECTION_RODATA static u8 const l_prticles_id_4141[6] = { - 0x8B, 0x82, 0x8B, 0x83, 0x8B, 0x84, -}; -COMPILER_STRIP_GATE(0x80C479C4, &l_prticles_id_4141); - /* 80C477B4-80C478A4 000714 00F0+00 1/1 0/0 0/0 .text hitPrtclSet__15daObjKnBullet_cFv */ void daObjKnBullet_c::hitPrtclSet() { - // NONMATCHING + for (int i = 0; i < 3; i++) { + JPABaseEmitter* emt = dComIfGp_particle_getEmitter(mEmtIds[i]); + if (emt != NULL) { + emt->becomeInvalidEmitter(); + emt->deleteAllParticle(); + } + } + + for (int i = 0; i < 3; i++) { + static const u16 l_prticles_id[] = { + dPa_RM(ID_ZI_S_KN_MBHIT_A), + dPa_RM(ID_ZI_S_KN_MBHIT_B), + dPa_RM(ID_ZI_S_KN_MBHIT_C), + }; + + dComIfGp_particle_set(l_prticles_id[i], ¤t.pos, ¤t.angle, NULL); + } } /* 80C478A4-80C478C4 000804 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Execute__FP15daObjKnBullet_c */ -static void daObjKnBullet_Execute(daObjKnBullet_c* param_0) { - // NONMATCHING +static int daObjKnBullet_Execute(daObjKnBullet_c* i_this) { + return i_this->Execute(); } /* 80C478C4-80C478E4 000824 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Draw__FP15daObjKnBullet_c */ -static void daObjKnBullet_Draw(daObjKnBullet_c* param_0) { - // NONMATCHING +static int daObjKnBullet_Draw(daObjKnBullet_c* i_this) { + return i_this->Draw(); } /* 80C478E4-80C478EC 000844 0008+00 1/0 0/0 0/0 .text daObjKnBullet_IsDelete__FP15daObjKnBullet_c */ -static bool daObjKnBullet_IsDelete(daObjKnBullet_c* param_0) { - return true; +static int daObjKnBullet_IsDelete(daObjKnBullet_c* i_this) { + return 1; } /* 80C478EC-80C4790C 00084C 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Delete__FP15daObjKnBullet_c */ -static void daObjKnBullet_Delete(daObjKnBullet_c* param_0) { - // NONMATCHING +static int daObjKnBullet_Delete(daObjKnBullet_c* i_this) { + return i_this->Delete(); } /* 80C4790C-80C4792C 00086C 0020+00 1/0 0/0 0/0 .text daObjKnBullet_create__FP10fopAc_ac_c */ -static void daObjKnBullet_create(fopAc_ac_c* param_0) { - // NONMATCHING +static int daObjKnBullet_create(fopAc_ac_c* i_this) { + return ((daObjKnBullet_c*)i_this)->Create(); } -/* 80C4792C-80C47948 00088C 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<s>__FPs */ -extern "C" void func_80C4792C(void* _this, s16* param_0) { - // NONMATCHING -} +/* 80C479CC-80C479EC -00001 0020+00 1/0 0/0 0/0 .data l_daObjKnBullet_Method */ +static actor_method_class l_daObjKnBullet_Method = { + (process_method_func)daObjKnBullet_create, + (process_method_func)daObjKnBullet_Delete, + (process_method_func)daObjKnBullet_Execute, + (process_method_func)daObjKnBullet_IsDelete, + (process_method_func)daObjKnBullet_Draw, +}; + +/* 80C479EC-80C47A1C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KN_BULLET */ +extern actor_process_profile_definition g_profile_KN_BULLET = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_KN_BULLET, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daObjKnBullet_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 348, // mPriority + &l_daObjKnBullet_Method, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index e253142712..5e59f471d4 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -6,607 +6,343 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6ChangeGate.h" -#include "dol2asm.h" - - - -// -// Forward References: -// - -extern "C" void __ct__21daLv6ChangeGate_HIO_cFv(); -extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__17daLv6ChangeGate_cFv(); -extern "C" void CreateHeap__17daLv6ChangeGate_cFv(); -extern "C" void create__17daLv6ChangeGate_cFv(); -extern "C" void __dt__8dCcD_CylFv(); -extern "C" void __ct__8dCcD_CylFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void isSwitch__17daLv6ChangeGate_cFv(); -extern "C" void Execute__17daLv6ChangeGate_cFPPA3_A4_f(); -extern "C" void moveGate__17daLv6ChangeGate_cFv(); -extern "C" void eventStart__17daLv6ChangeGate_cFv(); -extern "C" void init_modeWait__17daLv6ChangeGate_cFv(); -extern "C" void modeWait__17daLv6ChangeGate_cFv(); -extern "C" void init_modeSlideRight__17daLv6ChangeGate_cFv(); -extern "C" void modeSlideRight__17daLv6ChangeGate_cFv(); -extern "C" void init_modeSlideLeft__17daLv6ChangeGate_cFv(); -extern "C" void modeSlideLeft__17daLv6ChangeGate_cFv(); -extern "C" void init_modeBreak__17daLv6ChangeGate_cFv(); -extern "C" void modeBreak__17daLv6ChangeGate_cFv(); -extern "C" void Draw__17daLv6ChangeGate_cFv(); -extern "C" void Delete__17daLv6ChangeGate_cFv(); -extern "C" static void daLv6ChangeGate_Draw__FP17daLv6ChangeGate_c(); -extern "C" static void daLv6ChangeGate_Execute__FP17daLv6ChangeGate_c(); -extern "C" static void daLv6ChangeGate_Delete__FP17daLv6ChangeGate_c(); -extern "C" static void daLv6ChangeGate_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__21daLv6ChangeGate_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv6ChangeGate_cpp(); -extern "C" static void func_80C71FC4(); -extern "C" static void func_80C71FCC(); -extern "C" void __dt__17dEvLib_callback_cFv(); -extern "C" bool eventStart__17dEvLib_callback_cFv(); -extern "C" bool eventRun__17dEvLib_callback_cFv(); -extern "C" bool eventEnd__17dEvLib_callback_cFv(); -extern "C" void __dt__17daLv6ChangeGate_cFv(); -extern "C" u8 const mCcDObjInfo__17daLv6ChangeGate_c[48]; -extern "C" extern char const* const d_a_obj_lv6ChangeGate__stringBase0; -extern "C" u8 mCcDCyl__17daLv6ChangeGate_c[68]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -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 onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void eventUpdate__17dEvLib_callback_cFv(); -extern "C" void orderEvent__17dEvLib_callback_cFiii(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __destroy_arr(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -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" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C7214C-80C72150 000000 0004+00 4/4 0/0 0/0 .rodata @3639 */ -SECTION_RODATA static f32 const lit_3639 = 10.0f; -COMPILER_STRIP_GATE(0x80C7214C, &lit_3639); - -/* 80C72150-80C72154 000004 0004+00 1/2 0/0 0/0 .rodata @3640 */ -SECTION_RODATA static f32 const lit_3640 = 562.5f; -COMPILER_STRIP_GATE(0x80C72150, &lit_3640); - -/* 80C721CC-80C72210 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__17daLv6ChangeGate_c */ -SECTION_DATA u8 daLv6ChangeGate_c::mCcDCyl[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C72210-80C7221C -00001 000C+00 0/1 0/0 0/0 .data @3874 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3874[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__17daLv6ChangeGate_cFv, -}; -#pragma pop - -/* 80C7221C-80C72228 -00001 000C+00 0/1 0/0 0/0 .data @3875 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3875[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeSlideRight__17daLv6ChangeGate_cFv, -}; -#pragma pop - -/* 80C72228-80C72234 -00001 000C+00 0/1 0/0 0/0 .data @3876 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3876[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeSlideLeft__17daLv6ChangeGate_cFv, -}; -#pragma pop - -/* 80C72234-80C72240 -00001 000C+00 0/1 0/0 0/0 .data @3877 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3877[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreak__17daLv6ChangeGate_cFv, -}; -#pragma pop - -/* 80C72240-80C72270 000094 0030+00 0/1 0/0 0/0 .data mode_proc$3873 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80C72270-80C72290 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6ChangeGate_Method */ -static actor_method_class l_daLv6ChangeGate_Method = { - (process_method_func)daLv6ChangeGate_Create__FP10fopAc_ac_c, - (process_method_func)daLv6ChangeGate_Delete__FP17daLv6ChangeGate_c, - (process_method_func)daLv6ChangeGate_Execute__FP17daLv6ChangeGate_c, - 0, - (process_method_func)daLv6ChangeGate_Draw__FP17daLv6ChangeGate_c, -}; - -/* 80C72290-80C722C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6ChgGate */ -extern actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6ChgGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6ChangeGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 626, // mPriority - &l_daLv6ChangeGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80C722C0-80C722CC 000114 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80C722CC-80C722D8 000120 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80C722D8-80C722E4 00012C 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80C722E4-80C722F0 000138 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80C722F0-80C72308 000144 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ -SECTION_DATA extern void* __vt__17dEvLib_callback_c[6] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17dEvLib_callback_cFv, - (void*)eventStart__17dEvLib_callback_cFv, - (void*)eventRun__17dEvLib_callback_cFv, - (void*)eventEnd__17dEvLib_callback_cFv, -}; - -/* 80C72308-80C72350 00015C 0048+00 2/2 0/0 0/0 .data __vt__17daLv6ChangeGate_c */ -SECTION_DATA extern void* __vt__17daLv6ChangeGate_c[18] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__17daLv6ChangeGate_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__17daLv6ChangeGate_cFPPA3_A4_f, - (void*)Draw__17daLv6ChangeGate_cFv, - (void*)Delete__17daLv6ChangeGate_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, - (void*)NULL, - (void*)NULL, - (void*)func_80C71FCC, - (void*)func_80C71FC4, - (void*)eventRun__17dEvLib_callback_cFv, - (void*)eventEnd__17dEvLib_callback_cFv, - (void*)__dt__17daLv6ChangeGate_cFv, - (void*)eventStart__17daLv6ChangeGate_cFv, -}; - -/* 80C72350-80C7235C 0001A4 000C+00 2/2 0/0 0/0 .data __vt__21daLv6ChangeGate_HIO_c */ -SECTION_DATA extern void* __vt__21daLv6ChangeGate_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__21daLv6ChangeGate_HIO_cFv, -}; - -/* 80C7235C-80C72368 0001B0 000C+00 3/3 0/0 0/0 .data __vt__18fOpAcm_HIO_entry_c */ -SECTION_DATA extern void* __vt__18fOpAcm_HIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18fOpAcm_HIO_entry_cFv, -}; - -/* 80C72368-80C72374 0001BC 000C+00 4/4 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, -}; +#include "d/d_s_play.h" /* 80C70C4C-80C70C94 0000EC 0048+00 1/1 0/0 0/0 .text __ct__21daLv6ChangeGate_HIO_cFv */ daLv6ChangeGate_HIO_c::daLv6ChangeGate_HIO_c() { - // NONMATCHING + speed = 10.0f; + move_amount = 562.5f; + unk_0xc = 3; } -/* 80C70C94-80C70CF0 000134 005C+00 1/0 0/0 0/0 .text __dt__18fOpAcm_HIO_entry_cFv */ -// fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { -extern "C" void __dt__18fOpAcm_HIO_entry_cFv() { - // NONMATCHING -} - -/* 80C70CF0-80C70D38 000190 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 -} +/* 80C7238C-80C7239C 000014 0010+00 4/4 0/0 0/0 .bss l_HIO */ +static daLv6ChangeGate_HIO_c l_HIO; -/* ############################################################################################## */ /* 80C72154-80C72184 000008 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__17daLv6ChangeGate_c */ -SECTION_RODATA u8 const daLv6ChangeGate_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +const dCcD_SrcGObjInf daLv6ChangeGate_c::mCcDObjInfo = { + {0, {{0, 0, 0}, {0x400, 0x11}, {0x79}}}, + {dCcD_SE_SWORD, 0, 0, 0, 0}, + {dCcD_SE_STONE, 0, 0, 0, 0}, + {0}, }; -COMPILER_STRIP_GATE(0x80C72154, &daLv6ChangeGate_c::mCcDObjInfo); - -/* 80C72184-80C72188 000038 0004+00 3/6 0/0 0/0 .rodata @3664 */ -SECTION_RODATA static u8 const lit_3664[4] = { - 0x00, - 0x00, - 0x00, - 0x00, + +/* 80C721CC-80C72210 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__17daLv6ChangeGate_c */ +dCcD_SrcCyl daLv6ChangeGate_c::mCcDCyl = { + mCcDObjInfo, + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} }; -COMPILER_STRIP_GATE(0x80C72184, &lit_3664); /* 80C70D38-80C70DD4 0001D8 009C+00 2/2 0/0 0/0 .text setBaseMtx__17daLv6ChangeGate_cFv */ void daLv6ChangeGate_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(0, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::transM(mMoveTransX, 0.0f, 0.0f); + mpModel->setBaseScale(scale); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -/* ############################################################################################## */ -/* 80C721A4-80C721A4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C721A4 = "L6ChBlk"; -#pragma pop - /* 80C70DD4-80C70E40 000274 006C+00 1/0 0/0 0/0 .text CreateHeap__17daLv6ChangeGate_cFv */ -void daLv6ChangeGate_c::CreateHeap() { - // NONMATCHING -} +int daLv6ChangeGate_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6ChBlk", 4); + JUT_ASSERT(240, modelData != NULL); -/* ############################################################################################## */ -/* 80C72380-80C7238C 000008 000C+00 1/1 0/0 0/0 .bss @3631 */ -static u8 lit_3631[12]; + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } -/* 80C7238C-80C7239C 000014 0010+00 4/4 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[16]; + return 1; +} /* 80C70E40-80C7106C 0002E0 022C+00 1/1 0/0 0/0 .text create__17daLv6ChangeGate_cFv */ -void daLv6ChangeGate_c::create() { - // NONMATCHING -} +int daLv6ChangeGate_c::create() { + fopAcM_SetupActor(this, daLv6ChangeGate_c); -/* 80C7106C-80C71138 00050C 00CC+00 2/2 0/0 0/0 .text __dt__8dCcD_CylFv */ -// dCcD_Cyl::~dCcD_Cyl() { -extern "C" void __dt__8dCcD_CylFv() { - // NONMATCHING -} + if (getSw2() != 0xFF && fopAcM_isSwitch(this, getSw2())) { + return cPhs_ERROR_e; + } -/* 80C71138-80C711BC 0005D8 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */ -// dCcD_Cyl::dCcD_Cyl() { -extern "C" void __ct__8dCcD_CylFv() { - // NONMATCHING -} + int phase_state = dComIfG_resLoad(&mPhase, "L6ChBlk"); + if (phase_state == cPhs_COMPLEATE_e) { + if (MoveBGCreate("L6ChBlk", 7, dBgS_MoveBGProc_TypicalRotY, 0x1200, NULL) == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } -/* 80C711BC-80C71204 00065C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); -/* 80C71204-80C7124C 0006A4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} + mCcStts.Init(0xFF, 0xFF, this); + for (int i = 0; i < 12; i++) { + mCcCyls[i].Set(mCcDCyl); + mCcCyls[i].SetStts(&mCcStts); + } + + mSwState = getSwState(); + if (mSwState == 0xF) { + mSwState = 0; + } + + mSwbit = getSw(); + mIsSwitch = isSwitch(); + mMoveTransX = 0.0f; + + if (mIsSwitch) { + mMoveTransX = l_HIO.move_amount; + } else { + init_modeWait(); + } + + setBaseMtx(); + } -/* 80C7124C-80C712A8 0006EC 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -// dCcD_GStts::~dCcD_GStts() { -extern "C" void __dt__10dCcD_GSttsFv() { - // NONMATCHING + return phase_state; } /* 80C712A8-80C712F4 000748 004C+00 2/2 0/0 0/0 .text isSwitch__17daLv6ChangeGate_cFv */ -void daLv6ChangeGate_c::isSwitch() { - // NONMATCHING +u8 daLv6ChangeGate_c::isSwitch() { + return mSwState ^ fopAcM_isSwitch(this, mSwbit); } -/* ############################################################################################## */ -/* 80C72188-80C7218C 00003C 0004+00 0/1 0/0 0/0 .rodata @3866 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3866 = -250.0f; -COMPILER_STRIP_GATE(0x80C72188, &lit_3866); -#pragma pop - -/* 80C7218C-80C72190 000040 0004+00 0/1 0/0 0/0 .rodata @3867 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3867 = 65.0f; -COMPILER_STRIP_GATE(0x80C7218C, &lit_3867); -#pragma pop - -/* 80C72190-80C72194 000044 0004+00 0/1 0/0 0/0 .rodata @3868 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3868 = 330.0f; -COMPILER_STRIP_GATE(0x80C72190, &lit_3868); -#pragma pop - -/* 80C72194-80C72198 000048 0004+00 0/1 0/0 0/0 .rodata @3869 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3869 = 60.0f; -COMPILER_STRIP_GATE(0x80C72194, &lit_3869); -#pragma pop - /* 80C712F4-80C71494 000794 01A0+00 1/0 0/0 0/0 .text Execute__17daLv6ChangeGate_cFPPA3_A4_f */ -void daLv6ChangeGate_c::Execute(Mtx** param_0) { - // NONMATCHING -} +int daLv6ChangeGate_c::Execute(Mtx** param_0) { + eventUpdate(); + moveGate(); + + for (int i = 0; i < 12; i++) { + if (mCcCyls[i].ChkTgHit()) { + dCcD_GObjInf* gobj = mCcCyls[i].GetTgHitGObj(); + if (gobj->GetAtType() & AT_TYPE_CSTATUE_SWING) { + init_modeBreak(); + break; + } + } + } + + f32 cyl_x_offset = -250.0f; -/* ############################################################################################## */ -/* 80C7239C-80C723A0 000024 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80C7239C[4]; + for (int i = 0; i < 12; i++) { + cXyz spC(cyl_x_offset + mMoveTransX, 0.0f, 0.0f); + mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::multVec(&spC, &spC); + spC += current.pos; + + mCcCyls[i].SetR(65.0f + oREG_F(0)); + mCcCyls[i].SetH(330.0f + oREG_F(1)); + mCcCyls[i].SetC(spC); + dComIfG_Ccsp()->Set(&mCcCyls[i]); + + cyl_x_offset += 60.0f; + } + + *param_0 = &mpModel->getBaseTRMtx(); + setBaseMtx(); + return 1; +} /* 80C71494-80C715BC 000934 0128+00 1/1 0/0 0/0 .text moveGate__17daLv6ChangeGate_cFv */ void daLv6ChangeGate_c::moveGate() { - // NONMATCHING + static void (daLv6ChangeGate_c::*mode_proc[])() = { + &daLv6ChangeGate_c::modeWait, + &daLv6ChangeGate_c::modeSlideRight, + &daLv6ChangeGate_c::modeSlideLeft, + &daLv6ChangeGate_c::modeBreak, + }; + + u8 prev_sw = mIsSwitch; + mIsSwitch = isSwitch(); + + if (mIsSwitch != prev_sw) { + if (getEventID() != 0xFF) { + orderEvent(getEventID(), 0xFF, 1); + } else { + eventStart(); + } + } + + (this->*mode_proc[mMode])(); } /* 80C715BC-80C715F4 000A5C 0038+00 2/1 0/0 0/0 .text eventStart__17daLv6ChangeGate_cFv */ -void daLv6ChangeGate_c::eventStart() { - // NONMATCHING +bool daLv6ChangeGate_c::eventStart() { + if (mIsSwitch) { + init_modeSlideRight(); + } else { + init_modeSlideLeft(); + } + + return true; } /* 80C715F4-80C71600 000A94 000C+00 3/3 0/0 0/0 .text init_modeWait__17daLv6ChangeGate_cFv */ void daLv6ChangeGate_c::init_modeWait() { - // NONMATCHING + mMode = 0; } /* 80C71600-80C71604 000AA0 0004+00 1/0 0/0 0/0 .text modeWait__17daLv6ChangeGate_cFv */ -void daLv6ChangeGate_c::modeWait() { - /* empty function */ -} - -/* ############################################################################################## */ -/* 80C72198-80C7219C 00004C 0004+00 4/6 0/0 0/0 .rodata @3922 */ -SECTION_RODATA static f32 const lit_3922 = 1.0f; -COMPILER_STRIP_GATE(0x80C72198, &lit_3922); - -/* 80C7219C-80C721A0 000050 0004+00 3/5 0/0 0/0 .rodata @3923 */ -SECTION_RODATA static f32 const lit_3923 = -1.0f; -COMPILER_STRIP_GATE(0x80C7219C, &lit_3923); +void daLv6ChangeGate_c::modeWait() {} /* 80C71604-80C716B4 000AA4 00B0+00 1/1 0/0 0/0 .text init_modeSlideRight__17daLv6ChangeGate_cFv */ void daLv6ChangeGate_c::init_modeSlideRight() { - // NONMATCHING -} + mTimer = getWaitTime(); + if (mTimer == 0xFF) { + mTimer = 0; + } -/* ############################################################################################## */ -/* 80C721A0-80C721A4 000054 0004+00 0/2 0/0 0/0 .rodata @3953 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3953 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C721A0, &lit_3953); -#pragma pop + if (mTimer == 0) { + mDoAud_seStart(Z2SE_OBJ_L6_SW_GATE_ON, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + + mMode = 1; +} /* 80C716B4-80C7183C 000B54 0188+00 1/0 0/0 0/0 .text modeSlideRight__17daLv6ChangeGate_cFv */ void daLv6ChangeGate_c::modeSlideRight() { - // NONMATCHING + if (mTimer != 0) { + mTimer--; + if (mTimer == 0) { + mDoAud_seStart(Z2SE_OBJ_L6_SW_GATE_ON, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + return; + } + + f32 dist_to_target = cLib_addCalc(&mMoveTransX, l_HIO.move_amount, 0.1f, l_HIO.speed, 1.0f); + mDoAud_seStartLevel(Z2SE_OBJ_L6_SW_GATE_MV, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + + if (0.0f == dist_to_target) { + mDoAud_seStart(Z2SE_OBJ_L6_SW_GATE_OFF, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + init_modeWait(); + } } /* 80C7183C-80C718EC 000CDC 00B0+00 1/1 0/0 0/0 .text init_modeSlideLeft__17daLv6ChangeGate_cFv */ void daLv6ChangeGate_c::init_modeSlideLeft() { - // NONMATCHING + mTimer = getWaitTime(); + if (mTimer == 0xFF) { + mTimer = 0; + } + + if (mTimer == 0) { + mDoAud_seStart(Z2SE_OBJ_L6_SW_GATE_ON, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + + mMode = 2; } /* 80C718EC-80C71A74 000D8C 0188+00 1/0 0/0 0/0 .text modeSlideLeft__17daLv6ChangeGate_cFv */ void daLv6ChangeGate_c::modeSlideLeft() { - // NONMATCHING + if (mTimer != 0) { + mTimer--; + if (mTimer == 0) { + mDoAud_seStart(Z2SE_OBJ_L6_SW_GATE_ON, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + return; + } + + f32 dist_to_target = cLib_addCalc(&mMoveTransX, 0.0f, 0.1f, l_HIO.speed, 1.0f); + mDoAud_seStartLevel(Z2SE_OBJ_L6_SW_GATE_MV, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + + if (0.0f == dist_to_target) { + mDoAud_seStart(Z2SE_OBJ_L6_SW_GATE_OFF, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + init_modeWait(); + } } /* 80C71A74-80C71AF8 000F14 0084+00 1/1 0/0 0/0 .text init_modeBreak__17daLv6ChangeGate_cFv */ void daLv6ChangeGate_c::init_modeBreak() { - // NONMATCHING + mDoAud_seStart(Z2SE_OBJ_TRAP_BREAK_STN, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mMode = 3; } /* 80C71AF8-80C71D40 000F98 0248+00 1/0 0/0 0/0 .text modeBreak__17daLv6ChangeGate_cFv */ void daLv6ChangeGate_c::modeBreak() { - // NONMATCHING + cXyz effpos(mMoveTransX, 0.0f, 0.0f); + mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::multVec(&effpos, &effpos); + effpos += current.pos; + + csXyz effrot(shape_angle); + effrot.x = 0; + + dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV6CHBLK_BREAK_A), &effpos, &effrot, NULL); + dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV6CHBLK_BREAK_B), &effpos, &effrot, NULL); + dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV6CHBLK_BREAK_C), &effpos, &effrot, NULL); + dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV6CHBLK_BREAK_D), &effpos, &effrot, NULL); + dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV6CHBLK_BREAK_E), &effpos, &effrot, NULL); + + if (getSw2() != 0xFF) { + fopAcM_onSwitch(this, getSw2()); + } + + fopAcM_delete(this); } /* 80C71D40-80C71DE4 0011E0 00A4+00 1/0 0/0 0/0 .text Draw__17daLv6ChangeGate_cFv */ -void daLv6ChangeGate_c::Draw() { - // NONMATCHING +int daLv6ChangeGate_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } /* 80C71DE4-80C71E14 001284 0030+00 1/0 0/0 0/0 .text Delete__17daLv6ChangeGate_cFv */ -void daLv6ChangeGate_c::Delete() { - // NONMATCHING +int daLv6ChangeGate_c::Delete() { + dComIfG_resDelete(&mPhase, "L6ChBlk"); + return 1; } /* 80C71E14-80C71E40 0012B4 002C+00 1/0 0/0 0/0 .text daLv6ChangeGate_Draw__FP17daLv6ChangeGate_c */ -static void daLv6ChangeGate_Draw(daLv6ChangeGate_c* param_0) { - // NONMATCHING +static int daLv6ChangeGate_Draw(daLv6ChangeGate_c* i_this) { + return i_this->MoveBGDraw(); } /* 80C71E40-80C71E60 0012E0 0020+00 1/0 0/0 0/0 .text * daLv6ChangeGate_Execute__FP17daLv6ChangeGate_c */ -static void daLv6ChangeGate_Execute(daLv6ChangeGate_c* param_0) { - // NONMATCHING +static int daLv6ChangeGate_Execute(daLv6ChangeGate_c* i_this) { + return i_this->MoveBGExecute(); } /* 80C71E60-80C71E80 001300 0020+00 1/0 0/0 0/0 .text * daLv6ChangeGate_Delete__FP17daLv6ChangeGate_c */ -static void daLv6ChangeGate_Delete(daLv6ChangeGate_c* param_0) { - // NONMATCHING +static int daLv6ChangeGate_Delete(daLv6ChangeGate_c* i_this) { + return i_this->MoveBGDelete(); } /* 80C71E80-80C71EA0 001320 0020+00 1/0 0/0 0/0 .text daLv6ChangeGate_Create__FP10fopAc_ac_c */ -static void daLv6ChangeGate_Create(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 80C71EA0-80C71EE8 001340 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -// cCcD_GStts::~cCcD_GStts() { -extern "C" void __dt__10cCcD_GSttsFv() { - // NONMATCHING -} - -/* 80C71EE8-80C71F54 001388 006C+00 2/1 0/0 0/0 .text __dt__21daLv6ChangeGate_HIO_cFv */ -daLv6ChangeGate_HIO_c::~daLv6ChangeGate_HIO_c() { - // NONMATCHING -} - -/* 80C71F54-80C71FC4 0013F4 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv6ChangeGate_cpp - */ -void __sinit_d_a_obj_lv6ChangeGate_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C71F54, __sinit_d_a_obj_lv6ChangeGate_cpp); -#pragma pop - -/* 80C71FC4-80C71FCC 001464 0008+00 1/0 0/0 0/0 .text @1448@eventStart__17daLv6ChangeGate_cFv */ -static void func_80C71FC4() { - // NONMATCHING +static int daLv6ChangeGate_Create(fopAc_ac_c* i_this) { + return ((daLv6ChangeGate_c*)i_this)->create(); } -/* 80C71FCC-80C71FD4 00146C 0008+00 1/0 0/0 0/0 .text @1448@__dt__17daLv6ChangeGate_cFv - */ -static void func_80C71FCC() { - // NONMATCHING -} - -/* 80C71FD4-80C7201C 001474 0048+00 1/0 0/0 0/0 .text __dt__17dEvLib_callback_cFv */ -// dEvLib_callback_c::~dEvLib_callback_c() { -extern "C" void __dt__17dEvLib_callback_cFv() { - // NONMATCHING -} - -/* 80C7201C-80C72024 0014BC 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv - */ -// bool dEvLib_callback_c::eventStart() { -extern "C" bool eventStart__17dEvLib_callback_cFv() { - return true; -} - -/* 80C72024-80C7202C 0014C4 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventRun() { -extern "C" bool eventRun__17dEvLib_callback_cFv() { - return true; -} - -/* 80C7202C-80C72034 0014CC 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventEnd() { -extern "C" bool eventEnd__17dEvLib_callback_cFv() { - return true; -} - -/* 80C72034-80C72138 0014D4 0104+00 2/1 0/0 0/0 .text __dt__17daLv6ChangeGate_cFv */ -daLv6ChangeGate_c::~daLv6ChangeGate_c() { - // NONMATCHING -} +/* 80C72270-80C72290 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6ChangeGate_Method */ +static actor_method_class l_daLv6ChangeGate_Method = { + (process_method_func)daLv6ChangeGate_Create, + (process_method_func)daLv6ChangeGate_Delete, + (process_method_func)daLv6ChangeGate_Execute, + (process_method_func)NULL, + (process_method_func)daLv6ChangeGate_Draw, +}; -/* 80C721A4-80C721A4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C72290-80C722C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6ChgGate */ +extern actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6ChgGate, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daLv6ChangeGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 626, // mPriority + &l_daLv6ChangeGate_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index 22fa64c159..7023aa2f45 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -6,364 +6,219 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6Lblock.h" -#include "dol2asm.h" - - - -// -// Forward References: -// - -extern "C" void __ct__17daLv6Lblock_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__13daLv6Lblock_cFv(); -extern "C" void CreateHeap__13daLv6Lblock_cFv(); -extern "C" void create__13daLv6Lblock_cFv(); -extern "C" void isSwitch__13daLv6Lblock_cFv(); -extern "C" void Execute__13daLv6Lblock_cFPPA3_A4_f(); -extern "C" void moveBlock__13daLv6Lblock_cFv(); -extern "C" void init_modeWait__13daLv6Lblock_cFv(); -extern "C" void modeWait__13daLv6Lblock_cFv(); -extern "C" void init_modeLiftUp__13daLv6Lblock_cFv(); -extern "C" void modeLiftUp__13daLv6Lblock_cFv(); -extern "C" void init_modeLiftDown__13daLv6Lblock_cFv(); -extern "C" void modeLiftDown__13daLv6Lblock_cFv(); -extern "C" void Draw__13daLv6Lblock_cFv(); -extern "C" void Delete__13daLv6Lblock_cFv(); -extern "C" static void daLv6Lblock_Draw__FP13daLv6Lblock_c(); -extern "C" static void daLv6Lblock_Execute__FP13daLv6Lblock_c(); -extern "C" static void daLv6Lblock_Delete__FP13daLv6Lblock_c(); -extern "C" static void daLv6Lblock_Create__FP10fopAc_ac_c(); -extern "C" void __dt__17daLv6Lblock_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv6Lblock_cpp(); -extern "C" extern char const* const d_a_obj_lv6Lblock__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -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 isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C73CBC-80C73CC0 000000 0004+00 3/3 0/0 0/0 .rodata @3627 */ -SECTION_RODATA static f32 const lit_3627 = 15.0f; -COMPILER_STRIP_GATE(0x80C73CBC, &lit_3627); /* 80C73D04-80C73D0C 000020 0008+00 1/1 0/0 0/0 .data l_liftUpMax */ -SECTION_DATA static u8 l_liftUpMax[8] = { - 0x43, 0x96, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, -}; - -/* 80C73D0C-80C73D18 -00001 000C+00 0/1 0/0 0/0 .data @3734 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3734[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__13daLv6Lblock_cFv, -}; -#pragma pop - -/* 80C73D18-80C73D24 -00001 000C+00 0/1 0/0 0/0 .data @3735 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3735[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeLiftUp__13daLv6Lblock_cFv, -}; -#pragma pop - -/* 80C73D24-80C73D30 -00001 000C+00 0/1 0/0 0/0 .data @3736 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3736[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeLiftDown__13daLv6Lblock_cFv, -}; -#pragma pop - -/* 80C73D30-80C73D54 00004C 0024+00 0/1 0/0 0/0 .data mode_proc$3733 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[36] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80C73D54-80C73D74 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6Lblock_Method */ -static actor_method_class l_daLv6Lblock_Method = { - (process_method_func)daLv6Lblock_Create__FP10fopAc_ac_c, - (process_method_func)daLv6Lblock_Delete__FP13daLv6Lblock_c, - (process_method_func)daLv6Lblock_Execute__FP13daLv6Lblock_c, - 0, - (process_method_func)daLv6Lblock_Draw__FP13daLv6Lblock_c, -}; - -/* 80C73D74-80C73DA4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6Lblock */ -extern actor_process_profile_definition g_profile_Obj_Lv6Lblock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6Lblock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6Lblock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 625, // mPriority - &l_daLv6Lblock_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80C73DA4-80C73DCC 0000C0 0028+00 1/1 0/0 0/0 .data __vt__13daLv6Lblock_c */ -SECTION_DATA extern void* __vt__13daLv6Lblock_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__13daLv6Lblock_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__13daLv6Lblock_cFPPA3_A4_f, - (void*)Draw__13daLv6Lblock_cFv, - (void*)Delete__13daLv6Lblock_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C73DCC-80C73DD8 0000E8 000C+00 2/2 0/0 0/0 .data __vt__17daLv6Lblock_HIO_c */ -SECTION_DATA extern void* __vt__17daLv6Lblock_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17daLv6Lblock_HIO_cFv, -}; - -/* 80C73DD8-80C73DE4 0000F4 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, +static f32 l_liftUpMax[] = { + 300.0f, + 150.0f, }; /* 80C733EC-80C7341C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__17daLv6Lblock_HIO_cFv */ daLv6Lblock_HIO_c::daLv6Lblock_HIO_c() { - // NONMATCHING -} - -/* 80C7341C-80C73464 00011C 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 + speed = 15.0f; + unk_0xc = 3; } /* 80C73464-80C734EC 000164 0088+00 2/2 0/0 0/0 .text setBaseMtx__13daLv6Lblock_cFv */ void daLv6Lblock_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mpModel->setBaseScale(scale); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -/* ############################################################################################## */ -/* 80C73CD8-80C73CD8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C73CD8 = "L6Lblock"; -#pragma pop - /* 80C734EC-80C73558 0001EC 006C+00 1/0 0/0 0/0 .text CreateHeap__13daLv6Lblock_cFv */ -void daLv6Lblock_c::CreateHeap() { - // NONMATCHING -} +int daLv6Lblock_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6Lblock", 4); + JUT_ASSERT(177, modelData != NULL); + + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } -/* ############################################################################################## */ -/* 80C73CC0-80C73CC4 000004 0004+00 1/1 0/0 0/0 .rodata @3709 */ -SECTION_RODATA static f32 const lit_3709 = 300.0f; -COMPILER_STRIP_GATE(0x80C73CC0, &lit_3709); + return 1; +} /* 80C73558-80C736C0 000258 0168+00 1/1 0/0 0/0 .text create__13daLv6Lblock_cFv */ -void daLv6Lblock_c::create() { - // NONMATCHING +int daLv6Lblock_c::create() { + fopAcM_SetupActor(this, daLv6Lblock_c); + + int phase_state = dComIfG_resLoad(&mPhase, "L6Lblock"); + if (phase_state == cPhs_COMPLEATE_e) { + if (MoveBGCreate("L6Lblock", 7, dBgS_MoveBGProc_TypicalRotY, 0xD80, NULL) == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } + + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + + mSwState = getSwState(); + if (mSwState == 0xF) { + mSwState = 0; + } + + mSwbit = getSw(); + mIsSwitch = isSwitch(); + + mMaxHeight = l_liftUpMax[getUpMax()]; + current.pos.y -= 300.0f; + mBaseHeight = current.pos.y; + + if (mIsSwitch) { + current.pos.y = mBaseHeight + mMaxHeight; + } else { + init_modeWait(); + } + + setBaseMtx(); + } + + return phase_state; } /* 80C736C0-80C7370C 0003C0 004C+00 2/2 0/0 0/0 .text isSwitch__13daLv6Lblock_cFv */ -void daLv6Lblock_c::isSwitch() { - // NONMATCHING +u8 daLv6Lblock_c::isSwitch() { + return mSwState ^ fopAcM_isSwitch(this, mSwbit); } /* 80C7370C-80C7375C 00040C 0050+00 1/0 0/0 0/0 .text Execute__13daLv6Lblock_cFPPA3_A4_f */ -void daLv6Lblock_c::Execute(Mtx** param_0) { - // NONMATCHING +int daLv6Lblock_c::Execute(Mtx** param_0) { + moveBlock(); + *param_0 = &mpModel->getBaseTRMtx(); + setBaseMtx(); + return 1; } -/* ############################################################################################## */ -/* 80C73DF0-80C73DFC 000008 000C+00 1/1 0/0 0/0 .bss @3621 */ -static u8 lit_3621[12]; - /* 80C73DFC-80C73E0C 000014 0010+00 3/3 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[16]; - -/* 80C73E0C-80C73E10 000024 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80C73E0C[4]; +static daLv6Lblock_HIO_c l_HIO; /* 80C7375C-80C73850 00045C 00F4+00 1/1 0/0 0/0 .text moveBlock__13daLv6Lblock_cFv */ void daLv6Lblock_c::moveBlock() { - // NONMATCHING + static void (daLv6Lblock_c::*mode_proc[])() = { + &daLv6Lblock_c::modeWait, + &daLv6Lblock_c::modeLiftUp, + &daLv6Lblock_c::modeLiftDown, + }; + + u8 prev_sw = mIsSwitch; + mIsSwitch = isSwitch(); + + if (mIsSwitch != prev_sw) { + if (mIsSwitch) { + init_modeLiftUp(); + } else { + init_modeLiftDown(); + } + } + + (this->*mode_proc[mMode])(); } /* 80C73850-80C7385C 000550 000C+00 3/3 0/0 0/0 .text init_modeWait__13daLv6Lblock_cFv */ void daLv6Lblock_c::init_modeWait() { - // NONMATCHING + mMode = 0; } /* 80C7385C-80C73860 00055C 0004+00 1/0 0/0 0/0 .text modeWait__13daLv6Lblock_cFv */ -void daLv6Lblock_c::modeWait() { - /* empty function */ -} +void daLv6Lblock_c::modeWait() {} /* 80C73860-80C7386C 000560 000C+00 1/1 0/0 0/0 .text init_modeLiftUp__13daLv6Lblock_cFv */ void daLv6Lblock_c::init_modeLiftUp() { - // NONMATCHING + mMode = 1; } -/* ############################################################################################## */ -/* 80C73CC4-80C73CC8 000008 0004+00 0/2 0/0 0/0 .rodata @3777 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3777 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C73CC4, &lit_3777); -#pragma pop - -/* 80C73CC8-80C73CCC 00000C 0004+00 0/2 0/0 0/0 .rodata @3778 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3778 = 5.0f; -COMPILER_STRIP_GATE(0x80C73CC8, &lit_3778); -#pragma pop - -/* 80C73CCC-80C73CD0 000010 0004+00 0/2 0/0 0/0 .rodata @3779 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3779 = 1.0f; -COMPILER_STRIP_GATE(0x80C73CCC, &lit_3779); -#pragma pop - -/* 80C73CD0-80C73CD4 000014 0004+00 0/2 0/0 0/0 .rodata @3780 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3780 = -1.0f; -COMPILER_STRIP_GATE(0x80C73CD0, &lit_3780); -#pragma pop - -/* 80C73CD4-80C73CD8 000018 0004+00 0/2 0/0 0/0 .rodata @3781 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3781[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C73CD4, &lit_3781); -#pragma pop - /* 80C7386C-80C7398C 00056C 0120+00 1/0 0/0 0/0 .text modeLiftUp__13daLv6Lblock_cFv */ void daLv6Lblock_c::modeLiftUp() { - // NONMATCHING + f32 dist_to_target = cLib_addCalc(¤t.pos.y, mBaseHeight + mMaxHeight, 0.1f, l_HIO.speed, 5.0f); + mDoAud_seStartLevel(Z2SE_OBJ_L6_UD_BLOCK_UP, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + + if (0.0f == dist_to_target) { + mDoAud_seStart(Z2SE_OBJ_L6_UD_BLOCK_UP_ST, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + init_modeWait(); + } } /* 80C7398C-80C73998 00068C 000C+00 1/1 0/0 0/0 .text init_modeLiftDown__13daLv6Lblock_cFv */ void daLv6Lblock_c::init_modeLiftDown() { - // NONMATCHING + mMode = 2; } /* 80C73998-80C73AB0 000698 0118+00 1/0 0/0 0/0 .text modeLiftDown__13daLv6Lblock_cFv */ void daLv6Lblock_c::modeLiftDown() { - // NONMATCHING + f32 dist_to_target = cLib_addCalc(¤t.pos.y, mBaseHeight, 0.1f, l_HIO.speed, 5.0f); + mDoAud_seStartLevel(Z2SE_OBJ_L6_UD_BLOCK_DW, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + + if (0.0f == dist_to_target) { + mDoAud_seStart(Z2SE_OBJ_L6_UD_BLOCK_DW_ST, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + init_modeWait(); + } } /* 80C73AB0-80C73B54 0007B0 00A4+00 1/0 0/0 0/0 .text Draw__13daLv6Lblock_cFv */ -void daLv6Lblock_c::Draw() { - // NONMATCHING +int daLv6Lblock_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } /* 80C73B54-80C73B84 000854 0030+00 1/0 0/0 0/0 .text Delete__13daLv6Lblock_cFv */ -void daLv6Lblock_c::Delete() { - // NONMATCHING +int daLv6Lblock_c::Delete() { + dComIfG_resDelete(&mPhase, "L6Lblock"); + return 1; } /* 80C73B84-80C73BB0 000884 002C+00 1/0 0/0 0/0 .text daLv6Lblock_Draw__FP13daLv6Lblock_c */ -static void daLv6Lblock_Draw(daLv6Lblock_c* param_0) { - // NONMATCHING +static int daLv6Lblock_Draw(daLv6Lblock_c* i_this) { + return i_this->MoveBGDraw(); } /* 80C73BB0-80C73BD0 0008B0 0020+00 1/0 0/0 0/0 .text daLv6Lblock_Execute__FP13daLv6Lblock_c */ -static void daLv6Lblock_Execute(daLv6Lblock_c* param_0) { - // NONMATCHING +static int daLv6Lblock_Execute(daLv6Lblock_c* i_this) { + return i_this->MoveBGExecute(); } /* 80C73BD0-80C73BF0 0008D0 0020+00 1/0 0/0 0/0 .text daLv6Lblock_Delete__FP13daLv6Lblock_c */ -static void daLv6Lblock_Delete(daLv6Lblock_c* param_0) { - // NONMATCHING +static int daLv6Lblock_Delete(daLv6Lblock_c* i_this) { + return i_this->MoveBGDelete(); } /* 80C73BF0-80C73C10 0008F0 0020+00 1/0 0/0 0/0 .text daLv6Lblock_Create__FP10fopAc_ac_c */ -static void daLv6Lblock_Create(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 80C73C10-80C73C6C 000910 005C+00 2/1 0/0 0/0 .text __dt__17daLv6Lblock_HIO_cFv */ -daLv6Lblock_HIO_c::~daLv6Lblock_HIO_c() { - // NONMATCHING -} - -/* 80C73C6C-80C73CA8 00096C 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv6Lblock_cpp */ -void __sinit_d_a_obj_lv6Lblock_cpp() { - // NONMATCHING +static int daLv6Lblock_Create(fopAc_ac_c* i_this) { + return ((daLv6Lblock_c*)i_this)->create(); } -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C73C6C, __sinit_d_a_obj_lv6Lblock_cpp); -#pragma pop +/* 80C73D54-80C73D74 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6Lblock_Method */ +static actor_method_class l_daLv6Lblock_Method = { + (process_method_func)daLv6Lblock_Create, + (process_method_func)daLv6Lblock_Delete, + (process_method_func)daLv6Lblock_Execute, + (process_method_func)NULL, + (process_method_func)daLv6Lblock_Draw, +}; -/* 80C73CD8-80C73CD8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C73D74-80C73DA4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6Lblock */ +extern actor_process_profile_definition g_profile_Obj_Lv6Lblock = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6Lblock, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daLv6Lblock_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 625, // mPriority + &l_daLv6Lblock_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; |