From e1c5bdb53935499993e03dd3a023e2b6e46e670e Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 13 Feb 2024 10:21:57 -0800 Subject: [PATCH] d_a_e_yd_leaf and d_a_e_ph done (#2070) * d_a_e_yd_leaf done * d_a_e_ph OK * remove asm * some e_ph doc * match dBgS_Acch, fix f_op_actor_mng weak funcs * dBgS_Acch done * cleanup dBgS Chk TUs * d_a_obj done --- ...Start__5daObjFPC4cXyziPC12dCcD_GObjInfUl.s | 93 - ..._break_tsubo__5daObjFP10fopAc_ac_c4cXyzi.s | 83 - asm/d/a/d_a_obj/func_800373F0.s | 64 - asm/d/a/d_a_obj/func_800374EC.s | 81 - ...ff_break_gm_kotubo__5daObjFP10fopAc_ac_c.s | 38 - ...ff_break_gm_ootubo__5daObjFP10fopAc_ac_c.s | 38 - ..._eff_break_kotubo2__5daObjFP10fopAc_ac_c.s | 38 - ...e_eff_break_kotubo__5daObjFP10fopAc_ac_c.s | 38 - ...pAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz.s | 94 - ...am__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff.s | 13 - ...at_rotBaseY__5daObjFP10QuaternionRC4cXyz.s | 99 - .../CalcWallBmdCyl__9dBgS_AcchFv.s | 61 - .../d_bg_s_acch/CrrPos__9dBgS_AcchFR4dBgS.s | 329 -- .../GetWallAddY__9dBgS_AcchFR3Vec.s | 36 - .../GroundCheck__9dBgS_AcchFR4dBgS.s | 134 - .../LineCheck__9dBgS_AcchFR4dBgS.s | 307 -- asm/d/bg/d_bg_s_acch/__ct__9dBgS_AcchFv.s | 76 - asm/d/bg/d_bg_s_acch/__dt__12dBgS_AcchCirFv.s | 30 - asm/d/bg/d_bg_s_acch/__dt__9dBgS_AcchFv.s | 73 - asm/d/bg/d_bg_s_acch/func_80077484.s | 3 - asm/d/bg/d_bg_s_acch/func_8007748C.s | 3 - .../bg/d_bg_s_gnd_chk/__dt__11dBgS_GndChkFv.s | 36 - .../d_bg_s_gnd_chk/__dt__14dBgS_CamGndChkFv.s | 32 - .../__dt__18dBgS_CamGndChk_WtrFv.s | 32 - .../__dt__18dBgS_ObjGndChk_AllFv.s | 43 - .../__dt__18dBgS_ObjGndChk_SplFv.s | 43 - .../__dt__18dBgS_ObjGndChk_WtrFv.s | 43 - asm/d/bg/d_bg_s_gnd_chk/func_80077B10.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B18.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B20.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B28.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B30.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B38.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B40.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B48.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B50.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B58.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B60.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B68.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B70.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B78.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B80.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B88.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B90.s | 3 - asm/d/bg/d_bg_s_gnd_chk/func_80077B98.s | 3 - .../bg/d_bg_s_lin_chk/__dt__11dBgS_LinChkFv.s | 36 - .../d_bg_s_lin_chk/__dt__14dBgS_CamLinChkFv.s | 32 - .../d_bg_s_lin_chk/__dt__14dBgS_ObjLinChkFv.s | 32 - .../__dt__15dBgS_BombLinChkFv.s | 32 - .../__dt__15dBgS_LinkLinChkFv.s | 32 - .../__dt__15dBgS_RopeLinChkFv.s | 32 - .../__dt__16dBgS_ArrowLinChkFv.s | 32 - .../__dt__16dBgS_HorseLinChkFv.s | 32 - .../__dt__20dBgS_BoomerangLinChkFv.s | 32 - .../__dt__21dBgS_CamLinChk_NorWtrFv.s | 32 - asm/d/bg/d_bg_s_lin_chk/func_80078534.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_8007853C.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_80078544.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_8007854C.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_80078554.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_8007855C.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_80078564.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_8007856C.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_80078574.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_8007857C.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_80078584.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_8007858C.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_80078594.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_8007859C.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785A4.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785AC.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785B4.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785BC.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785C4.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785CC.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785D4.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785DC.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785E4.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785EC.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785F4.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_800785FC.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_80078604.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_8007860C.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_80078614.s | 3 - asm/d/bg/d_bg_s_lin_chk/func_8007861C.s | 3 - .../__dt__16dBgS_PolyPassChkFv.s | 26 - .../f_op_actor_mng/__dt__11dBgS_WtrChkFv.s | 32 - .../f_op_actor_mng/__dt__14dBgS_ObjGndChkFv.s | 32 - .../__dt__15dBgS_ObjRoofChkFv.s | 32 - asm/f_op/f_op_actor_mng/__dt__5l_HIOFv.s | 17 - .../__sinit_f_op_actor_mng_cpp.s | 72 - asm/f_op/f_op_actor_mng/func_8001E0D4.s | 3 - asm/f_op/f_op_actor_mng/func_8001E0DC.s | 3 - asm/f_op/f_op_actor_mng/func_8001E0E4.s | 3 - asm/f_op/f_op_actor_mng/func_8001E0EC.s | 3 - asm/f_op/f_op_actor_mng/func_8001E0F4.s | 3 - asm/f_op/f_op_actor_mng/func_8001E0FC.s | 3 - asm/f_op/f_op_actor_mng/func_8001E104.s | 3 - asm/f_op/f_op_actor_mng/func_8001E10C.s | 3 - asm/f_op/f_op_actor_mng/func_8001E114.s | 3 - .../e/d_a_e_ph/d_a_e_ph/Action__8daE_PH_cFv.s | 188 - .../d_a_e_ph/AttentionSet__8daE_PH_cFv.s | 158 - .../d_a_e_ph/d_a_e_ph/BaseSet__8daE_PH_cFv.s | 52 - .../d_a_e_ph/d_a_e_ph/C_Action__8daE_PH_cFv.s | 123 - .../d_a_e_ph/C_CheckPoint__8daE_PH_cFv.s | 32 - .../d_a_e_ph/CamAction__8daE_PH_cFv.s | 168 - .../d_a_e_ph/d_a_e_ph/De_Timer__8daE_PH_cFv.s | 19 - .../e/d_a_e_ph/d_a_e_ph/Delete__8daE_PH_cFv.s | 29 - .../d_a_e_ph/DemoAction__8daE_PH_cFv.s | 386 -- .../d_a_e_ph/DownBoots__8daE_PH_cFv.s | 78 - .../d_a_e_ph/d_a_e_ph/Execute__8daE_PH_cFv.s | 73 - .../e/d_a_e_ph/d_a_e_ph/EyeSet__8daE_PH_cFv.s | 17 - .../d_a_e_ph/d_a_e_ph/FlyAnm2__8daE_PH_cFv.s | 182 - .../e/d_a_e_ph/d_a_e_ph/FlyAnm__8daE_PH_cFv.s | 168 - .../d_a_e_ph/d_a_e_ph/GoTarget__8daE_PH_cFv.s | 170 - .../d_a_e_ph/JointCallBack__FP8J3DJointi.s | 21 - .../e/d_a_e_ph/d_a_e_ph/ObjHit__8daE_PH_cFv.s | 153 - .../d_a_e_ph/d_a_e_ph/S_Action__8daE_PH_cFv.s | 31 - .../d_a_e_ph/S_CheckPoint__8daE_PH_cFv.s | 111 - .../d_a_e_ph/S_GoTarget__8daE_PH_cFv.s | 272 -- .../d_a_e_ph/S_SetAngle__8daE_PH_cFv.s | 349 -- .../d_a_e_ph/S_SetPlaySpeed__8daE_PH_cFv.s | 51 - .../d_a_e_ph/SearchBackPos__8daE_PH_cFv.s | 21 - .../d_a_e_ph/SearchNearP__8daE_PH_cFv.s | 154 - .../d_a_e_ph/SearchNextPos__8daE_PH_cFv.s | 22 - .../d_a_e_ph/SetAnm__8daE_PH_cFiiff.s | 44 - .../d_a_e_ph/SetCMoveCam__8daE_PH_cF4cXyzff.s | 18 - .../d_a_e_ph/SetCheckAngle__8daE_PH_cFv.s | 282 -- .../d_a_e_ph/SetHeadAngle__8daE_PH_cFs.s | 30 - .../d_a_e_ph/SetReleaseCam__8daE_PH_cFv.s | 42 - .../d_a_e_ph/SetShapeAngle__8daE_PH_cFv.s | 115 - .../d_a_e_ph/SetStopCam__8daE_PH_cF4cXyzffs.s | 73 - .../d_a_e_ph/SetStopingCam__8daE_PH_cFv.s | 34 - .../d_a_e_ph/StopAction__8daE_PH_cFv.s | 111 - .../d_a_e_ph/ToumeiAction__8daE_PH_cFv.s | 168 - .../d_a_e_ph/d_a_e_ph/UpBoots__8daE_PH_cFv.s | 72 - .../d_a_e_ph/__ct__12daE_PH_HIO_cFv.s | 17 - .../d_a_e_ph/__dt__12dBgS_ObjAcchFv.s | 30 - .../d_a_e_ph/__dt__12daE_PH_HIO_cFv.s | 20 - .../a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGAabFv.s | 20 - .../a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGSphFv.s | 20 - .../d_a_e_ph/d_a_e_ph/__sinit_d_a_e_ph_cpp.s | 16 - .../e/d_a_e_ph/d_a_e_ph/create__8daE_PH_cFv.s | 416 --- ...trlJoint__8daE_PH_cFP8J3DJointP8J3DModel.s | 47 - .../d_a_e_ph/daE_PH_Create__FP10fopAc_ac_c.s | 9 - .../d_a_e_ph/daE_PH_Delete__FP8daE_PH_c.s | 10 - .../d_a_e_ph/daE_PH_Draw__FP8daE_PH_c.s | 75 - .../d_a_e_ph/daE_PH_Execute__FP8daE_PH_c.s | 9 - .../d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD0.s | 3 - .../d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD8.s | 3 - .../d_a_e_ph/initCcSph__8daE_PH_cFv.s | 25 - ...other_bg_check__FP8daE_PH_cP10fopAc_ac_c.s | 57 - .../d_a_e_ph/setBaseMtx__8daE_PH_cFv.s | 33 - .../d_a_e_ph/d_a_e_ph/setCcSph__8daE_PH_cFv.s | 40 - .../d_a_e_ph/useHeapInit__FP10fopAc_ac_c.s | 67 - .../daE_YD_LEAF_Create__FP10fopAc_ac_c.s | 53 - .../daE_YD_LEAF_Delete__FP15e_yd_leaf_class.s | 13 - .../daE_YD_LEAF_Draw__FP15e_yd_leaf_class.s | 43 - ...daE_YD_LEAF_Execute__FP15e_yd_leaf_class.s | 78 - .../useHeapInit__FP10fopAc_ac_c.s | 69 - .../JSystem/J3DGraphAnimator/J3DAnimation.h | 2 +- include/SSystem/SComponent/c_bg_s_chk.h | 2 +- include/SSystem/SComponent/c_bg_s_lin_chk.h | 1 + include/SSystem/SComponent/c_cc_d.h | 1 + include/SSystem/SComponent/c_xyz.h | 1 + include/d/a/d_a_obj.h | 22 +- include/d/a/d_a_player.h | 8 +- include/d/bg/d_bg_s_acch.h | 9 +- include/d/bg/d_bg_s_gnd_chk.h | 2 +- include/d/bg/d_bg_s_poly_pass_chk.h | 2 +- include/d/bg/d_bg_s_roof_chk.h | 7 + include/d/bg/d_bg_s_wtr_chk.h | 2 +- include/d/d_camera.h | 1 + include/d/particle/d_particle.h | 2 +- include/d/particle/d_particle_name.h | 3206 +++++++++++++++++ include/f_op/f_op_actor_mng.h | 47 +- include/m_Do/m_Do_ext.h | 47 +- include/m_Do/m_Do_mtx.h | 4 + include/rel/d/a/e/d_a_e_ph/d_a_e_ph.h | 109 +- .../rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.h | 11 +- obj_files.mk | 3 + rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp | 2434 +++++++------ rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp | 281 +- rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp | 2 +- src/d/a/d_a_no_chg_room.cpp | 4 - src/d/a/d_a_obj.cpp | 429 +-- src/d/bg/d_bg_s_acch.cpp | 691 ++-- src/d/bg/d_bg_s_chk.cpp | 2 +- src/d/bg/d_bg_s_gnd_chk.cpp | 398 +- src/d/bg/d_bg_s_grp_pass_chk.cpp | 7 +- src/d/bg/d_bg_s_lin_chk.cpp | 656 +--- src/d/bg/d_bg_s_poly_pass_chk.cpp | 94 +- src/d/bg/d_bg_s_roof_chk.cpp | 2 +- src/d/bg/d_bg_s_sph_chk.cpp | 2 +- src/d/bg/d_bg_s_spl_grp_chk.cpp | 2 +- src/d/bg/d_bg_s_wtr_chk.cpp | 2 +- src/d/d_k_wmark.cpp | 4 - src/d/d_k_wpillar.cpp | 8 - src/d/d_lib.cpp | 9 - src/f_op/f_op_actor_mng.cpp | 284 +- src/f_op/f_op_camera.cpp | 33 + 201 files changed, 5249 insertions(+), 11440 deletions(-) delete mode 100644 asm/d/a/d_a_obj/HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl.s delete mode 100644 asm/d/a/d_a_obj/eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi.s delete mode 100644 asm/d/a/d_a_obj/func_800373F0.s delete mode 100644 asm/d/a/d_a_obj/func_800374EC.s delete mode 100644 asm/d/a/d_a_obj/make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_obj/make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_obj/make_eff_break_kotubo2__5daObjFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_obj/make_eff_break_kotubo__5daObjFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_obj/posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz.s delete mode 100644 asm/d/a/d_a_obj/posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff.s delete mode 100644 asm/d/a/d_a_obj/quat_rotBaseY__5daObjFP10QuaternionRC4cXyz.s delete mode 100644 asm/d/bg/d_bg_s_acch/CalcWallBmdCyl__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/CrrPos__9dBgS_AcchFR4dBgS.s delete mode 100644 asm/d/bg/d_bg_s_acch/GetWallAddY__9dBgS_AcchFR3Vec.s delete mode 100644 asm/d/bg/d_bg_s_acch/GroundCheck__9dBgS_AcchFR4dBgS.s delete mode 100644 asm/d/bg/d_bg_s_acch/LineCheck__9dBgS_AcchFR4dBgS.s delete mode 100644 asm/d/bg/d_bg_s_acch/__ct__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/__dt__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/func_80077484.s delete mode 100644 asm/d/bg/d_bg_s_acch/func_8007748C.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__dt__11dBgS_GndChkFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__dt__14dBgS_CamGndChkFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_CamGndChk_WtrFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_AllFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_SplFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_WtrFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B10.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B18.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B20.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B28.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B30.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B38.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B40.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B48.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B50.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B58.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B60.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B68.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B70.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B78.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B80.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B88.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B90.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/func_80077B98.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__11dBgS_LinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_CamLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_ObjLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_BombLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_LinkLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_RopeLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_ArrowLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_HorseLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__20dBgS_BoomerangLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__dt__21dBgS_CamLinChk_NorWtrFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_80078534.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_8007853C.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_80078544.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_8007854C.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_80078554.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_8007855C.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_80078564.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_8007856C.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_80078574.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_8007857C.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_80078584.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_8007858C.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_80078594.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_8007859C.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785A4.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785AC.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785B4.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785BC.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785C4.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785CC.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785D4.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785DC.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785E4.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785EC.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785F4.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_800785FC.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_80078604.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_8007860C.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_80078614.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/func_8007861C.s delete mode 100644 asm/d/bg/d_bg_s_poly_pass_chk/__dt__16dBgS_PolyPassChkFv.s delete mode 100644 asm/f_op/f_op_actor_mng/__dt__11dBgS_WtrChkFv.s delete mode 100644 asm/f_op/f_op_actor_mng/__dt__14dBgS_ObjGndChkFv.s delete mode 100644 asm/f_op/f_op_actor_mng/__dt__15dBgS_ObjRoofChkFv.s delete mode 100644 asm/f_op/f_op_actor_mng/__dt__5l_HIOFv.s delete mode 100644 asm/f_op/f_op_actor_mng/__sinit_f_op_actor_mng_cpp.s delete mode 100644 asm/f_op/f_op_actor_mng/func_8001E0D4.s delete mode 100644 asm/f_op/f_op_actor_mng/func_8001E0DC.s delete mode 100644 asm/f_op/f_op_actor_mng/func_8001E0E4.s delete mode 100644 asm/f_op/f_op_actor_mng/func_8001E0EC.s delete mode 100644 asm/f_op/f_op_actor_mng/func_8001E0F4.s delete mode 100644 asm/f_op/f_op_actor_mng/func_8001E0FC.s delete mode 100644 asm/f_op/f_op_actor_mng/func_8001E104.s delete mode 100644 asm/f_op/f_op_actor_mng/func_8001E10C.s delete mode 100644 asm/f_op/f_op_actor_mng/func_8001E114.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Action__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/AttentionSet__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/BaseSet__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_Action__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_CheckPoint__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/CamAction__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/De_Timer__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Delete__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DemoAction__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DownBoots__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Execute__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/EyeSet__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm2__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/GoTarget__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/JointCallBack__FP8J3DJointi.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ObjHit__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_Action__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_CheckPoint__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_GoTarget__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetAngle__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetPlaySpeed__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchBackPos__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNearP__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNextPos__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetAnm__8daE_PH_cFiiff.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCMoveCam__8daE_PH_cF4cXyzff.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCheckAngle__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetHeadAngle__8daE_PH_cFs.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetReleaseCam__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetShapeAngle__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopCam__8daE_PH_cF4cXyzffs.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopingCam__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/StopAction__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ToumeiAction__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/UpBoots__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__ct__12daE_PH_HIO_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12daE_PH_HIO_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGSphFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__sinit_d_a_e_ph_cpp.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/create__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ctrlJoint__8daE_PH_cFP8J3DJointP8J3DModel.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Delete__FP8daE_PH_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Draw__FP8daE_PH_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Execute__FP8daE_PH_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD0.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD8.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/initCcSph__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/other_bg_check__FP8daE_PH_cP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setBaseMtx__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setCcSph__8daE_PH_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Delete__FP15e_yd_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Draw__FP15e_yd_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Execute__FP15e_yd_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/useHeapInit__FP10fopAc_ac_c.s diff --git a/asm/d/a/d_a_obj/HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl.s b/asm/d/a/d_a_obj/HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl.s deleted file mode 100644 index 1ee7d0d2fe8..00000000000 --- a/asm/d/a/d_a_obj/HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_80037900: -/* 80037900 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80037904 7C 08 02 A6 */ mflr r0 -/* 80037908 90 01 00 34 */ stw r0, 0x34(r1) -/* 8003790C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80037910 48 32 A8 BD */ bl _savegpr_25 -/* 80037914 7C 7D 1B 78 */ mr r29, r3 -/* 80037918 7C 9E 23 78 */ mr r30, r4 -/* 8003791C 7C BA 2B 78 */ mr r26, r5 -/* 80037920 7C DF 33 78 */ mr r31, r6 -/* 80037924 7F 43 D3 78 */ mr r3, r26 -/* 80037928 48 04 CC 55 */ bl GetTgHitObjSe__12dCcD_GObjInfFv -/* 8003792C 54 7B 06 3E */ clrlwi r27, r3, 0x18 -/* 80037930 38 7A 00 9C */ addi r3, r26, 0x9c -/* 80037934 48 04 BD 55 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 80037938 7C 7C 1B 78 */ mr r28, r3 -/* 8003793C 7F 43 D3 78 */ mr r3, r26 -/* 80037940 48 04 CB B9 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80037944 3B 40 00 00 */ li r26, 0 -/* 80037948 2C 1B 00 00 */ cmpwi r27, 0 -/* 8003794C 41 82 00 E8 */ beq lbl_80037A34 -/* 80037950 28 1C 00 00 */ cmplwi r28, 0 -/* 80037954 41 82 00 A4 */ beq lbl_800379F8 -/* 80037958 28 03 00 00 */ cmplwi r3, 0 -/* 8003795C 41 82 00 9C */ beq lbl_800379F8 -/* 80037960 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80037964 54 60 04 21 */ rlwinm. r0, r3, 0, 0x10, 0x10 -/* 80037968 41 82 00 10 */ beq lbl_80037978 -/* 8003796C 3C 60 00 04 */ lis r3, 0x0004 /* 0x00040006@ha */ -/* 80037970 3B 23 00 06 */ addi r25, r3, 0x0006 /* 0x00040006@l */ -/* 80037974 48 00 00 84 */ b lbl_800379F8 -lbl_80037978: -/* 80037978 54 60 04 A5 */ rlwinm. r0, r3, 0, 0x12, 0x12 -/* 8003797C 41 82 00 10 */ beq lbl_8003798C -/* 80037980 3C 60 00 04 */ lis r3, 0x0004 /* 0x00040008@ha */ -/* 80037984 3B 23 00 08 */ addi r25, r3, 0x0008 /* 0x00040008@l */ -/* 80037988 48 00 00 70 */ b lbl_800379F8 -lbl_8003798C: -/* 8003798C 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 -/* 80037990 41 82 00 10 */ beq lbl_800379A0 -/* 80037994 3C 60 00 04 */ lis r3, 0x0004 /* 0x0004000A@ha */ -/* 80037998 3B 23 00 0A */ addi r25, r3, 0x000A /* 0x0004000A@l */ -/* 8003799C 48 00 00 5C */ b lbl_800379F8 -lbl_800379A0: -/* 800379A0 A8 1C 00 0E */ lha r0, 0xe(r28) -/* 800379A4 2C 00 00 FD */ cmpwi r0, 0xfd -/* 800379A8 40 82 00 14 */ bne lbl_800379BC -/* 800379AC 48 12 79 ED */ bl checkMasterSwordEquip__9daPy_py_cFv -/* 800379B0 2C 03 00 00 */ cmpwi r3, 0 -/* 800379B4 41 82 00 08 */ beq lbl_800379BC -/* 800379B8 3B 40 00 01 */ li r26, 1 -lbl_800379BC: -/* 800379BC 2C 1B 00 05 */ cmpwi r27, 5 -/* 800379C0 40 82 00 10 */ bne lbl_800379D0 -/* 800379C4 3C 60 00 04 */ lis r3, 0x0004 /* 0x00040005@ha */ -/* 800379C8 3B 23 00 05 */ addi r25, r3, 0x0005 /* 0x00040005@l */ -/* 800379CC 48 00 00 2C */ b lbl_800379F8 -lbl_800379D0: -/* 800379D0 2C 1B 00 09 */ cmpwi r27, 9 -/* 800379D4 40 82 00 10 */ bne lbl_800379E4 -/* 800379D8 3C 60 00 04 */ lis r3, 0x0004 /* 0x0004000A@ha */ -/* 800379DC 3B 23 00 0A */ addi r25, r3, 0x000A /* 0x0004000A@l */ -/* 800379E0 48 00 00 18 */ b lbl_800379F8 -lbl_800379E4: -/* 800379E4 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 800379E8 41 82 00 0C */ beq lbl_800379F4 -/* 800379EC 3F 20 00 04 */ lis r25, 4 -/* 800379F0 48 00 00 08 */ b lbl_800379F8 -lbl_800379F4: -/* 800379F4 3F 20 00 04 */ lis r25, 4 -lbl_800379F8: -/* 800379F8 7F C3 F3 78 */ mr r3, r30 -/* 800379FC 4B FF 56 71 */ bl dComIfGp_getReverb__Fi -/* 80037A00 7C 60 1B 78 */ mr r0, r3 -/* 80037A04 93 21 00 08 */ stw r25, 8(r1) -/* 80037A08 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80037A0C 38 81 00 08 */ addi r4, r1, 8 -/* 80037A10 7F A5 EB 78 */ mr r5, r29 -/* 80037A14 57 E6 06 3E */ clrlwi r6, r31, 0x18 -/* 80037A18 7C 07 07 74 */ extsb r7, r0 -/* 80037A1C C0 22 83 98 */ lfs f1, lit_3671(r2) -/* 80037A20 FC 40 08 90 */ fmr f2, f1 -/* 80037A24 C0 62 83 A4 */ lfs f3, lit_3836(r2) -/* 80037A28 FC 80 18 90 */ fmr f4, f3 -/* 80037A2C 39 00 00 00 */ li r8, 0 -/* 80037A30 48 27 3F 55 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80037A34: -/* 80037A34 39 61 00 30 */ addi r11, r1, 0x30 -/* 80037A38 48 32 A7 E1 */ bl _restgpr_25 -/* 80037A3C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80037A40 7C 08 03 A6 */ mtlr r0 -/* 80037A44 38 21 00 30 */ addi r1, r1, 0x30 -/* 80037A48 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi.s b/asm/d/a/d_a_obj/eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi.s deleted file mode 100644 index a832541da35..00000000000 --- a/asm/d/a/d_a_obj/eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_80037038: -/* 80037038 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8003703C 7C 08 02 A6 */ mflr r0 -/* 80037040 90 01 00 44 */ stw r0, 0x44(r1) -/* 80037044 39 61 00 40 */ addi r11, r1, 0x40 -/* 80037048 48 32 B1 89 */ bl _savegpr_26 -/* 8003704C 7C 7D 1B 78 */ mr r29, r3 -/* 80037050 7C 9E 23 78 */ mr r30, r4 -/* 80037054 7C BF 2B 78 */ mr r31, r5 -/* 80037058 3C 60 80 38 */ lis r3, d_a_d_a_obj__stringBase0@ha /* 0x803792A8@ha */ -/* 8003705C 38 63 92 A8 */ addi r3, r3, d_a_d_a_obj__stringBase0@l /* 0x803792A8@l */ -/* 80037060 38 80 00 20 */ li r4, 0x20 -/* 80037064 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80037068 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003706C 3F 45 00 02 */ addis r26, r5, 2 -/* 80037070 3B 5A C2 F8 */ addi r26, r26, -15624 -/* 80037074 7F 45 D3 78 */ mr r5, r26 -/* 80037078 38 C0 00 80 */ li r6, 0x80 -/* 8003707C 48 00 52 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80037080 7C 7B 1B 78 */ mr r27, r3 -/* 80037084 3C 60 80 38 */ lis r3, d_a_d_a_obj__stringBase0@ha /* 0x803792A8@ha */ -/* 80037088 38 63 92 A8 */ addi r3, r3, d_a_d_a_obj__stringBase0@l /* 0x803792A8@l */ -/* 8003708C 38 80 00 42 */ li r4, 0x42 -/* 80037090 7F 45 D3 78 */ mr r5, r26 -/* 80037094 38 C0 00 80 */ li r6, 0x80 -/* 80037098 48 00 52 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8003709C 7C 7A 1B 78 */ mr r26, r3 -/* 800370A0 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 800370A4 7C 04 07 74 */ extsb r4, r0 -/* 800370A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800370AC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800370B0 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 800370B4 38 0D 89 10 */ la r0, mEcallback__18dPa_modelEcallBack(r13) /* 80450E90-_SDA_BASE_ */ -/* 800370B8 90 01 00 08 */ stw r0, 8(r1) -/* 800370BC 90 81 00 0C */ stw r4, 0xc(r1) -/* 800370C0 38 00 00 00 */ li r0, 0 -/* 800370C4 90 01 00 10 */ stw r0, 0x10(r1) -/* 800370C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800370CC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 800370D0 38 80 00 00 */ li r4, 0 -/* 800370D4 38 A0 01 5C */ li r5, 0x15c -/* 800370D8 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 800370DC 38 E0 00 00 */ li r7, 0 -/* 800370E0 39 00 00 00 */ li r8, 0 -/* 800370E4 39 20 00 00 */ li r9, 0 -/* 800370E8 39 40 00 FF */ li r10, 0xff -/* 800370EC C0 22 83 98 */ lfs f1, lit_3671(r2) -/* 800370F0 48 01 59 A1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 800370F4 7F 64 DB 78 */ mr r4, r27 -/* 800370F8 38 BD 01 0C */ addi r5, r29, 0x10c -/* 800370FC 38 C0 00 03 */ li r6, 3 -/* 80037100 7F 47 D3 78 */ mr r7, r26 -/* 80037104 39 00 00 00 */ li r8, 0 -/* 80037108 57 E9 06 3E */ clrlwi r9, r31, 0x18 -/* 8003710C 48 01 3A F5 */ bl setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc -/* 80037110 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80037114 7C 06 07 74 */ extsb r6, r0 -/* 80037118 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 8003711C 57 E5 18 38 */ slwi r5, r31, 3 -/* 80037120 3C 80 80 42 */ lis r4, mTsubo__13dPa_control_c@ha /* 0x80424794@ha */ -/* 80037124 38 04 47 94 */ addi r0, r4, mTsubo__13dPa_control_c@l /* 0x80424794@l */ -/* 80037128 7C 00 2A 14 */ add r0, r0, r5 -/* 8003712C 90 01 00 08 */ stw r0, 8(r1) -/* 80037130 90 C1 00 0C */ stw r6, 0xc(r1) -/* 80037134 38 00 00 00 */ li r0, 0 -/* 80037138 90 01 00 10 */ stw r0, 0x10(r1) -/* 8003713C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80037140 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80037144 38 80 00 00 */ li r4, 0 -/* 80037148 38 A0 01 5D */ li r5, 0x15d -/* 8003714C 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 80037150 38 E0 00 00 */ li r7, 0 -/* 80037154 39 00 00 00 */ li r8, 0 -/* 80037158 39 20 00 00 */ li r9, 0 -/* 8003715C 39 40 00 FF */ li r10, 0xff -/* 80037160 C0 22 83 98 */ lfs f1, lit_3671(r2) -/* 80037164 48 01 59 2D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80037168 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003716C 48 32 B0 B1 */ bl _restgpr_26 -/* 80037170 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80037174 7C 08 03 A6 */ mtlr r0 -/* 80037178 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003717C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/func_800373F0.s b/asm/d/a/d_a_obj/func_800373F0.s deleted file mode 100644 index e7b2f95f77f..00000000000 --- a/asm/d/a/d_a_obj/func_800373F0.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_800373F0: -/* 800373F0 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 800373F4 7C 08 02 A6 */ mflr r0 -/* 800373F8 90 01 00 64 */ stw r0, 0x64(r1) -/* 800373FC DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80037400 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80037404 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 80037408 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 8003740C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80037410 7C 7F 1B 78 */ mr r31, r3 -/* 80037414 FF C0 08 90 */ fmr f30, f1 -/* 80037418 FF E0 10 90 */ fmr f31, f2 -/* 8003741C 38 61 00 08 */ addi r3, r1, 8 -/* 80037420 38 84 04 F8 */ addi r4, r4, 0x4f8 -/* 80037424 48 22 F7 11 */ bl __mi__4cXyzCFRC3Vec -/* 80037428 C0 C1 00 08 */ lfs f6, 8(r1) -/* 8003742C D0 C1 00 20 */ stfs f6, 0x20(r1) -/* 80037430 C0 A1 00 0C */ lfs f5, 0xc(r1) -/* 80037434 D0 A1 00 24 */ stfs f5, 0x24(r1) -/* 80037438 C0 81 00 10 */ lfs f4, 0x10(r1) -/* 8003743C D0 81 00 28 */ stfs f4, 0x28(r1) -/* 80037440 EC 66 07 B2 */ fmuls f3, f6, f30 -/* 80037444 D0 61 00 14 */ stfs f3, 0x14(r1) -/* 80037448 EC 45 07 B2 */ fmuls f2, f5, f30 -/* 8003744C D0 41 00 18 */ stfs f2, 0x18(r1) -/* 80037450 EC 24 07 B2 */ fmuls f1, f4, f30 -/* 80037454 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80037458 FC 00 32 10 */ fabs f0, f6 -/* 8003745C FC 00 00 18 */ frsp f0, f0 -/* 80037460 EC 06 00 32 */ fmuls f0, f6, f0 -/* 80037464 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 80037468 EC 03 00 2A */ fadds f0, f3, f0 -/* 8003746C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80037470 FC 00 2A 10 */ fabs f0, f5 -/* 80037474 FC 00 00 18 */ frsp f0, f0 -/* 80037478 EC 05 00 32 */ fmuls f0, f5, f0 -/* 8003747C EC 1F 00 32 */ fmuls f0, f31, f0 -/* 80037480 EC 02 00 2A */ fadds f0, f2, f0 -/* 80037484 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80037488 FC 00 22 10 */ fabs f0, f4 -/* 8003748C FC 00 00 18 */ frsp f0, f0 -/* 80037490 EC 04 00 32 */ fmuls f0, f4, f0 -/* 80037494 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 80037498 EC 01 00 2A */ fadds f0, f1, f0 -/* 8003749C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 800374A0 38 61 00 14 */ addi r3, r1, 0x14 -/* 800374A4 7C 64 1B 78 */ mr r4, r3 -/* 800374A8 C0 22 83 A4 */ lfs f1, lit_3836(r2) -/* 800374AC 48 30 FC 2D */ bl PSVECScale -/* 800374B0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 800374B4 D0 1F 00 00 */ stfs f0, 0(r31) -/* 800374B8 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 800374BC D0 1F 00 04 */ stfs f0, 4(r31) -/* 800374C0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 800374C4 D0 1F 00 08 */ stfs f0, 8(r31) -/* 800374C8 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 800374CC CB E1 00 50 */ lfd f31, 0x50(r1) -/* 800374D0 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 800374D4 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 800374D8 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 800374DC 80 01 00 64 */ lwz r0, 0x64(r1) -/* 800374E0 7C 08 03 A6 */ mtlr r0 -/* 800374E4 38 21 00 60 */ addi r1, r1, 0x60 -/* 800374E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/func_800374EC.s b/asm/d/a/d_a_obj/func_800374EC.s deleted file mode 100644 index 1aa57ec737d..00000000000 --- a/asm/d/a/d_a_obj/func_800374EC.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_800374EC: -/* 800374EC 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 800374F0 7C 08 02 A6 */ mflr r0 -/* 800374F4 90 01 00 74 */ stw r0, 0x74(r1) -/* 800374F8 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 800374FC F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80037500 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 80037504 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80037508 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003750C 48 32 AC D1 */ bl _savegpr_29 -/* 80037510 7C 7D 1B 78 */ mr r29, r3 -/* 80037514 7C 9E 23 78 */ mr r30, r4 -/* 80037518 7C BF 2B 79 */ or. r31, r5, r5 -/* 8003751C FF C0 08 90 */ fmr f30, f1 -/* 80037520 FF E0 10 90 */ fmr f31, f2 -/* 80037524 3C 60 80 43 */ lis r3, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80037528 C4 03 0C F4 */ lfsu f0, Zero__4cXyz@l(r3) /* 0x80430CF4@l */ -/* 8003752C D0 1D 00 00 */ stfs f0, 0(r29) -/* 80037530 C0 03 00 04 */ lfs f0, 4(r3) -/* 80037534 D0 1D 00 04 */ stfs f0, 4(r29) -/* 80037538 C0 03 00 08 */ lfs f0, 8(r3) -/* 8003753C D0 1D 00 08 */ stfs f0, 8(r29) -/* 80037540 41 82 00 B8 */ beq lbl_800375F8 -/* 80037544 C0 06 00 00 */ lfs f0, 0(r6) -/* 80037548 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8003754C C0 26 00 04 */ lfs f1, 4(r6) -/* 80037550 D0 21 00 30 */ stfs f1, 0x30(r1) -/* 80037554 C0 06 00 08 */ lfs f0, 8(r6) -/* 80037558 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 8003755C C0 1E 05 30 */ lfs f0, 0x530(r30) -/* 80037560 EC 01 00 2A */ fadds f0, f1, f0 -/* 80037564 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80037568 28 07 00 00 */ cmplwi r7, 0 -/* 8003756C 41 82 00 14 */ beq lbl_80037580 -/* 80037570 38 61 00 2C */ addi r3, r1, 0x2c -/* 80037574 7C E4 3B 78 */ mr r4, r7 -/* 80037578 7C 65 1B 78 */ mr r5, r3 -/* 8003757C 48 30 FB 15 */ bl PSVECAdd -lbl_80037580: -/* 80037580 38 61 00 2C */ addi r3, r1, 0x2c -/* 80037584 7F E4 FB 78 */ mr r4, r31 -/* 80037588 48 30 FC 0D */ bl PSVECDotProduct -/* 8003758C C0 02 83 A0 */ lfs f0, lit_3801(r2) -/* 80037590 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80037594 40 80 00 64 */ bge lbl_800375F8 -/* 80037598 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8003759C FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 800375A0 4C 40 13 82 */ cror 2, 0, 2 -/* 800375A4 40 82 00 24 */ bne lbl_800375C8 -/* 800375A8 7F E3 FB 78 */ mr r3, r31 -/* 800375AC 38 81 00 2C */ addi r4, r1, 0x2c -/* 800375B0 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800375B4 48 23 76 09 */ bl cM3d_CrawVec__FRC3VecRC3VecP3Vec -/* 800375B8 7F A3 EB 78 */ mr r3, r29 -/* 800375BC 38 81 00 20 */ addi r4, r1, 0x20 -/* 800375C0 7F A5 EB 78 */ mr r5, r29 -/* 800375C4 48 30 FA CD */ bl PSVECAdd -lbl_800375C8: -/* 800375C8 7F E3 FB 78 */ mr r3, r31 -/* 800375CC 38 9E 04 F8 */ addi r4, r30, 0x4f8 -/* 800375D0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800375D4 48 23 75 E9 */ bl cM3d_CrawVec__FRC3VecRC3VecP3Vec -/* 800375D8 38 61 00 08 */ addi r3, r1, 8 -/* 800375DC 38 81 00 14 */ addi r4, r1, 0x14 -/* 800375E0 FC 20 F0 90 */ fmr f1, f30 -/* 800375E4 48 22 F5 A1 */ bl __ml__4cXyzCFf -/* 800375E8 7F A3 EB 78 */ mr r3, r29 -/* 800375EC 38 81 00 08 */ addi r4, r1, 8 -/* 800375F0 7F A5 EB 78 */ mr r5, r29 -/* 800375F4 48 30 FA C1 */ bl PSVECSubtract -lbl_800375F8: -/* 800375F8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 800375FC CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80037600 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 80037604 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80037608 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003760C 48 32 AC 1D */ bl _restgpr_29 -/* 80037610 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80037614 7C 08 03 A6 */ mtlr r0 -/* 80037618 38 21 00 70 */ addi r1, r1, 0x70 -/* 8003761C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c.s b/asm/d/a/d_a_obj/make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c.s deleted file mode 100644 index 714593dfbf0..00000000000 --- a/asm/d/a/d_a_obj/make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800372A0: -/* 800372A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800372A4 7C 08 02 A6 */ mflr r0 -/* 800372A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 800372AC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800372B0 7C 7F 1B 78 */ mr r31, r3 -/* 800372B4 88 0D 88 72 */ lbz r0, struct_80450DF0+0x2(r13) -/* 800372B8 7C 00 07 75 */ extsb. r0, r0 -/* 800372BC 40 82 00 34 */ bne lbl_800372F0 -/* 800372C0 C0 02 83 98 */ lfs f0, lit_3671(r2) -/* 800372C4 3C 60 80 42 */ lis r3, scale_3718@ha /* 0x80424624@ha */ -/* 800372C8 D4 03 46 24 */ stfsu f0, scale_3718@l(r3) /* 0x80424624@l */ -/* 800372CC D0 03 00 04 */ stfs f0, 4(r3) -/* 800372D0 D0 03 00 08 */ stfs f0, 8(r3) -/* 800372D4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 800372D8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 800372DC 3C A0 80 42 */ lis r5, lit_3719@ha /* 0x80424618@ha */ -/* 800372E0 38 A5 46 18 */ addi r5, r5, lit_3719@l /* 0x80424618@l */ -/* 800372E4 48 32 A9 41 */ bl __register_global_object -/* 800372E8 38 00 00 01 */ li r0, 1 -/* 800372EC 98 0D 88 72 */ stb r0, struct_80450DF0+0x2(r13) -lbl_800372F0: -/* 800372F0 3C 60 80 42 */ lis r3, scale_3718@ha /* 0x80424624@ha */ -/* 800372F4 C4 03 46 24 */ lfsu f0, scale_3718@l(r3) /* 0x80424624@l */ -/* 800372F8 D0 01 00 08 */ stfs f0, 8(r1) -/* 800372FC C0 03 00 04 */ lfs f0, 4(r3) -/* 80037300 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80037304 C0 03 00 08 */ lfs f0, 8(r3) -/* 80037308 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8003730C 7F E3 FB 78 */ mr r3, r31 -/* 80037310 38 81 00 08 */ addi r4, r1, 8 -/* 80037314 38 A0 00 03 */ li r5, 3 -/* 80037318 4B FF FD 21 */ bl eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi -/* 8003731C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80037320 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80037324 7C 08 03 A6 */ mtlr r0 -/* 80037328 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003732C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c.s b/asm/d/a/d_a_obj/make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c.s deleted file mode 100644 index a9c282788dc..00000000000 --- a/asm/d/a/d_a_obj/make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80037330: -/* 80037330 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80037334 7C 08 02 A6 */ mflr r0 -/* 80037338 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003733C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80037340 7C 7F 1B 78 */ mr r31, r3 -/* 80037344 88 0D 88 73 */ lbz r0, struct_80450DF0+0x3(r13) -/* 80037348 7C 00 07 75 */ extsb. r0, r0 -/* 8003734C 40 82 00 34 */ bne lbl_80037380 -/* 80037350 C0 02 83 9C */ lfs f0, lit_3714(r2) -/* 80037354 3C 60 80 42 */ lis r3, scale_3731@ha /* 0x8042463C@ha */ -/* 80037358 D4 03 46 3C */ stfsu f0, scale_3731@l(r3) /* 0x8042463C@l */ -/* 8003735C D0 03 00 04 */ stfs f0, 4(r3) -/* 80037360 D0 03 00 08 */ stfs f0, 8(r3) -/* 80037364 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 80037368 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 8003736C 3C A0 80 42 */ lis r5, lit_3732@ha /* 0x80424630@ha */ -/* 80037370 38 A5 46 30 */ addi r5, r5, lit_3732@l /* 0x80424630@l */ -/* 80037374 48 32 A8 B1 */ bl __register_global_object -/* 80037378 38 00 00 01 */ li r0, 1 -/* 8003737C 98 0D 88 73 */ stb r0, struct_80450DF0+0x3(r13) -lbl_80037380: -/* 80037380 3C 60 80 42 */ lis r3, scale_3731@ha /* 0x8042463C@ha */ -/* 80037384 C4 03 46 3C */ lfsu f0, scale_3731@l(r3) /* 0x8042463C@l */ -/* 80037388 D0 01 00 08 */ stfs f0, 8(r1) -/* 8003738C C0 03 00 04 */ lfs f0, 4(r3) -/* 80037390 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80037394 C0 03 00 08 */ lfs f0, 8(r3) -/* 80037398 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8003739C 7F E3 FB 78 */ mr r3, r31 -/* 800373A0 38 81 00 08 */ addi r4, r1, 8 -/* 800373A4 38 A0 00 04 */ li r5, 4 -/* 800373A8 4B FF FC 91 */ bl eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi -/* 800373AC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800373B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800373B4 7C 08 03 A6 */ mtlr r0 -/* 800373B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800373BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/make_eff_break_kotubo2__5daObjFP10fopAc_ac_c.s b/asm/d/a/d_a_obj/make_eff_break_kotubo2__5daObjFP10fopAc_ac_c.s deleted file mode 100644 index 5f0d19dd128..00000000000 --- a/asm/d/a/d_a_obj/make_eff_break_kotubo2__5daObjFP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80037210: -/* 80037210 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80037214 7C 08 02 A6 */ mflr r0 -/* 80037218 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003721C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80037220 7C 7F 1B 78 */ mr r31, r3 -/* 80037224 88 0D 88 71 */ lbz r0, struct_80450DF0+0x1(r13) -/* 80037228 7C 00 07 75 */ extsb. r0, r0 -/* 8003722C 40 82 00 34 */ bne lbl_80037260 -/* 80037230 C0 02 83 98 */ lfs f0, lit_3671(r2) -/* 80037234 3C 60 80 42 */ lis r3, scale_3691@ha /* 0x8042460C@ha */ -/* 80037238 D4 03 46 0C */ stfsu f0, scale_3691@l(r3) /* 0x8042460C@l */ -/* 8003723C D0 03 00 04 */ stfs f0, 4(r3) -/* 80037240 D0 03 00 08 */ stfs f0, 8(r3) -/* 80037244 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 80037248 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 8003724C 3C A0 80 42 */ lis r5, lit_3692@ha /* 0x80424600@ha */ -/* 80037250 38 A5 46 00 */ addi r5, r5, lit_3692@l /* 0x80424600@l */ -/* 80037254 48 32 A9 D1 */ bl __register_global_object -/* 80037258 38 00 00 01 */ li r0, 1 -/* 8003725C 98 0D 88 71 */ stb r0, struct_80450DF0+0x1(r13) -lbl_80037260: -/* 80037260 3C 60 80 42 */ lis r3, scale_3691@ha /* 0x8042460C@ha */ -/* 80037264 C4 03 46 0C */ lfsu f0, scale_3691@l(r3) /* 0x8042460C@l */ -/* 80037268 D0 01 00 08 */ stfs f0, 8(r1) -/* 8003726C C0 03 00 04 */ lfs f0, 4(r3) -/* 80037270 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80037274 C0 03 00 08 */ lfs f0, 8(r3) -/* 80037278 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8003727C 7F E3 FB 78 */ mr r3, r31 -/* 80037280 38 81 00 08 */ addi r4, r1, 8 -/* 80037284 38 A0 00 01 */ li r5, 1 -/* 80037288 4B FF FD B1 */ bl eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi -/* 8003728C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80037290 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80037294 7C 08 03 A6 */ mtlr r0 -/* 80037298 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003729C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/make_eff_break_kotubo__5daObjFP10fopAc_ac_c.s b/asm/d/a/d_a_obj/make_eff_break_kotubo__5daObjFP10fopAc_ac_c.s deleted file mode 100644 index b90632e9d49..00000000000 --- a/asm/d/a/d_a_obj/make_eff_break_kotubo__5daObjFP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80037180: -/* 80037180 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80037184 7C 08 02 A6 */ mflr r0 -/* 80037188 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003718C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80037190 7C 7F 1B 78 */ mr r31, r3 -/* 80037194 88 0D 88 70 */ lbz r0, struct_80450DF0+0x0(r13) -/* 80037198 7C 00 07 75 */ extsb. r0, r0 -/* 8003719C 40 82 00 34 */ bne lbl_800371D0 -/* 800371A0 C0 02 83 98 */ lfs f0, lit_3671(r2) -/* 800371A4 3C 60 80 42 */ lis r3, scale_3676@ha /* 0x804245F4@ha */ -/* 800371A8 D4 03 45 F4 */ stfsu f0, scale_3676@l(r3) /* 0x804245F4@l */ -/* 800371AC D0 03 00 04 */ stfs f0, 4(r3) -/* 800371B0 D0 03 00 08 */ stfs f0, 8(r3) -/* 800371B4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 800371B8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 800371BC 3C A0 80 42 */ lis r5, lit_3677@ha /* 0x804245E8@ha */ -/* 800371C0 38 A5 45 E8 */ addi r5, r5, lit_3677@l /* 0x804245E8@l */ -/* 800371C4 48 32 AA 61 */ bl __register_global_object -/* 800371C8 38 00 00 01 */ li r0, 1 -/* 800371CC 98 0D 88 70 */ stb r0, struct_80450DF0+0x0(r13) -lbl_800371D0: -/* 800371D0 3C 60 80 42 */ lis r3, scale_3676@ha /* 0x804245F4@ha */ -/* 800371D4 C4 03 45 F4 */ lfsu f0, scale_3676@l(r3) /* 0x804245F4@l */ -/* 800371D8 D0 01 00 08 */ stfs f0, 8(r1) -/* 800371DC C0 03 00 04 */ lfs f0, 4(r3) -/* 800371E0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800371E4 C0 03 00 08 */ lfs f0, 8(r3) -/* 800371E8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800371EC 7F E3 FB 78 */ mr r3, r31 -/* 800371F0 38 81 00 08 */ addi r4, r1, 8 -/* 800371F4 38 A0 00 00 */ li r5, 0 -/* 800371F8 4B FF FE 41 */ bl eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi -/* 800371FC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80037200 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80037204 7C 08 03 A6 */ mtlr r0 -/* 80037208 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003720C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz.s b/asm/d/a/d_a_obj/posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz.s deleted file mode 100644 index 3e5a4a1559e..00000000000 --- a/asm/d/a/d_a_obj/posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_80037620: -/* 80037620 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80037624 7C 08 02 A6 */ mflr r0 -/* 80037628 90 01 00 54 */ stw r0, 0x54(r1) -/* 8003762C DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80037630 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80037634 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 80037638 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 8003763C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80037640 48 32 AB 99 */ bl _savegpr_28 -/* 80037644 7C 7C 1B 78 */ mr r28, r3 -/* 80037648 7C 9D 23 78 */ mr r29, r4 -/* 8003764C 7C DE 33 78 */ mr r30, r6 -/* 80037650 FF C0 18 90 */ fmr f30, f3 -/* 80037654 FF E0 20 90 */ fmr f31, f4 -/* 80037658 7C FF 3B 78 */ mr r31, r7 -/* 8003765C 38 61 00 14 */ addi r3, r1, 0x14 -/* 80037660 7F 84 E3 78 */ mr r4, r28 -/* 80037664 4B FF FD 8D */ bl func_800373F0 -/* 80037668 38 61 00 08 */ addi r3, r1, 8 -/* 8003766C 7F 84 E3 78 */ mr r4, r28 -/* 80037670 7F C5 F3 78 */ mr r5, r30 -/* 80037674 FC 20 F0 90 */ fmr f1, f30 -/* 80037678 FC 40 F8 90 */ fmr f2, f31 -/* 8003767C 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80037680 7F E7 FB 78 */ mr r7, r31 -/* 80037684 4B FF FE 69 */ bl func_800374EC -/* 80037688 C0 9C 05 2C */ lfs f4, 0x52c(r28) -/* 8003768C C0 BC 05 30 */ lfs f5, 0x530(r28) -/* 80037690 A8 1C 04 DE */ lha r0, 0x4de(r28) -/* 80037694 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80037698 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8003769C 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800376A0 7C 03 04 2E */ lfsx f0, r3, r0 -/* 800376A4 C0 41 00 08 */ lfs f2, 8(r1) -/* 800376A8 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 800376AC EC 04 00 32 */ fmuls f0, f4, f0 -/* 800376B0 EC 01 00 2A */ fadds f0, f1, f0 -/* 800376B4 EC 22 00 2A */ fadds f1, f2, f0 -/* 800376B8 C0 61 00 0C */ lfs f3, 0xc(r1) -/* 800376BC C0 41 00 18 */ lfs f2, 0x18(r1) -/* 800376C0 C0 1C 04 FC */ lfs f0, 0x4fc(r28) -/* 800376C4 EC 00 28 2A */ fadds f0, f0, f5 -/* 800376C8 EC 02 00 2A */ fadds f0, f2, f0 -/* 800376CC EC A3 00 2A */ fadds f5, f3, f0 -/* 800376D0 7C 63 02 14 */ add r3, r3, r0 -/* 800376D4 C0 03 00 04 */ lfs f0, 4(r3) -/* 800376D8 C0 61 00 10 */ lfs f3, 0x10(r1) -/* 800376DC C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 800376E0 EC 04 00 32 */ fmuls f0, f4, f0 -/* 800376E4 EC 02 00 2A */ fadds f0, f2, f0 -/* 800376E8 EC 43 00 2A */ fadds f2, f3, f0 -/* 800376EC 28 1F 00 00 */ cmplwi r31, 0 -/* 800376F0 41 82 00 1C */ beq lbl_8003770C -/* 800376F4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 800376F8 EC 21 00 2A */ fadds f1, f1, f0 -/* 800376FC C0 1F 00 04 */ lfs f0, 4(r31) -/* 80037700 EC A5 00 2A */ fadds f5, f5, f0 -/* 80037704 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80037708 EC 42 00 2A */ fadds f2, f2, f0 -lbl_8003770C: -/* 8003770C C0 1C 05 34 */ lfs f0, 0x534(r28) -/* 80037710 FC 05 00 40 */ fcmpo cr0, f5, f0 -/* 80037714 40 80 00 08 */ bge lbl_8003771C -/* 80037718 FC A0 00 90 */ fmr f5, f0 -lbl_8003771C: -/* 8003771C D0 3C 04 F8 */ stfs f1, 0x4f8(r28) -/* 80037720 D0 BC 04 FC */ stfs f5, 0x4fc(r28) -/* 80037724 D0 5C 05 00 */ stfs f2, 0x500(r28) -/* 80037728 EC 61 00 72 */ fmuls f3, f1, f1 -/* 8003772C EC 02 00 B2 */ fmuls f0, f2, f2 -/* 80037730 EC 63 00 2A */ fadds f3, f3, f0 -/* 80037734 C0 02 83 A0 */ lfs f0, lit_3801(r2) -/* 80037738 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 8003773C 40 81 00 0C */ ble lbl_80037748 -/* 80037740 FC 00 18 34 */ frsqrte f0, f3 -/* 80037744 EC 60 00 F2 */ fmuls f3, f0, f3 -lbl_80037748: -/* 80037748 D0 7C 05 2C */ stfs f3, 0x52c(r28) -/* 8003774C 48 22 FF 29 */ bl cM_atan2s__Fff -/* 80037750 B0 7C 04 DE */ sth r3, 0x4de(r28) -/* 80037754 7F 83 E3 78 */ mr r3, r28 -/* 80037758 7F A4 EB 78 */ mr r4, r29 -/* 8003775C 4B FE 2F 05 */ bl fopAcM_posMove__FP10fopAc_ac_cPC4cXyz -/* 80037760 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80037764 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80037768 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 8003776C CB C1 00 30 */ lfd f30, 0x30(r1) -/* 80037770 39 61 00 30 */ addi r11, r1, 0x30 -/* 80037774 48 32 AA B1 */ bl _restgpr_28 -/* 80037778 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8003777C 7C 08 03 A6 */ mtlr r0 -/* 80037780 38 21 00 50 */ addi r1, r1, 0x50 -/* 80037784 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff.s b/asm/d/a/d_a_obj/posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff.s deleted file mode 100644 index 9a4f7a3a040..00000000000 --- a/asm/d/a/d_a_obj/posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800373C0: -/* 800373C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800373C4 7C 08 02 A6 */ mflr r0 -/* 800373C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800373CC 38 C0 00 00 */ li r6, 0 -/* 800373D0 C0 62 83 A0 */ lfs f3, lit_3801(r2) -/* 800373D4 FC 80 18 90 */ fmr f4, f3 -/* 800373D8 38 E0 00 00 */ li r7, 0 -/* 800373DC 48 00 02 45 */ bl posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz -/* 800373E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800373E4 7C 08 03 A6 */ mtlr r0 -/* 800373E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800373EC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_obj/quat_rotBaseY__5daObjFP10QuaternionRC4cXyz.s b/asm/d/a/d_a_obj/quat_rotBaseY__5daObjFP10QuaternionRC4cXyz.s deleted file mode 100644 index 0030eada8d2..00000000000 --- a/asm/d/a/d_a_obj/quat_rotBaseY__5daObjFP10QuaternionRC4cXyz.s +++ /dev/null @@ -1,99 +0,0 @@ -lbl_80037788: -/* 80037788 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8003778C 7C 08 02 A6 */ mflr r0 -/* 80037790 90 01 00 64 */ stw r0, 0x64(r1) -/* 80037794 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80037798 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 8003779C DB C1 00 40 */ stfd f30, 0x40(r1) -/* 800377A0 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 800377A4 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 800377A8 93 C1 00 38 */ stw r30, 0x38(r1) -/* 800377AC 7C 7E 1B 78 */ mr r30, r3 -/* 800377B0 7C 9F 23 78 */ mr r31, r4 -/* 800377B4 7F E3 FB 78 */ mr r3, r31 -/* 800377B8 48 30 F9 81 */ bl PSVECSquareMag -/* 800377BC FF E0 08 90 */ fmr f31, f1 -/* 800377C0 C0 02 83 A8 */ lfs f0, lit_3956(r2) -/* 800377C4 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 800377C8 40 81 00 EC */ ble lbl_800378B4 -/* 800377CC 38 61 00 14 */ addi r3, r1, 0x14 -/* 800377D0 3C 80 80 43 */ lis r4, BaseY__4cXyz@ha /* 0x80430D24@ha */ -/* 800377D4 38 84 0D 24 */ addi r4, r4, BaseY__4cXyz@l /* 0x80430D24@l */ -/* 800377D8 7F E5 FB 78 */ mr r5, r31 -/* 800377DC 48 22 F4 E1 */ bl outprod__4cXyzCFRC3Vec -/* 800377E0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 800377E4 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 800377E8 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 800377EC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 800377F0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 800377F4 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 800377F8 38 61 00 2C */ addi r3, r1, 0x2c -/* 800377FC 48 30 F9 3D */ bl PSVECSquareMag -/* 80037800 FF C0 08 90 */ fmr f30, f1 -/* 80037804 C0 02 83 A8 */ lfs f0, lit_3956(r2) -/* 80037808 FC 1E 00 40 */ fcmpo cr0, f30, f0 -/* 8003780C 40 81 00 80 */ ble lbl_8003788C -/* 80037810 38 61 00 08 */ addi r3, r1, 8 -/* 80037814 7F E4 FB 78 */ mr r4, r31 -/* 80037818 FC 20 F8 90 */ fmr f1, f31 -/* 8003781C 48 22 F3 FD */ bl __dv__4cXyzCFf -/* 80037820 C0 01 00 08 */ lfs f0, 8(r1) -/* 80037824 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80037828 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8003782C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80037830 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80037834 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80037838 3C 60 80 43 */ lis r3, BaseY__4cXyz@ha /* 0x80430D24@ha */ -/* 8003783C 38 63 0D 24 */ addi r3, r3, BaseY__4cXyz@l /* 0x80430D24@l */ -/* 80037840 38 81 00 20 */ addi r4, r1, 0x20 -/* 80037844 48 30 F9 51 */ bl PSVECDotProduct -/* 80037848 48 33 4E 99 */ bl acos -/* 8003784C FF E0 08 18 */ frsp f31, f1 -/* 80037850 C0 02 83 A0 */ lfs f0, lit_3801(r2) -/* 80037854 FC 1E 00 40 */ fcmpo cr0, f30, f0 -/* 80037858 40 81 00 0C */ ble lbl_80037864 -/* 8003785C FC 00 F0 34 */ frsqrte f0, f30 -/* 80037860 EF C0 07 B2 */ fmuls f30, f0, f30 -lbl_80037864: -/* 80037864 38 61 00 2C */ addi r3, r1, 0x2c -/* 80037868 7C 64 1B 78 */ mr r4, r3 -/* 8003786C C0 02 83 98 */ lfs f0, lit_3671(r2) -/* 80037870 EC 20 F0 24 */ fdivs f1, f0, f30 -/* 80037874 48 30 F8 65 */ bl PSVECScale -/* 80037878 7F C3 F3 78 */ mr r3, r30 -/* 8003787C 38 81 00 2C */ addi r4, r1, 0x2c -/* 80037880 FC 20 F8 90 */ fmr f1, f31 -/* 80037884 48 30 FB F1 */ bl C_QUATRotAxisRad -/* 80037888 48 00 00 50 */ b lbl_800378D8 -lbl_8003788C: -/* 8003788C 3C 60 80 38 */ lis r3, zero_quat@ha /* 0x80379298@ha */ -/* 80037890 C4 03 92 98 */ lfsu f0, zero_quat@l(r3) /* 0x80379298@l */ -/* 80037894 D0 1E 00 00 */ stfs f0, 0(r30) -/* 80037898 C0 03 00 04 */ lfs f0, 4(r3) -/* 8003789C D0 1E 00 04 */ stfs f0, 4(r30) -/* 800378A0 C0 03 00 08 */ lfs f0, 8(r3) -/* 800378A4 D0 1E 00 08 */ stfs f0, 8(r30) -/* 800378A8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 800378AC D0 1E 00 0C */ stfs f0, 0xc(r30) -/* 800378B0 48 00 00 28 */ b lbl_800378D8 -lbl_800378B4: -/* 800378B4 3C 60 80 38 */ lis r3, zero_quat@ha /* 0x80379298@ha */ -/* 800378B8 C4 03 92 98 */ lfsu f0, zero_quat@l(r3) /* 0x80379298@l */ -/* 800378BC D0 1E 00 00 */ stfs f0, 0(r30) -/* 800378C0 C0 03 00 04 */ lfs f0, 4(r3) -/* 800378C4 D0 1E 00 04 */ stfs f0, 4(r30) -/* 800378C8 C0 03 00 08 */ lfs f0, 8(r3) -/* 800378CC D0 1E 00 08 */ stfs f0, 8(r30) -/* 800378D0 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 800378D4 D0 1E 00 0C */ stfs f0, 0xc(r30) -lbl_800378D8: -/* 800378D8 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 800378DC CB E1 00 50 */ lfd f31, 0x50(r1) -/* 800378E0 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 800378E4 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 800378E8 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 800378EC 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 800378F0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 800378F4 7C 08 03 A6 */ mtlr r0 -/* 800378F8 38 21 00 60 */ addi r1, r1, 0x60 -/* 800378FC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/CalcWallBmdCyl__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/CalcWallBmdCyl__9dBgS_AcchFv.s deleted file mode 100644 index c4926973f1d..00000000000 --- a/asm/d/bg/d_bg_s_acch/CalcWallBmdCyl__9dBgS_AcchFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_8007703C: -/* 8007703C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80077040 7C 08 02 A6 */ mflr r0 -/* 80077044 90 01 00 24 */ stw r0, 0x24(r1) -/* 80077048 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8007704C 7C 7F 1B 78 */ mr r31, r3 -/* 80077050 80 03 00 88 */ lwz r0, 0x88(r3) -/* 80077054 2C 00 00 00 */ cmpwi r0, 0 -/* 80077058 41 81 00 1C */ bgt lbl_80077074 -/* 8007705C 38 7F 00 60 */ addi r3, r31, 0x60 -/* 80077060 80 9F 00 30 */ lwz r4, 0x30(r31) -/* 80077064 C0 22 8C C0 */ lfs f1, lit_4025(r2) -/* 80077068 FC 40 08 90 */ fmr f2, f1 -/* 8007706C 48 1F 81 15 */ bl Set__8cM3dGCylFRC4cXyzff -/* 80077070 48 00 00 90 */ b lbl_80077100 -lbl_80077074: -/* 80077074 4B FF FF 11 */ bl GetWallAllR__9dBgS_AcchFv -/* 80077078 80 9F 00 8C */ lwz r4, 0x8c(r31) -/* 8007707C C0 04 00 30 */ lfs f0, 0x30(r4) -/* 80077080 FC 60 00 90 */ fmr f3, f0 -/* 80077084 FC 80 00 90 */ fmr f4, f0 -/* 80077088 80 1F 00 88 */ lwz r0, 0x88(r31) -/* 8007708C 2C 00 00 01 */ cmpwi r0, 1 -/* 80077090 41 80 00 3C */ blt lbl_800770CC -/* 80077094 38 60 00 00 */ li r3, 0 -/* 80077098 7C 09 03 A6 */ mtctr r0 -/* 8007709C 2C 00 00 00 */ cmpwi r0, 0 -/* 800770A0 40 81 00 2C */ ble lbl_800770CC -lbl_800770A4: -/* 800770A4 38 03 00 30 */ addi r0, r3, 0x30 -/* 800770A8 7C 04 04 2E */ lfsx f0, r4, r0 -/* 800770AC FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 800770B0 40 81 00 08 */ ble lbl_800770B8 -/* 800770B4 FC 60 00 90 */ fmr f3, f0 -lbl_800770B8: -/* 800770B8 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 800770BC 40 80 00 08 */ bge lbl_800770C4 -/* 800770C0 FC 80 00 90 */ fmr f4, f0 -lbl_800770C4: -/* 800770C4 38 63 00 40 */ addi r3, r3, 0x40 -/* 800770C8 42 00 FF DC */ bdnz lbl_800770A4 -lbl_800770CC: -/* 800770CC 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 800770D0 C0 03 00 00 */ lfs f0, 0(r3) -/* 800770D4 D0 01 00 08 */ stfs f0, 8(r1) -/* 800770D8 C0 43 00 04 */ lfs f2, 4(r3) -/* 800770DC D0 41 00 0C */ stfs f2, 0xc(r1) -/* 800770E0 C0 03 00 08 */ lfs f0, 8(r3) -/* 800770E4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800770E8 EC 02 18 2A */ fadds f0, f2, f3 -/* 800770EC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800770F0 38 7F 00 60 */ addi r3, r31, 0x60 -/* 800770F4 38 81 00 08 */ addi r4, r1, 8 -/* 800770F8 EC 44 18 28 */ fsubs f2, f4, f3 -/* 800770FC 48 1F 80 85 */ bl Set__8cM3dGCylFRC4cXyzff -lbl_80077100: -/* 80077100 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80077104 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80077108 7C 08 03 A6 */ mtlr r0 -/* 8007710C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80077110 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/CrrPos__9dBgS_AcchFR4dBgS.s b/asm/d/bg/d_bg_s_acch/CrrPos__9dBgS_AcchFR4dBgS.s deleted file mode 100644 index b22d1cad3f0..00000000000 --- a/asm/d/bg/d_bg_s_acch/CrrPos__9dBgS_AcchFR4dBgS.s +++ /dev/null @@ -1,329 +0,0 @@ -lbl_80076AAC: -/* 80076AAC 94 21 FF 30 */ stwu r1, -0xd0(r1) -/* 80076AB0 7C 08 02 A6 */ mflr r0 -/* 80076AB4 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 80076AB8 DB E1 00 C0 */ stfd f31, 0xc0(r1) -/* 80076ABC F3 E1 00 C8 */ psq_st f31, 200(r1), 0, 0 /* qr0 */ -/* 80076AC0 DB C1 00 B0 */ stfd f30, 0xb0(r1) -/* 80076AC4 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, 0 /* qr0 */ -/* 80076AC8 DB A1 00 A0 */ stfd f29, 0xa0(r1) -/* 80076ACC F3 A1 00 A8 */ psq_st f29, 168(r1), 0, 0 /* qr0 */ -/* 80076AD0 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80076AD4 48 2E B7 09 */ bl _savegpr_29 -/* 80076AD8 7C 7E 1B 78 */ mr r30, r3 -/* 80076ADC 7C 9F 23 78 */ mr r31, r4 -/* 80076AE0 80 A3 00 2C */ lwz r5, 0x2c(r3) -/* 80076AE4 54 A0 07 FF */ clrlwi. r0, r5, 0x1f -/* 80076AE8 40 82 04 6C */ bne lbl_80076F54 -/* 80076AEC 7F E3 FB 78 */ mr r3, r31 -/* 80076AF0 38 9E 00 F0 */ addi r4, r30, 0xf0 -/* 80076AF4 54 A5 DF FE */ rlwinm r5, r5, 0x1b, 0x1f, 0x1f -/* 80076AF8 80 DE 00 30 */ lwz r6, 0x30(r30) -/* 80076AFC 80 FE 00 3C */ lwz r7, 0x3c(r30) -/* 80076B00 81 1E 00 40 */ lwz r8, 0x40(r30) -/* 80076B04 39 20 00 00 */ li r9, 0 -/* 80076B08 39 40 00 00 */ li r10, 0 -/* 80076B0C 4B FF EC 69 */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb -/* 80076B10 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 80076B14 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a -/* 80076B18 40 82 00 A0 */ bne lbl_80076BB8 -/* 80076B1C 38 A0 00 00 */ li r5, 0 -/* 80076B20 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b -/* 80076B24 41 82 00 5C */ beq lbl_80076B80 -/* 80076B28 38 60 00 00 */ li r3, 0 -/* 80076B2C 80 1E 00 88 */ lwz r0, 0x88(r30) -/* 80076B30 7C 09 03 A6 */ mtctr r0 -/* 80076B34 2C 00 00 00 */ cmpwi r0, 0 -/* 80076B38 40 81 00 48 */ ble lbl_80076B80 -lbl_80076B3C: -/* 80076B3C 80 1E 00 8C */ lwz r0, 0x8c(r30) -/* 80076B40 7C 80 1A 14 */ add r4, r0, r3 -/* 80076B44 80 04 00 10 */ lwz r0, 0x10(r4) -/* 80076B48 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80076B4C 41 82 00 2C */ beq lbl_80076B78 -/* 80076B50 7F E3 FB 78 */ mr r3, r31 -/* 80076B54 38 A0 00 01 */ li r5, 1 -/* 80076B58 80 DE 00 30 */ lwz r6, 0x30(r30) -/* 80076B5C 80 FE 00 3C */ lwz r7, 0x3c(r30) -/* 80076B60 81 1E 00 40 */ lwz r8, 0x40(r30) -/* 80076B64 39 20 00 01 */ li r9, 1 -/* 80076B68 39 40 00 00 */ li r10, 0 -/* 80076B6C 4B FF EC 09 */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb -/* 80076B70 38 A0 00 01 */ li r5, 1 -/* 80076B74 48 00 00 0C */ b lbl_80076B80 -lbl_80076B78: -/* 80076B78 38 63 00 40 */ addi r3, r3, 0x40 -/* 80076B7C 42 00 FF C0 */ bdnz lbl_80076B3C -lbl_80076B80: -/* 80076B80 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 80076B84 40 82 00 34 */ bne lbl_80076BB8 -/* 80076B88 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076B8C 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 -/* 80076B90 41 82 00 28 */ beq lbl_80076BB8 -/* 80076B94 7F E3 FB 78 */ mr r3, r31 -/* 80076B98 38 9E 01 30 */ addi r4, r30, 0x130 -/* 80076B9C 38 A0 00 01 */ li r5, 1 -/* 80076BA0 80 DE 00 30 */ lwz r6, 0x30(r30) -/* 80076BA4 80 FE 00 3C */ lwz r7, 0x3c(r30) -/* 80076BA8 81 1E 00 40 */ lwz r8, 0x40(r30) -/* 80076BAC 39 20 00 00 */ li r9, 0 -/* 80076BB0 39 40 00 01 */ li r10, 1 -/* 80076BB4 4B FF EB C1 */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb -lbl_80076BB8: -/* 80076BB8 7F C3 F3 78 */ mr r3, r30 -/* 80076BBC 7F E4 FB 78 */ mr r4, r31 -/* 80076BC0 4B FF F7 19 */ bl GroundCheckInit__9dBgS_AcchFR4dBgS -/* 80076BC4 7F C3 F3 78 */ mr r3, r30 -/* 80076BC8 4B FF F6 05 */ bl Init__9dBgS_AcchFv -/* 80076BCC 7F C3 F3 78 */ mr r3, r30 -/* 80076BD0 48 00 05 A9 */ bl GetWallAllLowH_R__9dBgS_AcchFv -/* 80076BD4 FF C0 08 90 */ fmr f30, f1 -/* 80076BD8 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80076BDC 80 9E 00 30 */ lwz r4, 0x30(r30) -/* 80076BE0 C0 43 00 08 */ lfs f2, 8(r3) -/* 80076BE4 C0 03 00 00 */ lfs f0, 0(r3) -/* 80076BE8 D0 01 00 08 */ stfs f0, 8(r1) -/* 80076BEC C0 22 8C C0 */ lfs f1, lit_4025(r2) -/* 80076BF0 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80076BF4 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80076BF8 C0 44 00 08 */ lfs f2, 8(r4) -/* 80076BFC C0 04 00 00 */ lfs f0, 0(r4) -/* 80076C00 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80076C04 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80076C08 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80076C0C 38 61 00 08 */ addi r3, r1, 8 -/* 80076C10 38 81 00 14 */ addi r4, r1, 0x14 -/* 80076C14 48 2D 07 89 */ bl PSVECSquareDistance -/* 80076C18 FF E0 08 90 */ fmr f31, f1 -/* 80076C1C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80076C20 C0 23 00 04 */ lfs f1, 4(r3) -/* 80076C24 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076C28 C0 03 00 04 */ lfs f0, 4(r3) -/* 80076C2C EF A1 00 28 */ fsubs f29, f1, f0 -/* 80076C30 7F C3 F3 78 */ mr r3, r30 -/* 80076C34 48 00 04 F5 */ bl GetWallAllLowH__9dBgS_AcchFv -/* 80076C38 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076C3C C0 03 00 04 */ lfs f0, 4(r3) -/* 80076C40 D0 1E 00 B8 */ stfs f0, 0xb8(r30) -/* 80076C44 38 00 00 00 */ li r0, 0 -/* 80076C48 98 1E 00 C0 */ stb r0, 0xc0(r30) -/* 80076C4C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80076C50 C0 03 00 04 */ lfs f0, 4(r3) -/* 80076C54 EC 41 00 2A */ fadds f2, f1, f0 -/* 80076C58 C0 3E 00 9C */ lfs f1, 0x9c(r30) -/* 80076C5C 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076C60 C0 03 00 04 */ lfs f0, 4(r3) -/* 80076C64 EC 61 00 2A */ fadds f3, f1, f0 -/* 80076C68 3B A0 00 00 */ li r29, 0 -/* 80076C6C 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076C70 54 00 04 1C */ rlwinm r0, r0, 0, 0x10, 0xe -/* 80076C74 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 80076C78 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 80076C7C 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 -/* 80076C80 40 82 00 50 */ bne lbl_80076CD0 -/* 80076C84 FC 00 F2 10 */ fabs f0, f30 -/* 80076C88 FC 20 00 18 */ frsp f1, f0 -/* 80076C8C C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 80076C90 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80076C94 41 80 00 3C */ blt lbl_80076CD0 -/* 80076C98 EC 1E 07 B2 */ fmuls f0, f30, f30 -/* 80076C9C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 80076CA0 41 81 00 20 */ bgt lbl_80076CC0 -/* 80076CA4 FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 80076CA8 41 81 00 18 */ bgt lbl_80076CC0 -/* 80076CAC C0 1E 00 9C */ lfs f0, 0x9c(r30) -/* 80076CB0 FC 1D 00 40 */ fcmpo cr0, f29, f0 -/* 80076CB4 41 81 00 0C */ bgt lbl_80076CC0 -/* 80076CB8 54 60 04 A5 */ rlwinm. r0, r3, 0, 0x12, 0x12 -/* 80076CBC 41 82 00 14 */ beq lbl_80076CD0 -lbl_80076CC0: -/* 80076CC0 3B A0 00 01 */ li r29, 1 -/* 80076CC4 7F C3 F3 78 */ mr r3, r30 -/* 80076CC8 7F E4 FB 78 */ mr r4, r31 -/* 80076CCC 4B FF F9 59 */ bl LineCheck__9dBgS_AcchFR4dBgS -lbl_80076CD0: -/* 80076CD0 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076CD4 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 80076CD8 40 82 00 30 */ bne lbl_80076D08 -/* 80076CDC 7F C3 F3 78 */ mr r3, r30 -/* 80076CE0 48 00 07 1D */ bl ChkWallSort__9dBgS_AcchFv -/* 80076CE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80076CE8 41 82 00 14 */ beq lbl_80076CFC -/* 80076CEC 7F E3 FB 78 */ mr r3, r31 -/* 80076CF0 7F C4 F3 78 */ mr r4, r30 -/* 80076CF4 4B FF E6 81 */ bl WallCorrectSort__4dBgSFP9dBgS_Acch -/* 80076CF8 48 00 00 10 */ b lbl_80076D08 -lbl_80076CFC: -/* 80076CFC 7F E3 FB 78 */ mr r3, r31 -/* 80076D00 7F C4 F3 78 */ mr r4, r30 -/* 80076D04 4B FF E5 49 */ bl WallCorrect__4dBgSFP9dBgS_Acch -lbl_80076D08: -/* 80076D08 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076D0C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80076D10 41 82 00 18 */ beq lbl_80076D28 -/* 80076D14 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80076D18 41 82 00 10 */ beq lbl_80076D28 -/* 80076D1C 7F C3 F3 78 */ mr r3, r30 -/* 80076D20 7F E4 FB 78 */ mr r4, r31 -/* 80076D24 4B FF F9 01 */ bl LineCheck__9dBgS_AcchFR4dBgS -lbl_80076D28: -/* 80076D28 C0 02 8C CC */ lfs f0, lit_4091(r2) -/* 80076D2C D0 1E 00 CC */ stfs f0, 0xcc(r30) -/* 80076D30 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076D34 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80076D38 40 82 00 90 */ bne lbl_80076DC8 -/* 80076D3C 38 7E 01 40 */ addi r3, r30, 0x140 -/* 80076D40 7F C4 F3 78 */ mr r4, r30 -/* 80076D44 48 1F 0E 75 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk -/* 80076D48 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076D4C 54 00 05 EA */ rlwinm r0, r0, 0, 0x17, 0x15 -/* 80076D50 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 80076D54 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076D58 C0 43 00 00 */ lfs f2, 0(r3) -/* 80076D5C D0 41 00 2C */ stfs f2, 0x2c(r1) -/* 80076D60 C0 23 00 04 */ lfs f1, 4(r3) -/* 80076D64 D0 21 00 30 */ stfs f1, 0x30(r1) -/* 80076D68 C0 03 00 08 */ lfs f0, 8(r3) -/* 80076D6C D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80076D70 D0 5E 01 6C */ stfs f2, 0x16c(r30) -/* 80076D74 D0 3E 01 70 */ stfs f1, 0x170(r30) -/* 80076D78 D0 1E 01 74 */ stfs f0, 0x174(r30) -/* 80076D7C 7F E3 FB 78 */ mr r3, r31 -/* 80076D80 38 9E 01 30 */ addi r4, r30, 0x130 -/* 80076D84 4B FF E7 19 */ bl RoofChk__4dBgSFP12dBgS_RoofChk -/* 80076D88 D0 3E 00 C4 */ stfs f1, 0xc4(r30) -/* 80076D8C C0 02 8C CC */ lfs f0, lit_4091(r2) -/* 80076D90 C0 3E 00 C4 */ lfs f1, 0xc4(r30) -/* 80076D94 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80076D98 41 82 00 30 */ beq lbl_80076DC8 -/* 80076D9C 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076DA0 C0 03 00 04 */ lfs f0, 4(r3) -/* 80076DA4 C0 5E 00 C8 */ lfs f2, 0xc8(r30) -/* 80076DA8 EC 00 10 2A */ fadds f0, f0, f2 -/* 80076DAC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80076DB0 40 81 00 18 */ ble lbl_80076DC8 -/* 80076DB4 EC 01 10 28 */ fsubs f0, f1, f2 -/* 80076DB8 D0 1E 00 CC */ stfs f0, 0xcc(r30) -/* 80076DBC 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076DC0 60 00 02 00 */ ori r0, r0, 0x200 -/* 80076DC4 90 1E 00 2C */ stw r0, 0x2c(r30) -lbl_80076DC8: -/* 80076DC8 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 80076DCC 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e -/* 80076DD0 40 82 00 28 */ bne lbl_80076DF8 -/* 80076DD4 54 60 06 B0 */ rlwinm r0, r3, 0, 0x1a, 0x18 -/* 80076DD8 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 80076DDC 7F C3 F3 78 */ mr r3, r30 -/* 80076DE0 7F E4 FB 78 */ mr r4, r31 -/* 80076DE4 4B FF F5 6D */ bl GroundCheck__9dBgS_AcchFR4dBgS -/* 80076DE8 7F C3 F3 78 */ mr r3, r30 -/* 80076DEC 7F E4 FB 78 */ mr r4, r31 -/* 80076DF0 4B FF F7 5D */ bl GroundRoofProc__9dBgS_AcchFR4dBgS -/* 80076DF4 48 00 00 1C */ b lbl_80076E10 -lbl_80076DF8: -/* 80076DF8 C0 3E 00 CC */ lfs f1, 0xcc(r30) -/* 80076DFC 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076E00 C0 03 00 04 */ lfs f0, 4(r3) -/* 80076E04 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80076E08 40 80 00 08 */ bge lbl_80076E10 -/* 80076E0C D0 23 00 04 */ stfs f1, 4(r3) -lbl_80076E10: -/* 80076E10 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 80076E14 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15 -/* 80076E18 40 82 01 3C */ bne lbl_80076F54 -/* 80076E1C 54 60 05 66 */ rlwinm r0, r3, 0, 0x15, 0x13 -/* 80076E20 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 80076E24 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076E28 54 00 05 24 */ rlwinm r0, r0, 0, 0x14, 0x12 -/* 80076E2C 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 80076E30 C0 02 8C C4 */ lfs f0, lit_4089(r2) -/* 80076E34 D0 1E 01 CC */ stfs f0, 0x1cc(r30) -/* 80076E38 C0 3E 00 98 */ lfs f1, 0x98(r30) -/* 80076E3C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80076E40 40 82 00 18 */ bne lbl_80076E58 -/* 80076E44 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076E48 C0 23 00 04 */ lfs f1, 4(r3) -/* 80076E4C C0 02 8C D8 */ lfs f0, lit_4554(r2) -/* 80076E50 EF A1 00 28 */ fsubs f29, f1, f0 -/* 80076E54 48 00 00 08 */ b lbl_80076E5C -lbl_80076E58: -/* 80076E58 FF A0 08 90 */ fmr f29, f1 -lbl_80076E5C: -/* 80076E5C 88 1E 01 D4 */ lbz r0, 0x1d4(r30) -/* 80076E60 28 00 00 01 */ cmplwi r0, 1 -/* 80076E64 40 82 00 10 */ bne lbl_80076E74 -/* 80076E68 C0 1E 00 D0 */ lfs f0, 0xd0(r30) -/* 80076E6C EF DD 00 2A */ fadds f30, f29, f0 -/* 80076E70 48 00 00 68 */ b lbl_80076ED8 -lbl_80076E74: -/* 80076E74 38 61 00 38 */ addi r3, r1, 0x38 -/* 80076E78 48 00 21 7D */ bl __ct__12dBgS_RoofChkFv -/* 80076E7C 38 61 00 5C */ addi r3, r1, 0x5c -/* 80076E80 48 00 20 6D */ bl SetUnderwaterRoof__16dBgS_PolyPassChkFv -/* 80076E84 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076E88 C0 03 00 00 */ lfs f0, 0(r3) -/* 80076E8C D0 01 00 74 */ stfs f0, 0x74(r1) -/* 80076E90 C0 03 00 04 */ lfs f0, 4(r3) -/* 80076E94 D0 01 00 78 */ stfs f0, 0x78(r1) -/* 80076E98 C0 03 00 08 */ lfs f0, 8(r3) -/* 80076E9C D0 01 00 7C */ stfs f0, 0x7c(r1) -/* 80076EA0 7F E3 FB 78 */ mr r3, r31 -/* 80076EA4 38 81 00 38 */ addi r4, r1, 0x38 -/* 80076EA8 4B FF E5 F5 */ bl RoofChk__4dBgSFP12dBgS_RoofChk -/* 80076EAC FF C0 08 90 */ fmr f30, f1 -/* 80076EB0 C0 02 8C CC */ lfs f0, lit_4091(r2) -/* 80076EB4 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 80076EB8 40 82 00 14 */ bne lbl_80076ECC -/* 80076EBC C0 22 8C DC */ lfs f1, lit_4555(r2) -/* 80076EC0 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076EC4 C0 03 00 04 */ lfs f0, 4(r3) -/* 80076EC8 EF C1 00 2A */ fadds f30, f1, f0 -lbl_80076ECC: -/* 80076ECC 38 61 00 38 */ addi r3, r1, 0x38 -/* 80076ED0 38 80 FF FF */ li r4, -1 -/* 80076ED4 48 00 21 BD */ bl __dt__12dBgS_RoofChkFv -lbl_80076ED8: -/* 80076ED8 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076EDC C0 03 00 00 */ lfs f0, 0(r3) -/* 80076EE0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80076EE4 C0 03 00 04 */ lfs f0, 4(r3) -/* 80076EE8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80076EEC C0 03 00 08 */ lfs f0, 8(r3) -/* 80076EF0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80076EF4 D3 A1 00 24 */ stfs f29, 0x24(r1) -/* 80076EF8 38 7E 01 80 */ addi r3, r30, 0x180 -/* 80076EFC 38 81 00 20 */ addi r4, r1, 0x20 -/* 80076F00 FC 20 F0 90 */ fmr f1, f30 -/* 80076F04 48 00 1C 8D */ bl Set__14dBgS_SplGrpChkFR4cXyzf -/* 80076F08 38 7E 01 A4 */ addi r3, r30, 0x1a4 -/* 80076F0C 38 9E 00 14 */ addi r4, r30, 0x14 -/* 80076F10 48 00 1E FD */ bl SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk -/* 80076F14 7F E3 FB 78 */ mr r3, r31 -/* 80076F18 38 9E 01 80 */ addi r4, r30, 0x180 -/* 80076F1C 4B FF E6 49 */ bl SplGrpChk__4dBgSFP14dBgS_SplGrpChk -/* 80076F20 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80076F24 41 82 00 30 */ beq lbl_80076F54 -/* 80076F28 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076F2C 60 00 08 00 */ ori r0, r0, 0x800 -/* 80076F30 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 80076F34 C0 3E 01 CC */ lfs f1, 0x1cc(r30) -/* 80076F38 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076F3C C0 03 00 04 */ lfs f0, 4(r3) -/* 80076F40 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80076F44 40 81 00 10 */ ble lbl_80076F54 -/* 80076F48 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076F4C 60 00 10 00 */ ori r0, r0, 0x1000 -/* 80076F50 90 1E 00 2C */ stw r0, 0x2c(r30) -lbl_80076F54: -/* 80076F54 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 /* qr0 */ -/* 80076F58 CB E1 00 C0 */ lfd f31, 0xc0(r1) -/* 80076F5C E3 C1 00 B8 */ psq_l f30, 184(r1), 0, 0 /* qr0 */ -/* 80076F60 CB C1 00 B0 */ lfd f30, 0xb0(r1) -/* 80076F64 E3 A1 00 A8 */ psq_l f29, 168(r1), 0, 0 /* qr0 */ -/* 80076F68 CB A1 00 A0 */ lfd f29, 0xa0(r1) -/* 80076F6C 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80076F70 48 2E B2 B9 */ bl _restgpr_29 -/* 80076F74 80 01 00 D4 */ lwz r0, 0xd4(r1) -/* 80076F78 7C 08 03 A6 */ mtlr r0 -/* 80076F7C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80076F80 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/GetWallAddY__9dBgS_AcchFR3Vec.s b/asm/d/bg/d_bg_s_acch/GetWallAddY__9dBgS_AcchFR3Vec.s deleted file mode 100644 index 0c2ffc1046f..00000000000 --- a/asm/d/bg/d_bg_s_acch/GetWallAddY__9dBgS_AcchFR3Vec.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80077200: -/* 80077200 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077204 7C 08 02 A6 */ mflr r0 -/* 80077208 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007720C 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80077210 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 80077214 41 82 00 14 */ beq lbl_80077228 -/* 80077218 C0 23 00 A4 */ lfs f1, 0xa4(r3) -/* 8007721C C0 02 8C E0 */ lfs f0, lit_4762(r2) -/* 80077220 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80077224 40 80 00 0C */ bge lbl_80077230 -lbl_80077228: -/* 80077228 C0 22 8C C0 */ lfs f1, lit_4025(r2) -/* 8007722C 48 00 00 3C */ b lbl_80077268 -lbl_80077230: -/* 80077230 38 63 00 A0 */ addi r3, r3, 0xa0 -/* 80077234 38 A1 00 08 */ addi r5, r1, 8 -/* 80077238 48 1F 83 9D */ bl getCrossYLessD__8cM3dGPlaCFRC3VecPf -/* 8007723C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80077240 41 82 00 24 */ beq lbl_80077264 -/* 80077244 C0 21 00 08 */ lfs f1, 8(r1) -/* 80077248 C0 02 8C C0 */ lfs f0, lit_4025(r2) -/* 8007724C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80077250 40 81 00 08 */ ble lbl_80077258 -/* 80077254 D0 01 00 08 */ stfs f0, 8(r1) -lbl_80077258: -/* 80077258 C0 01 00 08 */ lfs f0, 8(r1) -/* 8007725C FC 20 00 50 */ fneg f1, f0 -/* 80077260 48 00 00 08 */ b lbl_80077268 -lbl_80077264: -/* 80077264 C0 22 8C C0 */ lfs f1, lit_4025(r2) -lbl_80077268: -/* 80077268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007726C 7C 08 03 A6 */ mtlr r0 -/* 80077270 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077274 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/GroundCheck__9dBgS_AcchFR4dBgS.s b/asm/d/bg/d_bg_s_acch/GroundCheck__9dBgS_AcchFR4dBgS.s deleted file mode 100644 index 058c58c9003..00000000000 --- a/asm/d/bg/d_bg_s_acch/GroundCheck__9dBgS_AcchFR4dBgS.s +++ /dev/null @@ -1,134 +0,0 @@ -lbl_80076350: -/* 80076350 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80076354 7C 08 02 A6 */ mflr r0 -/* 80076358 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007635C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80076360 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80076364 7C 7E 1B 78 */ mr r30, r3 -/* 80076368 7C 9F 23 78 */ mr r31, r4 -/* 8007636C 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80076370 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80076374 40 82 01 C0 */ bne lbl_80076534 -/* 80076378 80 9E 00 30 */ lwz r4, 0x30(r30) -/* 8007637C C0 04 00 00 */ lfs f0, 0(r4) -/* 80076380 D0 01 00 08 */ stfs f0, 8(r1) -/* 80076384 C0 64 00 04 */ lfs f3, 4(r4) -/* 80076388 D0 61 00 0C */ stfs f3, 0xc(r1) -/* 8007638C C0 04 00 08 */ lfs f0, 8(r4) -/* 80076390 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80076394 C0 5E 00 94 */ lfs f2, 0x94(r30) -/* 80076398 C0 3E 00 9C */ lfs f1, 0x9c(r30) -/* 8007639C C0 1E 00 90 */ lfs f0, 0x90(r30) -/* 800763A0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800763A4 EC 02 00 2A */ fadds f0, f2, f0 -/* 800763A8 EC 03 00 2A */ fadds f0, f3, f0 -/* 800763AC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800763B0 48 00 10 31 */ bl ChkGndThinCellingOff__9dBgS_AcchFv -/* 800763B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800763B8 40 82 00 7C */ bne lbl_80076434 -/* 800763BC 88 0D 89 E8 */ lbz r0, data_80450F68(r13) -/* 800763C0 7C 00 07 75 */ extsb. r0, r0 -/* 800763C4 40 82 00 2C */ bne lbl_800763F0 -/* 800763C8 3C 60 80 42 */ lis r3, tmpRoofChk@ha /* 0x80424B2C@ha */ -/* 800763CC 38 63 4B 2C */ addi r3, r3, tmpRoofChk@l /* 0x80424B2C@l */ -/* 800763D0 48 00 2C 25 */ bl __ct__12dBgS_RoofChkFv -/* 800763D4 3C 80 80 08 */ lis r4, __dt__12dBgS_RoofChkFv@ha /* 0x80079090@ha */ -/* 800763D8 38 84 90 90 */ addi r4, r4, __dt__12dBgS_RoofChkFv@l /* 0x80079090@l */ -/* 800763DC 3C A0 80 42 */ lis r5, lit_4166@ha /* 0x80424B20@ha */ -/* 800763E0 38 A5 4B 20 */ addi r5, r5, lit_4166@l /* 0x80424B20@l */ -/* 800763E4 48 2E B8 41 */ bl __register_global_object -/* 800763E8 38 00 00 01 */ li r0, 1 -/* 800763EC 98 0D 89 E8 */ stb r0, data_80450F68(r13) -lbl_800763F0: -/* 800763F0 80 1E 00 E4 */ lwz r0, 0xe4(r30) -/* 800763F4 3C 60 80 42 */ lis r3, tmpRoofChk@ha /* 0x80424B2C@ha */ -/* 800763F8 38 83 4B 2C */ addi r4, r3, tmpRoofChk@l /* 0x80424B2C@l */ -/* 800763FC 90 04 00 18 */ stw r0, 0x18(r4) -/* 80076400 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076404 C0 03 00 00 */ lfs f0, 0(r3) -/* 80076408 D0 04 00 3C */ stfs f0, 0x3c(r4) -/* 8007640C C0 03 00 04 */ lfs f0, 4(r3) -/* 80076410 D0 04 00 40 */ stfs f0, 0x40(r4) -/* 80076414 C0 03 00 08 */ lfs f0, 8(r3) -/* 80076418 D0 04 00 44 */ stfs f0, 0x44(r4) -/* 8007641C 7F E3 FB 78 */ mr r3, r31 -/* 80076420 4B FF F0 7D */ bl RoofChk__4dBgSFP12dBgS_RoofChk -/* 80076424 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80076428 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8007642C 40 81 00 08 */ ble lbl_80076434 -/* 80076430 D0 21 00 0C */ stfs f1, 0xc(r1) -lbl_80076434: -/* 80076434 C0 02 8C C0 */ lfs f0, lit_4025(r2) -/* 80076438 D0 1E 00 94 */ stfs f0, 0x94(r30) -/* 8007643C 38 7E 00 DC */ addi r3, r30, 0xdc -/* 80076440 38 81 00 08 */ addi r4, r1, 8 -/* 80076444 48 1F 18 E5 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 80076448 7F E3 FB 78 */ mr r3, r31 -/* 8007644C 38 9E 00 DC */ addi r4, r30, 0xdc -/* 80076450 4B FF E0 51 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 80076454 D0 3E 00 98 */ stfs f1, 0x98(r30) -/* 80076458 C0 02 8C C4 */ lfs f0, lit_4089(r2) -/* 8007645C C0 3E 00 98 */ lfs f1, 0x98(r30) -/* 80076460 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80076464 41 82 00 AC */ beq lbl_80076510 -/* 80076468 C0 1E 00 90 */ lfs f0, 0x90(r30) -/* 8007646C EC 01 00 2A */ fadds f0, f1, f0 -/* 80076470 D0 1E 00 BC */ stfs f0, 0xbc(r30) -/* 80076474 C0 3E 00 BC */ lfs f1, 0xbc(r30) -/* 80076478 C0 1E 00 B8 */ lfs f0, 0xb8(r30) -/* 8007647C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80076480 40 81 00 90 */ ble lbl_80076510 -/* 80076484 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 80076488 D0 23 00 04 */ stfs f1, 4(r3) -/* 8007648C 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076490 54 00 04 21 */ rlwinm. r0, r0, 0, 0x10, 0x10 -/* 80076494 40 82 00 18 */ bne lbl_800764AC -/* 80076498 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 8007649C 28 03 00 00 */ cmplwi r3, 0 -/* 800764A0 41 82 00 0C */ beq lbl_800764AC -/* 800764A4 C0 02 8C C0 */ lfs f0, lit_4025(r2) -/* 800764A8 D0 03 00 04 */ stfs f0, 4(r3) -lbl_800764AC: -/* 800764AC 7F E3 FB 78 */ mr r3, r31 -/* 800764B0 38 9E 00 F0 */ addi r4, r30, 0xf0 -/* 800764B4 38 BE 00 A0 */ addi r5, r30, 0xa0 -/* 800764B8 4B FF E2 8D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 800764BC 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 800764C0 60 00 00 40 */ ori r0, r0, 0x40 -/* 800764C4 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 800764C8 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 800764CC 60 00 00 20 */ ori r0, r0, 0x20 -/* 800764D0 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 800764D4 88 1E 00 C0 */ lbz r0, 0xc0(r30) -/* 800764D8 28 00 00 00 */ cmplwi r0, 0 -/* 800764DC 40 82 00 1C */ bne lbl_800764F8 -/* 800764E0 38 00 00 01 */ li r0, 1 -/* 800764E4 98 1E 00 C0 */ stb r0, 0xc0(r30) -/* 800764E8 7F E3 FB 78 */ mr r3, r31 -/* 800764EC 38 9E 00 F0 */ addi r4, r30, 0xf0 -/* 800764F0 80 BE 00 84 */ lwz r5, 0x84(r30) -/* 800764F4 4B FF F6 91 */ bl RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c -lbl_800764F8: -/* 800764F8 88 1E 00 B4 */ lbz r0, 0xb4(r30) -/* 800764FC 28 00 00 00 */ cmplwi r0, 0 -/* 80076500 40 82 00 10 */ bne lbl_80076510 -/* 80076504 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076508 60 00 00 80 */ ori r0, r0, 0x80 -/* 8007650C 90 1E 00 2C */ stw r0, 0x2c(r30) -lbl_80076510: -/* 80076510 88 1E 00 B4 */ lbz r0, 0xb4(r30) -/* 80076514 28 00 00 00 */ cmplwi r0, 0 -/* 80076518 41 82 00 1C */ beq lbl_80076534 -/* 8007651C 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80076520 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80076524 40 82 00 10 */ bne lbl_80076534 -/* 80076528 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 8007652C 60 00 01 00 */ ori r0, r0, 0x100 -/* 80076530 90 1E 00 2C */ stw r0, 0x2c(r30) -lbl_80076534: -/* 80076534 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80076538 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8007653C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80076540 7C 08 03 A6 */ mtlr r0 -/* 80076544 38 21 00 20 */ addi r1, r1, 0x20 -/* 80076548 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/LineCheck__9dBgS_AcchFR4dBgS.s b/asm/d/bg/d_bg_s_acch/LineCheck__9dBgS_AcchFR4dBgS.s deleted file mode 100644 index eb8f79986db..00000000000 --- a/asm/d/bg/d_bg_s_acch/LineCheck__9dBgS_AcchFR4dBgS.s +++ /dev/null @@ -1,307 +0,0 @@ -lbl_80076624: -/* 80076624 94 21 FE 70 */ stwu r1, -0x190(r1) -/* 80076628 7C 08 02 A6 */ mflr r0 -/* 8007662C 90 01 01 94 */ stw r0, 0x194(r1) -/* 80076630 DB E1 01 80 */ stfd f31, 0x180(r1) -/* 80076634 F3 E1 01 88 */ psq_st f31, 392(r1), 0, 0 /* qr0 */ -/* 80076638 DB C1 01 70 */ stfd f30, 0x170(r1) -/* 8007663C F3 C1 01 78 */ psq_st f30, 376(r1), 0, 0 /* qr0 */ -/* 80076640 39 61 01 70 */ addi r11, r1, 0x170 -/* 80076644 48 2E BB 89 */ bl _savegpr_25 -/* 80076648 7C 7A 1B 78 */ mr r26, r3 -/* 8007664C 7C 9B 23 78 */ mr r27, r4 -/* 80076650 38 61 00 FC */ addi r3, r1, 0xfc -/* 80076654 48 00 29 A1 */ bl __ct__12dBgS_RoofChkFv -/* 80076658 80 1A 00 E4 */ lwz r0, 0xe4(r26) -/* 8007665C 90 01 01 14 */ stw r0, 0x114(r1) -/* 80076660 80 7A 00 34 */ lwz r3, 0x34(r26) -/* 80076664 C0 03 00 00 */ lfs f0, 0(r3) -/* 80076668 D0 01 01 38 */ stfs f0, 0x138(r1) -/* 8007666C C0 03 00 04 */ lfs f0, 4(r3) -/* 80076670 D0 01 01 3C */ stfs f0, 0x13c(r1) -/* 80076674 C0 03 00 08 */ lfs f0, 8(r3) -/* 80076678 D0 01 01 40 */ stfs f0, 0x140(r1) -/* 8007667C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80076680 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80076684 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80076688 38 81 00 FC */ addi r4, r1, 0xfc -/* 8007668C 4B FF EE 11 */ bl RoofChk__4dBgSFP12dBgS_RoofChk -/* 80076690 FF E0 08 90 */ fmr f31, f1 -/* 80076694 C3 C2 8C CC */ lfs f30, lit_4091(r2) -/* 80076698 3B C0 00 00 */ li r30, 0 -/* 8007669C 3B A0 00 00 */ li r29, 0 -/* 800766A0 3B 80 00 00 */ li r28, 0 -/* 800766A4 3B 20 00 00 */ li r25, 0 -/* 800766A8 3B E1 00 B8 */ addi r31, r1, 0xb8 -/* 800766AC 48 00 02 88 */ b lbl_80076934 -lbl_800766B0: -/* 800766B0 38 61 00 A4 */ addi r3, r1, 0xa4 -/* 800766B4 48 1F 16 A9 */ bl __ct__11cBgS_LinChkFv -/* 800766B8 80 7A 00 34 */ lwz r3, 0x34(r26) -/* 800766BC C0 03 00 00 */ lfs f0, 0(r3) -/* 800766C0 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 800766C4 C0 23 00 04 */ lfs f1, 4(r3) -/* 800766C8 D0 21 00 30 */ stfs f1, 0x30(r1) -/* 800766CC C0 03 00 08 */ lfs f0, 8(r3) -/* 800766D0 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 800766D4 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 800766D8 C0 03 00 00 */ lfs f0, 0(r3) -/* 800766DC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800766E0 C0 03 00 04 */ lfs f0, 4(r3) -/* 800766E4 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 800766E8 C0 03 00 08 */ lfs f0, 8(r3) -/* 800766EC D0 01 00 28 */ stfs f0, 0x28(r1) -/* 800766F0 80 7A 00 8C */ lwz r3, 0x8c(r26) -/* 800766F4 38 19 00 30 */ addi r0, r25, 0x30 -/* 800766F8 7C 03 04 2E */ lfsx f0, r3, r0 -/* 800766FC FC 40 00 90 */ fmr f2, f0 -/* 80076700 EC 01 00 2A */ fadds f0, f1, f0 -/* 80076704 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 80076708 40 80 00 2C */ bge lbl_80076734 -/* 8007670C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80076710 41 82 00 14 */ beq lbl_80076724 -/* 80076714 38 61 00 A4 */ addi r3, r1, 0xa4 -/* 80076718 38 80 FF FF */ li r4, -1 -/* 8007671C 48 1F 16 A1 */ bl __dt__11cBgS_LinChkFv -/* 80076720 48 00 02 0C */ b lbl_8007692C -lbl_80076724: -/* 80076724 EC 3F 08 28 */ fsubs f1, f31, f1 -/* 80076728 C0 02 8C D4 */ lfs f0, lit_4424(r2) -/* 8007672C EC 41 00 28 */ fsubs f2, f1, f0 -/* 80076730 3B A0 00 01 */ li r29, 1 -lbl_80076734: -/* 80076734 FC 1E 10 40 */ fcmpo cr0, f30, f2 -/* 80076738 40 81 00 08 */ ble lbl_80076740 -/* 8007673C FF C0 10 90 */ fmr f30, f2 -lbl_80076740: -/* 80076740 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80076744 EC 00 10 2A */ fadds f0, f0, f2 -/* 80076748 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8007674C C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80076750 EC 00 10 2A */ fadds f0, f0, f2 -/* 80076754 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80076758 7F 43 D3 78 */ mr r3, r26 -/* 8007675C 48 00 0A 89 */ bl GetSpeedY__9dBgS_AcchFv -/* 80076760 C0 02 8C C0 */ lfs f0, lit_4025(r2) -/* 80076764 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80076768 40 80 00 54 */ bge lbl_800767BC -/* 8007676C 80 7A 00 84 */ lwz r3, 0x84(r26) -/* 80076770 28 03 00 00 */ cmplwi r3, 0 -/* 80076774 41 82 00 48 */ beq lbl_800767BC -/* 80076778 A8 03 00 08 */ lha r0, 8(r3) -/* 8007677C 2C 00 00 FD */ cmpwi r0, 0xfd -/* 80076780 40 82 00 3C */ bne lbl_800767BC -/* 80076784 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80076788 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 8007678C 7D 89 03 A6 */ mtctr r12 -/* 80076790 4E 80 04 21 */ bctrl -/* 80076794 28 03 00 00 */ cmplwi r3, 0 -/* 80076798 40 82 00 24 */ bne lbl_800767BC -/* 8007679C 88 1A 00 1A */ lbz r0, 0x1a(r26) -/* 800767A0 28 00 00 00 */ cmplwi r0, 0 -/* 800767A4 41 82 00 18 */ beq lbl_800767BC -/* 800767A8 7F 43 D3 78 */ mr r3, r26 -/* 800767AC 48 00 0A 39 */ bl GetSpeedY__9dBgS_AcchFv -/* 800767B0 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 800767B4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 800767B8 D0 01 00 24 */ stfs f0, 0x24(r1) -lbl_800767BC: -/* 800767BC 38 61 00 A4 */ addi r3, r1, 0xa4 -/* 800767C0 38 81 00 2C */ addi r4, r1, 0x2c -/* 800767C4 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800767C8 80 DA 00 08 */ lwz r6, 8(r26) -/* 800767CC 48 1F 17 05 */ bl Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi -/* 800767D0 38 61 00 A4 */ addi r3, r1, 0xa4 -/* 800767D4 7F 44 D3 78 */ mr r4, r26 -/* 800767D8 48 1F 13 E1 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk -/* 800767DC 7F 63 DB 78 */ mr r3, r27 -/* 800767E0 38 81 00 A4 */ addi r4, r1, 0xa4 -/* 800767E4 4B FF DB D1 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 800767E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800767EC 41 82 01 34 */ beq lbl_80076920 -/* 800767F0 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 800767F4 C0 01 00 D4 */ lfs f0, 0xd4(r1) -/* 800767F8 D0 03 00 00 */ stfs f0, 0(r3) -/* 800767FC C0 01 00 D8 */ lfs f0, 0xd8(r1) -/* 80076800 D0 03 00 04 */ stfs f0, 4(r3) -/* 80076804 C0 01 00 DC */ lfs f0, 0xdc(r1) -/* 80076808 D0 03 00 08 */ stfs f0, 8(r3) -/* 8007680C 80 1A 00 2C */ lwz r0, 0x2c(r26) -/* 80076810 64 00 00 01 */ oris r0, r0, 1 -/* 80076814 90 1A 00 2C */ stw r0, 0x2c(r26) -/* 80076818 80 7A 00 D4 */ lwz r3, 0xd4(r26) -/* 8007681C 28 03 00 00 */ cmplwi r3, 0 -/* 80076820 41 82 00 24 */ beq lbl_80076844 -/* 80076824 A0 01 00 B8 */ lhz r0, 0xb8(r1) -/* 80076828 B0 03 00 00 */ sth r0, 0(r3) -/* 8007682C A0 01 00 BA */ lhz r0, 0xba(r1) -/* 80076830 B0 03 00 02 */ sth r0, 2(r3) -/* 80076834 80 01 00 BC */ lwz r0, 0xbc(r1) -/* 80076838 90 03 00 04 */ stw r0, 4(r3) -/* 8007683C 80 01 00 C0 */ lwz r0, 0xc0(r1) -/* 80076840 90 03 00 08 */ stw r0, 8(r3) -lbl_80076844: -/* 80076844 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80076848 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8007684C 90 01 00 48 */ stw r0, 0x48(r1) -/* 80076850 7F 63 DB 78 */ mr r3, r27 -/* 80076854 7F E4 FB 78 */ mr r4, r31 -/* 80076858 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8007685C 4B FF DE E9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 80076860 C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 80076864 48 1F 19 81 */ bl cBgW_CheckBGround__Ff -/* 80076868 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007686C 40 82 00 84 */ bne lbl_800768F0 -/* 80076870 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 80076874 38 81 00 38 */ addi r4, r1, 0x38 -/* 80076878 7C 65 1B 78 */ mr r5, r3 -/* 8007687C 48 2D 08 15 */ bl PSVECAdd -/* 80076880 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 80076884 EC 20 00 32 */ fmuls f1, f0, f0 -/* 80076888 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 8007688C EC 00 00 32 */ fmuls f0, f0, f0 -/* 80076890 EC 21 00 2A */ fadds f1, f1, f0 -/* 80076894 C0 02 8C C0 */ lfs f0, lit_4025(r2) -/* 80076898 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8007689C 40 81 00 0C */ ble lbl_800768A8 -/* 800768A0 FC 00 08 34 */ frsqrte f0, f1 -/* 800768A4 EC 20 00 72 */ fmuls f1, f0, f1 -lbl_800768A8: -/* 800768A8 FC 00 0A 10 */ fabs f0, f1 -/* 800768AC FC 20 00 18 */ frsp f1, f0 -/* 800768B0 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 800768B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800768B8 41 80 00 18 */ blt lbl_800768D0 -/* 800768BC 80 1A 00 8C */ lwz r0, 0x8c(r26) -/* 800768C0 7C 60 CA 14 */ add r3, r0, r25 -/* 800768C4 80 9A 00 30 */ lwz r4, 0x30(r26) -/* 800768C8 C0 24 00 04 */ lfs f1, 4(r4) -/* 800768CC 4B FF F6 B5 */ bl SetWallHDirect__12dBgS_AcchCirFf -lbl_800768D0: -/* 800768D0 80 7A 00 8C */ lwz r3, 0x8c(r26) -/* 800768D4 38 19 00 30 */ addi r0, r25, 0x30 -/* 800768D8 7C 23 04 2E */ lfsx f1, r3, r0 -/* 800768DC 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 800768E0 C0 03 00 04 */ lfs f0, 4(r3) -/* 800768E4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 800768E8 D0 03 00 04 */ stfs f0, 4(r3) -/* 800768EC 48 00 00 28 */ b lbl_80076914 -lbl_800768F0: -/* 800768F0 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 800768F4 C0 23 00 04 */ lfs f1, 4(r3) -/* 800768F8 C0 02 8C D4 */ lfs f0, lit_4424(r2) -/* 800768FC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80076900 D0 03 00 04 */ stfs f0, 4(r3) -/* 80076904 7F 43 D3 78 */ mr r3, r26 -/* 80076908 7F 64 DB 78 */ mr r4, r27 -/* 8007690C 4B FF FA 45 */ bl GroundCheck__9dBgS_AcchFR4dBgS -/* 80076910 3B C0 00 01 */ li r30, 1 -lbl_80076914: -/* 80076914 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80076918 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8007691C 90 01 00 48 */ stw r0, 0x48(r1) -lbl_80076920: -/* 80076920 38 61 00 A4 */ addi r3, r1, 0xa4 -/* 80076924 38 80 FF FF */ li r4, -1 -/* 80076928 48 1F 14 95 */ bl __dt__11cBgS_LinChkFv -lbl_8007692C: -/* 8007692C 3B 9C 00 01 */ addi r28, r28, 1 -/* 80076930 3B 39 00 40 */ addi r25, r25, 0x40 -lbl_80076934: -/* 80076934 80 1A 00 88 */ lwz r0, 0x88(r26) -/* 80076938 7C 1C 00 00 */ cmpw r28, r0 -/* 8007693C 41 80 FD 74 */ blt lbl_800766B0 -/* 80076940 7F 43 D3 78 */ mr r3, r26 -/* 80076944 48 00 0A C5 */ bl ChkLineDown__9dBgS_AcchFv -/* 80076948 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007694C 41 82 01 2C */ beq lbl_80076A78 -/* 80076950 80 7A 00 34 */ lwz r3, 0x34(r26) -/* 80076954 C0 23 00 04 */ lfs f1, 4(r3) -/* 80076958 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 8007695C C0 03 00 04 */ lfs f0, 4(r3) -/* 80076960 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80076964 C0 02 8C CC */ lfs f0, lit_4091(r2) -/* 80076968 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 8007696C 41 82 01 0C */ beq lbl_80076A78 -/* 80076970 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80076974 40 82 01 04 */ bne lbl_80076A78 -/* 80076978 FC 00 0A 10 */ fabs f0, f1 -/* 8007697C FC 20 00 18 */ frsp f1, f0 -/* 80076980 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 80076984 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80076988 41 80 00 F0 */ blt lbl_80076A78 -/* 8007698C 38 61 00 4C */ addi r3, r1, 0x4c -/* 80076990 48 1F 13 CD */ bl __ct__11cBgS_LinChkFv -/* 80076994 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 80076998 C0 43 00 00 */ lfs f2, 0(r3) -/* 8007699C D0 41 00 14 */ stfs f2, 0x14(r1) -/* 800769A0 C0 23 00 04 */ lfs f1, 4(r3) -/* 800769A4 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 800769A8 C0 03 00 08 */ lfs f0, 8(r3) -/* 800769AC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 800769B0 D0 41 00 08 */ stfs f2, 8(r1) -/* 800769B4 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 800769B8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800769BC EC 01 F0 2A */ fadds f0, f1, f30 -/* 800769C0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 800769C4 38 61 00 4C */ addi r3, r1, 0x4c -/* 800769C8 38 81 00 14 */ addi r4, r1, 0x14 -/* 800769CC 38 A1 00 08 */ addi r5, r1, 8 -/* 800769D0 80 DA 00 08 */ lwz r6, 8(r26) -/* 800769D4 48 1F 14 FD */ bl Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi -/* 800769D8 38 61 00 4C */ addi r3, r1, 0x4c -/* 800769DC 7F 44 D3 78 */ mr r4, r26 -/* 800769E0 48 1F 11 D9 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk -/* 800769E4 7F 63 DB 78 */ mr r3, r27 -/* 800769E8 38 81 00 4C */ addi r4, r1, 0x4c -/* 800769EC 4B FF D9 C9 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 800769F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800769F4 41 82 00 78 */ beq lbl_80076A6C -/* 800769F8 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 800769FC C0 01 00 7C */ lfs f0, 0x7c(r1) -/* 80076A00 D0 03 00 00 */ stfs f0, 0(r3) -/* 80076A04 C0 01 00 80 */ lfs f0, 0x80(r1) -/* 80076A08 D0 03 00 04 */ stfs f0, 4(r3) -/* 80076A0C C0 01 00 84 */ lfs f0, 0x84(r1) -/* 80076A10 D0 03 00 08 */ stfs f0, 8(r3) -/* 80076A14 80 1A 00 2C */ lwz r0, 0x2c(r26) -/* 80076A18 64 00 00 01 */ oris r0, r0, 1 -/* 80076A1C 90 1A 00 2C */ stw r0, 0x2c(r26) -/* 80076A20 80 7A 00 D4 */ lwz r3, 0xd4(r26) -/* 80076A24 28 03 00 00 */ cmplwi r3, 0 -/* 80076A28 41 82 00 24 */ beq lbl_80076A4C -/* 80076A2C A0 01 00 60 */ lhz r0, 0x60(r1) -/* 80076A30 B0 03 00 00 */ sth r0, 0(r3) -/* 80076A34 A0 01 00 62 */ lhz r0, 0x62(r1) -/* 80076A38 B0 03 00 02 */ sth r0, 2(r3) -/* 80076A3C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80076A40 90 03 00 04 */ stw r0, 4(r3) -/* 80076A44 80 01 00 68 */ lwz r0, 0x68(r1) -/* 80076A48 90 03 00 08 */ stw r0, 8(r3) -lbl_80076A4C: -/* 80076A4C 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 80076A50 C0 23 00 04 */ lfs f1, 4(r3) -/* 80076A54 C0 02 8C D4 */ lfs f0, lit_4424(r2) -/* 80076A58 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80076A5C D0 03 00 04 */ stfs f0, 4(r3) -/* 80076A60 7F 43 D3 78 */ mr r3, r26 -/* 80076A64 7F 64 DB 78 */ mr r4, r27 -/* 80076A68 4B FF F8 E9 */ bl GroundCheck__9dBgS_AcchFR4dBgS -lbl_80076A6C: -/* 80076A6C 38 61 00 4C */ addi r3, r1, 0x4c -/* 80076A70 38 80 FF FF */ li r4, -1 -/* 80076A74 48 1F 13 49 */ bl __dt__11cBgS_LinChkFv -lbl_80076A78: -/* 80076A78 38 61 00 FC */ addi r3, r1, 0xfc -/* 80076A7C 38 80 FF FF */ li r4, -1 -/* 80076A80 48 00 26 11 */ bl __dt__12dBgS_RoofChkFv -/* 80076A84 E3 E1 01 88 */ psq_l f31, 392(r1), 0, 0 /* qr0 */ -/* 80076A88 CB E1 01 80 */ lfd f31, 0x180(r1) -/* 80076A8C E3 C1 01 78 */ psq_l f30, 376(r1), 0, 0 /* qr0 */ -/* 80076A90 CB C1 01 70 */ lfd f30, 0x170(r1) -/* 80076A94 39 61 01 70 */ addi r11, r1, 0x170 -/* 80076A98 48 2E B7 81 */ bl _restgpr_25 -/* 80076A9C 80 01 01 94 */ lwz r0, 0x194(r1) -/* 80076AA0 7C 08 03 A6 */ mtlr r0 -/* 80076AA4 38 21 01 90 */ addi r1, r1, 0x190 -/* 80076AA8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/__ct__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/__ct__9dBgS_AcchFv.s deleted file mode 100644 index bd279b1736b..00000000000 --- a/asm/d/bg/d_bg_s_acch/__ct__9dBgS_AcchFv.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_800760A0: -/* 800760A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800760A4 7C 08 02 A6 */ mflr r0 -/* 800760A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800760AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800760B0 7C 7F 1B 78 */ mr r31, r3 -/* 800760B4 48 1F 1A 99 */ bl __ct__8cBgS_ChkFv -/* 800760B8 38 7F 00 14 */ addi r3, r31, 0x14 -/* 800760BC 48 00 13 E1 */ bl __ct__8dBgS_ChkFv -/* 800760C0 3C 60 80 3B */ lis r3, __vt__9dBgS_Acch@ha /* 0x803AB640@ha */ -/* 800760C4 38 63 B6 40 */ addi r3, r3, __vt__9dBgS_Acch@l /* 0x803AB640@l */ -/* 800760C8 90 7F 00 10 */ stw r3, 0x10(r31) -/* 800760CC 38 03 00 0C */ addi r0, r3, 0xc -/* 800760D0 90 1F 00 14 */ stw r0, 0x14(r31) -/* 800760D4 38 03 00 18 */ addi r0, r3, 0x18 -/* 800760D8 90 1F 00 24 */ stw r0, 0x24(r31) -/* 800760DC 3C 60 80 3A */ lis r3, __vt__8cM3dGLin@ha /* 0x803A78F8@ha */ -/* 800760E0 38 03 78 F8 */ addi r0, r3, __vt__8cM3dGLin@l /* 0x803A78F8@l */ -/* 800760E4 90 1F 00 5C */ stw r0, 0x5c(r31) -/* 800760E8 3C 60 80 3A */ lis r3, __vt__8cM3dGCyl@ha /* 0x803A720C@ha */ -/* 800760EC 38 03 72 0C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x803A720C@l */ -/* 800760F0 90 1F 00 74 */ stw r0, 0x74(r31) -/* 800760F4 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 800760F8 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 800760FC 90 1F 00 B0 */ stw r0, 0xb0(r31) -/* 80076100 38 7F 00 DC */ addi r3, r31, 0xdc -/* 80076104 48 00 14 79 */ bl __ct__11dBgS_GndChkFv -/* 80076108 38 7F 01 30 */ addi r3, r31, 0x130 -/* 8007610C 48 00 2E E9 */ bl __ct__12dBgS_RoofChkFv -/* 80076110 38 7F 01 80 */ addi r3, r31, 0x180 -/* 80076114 48 00 30 51 */ bl __ct__11dBgS_WtrChkFv -/* 80076118 38 7F 00 14 */ addi r3, r31, 0x14 -/* 8007611C 48 00 14 45 */ bl GetPolyPassChkInfo__8dBgS_ChkFv -/* 80076120 90 7F 00 00 */ stw r3, 0(r31) -/* 80076124 38 7F 00 14 */ addi r3, r31, 0x14 -/* 80076128 48 00 14 3D */ bl GetGrpPassChkInfo__8dBgS_ChkFv -/* 8007612C 90 7F 00 04 */ stw r3, 4(r31) -/* 80076130 38 60 00 00 */ li r3, 0 -/* 80076134 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 80076138 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 8007613C 60 00 00 08 */ ori r0, r0, 8 -/* 80076140 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 80076144 90 7F 00 30 */ stw r3, 0x30(r31) -/* 80076148 90 7F 00 34 */ stw r3, 0x34(r31) -/* 8007614C 90 7F 00 38 */ stw r3, 0x38(r31) -/* 80076150 C0 42 8C C4 */ lfs f2, lit_4089(r2) -/* 80076154 D0 5F 00 98 */ stfs f2, 0x98(r31) -/* 80076158 C0 22 8C C0 */ lfs f1, lit_4025(r2) -/* 8007615C D0 3F 00 90 */ stfs f1, 0x90(r31) -/* 80076160 C0 02 8C C8 */ lfs f0, lit_4090(r2) -/* 80076164 D0 1F 00 9C */ stfs f0, 0x9c(r31) -/* 80076168 D0 3F 00 94 */ stfs f1, 0x94(r31) -/* 8007616C 98 7F 00 B4 */ stb r3, 0xb4(r31) -/* 80076170 D0 3F 00 B8 */ stfs f1, 0xb8(r31) -/* 80076174 D0 3F 00 BC */ stfs f1, 0xbc(r31) -/* 80076178 90 7F 00 88 */ stw r3, 0x88(r31) -/* 8007617C 90 7F 00 8C */ stw r3, 0x8c(r31) -/* 80076180 C0 02 8C CC */ lfs f0, lit_4091(r2) -/* 80076184 D0 1F 00 C4 */ stfs f0, 0xc4(r31) -/* 80076188 D0 3F 00 C8 */ stfs f1, 0xc8(r31) -/* 8007618C D0 3F 00 CC */ stfs f1, 0xcc(r31) -/* 80076190 38 00 00 01 */ li r0, 1 -/* 80076194 98 1F 01 D4 */ stb r0, 0x1d4(r31) -/* 80076198 C0 02 8C D0 */ lfs f0, lit_4092(r2) -/* 8007619C D0 1F 00 D0 */ stfs f0, 0xd0(r31) -/* 800761A0 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 800761A4 90 7F 00 40 */ stw r3, 0x40(r31) -/* 800761A8 90 7F 00 84 */ stw r3, 0x84(r31) -/* 800761AC 90 7F 00 D4 */ stw r3, 0xd4(r31) -/* 800761B0 D0 5F 00 D8 */ stfs f2, 0xd8(r31) -/* 800761B4 7F E3 FB 78 */ mr r3, r31 -/* 800761B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800761BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800761C0 7C 08 03 A6 */ mtlr r0 -/* 800761C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800761C8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/__dt__12dBgS_AcchCirFv.s b/asm/d/bg/d_bg_s_acch/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index a4992d622cc..00000000000 --- a/asm/d/bg/d_bg_s_acch/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80077414: -/* 80077414 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077418 7C 08 02 A6 */ mflr r0 -/* 8007741C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077420 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077424 93 C1 00 08 */ stw r30, 8(r1) -/* 80077428 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8007742C 7C 9F 23 78 */ mr r31, r4 -/* 80077430 41 82 00 38 */ beq lbl_80077468 -/* 80077434 3C 60 80 3B */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x803AB664@ha */ -/* 80077438 38 03 B6 64 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x803AB664@l */ -/* 8007743C 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80077440 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80077444 38 80 FF FF */ li r4, -1 -/* 80077448 48 1F 7A D1 */ bl __dt__8cM3dGCirFv -/* 8007744C 7F C3 F3 78 */ mr r3, r30 -/* 80077450 38 80 00 00 */ li r4, 0 -/* 80077454 48 1F 0C 5D */ bl __dt__13cBgS_PolyInfoFv -/* 80077458 7F E0 07 35 */ extsh. r0, r31 -/* 8007745C 40 81 00 0C */ ble lbl_80077468 -/* 80077460 7F C3 F3 78 */ mr r3, r30 -/* 80077464 48 25 78 D9 */ bl __dl__FPv -lbl_80077468: -/* 80077468 7F C3 F3 78 */ mr r3, r30 -/* 8007746C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077470 83 C1 00 08 */ lwz r30, 8(r1) -/* 80077474 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077478 7C 08 03 A6 */ mtlr r0 -/* 8007747C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077480 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/__dt__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/__dt__9dBgS_AcchFv.s deleted file mode 100644 index 7c4716d26e3..00000000000 --- a/asm/d/bg/d_bg_s_acch/__dt__9dBgS_AcchFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_80075F94: -/* 80075F94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80075F98 7C 08 02 A6 */ mflr r0 -/* 80075F9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80075FA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80075FA4 93 C1 00 08 */ stw r30, 8(r1) -/* 80075FA8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80075FAC 7C 9F 23 78 */ mr r31, r4 -/* 80075FB0 41 82 00 D4 */ beq lbl_80076084 -/* 80075FB4 3C 60 80 3B */ lis r3, __vt__9dBgS_Acch@ha /* 0x803AB640@ha */ -/* 80075FB8 38 63 B6 40 */ addi r3, r3, __vt__9dBgS_Acch@l /* 0x803AB640@l */ -/* 80075FBC 90 7E 00 10 */ stw r3, 0x10(r30) -/* 80075FC0 38 03 00 0C */ addi r0, r3, 0xc -/* 80075FC4 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80075FC8 38 03 00 18 */ addi r0, r3, 0x18 -/* 80075FCC 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80075FD0 34 1E 01 80 */ addic. r0, r30, 0x180 -/* 80075FD4 41 82 00 34 */ beq lbl_80076008 -/* 80075FD8 3C 60 80 3A */ lis r3, __vt__11dBgS_WtrChk@ha /* 0x803A37FC@ha */ -/* 80075FDC 38 63 37 FC */ addi r3, r3, __vt__11dBgS_WtrChk@l /* 0x803A37FC@l */ -/* 80075FE0 90 7E 01 8C */ stw r3, 0x18c(r30) -/* 80075FE4 38 03 00 0C */ addi r0, r3, 0xc -/* 80075FE8 90 1E 01 A0 */ stw r0, 0x1a0(r30) -/* 80075FEC 38 03 00 18 */ addi r0, r3, 0x18 -/* 80075FF0 90 1E 01 A4 */ stw r0, 0x1a4(r30) -/* 80075FF4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80075FF8 90 1E 01 B4 */ stw r0, 0x1b4(r30) -/* 80075FFC 38 7E 01 80 */ addi r3, r30, 0x180 -/* 80076000 38 80 00 00 */ li r4, 0 -/* 80076004 48 00 2C 75 */ bl __dt__14dBgS_SplGrpChkFv -lbl_80076008: -/* 80076008 38 7E 01 30 */ addi r3, r30, 0x130 -/* 8007600C 38 80 FF FF */ li r4, -1 -/* 80076010 48 00 30 81 */ bl __dt__12dBgS_RoofChkFv -/* 80076014 38 7E 00 DC */ addi r3, r30, 0xdc -/* 80076018 38 80 FF FF */ li r4, -1 -/* 8007601C 48 00 15 D5 */ bl __dt__11dBgS_GndChkFv -/* 80076020 34 1E 00 A0 */ addic. r0, r30, 0xa0 -/* 80076024 41 82 00 10 */ beq lbl_80076034 -/* 80076028 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8007602C 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80076030 90 1E 00 B0 */ stw r0, 0xb0(r30) -lbl_80076034: -/* 80076034 34 1E 00 60 */ addic. r0, r30, 0x60 -/* 80076038 41 82 00 10 */ beq lbl_80076048 -/* 8007603C 3C 60 80 3A */ lis r3, __vt__8cM3dGCyl@ha /* 0x803A720C@ha */ -/* 80076040 38 03 72 0C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x803A720C@l */ -/* 80076044 90 1E 00 74 */ stw r0, 0x74(r30) -lbl_80076048: -/* 80076048 34 1E 00 44 */ addic. r0, r30, 0x44 -/* 8007604C 41 82 00 10 */ beq lbl_8007605C -/* 80076050 3C 60 80 3A */ lis r3, __vt__8cM3dGLin@ha /* 0x803A78F8@ha */ -/* 80076054 38 03 78 F8 */ addi r0, r3, __vt__8cM3dGLin@l /* 0x803A78F8@l */ -/* 80076058 90 1E 00 5C */ stw r0, 0x5c(r30) -lbl_8007605C: -/* 8007605C 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80076060 38 80 00 00 */ li r4, 0 -/* 80076064 48 00 14 85 */ bl __dt__8dBgS_ChkFv -/* 80076068 7F C3 F3 78 */ mr r3, r30 -/* 8007606C 38 80 00 00 */ li r4, 0 -/* 80076070 48 1F 1B 01 */ bl __dt__8cBgS_ChkFv -/* 80076074 7F E0 07 35 */ extsh. r0, r31 -/* 80076078 40 81 00 0C */ ble lbl_80076084 -/* 8007607C 7F C3 F3 78 */ mr r3, r30 -/* 80076080 48 25 8C BD */ bl __dl__FPv -lbl_80076084: -/* 80076084 7F C3 F3 78 */ mr r3, r30 -/* 80076088 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007608C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80076090 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80076094 7C 08 03 A6 */ mtlr r0 -/* 80076098 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007609C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/func_80077484.s b/asm/d/bg/d_bg_s_acch/func_80077484.s deleted file mode 100644 index 4e28430fef9..00000000000 --- a/asm/d/bg/d_bg_s_acch/func_80077484.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077484: -/* 80077484 38 63 FF DC */ addi r3, r3, -36 -/* 80077488 4B FF EB 0C */ b __dt__9dBgS_AcchFv diff --git a/asm/d/bg/d_bg_s_acch/func_8007748C.s b/asm/d/bg/d_bg_s_acch/func_8007748C.s deleted file mode 100644 index b71e38d7793..00000000000 --- a/asm/d/bg/d_bg_s_acch/func_8007748C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007748C: -/* 8007748C 38 63 FF EC */ addi r3, r3, -20 -/* 80077490 4B FF EB 04 */ b __dt__9dBgS_AcchFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/__dt__11dBgS_GndChkFv.s b/asm/d/bg/d_bg_s_gnd_chk/__dt__11dBgS_GndChkFv.s deleted file mode 100644 index 539292d752c..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__dt__11dBgS_GndChkFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_800775F0: -/* 800775F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800775F4 7C 08 02 A6 */ mflr r0 -/* 800775F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800775FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077600 93 C1 00 08 */ stw r30, 8(r1) -/* 80077604 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077608 7C 9F 23 78 */ mr r31, r4 -/* 8007760C 41 82 00 50 */ beq lbl_8007765C -/* 80077610 3C 60 80 3B */ lis r3, __vt__11dBgS_GndChk@ha /* 0x803AB778@ha */ -/* 80077614 38 63 B7 78 */ addi r3, r3, __vt__11dBgS_GndChk@l /* 0x803AB778@l */ -/* 80077618 90 7E 00 10 */ stw r3, 0x10(r30) -/* 8007761C 38 03 00 0C */ addi r0, r3, 0xc -/* 80077620 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80077624 38 03 00 18 */ addi r0, r3, 0x18 -/* 80077628 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 8007762C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80077630 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80077634 38 7E 00 3C */ addi r3, r30, 0x3c -/* 80077638 38 80 00 00 */ li r4, 0 -/* 8007763C 4B FF FE AD */ bl __dt__8dBgS_ChkFv -/* 80077640 7F C3 F3 78 */ mr r3, r30 -/* 80077644 38 80 00 00 */ li r4, 0 -/* 80077648 48 1F 06 4D */ bl __dt__11cBgS_GndChkFv -/* 8007764C 7F E0 07 35 */ extsh. r0, r31 -/* 80077650 40 81 00 0C */ ble lbl_8007765C -/* 80077654 7F C3 F3 78 */ mr r3, r30 -/* 80077658 48 25 76 E5 */ bl __dl__FPv -lbl_8007765C: -/* 8007765C 7F C3 F3 78 */ mr r3, r30 -/* 80077660 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077664 83 C1 00 08 */ lwz r30, 8(r1) -/* 80077668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007766C 7C 08 03 A6 */ mtlr r0 -/* 80077670 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077674 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/__dt__14dBgS_CamGndChkFv.s b/asm/d/bg/d_bg_s_gnd_chk/__dt__14dBgS_CamGndChkFv.s deleted file mode 100644 index 9f39169fa35..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__dt__14dBgS_CamGndChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80077988: -/* 80077988 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007798C 7C 08 02 A6 */ mflr r0 -/* 80077990 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077994 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077998 93 C1 00 08 */ stw r30, 8(r1) -/* 8007799C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 800779A0 7C 9F 23 78 */ mr r31, r4 -/* 800779A4 41 82 00 40 */ beq lbl_800779E4 -/* 800779A8 3C 80 80 3B */ lis r4, __vt__14dBgS_CamGndChk@ha /* 0x803AB6B8@ha */ -/* 800779AC 38 84 B6 B8 */ addi r4, r4, __vt__14dBgS_CamGndChk@l /* 0x803AB6B8@l */ -/* 800779B0 90 9E 00 10 */ stw r4, 0x10(r30) -/* 800779B4 38 04 00 0C */ addi r0, r4, 0xc -/* 800779B8 90 1E 00 20 */ stw r0, 0x20(r30) -/* 800779BC 38 04 00 18 */ addi r0, r4, 0x18 -/* 800779C0 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 800779C4 38 04 00 24 */ addi r0, r4, 0x24 -/* 800779C8 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 800779CC 38 80 00 00 */ li r4, 0 -/* 800779D0 4B FF FC 21 */ bl __dt__11dBgS_GndChkFv -/* 800779D4 7F E0 07 35 */ extsh. r0, r31 -/* 800779D8 40 81 00 0C */ ble lbl_800779E4 -/* 800779DC 7F C3 F3 78 */ mr r3, r30 -/* 800779E0 48 25 73 5D */ bl __dl__FPv -lbl_800779E4: -/* 800779E4 7F C3 F3 78 */ mr r3, r30 -/* 800779E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800779EC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800779F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800779F4 7C 08 03 A6 */ mtlr r0 -/* 800779F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800779FC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_CamGndChk_WtrFv.s b/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_CamGndChk_WtrFv.s deleted file mode 100644 index 8a706dc6e76..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_CamGndChk_WtrFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80077A98: -/* 80077A98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077A9C 7C 08 02 A6 */ mflr r0 -/* 80077AA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077AA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077AA8 93 C1 00 08 */ stw r30, 8(r1) -/* 80077AAC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077AB0 7C 9F 23 78 */ mr r31, r4 -/* 80077AB4 41 82 00 40 */ beq lbl_80077AF4 -/* 80077AB8 3C 80 80 3B */ lis r4, __vt__18dBgS_CamGndChk_Wtr@ha /* 0x803AB688@ha */ -/* 80077ABC 38 84 B6 88 */ addi r4, r4, __vt__18dBgS_CamGndChk_Wtr@l /* 0x803AB688@l */ -/* 80077AC0 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80077AC4 38 04 00 0C */ addi r0, r4, 0xc -/* 80077AC8 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80077ACC 38 04 00 18 */ addi r0, r4, 0x18 -/* 80077AD0 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 80077AD4 38 04 00 24 */ addi r0, r4, 0x24 -/* 80077AD8 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80077ADC 38 80 00 00 */ li r4, 0 -/* 80077AE0 4B FF FE A9 */ bl __dt__14dBgS_CamGndChkFv -/* 80077AE4 7F E0 07 35 */ extsh. r0, r31 -/* 80077AE8 40 81 00 0C */ ble lbl_80077AF4 -/* 80077AEC 7F C3 F3 78 */ mr r3, r30 -/* 80077AF0 48 25 72 4D */ bl __dl__FPv -lbl_80077AF4: -/* 80077AF4 7F C3 F3 78 */ mr r3, r30 -/* 80077AF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077AFC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80077B00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077B04 7C 08 03 A6 */ mtlr r0 -/* 80077B08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077B0C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_AllFv.s b/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_AllFv.s deleted file mode 100644 index 4656023248a..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_AllFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_800778E8: -/* 800778E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800778EC 7C 08 02 A6 */ mflr r0 -/* 800778F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800778F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800778F8 93 C1 00 08 */ stw r30, 8(r1) -/* 800778FC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077900 7C 9F 23 78 */ mr r31, r4 -/* 80077904 41 82 00 68 */ beq lbl_8007796C -/* 80077908 3C 80 80 3B */ lis r4, __vt__18dBgS_ObjGndChk_All@ha /* 0x803AB6E8@ha */ -/* 8007790C 38 84 B6 E8 */ addi r4, r4, __vt__18dBgS_ObjGndChk_All@l /* 0x803AB6E8@l */ -/* 80077910 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80077914 38 04 00 0C */ addi r0, r4, 0xc -/* 80077918 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8007791C 38 04 00 18 */ addi r0, r4, 0x18 -/* 80077920 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 80077924 38 04 00 24 */ addi r0, r4, 0x24 -/* 80077928 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 8007792C 41 82 00 30 */ beq lbl_8007795C -/* 80077930 3C 80 80 3A */ lis r4, __vt__14dBgS_ObjGndChk@ha /* 0x803A382C@ha */ -/* 80077934 38 84 38 2C */ addi r4, r4, __vt__14dBgS_ObjGndChk@l /* 0x803A382C@l */ -/* 80077938 90 9E 00 10 */ stw r4, 0x10(r30) -/* 8007793C 38 04 00 0C */ addi r0, r4, 0xc -/* 80077940 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80077944 38 04 00 18 */ addi r0, r4, 0x18 -/* 80077948 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 8007794C 38 04 00 24 */ addi r0, r4, 0x24 -/* 80077950 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80077954 38 80 00 00 */ li r4, 0 -/* 80077958 4B FF FC 99 */ bl __dt__11dBgS_GndChkFv -lbl_8007795C: -/* 8007795C 7F E0 07 35 */ extsh. r0, r31 -/* 80077960 40 81 00 0C */ ble lbl_8007796C -/* 80077964 7F C3 F3 78 */ mr r3, r30 -/* 80077968 48 25 73 D5 */ bl __dl__FPv -lbl_8007796C: -/* 8007796C 7F C3 F3 78 */ mr r3, r30 -/* 80077970 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077974 83 C1 00 08 */ lwz r30, 8(r1) -/* 80077978 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007797C 7C 08 03 A6 */ mtlr r0 -/* 80077980 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077984 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_SplFv.s b/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_SplFv.s deleted file mode 100644 index 822825b35ef..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_SplFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80077848: -/* 80077848 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007784C 7C 08 02 A6 */ mflr r0 -/* 80077850 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077854 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077858 93 C1 00 08 */ stw r30, 8(r1) -/* 8007785C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077860 7C 9F 23 78 */ mr r31, r4 -/* 80077864 41 82 00 68 */ beq lbl_800778CC -/* 80077868 3C 80 80 3B */ lis r4, __vt__18dBgS_ObjGndChk_Spl@ha /* 0x803AB718@ha */ -/* 8007786C 38 84 B7 18 */ addi r4, r4, __vt__18dBgS_ObjGndChk_Spl@l /* 0x803AB718@l */ -/* 80077870 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80077874 38 04 00 0C */ addi r0, r4, 0xc -/* 80077878 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8007787C 38 04 00 18 */ addi r0, r4, 0x18 -/* 80077880 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 80077884 38 04 00 24 */ addi r0, r4, 0x24 -/* 80077888 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 8007788C 41 82 00 30 */ beq lbl_800778BC -/* 80077890 3C 80 80 3A */ lis r4, __vt__14dBgS_ObjGndChk@ha /* 0x803A382C@ha */ -/* 80077894 38 84 38 2C */ addi r4, r4, __vt__14dBgS_ObjGndChk@l /* 0x803A382C@l */ -/* 80077898 90 9E 00 10 */ stw r4, 0x10(r30) -/* 8007789C 38 04 00 0C */ addi r0, r4, 0xc -/* 800778A0 90 1E 00 20 */ stw r0, 0x20(r30) -/* 800778A4 38 04 00 18 */ addi r0, r4, 0x18 -/* 800778A8 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 800778AC 38 04 00 24 */ addi r0, r4, 0x24 -/* 800778B0 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 800778B4 38 80 00 00 */ li r4, 0 -/* 800778B8 4B FF FD 39 */ bl __dt__11dBgS_GndChkFv -lbl_800778BC: -/* 800778BC 7F E0 07 35 */ extsh. r0, r31 -/* 800778C0 40 81 00 0C */ ble lbl_800778CC -/* 800778C4 7F C3 F3 78 */ mr r3, r30 -/* 800778C8 48 25 74 75 */ bl __dl__FPv -lbl_800778CC: -/* 800778CC 7F C3 F3 78 */ mr r3, r30 -/* 800778D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800778D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800778D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800778DC 7C 08 03 A6 */ mtlr r0 -/* 800778E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800778E4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_WtrFv.s b/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_WtrFv.s deleted file mode 100644 index b2ade6aecd9..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_WtrFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80077710: -/* 80077710 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077714 7C 08 02 A6 */ mflr r0 -/* 80077718 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007771C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077720 93 C1 00 08 */ stw r30, 8(r1) -/* 80077724 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077728 7C 9F 23 78 */ mr r31, r4 -/* 8007772C 41 82 00 68 */ beq lbl_80077794 -/* 80077730 3C 80 80 3B */ lis r4, __vt__18dBgS_ObjGndChk_Wtr@ha /* 0x803AB748@ha */ -/* 80077734 38 84 B7 48 */ addi r4, r4, __vt__18dBgS_ObjGndChk_Wtr@l /* 0x803AB748@l */ -/* 80077738 90 9E 00 10 */ stw r4, 0x10(r30) -/* 8007773C 38 04 00 0C */ addi r0, r4, 0xc -/* 80077740 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80077744 38 04 00 18 */ addi r0, r4, 0x18 -/* 80077748 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 8007774C 38 04 00 24 */ addi r0, r4, 0x24 -/* 80077750 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80077754 41 82 00 30 */ beq lbl_80077784 -/* 80077758 3C 80 80 3A */ lis r4, __vt__14dBgS_ObjGndChk@ha /* 0x803A382C@ha */ -/* 8007775C 38 84 38 2C */ addi r4, r4, __vt__14dBgS_ObjGndChk@l /* 0x803A382C@l */ -/* 80077760 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80077764 38 04 00 0C */ addi r0, r4, 0xc -/* 80077768 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8007776C 38 04 00 18 */ addi r0, r4, 0x18 -/* 80077770 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 80077774 38 04 00 24 */ addi r0, r4, 0x24 -/* 80077778 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 8007777C 38 80 00 00 */ li r4, 0 -/* 80077780 4B FF FE 71 */ bl __dt__11dBgS_GndChkFv -lbl_80077784: -/* 80077784 7F E0 07 35 */ extsh. r0, r31 -/* 80077788 40 81 00 0C */ ble lbl_80077794 -/* 8007778C 7F C3 F3 78 */ mr r3, r30 -/* 80077790 48 25 75 AD */ bl __dl__FPv -lbl_80077794: -/* 80077794 7F C3 F3 78 */ mr r3, r30 -/* 80077798 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007779C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800777A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800777A4 7C 08 03 A6 */ mtlr r0 -/* 800777A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800777AC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B10.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B10.s deleted file mode 100644 index 0ed2f509ffd..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B10.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B10: -/* 80077B10 38 63 FF EC */ addi r3, r3, -20 -/* 80077B14 4B FF FA DC */ b __dt__11dBgS_GndChkFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B18.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B18.s deleted file mode 100644 index 7718e76f7de..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B18.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B18: -/* 80077B18 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B1C 4B FF FA D4 */ b __dt__11dBgS_GndChkFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B20.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B20.s deleted file mode 100644 index a786bd8bd53..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B20.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B20: -/* 80077B20 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B24 4B FF FA CC */ b __dt__11dBgS_GndChkFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B28.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B28.s deleted file mode 100644 index 3d3fd1d4b8a..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B28.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B28: -/* 80077B28 38 63 FF EC */ addi r3, r3, -20 -/* 80077B2C 4B FF FB E4 */ b __dt__18dBgS_ObjGndChk_WtrFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B30.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B30.s deleted file mode 100644 index 181a6772411..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B30.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B30: -/* 80077B30 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B34 4B FF FB DC */ b __dt__18dBgS_ObjGndChk_WtrFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B38.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B38.s deleted file mode 100644 index 7ad5891f95b..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B38.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B38: -/* 80077B38 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B3C 4B FF FB D4 */ b __dt__18dBgS_ObjGndChk_WtrFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B40.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B40.s deleted file mode 100644 index 55dfc2fe1de..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B40.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B40: -/* 80077B40 38 63 FF EC */ addi r3, r3, -20 -/* 80077B44 4B FF FD 04 */ b __dt__18dBgS_ObjGndChk_SplFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B48.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B48.s deleted file mode 100644 index f55f56644bb..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B48.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B48: -/* 80077B48 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B4C 4B FF FC FC */ b __dt__18dBgS_ObjGndChk_SplFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B50.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B50.s deleted file mode 100644 index 3ccbaf7f480..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B50.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B50: -/* 80077B50 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B54 4B FF FC F4 */ b __dt__18dBgS_ObjGndChk_SplFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B58.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B58.s deleted file mode 100644 index 7683091ccc1..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B58.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B58: -/* 80077B58 38 63 FF EC */ addi r3, r3, -20 -/* 80077B5C 4B FF FD 8C */ b __dt__18dBgS_ObjGndChk_AllFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B60.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B60.s deleted file mode 100644 index 95957e977cb..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B60.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B60: -/* 80077B60 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B64 4B FF FD 84 */ b __dt__18dBgS_ObjGndChk_AllFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B68.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B68.s deleted file mode 100644 index b1929a0c673..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B68.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B68: -/* 80077B68 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B6C 4B FF FD 7C */ b __dt__18dBgS_ObjGndChk_AllFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B70.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B70.s deleted file mode 100644 index 341b867fbf0..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B70.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B70: -/* 80077B70 38 63 FF EC */ addi r3, r3, -20 -/* 80077B74 4B FF FE 14 */ b __dt__14dBgS_CamGndChkFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B78.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B78.s deleted file mode 100644 index dbbbd062c03..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B78.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B78: -/* 80077B78 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B7C 4B FF FE 0C */ b __dt__14dBgS_CamGndChkFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B80.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B80.s deleted file mode 100644 index f635ff27627..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B80.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B80: -/* 80077B80 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B84 4B FF FE 04 */ b __dt__14dBgS_CamGndChkFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B88.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B88.s deleted file mode 100644 index 1ffdd7fc3e6..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B88.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B88: -/* 80077B88 38 63 FF EC */ addi r3, r3, -20 -/* 80077B8C 4B FF FF 0C */ b __dt__18dBgS_CamGndChk_WtrFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B90.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B90.s deleted file mode 100644 index ed57b712960..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B90.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B90: -/* 80077B90 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B94 4B FF FF 04 */ b __dt__18dBgS_CamGndChk_WtrFv diff --git a/asm/d/bg/d_bg_s_gnd_chk/func_80077B98.s b/asm/d/bg/d_bg_s_gnd_chk/func_80077B98.s deleted file mode 100644 index 47130d09624..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/func_80077B98.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077B98: -/* 80077B98 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B9C 4B FF FE FC */ b __dt__18dBgS_CamGndChk_WtrFv diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__11dBgS_LinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__11dBgS_LinChkFv.s deleted file mode 100644 index 7ed133fc710..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__11dBgS_LinChkFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80077CDC: -/* 80077CDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077CE0 7C 08 02 A6 */ mflr r0 -/* 80077CE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077CE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077CEC 93 C1 00 08 */ stw r30, 8(r1) -/* 80077CF0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077CF4 7C 9F 23 78 */ mr r31, r4 -/* 80077CF8 41 82 00 50 */ beq lbl_80077D48 -/* 80077CFC 3C 60 80 3B */ lis r3, __vt__11dBgS_LinChk@ha /* 0x803AB970@ha */ -/* 80077D00 38 63 B9 70 */ addi r3, r3, __vt__11dBgS_LinChk@l /* 0x803AB970@l */ -/* 80077D04 90 7E 00 10 */ stw r3, 0x10(r30) -/* 80077D08 38 03 00 0C */ addi r0, r3, 0xc -/* 80077D0C 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80077D10 38 03 00 18 */ addi r0, r3, 0x18 -/* 80077D14 90 1E 00 58 */ stw r0, 0x58(r30) -/* 80077D18 38 03 00 24 */ addi r0, r3, 0x24 -/* 80077D1C 90 1E 00 68 */ stw r0, 0x68(r30) -/* 80077D20 38 7E 00 58 */ addi r3, r30, 0x58 -/* 80077D24 38 80 00 00 */ li r4, 0 -/* 80077D28 4B FF F7 C1 */ bl __dt__8dBgS_ChkFv -/* 80077D2C 7F C3 F3 78 */ mr r3, r30 -/* 80077D30 38 80 00 00 */ li r4, 0 -/* 80077D34 48 1F 00 89 */ bl __dt__11cBgS_LinChkFv -/* 80077D38 7F E0 07 35 */ extsh. r0, r31 -/* 80077D3C 40 81 00 0C */ ble lbl_80077D48 -/* 80077D40 7F C3 F3 78 */ mr r3, r30 -/* 80077D44 48 25 6F F9 */ bl __dl__FPv -lbl_80077D48: -/* 80077D48 7F C3 F3 78 */ mr r3, r30 -/* 80077D4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077D50 83 C1 00 08 */ lwz r30, 8(r1) -/* 80077D54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077D58 7C 08 03 A6 */ mtlr r0 -/* 80077D5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077D60 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_CamLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_CamLinChkFv.s deleted file mode 100644 index a0736ae2dc4..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_CamLinChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80077E00: -/* 80077E00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077E04 7C 08 02 A6 */ mflr r0 -/* 80077E08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077E0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077E10 93 C1 00 08 */ stw r30, 8(r1) -/* 80077E14 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077E18 7C 9F 23 78 */ mr r31, r4 -/* 80077E1C 41 82 00 40 */ beq lbl_80077E5C -/* 80077E20 3C 80 80 3B */ lis r4, __vt__14dBgS_CamLinChk@ha /* 0x803AB940@ha */ -/* 80077E24 38 84 B9 40 */ addi r4, r4, __vt__14dBgS_CamLinChk@l /* 0x803AB940@l */ -/* 80077E28 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80077E2C 38 04 00 0C */ addi r0, r4, 0xc -/* 80077E30 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80077E34 38 04 00 18 */ addi r0, r4, 0x18 -/* 80077E38 90 1E 00 58 */ stw r0, 0x58(r30) -/* 80077E3C 38 04 00 24 */ addi r0, r4, 0x24 -/* 80077E40 90 1E 00 68 */ stw r0, 0x68(r30) -/* 80077E44 38 80 00 00 */ li r4, 0 -/* 80077E48 4B FF FE 95 */ bl __dt__11dBgS_LinChkFv -/* 80077E4C 7F E0 07 35 */ extsh. r0, r31 -/* 80077E50 40 81 00 0C */ ble lbl_80077E5C -/* 80077E54 7F C3 F3 78 */ mr r3, r30 -/* 80077E58 48 25 6E E5 */ bl __dl__FPv -lbl_80077E5C: -/* 80077E5C 7F C3 F3 78 */ mr r3, r30 -/* 80077E60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077E64 83 C1 00 08 */ lwz r30, 8(r1) -/* 80077E68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077E6C 7C 08 03 A6 */ mtlr r0 -/* 80077E70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077E74 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_ObjLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_ObjLinChkFv.s deleted file mode 100644 index b886424f3f6..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_ObjLinChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80077FB8: -/* 80077FB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077FBC 7C 08 02 A6 */ mflr r0 -/* 80077FC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077FC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077FC8 93 C1 00 08 */ stw r30, 8(r1) -/* 80077FCC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077FD0 7C 9F 23 78 */ mr r31, r4 -/* 80077FD4 41 82 00 40 */ beq lbl_80078014 -/* 80077FD8 3C 80 80 3B */ lis r4, __vt__14dBgS_ObjLinChk@ha /* 0x803AB8E0@ha */ -/* 80077FDC 38 84 B8 E0 */ addi r4, r4, __vt__14dBgS_ObjLinChk@l /* 0x803AB8E0@l */ -/* 80077FE0 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80077FE4 38 04 00 0C */ addi r0, r4, 0xc -/* 80077FE8 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80077FEC 38 04 00 18 */ addi r0, r4, 0x18 -/* 80077FF0 90 1E 00 58 */ stw r0, 0x58(r30) -/* 80077FF4 38 04 00 24 */ addi r0, r4, 0x24 -/* 80077FF8 90 1E 00 68 */ stw r0, 0x68(r30) -/* 80077FFC 38 80 00 00 */ li r4, 0 -/* 80078000 4B FF FC DD */ bl __dt__11dBgS_LinChkFv -/* 80078004 7F E0 07 35 */ extsh. r0, r31 -/* 80078008 40 81 00 0C */ ble lbl_80078014 -/* 8007800C 7F C3 F3 78 */ mr r3, r30 -/* 80078010 48 25 6D 2D */ bl __dl__FPv -lbl_80078014: -/* 80078014 7F C3 F3 78 */ mr r3, r30 -/* 80078018 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007801C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80078020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078024 7C 08 03 A6 */ mtlr r0 -/* 80078028 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007802C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_BombLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_BombLinChkFv.s deleted file mode 100644 index f29b60a2e38..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_BombLinChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80078160: -/* 80078160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078164 7C 08 02 A6 */ mflr r0 -/* 80078168 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007816C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078170 93 C1 00 08 */ stw r30, 8(r1) -/* 80078174 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80078178 7C 9F 23 78 */ mr r31, r4 -/* 8007817C 41 82 00 40 */ beq lbl_800781BC -/* 80078180 3C 80 80 3B */ lis r4, __vt__15dBgS_BombLinChk@ha /* 0x803AB880@ha */ -/* 80078184 38 84 B8 80 */ addi r4, r4, __vt__15dBgS_BombLinChk@l /* 0x803AB880@l */ -/* 80078188 90 9E 00 10 */ stw r4, 0x10(r30) -/* 8007818C 38 04 00 0C */ addi r0, r4, 0xc -/* 80078190 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80078194 38 04 00 18 */ addi r0, r4, 0x18 -/* 80078198 90 1E 00 58 */ stw r0, 0x58(r30) -/* 8007819C 38 04 00 24 */ addi r0, r4, 0x24 -/* 800781A0 90 1E 00 68 */ stw r0, 0x68(r30) -/* 800781A4 38 80 00 00 */ li r4, 0 -/* 800781A8 4B FF FB 35 */ bl __dt__11dBgS_LinChkFv -/* 800781AC 7F E0 07 35 */ extsh. r0, r31 -/* 800781B0 40 81 00 0C */ ble lbl_800781BC -/* 800781B4 7F C3 F3 78 */ mr r3, r30 -/* 800781B8 48 25 6B 85 */ bl __dl__FPv -lbl_800781BC: -/* 800781BC 7F C3 F3 78 */ mr r3, r30 -/* 800781C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800781C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800781C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800781CC 7C 08 03 A6 */ mtlr r0 -/* 800781D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800781D4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_LinkLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_LinkLinChkFv.s deleted file mode 100644 index 0e7bf9470ef..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_LinkLinChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8007808C: -/* 8007808C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078090 7C 08 02 A6 */ mflr r0 -/* 80078094 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078098 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007809C 93 C1 00 08 */ stw r30, 8(r1) -/* 800780A0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 800780A4 7C 9F 23 78 */ mr r31, r4 -/* 800780A8 41 82 00 40 */ beq lbl_800780E8 -/* 800780AC 3C 80 80 3B */ lis r4, __vt__15dBgS_LinkLinChk@ha /* 0x803AB8B0@ha */ -/* 800780B0 38 84 B8 B0 */ addi r4, r4, __vt__15dBgS_LinkLinChk@l /* 0x803AB8B0@l */ -/* 800780B4 90 9E 00 10 */ stw r4, 0x10(r30) -/* 800780B8 38 04 00 0C */ addi r0, r4, 0xc -/* 800780BC 90 1E 00 20 */ stw r0, 0x20(r30) -/* 800780C0 38 04 00 18 */ addi r0, r4, 0x18 -/* 800780C4 90 1E 00 58 */ stw r0, 0x58(r30) -/* 800780C8 38 04 00 24 */ addi r0, r4, 0x24 -/* 800780CC 90 1E 00 68 */ stw r0, 0x68(r30) -/* 800780D0 38 80 00 00 */ li r4, 0 -/* 800780D4 4B FF FC 09 */ bl __dt__11dBgS_LinChkFv -/* 800780D8 7F E0 07 35 */ extsh. r0, r31 -/* 800780DC 40 81 00 0C */ ble lbl_800780E8 -/* 800780E0 7F C3 F3 78 */ mr r3, r30 -/* 800780E4 48 25 6C 59 */ bl __dl__FPv -lbl_800780E8: -/* 800780E8 7F C3 F3 78 */ mr r3, r30 -/* 800780EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800780F0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800780F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800780F8 7C 08 03 A6 */ mtlr r0 -/* 800780FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078100 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_RopeLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_RopeLinChkFv.s deleted file mode 100644 index 3a35c9807d0..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_RopeLinChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800783E8: -/* 800783E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800783EC 7C 08 02 A6 */ mflr r0 -/* 800783F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800783F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800783F8 93 C1 00 08 */ stw r30, 8(r1) -/* 800783FC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80078400 7C 9F 23 78 */ mr r31, r4 -/* 80078404 41 82 00 40 */ beq lbl_80078444 -/* 80078408 3C 80 80 3B */ lis r4, __vt__15dBgS_RopeLinChk@ha /* 0x803AB7F0@ha */ -/* 8007840C 38 84 B7 F0 */ addi r4, r4, __vt__15dBgS_RopeLinChk@l /* 0x803AB7F0@l */ -/* 80078410 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80078414 38 04 00 0C */ addi r0, r4, 0xc -/* 80078418 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8007841C 38 04 00 18 */ addi r0, r4, 0x18 -/* 80078420 90 1E 00 58 */ stw r0, 0x58(r30) -/* 80078424 38 04 00 24 */ addi r0, r4, 0x24 -/* 80078428 90 1E 00 68 */ stw r0, 0x68(r30) -/* 8007842C 38 80 00 00 */ li r4, 0 -/* 80078430 4B FF F8 AD */ bl __dt__11dBgS_LinChkFv -/* 80078434 7F E0 07 35 */ extsh. r0, r31 -/* 80078438 40 81 00 0C */ ble lbl_80078444 -/* 8007843C 7F C3 F3 78 */ mr r3, r30 -/* 80078440 48 25 68 FD */ bl __dl__FPv -lbl_80078444: -/* 80078444 7F C3 F3 78 */ mr r3, r30 -/* 80078448 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007844C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80078450 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078454 7C 08 03 A6 */ mtlr r0 -/* 80078458 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007845C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_ArrowLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_ArrowLinChkFv.s deleted file mode 100644 index 14bb101e783..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_ArrowLinChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80078240: -/* 80078240 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078244 7C 08 02 A6 */ mflr r0 -/* 80078248 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007824C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078250 93 C1 00 08 */ stw r30, 8(r1) -/* 80078254 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80078258 7C 9F 23 78 */ mr r31, r4 -/* 8007825C 41 82 00 40 */ beq lbl_8007829C -/* 80078260 3C 80 80 3B */ lis r4, __vt__16dBgS_ArrowLinChk@ha /* 0x803AB850@ha */ -/* 80078264 38 84 B8 50 */ addi r4, r4, __vt__16dBgS_ArrowLinChk@l /* 0x803AB850@l */ -/* 80078268 90 9E 00 10 */ stw r4, 0x10(r30) -/* 8007826C 38 04 00 0C */ addi r0, r4, 0xc -/* 80078270 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80078274 38 04 00 18 */ addi r0, r4, 0x18 -/* 80078278 90 1E 00 58 */ stw r0, 0x58(r30) -/* 8007827C 38 04 00 24 */ addi r0, r4, 0x24 -/* 80078280 90 1E 00 68 */ stw r0, 0x68(r30) -/* 80078284 38 80 00 00 */ li r4, 0 -/* 80078288 4B FF FA 55 */ bl __dt__11dBgS_LinChkFv -/* 8007828C 7F E0 07 35 */ extsh. r0, r31 -/* 80078290 40 81 00 0C */ ble lbl_8007829C -/* 80078294 7F C3 F3 78 */ mr r3, r30 -/* 80078298 48 25 6A A5 */ bl __dl__FPv -lbl_8007829C: -/* 8007829C 7F C3 F3 78 */ mr r3, r30 -/* 800782A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800782A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800782A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800782AC 7C 08 03 A6 */ mtlr r0 -/* 800782B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800782B4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_HorseLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_HorseLinChkFv.s deleted file mode 100644 index 9da43a60765..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_HorseLinChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800784BC: -/* 800784BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800784C0 7C 08 02 A6 */ mflr r0 -/* 800784C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800784C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800784CC 93 C1 00 08 */ stw r30, 8(r1) -/* 800784D0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 800784D4 7C 9F 23 78 */ mr r31, r4 -/* 800784D8 41 82 00 40 */ beq lbl_80078518 -/* 800784DC 3C 80 80 3B */ lis r4, __vt__16dBgS_HorseLinChk@ha /* 0x803AB7C0@ha */ -/* 800784E0 38 84 B7 C0 */ addi r4, r4, __vt__16dBgS_HorseLinChk@l /* 0x803AB7C0@l */ -/* 800784E4 90 9E 00 10 */ stw r4, 0x10(r30) -/* 800784E8 38 04 00 0C */ addi r0, r4, 0xc -/* 800784EC 90 1E 00 20 */ stw r0, 0x20(r30) -/* 800784F0 38 04 00 18 */ addi r0, r4, 0x18 -/* 800784F4 90 1E 00 58 */ stw r0, 0x58(r30) -/* 800784F8 38 04 00 24 */ addi r0, r4, 0x24 -/* 800784FC 90 1E 00 68 */ stw r0, 0x68(r30) -/* 80078500 38 80 00 00 */ li r4, 0 -/* 80078504 4B FF F7 D9 */ bl __dt__11dBgS_LinChkFv -/* 80078508 7F E0 07 35 */ extsh. r0, r31 -/* 8007850C 40 81 00 0C */ ble lbl_80078518 -/* 80078510 7F C3 F3 78 */ mr r3, r30 -/* 80078514 48 25 68 29 */ bl __dl__FPv -lbl_80078518: -/* 80078518 7F C3 F3 78 */ mr r3, r30 -/* 8007851C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078520 83 C1 00 08 */ lwz r30, 8(r1) -/* 80078524 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078528 7C 08 03 A6 */ mtlr r0 -/* 8007852C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078530 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__20dBgS_BoomerangLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__20dBgS_BoomerangLinChkFv.s deleted file mode 100644 index a41f878e97c..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__20dBgS_BoomerangLinChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80078314: -/* 80078314 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078318 7C 08 02 A6 */ mflr r0 -/* 8007831C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078320 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078324 93 C1 00 08 */ stw r30, 8(r1) -/* 80078328 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8007832C 7C 9F 23 78 */ mr r31, r4 -/* 80078330 41 82 00 40 */ beq lbl_80078370 -/* 80078334 3C 80 80 3B */ lis r4, __vt__20dBgS_BoomerangLinChk@ha /* 0x803AB820@ha */ -/* 80078338 38 84 B8 20 */ addi r4, r4, __vt__20dBgS_BoomerangLinChk@l /* 0x803AB820@l */ -/* 8007833C 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80078340 38 04 00 0C */ addi r0, r4, 0xc -/* 80078344 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80078348 38 04 00 18 */ addi r0, r4, 0x18 -/* 8007834C 90 1E 00 58 */ stw r0, 0x58(r30) -/* 80078350 38 04 00 24 */ addi r0, r4, 0x24 -/* 80078354 90 1E 00 68 */ stw r0, 0x68(r30) -/* 80078358 38 80 00 00 */ li r4, 0 -/* 8007835C 4B FF F9 81 */ bl __dt__11dBgS_LinChkFv -/* 80078360 7F E0 07 35 */ extsh. r0, r31 -/* 80078364 40 81 00 0C */ ble lbl_80078370 -/* 80078368 7F C3 F3 78 */ mr r3, r30 -/* 8007836C 48 25 69 D1 */ bl __dl__FPv -lbl_80078370: -/* 80078370 7F C3 F3 78 */ mr r3, r30 -/* 80078374 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078378 83 C1 00 08 */ lwz r30, 8(r1) -/* 8007837C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078380 7C 08 03 A6 */ mtlr r0 -/* 80078384 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078388 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__dt__21dBgS_CamLinChk_NorWtrFv.s b/asm/d/bg/d_bg_s_lin_chk/__dt__21dBgS_CamLinChk_NorWtrFv.s deleted file mode 100644 index be05a5fdce4..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__dt__21dBgS_CamLinChk_NorWtrFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80077EE4: -/* 80077EE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077EE8 7C 08 02 A6 */ mflr r0 -/* 80077EEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077EF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077EF4 93 C1 00 08 */ stw r30, 8(r1) -/* 80077EF8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077EFC 7C 9F 23 78 */ mr r31, r4 -/* 80077F00 41 82 00 40 */ beq lbl_80077F40 -/* 80077F04 3C 80 80 3B */ lis r4, __vt__21dBgS_CamLinChk_NorWtr@ha /* 0x803AB910@ha */ -/* 80077F08 38 84 B9 10 */ addi r4, r4, __vt__21dBgS_CamLinChk_NorWtr@l /* 0x803AB910@l */ -/* 80077F0C 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80077F10 38 04 00 0C */ addi r0, r4, 0xc -/* 80077F14 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80077F18 38 04 00 18 */ addi r0, r4, 0x18 -/* 80077F1C 90 1E 00 58 */ stw r0, 0x58(r30) -/* 80077F20 38 04 00 24 */ addi r0, r4, 0x24 -/* 80077F24 90 1E 00 68 */ stw r0, 0x68(r30) -/* 80077F28 38 80 00 00 */ li r4, 0 -/* 80077F2C 4B FF FE D5 */ bl __dt__14dBgS_CamLinChkFv -/* 80077F30 7F E0 07 35 */ extsh. r0, r31 -/* 80077F34 40 81 00 0C */ ble lbl_80077F40 -/* 80077F38 7F C3 F3 78 */ mr r3, r30 -/* 80077F3C 48 25 6E 01 */ bl __dl__FPv -lbl_80077F40: -/* 80077F40 7F C3 F3 78 */ mr r3, r30 -/* 80077F44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077F48 83 C1 00 08 */ lwz r30, 8(r1) -/* 80077F4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077F50 7C 08 03 A6 */ mtlr r0 -/* 80077F54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077F58 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/func_80078534.s b/asm/d/bg/d_bg_s_lin_chk/func_80078534.s deleted file mode 100644 index c7e8a5639b8..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_80078534.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078534: -/* 80078534 38 63 FF EC */ addi r3, r3, -20 -/* 80078538 4B FF F7 A4 */ b __dt__11dBgS_LinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_8007853C.s b/asm/d/bg/d_bg_s_lin_chk/func_8007853C.s deleted file mode 100644 index 6fd08feb489..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_8007853C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007853C: -/* 8007853C 38 63 FF 98 */ addi r3, r3, -104 -/* 80078540 4B FF F7 9C */ b __dt__11dBgS_LinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_80078544.s b/asm/d/bg/d_bg_s_lin_chk/func_80078544.s deleted file mode 100644 index 59f823f18d3..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_80078544.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078544: -/* 80078544 38 63 FF A8 */ addi r3, r3, -88 -/* 80078548 4B FF F7 94 */ b __dt__11dBgS_LinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_8007854C.s b/asm/d/bg/d_bg_s_lin_chk/func_8007854C.s deleted file mode 100644 index 41d76690d65..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_8007854C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007854C: -/* 8007854C 38 63 FF EC */ addi r3, r3, -20 -/* 80078550 4B FF F8 B0 */ b __dt__14dBgS_CamLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_80078554.s b/asm/d/bg/d_bg_s_lin_chk/func_80078554.s deleted file mode 100644 index 0052bbe831d..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_80078554.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078554: -/* 80078554 38 63 FF 98 */ addi r3, r3, -104 -/* 80078558 4B FF F8 A8 */ b __dt__14dBgS_CamLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_8007855C.s b/asm/d/bg/d_bg_s_lin_chk/func_8007855C.s deleted file mode 100644 index 781b7e12a3f..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_8007855C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007855C: -/* 8007855C 38 63 FF A8 */ addi r3, r3, -88 -/* 80078560 4B FF F8 A0 */ b __dt__14dBgS_CamLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_80078564.s b/asm/d/bg/d_bg_s_lin_chk/func_80078564.s deleted file mode 100644 index 8ebbd9eb1f1..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_80078564.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078564: -/* 80078564 38 63 FF EC */ addi r3, r3, -20 -/* 80078568 4B FF F9 7C */ b __dt__21dBgS_CamLinChk_NorWtrFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_8007856C.s b/asm/d/bg/d_bg_s_lin_chk/func_8007856C.s deleted file mode 100644 index 3b9df5a5087..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_8007856C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007856C: -/* 8007856C 38 63 FF 98 */ addi r3, r3, -104 -/* 80078570 4B FF F9 74 */ b __dt__21dBgS_CamLinChk_NorWtrFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_80078574.s b/asm/d/bg/d_bg_s_lin_chk/func_80078574.s deleted file mode 100644 index a898df9c9a4..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_80078574.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078574: -/* 80078574 38 63 FF A8 */ addi r3, r3, -88 -/* 80078578 4B FF F9 6C */ b __dt__21dBgS_CamLinChk_NorWtrFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_8007857C.s b/asm/d/bg/d_bg_s_lin_chk/func_8007857C.s deleted file mode 100644 index 40ef71d489e..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_8007857C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007857C: -/* 8007857C 38 63 FF EC */ addi r3, r3, -20 -/* 80078580 4B FF FA 38 */ b __dt__14dBgS_ObjLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_80078584.s b/asm/d/bg/d_bg_s_lin_chk/func_80078584.s deleted file mode 100644 index 10a863d2ee9..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_80078584.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078584: -/* 80078584 38 63 FF 98 */ addi r3, r3, -104 -/* 80078588 4B FF FA 30 */ b __dt__14dBgS_ObjLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_8007858C.s b/asm/d/bg/d_bg_s_lin_chk/func_8007858C.s deleted file mode 100644 index b9d03c45e96..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_8007858C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007858C: -/* 8007858C 38 63 FF A8 */ addi r3, r3, -88 -/* 80078590 4B FF FA 28 */ b __dt__14dBgS_ObjLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_80078594.s b/asm/d/bg/d_bg_s_lin_chk/func_80078594.s deleted file mode 100644 index 4ece8d58533..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_80078594.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078594: -/* 80078594 38 63 FF EC */ addi r3, r3, -20 -/* 80078598 4B FF FA F4 */ b __dt__15dBgS_LinkLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_8007859C.s b/asm/d/bg/d_bg_s_lin_chk/func_8007859C.s deleted file mode 100644 index 488db123847..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_8007859C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007859C: -/* 8007859C 38 63 FF 98 */ addi r3, r3, -104 -/* 800785A0 4B FF FA EC */ b __dt__15dBgS_LinkLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785A4.s b/asm/d/bg/d_bg_s_lin_chk/func_800785A4.s deleted file mode 100644 index 767b1e7cb00..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785A4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785A4: -/* 800785A4 38 63 FF A8 */ addi r3, r3, -88 -/* 800785A8 4B FF FA E4 */ b __dt__15dBgS_LinkLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785AC.s b/asm/d/bg/d_bg_s_lin_chk/func_800785AC.s deleted file mode 100644 index 31f7efea3b6..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785AC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785AC: -/* 800785AC 38 63 FF EC */ addi r3, r3, -20 -/* 800785B0 4B FF FB B0 */ b __dt__15dBgS_BombLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785B4.s b/asm/d/bg/d_bg_s_lin_chk/func_800785B4.s deleted file mode 100644 index 68378422b19..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785B4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785B4: -/* 800785B4 38 63 FF 98 */ addi r3, r3, -104 -/* 800785B8 4B FF FB A8 */ b __dt__15dBgS_BombLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785BC.s b/asm/d/bg/d_bg_s_lin_chk/func_800785BC.s deleted file mode 100644 index 04608fe8019..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785BC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785BC: -/* 800785BC 38 63 FF A8 */ addi r3, r3, -88 -/* 800785C0 4B FF FB A0 */ b __dt__15dBgS_BombLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785C4.s b/asm/d/bg/d_bg_s_lin_chk/func_800785C4.s deleted file mode 100644 index 31701b5062a..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785C4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785C4: -/* 800785C4 38 63 FF EC */ addi r3, r3, -20 -/* 800785C8 4B FF FC 78 */ b __dt__16dBgS_ArrowLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785CC.s b/asm/d/bg/d_bg_s_lin_chk/func_800785CC.s deleted file mode 100644 index 6eebf9c40ef..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785CC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785CC: -/* 800785CC 38 63 FF 98 */ addi r3, r3, -104 -/* 800785D0 4B FF FC 70 */ b __dt__16dBgS_ArrowLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785D4.s b/asm/d/bg/d_bg_s_lin_chk/func_800785D4.s deleted file mode 100644 index 8e855326511..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785D4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785D4: -/* 800785D4 38 63 FF A8 */ addi r3, r3, -88 -/* 800785D8 4B FF FC 68 */ b __dt__16dBgS_ArrowLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785DC.s b/asm/d/bg/d_bg_s_lin_chk/func_800785DC.s deleted file mode 100644 index 98307235658..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785DC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785DC: -/* 800785DC 38 63 FF EC */ addi r3, r3, -20 -/* 800785E0 4B FF FD 34 */ b __dt__20dBgS_BoomerangLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785E4.s b/asm/d/bg/d_bg_s_lin_chk/func_800785E4.s deleted file mode 100644 index 76abc5e3399..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785E4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785E4: -/* 800785E4 38 63 FF 98 */ addi r3, r3, -104 -/* 800785E8 4B FF FD 2C */ b __dt__20dBgS_BoomerangLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785EC.s b/asm/d/bg/d_bg_s_lin_chk/func_800785EC.s deleted file mode 100644 index efe0887e217..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785EC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785EC: -/* 800785EC 38 63 FF A8 */ addi r3, r3, -88 -/* 800785F0 4B FF FD 24 */ b __dt__20dBgS_BoomerangLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785F4.s b/asm/d/bg/d_bg_s_lin_chk/func_800785F4.s deleted file mode 100644 index fdcc99e84ac..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785F4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785F4: -/* 800785F4 38 63 FF EC */ addi r3, r3, -20 -/* 800785F8 4B FF FD F0 */ b __dt__15dBgS_RopeLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_800785FC.s b/asm/d/bg/d_bg_s_lin_chk/func_800785FC.s deleted file mode 100644 index 15ad5049929..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_800785FC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800785FC: -/* 800785FC 38 63 FF 98 */ addi r3, r3, -104 -/* 80078600 4B FF FD E8 */ b __dt__15dBgS_RopeLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_80078604.s b/asm/d/bg/d_bg_s_lin_chk/func_80078604.s deleted file mode 100644 index a7183acc306..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_80078604.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078604: -/* 80078604 38 63 FF A8 */ addi r3, r3, -88 -/* 80078608 4B FF FD E0 */ b __dt__15dBgS_RopeLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_8007860C.s b/asm/d/bg/d_bg_s_lin_chk/func_8007860C.s deleted file mode 100644 index 9c102dff636..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_8007860C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007860C: -/* 8007860C 38 63 FF EC */ addi r3, r3, -20 -/* 80078610 4B FF FE AC */ b __dt__16dBgS_HorseLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_80078614.s b/asm/d/bg/d_bg_s_lin_chk/func_80078614.s deleted file mode 100644 index d788901f107..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_80078614.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078614: -/* 80078614 38 63 FF 98 */ addi r3, r3, -104 -/* 80078618 4B FF FE A4 */ b __dt__16dBgS_HorseLinChkFv diff --git a/asm/d/bg/d_bg_s_lin_chk/func_8007861C.s b/asm/d/bg/d_bg_s_lin_chk/func_8007861C.s deleted file mode 100644 index f7bec5829da..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/func_8007861C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007861C: -/* 8007861C 38 63 FF A8 */ addi r3, r3, -88 -/* 80078620 4B FF FE 9C */ b __dt__16dBgS_HorseLinChkFv diff --git a/asm/d/bg/d_bg_s_poly_pass_chk/__dt__16dBgS_PolyPassChkFv.s b/asm/d/bg/d_bg_s_poly_pass_chk/__dt__16dBgS_PolyPassChkFv.s deleted file mode 100644 index 33bb25fc14f..00000000000 --- a/asm/d/bg/d_bg_s_poly_pass_chk/__dt__16dBgS_PolyPassChkFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80078DB0: -/* 80078DB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078DB4 7C 08 02 A6 */ mflr r0 -/* 80078DB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078DBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078DC0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80078DC4 41 82 00 30 */ beq lbl_80078DF4 -/* 80078DC8 3C 60 80 3B */ lis r3, __vt__16dBgS_PolyPassChk@ha /* 0x803ABA38@ha */ -/* 80078DCC 38 03 BA 38 */ addi r0, r3, __vt__16dBgS_PolyPassChk@l /* 0x803ABA38@l */ -/* 80078DD0 90 1F 00 00 */ stw r0, 0(r31) -/* 80078DD4 41 82 00 10 */ beq lbl_80078DE4 -/* 80078DD8 3C 60 80 3B */ lis r3, __vt__16cBgS_PolyPassChk@ha /* 0x803ABA44@ha */ -/* 80078DDC 38 03 BA 44 */ addi r0, r3, __vt__16cBgS_PolyPassChk@l /* 0x803ABA44@l */ -/* 80078DE0 90 1F 00 00 */ stw r0, 0(r31) -lbl_80078DE4: -/* 80078DE4 7C 80 07 35 */ extsh. r0, r4 -/* 80078DE8 40 81 00 0C */ ble lbl_80078DF4 -/* 80078DEC 7F E3 FB 78 */ mr r3, r31 -/* 80078DF0 48 25 5F 4D */ bl __dl__FPv -lbl_80078DF4: -/* 80078DF4 7F E3 FB 78 */ mr r3, r31 -/* 80078DF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078DFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078E00 7C 08 03 A6 */ mtlr r0 -/* 80078E04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078E08 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/__dt__11dBgS_WtrChkFv.s b/asm/f_op/f_op_actor_mng/__dt__11dBgS_WtrChkFv.s deleted file mode 100644 index 3b25c16ac43..00000000000 --- a/asm/f_op/f_op_actor_mng/__dt__11dBgS_WtrChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8001DF30: -/* 8001DF30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001DF34 7C 08 02 A6 */ mflr r0 -/* 8001DF38 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001DF3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001DF40 93 C1 00 08 */ stw r30, 8(r1) -/* 8001DF44 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8001DF48 7C 9F 23 78 */ mr r31, r4 -/* 8001DF4C 41 82 00 40 */ beq lbl_8001DF8C -/* 8001DF50 3C 80 80 3A */ lis r4, __vt__11dBgS_WtrChk@ha /* 0x803A37FC@ha */ -/* 8001DF54 38 84 37 FC */ addi r4, r4, __vt__11dBgS_WtrChk@l /* 0x803A37FC@l */ -/* 8001DF58 90 9E 00 0C */ stw r4, 0xc(r30) -/* 8001DF5C 38 04 00 0C */ addi r0, r4, 0xc -/* 8001DF60 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8001DF64 38 04 00 18 */ addi r0, r4, 0x18 -/* 8001DF68 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8001DF6C 38 04 00 24 */ addi r0, r4, 0x24 -/* 8001DF70 90 1E 00 34 */ stw r0, 0x34(r30) -/* 8001DF74 38 80 00 00 */ li r4, 0 -/* 8001DF78 48 05 AD 01 */ bl __dt__14dBgS_SplGrpChkFv -/* 8001DF7C 7F E0 07 35 */ extsh. r0, r31 -/* 8001DF80 40 81 00 0C */ ble lbl_8001DF8C -/* 8001DF84 7F C3 F3 78 */ mr r3, r30 -/* 8001DF88 48 2B 0D B5 */ bl __dl__FPv -lbl_8001DF8C: -/* 8001DF8C 7F C3 F3 78 */ mr r3, r30 -/* 8001DF90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001DF94 83 C1 00 08 */ lwz r30, 8(r1) -/* 8001DF98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001DF9C 7C 08 03 A6 */ mtlr r0 -/* 8001DFA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001DFA4 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/__dt__14dBgS_ObjGndChkFv.s b/asm/f_op/f_op_actor_mng/__dt__14dBgS_ObjGndChkFv.s deleted file mode 100644 index 09634508079..00000000000 --- a/asm/f_op/f_op_actor_mng/__dt__14dBgS_ObjGndChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8001E020: -/* 8001E020 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001E024 7C 08 02 A6 */ mflr r0 -/* 8001E028 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001E02C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001E030 93 C1 00 08 */ stw r30, 8(r1) -/* 8001E034 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8001E038 7C 9F 23 78 */ mr r31, r4 -/* 8001E03C 41 82 00 40 */ beq lbl_8001E07C -/* 8001E040 3C 80 80 3A */ lis r4, __vt__14dBgS_ObjGndChk@ha /* 0x803A382C@ha */ -/* 8001E044 38 84 38 2C */ addi r4, r4, __vt__14dBgS_ObjGndChk@l /* 0x803A382C@l */ -/* 8001E048 90 9E 00 10 */ stw r4, 0x10(r30) -/* 8001E04C 38 04 00 0C */ addi r0, r4, 0xc -/* 8001E050 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8001E054 38 04 00 18 */ addi r0, r4, 0x18 -/* 8001E058 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 8001E05C 38 04 00 24 */ addi r0, r4, 0x24 -/* 8001E060 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 8001E064 38 80 00 00 */ li r4, 0 -/* 8001E068 48 05 95 89 */ bl __dt__11dBgS_GndChkFv -/* 8001E06C 7F E0 07 35 */ extsh. r0, r31 -/* 8001E070 40 81 00 0C */ ble lbl_8001E07C -/* 8001E074 7F C3 F3 78 */ mr r3, r30 -/* 8001E078 48 2B 0C C5 */ bl __dl__FPv -lbl_8001E07C: -/* 8001E07C 7F C3 F3 78 */ mr r3, r30 -/* 8001E080 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001E084 83 C1 00 08 */ lwz r30, 8(r1) -/* 8001E088 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001E08C 7C 08 03 A6 */ mtlr r0 -/* 8001E090 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001E094 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/__dt__15dBgS_ObjRoofChkFv.s b/asm/f_op/f_op_actor_mng/__dt__15dBgS_ObjRoofChkFv.s deleted file mode 100644 index dbb7cb198b2..00000000000 --- a/asm/f_op/f_op_actor_mng/__dt__15dBgS_ObjRoofChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8001DFA8: -/* 8001DFA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001DFAC 7C 08 02 A6 */ mflr r0 -/* 8001DFB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001DFB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001DFB8 93 C1 00 08 */ stw r30, 8(r1) -/* 8001DFBC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8001DFC0 7C 9F 23 78 */ mr r31, r4 -/* 8001DFC4 41 82 00 40 */ beq lbl_8001E004 -/* 8001DFC8 3C 80 80 3A */ lis r4, __vt__15dBgS_ObjRoofChk@ha /* 0x803A37CC@ha */ -/* 8001DFCC 38 84 37 CC */ addi r4, r4, __vt__15dBgS_ObjRoofChk@l /* 0x803A37CC@l */ -/* 8001DFD0 90 9E 00 0C */ stw r4, 0xc(r30) -/* 8001DFD4 38 04 00 0C */ addi r0, r4, 0xc -/* 8001DFD8 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8001DFDC 38 04 00 18 */ addi r0, r4, 0x18 -/* 8001DFE0 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8001DFE4 38 04 00 24 */ addi r0, r4, 0x24 -/* 8001DFE8 90 1E 00 34 */ stw r0, 0x34(r30) -/* 8001DFEC 38 80 00 00 */ li r4, 0 -/* 8001DFF0 48 05 B0 A1 */ bl __dt__12dBgS_RoofChkFv -/* 8001DFF4 7F E0 07 35 */ extsh. r0, r31 -/* 8001DFF8 40 81 00 0C */ ble lbl_8001E004 -/* 8001DFFC 7F C3 F3 78 */ mr r3, r30 -/* 8001E000 48 2B 0D 3D */ bl __dl__FPv -lbl_8001E004: -/* 8001E004 7F C3 F3 78 */ mr r3, r30 -/* 8001E008 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001E00C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8001E010 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001E014 7C 08 03 A6 */ mtlr r0 -/* 8001E018 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001E01C 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/__dt__5l_HIOFv.s b/asm/f_op/f_op_actor_mng/__dt__5l_HIOFv.s deleted file mode 100644 index 0f6206dff3e..00000000000 --- a/asm/f_op/f_op_actor_mng/__dt__5l_HIOFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8001E098: -/* 8001E098 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001E09C 7C 08 02 A6 */ mflr r0 -/* 8001E0A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001E0A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001E0A8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8001E0AC 41 82 00 10 */ beq lbl_8001E0BC -/* 8001E0B0 7C 80 07 35 */ extsh. r0, r4 -/* 8001E0B4 40 81 00 08 */ ble lbl_8001E0BC -/* 8001E0B8 48 2B 0C 85 */ bl __dl__FPv -lbl_8001E0BC: -/* 8001E0BC 7F E3 FB 78 */ mr r3, r31 -/* 8001E0C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001E0C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001E0C8 7C 08 03 A6 */ mtlr r0 -/* 8001E0CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001E0D0 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/__sinit_f_op_actor_mng_cpp.s b/asm/f_op/f_op_actor_mng/__sinit_f_op_actor_mng_cpp.s deleted file mode 100644 index a12c2c02106..00000000000 --- a/asm/f_op/f_op_actor_mng/__sinit_f_op_actor_mng_cpp.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8001DE14: -/* 8001DE14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001DE18 7C 08 02 A6 */ mflr r0 -/* 8001DE1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001DE20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001DE24 93 C1 00 08 */ stw r30, 8(r1) -/* 8001DE28 3C 60 80 3F */ lis r3, lit_4176@ha /* 0x803F1C00@ha */ -/* 8001DE2C 3B E3 1C 00 */ addi r31, r3, lit_4176@l /* 0x803F1C00@l */ -/* 8001DE30 38 6D 87 4C */ la r3, l_hio(r13) /* 80450CCC-_SDA_BASE_ */ -/* 8001DE34 3C 80 80 02 */ lis r4, __dt__5l_HIOFv@ha /* 0x8001E098@ha */ -/* 8001DE38 38 84 E0 98 */ addi r4, r4, __dt__5l_HIOFv@l /* 0x8001E098@l */ -/* 8001DE3C 38 BF 00 00 */ addi r5, r31, 0 -/* 8001DE40 48 34 3D E5 */ bl __register_global_object -/* 8001DE44 38 7F 00 48 */ addi r3, r31, 0x48 -/* 8001DE48 80 03 00 4C */ lwz r0, 0x4c(r3) -/* 8001DE4C 54 00 00 C2 */ rlwinm r0, r0, 0, 3, 1 -/* 8001DE50 90 03 00 4C */ stw r0, 0x4c(r3) -/* 8001DE54 48 05 A1 09 */ bl __ct__14dBgS_ObjLinChkFv -/* 8001DE58 3C 80 80 07 */ lis r4, __dt__14dBgS_ObjLinChkFv@ha /* 0x80077FB8@ha */ -/* 8001DE5C 38 84 7F B8 */ addi r4, r4, __dt__14dBgS_ObjLinChkFv@l /* 0x80077FB8@l */ -/* 8001DE60 38 BF 00 3C */ addi r5, r31, 0x3c -/* 8001DE64 48 34 3D C1 */ bl __register_global_object -/* 8001DE68 3B DF 00 C4 */ addi r30, r31, 0xc4 -/* 8001DE6C 7F C3 F3 78 */ mr r3, r30 -/* 8001DE70 48 05 97 0D */ bl __ct__11dBgS_GndChkFv -/* 8001DE74 3C 60 80 3A */ lis r3, __vt__14dBgS_ObjGndChk@ha /* 0x803A382C@ha */ -/* 8001DE78 38 63 38 2C */ addi r3, r3, __vt__14dBgS_ObjGndChk@l /* 0x803A382C@l */ -/* 8001DE7C 90 7E 00 10 */ stw r3, 0x10(r30) -/* 8001DE80 38 03 00 0C */ addi r0, r3, 0xc -/* 8001DE84 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8001DE88 38 03 00 18 */ addi r0, r3, 0x18 -/* 8001DE8C 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 8001DE90 38 03 00 24 */ addi r0, r3, 0x24 -/* 8001DE94 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 8001DE98 38 7E 00 3C */ addi r3, r30, 0x3c -/* 8001DE9C 48 05 AF CD */ bl SetObj__16dBgS_PolyPassChkFv -/* 8001DEA0 7F C3 F3 78 */ mr r3, r30 -/* 8001DEA4 3C 80 80 02 */ lis r4, __dt__14dBgS_ObjGndChkFv@ha /* 0x8001E020@ha */ -/* 8001DEA8 38 84 E0 20 */ addi r4, r4, __dt__14dBgS_ObjGndChkFv@l /* 0x8001E020@l */ -/* 8001DEAC 38 BF 00 B8 */ addi r5, r31, 0xb8 -/* 8001DEB0 48 34 3D 75 */ bl __register_global_object -/* 8001DEB4 3B DF 01 24 */ addi r30, r31, 0x124 -/* 8001DEB8 7F C3 F3 78 */ mr r3, r30 -/* 8001DEBC 48 05 B1 39 */ bl __ct__12dBgS_RoofChkFv -/* 8001DEC0 3C 60 80 3A */ lis r3, __vt__15dBgS_ObjRoofChk@ha /* 0x803A37CC@ha */ -/* 8001DEC4 38 63 37 CC */ addi r3, r3, __vt__15dBgS_ObjRoofChk@l /* 0x803A37CC@l */ -/* 8001DEC8 90 7E 00 0C */ stw r3, 0xc(r30) -/* 8001DECC 38 03 00 0C */ addi r0, r3, 0xc -/* 8001DED0 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8001DED4 38 03 00 18 */ addi r0, r3, 0x18 -/* 8001DED8 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8001DEDC 38 03 00 24 */ addi r0, r3, 0x24 -/* 8001DEE0 90 1E 00 34 */ stw r0, 0x34(r30) -/* 8001DEE4 38 7E 00 24 */ addi r3, r30, 0x24 -/* 8001DEE8 48 05 AF 81 */ bl SetObj__16dBgS_PolyPassChkFv -/* 8001DEEC 7F C3 F3 78 */ mr r3, r30 -/* 8001DEF0 3C 80 80 02 */ lis r4, __dt__15dBgS_ObjRoofChkFv@ha /* 0x8001DFA8@ha */ -/* 8001DEF4 38 84 DF A8 */ addi r4, r4, __dt__15dBgS_ObjRoofChkFv@l /* 0x8001DFA8@l */ -/* 8001DEF8 38 BF 01 18 */ addi r5, r31, 0x118 -/* 8001DEFC 48 34 3D 29 */ bl __register_global_object -/* 8001DF00 38 7F 01 80 */ addi r3, r31, 0x180 -/* 8001DF04 48 05 B2 61 */ bl __ct__11dBgS_WtrChkFv -/* 8001DF08 3C 80 80 02 */ lis r4, __dt__11dBgS_WtrChkFv@ha /* 0x8001DF30@ha */ -/* 8001DF0C 38 84 DF 30 */ addi r4, r4, __dt__11dBgS_WtrChkFv@l /* 0x8001DF30@l */ -/* 8001DF10 38 BF 01 74 */ addi r5, r31, 0x174 -/* 8001DF14 48 34 3D 11 */ bl __register_global_object -/* 8001DF18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001DF1C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8001DF20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001DF24 7C 08 03 A6 */ mtlr r0 -/* 8001DF28 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001DF2C 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/func_8001E0D4.s b/asm/f_op/f_op_actor_mng/func_8001E0D4.s deleted file mode 100644 index ef918cf3de5..00000000000 --- a/asm/f_op/f_op_actor_mng/func_8001E0D4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8001E0D4: -/* 8001E0D4 38 63 FF EC */ addi r3, r3, -20 -/* 8001E0D8 4B FF FF 48 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/f_op/f_op_actor_mng/func_8001E0DC.s b/asm/f_op/f_op_actor_mng/func_8001E0DC.s deleted file mode 100644 index c3f2857ee67..00000000000 --- a/asm/f_op/f_op_actor_mng/func_8001E0DC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8001E0DC: -/* 8001E0DC 38 63 FF B4 */ addi r3, r3, -76 -/* 8001E0E0 4B FF FF 40 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/f_op/f_op_actor_mng/func_8001E0E4.s b/asm/f_op/f_op_actor_mng/func_8001E0E4.s deleted file mode 100644 index 39ffef7e0d8..00000000000 --- a/asm/f_op/f_op_actor_mng/func_8001E0E4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8001E0E4: -/* 8001E0E4 38 63 FF C4 */ addi r3, r3, -60 -/* 8001E0E8 4B FF FF 38 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/f_op/f_op_actor_mng/func_8001E0EC.s b/asm/f_op/f_op_actor_mng/func_8001E0EC.s deleted file mode 100644 index 939fc57b9c9..00000000000 --- a/asm/f_op/f_op_actor_mng/func_8001E0EC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8001E0EC: -/* 8001E0EC 38 63 FF F0 */ addi r3, r3, -16 -/* 8001E0F0 4B FF FE 40 */ b __dt__11dBgS_WtrChkFv diff --git a/asm/f_op/f_op_actor_mng/func_8001E0F4.s b/asm/f_op/f_op_actor_mng/func_8001E0F4.s deleted file mode 100644 index 12015e23ba1..00000000000 --- a/asm/f_op/f_op_actor_mng/func_8001E0F4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8001E0F4: -/* 8001E0F4 38 63 FF CC */ addi r3, r3, -52 -/* 8001E0F8 4B FF FE 38 */ b __dt__11dBgS_WtrChkFv diff --git a/asm/f_op/f_op_actor_mng/func_8001E0FC.s b/asm/f_op/f_op_actor_mng/func_8001E0FC.s deleted file mode 100644 index cf6e5f72a2f..00000000000 --- a/asm/f_op/f_op_actor_mng/func_8001E0FC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8001E0FC: -/* 8001E0FC 38 63 FF DC */ addi r3, r3, -36 -/* 8001E100 4B FF FE 30 */ b __dt__11dBgS_WtrChkFv diff --git a/asm/f_op/f_op_actor_mng/func_8001E104.s b/asm/f_op/f_op_actor_mng/func_8001E104.s deleted file mode 100644 index 142a166ba9d..00000000000 --- a/asm/f_op/f_op_actor_mng/func_8001E104.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8001E104: -/* 8001E104 38 63 FF F0 */ addi r3, r3, -16 -/* 8001E108 4B FF FE A0 */ b __dt__15dBgS_ObjRoofChkFv diff --git a/asm/f_op/f_op_actor_mng/func_8001E10C.s b/asm/f_op/f_op_actor_mng/func_8001E10C.s deleted file mode 100644 index 91bd5189ca5..00000000000 --- a/asm/f_op/f_op_actor_mng/func_8001E10C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8001E10C: -/* 8001E10C 38 63 FF CC */ addi r3, r3, -52 -/* 8001E110 4B FF FE 98 */ b __dt__15dBgS_ObjRoofChkFv diff --git a/asm/f_op/f_op_actor_mng/func_8001E114.s b/asm/f_op/f_op_actor_mng/func_8001E114.s deleted file mode 100644 index 0485d56aa47..00000000000 --- a/asm/f_op/f_op_actor_mng/func_8001E114.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8001E114: -/* 8001E114 38 63 FF DC */ addi r3, r3, -36 -/* 8001E118 4B FF FE 90 */ b __dt__15dBgS_ObjRoofChkFv diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Action__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Action__8daE_PH_cFv.s deleted file mode 100644 index 02a71c86c3c..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Action__8daE_PH_cFv.s +++ /dev/null @@ -1,188 +0,0 @@ -lbl_8073FD70: -/* 8073FD70 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8073FD74 7C 08 02 A6 */ mflr r0 -/* 8073FD78 90 01 00 24 */ stw r0, 0x24(r1) -/* 8073FD7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8073FD80 4B C2 24 5D */ bl _savegpr_29 -/* 8073FD84 7C 7F 1B 78 */ mr r31, r3 -/* 8073FD88 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073FD8C 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073FD90 83 BE 5D AC */ lwz r29, 0x5dac(r30) -/* 8073FD94 88 03 06 60 */ lbz r0, 0x660(r3) -/* 8073FD98 2C 00 00 02 */ cmpwi r0, 2 -/* 8073FD9C 41 82 00 68 */ beq lbl_8073FE04 -/* 8073FDA0 40 80 01 9C */ bge lbl_8073FF3C -/* 8073FDA4 2C 00 00 01 */ cmpwi r0, 1 -/* 8073FDA8 40 80 00 08 */ bge lbl_8073FDB0 -/* 8073FDAC 48 00 01 90 */ b lbl_8073FF3C -lbl_8073FDB0: -/* 8073FDB0 4B FF ED B5 */ bl C_Action__8daE_PH_cFv -/* 8073FDB4 7F E3 FB 78 */ mr r3, r31 -/* 8073FDB8 38 9F 09 38 */ addi r4, r31, 0x938 -/* 8073FDBC 4B 8D A9 11 */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 8073FDC0 7F E3 FB 78 */ mr r3, r31 -/* 8073FDC4 48 00 0E 79 */ bl AttentionSet__8daE_PH_cFv -/* 8073FDC8 7F E3 FB 78 */ mr r3, r31 -/* 8073FDCC 80 9E 5D AC */ lwz r4, 0x5dac(r30) -/* 8073FDD0 4B 8D AA 11 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8073FDD4 3C 60 80 74 */ lis r3, lit_4979@ha /* 0x80741CC4@ha */ -/* 8073FDD8 C0 03 1C C4 */ lfs f0, lit_4979@l(r3) /* 0x80741CC4@l */ -/* 8073FDDC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073FDE0 41 81 00 18 */ bgt lbl_8073FDF8 -/* 8073FDE4 7F E3 FB 78 */ mr r3, r31 -/* 8073FDE8 7F A4 EB 78 */ mr r4, r29 -/* 8073FDEC 4B FF D7 01 */ bl other_bg_check__FP8daE_PH_cP10fopAc_ac_c -/* 8073FDF0 2C 03 00 00 */ cmpwi r3, 0 -/* 8073FDF4 41 82 01 D8 */ beq lbl_8073FFCC -lbl_8073FDF8: -/* 8073FDF8 38 00 00 00 */ li r0, 0 -/* 8073FDFC 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 8073FE00 48 00 01 CC */ b lbl_8073FFCC -lbl_8073FE04: -/* 8073FE04 88 1F 05 B2 */ lbz r0, 0x5b2(r31) -/* 8073FE08 28 00 00 00 */ cmplwi r0, 0 -/* 8073FE0C 41 82 00 F4 */ beq lbl_8073FF00 -/* 8073FE10 4B FF FD CD */ bl StopAction__8daE_PH_cFv -/* 8073FE14 7F E3 FB 78 */ mr r3, r31 -/* 8073FE18 80 9E 5D AC */ lwz r4, 0x5dac(r30) -/* 8073FE1C 4B 8D A9 C5 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8073FE20 3C 60 80 74 */ lis r3, lit_4980@ha /* 0x80741CC8@ha */ -/* 8073FE24 C0 03 1C C8 */ lfs f0, lit_4980@l(r3) /* 0x80741CC8@l */ -/* 8073FE28 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073FE2C 41 81 00 18 */ bgt lbl_8073FE44 -/* 8073FE30 7F E3 FB 78 */ mr r3, r31 -/* 8073FE34 7F A4 EB 78 */ mr r4, r29 -/* 8073FE38 4B FF D6 B5 */ bl other_bg_check__FP8daE_PH_cP10fopAc_ac_c -/* 8073FE3C 2C 03 00 00 */ cmpwi r3, 0 -/* 8073FE40 41 82 00 0C */ beq lbl_8073FE4C -lbl_8073FE44: -/* 8073FE44 38 00 00 00 */ li r0, 0 -/* 8073FE48 90 1F 05 5C */ stw r0, 0x55c(r31) -lbl_8073FE4C: -/* 8073FE4C 34 7F 09 38 */ addic. r3, r31, 0x938 -/* 8073FE50 41 82 00 34 */ beq lbl_8073FE84 -/* 8073FE54 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 8073FE58 C0 03 00 00 */ lfs f0, 0(r3) -/* 8073FE5C EC 01 00 2A */ fadds f0, f1, f0 -/* 8073FE60 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 8073FE64 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 8073FE68 C0 03 00 04 */ lfs f0, 4(r3) -/* 8073FE6C EC 01 00 2A */ fadds f0, f1, f0 -/* 8073FE70 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 8073FE74 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) -/* 8073FE78 C0 03 00 08 */ lfs f0, 8(r3) -/* 8073FE7C EC 01 00 2A */ fadds f0, f1, f0 -/* 8073FE80 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -lbl_8073FE84: -/* 8073FE84 7F E3 FB 78 */ mr r3, r31 -/* 8073FE88 4B FF FA 41 */ bl FlyAnm2__8daE_PH_cFv -/* 8073FE8C 7F E3 FB 78 */ mr r3, r31 -/* 8073FE90 48 00 0D AD */ bl AttentionSet__8daE_PH_cFv -/* 8073FE94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073FE98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073FE9C 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8073FEA0 3C 80 80 74 */ lis r4, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 8073FEA4 38 84 1D 0C */ addi r4, r4, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 8073FEA8 38 84 00 05 */ addi r4, r4, 5 -/* 8073FEAC 4B C2 8A E9 */ bl strcmp -/* 8073FEB0 2C 03 00 00 */ cmpwi r3, 0 -/* 8073FEB4 40 82 00 78 */ bne lbl_8073FF2C -/* 8073FEB8 80 1F 06 28 */ lwz r0, 0x628(r31) -/* 8073FEBC 2C 00 00 0B */ cmpwi r0, 0xb -/* 8073FEC0 40 82 00 14 */ bne lbl_8073FED4 -/* 8073FEC4 38 60 00 18 */ li r3, 0x18 -/* 8073FEC8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8073FECC 7C 04 07 74 */ extsb r4, r0 -/* 8073FED0 4B 8E DA 7D */ bl dComIfGs_onZoneSwitch__Fii -lbl_8073FED4: -/* 8073FED4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073FED8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073FEDC 38 80 00 3F */ li r4, 0x3f -/* 8073FEE0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8073FEE4 7C 05 07 74 */ extsb r5, r0 -/* 8073FEE8 4B 8F 54 79 */ bl isSwitch__10dSv_info_cCFii -/* 8073FEEC 2C 03 00 00 */ cmpwi r3, 0 -/* 8073FEF0 40 82 00 3C */ bne lbl_8073FF2C -/* 8073FEF4 7F E3 FB 78 */ mr r3, r31 -/* 8073FEF8 4B 8D 9D 85 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 8073FEFC 48 00 00 30 */ b lbl_8073FF2C -lbl_8073FF00: -/* 8073FF00 38 00 00 00 */ li r0, 0 -/* 8073FF04 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 8073FF08 7F C3 F3 78 */ mr r3, r30 -/* 8073FF0C 38 80 00 3F */ li r4, 0x3f -/* 8073FF10 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8073FF14 7C 05 07 74 */ extsb r5, r0 -/* 8073FF18 4B 8F 54 49 */ bl isSwitch__10dSv_info_cCFii -/* 8073FF1C 2C 03 00 00 */ cmpwi r3, 0 -/* 8073FF20 41 82 00 0C */ beq lbl_8073FF2C -/* 8073FF24 38 00 00 01 */ li r0, 1 -/* 8073FF28 98 1F 05 B2 */ stb r0, 0x5b2(r31) -lbl_8073FF2C: -/* 8073FF2C 80 1F 09 A0 */ lwz r0, 0x9a0(r31) -/* 8073FF30 60 00 00 01 */ ori r0, r0, 1 -/* 8073FF34 90 1F 09 A0 */ stw r0, 0x9a0(r31) -/* 8073FF38 48 00 00 94 */ b lbl_8073FFCC -lbl_8073FF3C: -/* 8073FF3C 7F E3 FB 78 */ mr r3, r31 -/* 8073FF40 7F A4 EB 78 */ mr r4, r29 -/* 8073FF44 4B 8D A8 9D */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8073FF48 3C 60 80 74 */ lis r3, lit_4979@ha /* 0x80741CC4@ha */ -/* 8073FF4C C0 03 1C C4 */ lfs f0, lit_4979@l(r3) /* 0x80741CC4@l */ -/* 8073FF50 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073FF54 41 81 00 18 */ bgt lbl_8073FF6C -/* 8073FF58 7F E3 FB 78 */ mr r3, r31 -/* 8073FF5C 7F A4 EB 78 */ mr r4, r29 -/* 8073FF60 4B FF D5 8D */ bl other_bg_check__FP8daE_PH_cP10fopAc_ac_c -/* 8073FF64 2C 03 00 00 */ cmpwi r3, 0 -/* 8073FF68 41 82 00 0C */ beq lbl_8073FF74 -lbl_8073FF6C: -/* 8073FF6C 38 00 00 00 */ li r0, 0 -/* 8073FF70 90 1F 05 5C */ stw r0, 0x55c(r31) -lbl_8073FF74: -/* 8073FF74 7F E3 FB 78 */ mr r3, r31 -/* 8073FF78 4B FF FB F9 */ bl S_Action__8daE_PH_cFv -/* 8073FF7C 34 7F 09 38 */ addic. r3, r31, 0x938 -/* 8073FF80 41 82 00 34 */ beq lbl_8073FFB4 -/* 8073FF84 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 8073FF88 C0 03 00 00 */ lfs f0, 0(r3) -/* 8073FF8C EC 01 00 2A */ fadds f0, f1, f0 -/* 8073FF90 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 8073FF94 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 8073FF98 C0 03 00 04 */ lfs f0, 4(r3) -/* 8073FF9C EC 01 00 2A */ fadds f0, f1, f0 -/* 8073FFA0 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 8073FFA4 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) -/* 8073FFA8 C0 03 00 08 */ lfs f0, 8(r3) -/* 8073FFAC EC 01 00 2A */ fadds f0, f1, f0 -/* 8073FFB0 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -lbl_8073FFB4: -/* 8073FFB4 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 8073FFB8 C0 1F 04 FC */ lfs f0, 0x4fc(r31) -/* 8073FFBC EC 01 00 2A */ fadds f0, f1, f0 -/* 8073FFC0 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 8073FFC4 7F E3 FB 78 */ mr r3, r31 -/* 8073FFC8 48 00 0C 75 */ bl AttentionSet__8daE_PH_cFv -lbl_8073FFCC: -/* 8073FFCC 7F E3 FB 78 */ mr r3, r31 -/* 8073FFD0 48 00 0E A1 */ bl ObjHit__8daE_PH_cFv -/* 8073FFD4 7F E3 FB 78 */ mr r3, r31 -/* 8073FFD8 48 00 10 D9 */ bl BaseSet__8daE_PH_cFv -/* 8073FFDC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8073FFE0 7C 03 07 74 */ extsb r3, r0 -/* 8073FFE4 4B 8E D0 89 */ bl dComIfGp_getReverb__Fi -/* 8073FFE8 7C 65 1B 78 */ mr r5, r3 -/* 8073FFEC 80 7F 07 1C */ lwz r3, 0x71c(r31) -/* 8073FFF0 38 80 00 00 */ li r4, 0 -/* 8073FFF4 4B 8D 10 BD */ bl play__16mDoExt_McaMorfSOFUlSc -/* 8073FFF8 38 7F 07 60 */ addi r3, r31, 0x760 -/* 8073FFFC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80740000 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740004 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80740008 4B 93 6A A5 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 8074000C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80740010 4B C2 22 19 */ bl _restgpr_29 -/* 80740014 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80740018 7C 08 03 A6 */ mtlr r0 -/* 8074001C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80740020 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/AttentionSet__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/AttentionSet__8daE_PH_cFv.s deleted file mode 100644 index d37dfbf24cd..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/AttentionSet__8daE_PH_cFv.s +++ /dev/null @@ -1,158 +0,0 @@ -lbl_80740C3C: -/* 80740C3C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80740C40 7C 08 02 A6 */ mflr r0 -/* 80740C44 90 01 00 44 */ stw r0, 0x44(r1) -/* 80740C48 39 61 00 40 */ addi r11, r1, 0x40 -/* 80740C4C 4B C2 15 91 */ bl _savegpr_29 -/* 80740C50 7C 7E 1B 78 */ mr r30, r3 -/* 80740C54 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 80740C58 3B A3 1B F4 */ addi r29, r3, lit_3767@l /* 0x80741BF4@l */ -/* 80740C5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80740C60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740C64 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 80740C68 80 1E 06 28 */ lwz r0, 0x628(r30) -/* 80740C6C 2C 00 00 0B */ cmpwi r0, 0xb -/* 80740C70 41 82 00 50 */ beq lbl_80740CC0 -/* 80740C74 2C 00 00 0C */ cmpwi r0, 0xc -/* 80740C78 41 82 00 48 */ beq lbl_80740CC0 -/* 80740C7C 2C 00 00 0A */ cmpwi r0, 0xa -/* 80740C80 41 82 00 40 */ beq lbl_80740CC0 -/* 80740C84 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80740C88 3C 80 80 74 */ lis r4, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 80740C8C 38 84 1D 0C */ addi r4, r4, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 80740C90 38 84 00 05 */ addi r4, r4, 5 -/* 80740C94 4B C2 7D 01 */ bl strcmp -/* 80740C98 2C 03 00 00 */ cmpwi r3, 0 -/* 80740C9C 40 82 00 10 */ bne lbl_80740CAC -/* 80740CA0 38 00 00 52 */ li r0, 0x52 -/* 80740CA4 98 1E 05 46 */ stb r0, 0x546(r30) -/* 80740CA8 48 00 00 0C */ b lbl_80740CB4 -lbl_80740CAC: -/* 80740CAC 38 00 00 53 */ li r0, 0x53 -/* 80740CB0 98 1E 05 46 */ stb r0, 0x546(r30) -lbl_80740CB4: -/* 80740CB4 38 00 00 04 */ li r0, 4 -/* 80740CB8 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 80740CBC 48 00 01 74 */ b lbl_80740E30 -lbl_80740CC0: -/* 80740CC0 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 80740CC4 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80740CC8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80740CCC C0 3D 00 00 */ lfs f1, 0(r29) -/* 80740CD0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80740CD4 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80740CD8 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) -/* 80740CDC C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80740CE0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80740CE4 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80740CE8 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80740CEC 38 61 00 0C */ addi r3, r1, 0xc -/* 80740CF0 38 81 00 18 */ addi r4, r1, 0x18 -/* 80740CF4 4B C0 66 A9 */ bl PSVECSquareDistance -/* 80740CF8 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80740CFC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80740D00 40 81 00 58 */ ble lbl_80740D58 -/* 80740D04 FC 00 08 34 */ frsqrte f0, f1 -/* 80740D08 C8 9D 00 60 */ lfd f4, 0x60(r29) -/* 80740D0C FC 44 00 32 */ fmul f2, f4, f0 -/* 80740D10 C8 7D 00 68 */ lfd f3, 0x68(r29) -/* 80740D14 FC 00 00 32 */ fmul f0, f0, f0 -/* 80740D18 FC 01 00 32 */ fmul f0, f1, f0 -/* 80740D1C FC 03 00 28 */ fsub f0, f3, f0 -/* 80740D20 FC 02 00 32 */ fmul f0, f2, f0 -/* 80740D24 FC 44 00 32 */ fmul f2, f4, f0 -/* 80740D28 FC 00 00 32 */ fmul f0, f0, f0 -/* 80740D2C FC 01 00 32 */ fmul f0, f1, f0 -/* 80740D30 FC 03 00 28 */ fsub f0, f3, f0 -/* 80740D34 FC 02 00 32 */ fmul f0, f2, f0 -/* 80740D38 FC 44 00 32 */ fmul f2, f4, f0 -/* 80740D3C FC 00 00 32 */ fmul f0, f0, f0 -/* 80740D40 FC 01 00 32 */ fmul f0, f1, f0 -/* 80740D44 FC 03 00 28 */ fsub f0, f3, f0 -/* 80740D48 FC 02 00 32 */ fmul f0, f2, f0 -/* 80740D4C FC 21 00 32 */ fmul f1, f1, f0 -/* 80740D50 FC 20 08 18 */ frsp f1, f1 -/* 80740D54 48 00 00 88 */ b lbl_80740DDC -lbl_80740D58: -/* 80740D58 C8 1D 00 70 */ lfd f0, 0x70(r29) -/* 80740D5C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80740D60 40 80 00 10 */ bge lbl_80740D70 -/* 80740D64 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80740D68 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80740D6C 48 00 00 70 */ b lbl_80740DDC -lbl_80740D70: -/* 80740D70 D0 21 00 08 */ stfs f1, 8(r1) -/* 80740D74 80 81 00 08 */ lwz r4, 8(r1) -/* 80740D78 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80740D7C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80740D80 7C 03 00 00 */ cmpw r3, r0 -/* 80740D84 41 82 00 14 */ beq lbl_80740D98 -/* 80740D88 40 80 00 40 */ bge lbl_80740DC8 -/* 80740D8C 2C 03 00 00 */ cmpwi r3, 0 -/* 80740D90 41 82 00 20 */ beq lbl_80740DB0 -/* 80740D94 48 00 00 34 */ b lbl_80740DC8 -lbl_80740D98: -/* 80740D98 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80740D9C 41 82 00 0C */ beq lbl_80740DA8 -/* 80740DA0 38 00 00 01 */ li r0, 1 -/* 80740DA4 48 00 00 28 */ b lbl_80740DCC -lbl_80740DA8: -/* 80740DA8 38 00 00 02 */ li r0, 2 -/* 80740DAC 48 00 00 20 */ b lbl_80740DCC -lbl_80740DB0: -/* 80740DB0 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80740DB4 41 82 00 0C */ beq lbl_80740DC0 -/* 80740DB8 38 00 00 05 */ li r0, 5 -/* 80740DBC 48 00 00 10 */ b lbl_80740DCC -lbl_80740DC0: -/* 80740DC0 38 00 00 03 */ li r0, 3 -/* 80740DC4 48 00 00 08 */ b lbl_80740DCC -lbl_80740DC8: -/* 80740DC8 38 00 00 04 */ li r0, 4 -lbl_80740DCC: -/* 80740DCC 2C 00 00 01 */ cmpwi r0, 1 -/* 80740DD0 40 82 00 0C */ bne lbl_80740DDC -/* 80740DD4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80740DD8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80740DDC: -/* 80740DDC C0 1D 00 C8 */ lfs f0, 0xc8(r29) -/* 80740DE0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80740DE4 40 81 00 40 */ ble lbl_80740E24 -/* 80740DE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80740DEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740DF0 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80740DF4 3C 80 80 74 */ lis r4, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 80740DF8 38 84 1D 0C */ addi r4, r4, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 80740DFC 38 84 00 05 */ addi r4, r4, 5 -/* 80740E00 4B C2 7B 95 */ bl strcmp -/* 80740E04 2C 03 00 00 */ cmpwi r3, 0 -/* 80740E08 40 82 00 10 */ bne lbl_80740E18 -/* 80740E0C 38 00 00 52 */ li r0, 0x52 -/* 80740E10 98 1E 05 46 */ stb r0, 0x546(r30) -/* 80740E14 48 00 00 1C */ b lbl_80740E30 -lbl_80740E18: -/* 80740E18 38 00 00 53 */ li r0, 0x53 -/* 80740E1C 98 1E 05 46 */ stb r0, 0x546(r30) -/* 80740E20 48 00 00 10 */ b lbl_80740E30 -lbl_80740E24: -/* 80740E24 38 00 00 00 */ li r0, 0 -/* 80740E28 98 1E 05 46 */ stb r0, 0x546(r30) -/* 80740E2C 90 1E 05 5C */ stw r0, 0x55c(r30) -lbl_80740E30: -/* 80740E30 7F E3 FB 78 */ mr r3, r31 -/* 80740E34 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 80740E38 81 8C 02 64 */ lwz r12, 0x264(r12) -/* 80740E3C 7D 89 03 A6 */ mtctr r12 -/* 80740E40 4E 80 04 21 */ bctrl -/* 80740E44 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80740E48 41 82 00 10 */ beq lbl_80740E58 -/* 80740E4C 38 00 00 00 */ li r0, 0 -/* 80740E50 98 1E 05 46 */ stb r0, 0x546(r30) -/* 80740E54 90 1E 05 5C */ stw r0, 0x55c(r30) -lbl_80740E58: -/* 80740E58 39 61 00 40 */ addi r11, r1, 0x40 -/* 80740E5C 4B C2 13 CD */ bl _restgpr_29 -/* 80740E60 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80740E64 7C 08 03 A6 */ mtlr r0 -/* 80740E68 38 21 00 40 */ addi r1, r1, 0x40 -/* 80740E6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/BaseSet__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/BaseSet__8daE_PH_cFv.s deleted file mode 100644 index 419afe4d0e3..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/BaseSet__8daE_PH_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_807410B0: -/* 807410B0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 807410B4 7C 08 02 A6 */ mflr r0 -/* 807410B8 90 01 00 34 */ stw r0, 0x34(r1) -/* 807410BC 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 807410C0 7C 7F 1B 78 */ mr r31, r3 -/* 807410C4 38 7F 06 16 */ addi r3, r31, 0x616 -/* 807410C8 38 80 00 00 */ li r4, 0 -/* 807410CC 38 A0 00 40 */ li r5, 0x40 -/* 807410D0 4B B2 FA C1 */ bl cLib_chaseAngleS__FPsss -/* 807410D4 A8 7F 06 1A */ lha r3, 0x61a(r31) -/* 807410D8 A8 1F 06 18 */ lha r0, 0x618(r31) -/* 807410DC 7C 03 02 14 */ add r0, r3, r0 -/* 807410E0 B0 1F 06 1A */ sth r0, 0x61a(r31) -/* 807410E4 A8 1F 06 1A */ lha r0, 0x61a(r31) -/* 807410E8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 807410EC 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 807410F0 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 807410F4 7C 44 04 2E */ lfsx f2, r4, r0 -/* 807410F8 A8 1F 06 16 */ lha r0, 0x616(r31) -/* 807410FC 3C 60 80 74 */ lis r3, lit_4215@ha /* 0x80741C74@ha */ -/* 80741100 C8 23 1C 74 */ lfd f1, lit_4215@l(r3) /* 0x80741C74@l */ -/* 80741104 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80741108 90 01 00 0C */ stw r0, 0xc(r1) -/* 8074110C 3C 60 43 30 */ lis r3, 0x4330 -/* 80741110 90 61 00 08 */ stw r3, 8(r1) -/* 80741114 C8 01 00 08 */ lfd f0, 8(r1) -/* 80741118 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8074111C EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80741120 FC 00 00 1E */ fctiwz f0, f0 -/* 80741124 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80741128 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8074112C B0 1F 04 E4 */ sth r0, 0x4e4(r31) -/* 80741130 A8 1F 06 1A */ lha r0, 0x61a(r31) -/* 80741134 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80741138 7C 44 04 2E */ lfsx f2, r4, r0 -/* 8074113C A8 1F 06 16 */ lha r0, 0x616(r31) -/* 80741140 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80741144 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80741148 90 61 00 18 */ stw r3, 0x18(r1) -/* 8074114C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80741150 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80741154 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80741158 FC 00 00 1E */ fctiwz f0, f0 -/* 8074115C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80741160 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80741164 B0 1F 06 68 */ sth r0, 0x668(r31) -/* 80741168 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8074116C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80741170 7C 08 03 A6 */ mtlr r0 -/* 80741174 38 21 00 30 */ addi r1, r1, 0x30 -/* 80741178 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_Action__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_Action__8daE_PH_cFv.s deleted file mode 100644 index 0650b5b9ca0..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_Action__8daE_PH_cFv.s +++ /dev/null @@ -1,123 +0,0 @@ -lbl_8073EB64: -/* 8073EB64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8073EB68 7C 08 02 A6 */ mflr r0 -/* 8073EB6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073EB70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8073EB74 93 C1 00 08 */ stw r30, 8(r1) -/* 8073EB78 7C 7F 1B 78 */ mr r31, r3 -/* 8073EB7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073EB80 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073EB84 83 C4 5D AC */ lwz r30, 0x5dac(r4) -/* 8073EB88 88 83 05 B0 */ lbz r4, 0x5b0(r3) -/* 8073EB8C 2C 04 00 01 */ cmpwi r4, 1 -/* 8073EB90 41 82 00 BC */ beq lbl_8073EC4C -/* 8073EB94 40 80 00 10 */ bge lbl_8073EBA4 -/* 8073EB98 2C 04 00 00 */ cmpwi r4, 0 -/* 8073EB9C 40 80 00 14 */ bge lbl_8073EBB0 -/* 8073EBA0 48 00 01 38 */ b lbl_8073ECD8 -lbl_8073EBA4: -/* 8073EBA4 2C 04 00 03 */ cmpwi r4, 3 -/* 8073EBA8 40 80 01 30 */ bge lbl_8073ECD8 -/* 8073EBAC 48 00 00 C8 */ b lbl_8073EC74 -lbl_8073EBB0: -/* 8073EBB0 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 8073EBB4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8073EBB8 41 82 00 30 */ beq lbl_8073EBE8 -/* 8073EBBC 80 1F 06 28 */ lwz r0, 0x628(r31) -/* 8073EBC0 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073EBC4 40 82 00 24 */ bne lbl_8073EBE8 -/* 8073EBC8 38 04 00 01 */ addi r0, r4, 1 -/* 8073EBCC 98 1F 05 B0 */ stb r0, 0x5b0(r31) -/* 8073EBD0 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 8073EBD4 D0 1F 06 40 */ stfs f0, 0x640(r31) -/* 8073EBD8 3C 60 80 74 */ lis r3, lit_4501@ha /* 0x80741CA8@ha */ -/* 8073EBDC C0 03 1C A8 */ lfs f0, lit_4501@l(r3) /* 0x80741CA8@l */ -/* 8073EBE0 D0 1F 06 24 */ stfs f0, 0x624(r31) -/* 8073EBE4 D0 1F 06 20 */ stfs f0, 0x620(r31) -lbl_8073EBE8: -/* 8073EBE8 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 8073EBEC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8073EBF0 41 82 00 10 */ beq lbl_8073EC00 -/* 8073EBF4 80 1F 06 28 */ lwz r0, 0x628(r31) -/* 8073EBF8 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073EBFC 41 82 00 0C */ beq lbl_8073EC08 -lbl_8073EC00: -/* 8073EC00 C0 1F 05 B8 */ lfs f0, 0x5b8(r31) -/* 8073EC04 D0 1F 06 20 */ stfs f0, 0x620(r31) -lbl_8073EC08: -/* 8073EC08 7F E3 FB 78 */ mr r3, r31 -/* 8073EC0C 4B FF FC A5 */ bl C_CheckPoint__8daE_PH_cFv -/* 8073EC10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8073EC14 41 82 00 2C */ beq lbl_8073EC40 -/* 8073EC18 88 1F 06 62 */ lbz r0, 0x662(r31) -/* 8073EC1C 28 00 00 00 */ cmplwi r0, 0 -/* 8073EC20 41 82 00 10 */ beq lbl_8073EC30 -/* 8073EC24 7F E3 FB 78 */ mr r3, r31 -/* 8073EC28 48 00 01 31 */ bl SearchBackPos__8daE_PH_cFv -/* 8073EC2C 48 00 00 0C */ b lbl_8073EC38 -lbl_8073EC30: -/* 8073EC30 7F E3 FB 78 */ mr r3, r31 -/* 8073EC34 48 00 00 D9 */ bl SearchNextPos__8daE_PH_cFv -lbl_8073EC38: -/* 8073EC38 7F E3 FB 78 */ mr r3, r31 -/* 8073EC3C 4B FF F8 69 */ bl SetCheckAngle__8daE_PH_cFv -lbl_8073EC40: -/* 8073EC40 7F E3 FB 78 */ mr r3, r31 -/* 8073EC44 4B FF F5 E9 */ bl GoTarget__8daE_PH_cFv -/* 8073EC48 48 00 00 90 */ b lbl_8073ECD8 -lbl_8073EC4C: -/* 8073EC4C 4B FF FC D9 */ bl DownBoots__8daE_PH_cFv -/* 8073EC50 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 8073EC54 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8073EC58 41 82 00 10 */ beq lbl_8073EC68 -/* 8073EC5C 80 1F 06 28 */ lwz r0, 0x628(r31) -/* 8073EC60 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073EC64 41 82 00 74 */ beq lbl_8073ECD8 -lbl_8073EC68: -/* 8073EC68 C0 1F 05 B8 */ lfs f0, 0x5b8(r31) -/* 8073EC6C D0 1F 06 20 */ stfs f0, 0x620(r31) -/* 8073EC70 48 00 00 68 */ b lbl_8073ECD8 -lbl_8073EC74: -/* 8073EC74 4B FF F5 B9 */ bl GoTarget__8daE_PH_cFv -/* 8073EC78 7F E3 FB 78 */ mr r3, r31 -/* 8073EC7C 4B FF FC 35 */ bl C_CheckPoint__8daE_PH_cFv -/* 8073EC80 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8073EC84 41 82 00 2C */ beq lbl_8073ECB0 -/* 8073EC88 88 1F 06 62 */ lbz r0, 0x662(r31) -/* 8073EC8C 28 00 00 00 */ cmplwi r0, 0 -/* 8073EC90 41 82 00 10 */ beq lbl_8073ECA0 -/* 8073EC94 7F E3 FB 78 */ mr r3, r31 -/* 8073EC98 48 00 00 C1 */ bl SearchBackPos__8daE_PH_cFv -/* 8073EC9C 48 00 00 0C */ b lbl_8073ECA8 -lbl_8073ECA0: -/* 8073ECA0 7F E3 FB 78 */ mr r3, r31 -/* 8073ECA4 48 00 00 69 */ bl SearchNextPos__8daE_PH_cFv -lbl_8073ECA8: -/* 8073ECA8 7F E3 FB 78 */ mr r3, r31 -/* 8073ECAC 4B FF F7 F9 */ bl SetCheckAngle__8daE_PH_cFv -lbl_8073ECB0: -/* 8073ECB0 7F E3 FB 78 */ mr r3, r31 -/* 8073ECB4 4B FF FD 9D */ bl UpBoots__8daE_PH_cFv -/* 8073ECB8 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 8073ECBC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8073ECC0 41 82 00 10 */ beq lbl_8073ECD0 -/* 8073ECC4 80 1F 06 28 */ lwz r0, 0x628(r31) -/* 8073ECC8 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073ECCC 41 82 00 0C */ beq lbl_8073ECD8 -lbl_8073ECD0: -/* 8073ECD0 C0 1F 05 B8 */ lfs f0, 0x5b8(r31) -/* 8073ECD4 D0 1F 06 20 */ stfs f0, 0x620(r31) -lbl_8073ECD8: -/* 8073ECD8 38 7F 06 24 */ addi r3, r31, 0x624 -/* 8073ECDC C0 3F 06 20 */ lfs f1, 0x620(r31) -/* 8073ECE0 3C 80 80 74 */ lis r4, lit_4286@ha /* 0x80741C84@ha */ -/* 8073ECE4 C0 44 1C 84 */ lfs f2, lit_4286@l(r4) /* 0x80741C84@l */ -/* 8073ECE8 4B B3 1A 59 */ bl cLib_chaseF__FPfff -/* 8073ECEC 7F E3 FB 78 */ mr r3, r31 -/* 8073ECF0 4B FF F1 09 */ bl FlyAnm__8daE_PH_cFv -/* 8073ECF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8073ECF8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8073ECFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073ED00 7C 08 03 A6 */ mtlr r0 -/* 8073ED04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8073ED08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_CheckPoint__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_CheckPoint__8daE_PH_cFv.s deleted file mode 100644 index 73390383520..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_CheckPoint__8daE_PH_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8073E8B0: -/* 8073E8B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8073E8B4 7C 08 02 A6 */ mflr r0 -/* 8073E8B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8073E8BC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8073E8C0 7C 7F 1B 78 */ mr r31, r3 -/* 8073E8C4 C0 43 06 50 */ lfs f2, 0x650(r3) -/* 8073E8C8 C0 23 06 4C */ lfs f1, 0x64c(r3) -/* 8073E8CC C0 03 06 48 */ lfs f0, 0x648(r3) -/* 8073E8D0 D0 01 00 08 */ stfs f0, 8(r1) -/* 8073E8D4 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8073E8D8 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 8073E8DC 38 61 00 08 */ addi r3, r1, 8 -/* 8073E8E0 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8073E8E4 4B B3 23 21 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 8073E8E8 A8 1F 06 1E */ lha r0, 0x61e(r31) -/* 8073E8EC 7C 03 00 50 */ subf r0, r3, r0 -/* 8073E8F0 7C 00 07 34 */ extsh r0, r0 -/* 8073E8F4 2C 00 40 00 */ cmpwi r0, 0x4000 -/* 8073E8F8 40 80 00 14 */ bge lbl_8073E90C -/* 8073E8FC 2C 00 C0 00 */ cmpwi r0, -16384 -/* 8073E900 40 81 00 0C */ ble lbl_8073E90C -/* 8073E904 38 60 00 01 */ li r3, 1 -/* 8073E908 48 00 00 08 */ b lbl_8073E910 -lbl_8073E90C: -/* 8073E90C 38 60 00 00 */ li r3, 0 -lbl_8073E910: -/* 8073E910 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8073E914 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8073E918 7C 08 03 A6 */ mtlr r0 -/* 8073E91C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8073E920 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/CamAction__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/CamAction__8daE_PH_cFv.s deleted file mode 100644 index 1ce8c0e1c5c..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/CamAction__8daE_PH_cFv.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_80740098: -/* 80740098 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8074009C 7C 08 02 A6 */ mflr r0 -/* 807400A0 90 01 00 64 */ stw r0, 0x64(r1) -/* 807400A4 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 807400A8 93 C1 00 58 */ stw r30, 0x58(r1) -/* 807400AC 7C 7F 1B 78 */ mr r31, r3 -/* 807400B0 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 807400B4 3B C3 1B F4 */ addi r30, r3, lit_3767@l /* 0x80741BF4@l */ -/* 807400B8 C0 1E 00 00 */ lfs f0, 0(r30) -/* 807400BC D0 01 00 44 */ stfs f0, 0x44(r1) -/* 807400C0 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 807400C4 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 807400C8 80 7F 07 1C */ lwz r3, 0x71c(r31) -/* 807400CC 80 63 00 04 */ lwz r3, 4(r3) -/* 807400D0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 807400D4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 807400D8 38 63 00 60 */ addi r3, r3, 0x60 -/* 807400DC 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807400E0 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807400E4 4B C0 63 CD */ bl PSMTXCopy -/* 807400E8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807400EC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807400F0 38 81 00 44 */ addi r4, r1, 0x44 -/* 807400F4 7C 85 23 78 */ mr r5, r4 -/* 807400F8 4B C0 6C 75 */ bl PSMTXMultVec -/* 807400FC 88 1F 05 B1 */ lbz r0, 0x5b1(r31) -/* 80740100 2C 00 00 02 */ cmpwi r0, 2 -/* 80740104 41 82 00 E4 */ beq lbl_807401E8 -/* 80740108 40 80 00 14 */ bge lbl_8074011C -/* 8074010C 2C 00 00 00 */ cmpwi r0, 0 -/* 80740110 41 82 00 1C */ beq lbl_8074012C -/* 80740114 40 80 00 9C */ bge lbl_807401B0 -/* 80740118 48 00 01 E8 */ b lbl_80740300 -lbl_8074011C: -/* 8074011C 2C 00 00 04 */ cmpwi r0, 4 -/* 80740120 41 82 01 74 */ beq lbl_80740294 -/* 80740124 40 80 01 DC */ bge lbl_80740300 -/* 80740128 48 00 01 1C */ b lbl_80740244 -lbl_8074012C: -/* 8074012C C0 1E 00 D8 */ lfs f0, 0xd8(r30) -/* 80740130 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80740134 C0 1E 00 00 */ lfs f0, 0(r30) -/* 80740138 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 8074013C C0 1E 00 DC */ lfs f0, 0xdc(r30) -/* 80740140 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80740144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80740148 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8074014C 38 80 00 10 */ li r4, 0x10 -/* 80740150 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80740154 7C 05 07 74 */ extsb r5, r0 -/* 80740158 4B 8F 52 09 */ bl isSwitch__10dSv_info_cCFii -/* 8074015C 2C 03 00 00 */ cmpwi r3, 0 -/* 80740160 41 82 01 A0 */ beq lbl_80740300 -/* 80740164 C0 01 00 44 */ lfs f0, 0x44(r1) -/* 80740168 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8074016C C0 01 00 48 */ lfs f0, 0x48(r1) -/* 80740170 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80740174 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 80740178 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 8074017C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80740180 38 81 00 38 */ addi r4, r1, 0x38 -/* 80740184 4B B3 0A 81 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80740188 7C 65 1B 78 */ mr r5, r3 -/* 8074018C 7F E3 FB 78 */ mr r3, r31 -/* 80740190 38 81 00 2C */ addi r4, r1, 0x2c -/* 80740194 C0 3E 00 E0 */ lfs f1, 0xe0(r30) -/* 80740198 C0 5E 00 4C */ lfs f2, 0x4c(r30) -/* 8074019C 4B FF D4 AD */ bl SetStopCam__8daE_PH_cF4cXyzffs -/* 807401A0 88 7F 05 B1 */ lbz r3, 0x5b1(r31) -/* 807401A4 38 03 00 01 */ addi r0, r3, 1 -/* 807401A8 98 1F 05 B1 */ stb r0, 0x5b1(r31) -/* 807401AC 48 00 01 54 */ b lbl_80740300 -lbl_807401B0: -/* 807401B0 C0 01 00 44 */ lfs f0, 0x44(r1) -/* 807401B4 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 807401B8 C0 01 00 48 */ lfs f0, 0x48(r1) -/* 807401BC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 807401C0 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 807401C4 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 807401C8 7F E3 FB 78 */ mr r3, r31 -/* 807401CC 38 81 00 20 */ addi r4, r1, 0x20 -/* 807401D0 C0 3E 00 08 */ lfs f1, 8(r30) -/* 807401D4 C0 5E 00 E4 */ lfs f2, 0xe4(r30) -/* 807401D8 4B FF D5 91 */ bl SetCMoveCam__8daE_PH_cF4cXyzff -/* 807401DC 7F E3 FB 78 */ mr r3, r31 -/* 807401E0 4B FF D3 E5 */ bl SetStopingCam__8daE_PH_cFv -/* 807401E4 48 00 01 1C */ b lbl_80740300 -lbl_807401E8: -/* 807401E8 C0 1E 00 00 */ lfs f0, 0(r30) -/* 807401EC D0 01 00 38 */ stfs f0, 0x38(r1) -/* 807401F0 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 807401F4 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 807401F8 C0 01 00 44 */ lfs f0, 0x44(r1) -/* 807401FC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80740200 C0 01 00 48 */ lfs f0, 0x48(r1) -/* 80740204 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80740208 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 8074020C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80740210 38 61 00 38 */ addi r3, r1, 0x38 -/* 80740214 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80740218 4B B3 09 ED */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 8074021C 7C 65 1B 78 */ mr r5, r3 -/* 80740220 7F E3 FB 78 */ mr r3, r31 -/* 80740224 38 81 00 14 */ addi r4, r1, 0x14 -/* 80740228 C0 3E 00 D0 */ lfs f1, 0xd0(r30) -/* 8074022C C0 5E 00 C8 */ lfs f2, 0xc8(r30) -/* 80740230 4B FF D4 19 */ bl SetStopCam__8daE_PH_cF4cXyzffs -/* 80740234 88 7F 05 B1 */ lbz r3, 0x5b1(r31) -/* 80740238 38 03 00 01 */ addi r0, r3, 1 -/* 8074023C 98 1F 05 B1 */ stb r0, 0x5b1(r31) -/* 80740240 48 00 00 C0 */ b lbl_80740300 -lbl_80740244: -/* 80740244 C0 01 00 44 */ lfs f0, 0x44(r1) -/* 80740248 D0 01 00 08 */ stfs f0, 8(r1) -/* 8074024C C0 01 00 48 */ lfs f0, 0x48(r1) -/* 80740250 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80740254 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 80740258 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8074025C 7F E3 FB 78 */ mr r3, r31 -/* 80740260 38 81 00 08 */ addi r4, r1, 8 -/* 80740264 C0 3E 00 08 */ lfs f1, 8(r30) -/* 80740268 C0 5E 00 E4 */ lfs f2, 0xe4(r30) -/* 8074026C 4B FF D4 FD */ bl SetCMoveCam__8daE_PH_cF4cXyzff -/* 80740270 7F E3 FB 78 */ mr r3, r31 -/* 80740274 4B FF D3 51 */ bl SetStopingCam__8daE_PH_cFv -/* 80740278 A8 1F 05 EC */ lha r0, 0x5ec(r31) -/* 8074027C 2C 00 00 00 */ cmpwi r0, 0 -/* 80740280 40 82 00 80 */ bne lbl_80740300 -/* 80740284 88 7F 05 B1 */ lbz r3, 0x5b1(r31) -/* 80740288 38 03 00 01 */ addi r0, r3, 1 -/* 8074028C 98 1F 05 B1 */ stb r0, 0x5b1(r31) -/* 80740290 48 00 00 70 */ b lbl_80740300 -lbl_80740294: -/* 80740294 C0 3E 00 00 */ lfs f1, 0(r30) -/* 80740298 D0 3F 05 BC */ stfs f1, 0x5bc(r31) -/* 8074029C C0 1E 00 C4 */ lfs f0, 0xc4(r30) -/* 807402A0 D0 1F 05 C0 */ stfs f0, 0x5c0(r31) -/* 807402A4 C0 1E 00 E8 */ lfs f0, 0xe8(r30) -/* 807402A8 D0 1F 05 C4 */ stfs f0, 0x5c4(r31) -/* 807402AC D0 3F 05 D4 */ stfs f1, 0x5d4(r31) -/* 807402B0 C0 1E 00 4C */ lfs f0, 0x4c(r30) -/* 807402B4 D0 1F 05 D8 */ stfs f0, 0x5d8(r31) -/* 807402B8 D0 3F 05 DC */ stfs f1, 0x5dc(r31) -/* 807402BC 7F E3 FB 78 */ mr r3, r31 -/* 807402C0 4B FF D4 ED */ bl SetReleaseCam__8daE_PH_cFv -/* 807402C4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 807402C8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 807402CC 80 63 00 00 */ lwz r3, 0(r3) -/* 807402D0 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 807402D4 3C 80 01 00 */ lis r4, 0x0100 /* 0x01000090@ha */ -/* 807402D8 38 84 00 90 */ addi r4, r4, 0x0090 /* 0x01000090@l */ -/* 807402DC 38 A0 00 00 */ li r5, 0 -/* 807402E0 38 C0 00 00 */ li r6, 0 -/* 807402E4 4B B6 ED 2D */ bl bgmStart__8Z2SeqMgrFUlUll -/* 807402E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807402EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807402F0 38 80 00 3F */ li r4, 0x3f -/* 807402F4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 807402F8 7C 05 07 74 */ extsb r5, r0 -/* 807402FC 4B 8F 4F 05 */ bl onSwitch__10dSv_info_cFii -lbl_80740300: -/* 80740300 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 80740304 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 80740308 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8074030C 7C 08 03 A6 */ mtlr r0 -/* 80740310 38 21 00 60 */ addi r1, r1, 0x60 -/* 80740314 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/De_Timer__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/De_Timer__8daE_PH_cFv.s deleted file mode 100644 index 5cc1ed76c80..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/De_Timer__8daE_PH_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8074117C: -/* 8074117C A8 83 05 AE */ lha r4, 0x5ae(r3) -/* 80741180 38 04 FF FF */ addi r0, r4, -1 -/* 80741184 B0 03 05 AE */ sth r0, 0x5ae(r3) -/* 80741188 A8 03 05 AE */ lha r0, 0x5ae(r3) -/* 8074118C 2C 00 00 00 */ cmpwi r0, 0 -/* 80741190 41 81 00 0C */ bgt lbl_8074119C -/* 80741194 38 00 00 00 */ li r0, 0 -/* 80741198 B0 03 05 AE */ sth r0, 0x5ae(r3) -lbl_8074119C: -/* 8074119C A8 83 05 AC */ lha r4, 0x5ac(r3) -/* 807411A0 38 04 FF FF */ addi r0, r4, -1 -/* 807411A4 B0 03 05 AC */ sth r0, 0x5ac(r3) -/* 807411A8 A8 03 05 AC */ lha r0, 0x5ac(r3) -/* 807411AC 2C 00 00 00 */ cmpwi r0, 0 -/* 807411B0 4C 80 00 20 */ bgelr -/* 807411B4 38 00 00 00 */ li r0, 0 -/* 807411B8 B0 03 05 AC */ sth r0, 0x5ac(r3) -/* 807411BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Delete__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Delete__8daE_PH_cFv.s deleted file mode 100644 index 0b65bd59061..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Delete__8daE_PH_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80741200: -/* 80741200 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80741204 7C 08 02 A6 */ mflr r0 -/* 80741208 90 01 00 14 */ stw r0, 0x14(r1) -/* 8074120C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80741210 7C 7F 1B 78 */ mr r31, r3 -/* 80741214 38 7F 06 6C */ addi r3, r31, 0x66c -/* 80741218 3C 80 80 74 */ lis r4, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 8074121C 38 84 1D 0C */ addi r4, r4, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 80741220 4B 8E BD E9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80741224 88 1F 0A D0 */ lbz r0, 0xad0(r31) -/* 80741228 28 00 00 00 */ cmplwi r0, 0 -/* 8074122C 41 82 00 10 */ beq lbl_8074123C -/* 80741230 38 00 00 00 */ li r0, 0 -/* 80741234 3C 60 80 74 */ lis r3, data_80741DC0@ha /* 0x80741DC0@ha */ -/* 80741238 98 03 1D C0 */ stb r0, data_80741DC0@l(r3) /* 0x80741DC0@l */ -lbl_8074123C: -/* 8074123C 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 80741240 28 00 00 00 */ cmplwi r0, 0 -/* 80741244 41 82 00 0C */ beq lbl_80741250 -/* 80741248 80 7F 07 1C */ lwz r3, 0x71c(r31) -/* 8074124C 4B 8D 00 C5 */ bl stopZelAnime__16mDoExt_McaMorfSOFv -lbl_80741250: -/* 80741250 38 60 00 01 */ li r3, 1 -/* 80741254 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80741258 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8074125C 7C 08 03 A6 */ mtlr r0 -/* 80741260 38 21 00 10 */ addi r1, r1, 0x10 -/* 80741264 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DemoAction__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DemoAction__8daE_PH_cFv.s deleted file mode 100644 index cf8e47042ce..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DemoAction__8daE_PH_cFv.s +++ /dev/null @@ -1,386 +0,0 @@ -lbl_80740318: -/* 80740318 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8074031C 7C 08 02 A6 */ mflr r0 -/* 80740320 90 01 00 44 */ stw r0, 0x44(r1) -/* 80740324 39 61 00 40 */ addi r11, r1, 0x40 -/* 80740328 4B C2 1E B5 */ bl _savegpr_29 -/* 8074032C 7C 7D 1B 78 */ mr r29, r3 -/* 80740330 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 80740334 3B C3 1B F4 */ addi r30, r3, lit_3767@l /* 0x80741BF4@l */ -/* 80740338 88 1D 05 B0 */ lbz r0, 0x5b0(r29) -/* 8074033C 2C 00 00 02 */ cmpwi r0, 2 -/* 80740340 41 82 01 5C */ beq lbl_8074049C -/* 80740344 40 80 00 14 */ bge lbl_80740358 -/* 80740348 2C 00 00 00 */ cmpwi r0, 0 -/* 8074034C 41 82 00 1C */ beq lbl_80740368 -/* 80740350 40 80 00 8C */ bge lbl_807403DC -/* 80740354 48 00 03 A8 */ b lbl_807406FC -lbl_80740358: -/* 80740358 2C 00 00 04 */ cmpwi r0, 4 -/* 8074035C 41 82 02 E8 */ beq lbl_80740644 -/* 80740360 40 80 03 9C */ bge lbl_807406FC -/* 80740364 48 00 02 00 */ b lbl_80740564 -lbl_80740368: -/* 80740368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8074036C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740370 38 80 00 10 */ li r4, 0x10 -/* 80740374 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80740378 7C 05 07 74 */ extsb r5, r0 -/* 8074037C 4B 8F 4F E5 */ bl isSwitch__10dSv_info_cCFii -/* 80740380 2C 03 00 00 */ cmpwi r3, 0 -/* 80740384 41 82 00 4C */ beq lbl_807403D0 -/* 80740388 88 7D 05 B0 */ lbz r3, 0x5b0(r29) -/* 8074038C 38 03 00 01 */ addi r0, r3, 1 -/* 80740390 98 1D 05 B0 */ stb r0, 0x5b0(r29) -/* 80740394 38 00 00 64 */ li r0, 0x64 -/* 80740398 90 1D 06 28 */ stw r0, 0x628(r29) -/* 8074039C 38 00 00 32 */ li r0, 0x32 -/* 807403A0 B0 1D 05 EC */ sth r0, 0x5ec(r29) -/* 807403A4 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 807403A8 28 00 00 04 */ cmplwi r0, 4 -/* 807403AC 40 82 00 24 */ bne lbl_807403D0 -/* 807403B0 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 807403B4 4B B2 75 A1 */ bl cM_rndF__Ff -/* 807403B8 C0 1E 00 EC */ lfs f0, 0xec(r30) -/* 807403BC EC 00 08 2A */ fadds f0, f0, f1 -/* 807403C0 FC 00 00 1E */ fctiwz f0, f0 -/* 807403C4 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 807403C8 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 807403CC B0 1D 05 EC */ sth r0, 0x5ec(r29) -lbl_807403D0: -/* 807403D0 C0 1E 00 00 */ lfs f0, 0(r30) -/* 807403D4 D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 807403D8 48 00 03 24 */ b lbl_807406FC -lbl_807403DC: -/* 807403DC A8 1D 05 EC */ lha r0, 0x5ec(r29) -/* 807403E0 2C 00 00 00 */ cmpwi r0, 0 -/* 807403E4 40 82 00 24 */ bne lbl_80740408 -/* 807403E8 80 1D 06 28 */ lwz r0, 0x628(r29) -/* 807403EC 2C 00 00 04 */ cmpwi r0, 4 -/* 807403F0 41 82 00 18 */ beq lbl_80740408 -/* 807403F4 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807403F8 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 807403FC D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80740400 38 00 00 04 */ li r0, 4 -/* 80740404 90 1D 06 28 */ stw r0, 0x628(r29) -lbl_80740408: -/* 80740408 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 8074040C 38 63 00 0C */ addi r3, r3, 0xc -/* 80740410 C0 3E 00 F0 */ lfs f1, 0xf0(r30) -/* 80740414 4B BE 80 19 */ bl checkPass__12J3DFrameCtrlFf -/* 80740418 2C 03 00 00 */ cmpwi r3, 0 -/* 8074041C 41 82 00 50 */ beq lbl_8074046C -/* 80740420 80 1D 06 28 */ lwz r0, 0x628(r29) -/* 80740424 2C 00 00 04 */ cmpwi r0, 4 -/* 80740428 40 82 00 44 */ bne lbl_8074046C -/* 8074042C C0 1E 00 F4 */ lfs f0, 0xf4(r30) -/* 80740430 D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 80740434 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070580@ha */ -/* 80740438 38 03 05 80 */ addi r0, r3, 0x0580 /* 0x00070580@l */ -/* 8074043C 90 01 00 20 */ stw r0, 0x20(r1) -/* 80740440 38 7D 06 74 */ addi r3, r29, 0x674 -/* 80740444 38 81 00 20 */ addi r4, r1, 0x20 -/* 80740448 38 A0 00 00 */ li r5, 0 -/* 8074044C 38 C0 FF FF */ li r6, -1 -/* 80740450 81 9D 06 74 */ lwz r12, 0x674(r29) -/* 80740454 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80740458 7D 89 03 A6 */ mtctr r12 -/* 8074045C 4E 80 04 21 */ bctrl -/* 80740460 88 7D 05 B0 */ lbz r3, 0x5b0(r29) -/* 80740464 38 03 00 01 */ addi r0, r3, 1 -/* 80740468 98 1D 05 B0 */ stb r0, 0x5b0(r29) -lbl_8074046C: -/* 8074046C 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 80740470 C0 23 00 1C */ lfs f1, 0x1c(r3) -/* 80740474 C0 1E 00 F8 */ lfs f0, 0xf8(r30) -/* 80740478 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8074047C 40 81 02 80 */ ble lbl_807406FC -/* 80740480 80 1D 06 28 */ lwz r0, 0x628(r29) -/* 80740484 2C 00 00 04 */ cmpwi r0, 4 -/* 80740488 40 82 02 74 */ bne lbl_807406FC -/* 8074048C 7F A3 EB 78 */ mr r3, r29 -/* 80740490 38 80 20 00 */ li r4, 0x2000 -/* 80740494 4B FF FB 91 */ bl SetHeadAngle__8daE_PH_cFs -/* 80740498 48 00 02 64 */ b lbl_807406FC -lbl_8074049C: -/* 8074049C C0 3D 04 FC */ lfs f1, 0x4fc(r29) -/* 807404A0 C0 1E 00 FC */ lfs f0, 0xfc(r30) -/* 807404A4 EC 01 00 2A */ fadds f0, f1, f0 -/* 807404A8 D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 807404AC 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 807404B0 38 80 00 01 */ li r4, 1 -/* 807404B4 88 03 00 11 */ lbz r0, 0x11(r3) -/* 807404B8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 807404BC 40 82 00 18 */ bne lbl_807404D4 -/* 807404C0 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807404C4 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 807404C8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 807404CC 41 82 00 08 */ beq lbl_807404D4 -/* 807404D0 38 80 00 00 */ li r4, 0 -lbl_807404D4: -/* 807404D4 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 807404D8 41 82 00 30 */ beq lbl_80740508 -/* 807404DC 88 7D 05 B0 */ lbz r3, 0x5b0(r29) -/* 807404E0 38 03 00 01 */ addi r0, r3, 1 -/* 807404E4 98 1D 05 B0 */ stb r0, 0x5b0(r29) -/* 807404E8 38 00 00 32 */ li r0, 0x32 -/* 807404EC B0 1D 05 EC */ sth r0, 0x5ec(r29) -/* 807404F0 7F A3 EB 78 */ mr r3, r29 -/* 807404F4 38 80 00 0E */ li r4, 0xe -/* 807404F8 38 A0 00 02 */ li r5, 2 -/* 807404FC C0 3E 00 78 */ lfs f1, 0x78(r30) -/* 80740500 C0 5E 00 04 */ lfs f2, 4(r30) -/* 80740504 4B FF D6 25 */ bl SetAnm__8daE_PH_cFiiff -lbl_80740508: -/* 80740508 C0 3D 04 FC */ lfs f1, 0x4fc(r29) -/* 8074050C C0 1E 00 00 */ lfs f0, 0(r30) -/* 80740510 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80740514 4C 40 13 82 */ cror 2, 0, 2 -/* 80740518 40 82 00 3C */ bne lbl_80740554 -/* 8074051C 7F A3 EB 78 */ mr r3, r29 -/* 80740520 38 80 10 00 */ li r4, 0x1000 -/* 80740524 4B FF FB 01 */ bl SetHeadAngle__8daE_PH_cFs -/* 80740528 38 7D 06 12 */ addi r3, r29, 0x612 -/* 8074052C 38 80 10 00 */ li r4, 0x1000 -/* 80740530 38 A0 00 10 */ li r5, 0x10 -/* 80740534 38 C0 10 00 */ li r6, 0x1000 -/* 80740538 4B B3 00 D1 */ bl cLib_addCalcAngleS2__FPssss -/* 8074053C 38 7D 06 12 */ addi r3, r29, 0x612 -/* 80740540 38 80 10 00 */ li r4, 0x1000 -/* 80740544 38 A0 00 10 */ li r5, 0x10 -/* 80740548 38 C0 10 00 */ li r6, 0x1000 -/* 8074054C 4B B3 00 BD */ bl cLib_addCalcAngleS2__FPssss -/* 80740550 48 00 01 AC */ b lbl_807406FC -lbl_80740554: -/* 80740554 7F A3 EB 78 */ mr r3, r29 -/* 80740558 38 80 20 00 */ li r4, 0x2000 -/* 8074055C 4B FF FA C9 */ bl SetHeadAngle__8daE_PH_cFs -/* 80740560 48 00 01 9C */ b lbl_807406FC -lbl_80740564: -/* 80740564 38 7D 04 FC */ addi r3, r29, 0x4fc -/* 80740568 C0 3E 01 00 */ lfs f1, 0x100(r30) -/* 8074056C C0 5E 00 B8 */ lfs f2, 0xb8(r30) -/* 80740570 C0 7E 01 04 */ lfs f3, 0x104(r30) -/* 80740574 4B B2 F4 C9 */ bl cLib_addCalc2__FPffff -/* 80740578 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 8074057C 28 00 00 05 */ cmplwi r0, 5 -/* 80740580 40 82 00 64 */ bne lbl_807405E4 -/* 80740584 C0 3D 04 FC */ lfs f1, 0x4fc(r29) -/* 80740588 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8074058C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80740590 4C 41 13 82 */ cror 2, 1, 2 -/* 80740594 40 82 00 2C */ bne lbl_807405C0 -/* 80740598 D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 8074059C 7F A3 EB 78 */ mr r3, r29 -/* 807405A0 38 80 10 00 */ li r4, 0x1000 -/* 807405A4 4B FF FA 81 */ bl SetHeadAngle__8daE_PH_cFs -/* 807405A8 38 7D 06 12 */ addi r3, r29, 0x612 -/* 807405AC 38 80 10 00 */ li r4, 0x1000 -/* 807405B0 38 A0 00 10 */ li r5, 0x10 -/* 807405B4 38 C0 10 00 */ li r6, 0x1000 -/* 807405B8 4B B3 00 51 */ bl cLib_addCalcAngleS2__FPssss -/* 807405BC 48 00 00 34 */ b lbl_807405F0 -lbl_807405C0: -/* 807405C0 7F A3 EB 78 */ mr r3, r29 -/* 807405C4 38 80 10 00 */ li r4, 0x1000 -/* 807405C8 4B FF FA 5D */ bl SetHeadAngle__8daE_PH_cFs -/* 807405CC 38 7D 06 12 */ addi r3, r29, 0x612 -/* 807405D0 38 80 10 00 */ li r4, 0x1000 -/* 807405D4 38 A0 00 10 */ li r5, 0x10 -/* 807405D8 38 C0 10 00 */ li r6, 0x1000 -/* 807405DC 4B B3 00 2D */ bl cLib_addCalcAngleS2__FPssss -/* 807405E0 48 00 00 10 */ b lbl_807405F0 -lbl_807405E4: -/* 807405E4 7F A3 EB 78 */ mr r3, r29 -/* 807405E8 38 80 15 00 */ li r4, 0x1500 -/* 807405EC 4B FF FA 39 */ bl SetHeadAngle__8daE_PH_cFs -lbl_807405F0: -/* 807405F0 A8 1D 05 EC */ lha r0, 0x5ec(r29) -/* 807405F4 2C 00 00 00 */ cmpwi r0, 0 -/* 807405F8 40 82 00 2C */ bne lbl_80740624 -/* 807405FC 88 7D 05 B0 */ lbz r3, 0x5b0(r29) -/* 80740600 38 03 00 01 */ addi r0, r3, 1 -/* 80740604 98 1D 05 B0 */ stb r0, 0x5b0(r29) -/* 80740608 88 7D 05 B1 */ lbz r3, 0x5b1(r29) -/* 8074060C 38 03 00 01 */ addi r0, r3, 1 -/* 80740610 98 1D 05 B1 */ stb r0, 0x5b1(r29) -/* 80740614 38 00 01 2C */ li r0, 0x12c -/* 80740618 B0 1D 05 EC */ sth r0, 0x5ec(r29) -/* 8074061C 38 00 01 68 */ li r0, 0x168 -/* 80740620 B0 1D 05 EE */ sth r0, 0x5ee(r29) -lbl_80740624: -/* 80740624 C0 5E 00 04 */ lfs f2, 4(r30) -/* 80740628 C0 3D 04 FC */ lfs f1, 0x4fc(r29) -/* 8074062C C0 1E 00 8C */ lfs f0, 0x8c(r30) -/* 80740630 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80740634 EC 02 00 2A */ fadds f0, f2, f0 -/* 80740638 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 8074063C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80740640 48 00 00 BC */ b lbl_807406FC -lbl_80740644: -/* 80740644 38 7D 04 FC */ addi r3, r29, 0x4fc -/* 80740648 C0 3E 01 00 */ lfs f1, 0x100(r30) -/* 8074064C C0 5E 00 08 */ lfs f2, 8(r30) -/* 80740650 C0 7E 00 9C */ lfs f3, 0x9c(r30) -/* 80740654 4B B2 F3 E9 */ bl cLib_addCalc2__FPffff -/* 80740658 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 8074065C 28 00 00 05 */ cmplwi r0, 5 -/* 80740660 40 82 00 4C */ bne lbl_807406AC -/* 80740664 A8 1D 05 EC */ lha r0, 0x5ec(r29) -/* 80740668 2C 00 00 DC */ cmpwi r0, 0xdc -/* 8074066C 40 81 00 30 */ ble lbl_8074069C -/* 80740670 C0 1E 00 00 */ lfs f0, 0(r30) -/* 80740674 D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 80740678 7F A3 EB 78 */ mr r3, r29 -/* 8074067C 38 80 10 00 */ li r4, 0x1000 -/* 80740680 4B FF F9 A5 */ bl SetHeadAngle__8daE_PH_cFs -/* 80740684 38 7D 06 12 */ addi r3, r29, 0x612 -/* 80740688 38 80 10 00 */ li r4, 0x1000 -/* 8074068C 38 A0 00 10 */ li r5, 0x10 -/* 80740690 38 C0 10 00 */ li r6, 0x1000 -/* 80740694 4B B2 FF 75 */ bl cLib_addCalcAngleS2__FPssss -/* 80740698 48 00 00 20 */ b lbl_807406B8 -lbl_8074069C: -/* 8074069C 7F A3 EB 78 */ mr r3, r29 -/* 807406A0 38 80 15 00 */ li r4, 0x1500 -/* 807406A4 4B FF F9 81 */ bl SetHeadAngle__8daE_PH_cFs -/* 807406A8 48 00 00 10 */ b lbl_807406B8 -lbl_807406AC: -/* 807406AC 7F A3 EB 78 */ mr r3, r29 -/* 807406B0 38 80 15 00 */ li r4, 0x1500 -/* 807406B4 4B FF F9 71 */ bl SetHeadAngle__8daE_PH_cFs -lbl_807406B8: -/* 807406B8 C0 5E 00 04 */ lfs f2, 4(r30) -/* 807406BC C0 3D 04 FC */ lfs f1, 0x4fc(r29) -/* 807406C0 C0 1E 00 8C */ lfs f0, 0x8c(r30) -/* 807406C4 EC 01 00 24 */ fdivs f0, f1, f0 -/* 807406C8 EC 02 00 2A */ fadds f0, f2, f0 -/* 807406CC 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 807406D0 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 807406D4 A8 1D 05 EE */ lha r0, 0x5ee(r29) -/* 807406D8 2C 00 00 00 */ cmpwi r0, 0 -/* 807406DC 41 82 00 18 */ beq lbl_807406F4 -/* 807406E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807406E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807406E8 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 807406EC 28 00 00 00 */ cmplwi r0, 0 -/* 807406F0 40 82 00 0C */ bne lbl_807406FC -lbl_807406F4: -/* 807406F4 7F A3 EB 78 */ mr r3, r29 -/* 807406F8 4B 8D 95 85 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_807406FC: -/* 807406FC 34 7D 09 38 */ addic. r3, r29, 0x938 -/* 80740700 41 82 00 34 */ beq lbl_80740734 -/* 80740704 C0 3D 04 D0 */ lfs f1, 0x4d0(r29) -/* 80740708 C0 03 00 00 */ lfs f0, 0(r3) -/* 8074070C EC 01 00 2A */ fadds f0, f1, f0 -/* 80740710 D0 1D 04 D0 */ stfs f0, 0x4d0(r29) -/* 80740714 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80740718 C0 03 00 04 */ lfs f0, 4(r3) -/* 8074071C EC 01 00 2A */ fadds f0, f1, f0 -/* 80740720 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 80740724 C0 3D 04 D8 */ lfs f1, 0x4d8(r29) -/* 80740728 C0 03 00 08 */ lfs f0, 8(r3) -/* 8074072C EC 01 00 2A */ fadds f0, f1, f0 -/* 80740730 D0 1D 04 D8 */ stfs f0, 0x4d8(r29) -lbl_80740734: -/* 80740734 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80740738 C0 1D 04 FC */ lfs f0, 0x4fc(r29) -/* 8074073C EC 01 00 2A */ fadds f0, f1, f0 -/* 80740740 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 80740744 80 1D 06 28 */ lwz r0, 0x628(r29) -/* 80740748 2C 00 00 04 */ cmpwi r0, 4 -/* 8074074C 40 82 01 5C */ bne lbl_807408A8 -/* 80740750 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80740754 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740758 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 8074075C 38 00 00 FF */ li r0, 0xff -/* 80740760 90 01 00 08 */ stw r0, 8(r1) -/* 80740764 38 80 00 00 */ li r4, 0 -/* 80740768 90 81 00 0C */ stw r4, 0xc(r1) -/* 8074076C 38 00 FF FF */ li r0, -1 -/* 80740770 90 01 00 10 */ stw r0, 0x10(r1) -/* 80740774 90 81 00 14 */ stw r4, 0x14(r1) -/* 80740778 90 81 00 18 */ stw r4, 0x18(r1) -/* 8074077C 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80740780 80 9D 06 00 */ lwz r4, 0x600(r29) -/* 80740784 38 A0 00 00 */ li r5, 0 -/* 80740788 3C C0 00 01 */ lis r6, 0x0001 /* 0x00008C6F@ha */ -/* 8074078C 38 C6 8C 6F */ addi r6, r6, 0x8C6F /* 0x00008C6F@l */ -/* 80740790 38 FD 04 D0 */ addi r7, r29, 0x4d0 -/* 80740794 39 1D 01 0C */ addi r8, r29, 0x10c -/* 80740798 39 3D 04 E4 */ addi r9, r29, 0x4e4 -/* 8074079C 39 40 00 00 */ li r10, 0 -/* 807407A0 C0 3E 00 04 */ lfs f1, 4(r30) -/* 807407A4 4B 90 CD 29 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 807407A8 90 7D 06 00 */ stw r3, 0x600(r29) -/* 807407AC 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 807407B0 38 00 00 FF */ li r0, 0xff -/* 807407B4 90 01 00 08 */ stw r0, 8(r1) -/* 807407B8 38 80 00 00 */ li r4, 0 -/* 807407BC 90 81 00 0C */ stw r4, 0xc(r1) -/* 807407C0 38 00 FF FF */ li r0, -1 -/* 807407C4 90 01 00 10 */ stw r0, 0x10(r1) -/* 807407C8 90 81 00 14 */ stw r4, 0x14(r1) -/* 807407CC 90 81 00 18 */ stw r4, 0x18(r1) -/* 807407D0 90 81 00 1C */ stw r4, 0x1c(r1) -/* 807407D4 80 9D 06 04 */ lwz r4, 0x604(r29) -/* 807407D8 38 A0 00 00 */ li r5, 0 -/* 807407DC 3C C0 00 01 */ lis r6, 0x0001 /* 0x00008C70@ha */ -/* 807407E0 38 C6 8C 70 */ addi r6, r6, 0x8C70 /* 0x00008C70@l */ -/* 807407E4 38 FD 04 D0 */ addi r7, r29, 0x4d0 -/* 807407E8 39 1D 01 0C */ addi r8, r29, 0x10c -/* 807407EC 39 3D 04 E4 */ addi r9, r29, 0x4e4 -/* 807407F0 39 40 00 00 */ li r10, 0 -/* 807407F4 C0 3E 00 04 */ lfs f1, 4(r30) -/* 807407F8 4B 90 CC D5 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 807407FC 90 7D 06 04 */ stw r3, 0x604(r29) -/* 80740800 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80740804 38 00 00 FF */ li r0, 0xff -/* 80740808 90 01 00 08 */ stw r0, 8(r1) -/* 8074080C 38 80 00 00 */ li r4, 0 -/* 80740810 90 81 00 0C */ stw r4, 0xc(r1) -/* 80740814 38 00 FF FF */ li r0, -1 -/* 80740818 90 01 00 10 */ stw r0, 0x10(r1) -/* 8074081C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80740820 90 81 00 18 */ stw r4, 0x18(r1) -/* 80740824 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80740828 80 9D 06 08 */ lwz r4, 0x608(r29) -/* 8074082C 38 A0 00 00 */ li r5, 0 -/* 80740830 3C C0 00 01 */ lis r6, 0x0001 /* 0x00008C71@ha */ -/* 80740834 38 C6 8C 71 */ addi r6, r6, 0x8C71 /* 0x00008C71@l */ -/* 80740838 38 FD 04 D0 */ addi r7, r29, 0x4d0 -/* 8074083C 39 1D 01 0C */ addi r8, r29, 0x10c -/* 80740840 39 3D 04 E4 */ addi r9, r29, 0x4e4 -/* 80740844 39 40 00 00 */ li r10, 0 -/* 80740848 C0 3E 00 04 */ lfs f1, 4(r30) -/* 8074084C 4B 90 CC 81 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80740850 90 7D 06 08 */ stw r3, 0x608(r29) -/* 80740854 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80740858 38 00 00 FF */ li r0, 0xff -/* 8074085C 90 01 00 08 */ stw r0, 8(r1) -/* 80740860 38 80 00 00 */ li r4, 0 -/* 80740864 90 81 00 0C */ stw r4, 0xc(r1) -/* 80740868 38 00 FF FF */ li r0, -1 -/* 8074086C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80740870 90 81 00 14 */ stw r4, 0x14(r1) -/* 80740874 90 81 00 18 */ stw r4, 0x18(r1) -/* 80740878 90 81 00 1C */ stw r4, 0x1c(r1) -/* 8074087C 80 9D 06 0C */ lwz r4, 0x60c(r29) -/* 80740880 38 A0 00 00 */ li r5, 0 -/* 80740884 3C C0 00 01 */ lis r6, 0x0001 /* 0x00008C72@ha */ -/* 80740888 38 C6 8C 72 */ addi r6, r6, 0x8C72 /* 0x00008C72@l */ -/* 8074088C 38 FD 04 D0 */ addi r7, r29, 0x4d0 -/* 80740890 39 1D 01 0C */ addi r8, r29, 0x10c -/* 80740894 39 3D 04 E4 */ addi r9, r29, 0x4e4 -/* 80740898 39 40 00 00 */ li r10, 0 -/* 8074089C C0 3E 00 04 */ lfs f1, 4(r30) -/* 807408A0 4B 90 CC 2D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 807408A4 90 7D 06 0C */ stw r3, 0x60c(r29) -lbl_807408A8: -/* 807408A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 807408AC 4B C2 19 7D */ bl _restgpr_29 -/* 807408B0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 807408B4 7C 08 03 A6 */ mtlr r0 -/* 807408B8 38 21 00 40 */ addi r1, r1, 0x40 -/* 807408BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DownBoots__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DownBoots__8daE_PH_cFv.s deleted file mode 100644 index 9c5c97ec231..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DownBoots__8daE_PH_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_8073E924: -/* 8073E924 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8073E928 7C 08 02 A6 */ mflr r0 -/* 8073E92C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8073E930 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8073E934 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8073E938 7C 7E 1B 78 */ mr r30, r3 -/* 8073E93C 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073E940 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073E944 A8 7E 06 66 */ lha r3, 0x666(r30) -/* 8073E948 A8 1E 06 12 */ lha r0, 0x612(r30) -/* 8073E94C C8 5F 00 80 */ lfd f2, 0x80(r31) -/* 8073E950 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073E954 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073E958 3C 80 43 30 */ lis r4, 0x4330 -/* 8073E95C 90 81 00 10 */ stw r4, 0x10(r1) -/* 8073E960 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8073E964 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8073E968 C0 1E 06 24 */ lfs f0, 0x624(r30) -/* 8073E96C EC 01 00 32 */ fmuls f0, f1, f0 -/* 8073E970 FC 00 00 1E */ fctiwz f0, f0 -/* 8073E974 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 8073E978 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8073E97C 7C 03 02 14 */ add r0, r3, r0 -/* 8073E980 B0 1E 06 66 */ sth r0, 0x666(r30) -/* 8073E984 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070462@ha */ -/* 8073E988 38 03 04 62 */ addi r0, r3, 0x0462 /* 0x00070462@l */ -/* 8073E98C 90 01 00 08 */ stw r0, 8(r1) -/* 8073E990 A8 1E 06 12 */ lha r0, 0x612(r30) -/* 8073E994 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073E998 90 01 00 24 */ stw r0, 0x24(r1) -/* 8073E99C 90 81 00 20 */ stw r4, 0x20(r1) -/* 8073E9A0 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8073E9A4 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8073E9A8 C0 1E 06 24 */ lfs f0, 0x624(r30) -/* 8073E9AC EC 21 00 32 */ fmuls f1, f1, f0 -/* 8073E9B0 4B C2 36 FD */ bl __cvt_fp2unsigned -/* 8073E9B4 7C 65 1B 78 */ mr r5, r3 -/* 8073E9B8 38 7E 06 74 */ addi r3, r30, 0x674 -/* 8073E9BC 38 81 00 08 */ addi r4, r1, 8 -/* 8073E9C0 38 C0 FF FF */ li r6, -1 -/* 8073E9C4 81 9E 06 74 */ lwz r12, 0x674(r30) -/* 8073E9C8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8073E9CC 7D 89 03 A6 */ mtctr r12 -/* 8073E9D0 4E 80 04 21 */ bctrl -/* 8073E9D4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073E9D8 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 8073E9DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073E9E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073E9E4 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 8073E9E8 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 8073E9EC C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 8073E9F0 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 8073E9F4 EC 01 00 2A */ fadds f0, f1, f0 -/* 8073E9F8 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 8073E9FC 80 03 05 70 */ lwz r0, 0x570(r3) -/* 8073EA00 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8073EA04 41 82 00 10 */ beq lbl_8073EA14 -/* 8073EA08 80 1E 06 28 */ lwz r0, 0x628(r30) -/* 8073EA0C 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073EA10 41 82 00 1C */ beq lbl_8073EA2C -lbl_8073EA14: -/* 8073EA14 88 7E 05 B0 */ lbz r3, 0x5b0(r30) -/* 8073EA18 38 03 00 01 */ addi r0, r3, 1 -/* 8073EA1C 98 1E 05 B0 */ stb r0, 0x5b0(r30) -/* 8073EA20 C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 8073EA24 D0 1E 06 24 */ stfs f0, 0x624(r30) -/* 8073EA28 D0 1E 06 20 */ stfs f0, 0x620(r30) -lbl_8073EA2C: -/* 8073EA2C C0 1E 06 24 */ lfs f0, 0x624(r30) -/* 8073EA30 80 7E 07 1C */ lwz r3, 0x71c(r30) -/* 8073EA34 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8073EA38 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8073EA3C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 8073EA40 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8073EA44 7C 08 03 A6 */ mtlr r0 -/* 8073EA48 38 21 00 30 */ addi r1, r1, 0x30 -/* 8073EA4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Execute__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Execute__8daE_PH_cFv.s deleted file mode 100644 index b72bf4d8db4..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Execute__8daE_PH_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_80740B3C: -/* 80740B3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80740B40 7C 08 02 A6 */ mflr r0 -/* 80740B44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80740B48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80740B4C 7C 7F 1B 78 */ mr r31, r3 -/* 80740B50 48 00 06 71 */ bl EyeSet__8daE_PH_cFv -/* 80740B54 88 1F 06 60 */ lbz r0, 0x660(r31) -/* 80740B58 2C 00 00 03 */ cmpwi r0, 3 -/* 80740B5C 41 82 00 14 */ beq lbl_80740B70 -/* 80740B60 41 80 00 98 */ blt lbl_80740BF8 -/* 80740B64 2C 00 00 06 */ cmpwi r0, 6 -/* 80740B68 40 80 00 90 */ bge lbl_80740BF8 -/* 80740B6C 48 00 00 10 */ b lbl_80740B7C -lbl_80740B70: -/* 80740B70 7F E3 FB 78 */ mr r3, r31 -/* 80740B74 4B FF FD 4D */ bl ToumeiAction__8daE_PH_cFv -/* 80740B78 48 00 00 90 */ b lbl_80740C08 -lbl_80740B7C: -/* 80740B7C 38 60 00 00 */ li r3, 0 -/* 80740B80 7C 64 1B 78 */ mr r4, r3 -/* 80740B84 38 00 00 03 */ li r0, 3 -/* 80740B88 7C 09 03 A6 */ mtctr r0 -lbl_80740B8C: -/* 80740B8C 38 C3 05 EC */ addi r6, r3, 0x5ec -/* 80740B90 7C BF 32 AE */ lhax r5, r31, r6 -/* 80740B94 38 05 FF FF */ addi r0, r5, -1 -/* 80740B98 7C 1F 33 2E */ sthx r0, r31, r6 -/* 80740B9C 7C 1F 32 AE */ lhax r0, r31, r6 -/* 80740BA0 2C 00 00 00 */ cmpwi r0, 0 -/* 80740BA4 41 81 00 08 */ bgt lbl_80740BAC -/* 80740BA8 7C 9F 33 2E */ sthx r4, r31, r6 -lbl_80740BAC: -/* 80740BAC 38 63 00 02 */ addi r3, r3, 2 -/* 80740BB0 42 00 FF DC */ bdnz lbl_80740B8C -/* 80740BB4 7F E3 FB 78 */ mr r3, r31 -/* 80740BB8 48 00 05 C5 */ bl De_Timer__8daE_PH_cFv -/* 80740BBC 7F E3 FB 78 */ mr r3, r31 -/* 80740BC0 4B FF F7 59 */ bl DemoAction__8daE_PH_cFv -/* 80740BC4 88 1F 06 60 */ lbz r0, 0x660(r31) -/* 80740BC8 28 00 00 05 */ cmplwi r0, 5 -/* 80740BCC 40 82 00 0C */ bne lbl_80740BD8 -/* 80740BD0 7F E3 FB 78 */ mr r3, r31 -/* 80740BD4 4B FF F4 C5 */ bl CamAction__8daE_PH_cFv -lbl_80740BD8: -/* 80740BD8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80740BDC 7C 03 07 74 */ extsb r3, r0 -/* 80740BE0 4B 8E C4 8D */ bl dComIfGp_getReverb__Fi -/* 80740BE4 7C 65 1B 78 */ mr r5, r3 -/* 80740BE8 80 7F 07 1C */ lwz r3, 0x71c(r31) -/* 80740BEC 38 80 00 00 */ li r4, 0 -/* 80740BF0 4B 8D 04 C1 */ bl play__16mDoExt_McaMorfSOFUlSc -/* 80740BF4 48 00 00 14 */ b lbl_80740C08 -lbl_80740BF8: -/* 80740BF8 7F E3 FB 78 */ mr r3, r31 -/* 80740BFC 48 00 05 81 */ bl De_Timer__8daE_PH_cFv -/* 80740C00 7F E3 FB 78 */ mr r3, r31 -/* 80740C04 4B FF F1 6D */ bl Action__8daE_PH_cFv -lbl_80740C08: -/* 80740C08 7F E3 FB 78 */ mr r3, r31 -/* 80740C0C 48 00 06 5D */ bl setBaseMtx__8daE_PH_cFv -/* 80740C10 88 1F 06 60 */ lbz r0, 0x660(r31) -/* 80740C14 28 00 00 03 */ cmplwi r0, 3 -/* 80740C18 41 82 00 0C */ beq lbl_80740C24 -/* 80740C1C 7F E3 FB 78 */ mr r3, r31 -/* 80740C20 4B FF CD 31 */ bl setCcSph__8daE_PH_cFv -lbl_80740C24: -/* 80740C24 38 60 00 01 */ li r3, 1 -/* 80740C28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80740C2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80740C30 7C 08 03 A6 */ mtlr r0 -/* 80740C34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80740C38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/EyeSet__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/EyeSet__8daE_PH_cFv.s deleted file mode 100644 index 00565dd812a..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/EyeSet__8daE_PH_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_807411C0: -/* 807411C0 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 807411C4 D0 03 05 38 */ stfs f0, 0x538(r3) -/* 807411C8 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 807411CC D0 03 05 3C */ stfs f0, 0x53c(r3) -/* 807411D0 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 807411D4 D0 03 05 40 */ stfs f0, 0x540(r3) -/* 807411D8 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 807411DC D0 03 05 50 */ stfs f0, 0x550(r3) -/* 807411E0 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 807411E4 D0 03 05 58 */ stfs f0, 0x558(r3) -/* 807411E8 3C 80 80 74 */ lis r4, lit_5389@ha /* 0x80741D08@ha */ -/* 807411EC C0 24 1D 08 */ lfs f1, lit_5389@l(r4) /* 0x80741D08@l */ -/* 807411F0 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 807411F4 EC 01 00 2A */ fadds f0, f1, f0 -/* 807411F8 D0 03 05 54 */ stfs f0, 0x554(r3) -/* 807411FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm2__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm2__8daE_PH_cFv.s deleted file mode 100644 index edc007eb378..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm2__8daE_PH_cFv.s +++ /dev/null @@ -1,182 +0,0 @@ -lbl_8073F8C8: -/* 8073F8C8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8073F8CC 7C 08 02 A6 */ mflr r0 -/* 8073F8D0 90 01 00 34 */ stw r0, 0x34(r1) -/* 8073F8D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8073F8D8 4B C2 29 05 */ bl _savegpr_29 -/* 8073F8DC 7C 7E 1B 78 */ mr r30, r3 -/* 8073F8E0 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073F8E4 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073F8E8 80 1E 06 28 */ lwz r0, 0x628(r30) -/* 8073F8EC 2C 00 00 06 */ cmpwi r0, 6 -/* 8073F8F0 41 82 00 14 */ beq lbl_8073F904 -/* 8073F8F4 2C 00 00 0B */ cmpwi r0, 0xb -/* 8073F8F8 41 82 00 0C */ beq lbl_8073F904 -/* 8073F8FC 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073F900 40 82 00 FC */ bne lbl_8073F9FC -lbl_8073F904: -/* 8073F904 80 7E 07 1C */ lwz r3, 0x71c(r30) -/* 8073F908 38 80 00 01 */ li r4, 1 -/* 8073F90C 88 03 00 11 */ lbz r0, 0x11(r3) -/* 8073F910 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8073F914 40 82 00 18 */ bne lbl_8073F92C -/* 8073F918 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8073F91C C0 03 00 18 */ lfs f0, 0x18(r3) -/* 8073F920 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073F924 41 82 00 08 */ beq lbl_8073F92C -/* 8073F928 38 80 00 00 */ li r4, 0 -lbl_8073F92C: -/* 8073F92C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8073F930 41 82 00 1C */ beq lbl_8073F94C -/* 8073F934 7F C3 F3 78 */ mr r3, r30 -/* 8073F938 38 80 00 0E */ li r4, 0xe -/* 8073F93C 38 A0 00 02 */ li r5, 2 -/* 8073F940 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073F944 C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073F948 4B FF E1 E1 */ bl SetAnm__8daE_PH_cFiiff -lbl_8073F94C: -/* 8073F94C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073F950 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073F954 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 8073F958 38 00 00 FF */ li r0, 0xff -/* 8073F95C 90 01 00 08 */ stw r0, 8(r1) -/* 8073F960 38 80 00 00 */ li r4, 0 -/* 8073F964 90 81 00 0C */ stw r4, 0xc(r1) -/* 8073F968 38 00 FF FF */ li r0, -1 -/* 8073F96C 90 01 00 10 */ stw r0, 0x10(r1) -/* 8073F970 90 81 00 14 */ stw r4, 0x14(r1) -/* 8073F974 90 81 00 18 */ stw r4, 0x18(r1) -/* 8073F978 90 81 00 1C */ stw r4, 0x1c(r1) -/* 8073F97C 80 9E 05 F8 */ lwz r4, 0x5f8(r30) -/* 8073F980 38 A0 00 00 */ li r5, 0 -/* 8073F984 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000878C@ha */ -/* 8073F988 38 C6 87 8C */ addi r6, r6, 0x878C /* 0x0000878C@l */ -/* 8073F98C 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 8073F990 39 1E 01 0C */ addi r8, r30, 0x10c -/* 8073F994 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 8073F998 39 40 00 00 */ li r10, 0 -/* 8073F99C C0 3F 00 04 */ lfs f1, 4(r31) -/* 8073F9A0 4B 90 DB 2D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8073F9A4 90 7E 05 F8 */ stw r3, 0x5f8(r30) -/* 8073F9A8 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 8073F9AC 38 00 00 FF */ li r0, 0xff -/* 8073F9B0 90 01 00 08 */ stw r0, 8(r1) -/* 8073F9B4 38 80 00 00 */ li r4, 0 -/* 8073F9B8 90 81 00 0C */ stw r4, 0xc(r1) -/* 8073F9BC 38 00 FF FF */ li r0, -1 -/* 8073F9C0 90 01 00 10 */ stw r0, 0x10(r1) -/* 8073F9C4 90 81 00 14 */ stw r4, 0x14(r1) -/* 8073F9C8 90 81 00 18 */ stw r4, 0x18(r1) -/* 8073F9CC 90 81 00 1C */ stw r4, 0x1c(r1) -/* 8073F9D0 80 9E 05 FC */ lwz r4, 0x5fc(r30) -/* 8073F9D4 38 A0 00 00 */ li r5, 0 -/* 8073F9D8 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000878D@ha */ -/* 8073F9DC 38 C6 87 8D */ addi r6, r6, 0x878D /* 0x0000878D@l */ -/* 8073F9E0 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 8073F9E4 39 1E 01 0C */ addi r8, r30, 0x10c -/* 8073F9E8 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 8073F9EC 39 40 00 00 */ li r10, 0 -/* 8073F9F0 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8073F9F4 4B 90 DA D9 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8073F9F8 90 7E 05 FC */ stw r3, 0x5fc(r30) -lbl_8073F9FC: -/* 8073F9FC 80 1E 06 28 */ lwz r0, 0x628(r30) -/* 8073FA00 2C 00 00 0E */ cmpwi r0, 0xe -/* 8073FA04 40 82 00 B8 */ bne lbl_8073FABC -/* 8073FA08 7F C3 F3 78 */ mr r3, r30 -/* 8073FA0C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073FA10 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073FA14 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 8073FA18 4B 8D AD C9 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8073FA1C C0 1F 00 C8 */ lfs f0, 0xc8(r31) -/* 8073FA20 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073FA24 40 80 00 58 */ bge lbl_8073FA7C -/* 8073FA28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073FA2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073FA30 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8073FA34 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 8073FA38 41 82 00 44 */ beq lbl_8073FA7C -/* 8073FA3C 38 00 00 00 */ li r0, 0 -/* 8073FA40 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 8073FA44 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 8073FA48 D0 1E 06 30 */ stfs f0, 0x630(r30) -/* 8073FA4C 38 00 00 0F */ li r0, 0xf -/* 8073FA50 B0 1E 05 AE */ sth r0, 0x5ae(r30) -/* 8073FA54 38 00 10 00 */ li r0, 0x1000 -/* 8073FA58 B0 1E 06 16 */ sth r0, 0x616(r30) -/* 8073FA5C B0 1E 06 18 */ sth r0, 0x618(r30) -/* 8073FA60 7F C3 F3 78 */ mr r3, r30 -/* 8073FA64 38 80 00 0C */ li r4, 0xc -/* 8073FA68 38 A0 00 02 */ li r5, 2 -/* 8073FA6C C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073FA70 C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073FA74 4B FF E0 B5 */ bl SetAnm__8daE_PH_cFiiff -/* 8073FA78 48 00 00 E0 */ b lbl_8073FB58 -lbl_8073FA7C: -/* 8073FA7C 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 8073FA80 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 8073FA84 41 82 00 10 */ beq lbl_8073FA94 -/* 8073FA88 38 00 00 00 */ li r0, 0 -/* 8073FA8C 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 8073FA90 48 00 00 C8 */ b lbl_8073FB58 -lbl_8073FA94: -/* 8073FA94 80 1E 06 28 */ lwz r0, 0x628(r30) -/* 8073FA98 2C 00 00 0E */ cmpwi r0, 0xe -/* 8073FA9C 41 82 00 BC */ beq lbl_8073FB58 -/* 8073FAA0 7F C3 F3 78 */ mr r3, r30 -/* 8073FAA4 38 80 00 0E */ li r4, 0xe -/* 8073FAA8 38 A0 00 02 */ li r5, 2 -/* 8073FAAC C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073FAB0 C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073FAB4 4B FF E0 75 */ bl SetAnm__8daE_PH_cFiiff -/* 8073FAB8 48 00 00 A0 */ b lbl_8073FB58 -lbl_8073FABC: -/* 8073FABC 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073FAC0 40 82 00 48 */ bne lbl_8073FB08 -/* 8073FAC4 38 00 00 00 */ li r0, 0 -/* 8073FAC8 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 8073FACC 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 8073FAD0 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 8073FAD4 41 82 00 18 */ beq lbl_8073FAEC -/* 8073FAD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073FADC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073FAE0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8073FAE4 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 8073FAE8 40 82 00 70 */ bne lbl_8073FB58 -lbl_8073FAEC: -/* 8073FAEC 7F C3 F3 78 */ mr r3, r30 -/* 8073FAF0 38 80 00 0A */ li r4, 0xa -/* 8073FAF4 38 A0 00 00 */ li r5, 0 -/* 8073FAF8 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073FAFC C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073FB00 4B FF E0 29 */ bl SetAnm__8daE_PH_cFiiff -/* 8073FB04 48 00 00 54 */ b lbl_8073FB58 -lbl_8073FB08: -/* 8073FB08 2C 00 00 0A */ cmpwi r0, 0xa -/* 8073FB0C 40 82 00 4C */ bne lbl_8073FB58 -/* 8073FB10 80 7E 07 1C */ lwz r3, 0x71c(r30) -/* 8073FB14 38 80 00 01 */ li r4, 1 -/* 8073FB18 88 03 00 11 */ lbz r0, 0x11(r3) -/* 8073FB1C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8073FB20 40 82 00 18 */ bne lbl_8073FB38 -/* 8073FB24 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8073FB28 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 8073FB2C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073FB30 41 82 00 08 */ beq lbl_8073FB38 -/* 8073FB34 38 80 00 00 */ li r4, 0 -lbl_8073FB38: -/* 8073FB38 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8073FB3C 41 82 00 1C */ beq lbl_8073FB58 -/* 8073FB40 7F C3 F3 78 */ mr r3, r30 -/* 8073FB44 38 80 00 0E */ li r4, 0xe -/* 8073FB48 38 A0 00 02 */ li r5, 2 -/* 8073FB4C C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073FB50 C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073FB54 4B FF DF D5 */ bl SetAnm__8daE_PH_cFiiff -lbl_8073FB58: -/* 8073FB58 39 61 00 30 */ addi r11, r1, 0x30 -/* 8073FB5C 4B C2 26 CD */ bl _restgpr_29 -/* 8073FB60 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8073FB64 7C 08 03 A6 */ mtlr r0 -/* 8073FB68 38 21 00 30 */ addi r1, r1, 0x30 -/* 8073FB6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm__8daE_PH_cFv.s deleted file mode 100644 index b740d621d17..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm__8daE_PH_cFv.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_8073DDF8: -/* 8073DDF8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8073DDFC 7C 08 02 A6 */ mflr r0 -/* 8073DE00 90 01 00 34 */ stw r0, 0x34(r1) -/* 8073DE04 39 61 00 30 */ addi r11, r1, 0x30 -/* 8073DE08 4B C2 43 D5 */ bl _savegpr_29 -/* 8073DE0C 7C 7E 1B 78 */ mr r30, r3 -/* 8073DE10 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073DE14 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073DE18 80 1E 06 28 */ lwz r0, 0x628(r30) -/* 8073DE1C 2C 00 00 06 */ cmpwi r0, 6 -/* 8073DE20 41 82 00 14 */ beq lbl_8073DE34 -/* 8073DE24 2C 00 00 0B */ cmpwi r0, 0xb -/* 8073DE28 41 82 00 0C */ beq lbl_8073DE34 -/* 8073DE2C 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073DE30 40 82 00 FC */ bne lbl_8073DF2C -lbl_8073DE34: -/* 8073DE34 80 7E 07 1C */ lwz r3, 0x71c(r30) -/* 8073DE38 38 80 00 01 */ li r4, 1 -/* 8073DE3C 88 03 00 11 */ lbz r0, 0x11(r3) -/* 8073DE40 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8073DE44 40 82 00 18 */ bne lbl_8073DE5C -/* 8073DE48 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8073DE4C C0 03 00 18 */ lfs f0, 0x18(r3) -/* 8073DE50 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073DE54 41 82 00 08 */ beq lbl_8073DE5C -/* 8073DE58 38 80 00 00 */ li r4, 0 -lbl_8073DE5C: -/* 8073DE5C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8073DE60 41 82 00 1C */ beq lbl_8073DE7C -/* 8073DE64 7F C3 F3 78 */ mr r3, r30 -/* 8073DE68 38 80 00 0E */ li r4, 0xe -/* 8073DE6C 38 A0 00 02 */ li r5, 2 -/* 8073DE70 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073DE74 C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073DE78 4B FF FC B1 */ bl SetAnm__8daE_PH_cFiiff -lbl_8073DE7C: -/* 8073DE7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073DE80 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073DE84 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 8073DE88 38 00 00 FF */ li r0, 0xff -/* 8073DE8C 90 01 00 08 */ stw r0, 8(r1) -/* 8073DE90 38 80 00 00 */ li r4, 0 -/* 8073DE94 90 81 00 0C */ stw r4, 0xc(r1) -/* 8073DE98 38 00 FF FF */ li r0, -1 -/* 8073DE9C 90 01 00 10 */ stw r0, 0x10(r1) -/* 8073DEA0 90 81 00 14 */ stw r4, 0x14(r1) -/* 8073DEA4 90 81 00 18 */ stw r4, 0x18(r1) -/* 8073DEA8 90 81 00 1C */ stw r4, 0x1c(r1) -/* 8073DEAC 80 9E 05 F8 */ lwz r4, 0x5f8(r30) -/* 8073DEB0 38 A0 00 00 */ li r5, 0 -/* 8073DEB4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000878C@ha */ -/* 8073DEB8 38 C6 87 8C */ addi r6, r6, 0x878C /* 0x0000878C@l */ -/* 8073DEBC 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 8073DEC0 39 1E 01 0C */ addi r8, r30, 0x10c -/* 8073DEC4 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 8073DEC8 39 40 00 00 */ li r10, 0 -/* 8073DECC C0 3F 00 04 */ lfs f1, 4(r31) -/* 8073DED0 4B 90 F5 FD */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8073DED4 90 7E 05 F8 */ stw r3, 0x5f8(r30) -/* 8073DED8 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 8073DEDC 38 00 00 FF */ li r0, 0xff -/* 8073DEE0 90 01 00 08 */ stw r0, 8(r1) -/* 8073DEE4 38 80 00 00 */ li r4, 0 -/* 8073DEE8 90 81 00 0C */ stw r4, 0xc(r1) -/* 8073DEEC 38 00 FF FF */ li r0, -1 -/* 8073DEF0 90 01 00 10 */ stw r0, 0x10(r1) -/* 8073DEF4 90 81 00 14 */ stw r4, 0x14(r1) -/* 8073DEF8 90 81 00 18 */ stw r4, 0x18(r1) -/* 8073DEFC 90 81 00 1C */ stw r4, 0x1c(r1) -/* 8073DF00 80 9E 05 FC */ lwz r4, 0x5fc(r30) -/* 8073DF04 38 A0 00 00 */ li r5, 0 -/* 8073DF08 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000878D@ha */ -/* 8073DF0C 38 C6 87 8D */ addi r6, r6, 0x878D /* 0x0000878D@l */ -/* 8073DF10 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 8073DF14 39 1E 01 0C */ addi r8, r30, 0x10c -/* 8073DF18 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 8073DF1C 39 40 00 00 */ li r10, 0 -/* 8073DF20 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8073DF24 4B 90 F5 A9 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8073DF28 90 7E 05 FC */ stw r3, 0x5fc(r30) -lbl_8073DF2C: -/* 8073DF2C 80 9E 06 28 */ lwz r4, 0x628(r30) -/* 8073DF30 2C 04 00 0B */ cmpwi r4, 0xb -/* 8073DF34 41 82 00 0C */ beq lbl_8073DF40 -/* 8073DF38 2C 04 00 0E */ cmpwi r4, 0xe -/* 8073DF3C 40 82 00 80 */ bne lbl_8073DFBC -lbl_8073DF40: -/* 8073DF40 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 8073DF44 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 8073DF48 41 82 00 50 */ beq lbl_8073DF98 -/* 8073DF4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073DF50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073DF54 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8073DF58 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 8073DF5C 41 82 00 3C */ beq lbl_8073DF98 -/* 8073DF60 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 8073DF64 D0 1E 06 30 */ stfs f0, 0x630(r30) -/* 8073DF68 38 00 00 0F */ li r0, 0xf -/* 8073DF6C B0 1E 05 AE */ sth r0, 0x5ae(r30) -/* 8073DF70 38 00 10 00 */ li r0, 0x1000 -/* 8073DF74 B0 1E 06 16 */ sth r0, 0x616(r30) -/* 8073DF78 B0 1E 06 18 */ sth r0, 0x618(r30) -/* 8073DF7C 7F C3 F3 78 */ mr r3, r30 -/* 8073DF80 38 80 00 0C */ li r4, 0xc -/* 8073DF84 38 A0 00 02 */ li r5, 2 -/* 8073DF88 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073DF8C C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073DF90 4B FF FB 99 */ bl SetAnm__8daE_PH_cFiiff -/* 8073DF94 48 00 00 BC */ b lbl_8073E050 -lbl_8073DF98: -/* 8073DF98 2C 04 00 0E */ cmpwi r4, 0xe -/* 8073DF9C 41 82 00 B4 */ beq lbl_8073E050 -/* 8073DFA0 7F C3 F3 78 */ mr r3, r30 -/* 8073DFA4 38 80 00 0E */ li r4, 0xe -/* 8073DFA8 38 A0 00 02 */ li r5, 2 -/* 8073DFAC C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073DFB0 C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073DFB4 4B FF FB 75 */ bl SetAnm__8daE_PH_cFiiff -/* 8073DFB8 48 00 00 98 */ b lbl_8073E050 -lbl_8073DFBC: -/* 8073DFBC 2C 04 00 0C */ cmpwi r4, 0xc -/* 8073DFC0 40 82 00 40 */ bne lbl_8073E000 -/* 8073DFC4 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 8073DFC8 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 8073DFCC 41 82 00 18 */ beq lbl_8073DFE4 -/* 8073DFD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073DFD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073DFD8 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8073DFDC 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 8073DFE0 40 82 00 70 */ bne lbl_8073E050 -lbl_8073DFE4: -/* 8073DFE4 7F C3 F3 78 */ mr r3, r30 -/* 8073DFE8 38 80 00 0A */ li r4, 0xa -/* 8073DFEC 38 A0 00 00 */ li r5, 0 -/* 8073DFF0 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073DFF4 C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073DFF8 4B FF FB 31 */ bl SetAnm__8daE_PH_cFiiff -/* 8073DFFC 48 00 00 54 */ b lbl_8073E050 -lbl_8073E000: -/* 8073E000 2C 04 00 0A */ cmpwi r4, 0xa -/* 8073E004 40 82 00 4C */ bne lbl_8073E050 -/* 8073E008 80 7E 07 1C */ lwz r3, 0x71c(r30) -/* 8073E00C 38 80 00 01 */ li r4, 1 -/* 8073E010 88 03 00 11 */ lbz r0, 0x11(r3) -/* 8073E014 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8073E018 40 82 00 18 */ bne lbl_8073E030 -/* 8073E01C C0 3F 00 00 */ lfs f1, 0(r31) -/* 8073E020 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 8073E024 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073E028 41 82 00 08 */ beq lbl_8073E030 -/* 8073E02C 38 80 00 00 */ li r4, 0 -lbl_8073E030: -/* 8073E030 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8073E034 41 82 00 1C */ beq lbl_8073E050 -/* 8073E038 7F C3 F3 78 */ mr r3, r30 -/* 8073E03C 38 80 00 0E */ li r4, 0xe -/* 8073E040 38 A0 00 02 */ li r5, 2 -/* 8073E044 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8073E048 C0 5E 06 24 */ lfs f2, 0x624(r30) -/* 8073E04C 4B FF FA DD */ bl SetAnm__8daE_PH_cFiiff -lbl_8073E050: -/* 8073E050 39 61 00 30 */ addi r11, r1, 0x30 -/* 8073E054 4B C2 41 D5 */ bl _restgpr_29 -/* 8073E058 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8073E05C 7C 08 03 A6 */ mtlr r0 -/* 8073E060 38 21 00 30 */ addi r1, r1, 0x30 -/* 8073E064 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/GoTarget__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/GoTarget__8daE_PH_cFv.s deleted file mode 100644 index 330589af394..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/GoTarget__8daE_PH_cFv.s +++ /dev/null @@ -1,170 +0,0 @@ -lbl_8073E22C: -/* 8073E22C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8073E230 7C 08 02 A6 */ mflr r0 -/* 8073E234 90 01 00 64 */ stw r0, 0x64(r1) -/* 8073E238 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8073E23C 93 C1 00 58 */ stw r30, 0x58(r1) -/* 8073E240 7C 7E 1B 78 */ mr r30, r3 -/* 8073E244 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073E248 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073E24C C0 5E 06 50 */ lfs f2, 0x650(r30) -/* 8073E250 C0 3E 06 4C */ lfs f1, 0x64c(r30) -/* 8073E254 C0 1E 06 48 */ lfs f0, 0x648(r30) -/* 8073E258 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8073E25C D0 21 00 28 */ stfs f1, 0x28(r1) -/* 8073E260 D0 41 00 2C */ stfs f2, 0x2c(r1) -/* 8073E264 38 7E 04 FC */ addi r3, r30, 0x4fc -/* 8073E268 C0 3E 06 34 */ lfs f1, 0x634(r30) -/* 8073E26C 3C 80 80 74 */ lis r4, l_HIO@ha /* 0x80741DD0@ha */ -/* 8073E270 38 84 1D D0 */ addi r4, r4, l_HIO@l /* 0x80741DD0@l */ -/* 8073E274 C0 44 00 18 */ lfs f2, 0x18(r4) -/* 8073E278 C0 7F 00 88 */ lfs f3, 0x88(r31) -/* 8073E27C 4B B3 17 C1 */ bl cLib_addCalc2__FPffff -/* 8073E280 38 7E 05 2C */ addi r3, r30, 0x52c -/* 8073E284 C0 3E 06 38 */ lfs f1, 0x638(r30) -/* 8073E288 C0 5F 00 08 */ lfs f2, 8(r31) -/* 8073E28C C0 7F 00 8C */ lfs f3, 0x8c(r31) -/* 8073E290 4B B3 17 AD */ bl cLib_addCalc2__FPffff -/* 8073E294 7F C3 F3 78 */ mr r3, r30 -/* 8073E298 4B FF FD D1 */ bl SetShapeAngle__8daE_PH_cFv -/* 8073E29C C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 8073E2A0 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 8073E2A4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8073E2A8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8073E2AC D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8073E2B0 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 8073E2B4 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 8073E2B8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8073E2BC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 8073E2C0 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8073E2C4 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8073E2C8 38 61 00 0C */ addi r3, r1, 0xc -/* 8073E2CC 38 81 00 18 */ addi r4, r1, 0x18 -/* 8073E2D0 4B C0 90 CD */ bl PSVECSquareDistance -/* 8073E2D4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073E2D8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073E2DC 40 81 00 58 */ ble lbl_8073E334 -/* 8073E2E0 FC 00 08 34 */ frsqrte f0, f1 -/* 8073E2E4 C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073E2E8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073E2EC C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073E2F0 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073E2F4 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073E2F8 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073E2FC FC 02 00 32 */ fmul f0, f2, f0 -/* 8073E300 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073E304 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073E308 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073E30C FC 03 00 28 */ fsub f0, f3, f0 -/* 8073E310 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073E314 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073E318 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073E31C FC 01 00 32 */ fmul f0, f1, f0 -/* 8073E320 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073E324 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073E328 FC 21 00 32 */ fmul f1, f1, f0 -/* 8073E32C FC 20 08 18 */ frsp f1, f1 -/* 8073E330 48 00 00 88 */ b lbl_8073E3B8 -lbl_8073E334: -/* 8073E334 C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073E338 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073E33C 40 80 00 10 */ bge lbl_8073E34C -/* 8073E340 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073E344 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073E348 48 00 00 70 */ b lbl_8073E3B8 -lbl_8073E34C: -/* 8073E34C D0 21 00 08 */ stfs f1, 8(r1) -/* 8073E350 80 81 00 08 */ lwz r4, 8(r1) -/* 8073E354 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073E358 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073E35C 7C 03 00 00 */ cmpw r3, r0 -/* 8073E360 41 82 00 14 */ beq lbl_8073E374 -/* 8073E364 40 80 00 40 */ bge lbl_8073E3A4 -/* 8073E368 2C 03 00 00 */ cmpwi r3, 0 -/* 8073E36C 41 82 00 20 */ beq lbl_8073E38C -/* 8073E370 48 00 00 34 */ b lbl_8073E3A4 -lbl_8073E374: -/* 8073E374 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073E378 41 82 00 0C */ beq lbl_8073E384 -/* 8073E37C 38 00 00 01 */ li r0, 1 -/* 8073E380 48 00 00 28 */ b lbl_8073E3A8 -lbl_8073E384: -/* 8073E384 38 00 00 02 */ li r0, 2 -/* 8073E388 48 00 00 20 */ b lbl_8073E3A8 -lbl_8073E38C: -/* 8073E38C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073E390 41 82 00 0C */ beq lbl_8073E39C -/* 8073E394 38 00 00 05 */ li r0, 5 -/* 8073E398 48 00 00 10 */ b lbl_8073E3A8 -lbl_8073E39C: -/* 8073E39C 38 00 00 03 */ li r0, 3 -/* 8073E3A0 48 00 00 08 */ b lbl_8073E3A8 -lbl_8073E3A4: -/* 8073E3A4 38 00 00 04 */ li r0, 4 -lbl_8073E3A8: -/* 8073E3A8 2C 00 00 01 */ cmpwi r0, 1 -/* 8073E3AC 40 82 00 0C */ bne lbl_8073E3B8 -/* 8073E3B0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073E3B4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8073E3B8: -/* 8073E3B8 C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 8073E3BC EC 01 00 24 */ fdivs f0, f1, f0 -/* 8073E3C0 FC 00 00 1E */ fctiwz f0, f0 -/* 8073E3C4 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8073E3C8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8073E3CC 2C 00 00 00 */ cmpwi r0, 0 -/* 8073E3D0 40 82 00 08 */ bne lbl_8073E3D8 -/* 8073E3D4 38 00 00 01 */ li r0, 1 -lbl_8073E3D8: -/* 8073E3D8 C0 21 00 28 */ lfs f1, 0x28(r1) -/* 8073E3DC C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8073E3E0 EC 41 00 28 */ fsubs f2, f1, f0 -/* 8073E3E4 C8 3F 00 80 */ lfd f1, 0x80(r31) -/* 8073E3E8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073E3EC 90 01 00 3C */ stw r0, 0x3c(r1) -/* 8073E3F0 3C 00 43 30 */ lis r0, 0x4330 -/* 8073E3F4 90 01 00 38 */ stw r0, 0x38(r1) -/* 8073E3F8 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 8073E3FC EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073E400 EC 02 00 24 */ fdivs f0, f2, f0 -/* 8073E404 D0 1E 06 34 */ stfs f0, 0x634(r30) -/* 8073E408 38 7E 06 24 */ addi r3, r30, 0x624 -/* 8073E40C C0 3E 06 20 */ lfs f1, 0x620(r30) -/* 8073E410 C0 5F 00 90 */ lfs f2, 0x90(r31) -/* 8073E414 4B B3 23 2D */ bl cLib_chaseF__FPfff -/* 8073E418 38 7E 06 12 */ addi r3, r30, 0x612 -/* 8073E41C A8 1E 06 10 */ lha r0, 0x610(r30) -/* 8073E420 C8 3F 00 80 */ lfd f1, 0x80(r31) -/* 8073E424 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073E428 90 01 00 44 */ stw r0, 0x44(r1) -/* 8073E42C 3C 00 43 30 */ lis r0, 0x4330 -/* 8073E430 90 01 00 40 */ stw r0, 0x40(r1) -/* 8073E434 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 8073E438 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8073E43C C0 1E 06 24 */ lfs f0, 0x624(r30) -/* 8073E440 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8073E444 FC 00 00 1E */ fctiwz f0, f0 -/* 8073E448 D8 01 00 48 */ stfd f0, 0x48(r1) -/* 8073E44C 80 81 00 4C */ lwz r4, 0x4c(r1) -/* 8073E450 38 A0 00 10 */ li r5, 0x10 -/* 8073E454 4B B3 27 3D */ bl cLib_chaseAngleS__FPsss -/* 8073E458 C0 1E 06 24 */ lfs f0, 0x624(r30) -/* 8073E45C 80 7E 07 1C */ lwz r3, 0x71c(r30) -/* 8073E460 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8073E464 C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 8073E468 C0 5E 07 F8 */ lfs f2, 0x7f8(r30) -/* 8073E46C FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 8073E470 41 82 00 1C */ beq lbl_8073E48C -/* 8073E474 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 8073E478 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 8073E47C EC 00 10 2A */ fadds f0, f0, f2 -/* 8073E480 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073E484 40 80 00 08 */ bge lbl_8073E48C -/* 8073E488 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -lbl_8073E48C: -/* 8073E48C 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8073E490 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 8073E494 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8073E498 7C 08 03 A6 */ mtlr r0 -/* 8073E49C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8073E4A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/JointCallBack__FP8J3DJointi.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/JointCallBack__FP8J3DJointi.s deleted file mode 100644 index 22780b68609..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/JointCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8073D904: -/* 8073D904 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8073D908 7C 08 02 A6 */ mflr r0 -/* 8073D90C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073D910 7C 60 1B 78 */ mr r0, r3 -/* 8073D914 2C 04 00 00 */ cmpwi r4, 0 -/* 8073D918 40 82 00 24 */ bne lbl_8073D93C -/* 8073D91C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8073D920 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8073D924 80 A3 00 38 */ lwz r5, 0x38(r3) -/* 8073D928 80 65 00 14 */ lwz r3, 0x14(r5) -/* 8073D92C 28 03 00 00 */ cmplwi r3, 0 -/* 8073D930 41 82 00 0C */ beq lbl_8073D93C -/* 8073D934 7C 04 03 78 */ mr r4, r0 -/* 8073D938 4B FF FF 19 */ bl ctrlJoint__8daE_PH_cFP8J3DJointP8J3DModel -lbl_8073D93C: -/* 8073D93C 38 60 00 01 */ li r3, 1 -/* 8073D940 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073D944 7C 08 03 A6 */ mtlr r0 -/* 8073D948 38 21 00 10 */ addi r1, r1, 0x10 -/* 8073D94C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ObjHit__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ObjHit__8daE_PH_cFv.s deleted file mode 100644 index 742ad887cbf..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ObjHit__8daE_PH_cFv.s +++ /dev/null @@ -1,153 +0,0 @@ -lbl_80740E70: -/* 80740E70 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80740E74 7C 08 02 A6 */ mflr r0 -/* 80740E78 90 01 00 44 */ stw r0, 0x44(r1) -/* 80740E7C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80740E80 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80740E84 7C 7E 1B 78 */ mr r30, r3 -/* 80740E88 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 80740E8C 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 80740E90 3C 60 80 74 */ lis r3, l_HIO@ha /* 0x80741DD0@ha */ -/* 80740E94 38 63 1D D0 */ addi r3, r3, l_HIO@l /* 0x80741DD0@l */ -/* 80740E98 C0 23 00 08 */ lfs f1, 8(r3) -/* 80740E9C C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80740EA0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80740EA4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80740EA8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80740EAC D0 21 00 28 */ stfs f1, 0x28(r1) -/* 80740EB0 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80740EB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80740EB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740EBC 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80740EC0 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 -/* 80740EC4 41 82 00 14 */ beq lbl_80740ED8 -/* 80740EC8 80 1E 0A 10 */ lwz r0, 0xa10(r30) -/* 80740ECC 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80740ED0 90 1E 0A 10 */ stw r0, 0xa10(r30) -/* 80740ED4 48 00 00 10 */ b lbl_80740EE4 -lbl_80740ED8: -/* 80740ED8 80 1E 0A 10 */ lwz r0, 0xa10(r30) -/* 80740EDC 60 00 00 01 */ ori r0, r0, 1 -/* 80740EE0 90 1E 0A 10 */ stw r0, 0xa10(r30) -lbl_80740EE4: -/* 80740EE4 A8 1E 05 AE */ lha r0, 0x5ae(r30) -/* 80740EE8 2C 00 00 00 */ cmpwi r0, 0 -/* 80740EEC 40 81 00 90 */ ble lbl_80740F7C -/* 80740EF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80740EF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740EF8 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80740EFC 28 1E 00 00 */ cmplwi r30, 0 -/* 80740F00 41 82 00 0C */ beq lbl_80740F0C -/* 80740F04 80 9E 00 04 */ lwz r4, 4(r30) -/* 80740F08 48 00 00 08 */ b lbl_80740F10 -lbl_80740F0C: -/* 80740F0C 38 80 FF FF */ li r4, -1 -lbl_80740F10: -/* 80740F10 38 A1 00 24 */ addi r5, r1, 0x24 -/* 80740F14 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80740F18 81 8C 01 38 */ lwz r12, 0x138(r12) -/* 80740F1C 7D 89 03 A6 */ mtctr r12 -/* 80740F20 4E 80 04 21 */ bctrl -/* 80740F24 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 80740F28 38 80 00 00 */ li r4, 0 -/* 80740F2C 38 A0 01 00 */ li r5, 0x100 -/* 80740F30 4B B2 FC 61 */ bl cLib_chaseAngleS__FPsss -/* 80740F34 38 7E 06 30 */ addi r3, r30, 0x630 -/* 80740F38 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80740F3C C0 5F 00 04 */ lfs f2, 4(r31) -/* 80740F40 4B B2 F8 01 */ bl cLib_chaseF__FPfff -/* 80740F44 38 7E 06 24 */ addi r3, r30, 0x624 -/* 80740F48 C0 3F 01 0C */ lfs f1, 0x10c(r31) -/* 80740F4C C0 5F 00 9C */ lfs f2, 0x9c(r31) -/* 80740F50 4B B2 F7 F1 */ bl cLib_chaseF__FPfff -/* 80740F54 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80740F58 C0 1E 06 30 */ lfs f0, 0x630(r30) -/* 80740F5C EC 01 00 2A */ fadds f0, f1, f0 -/* 80740F60 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80740F64 38 7E 09 74 */ addi r3, r30, 0x974 -/* 80740F68 81 9E 09 B0 */ lwz r12, 0x9b0(r30) -/* 80740F6C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80740F70 7D 89 03 A6 */ mtctr r12 -/* 80740F74 4E 80 04 21 */ bctrl -/* 80740F78 48 00 01 20 */ b lbl_80741098 -lbl_80740F7C: -/* 80740F7C 80 1E 09 8C */ lwz r0, 0x98c(r30) -/* 80740F80 60 00 00 01 */ ori r0, r0, 1 -/* 80740F84 90 1E 09 8C */ stw r0, 0x98c(r30) -/* 80740F88 38 7E 09 74 */ addi r3, r30, 0x974 -/* 80740F8C 4B 94 34 D5 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80740F90 28 03 00 00 */ cmplwi r3, 0 -/* 80740F94 41 82 01 04 */ beq lbl_80741098 -/* 80740F98 38 7E 09 74 */ addi r3, r30, 0x974 -/* 80740F9C 4B 94 35 5D */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80740FA0 90 7E 0A AC */ stw r3, 0xaac(r30) -/* 80740FA4 38 7E 09 74 */ addi r3, r30, 0x974 -/* 80740FA8 4B 94 35 51 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80740FAC C0 1F 01 10 */ lfs f0, 0x110(r31) -/* 80740FB0 D0 1E 06 30 */ stfs f0, 0x630(r30) -/* 80740FB4 38 00 00 0F */ li r0, 0xf -/* 80740FB8 B0 1E 05 AE */ sth r0, 0x5ae(r30) -/* 80740FBC 38 80 10 00 */ li r4, 0x1000 -/* 80740FC0 B0 9E 06 16 */ sth r4, 0x616(r30) -/* 80740FC4 B0 9E 06 18 */ sth r4, 0x618(r30) -/* 80740FC8 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80740FCC 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 -/* 80740FD0 41 82 00 28 */ beq lbl_80740FF8 -/* 80740FD4 B0 9E 06 16 */ sth r4, 0x616(r30) -/* 80740FD8 B0 9E 06 18 */ sth r4, 0x618(r30) -/* 80740FDC 7F C3 F3 78 */ mr r3, r30 -/* 80740FE0 38 80 00 0B */ li r4, 0xb -/* 80740FE4 38 A0 00 00 */ li r5, 0 -/* 80740FE8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80740FEC FC 40 08 90 */ fmr f2, f1 -/* 80740FF0 4B FF CB 39 */ bl SetAnm__8daE_PH_cFiiff -/* 80740FF4 48 00 00 1C */ b lbl_80741010 -lbl_80740FF8: -/* 80740FF8 7F C3 F3 78 */ mr r3, r30 -/* 80740FFC 38 80 00 06 */ li r4, 6 -/* 80741000 38 A0 00 00 */ li r5, 0 -/* 80741004 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80741008 FC 40 08 90 */ fmr f2, f1 -/* 8074100C 4B FF CB 1D */ bl SetAnm__8daE_PH_cFiiff -lbl_80741010: -/* 80741010 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80741014 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80741018 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 8074101C 38 80 00 00 */ li r4, 0 -/* 80741020 90 81 00 08 */ stw r4, 8(r1) -/* 80741024 38 00 FF FF */ li r0, -1 -/* 80741028 90 01 00 0C */ stw r0, 0xc(r1) -/* 8074102C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80741030 90 81 00 14 */ stw r4, 0x14(r1) -/* 80741034 90 81 00 18 */ stw r4, 0x18(r1) -/* 80741038 38 80 00 00 */ li r4, 0 -/* 8074103C 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000878E@ha */ -/* 80741040 38 A5 87 8E */ addi r5, r5, 0x878E /* 0x0000878E@l */ -/* 80741044 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80741048 38 FE 01 0C */ addi r7, r30, 0x10c -/* 8074104C 39 1E 04 E4 */ addi r8, r30, 0x4e4 -/* 80741050 39 20 00 00 */ li r9, 0 -/* 80741054 39 40 00 FF */ li r10, 0xff -/* 80741058 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8074105C 4B 90 BA 35 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80741060 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070461@ha */ -/* 80741064 38 03 04 61 */ addi r0, r3, 0x0461 /* 0x00070461@l */ -/* 80741068 90 01 00 20 */ stw r0, 0x20(r1) -/* 8074106C 38 7E 06 74 */ addi r3, r30, 0x674 -/* 80741070 38 81 00 20 */ addi r4, r1, 0x20 -/* 80741074 38 A0 00 00 */ li r5, 0 -/* 80741078 38 C0 FF FF */ li r6, -1 -/* 8074107C 81 9E 06 74 */ lwz r12, 0x674(r30) -/* 80741080 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80741084 7D 89 03 A6 */ mtctr r12 -/* 80741088 4E 80 04 21 */ bctrl -/* 8074108C 80 1E 09 8C */ lwz r0, 0x98c(r30) -/* 80741090 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80741094 90 1E 09 8C */ stw r0, 0x98c(r30) -lbl_80741098: -/* 80741098 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 8074109C 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 807410A0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 807410A4 7C 08 03 A6 */ mtlr r0 -/* 807410A8 38 21 00 40 */ addi r1, r1, 0x40 -/* 807410AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_Action__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_Action__8daE_PH_cFv.s deleted file mode 100644 index c276e81b163..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_Action__8daE_PH_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8073FB70: -/* 8073FB70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8073FB74 7C 08 02 A6 */ mflr r0 -/* 8073FB78 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073FB7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8073FB80 7C 7F 1B 78 */ mr r31, r3 -/* 8073FB84 4B FF F6 CD */ bl S_CheckPoint__8daE_PH_cFv -/* 8073FB88 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8073FB8C 41 82 00 0C */ beq lbl_8073FB98 -/* 8073FB90 7F E3 FB 78 */ mr r3, r31 -/* 8073FB94 4B FF F8 41 */ bl S_SetAngle__8daE_PH_cFv -lbl_8073FB98: -/* 8073FB98 7F E3 FB 78 */ mr r3, r31 -/* 8073FB9C 4B FF E2 5D */ bl FlyAnm__8daE_PH_cFv -/* 8073FBA0 A8 1F 05 AC */ lha r0, 0x5ac(r31) -/* 8073FBA4 2C 00 00 00 */ cmpwi r0, 0 -/* 8073FBA8 40 81 00 18 */ ble lbl_8073FBC0 -/* 8073FBAC 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073FBB0 C0 03 1B F4 */ lfs f0, lit_3767@l(r3) /* 0x80741BF4@l */ -/* 8073FBB4 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 8073FBB8 D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 8073FBBC 48 00 00 0C */ b lbl_8073FBC8 -lbl_8073FBC0: -/* 8073FBC0 7F E3 FB 78 */ mr r3, r31 -/* 8073FBC4 4B FF F2 A5 */ bl S_GoTarget__8daE_PH_cFv -lbl_8073FBC8: -/* 8073FBC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8073FBCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073FBD0 7C 08 03 A6 */ mtlr r0 -/* 8073FBD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8073FBD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_CheckPoint__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_CheckPoint__8daE_PH_cFv.s deleted file mode 100644 index 08692db402a..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_CheckPoint__8daE_PH_cFv.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_8073F250: -/* 8073F250 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8073F254 7C 08 02 A6 */ mflr r0 -/* 8073F258 90 01 00 24 */ stw r0, 0x24(r1) -/* 8073F25C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8073F260 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8073F264 7C 7E 1B 78 */ mr r30, r3 -/* 8073F268 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073F26C 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073F270 C0 5E 06 50 */ lfs f2, 0x650(r30) -/* 8073F274 C0 3E 06 4C */ lfs f1, 0x64c(r30) -/* 8073F278 C0 1E 06 48 */ lfs f0, 0x648(r30) -/* 8073F27C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8073F280 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8073F284 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 8073F288 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 8073F28C 38 81 00 0C */ addi r4, r1, 0xc -/* 8073F290 4B C0 81 0D */ bl PSVECSquareDistance -/* 8073F294 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073F298 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F29C 40 81 00 58 */ ble lbl_8073F2F4 -/* 8073F2A0 FC 00 08 34 */ frsqrte f0, f1 -/* 8073F2A4 C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073F2A8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F2AC C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073F2B0 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F2B4 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F2B8 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F2BC FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F2C0 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F2C4 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F2C8 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F2CC FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F2D0 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F2D4 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F2D8 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F2DC FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F2E0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F2E4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F2E8 FC 21 00 32 */ fmul f1, f1, f0 -/* 8073F2EC FC 20 08 18 */ frsp f1, f1 -/* 8073F2F0 48 00 00 88 */ b lbl_8073F378 -lbl_8073F2F4: -/* 8073F2F4 C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073F2F8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F2FC 40 80 00 10 */ bge lbl_8073F30C -/* 8073F300 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F304 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073F308 48 00 00 70 */ b lbl_8073F378 -lbl_8073F30C: -/* 8073F30C D0 21 00 08 */ stfs f1, 8(r1) -/* 8073F310 80 81 00 08 */ lwz r4, 8(r1) -/* 8073F314 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073F318 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073F31C 7C 03 00 00 */ cmpw r3, r0 -/* 8073F320 41 82 00 14 */ beq lbl_8073F334 -/* 8073F324 40 80 00 40 */ bge lbl_8073F364 -/* 8073F328 2C 03 00 00 */ cmpwi r3, 0 -/* 8073F32C 41 82 00 20 */ beq lbl_8073F34C -/* 8073F330 48 00 00 34 */ b lbl_8073F364 -lbl_8073F334: -/* 8073F334 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F338 41 82 00 0C */ beq lbl_8073F344 -/* 8073F33C 38 00 00 01 */ li r0, 1 -/* 8073F340 48 00 00 28 */ b lbl_8073F368 -lbl_8073F344: -/* 8073F344 38 00 00 02 */ li r0, 2 -/* 8073F348 48 00 00 20 */ b lbl_8073F368 -lbl_8073F34C: -/* 8073F34C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F350 41 82 00 0C */ beq lbl_8073F35C -/* 8073F354 38 00 00 05 */ li r0, 5 -/* 8073F358 48 00 00 10 */ b lbl_8073F368 -lbl_8073F35C: -/* 8073F35C 38 00 00 03 */ li r0, 3 -/* 8073F360 48 00 00 08 */ b lbl_8073F368 -lbl_8073F364: -/* 8073F364 38 00 00 04 */ li r0, 4 -lbl_8073F368: -/* 8073F368 2C 00 00 01 */ cmpwi r0, 1 -/* 8073F36C 40 82 00 0C */ bne lbl_8073F378 -/* 8073F370 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F374 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8073F378: -/* 8073F378 C0 1F 00 C4 */ lfs f0, 0xc4(r31) -/* 8073F37C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F380 40 80 00 38 */ bge lbl_8073F3B8 -/* 8073F384 A8 1E 05 AC */ lha r0, 0x5ac(r30) -/* 8073F388 2C 00 00 00 */ cmpwi r0, 0 -/* 8073F38C 40 82 00 2C */ bne lbl_8073F3B8 -/* 8073F390 88 1E 06 62 */ lbz r0, 0x662(r30) -/* 8073F394 28 00 00 00 */ cmplwi r0, 0 -/* 8073F398 41 82 00 10 */ beq lbl_8073F3A8 -/* 8073F39C 7F C3 F3 78 */ mr r3, r30 -/* 8073F3A0 4B FF F9 B9 */ bl SearchBackPos__8daE_PH_cFv -/* 8073F3A4 48 00 00 0C */ b lbl_8073F3B0 -lbl_8073F3A8: -/* 8073F3A8 7F C3 F3 78 */ mr r3, r30 -/* 8073F3AC 4B FF F9 61 */ bl SearchNextPos__8daE_PH_cFv -lbl_8073F3B0: -/* 8073F3B0 38 60 00 01 */ li r3, 1 -/* 8073F3B4 48 00 00 08 */ b lbl_8073F3BC -lbl_8073F3B8: -/* 8073F3B8 38 60 00 00 */ li r3, 0 -lbl_8073F3BC: -/* 8073F3BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8073F3C0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8073F3C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8073F3C8 7C 08 03 A6 */ mtlr r0 -/* 8073F3CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8073F3D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_GoTarget__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_GoTarget__8daE_PH_cFv.s deleted file mode 100644 index 076904c22cc..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_GoTarget__8daE_PH_cFv.s +++ /dev/null @@ -1,272 +0,0 @@ -lbl_8073EE68: -/* 8073EE68 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8073EE6C 7C 08 02 A6 */ mflr r0 -/* 8073EE70 90 01 00 74 */ stw r0, 0x74(r1) -/* 8073EE74 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 8073EE78 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 8073EE7C 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8073EE80 93 C1 00 58 */ stw r30, 0x58(r1) -/* 8073EE84 7C 7E 1B 78 */ mr r30, r3 -/* 8073EE88 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073EE8C 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073EE90 C0 5E 06 50 */ lfs f2, 0x650(r30) -/* 8073EE94 C0 3E 06 4C */ lfs f1, 0x64c(r30) -/* 8073EE98 C0 1E 06 48 */ lfs f0, 0x648(r30) -/* 8073EE9C D0 01 00 34 */ stfs f0, 0x34(r1) -/* 8073EEA0 D0 21 00 38 */ stfs f1, 0x38(r1) -/* 8073EEA4 D0 41 00 3C */ stfs f2, 0x3c(r1) -/* 8073EEA8 C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 8073EEAC C0 5E 07 F8 */ lfs f2, 0x7f8(r30) -/* 8073EEB0 FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 8073EEB4 41 82 00 1C */ beq lbl_8073EED0 -/* 8073EEB8 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 8073EEBC C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 8073EEC0 EC 00 10 2A */ fadds f0, f0, f2 -/* 8073EEC4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073EEC8 40 80 00 08 */ bge lbl_8073EED0 -/* 8073EECC D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -lbl_8073EED0: -/* 8073EED0 C0 5E 06 50 */ lfs f2, 0x650(r30) -/* 8073EED4 C0 3E 06 4C */ lfs f1, 0x64c(r30) -/* 8073EED8 C0 1E 06 48 */ lfs f0, 0x648(r30) -/* 8073EEDC D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8073EEE0 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 8073EEE4 D0 41 00 30 */ stfs f2, 0x30(r1) -/* 8073EEE8 38 7E 05 2C */ addi r3, r30, 0x52c -/* 8073EEEC C0 3E 06 38 */ lfs f1, 0x638(r30) -/* 8073EEF0 C0 5F 00 BC */ lfs f2, 0xbc(r31) -/* 8073EEF4 C0 7F 00 8C */ lfs f3, 0x8c(r31) -/* 8073EEF8 4B B3 0B 45 */ bl cLib_addCalc2__FPffff -/* 8073EEFC C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 8073EF00 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 8073EF04 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8073EF08 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8073EF0C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 8073EF10 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 8073EF14 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8073EF18 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8073EF1C D0 21 00 20 */ stfs f1, 0x20(r1) -/* 8073EF20 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8073EF24 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8073EF28 38 61 00 10 */ addi r3, r1, 0x10 -/* 8073EF2C 38 81 00 1C */ addi r4, r1, 0x1c -/* 8073EF30 4B C0 84 6D */ bl PSVECSquareDistance -/* 8073EF34 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073EF38 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073EF3C 40 81 00 58 */ ble lbl_8073EF94 -/* 8073EF40 FC 00 08 34 */ frsqrte f0, f1 -/* 8073EF44 C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073EF48 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073EF4C C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073EF50 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073EF54 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073EF58 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073EF5C FC 02 00 32 */ fmul f0, f2, f0 -/* 8073EF60 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073EF64 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073EF68 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073EF6C FC 03 00 28 */ fsub f0, f3, f0 -/* 8073EF70 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073EF74 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073EF78 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073EF7C FC 01 00 32 */ fmul f0, f1, f0 -/* 8073EF80 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073EF84 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073EF88 FC 21 00 32 */ fmul f1, f1, f0 -/* 8073EF8C FC 20 08 18 */ frsp f1, f1 -/* 8073EF90 48 00 00 88 */ b lbl_8073F018 -lbl_8073EF94: -/* 8073EF94 C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073EF98 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073EF9C 40 80 00 10 */ bge lbl_8073EFAC -/* 8073EFA0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073EFA4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073EFA8 48 00 00 70 */ b lbl_8073F018 -lbl_8073EFAC: -/* 8073EFAC D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8073EFB0 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8073EFB4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073EFB8 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073EFBC 7C 03 00 00 */ cmpw r3, r0 -/* 8073EFC0 41 82 00 14 */ beq lbl_8073EFD4 -/* 8073EFC4 40 80 00 40 */ bge lbl_8073F004 -/* 8073EFC8 2C 03 00 00 */ cmpwi r3, 0 -/* 8073EFCC 41 82 00 20 */ beq lbl_8073EFEC -/* 8073EFD0 48 00 00 34 */ b lbl_8073F004 -lbl_8073EFD4: -/* 8073EFD4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073EFD8 41 82 00 0C */ beq lbl_8073EFE4 -/* 8073EFDC 38 00 00 01 */ li r0, 1 -/* 8073EFE0 48 00 00 28 */ b lbl_8073F008 -lbl_8073EFE4: -/* 8073EFE4 38 00 00 02 */ li r0, 2 -/* 8073EFE8 48 00 00 20 */ b lbl_8073F008 -lbl_8073EFEC: -/* 8073EFEC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073EFF0 41 82 00 0C */ beq lbl_8073EFFC -/* 8073EFF4 38 00 00 05 */ li r0, 5 -/* 8073EFF8 48 00 00 10 */ b lbl_8073F008 -lbl_8073EFFC: -/* 8073EFFC 38 00 00 03 */ li r0, 3 -/* 8073F000 48 00 00 08 */ b lbl_8073F008 -lbl_8073F004: -/* 8073F004 38 00 00 04 */ li r0, 4 -lbl_8073F008: -/* 8073F008 2C 00 00 01 */ cmpwi r0, 1 -/* 8073F00C 40 82 00 0C */ bne lbl_8073F018 -/* 8073F010 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F014 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8073F018: -/* 8073F018 C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 8073F01C EC 01 00 24 */ fdivs f0, f1, f0 -/* 8073F020 FC 00 00 1E */ fctiwz f0, f0 -/* 8073F024 D8 01 00 40 */ stfd f0, 0x40(r1) -/* 8073F028 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8073F02C 2C 00 00 00 */ cmpwi r0, 0 -/* 8073F030 40 82 00 08 */ bne lbl_8073F038 -/* 8073F034 38 00 00 01 */ li r0, 1 -lbl_8073F038: -/* 8073F038 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 8073F03C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8073F040 EC 41 00 28 */ fsubs f2, f1, f0 -/* 8073F044 C8 3F 00 80 */ lfd f1, 0x80(r31) -/* 8073F048 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073F04C 90 01 00 4C */ stw r0, 0x4c(r1) -/* 8073F050 3C 00 43 30 */ lis r0, 0x4330 -/* 8073F054 90 01 00 48 */ stw r0, 0x48(r1) -/* 8073F058 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 8073F05C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073F060 EC 02 00 24 */ fdivs f0, f2, f0 -/* 8073F064 D0 1E 06 34 */ stfs f0, 0x634(r30) -/* 8073F068 C0 3E 06 54 */ lfs f1, 0x654(r30) -/* 8073F06C C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8073F070 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073F074 40 82 01 48 */ bne lbl_8073F1BC -/* 8073F078 C0 3E 06 5C */ lfs f1, 0x65c(r30) -/* 8073F07C C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8073F080 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073F084 40 82 01 38 */ bne lbl_8073F1BC -/* 8073F088 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 8073F08C 38 81 00 28 */ addi r4, r1, 0x28 -/* 8073F090 4B C0 83 0D */ bl PSVECSquareDistance -/* 8073F094 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073F098 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F09C 40 81 00 58 */ ble lbl_8073F0F4 -/* 8073F0A0 FC 00 08 34 */ frsqrte f0, f1 -/* 8073F0A4 C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073F0A8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F0AC C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073F0B0 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F0B4 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F0B8 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F0BC FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F0C0 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F0C4 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F0C8 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F0CC FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F0D0 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F0D4 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F0D8 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F0DC FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F0E0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F0E4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F0E8 FC 21 00 32 */ fmul f1, f1, f0 -/* 8073F0EC FC 20 08 18 */ frsp f1, f1 -/* 8073F0F0 48 00 00 88 */ b lbl_8073F178 -lbl_8073F0F4: -/* 8073F0F4 C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073F0F8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F0FC 40 80 00 10 */ bge lbl_8073F10C -/* 8073F100 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F104 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073F108 48 00 00 70 */ b lbl_8073F178 -lbl_8073F10C: -/* 8073F10C D0 21 00 08 */ stfs f1, 8(r1) -/* 8073F110 80 81 00 08 */ lwz r4, 8(r1) -/* 8073F114 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073F118 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073F11C 7C 03 00 00 */ cmpw r3, r0 -/* 8073F120 41 82 00 14 */ beq lbl_8073F134 -/* 8073F124 40 80 00 40 */ bge lbl_8073F164 -/* 8073F128 2C 03 00 00 */ cmpwi r3, 0 -/* 8073F12C 41 82 00 20 */ beq lbl_8073F14C -/* 8073F130 48 00 00 34 */ b lbl_8073F164 -lbl_8073F134: -/* 8073F134 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F138 41 82 00 0C */ beq lbl_8073F144 -/* 8073F13C 38 00 00 01 */ li r0, 1 -/* 8073F140 48 00 00 28 */ b lbl_8073F168 -lbl_8073F144: -/* 8073F144 38 00 00 02 */ li r0, 2 -/* 8073F148 48 00 00 20 */ b lbl_8073F168 -lbl_8073F14C: -/* 8073F14C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F150 41 82 00 0C */ beq lbl_8073F15C -/* 8073F154 38 00 00 05 */ li r0, 5 -/* 8073F158 48 00 00 10 */ b lbl_8073F168 -lbl_8073F15C: -/* 8073F15C 38 00 00 03 */ li r0, 3 -/* 8073F160 48 00 00 08 */ b lbl_8073F168 -lbl_8073F164: -/* 8073F164 38 00 00 04 */ li r0, 4 -lbl_8073F168: -/* 8073F168 2C 00 00 01 */ cmpwi r0, 1 -/* 8073F16C 40 82 00 0C */ bne lbl_8073F178 -/* 8073F170 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F174 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8073F178: -/* 8073F178 C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 8073F17C EC 01 00 24 */ fdivs f0, f1, f0 -/* 8073F180 FC 00 00 1E */ fctiwz f0, f0 -/* 8073F184 D8 01 00 48 */ stfd f0, 0x48(r1) -/* 8073F188 80 01 00 4C */ lwz r0, 0x4c(r1) -/* 8073F18C C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 8073F190 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8073F194 EC 41 00 28 */ fsubs f2, f1, f0 -/* 8073F198 C8 3F 00 80 */ lfd f1, 0x80(r31) -/* 8073F19C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073F1A0 90 01 00 44 */ stw r0, 0x44(r1) -/* 8073F1A4 3C 00 43 30 */ lis r0, 0x4330 -/* 8073F1A8 90 01 00 40 */ stw r0, 0x40(r1) -/* 8073F1AC C8 01 00 40 */ lfd f0, 0x40(r1) -/* 8073F1B0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073F1B4 EC 02 00 24 */ fdivs f0, f2, f0 -/* 8073F1B8 D0 1E 06 34 */ stfs f0, 0x634(r30) -lbl_8073F1BC: -/* 8073F1BC C3 FE 04 D4 */ lfs f31, 0x4d4(r30) -/* 8073F1C0 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 8073F1C4 38 81 00 28 */ addi r4, r1, 0x28 -/* 8073F1C8 C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 8073F1CC 4B B3 15 E1 */ bl cLib_chasePos__FP4cXyzRC4cXyzf -/* 8073F1D0 D3 FE 04 D4 */ stfs f31, 0x4d4(r30) -/* 8073F1D4 38 7E 04 FC */ addi r3, r30, 0x4fc -/* 8073F1D8 C0 3E 06 34 */ lfs f1, 0x634(r30) -/* 8073F1DC C0 5F 00 C0 */ lfs f2, 0xc0(r31) -/* 8073F1E0 C0 7F 00 88 */ lfs f3, 0x88(r31) -/* 8073F1E4 4B B3 08 59 */ bl cLib_addCalc2__FPffff -/* 8073F1E8 38 7E 06 12 */ addi r3, r30, 0x612 -/* 8073F1EC A8 1E 06 10 */ lha r0, 0x610(r30) -/* 8073F1F0 C8 3F 00 80 */ lfd f1, 0x80(r31) -/* 8073F1F4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073F1F8 90 01 00 4C */ stw r0, 0x4c(r1) -/* 8073F1FC 3C 00 43 30 */ lis r0, 0x4330 -/* 8073F200 90 01 00 48 */ stw r0, 0x48(r1) -/* 8073F204 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 8073F208 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8073F20C C0 1E 06 24 */ lfs f0, 0x624(r30) -/* 8073F210 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8073F214 FC 00 00 1E */ fctiwz f0, f0 -/* 8073F218 D8 01 00 40 */ stfd f0, 0x40(r1) -/* 8073F21C 80 81 00 44 */ lwz r4, 0x44(r1) -/* 8073F220 38 A0 00 10 */ li r5, 0x10 -/* 8073F224 4B B3 19 6D */ bl cLib_chaseAngleS__FPsss -/* 8073F228 7F C3 F3 78 */ mr r3, r30 -/* 8073F22C 4B FF FB 75 */ bl S_SetPlaySpeed__8daE_PH_cFv -/* 8073F230 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 8073F234 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 8073F238 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8073F23C 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 8073F240 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8073F244 7C 08 03 A6 */ mtlr r0 -/* 8073F248 38 21 00 70 */ addi r1, r1, 0x70 -/* 8073F24C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetAngle__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetAngle__8daE_PH_cFv.s deleted file mode 100644 index 6fede334a5a..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetAngle__8daE_PH_cFv.s +++ /dev/null @@ -1,349 +0,0 @@ -lbl_8073F3D4: -/* 8073F3D4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8073F3D8 7C 08 02 A6 */ mflr r0 -/* 8073F3DC 90 01 00 74 */ stw r0, 0x74(r1) -/* 8073F3E0 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 8073F3E4 93 C1 00 68 */ stw r30, 0x68(r1) -/* 8073F3E8 7C 7E 1B 78 */ mr r30, r3 -/* 8073F3EC 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073F3F0 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073F3F4 C0 5E 06 50 */ lfs f2, 0x650(r30) -/* 8073F3F8 C0 3E 06 4C */ lfs f1, 0x64c(r30) -/* 8073F3FC C0 1E 06 48 */ lfs f0, 0x648(r30) -/* 8073F400 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 8073F404 D0 21 00 48 */ stfs f1, 0x48(r1) -/* 8073F408 D0 41 00 4C */ stfs f2, 0x4c(r1) -/* 8073F40C C0 1E 06 48 */ lfs f0, 0x648(r30) -/* 8073F410 D0 1E 06 54 */ stfs f0, 0x654(r30) -/* 8073F414 C0 1E 06 4C */ lfs f0, 0x64c(r30) -/* 8073F418 D0 1E 06 58 */ stfs f0, 0x658(r30) -/* 8073F41C C0 1E 06 50 */ lfs f0, 0x650(r30) -/* 8073F420 D0 1E 06 5C */ stfs f0, 0x65c(r30) -/* 8073F424 80 7E 06 44 */ lwz r3, 0x644(r30) -/* 8073F428 80 9E 06 2C */ lwz r4, 0x62c(r30) -/* 8073F42C 4B 91 23 85 */ bl dPath_GetPnt__FPC5dPathi -/* 8073F430 C0 03 00 04 */ lfs f0, 4(r3) -/* 8073F434 D0 1E 06 48 */ stfs f0, 0x648(r30) -/* 8073F438 C0 03 00 08 */ lfs f0, 8(r3) -/* 8073F43C D0 1E 06 4C */ stfs f0, 0x64c(r30) -/* 8073F440 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8073F444 D0 1E 06 50 */ stfs f0, 0x650(r30) -/* 8073F448 C0 7E 06 50 */ lfs f3, 0x650(r30) -/* 8073F44C C0 5E 06 4C */ lfs f2, 0x64c(r30) -/* 8073F450 C0 3E 06 48 */ lfs f1, 0x648(r30) -/* 8073F454 D0 21 00 38 */ stfs f1, 0x38(r1) -/* 8073F458 D0 41 00 3C */ stfs f2, 0x3c(r1) -/* 8073F45C D0 61 00 40 */ stfs f3, 0x40(r1) -/* 8073F460 C0 01 00 44 */ lfs f0, 0x44(r1) -/* 8073F464 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8073F468 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 8073F46C C0 01 00 48 */ lfs f0, 0x48(r1) -/* 8073F470 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8073F474 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8073F478 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 8073F47C EC 43 00 28 */ fsubs f2, f3, f0 -/* 8073F480 D0 41 00 34 */ stfs f2, 0x34(r1) -/* 8073F484 4B B2 81 F1 */ bl cM_atan2s__Fff -/* 8073F488 B0 7E 06 1E */ sth r3, 0x61e(r30) -/* 8073F48C C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8073F490 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8073F494 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073F498 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8073F49C C0 01 00 34 */ lfs f0, 0x34(r1) -/* 8073F4A0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8073F4A4 38 61 00 20 */ addi r3, r1, 0x20 -/* 8073F4A8 4B C0 7C 91 */ bl PSVECSquareMag -/* 8073F4AC C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073F4B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F4B4 40 81 00 58 */ ble lbl_8073F50C -/* 8073F4B8 FC 00 08 34 */ frsqrte f0, f1 -/* 8073F4BC C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073F4C0 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F4C4 C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073F4C8 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F4CC FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F4D0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F4D4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F4D8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F4DC FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F4E0 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F4E4 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F4E8 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F4EC FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F4F0 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F4F4 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F4F8 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F4FC FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F500 FC 41 00 32 */ fmul f2, f1, f0 -/* 8073F504 FC 40 10 18 */ frsp f2, f2 -/* 8073F508 48 00 00 90 */ b lbl_8073F598 -lbl_8073F50C: -/* 8073F50C C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073F510 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F514 40 80 00 10 */ bge lbl_8073F524 -/* 8073F518 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F51C C0 43 0A E0 */ lfs f2, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073F520 48 00 00 78 */ b lbl_8073F598 -lbl_8073F524: -/* 8073F524 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8073F528 80 81 00 10 */ lwz r4, 0x10(r1) -/* 8073F52C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073F530 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073F534 7C 03 00 00 */ cmpw r3, r0 -/* 8073F538 41 82 00 14 */ beq lbl_8073F54C -/* 8073F53C 40 80 00 40 */ bge lbl_8073F57C -/* 8073F540 2C 03 00 00 */ cmpwi r3, 0 -/* 8073F544 41 82 00 20 */ beq lbl_8073F564 -/* 8073F548 48 00 00 34 */ b lbl_8073F57C -lbl_8073F54C: -/* 8073F54C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F550 41 82 00 0C */ beq lbl_8073F55C -/* 8073F554 38 00 00 01 */ li r0, 1 -/* 8073F558 48 00 00 28 */ b lbl_8073F580 -lbl_8073F55C: -/* 8073F55C 38 00 00 02 */ li r0, 2 -/* 8073F560 48 00 00 20 */ b lbl_8073F580 -lbl_8073F564: -/* 8073F564 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F568 41 82 00 0C */ beq lbl_8073F574 -/* 8073F56C 38 00 00 05 */ li r0, 5 -/* 8073F570 48 00 00 10 */ b lbl_8073F580 -lbl_8073F574: -/* 8073F574 38 00 00 03 */ li r0, 3 -/* 8073F578 48 00 00 08 */ b lbl_8073F580 -lbl_8073F57C: -/* 8073F57C 38 00 00 04 */ li r0, 4 -lbl_8073F580: -/* 8073F580 2C 00 00 01 */ cmpwi r0, 1 -/* 8073F584 40 82 00 10 */ bne lbl_8073F594 -/* 8073F588 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F58C C0 43 0A E0 */ lfs f2, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073F590 48 00 00 08 */ b lbl_8073F598 -lbl_8073F594: -/* 8073F594 FC 40 08 90 */ fmr f2, f1 -lbl_8073F598: -/* 8073F598 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 8073F59C 4B B2 80 D9 */ bl cM_atan2s__Fff -/* 8073F5A0 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c -/* 8073F5A4 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8073F5A8 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8073F5AC 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8073F5B0 FC 80 02 10 */ fabs f4, f0 -/* 8073F5B4 3C 60 80 74 */ lis r3, l_HIO@ha /* 0x80741DD0@ha */ -/* 8073F5B8 38 83 1D D0 */ addi r4, r3, l_HIO@l /* 0x80741DD0@l */ -/* 8073F5BC C0 24 00 10 */ lfs f1, 0x10(r4) -/* 8073F5C0 88 1E 06 63 */ lbz r0, 0x663(r30) -/* 8073F5C4 C8 7F 00 A8 */ lfd f3, 0xa8(r31) -/* 8073F5C8 90 01 00 54 */ stw r0, 0x54(r1) -/* 8073F5CC 3C 60 43 30 */ lis r3, 0x4330 -/* 8073F5D0 90 61 00 50 */ stw r3, 0x50(r1) -/* 8073F5D4 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 8073F5D8 EC 00 18 28 */ fsubs f0, f0, f3 -/* 8073F5DC EC 41 00 2A */ fadds f2, f1, f0 -/* 8073F5E0 C0 3F 00 98 */ lfs f1, 0x98(r31) -/* 8073F5E4 FC 00 20 18 */ frsp f0, f4 -/* 8073F5E8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8073F5EC EC 02 00 32 */ fmuls f0, f2, f0 -/* 8073F5F0 D0 1E 06 38 */ stfs f0, 0x638(r30) -/* 8073F5F4 C0 21 00 44 */ lfs f1, 0x44(r1) -/* 8073F5F8 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 8073F5FC FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073F600 40 82 00 34 */ bne lbl_8073F634 -/* 8073F604 C0 21 00 4C */ lfs f1, 0x4c(r1) -/* 8073F608 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 8073F60C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073F610 40 82 00 24 */ bne lbl_8073F634 -/* 8073F614 C0 24 00 10 */ lfs f1, 0x10(r4) -/* 8073F618 88 1E 06 63 */ lbz r0, 0x663(r30) -/* 8073F61C 90 01 00 54 */ stw r0, 0x54(r1) -/* 8073F620 90 61 00 50 */ stw r3, 0x50(r1) -/* 8073F624 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 8073F628 EC 00 18 28 */ fsubs f0, f0, f3 -/* 8073F62C EC 01 00 2A */ fadds f0, f1, f0 -/* 8073F630 D0 1E 06 38 */ stfs f0, 0x638(r30) -lbl_8073F634: -/* 8073F634 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8073F638 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8073F63C C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073F640 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8073F644 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 8073F648 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8073F64C 38 61 00 14 */ addi r3, r1, 0x14 -/* 8073F650 4B C0 7A E9 */ bl PSVECSquareMag -/* 8073F654 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073F658 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F65C 40 81 00 58 */ ble lbl_8073F6B4 -/* 8073F660 FC 00 08 34 */ frsqrte f0, f1 -/* 8073F664 C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073F668 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F66C C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073F670 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F674 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F678 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F67C FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F680 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F684 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F688 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F68C FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F690 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F694 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F698 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F69C FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F6A0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F6A4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F6A8 FC 41 00 32 */ fmul f2, f1, f0 -/* 8073F6AC FC 40 10 18 */ frsp f2, f2 -/* 8073F6B0 48 00 00 90 */ b lbl_8073F740 -lbl_8073F6B4: -/* 8073F6B4 C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073F6B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F6BC 40 80 00 10 */ bge lbl_8073F6CC -/* 8073F6C0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F6C4 C0 43 0A E0 */ lfs f2, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073F6C8 48 00 00 78 */ b lbl_8073F740 -lbl_8073F6CC: -/* 8073F6CC D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8073F6D0 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8073F6D4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073F6D8 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073F6DC 7C 03 00 00 */ cmpw r3, r0 -/* 8073F6E0 41 82 00 14 */ beq lbl_8073F6F4 -/* 8073F6E4 40 80 00 40 */ bge lbl_8073F724 -/* 8073F6E8 2C 03 00 00 */ cmpwi r3, 0 -/* 8073F6EC 41 82 00 20 */ beq lbl_8073F70C -/* 8073F6F0 48 00 00 34 */ b lbl_8073F724 -lbl_8073F6F4: -/* 8073F6F4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F6F8 41 82 00 0C */ beq lbl_8073F704 -/* 8073F6FC 38 00 00 01 */ li r0, 1 -/* 8073F700 48 00 00 28 */ b lbl_8073F728 -lbl_8073F704: -/* 8073F704 38 00 00 02 */ li r0, 2 -/* 8073F708 48 00 00 20 */ b lbl_8073F728 -lbl_8073F70C: -/* 8073F70C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F710 41 82 00 0C */ beq lbl_8073F71C -/* 8073F714 38 00 00 05 */ li r0, 5 -/* 8073F718 48 00 00 10 */ b lbl_8073F728 -lbl_8073F71C: -/* 8073F71C 38 00 00 03 */ li r0, 3 -/* 8073F720 48 00 00 08 */ b lbl_8073F728 -lbl_8073F724: -/* 8073F724 38 00 00 04 */ li r0, 4 -lbl_8073F728: -/* 8073F728 2C 00 00 01 */ cmpwi r0, 1 -/* 8073F72C 40 82 00 10 */ bne lbl_8073F73C -/* 8073F730 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F734 C0 43 0A E0 */ lfs f2, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073F738 48 00 00 08 */ b lbl_8073F740 -lbl_8073F73C: -/* 8073F73C FC 40 08 90 */ fmr f2, f1 -lbl_8073F740: -/* 8073F740 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 8073F744 4B B2 7F 31 */ bl cM_atan2s__Fff -/* 8073F748 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c -/* 8073F74C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8073F750 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8073F754 7C 43 04 2E */ lfsx f2, r3, r0 -/* 8073F758 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8073F75C C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 8073F760 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 8073F764 EC 01 00 2A */ fadds f0, f1, f0 -/* 8073F768 D0 1E 06 20 */ stfs f0, 0x620(r30) -/* 8073F76C C0 3E 06 20 */ lfs f1, 0x620(r30) -/* 8073F770 C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 8073F774 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F778 40 80 00 08 */ bge lbl_8073F780 -/* 8073F77C D0 1E 06 20 */ stfs f0, 0x620(r30) -lbl_8073F780: -/* 8073F780 38 61 00 44 */ addi r3, r1, 0x44 -/* 8073F784 38 81 00 38 */ addi r4, r1, 0x38 -/* 8073F788 4B C0 7C 15 */ bl PSVECSquareDistance -/* 8073F78C C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073F790 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F794 40 81 00 58 */ ble lbl_8073F7EC -/* 8073F798 FC 00 08 34 */ frsqrte f0, f1 -/* 8073F79C C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073F7A0 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F7A4 C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073F7A8 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F7AC FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F7B0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F7B4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F7B8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F7BC FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F7C0 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F7C4 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F7C8 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F7CC FC 44 00 32 */ fmul f2, f4, f0 -/* 8073F7D0 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073F7D4 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073F7D8 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073F7DC FC 02 00 32 */ fmul f0, f2, f0 -/* 8073F7E0 FC 21 00 32 */ fmul f1, f1, f0 -/* 8073F7E4 FC 20 08 18 */ frsp f1, f1 -/* 8073F7E8 48 00 00 88 */ b lbl_8073F870 -lbl_8073F7EC: -/* 8073F7EC C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073F7F0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073F7F4 40 80 00 10 */ bge lbl_8073F804 -/* 8073F7F8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F7FC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073F800 48 00 00 70 */ b lbl_8073F870 -lbl_8073F804: -/* 8073F804 D0 21 00 08 */ stfs f1, 8(r1) -/* 8073F808 80 81 00 08 */ lwz r4, 8(r1) -/* 8073F80C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073F810 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073F814 7C 03 00 00 */ cmpw r3, r0 -/* 8073F818 41 82 00 14 */ beq lbl_8073F82C -/* 8073F81C 40 80 00 40 */ bge lbl_8073F85C -/* 8073F820 2C 03 00 00 */ cmpwi r3, 0 -/* 8073F824 41 82 00 20 */ beq lbl_8073F844 -/* 8073F828 48 00 00 34 */ b lbl_8073F85C -lbl_8073F82C: -/* 8073F82C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F830 41 82 00 0C */ beq lbl_8073F83C -/* 8073F834 38 00 00 01 */ li r0, 1 -/* 8073F838 48 00 00 28 */ b lbl_8073F860 -lbl_8073F83C: -/* 8073F83C 38 00 00 02 */ li r0, 2 -/* 8073F840 48 00 00 20 */ b lbl_8073F860 -lbl_8073F844: -/* 8073F844 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073F848 41 82 00 0C */ beq lbl_8073F854 -/* 8073F84C 38 00 00 05 */ li r0, 5 -/* 8073F850 48 00 00 10 */ b lbl_8073F860 -lbl_8073F854: -/* 8073F854 38 00 00 03 */ li r0, 3 -/* 8073F858 48 00 00 08 */ b lbl_8073F860 -lbl_8073F85C: -/* 8073F85C 38 00 00 04 */ li r0, 4 -lbl_8073F860: -/* 8073F860 2C 00 00 01 */ cmpwi r0, 1 -/* 8073F864 40 82 00 0C */ bne lbl_8073F870 -/* 8073F868 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073F86C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8073F870: -/* 8073F870 D0 3E 06 3C */ stfs f1, 0x63c(r30) -/* 8073F874 3C 60 80 74 */ lis r3, l_HIO@ha /* 0x80741DD0@ha */ -/* 8073F878 38 63 1D D0 */ addi r3, r3, l_HIO@l /* 0x80741DD0@l */ -/* 8073F87C C0 43 00 0C */ lfs f2, 0xc(r3) -/* 8073F880 88 1E 06 64 */ lbz r0, 0x664(r30) -/* 8073F884 C8 3F 00 A8 */ lfd f1, 0xa8(r31) -/* 8073F888 90 01 00 54 */ stw r0, 0x54(r1) -/* 8073F88C 3C 00 43 30 */ lis r0, 0x4330 -/* 8073F890 90 01 00 50 */ stw r0, 0x50(r1) -/* 8073F894 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 8073F898 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073F89C EC 02 00 2A */ fadds f0, f2, f0 -/* 8073F8A0 FC 00 00 1E */ fctiwz f0, f0 -/* 8073F8A4 D8 01 00 58 */ stfd f0, 0x58(r1) -/* 8073F8A8 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 8073F8AC B0 1E 05 AC */ sth r0, 0x5ac(r30) -/* 8073F8B0 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 8073F8B4 83 C1 00 68 */ lwz r30, 0x68(r1) -/* 8073F8B8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8073F8BC 7C 08 03 A6 */ mtlr r0 -/* 8073F8C0 38 21 00 70 */ addi r1, r1, 0x70 -/* 8073F8C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetPlaySpeed__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetPlaySpeed__8daE_PH_cFv.s deleted file mode 100644 index 421811a168a..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetPlaySpeed__8daE_PH_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8073EDA0: -/* 8073EDA0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8073EDA4 7C 08 02 A6 */ mflr r0 -/* 8073EDA8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8073EDAC 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8073EDB0 7C 7F 1B 78 */ mr r31, r3 -/* 8073EDB4 A8 63 06 66 */ lha r3, 0x666(r3) -/* 8073EDB8 A8 1F 06 12 */ lha r0, 0x612(r31) -/* 8073EDBC 7C 03 02 14 */ add r0, r3, r0 -/* 8073EDC0 B0 1F 06 66 */ sth r0, 0x666(r31) -/* 8073EDC4 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070462@ha */ -/* 8073EDC8 38 03 04 62 */ addi r0, r3, 0x0462 /* 0x00070462@l */ -/* 8073EDCC 90 01 00 08 */ stw r0, 8(r1) -/* 8073EDD0 38 7F 06 74 */ addi r3, r31, 0x674 -/* 8073EDD4 38 81 00 08 */ addi r4, r1, 8 -/* 8073EDD8 A8 BF 06 12 */ lha r5, 0x612(r31) -/* 8073EDDC 38 C0 FF FF */ li r6, -1 -/* 8073EDE0 81 9F 06 74 */ lwz r12, 0x674(r31) -/* 8073EDE4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8073EDE8 7D 89 03 A6 */ mtctr r12 -/* 8073EDEC 4E 80 04 21 */ bctrl -/* 8073EDF0 38 7F 06 24 */ addi r3, r31, 0x624 -/* 8073EDF4 C0 3F 06 20 */ lfs f1, 0x620(r31) -/* 8073EDF8 3C 80 80 74 */ lis r4, lit_4548@ha /* 0x80741CAC@ha */ -/* 8073EDFC C0 44 1C AC */ lfs f2, lit_4548@l(r4) /* 0x80741CAC@l */ -/* 8073EE00 4B B3 19 41 */ bl cLib_chaseF__FPfff -/* 8073EE04 38 7F 06 12 */ addi r3, r31, 0x612 -/* 8073EE08 A8 1F 06 10 */ lha r0, 0x610(r31) -/* 8073EE0C 3C 80 80 74 */ lis r4, lit_4215@ha /* 0x80741C74@ha */ -/* 8073EE10 C8 24 1C 74 */ lfd f1, lit_4215@l(r4) /* 0x80741C74@l */ -/* 8073EE14 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073EE18 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073EE1C 3C 00 43 30 */ lis r0, 0x4330 -/* 8073EE20 90 01 00 10 */ stw r0, 0x10(r1) -/* 8073EE24 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8073EE28 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8073EE2C C0 1F 06 20 */ lfs f0, 0x620(r31) -/* 8073EE30 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8073EE34 FC 00 00 1E */ fctiwz f0, f0 -/* 8073EE38 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 8073EE3C 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 8073EE40 38 A0 00 10 */ li r5, 0x10 -/* 8073EE44 4B B3 1D 4D */ bl cLib_chaseAngleS__FPsss -/* 8073EE48 C0 1F 06 24 */ lfs f0, 0x624(r31) -/* 8073EE4C 80 7F 07 1C */ lwz r3, 0x71c(r31) -/* 8073EE50 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8073EE54 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8073EE58 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8073EE5C 7C 08 03 A6 */ mtlr r0 -/* 8073EE60 38 21 00 30 */ addi r1, r1, 0x30 -/* 8073EE64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchBackPos__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchBackPos__8daE_PH_cFv.s deleted file mode 100644 index fa5119d1503..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchBackPos__8daE_PH_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8073ED58: -/* 8073ED58 80 83 06 2C */ lwz r4, 0x62c(r3) -/* 8073ED5C 2C 04 00 00 */ cmpwi r4, 0 -/* 8073ED60 41 81 00 34 */ bgt lbl_8073ED94 -/* 8073ED64 80 A3 06 44 */ lwz r5, 0x644(r3) -/* 8073ED68 88 05 00 05 */ lbz r0, 5(r5) -/* 8073ED6C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8073ED70 41 82 00 10 */ beq lbl_8073ED80 -/* 8073ED74 A0 05 00 00 */ lhz r0, 0(r5) -/* 8073ED78 90 03 06 2C */ stw r0, 0x62c(r3) -/* 8073ED7C 4E 80 00 20 */ blr -lbl_8073ED80: -/* 8073ED80 38 04 00 01 */ addi r0, r4, 1 -/* 8073ED84 90 03 06 2C */ stw r0, 0x62c(r3) -/* 8073ED88 38 00 00 00 */ li r0, 0 -/* 8073ED8C 98 03 06 62 */ stb r0, 0x662(r3) -/* 8073ED90 4E 80 00 20 */ blr -lbl_8073ED94: -/* 8073ED94 38 04 FF FF */ addi r0, r4, -1 -/* 8073ED98 90 03 06 2C */ stw r0, 0x62c(r3) -/* 8073ED9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNearP__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNearP__8daE_PH_cFv.s deleted file mode 100644 index 301509854a3..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNearP__8daE_PH_cFv.s +++ /dev/null @@ -1,154 +0,0 @@ -lbl_8073DBD4: -/* 8073DBD4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8073DBD8 7C 08 02 A6 */ mflr r0 -/* 8073DBDC 90 01 00 64 */ stw r0, 0x64(r1) -/* 8073DBE0 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 8073DBE4 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 8073DBE8 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 8073DBEC F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 8073DBF0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8073DBF4 4B C2 45 E9 */ bl _savegpr_29 -/* 8073DBF8 7C 7D 1B 78 */ mr r29, r3 -/* 8073DBFC 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073DC00 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073DC04 C3 DF 00 5C */ lfs f30, 0x5c(r31) -/* 8073DC08 3B C0 00 00 */ li r30, 0 -/* 8073DC0C C3 FF 00 00 */ lfs f31, 0(r31) -/* 8073DC10 48 00 01 B0 */ b lbl_8073DDC0 -lbl_8073DC14: -/* 8073DC14 7F C4 F3 78 */ mr r4, r30 -/* 8073DC18 4B 91 3B 99 */ bl dPath_GetPnt__FPC5dPathi -/* 8073DC1C C0 3D 04 D8 */ lfs f1, 0x4d8(r29) -/* 8073DC20 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8073DC24 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8073DC28 D3 E1 00 10 */ stfs f31, 0x10(r1) -/* 8073DC2C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 8073DC30 C0 23 00 0C */ lfs f1, 0xc(r3) -/* 8073DC34 C0 03 00 04 */ lfs f0, 4(r3) -/* 8073DC38 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8073DC3C D3 E1 00 1C */ stfs f31, 0x1c(r1) -/* 8073DC40 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 8073DC44 38 61 00 0C */ addi r3, r1, 0xc -/* 8073DC48 38 81 00 18 */ addi r4, r1, 0x18 -/* 8073DC4C 4B C0 97 51 */ bl PSVECSquareDistance -/* 8073DC50 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 8073DC54 40 81 00 58 */ ble lbl_8073DCAC -/* 8073DC58 FC 00 08 34 */ frsqrte f0, f1 -/* 8073DC5C C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073DC60 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073DC64 C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073DC68 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073DC6C FC 01 00 32 */ fmul f0, f1, f0 -/* 8073DC70 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073DC74 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073DC78 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073DC7C FC 00 00 32 */ fmul f0, f0, f0 -/* 8073DC80 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073DC84 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073DC88 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073DC8C FC 44 00 32 */ fmul f2, f4, f0 -/* 8073DC90 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073DC94 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073DC98 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073DC9C FC 02 00 32 */ fmul f0, f2, f0 -/* 8073DCA0 FC 21 00 32 */ fmul f1, f1, f0 -/* 8073DCA4 FC 20 08 18 */ frsp f1, f1 -/* 8073DCA8 48 00 00 88 */ b lbl_8073DD30 -lbl_8073DCAC: -/* 8073DCAC C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073DCB0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073DCB4 40 80 00 10 */ bge lbl_8073DCC4 -/* 8073DCB8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073DCBC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073DCC0 48 00 00 70 */ b lbl_8073DD30 -lbl_8073DCC4: -/* 8073DCC4 D0 21 00 08 */ stfs f1, 8(r1) -/* 8073DCC8 80 81 00 08 */ lwz r4, 8(r1) -/* 8073DCCC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073DCD0 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073DCD4 7C 03 00 00 */ cmpw r3, r0 -/* 8073DCD8 41 82 00 14 */ beq lbl_8073DCEC -/* 8073DCDC 40 80 00 40 */ bge lbl_8073DD1C -/* 8073DCE0 2C 03 00 00 */ cmpwi r3, 0 -/* 8073DCE4 41 82 00 20 */ beq lbl_8073DD04 -/* 8073DCE8 48 00 00 34 */ b lbl_8073DD1C -lbl_8073DCEC: -/* 8073DCEC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073DCF0 41 82 00 0C */ beq lbl_8073DCFC -/* 8073DCF4 38 00 00 01 */ li r0, 1 -/* 8073DCF8 48 00 00 28 */ b lbl_8073DD20 -lbl_8073DCFC: -/* 8073DCFC 38 00 00 02 */ li r0, 2 -/* 8073DD00 48 00 00 20 */ b lbl_8073DD20 -lbl_8073DD04: -/* 8073DD04 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073DD08 41 82 00 0C */ beq lbl_8073DD14 -/* 8073DD0C 38 00 00 05 */ li r0, 5 -/* 8073DD10 48 00 00 10 */ b lbl_8073DD20 -lbl_8073DD14: -/* 8073DD14 38 00 00 03 */ li r0, 3 -/* 8073DD18 48 00 00 08 */ b lbl_8073DD20 -lbl_8073DD1C: -/* 8073DD1C 38 00 00 04 */ li r0, 4 -lbl_8073DD20: -/* 8073DD20 2C 00 00 01 */ cmpwi r0, 1 -/* 8073DD24 40 82 00 0C */ bne lbl_8073DD30 -/* 8073DD28 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073DD2C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8073DD30: -/* 8073DD30 FC 01 F0 40 */ fcmpo cr0, f1, f30 -/* 8073DD34 40 80 00 88 */ bge lbl_8073DDBC -/* 8073DD38 FF C0 08 90 */ fmr f30, f1 -/* 8073DD3C 93 DD 06 2C */ stw r30, 0x62c(r29) -/* 8073DD40 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8073DD44 D0 1D 06 48 */ stfs f0, 0x648(r29) -/* 8073DD48 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8073DD4C D0 1D 06 4C */ stfs f0, 0x64c(r29) -/* 8073DD50 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8073DD54 D0 1D 06 50 */ stfs f0, 0x650(r29) -/* 8073DD58 80 9D 06 2C */ lwz r4, 0x62c(r29) -/* 8073DD5C 80 BD 06 44 */ lwz r5, 0x644(r29) -/* 8073DD60 A0 65 00 00 */ lhz r3, 0(r5) -/* 8073DD64 38 03 FF FF */ addi r0, r3, -1 -/* 8073DD68 7C 04 00 00 */ cmpw r4, r0 -/* 8073DD6C 40 82 00 28 */ bne lbl_8073DD94 -/* 8073DD70 88 05 00 05 */ lbz r0, 5(r5) -/* 8073DD74 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8073DD78 41 82 00 10 */ beq lbl_8073DD88 -/* 8073DD7C 38 00 00 00 */ li r0, 0 -/* 8073DD80 90 1D 06 2C */ stw r0, 0x62c(r29) -/* 8073DD84 48 00 00 18 */ b lbl_8073DD9C -lbl_8073DD88: -/* 8073DD88 38 04 FF FF */ addi r0, r4, -1 -/* 8073DD8C 90 1D 06 2C */ stw r0, 0x62c(r29) -/* 8073DD90 48 00 00 0C */ b lbl_8073DD9C -lbl_8073DD94: -/* 8073DD94 38 04 00 01 */ addi r0, r4, 1 -/* 8073DD98 90 1D 06 2C */ stw r0, 0x62c(r29) -lbl_8073DD9C: -/* 8073DD9C 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 8073DDA0 28 00 00 01 */ cmplwi r0, 1 -/* 8073DDA4 40 82 00 10 */ bne lbl_8073DDB4 -/* 8073DDA8 7F A3 EB 78 */ mr r3, r29 -/* 8073DDAC 48 00 06 F9 */ bl SetCheckAngle__8daE_PH_cFv -/* 8073DDB0 48 00 00 0C */ b lbl_8073DDBC -lbl_8073DDB4: -/* 8073DDB4 7F A3 EB 78 */ mr r3, r29 -/* 8073DDB8 48 00 16 1D */ bl S_SetAngle__8daE_PH_cFv -lbl_8073DDBC: -/* 8073DDBC 3B DE 00 01 */ addi r30, r30, 1 -lbl_8073DDC0: -/* 8073DDC0 80 7D 06 44 */ lwz r3, 0x644(r29) -/* 8073DDC4 A0 03 00 00 */ lhz r0, 0(r3) -/* 8073DDC8 7C 1E 00 00 */ cmpw r30, r0 -/* 8073DDCC 41 80 FE 48 */ blt lbl_8073DC14 -/* 8073DDD0 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 8073DDD4 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 8073DDD8 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 8073DDDC CB C1 00 40 */ lfd f30, 0x40(r1) -/* 8073DDE0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8073DDE4 4B C2 44 45 */ bl _restgpr_29 -/* 8073DDE8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8073DDEC 7C 08 03 A6 */ mtlr r0 -/* 8073DDF0 38 21 00 60 */ addi r1, r1, 0x60 -/* 8073DDF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNextPos__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNextPos__8daE_PH_cFv.s deleted file mode 100644 index c1f82ddc938..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNextPos__8daE_PH_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8073ED0C: -/* 8073ED0C 80 A3 06 2C */ lwz r5, 0x62c(r3) -/* 8073ED10 38 85 00 01 */ addi r4, r5, 1 -/* 8073ED14 80 C3 06 44 */ lwz r6, 0x644(r3) -/* 8073ED18 A0 06 00 00 */ lhz r0, 0(r6) -/* 8073ED1C 7C 04 00 00 */ cmpw r4, r0 -/* 8073ED20 41 80 00 30 */ blt lbl_8073ED50 -/* 8073ED24 88 06 00 05 */ lbz r0, 5(r6) -/* 8073ED28 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8073ED2C 41 82 00 10 */ beq lbl_8073ED3C -/* 8073ED30 38 00 00 00 */ li r0, 0 -/* 8073ED34 90 03 06 2C */ stw r0, 0x62c(r3) -/* 8073ED38 4E 80 00 20 */ blr -lbl_8073ED3C: -/* 8073ED3C 38 05 FF FF */ addi r0, r5, -1 -/* 8073ED40 90 03 06 2C */ stw r0, 0x62c(r3) -/* 8073ED44 38 00 00 01 */ li r0, 1 -/* 8073ED48 98 03 06 62 */ stb r0, 0x662(r3) -/* 8073ED4C 4E 80 00 20 */ blr -lbl_8073ED50: -/* 8073ED50 90 83 06 2C */ stw r4, 0x62c(r3) -/* 8073ED54 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetAnm__8daE_PH_cFiiff.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetAnm__8daE_PH_cFiiff.s deleted file mode 100644 index 3df2a260796..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetAnm__8daE_PH_cFiiff.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8073DB28: -/* 8073DB28 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8073DB2C 7C 08 02 A6 */ mflr r0 -/* 8073DB30 90 01 00 44 */ stw r0, 0x44(r1) -/* 8073DB34 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8073DB38 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8073DB3C DB C1 00 20 */ stfd f30, 0x20(r1) -/* 8073DB40 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 8073DB44 39 61 00 20 */ addi r11, r1, 0x20 -/* 8073DB48 4B C2 46 95 */ bl _savegpr_29 -/* 8073DB4C 7C 7D 1B 78 */ mr r29, r3 -/* 8073DB50 7C 9E 23 78 */ mr r30, r4 -/* 8073DB54 7C BF 2B 78 */ mr r31, r5 -/* 8073DB58 FF C0 08 90 */ fmr f30, f1 -/* 8073DB5C FF E0 10 90 */ fmr f31, f2 -/* 8073DB60 3C 60 80 74 */ lis r3, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 8073DB64 38 63 1D 0C */ addi r3, r3, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 8073DB68 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073DB6C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073DB70 3C A5 00 02 */ addis r5, r5, 2 -/* 8073DB74 38 C0 00 80 */ li r6, 0x80 -/* 8073DB78 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8073DB7C 4B 8F E7 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8073DB80 7C 64 1B 78 */ mr r4, r3 -/* 8073DB84 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 8073DB88 7F E5 FB 78 */ mr r5, r31 -/* 8073DB8C FC 20 F0 90 */ fmr f1, f30 -/* 8073DB90 FC 40 F8 90 */ fmr f2, f31 -/* 8073DB94 3C C0 80 74 */ lis r6, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073DB98 C0 66 1B F4 */ lfs f3, lit_3767@l(r6) /* 0x80741BF4@l */ -/* 8073DB9C 3C C0 80 74 */ lis r6, lit_4064@ha /* 0x80741C4C@ha */ -/* 8073DBA0 C0 86 1C 4C */ lfs f4, lit_4064@l(r6) /* 0x80741C4C@l */ -/* 8073DBA4 4B 8D 32 CD */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 8073DBA8 93 DD 06 28 */ stw r30, 0x628(r29) -/* 8073DBAC E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8073DBB0 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8073DBB4 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 8073DBB8 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 8073DBBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8073DBC0 4B C2 46 69 */ bl _restgpr_29 -/* 8073DBC4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8073DBC8 7C 08 03 A6 */ mtlr r0 -/* 8073DBCC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8073DBD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCMoveCam__8daE_PH_cF4cXyzff.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCMoveCam__8daE_PH_cF4cXyzff.s deleted file mode 100644 index 955ec286ebf..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCMoveCam__8daE_PH_cF4cXyzff.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8073D768: -/* 8073D768 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8073D76C 7C 08 02 A6 */ mflr r0 -/* 8073D770 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073D774 7C 65 1B 78 */ mr r5, r3 -/* 8073D778 C0 04 00 00 */ lfs f0, 0(r4) -/* 8073D77C D0 03 05 E0 */ stfs f0, 0x5e0(r3) -/* 8073D780 C0 04 00 04 */ lfs f0, 4(r4) -/* 8073D784 D0 03 05 E4 */ stfs f0, 0x5e4(r3) -/* 8073D788 C0 04 00 08 */ lfs f0, 8(r4) -/* 8073D78C D0 03 05 E8 */ stfs f0, 0x5e8(r3) -/* 8073D790 38 65 05 D4 */ addi r3, r5, 0x5d4 -/* 8073D794 38 85 05 E0 */ addi r4, r5, 0x5e0 -/* 8073D798 4B B3 29 E1 */ bl cLib_addCalcPos2__FP4cXyzRC4cXyzff -/* 8073D79C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073D7A0 7C 08 03 A6 */ mtlr r0 -/* 8073D7A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8073D7A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCheckAngle__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCheckAngle__8daE_PH_cFv.s deleted file mode 100644 index d257092e46a..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCheckAngle__8daE_PH_cFv.s +++ /dev/null @@ -1,282 +0,0 @@ -lbl_8073E4A4: -/* 8073E4A4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8073E4A8 7C 08 02 A6 */ mflr r0 -/* 8073E4AC 90 01 00 74 */ stw r0, 0x74(r1) -/* 8073E4B0 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 8073E4B4 93 C1 00 68 */ stw r30, 0x68(r1) -/* 8073E4B8 7C 7E 1B 78 */ mr r30, r3 -/* 8073E4BC 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073E4C0 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073E4C4 C0 5E 06 50 */ lfs f2, 0x650(r30) -/* 8073E4C8 C0 3E 06 4C */ lfs f1, 0x64c(r30) -/* 8073E4CC C0 1E 06 48 */ lfs f0, 0x648(r30) -/* 8073E4D0 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 8073E4D4 D0 21 00 50 */ stfs f1, 0x50(r1) -/* 8073E4D8 D0 41 00 54 */ stfs f2, 0x54(r1) -/* 8073E4DC 80 7E 06 44 */ lwz r3, 0x644(r30) -/* 8073E4E0 80 9E 06 2C */ lwz r4, 0x62c(r30) -/* 8073E4E4 4B 91 32 CD */ bl dPath_GetPnt__FPC5dPathi -/* 8073E4E8 C0 03 00 04 */ lfs f0, 4(r3) -/* 8073E4EC D0 1E 06 48 */ stfs f0, 0x648(r30) -/* 8073E4F0 C0 03 00 08 */ lfs f0, 8(r3) -/* 8073E4F4 D0 1E 06 4C */ stfs f0, 0x64c(r30) -/* 8073E4F8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8073E4FC D0 1E 06 50 */ stfs f0, 0x650(r30) -/* 8073E500 C0 7E 06 50 */ lfs f3, 0x650(r30) -/* 8073E504 C0 5E 06 4C */ lfs f2, 0x64c(r30) -/* 8073E508 C0 3E 06 48 */ lfs f1, 0x648(r30) -/* 8073E50C D0 21 00 40 */ stfs f1, 0x40(r1) -/* 8073E510 D0 41 00 44 */ stfs f2, 0x44(r1) -/* 8073E514 D0 61 00 48 */ stfs f3, 0x48(r1) -/* 8073E518 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 8073E51C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073E520 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 8073E524 C0 01 00 50 */ lfs f0, 0x50(r1) -/* 8073E528 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8073E52C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 8073E530 C0 01 00 54 */ lfs f0, 0x54(r1) -/* 8073E534 EC 00 18 28 */ fsubs f0, f0, f3 -/* 8073E538 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 8073E53C 38 61 00 4C */ addi r3, r1, 0x4c -/* 8073E540 38 81 00 40 */ addi r4, r1, 0x40 -/* 8073E544 4B B3 26 C1 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 8073E548 B0 7E 06 1E */ sth r3, 0x61e(r30) -/* 8073E54C C0 01 00 34 */ lfs f0, 0x34(r1) -/* 8073E550 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8073E554 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073E558 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8073E55C C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 8073E560 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8073E564 38 61 00 1C */ addi r3, r1, 0x1c -/* 8073E568 4B C0 8B D1 */ bl PSVECSquareMag -/* 8073E56C C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073E570 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073E574 40 81 00 58 */ ble lbl_8073E5CC -/* 8073E578 FC 00 08 34 */ frsqrte f0, f1 -/* 8073E57C C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073E580 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073E584 C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073E588 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073E58C FC 01 00 32 */ fmul f0, f1, f0 -/* 8073E590 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073E594 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073E598 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073E59C FC 00 00 32 */ fmul f0, f0, f0 -/* 8073E5A0 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073E5A4 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073E5A8 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073E5AC FC 44 00 32 */ fmul f2, f4, f0 -/* 8073E5B0 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073E5B4 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073E5B8 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073E5BC FC 02 00 32 */ fmul f0, f2, f0 -/* 8073E5C0 FC 41 00 32 */ fmul f2, f1, f0 -/* 8073E5C4 FC 40 10 18 */ frsp f2, f2 -/* 8073E5C8 48 00 00 90 */ b lbl_8073E658 -lbl_8073E5CC: -/* 8073E5CC C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073E5D0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073E5D4 40 80 00 10 */ bge lbl_8073E5E4 -/* 8073E5D8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073E5DC C0 43 0A E0 */ lfs f2, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073E5E0 48 00 00 78 */ b lbl_8073E658 -lbl_8073E5E4: -/* 8073E5E4 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8073E5E8 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8073E5EC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073E5F0 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073E5F4 7C 03 00 00 */ cmpw r3, r0 -/* 8073E5F8 41 82 00 14 */ beq lbl_8073E60C -/* 8073E5FC 40 80 00 40 */ bge lbl_8073E63C -/* 8073E600 2C 03 00 00 */ cmpwi r3, 0 -/* 8073E604 41 82 00 20 */ beq lbl_8073E624 -/* 8073E608 48 00 00 34 */ b lbl_8073E63C -lbl_8073E60C: -/* 8073E60C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073E610 41 82 00 0C */ beq lbl_8073E61C -/* 8073E614 38 00 00 01 */ li r0, 1 -/* 8073E618 48 00 00 28 */ b lbl_8073E640 -lbl_8073E61C: -/* 8073E61C 38 00 00 02 */ li r0, 2 -/* 8073E620 48 00 00 20 */ b lbl_8073E640 -lbl_8073E624: -/* 8073E624 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073E628 41 82 00 0C */ beq lbl_8073E634 -/* 8073E62C 38 00 00 05 */ li r0, 5 -/* 8073E630 48 00 00 10 */ b lbl_8073E640 -lbl_8073E634: -/* 8073E634 38 00 00 03 */ li r0, 3 -/* 8073E638 48 00 00 08 */ b lbl_8073E640 -lbl_8073E63C: -/* 8073E63C 38 00 00 04 */ li r0, 4 -lbl_8073E640: -/* 8073E640 2C 00 00 01 */ cmpwi r0, 1 -/* 8073E644 40 82 00 10 */ bne lbl_8073E654 -/* 8073E648 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073E64C C0 43 0A E0 */ lfs f2, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073E650 48 00 00 08 */ b lbl_8073E658 -lbl_8073E654: -/* 8073E654 FC 40 08 90 */ fmr f2, f1 -lbl_8073E658: -/* 8073E658 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 8073E65C 4B B2 90 19 */ bl cM_atan2s__Fff -/* 8073E660 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c -/* 8073E664 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8073E668 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8073E66C 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8073E670 FC 60 02 10 */ fabs f3, f0 -/* 8073E674 3C 60 80 74 */ lis r3, l_HIO@ha /* 0x80741DD0@ha */ -/* 8073E678 38 63 1D D0 */ addi r3, r3, l_HIO@l /* 0x80741DD0@l */ -/* 8073E67C C0 43 00 10 */ lfs f2, 0x10(r3) -/* 8073E680 88 1E 06 63 */ lbz r0, 0x663(r30) -/* 8073E684 C8 3F 00 A8 */ lfd f1, 0xa8(r31) -/* 8073E688 90 01 00 5C */ stw r0, 0x5c(r1) -/* 8073E68C 3C 00 43 30 */ lis r0, 0x4330 -/* 8073E690 90 01 00 58 */ stw r0, 0x58(r1) -/* 8073E694 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 8073E698 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073E69C EC 42 00 2A */ fadds f2, f2, f0 -/* 8073E6A0 C0 3F 00 98 */ lfs f1, 0x98(r31) -/* 8073E6A4 FC 00 18 18 */ frsp f0, f3 -/* 8073E6A8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8073E6AC EC 02 00 32 */ fmuls f0, f2, f0 -/* 8073E6B0 D0 1E 06 38 */ stfs f0, 0x638(r30) -/* 8073E6B4 C0 5E 06 50 */ lfs f2, 0x650(r30) -/* 8073E6B8 C0 3E 06 4C */ lfs f1, 0x64c(r30) -/* 8073E6BC C0 1E 06 48 */ lfs f0, 0x648(r30) -/* 8073E6C0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8073E6C4 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 8073E6C8 D0 41 00 30 */ stfs f2, 0x30(r1) -/* 8073E6CC 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 8073E6D0 38 81 00 28 */ addi r4, r1, 0x28 -/* 8073E6D4 4B B3 25 31 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 8073E6D8 B0 7E 06 1C */ sth r3, 0x61c(r30) -/* 8073E6DC C0 01 00 34 */ lfs f0, 0x34(r1) -/* 8073E6E0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8073E6E4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073E6E8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8073E6EC C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 8073E6F0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8073E6F4 38 61 00 10 */ addi r3, r1, 0x10 -/* 8073E6F8 4B C0 8A 41 */ bl PSVECSquareMag -/* 8073E6FC C0 1F 00 00 */ lfs f0, 0(r31) -/* 8073E700 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073E704 40 81 00 58 */ ble lbl_8073E75C -/* 8073E708 FC 00 08 34 */ frsqrte f0, f1 -/* 8073E70C C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 8073E710 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073E714 C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 8073E718 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073E71C FC 01 00 32 */ fmul f0, f1, f0 -/* 8073E720 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073E724 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073E728 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073E72C FC 00 00 32 */ fmul f0, f0, f0 -/* 8073E730 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073E734 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073E738 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073E73C FC 44 00 32 */ fmul f2, f4, f0 -/* 8073E740 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073E744 FC 01 00 32 */ fmul f0, f1, f0 -/* 8073E748 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073E74C FC 02 00 32 */ fmul f0, f2, f0 -/* 8073E750 FC 41 00 32 */ fmul f2, f1, f0 -/* 8073E754 FC 40 10 18 */ frsp f2, f2 -/* 8073E758 48 00 00 90 */ b lbl_8073E7E8 -lbl_8073E75C: -/* 8073E75C C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 8073E760 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073E764 40 80 00 10 */ bge lbl_8073E774 -/* 8073E768 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073E76C C0 43 0A E0 */ lfs f2, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073E770 48 00 00 78 */ b lbl_8073E7E8 -lbl_8073E774: -/* 8073E774 D0 21 00 08 */ stfs f1, 8(r1) -/* 8073E778 80 81 00 08 */ lwz r4, 8(r1) -/* 8073E77C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073E780 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073E784 7C 03 00 00 */ cmpw r3, r0 -/* 8073E788 41 82 00 14 */ beq lbl_8073E79C -/* 8073E78C 40 80 00 40 */ bge lbl_8073E7CC -/* 8073E790 2C 03 00 00 */ cmpwi r3, 0 -/* 8073E794 41 82 00 20 */ beq lbl_8073E7B4 -/* 8073E798 48 00 00 34 */ b lbl_8073E7CC -lbl_8073E79C: -/* 8073E79C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073E7A0 41 82 00 0C */ beq lbl_8073E7AC -/* 8073E7A4 38 00 00 01 */ li r0, 1 -/* 8073E7A8 48 00 00 28 */ b lbl_8073E7D0 -lbl_8073E7AC: -/* 8073E7AC 38 00 00 02 */ li r0, 2 -/* 8073E7B0 48 00 00 20 */ b lbl_8073E7D0 -lbl_8073E7B4: -/* 8073E7B4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073E7B8 41 82 00 0C */ beq lbl_8073E7C4 -/* 8073E7BC 38 00 00 05 */ li r0, 5 -/* 8073E7C0 48 00 00 10 */ b lbl_8073E7D0 -lbl_8073E7C4: -/* 8073E7C4 38 00 00 03 */ li r0, 3 -/* 8073E7C8 48 00 00 08 */ b lbl_8073E7D0 -lbl_8073E7CC: -/* 8073E7CC 38 00 00 04 */ li r0, 4 -lbl_8073E7D0: -/* 8073E7D0 2C 00 00 01 */ cmpwi r0, 1 -/* 8073E7D4 40 82 00 10 */ bne lbl_8073E7E4 -/* 8073E7D8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073E7DC C0 43 0A E0 */ lfs f2, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073E7E0 48 00 00 08 */ b lbl_8073E7E8 -lbl_8073E7E4: -/* 8073E7E4 FC 40 08 90 */ fmr f2, f1 -lbl_8073E7E8: -/* 8073E7E8 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 8073E7EC 4B B2 8E 89 */ bl cM_atan2s__Fff -/* 8073E7F0 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c -/* 8073E7F4 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8073E7F8 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8073E7FC 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8073E800 C0 5F 00 04 */ lfs f2, 4(r31) -/* 8073E804 C0 3F 00 9C */ lfs f1, 0x9c(r31) -/* 8073E808 FC 00 00 50 */ fneg f0, f0 -/* 8073E80C EC 01 00 32 */ fmuls f0, f1, f0 -/* 8073E810 EC 02 00 2A */ fadds f0, f2, f0 -/* 8073E814 D0 1E 06 20 */ stfs f0, 0x620(r30) -/* 8073E818 C0 3E 06 20 */ lfs f1, 0x620(r30) -/* 8073E81C C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 8073E820 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073E824 40 80 00 08 */ bge lbl_8073E82C -/* 8073E828 D0 1E 06 20 */ stfs f0, 0x620(r30) -lbl_8073E82C: -/* 8073E82C C0 1E 06 20 */ lfs f0, 0x620(r30) -/* 8073E830 D0 1E 05 B8 */ stfs f0, 0x5b8(r30) -/* 8073E834 3C 60 80 74 */ lis r3, l_HIO@ha /* 0x80741DD0@ha */ -/* 8073E838 38 63 1D D0 */ addi r3, r3, l_HIO@l /* 0x80741DD0@l */ -/* 8073E83C C0 43 00 0C */ lfs f2, 0xc(r3) -/* 8073E840 88 1E 06 64 */ lbz r0, 0x664(r30) -/* 8073E844 C8 3F 00 A8 */ lfd f1, 0xa8(r31) -/* 8073E848 90 01 00 5C */ stw r0, 0x5c(r1) -/* 8073E84C 3C 00 43 30 */ lis r0, 0x4330 -/* 8073E850 90 01 00 58 */ stw r0, 0x58(r1) -/* 8073E854 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 8073E858 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073E85C EC 02 00 2A */ fadds f0, f2, f0 -/* 8073E860 FC 00 00 1E */ fctiwz f0, f0 -/* 8073E864 D8 01 00 60 */ stfd f0, 0x60(r1) -/* 8073E868 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8073E86C B0 1E 05 AC */ sth r0, 0x5ac(r30) -/* 8073E870 C0 21 00 4C */ lfs f1, 0x4c(r1) -/* 8073E874 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 8073E878 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073E87C 40 82 00 1C */ bne lbl_8073E898 -/* 8073E880 C0 21 00 54 */ lfs f1, 0x54(r1) -/* 8073E884 C0 01 00 48 */ lfs f0, 0x48(r1) -/* 8073E888 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8073E88C 40 82 00 0C */ bne lbl_8073E898 -/* 8073E890 38 00 00 00 */ li r0, 0 -/* 8073E894 98 1E 06 60 */ stb r0, 0x660(r30) -lbl_8073E898: -/* 8073E898 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 8073E89C 83 C1 00 68 */ lwz r30, 0x68(r1) -/* 8073E8A0 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8073E8A4 7C 08 03 A6 */ mtlr r0 -/* 8073E8A8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8073E8AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetHeadAngle__8daE_PH_cFs.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetHeadAngle__8daE_PH_cFs.s deleted file mode 100644 index 12fe1b536a0..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetHeadAngle__8daE_PH_cFs.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80740024: -/* 80740024 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80740028 7C 08 02 A6 */ mflr r0 -/* 8074002C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80740030 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80740034 7C 7F 1B 78 */ mr r31, r3 -/* 80740038 38 7F 06 12 */ addi r3, r31, 0x612 -/* 8074003C 38 A0 00 10 */ li r5, 0x10 -/* 80740040 38 C0 10 00 */ li r6, 0x1000 -/* 80740044 4B B3 05 C5 */ bl cLib_addCalcAngleS2__FPssss -/* 80740048 A8 7F 06 66 */ lha r3, 0x666(r31) -/* 8074004C A8 1F 06 12 */ lha r0, 0x612(r31) -/* 80740050 7C 03 02 14 */ add r0, r3, r0 -/* 80740054 B0 1F 06 66 */ sth r0, 0x666(r31) -/* 80740058 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070462@ha */ -/* 8074005C 38 03 04 62 */ addi r0, r3, 0x0462 /* 0x00070462@l */ -/* 80740060 90 01 00 08 */ stw r0, 8(r1) -/* 80740064 38 7F 06 74 */ addi r3, r31, 0x674 -/* 80740068 38 81 00 08 */ addi r4, r1, 8 -/* 8074006C A8 BF 06 12 */ lha r5, 0x612(r31) -/* 80740070 38 C0 FF FF */ li r6, -1 -/* 80740074 81 9F 06 74 */ lwz r12, 0x674(r31) -/* 80740078 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8074007C 7D 89 03 A6 */ mtctr r12 -/* 80740080 4E 80 04 21 */ bctrl -/* 80740084 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80740088 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8074008C 7C 08 03 A6 */ mtlr r0 -/* 80740090 38 21 00 20 */ addi r1, r1, 0x20 -/* 80740094 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetReleaseCam__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetReleaseCam__8daE_PH_cFv.s deleted file mode 100644 index f0f82374c7d..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetReleaseCam__8daE_PH_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8073D7AC: -/* 8073D7AC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8073D7B0 7C 08 02 A6 */ mflr r0 -/* 8073D7B4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8073D7B8 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8073D7BC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073D7C0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073D7C4 88 04 5D B0 */ lbz r0, 0x5db0(r4) -/* 8073D7C8 7C 00 07 74 */ extsb r0, r0 -/* 8073D7CC 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 8073D7D0 7C 84 02 14 */ add r4, r4, r0 -/* 8073D7D4 83 E4 5D 74 */ lwz r31, 0x5d74(r4) -/* 8073D7D8 C0 03 05 D4 */ lfs f0, 0x5d4(r3) -/* 8073D7DC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8073D7E0 C0 03 05 D8 */ lfs f0, 0x5d8(r3) -/* 8073D7E4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8073D7E8 C0 03 05 DC */ lfs f0, 0x5dc(r3) -/* 8073D7EC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8073D7F0 C0 03 05 BC */ lfs f0, 0x5bc(r3) -/* 8073D7F4 D0 01 00 08 */ stfs f0, 8(r1) -/* 8073D7F8 C0 03 05 C0 */ lfs f0, 0x5c0(r3) -/* 8073D7FC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8073D800 C0 03 05 C4 */ lfs f0, 0x5c4(r3) -/* 8073D804 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8073D808 38 7F 02 48 */ addi r3, r31, 0x248 -/* 8073D80C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8073D810 38 A1 00 08 */ addi r5, r1, 8 -/* 8073D814 4B A4 34 05 */ bl Reset__9dCamera_cF4cXyz4cXyz -/* 8073D818 38 7F 02 48 */ addi r3, r31, 0x248 -/* 8073D81C 4B A2 3C 91 */ bl Start__9dCamera_cFv -/* 8073D820 38 7F 02 48 */ addi r3, r31, 0x248 -/* 8073D824 38 80 00 00 */ li r4, 0 -/* 8073D828 4B A2 57 E5 */ bl SetTrimSize__9dCamera_cFl -/* 8073D82C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073D830 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073D834 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8073D838 4B 90 4C 31 */ bl reset__14dEvt_control_cFv -/* 8073D83C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8073D840 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8073D844 7C 08 03 A6 */ mtlr r0 -/* 8073D848 38 21 00 30 */ addi r1, r1, 0x30 -/* 8073D84C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetShapeAngle__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetShapeAngle__8daE_PH_cFv.s deleted file mode 100644 index 8205b872342..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetShapeAngle__8daE_PH_cFv.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_8073E068: -/* 8073E068 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8073E06C 7C 08 02 A6 */ mflr r0 -/* 8073E070 90 01 00 54 */ stw r0, 0x54(r1) -/* 8073E074 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 8073E078 93 C1 00 48 */ stw r30, 0x48(r1) -/* 8073E07C 7C 7F 1B 78 */ mr r31, r3 -/* 8073E080 A8 03 06 66 */ lha r0, 0x666(r3) -/* 8073E084 3C 60 80 74 */ lis r3, lit_4215@ha /* 0x80741C74@ha */ -/* 8073E088 C8 63 1C 74 */ lfd f3, lit_4215@l(r3) /* 0x80741C74@l */ -/* 8073E08C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073E090 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8073E094 3C 80 43 30 */ lis r4, 0x4330 -/* 8073E098 90 81 00 18 */ stw r4, 0x18(r1) -/* 8073E09C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8073E0A0 EC 40 18 28 */ fsubs f2, f0, f3 -/* 8073E0A4 A8 1F 06 12 */ lha r0, 0x612(r31) -/* 8073E0A8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073E0AC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8073E0B0 90 81 00 20 */ stw r4, 0x20(r1) -/* 8073E0B4 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8073E0B8 EC 20 18 28 */ fsubs f1, f0, f3 -/* 8073E0BC C0 1F 06 24 */ lfs f0, 0x624(r31) -/* 8073E0C0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8073E0C4 EC 02 00 2A */ fadds f0, f2, f0 -/* 8073E0C8 FC 00 00 1E */ fctiwz f0, f0 -/* 8073E0CC D8 01 00 28 */ stfd f0, 0x28(r1) -/* 8073E0D0 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8073E0D4 B0 1F 06 66 */ sth r0, 0x666(r31) -/* 8073E0D8 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070462@ha */ -/* 8073E0DC 38 03 04 62 */ addi r0, r3, 0x0462 /* 0x00070462@l */ -/* 8073E0E0 90 01 00 08 */ stw r0, 8(r1) -/* 8073E0E4 A8 1F 06 12 */ lha r0, 0x612(r31) -/* 8073E0E8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073E0EC 90 01 00 34 */ stw r0, 0x34(r1) -/* 8073E0F0 90 81 00 30 */ stw r4, 0x30(r1) -/* 8073E0F4 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8073E0F8 EC 20 18 28 */ fsubs f1, f0, f3 -/* 8073E0FC C0 1F 06 24 */ lfs f0, 0x624(r31) -/* 8073E100 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8073E104 4B C2 3F A9 */ bl __cvt_fp2unsigned -/* 8073E108 7C 65 1B 78 */ mr r5, r3 -/* 8073E10C 38 7F 06 74 */ addi r3, r31, 0x674 -/* 8073E110 38 81 00 08 */ addi r4, r1, 8 -/* 8073E114 38 C0 FF FF */ li r6, -1 -/* 8073E118 81 9F 06 74 */ lwz r12, 0x674(r31) -/* 8073E11C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8073E120 7D 89 03 A6 */ mtctr r12 -/* 8073E124 4E 80 04 21 */ bctrl -/* 8073E128 C0 5F 06 50 */ lfs f2, 0x650(r31) -/* 8073E12C C0 3F 06 4C */ lfs f1, 0x64c(r31) -/* 8073E130 C0 1F 06 48 */ lfs f0, 0x648(r31) -/* 8073E134 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8073E138 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8073E13C D0 41 00 14 */ stfs f2, 0x14(r1) -/* 8073E140 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8073E144 38 81 00 0C */ addi r4, r1, 0xc -/* 8073E148 4B B3 2A BD */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 8073E14C B0 7F 06 1C */ sth r3, 0x61c(r31) -/* 8073E150 AB DF 04 DE */ lha r30, 0x4de(r31) -/* 8073E154 38 7F 04 DE */ addi r3, r31, 0x4de -/* 8073E158 A8 9F 06 1C */ lha r4, 0x61c(r31) -/* 8073E15C 3C A0 80 74 */ lis r5, l_HIO@ha /* 0x80741DD0@ha */ -/* 8073E160 38 A5 1D D0 */ addi r5, r5, l_HIO@l /* 0x80741DD0@l */ -/* 8073E164 C0 45 00 14 */ lfs f2, 0x14(r5) -/* 8073E168 A8 1F 05 B4 */ lha r0, 0x5b4(r31) -/* 8073E16C 54 00 40 2E */ slwi r0, r0, 8 -/* 8073E170 3C A0 80 74 */ lis r5, lit_4215@ha /* 0x80741C74@ha */ -/* 8073E174 C8 25 1C 74 */ lfd f1, lit_4215@l(r5) /* 0x80741C74@l */ -/* 8073E178 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073E17C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 8073E180 3C 00 43 30 */ lis r0, 0x4330 -/* 8073E184 90 01 00 38 */ stw r0, 0x38(r1) -/* 8073E188 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 8073E18C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073E190 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8073E194 FC 00 00 1E */ fctiwz f0, f0 -/* 8073E198 D8 01 00 40 */ stfd f0, 0x40(r1) -/* 8073E19C 80 A1 00 44 */ lwz r5, 0x44(r1) -/* 8073E1A0 4B B3 29 F1 */ bl cLib_chaseAngleS__FPsss -/* 8073E1A4 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 8073E1A8 7C 04 F0 50 */ subf r0, r4, r30 -/* 8073E1AC 7C 1E 07 34 */ extsh r30, r0 -/* 8073E1B0 A8 1F 05 B4 */ lha r0, 0x5b4(r31) -/* 8073E1B4 2C 00 00 46 */ cmpwi r0, 0x46 -/* 8073E1B8 41 82 00 14 */ beq lbl_8073E1CC -/* 8073E1BC 38 7F 04 E6 */ addi r3, r31, 0x4e6 -/* 8073E1C0 38 A0 00 20 */ li r5, 0x20 -/* 8073E1C4 38 C0 10 00 */ li r6, 0x1000 -/* 8073E1C8 4B B3 24 41 */ bl cLib_addCalcAngleS2__FPssss -lbl_8073E1CC: -/* 8073E1CC 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 8073E1D0 3C 80 80 74 */ lis r4, lit_4213@ha /* 0x80741C70@ha */ -/* 8073E1D4 C0 44 1C 70 */ lfs f2, lit_4213@l(r4) /* 0x80741C70@l */ -/* 8073E1D8 7C 1E 00 D0 */ neg r0, r30 -/* 8073E1DC 3C 80 80 74 */ lis r4, lit_4215@ha /* 0x80741C74@ha */ -/* 8073E1E0 C8 24 1C 74 */ lfd f1, lit_4215@l(r4) /* 0x80741C74@l */ -/* 8073E1E4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073E1E8 90 01 00 44 */ stw r0, 0x44(r1) -/* 8073E1EC 3C 00 43 30 */ lis r0, 0x4330 -/* 8073E1F0 90 01 00 40 */ stw r0, 0x40(r1) -/* 8073E1F4 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 8073E1F8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073E1FC EC 02 00 32 */ fmuls f0, f2, f0 -/* 8073E200 FC 00 00 1E */ fctiwz f0, f0 -/* 8073E204 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 8073E208 80 81 00 3C */ lwz r4, 0x3c(r1) -/* 8073E20C 38 A0 00 30 */ li r5, 0x30 -/* 8073E210 4B B3 29 81 */ bl cLib_chaseAngleS__FPsss -/* 8073E214 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 8073E218 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 8073E21C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8073E220 7C 08 03 A6 */ mtlr r0 -/* 8073E224 38 21 00 50 */ addi r1, r1, 0x50 -/* 8073E228 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopCam__8daE_PH_cF4cXyzffs.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopCam__8daE_PH_cF4cXyzffs.s deleted file mode 100644 index ecca557e4dd..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopCam__8daE_PH_cF4cXyzffs.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_8073D648: -/* 8073D648 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8073D64C 7C 08 02 A6 */ mflr r0 -/* 8073D650 90 01 00 44 */ stw r0, 0x44(r1) -/* 8073D654 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 8073D658 93 C1 00 38 */ stw r30, 0x38(r1) -/* 8073D65C 7C 7E 1B 78 */ mr r30, r3 -/* 8073D660 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073D664 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073D668 88 03 5D B0 */ lbz r0, 0x5db0(r3) -/* 8073D66C 7C 00 07 74 */ extsb r0, r0 -/* 8073D670 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 8073D674 7C 63 02 14 */ add r3, r3, r0 -/* 8073D678 83 E3 5D 74 */ lwz r31, 0x5d74(r3) -/* 8073D67C 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073D680 C0 03 1B F4 */ lfs f0, lit_3767@l(r3) /* 0x80741BF4@l */ -/* 8073D684 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8073D688 D0 41 00 30 */ stfs f2, 0x30(r1) -/* 8073D68C D0 21 00 34 */ stfs f1, 0x34(r1) -/* 8073D690 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8073D694 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8073D698 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8073D69C C0 44 00 08 */ lfs f2, 8(r4) -/* 8073D6A0 C0 24 00 04 */ lfs f1, 4(r4) -/* 8073D6A4 C0 04 00 00 */ lfs f0, 0(r4) -/* 8073D6A8 D0 1E 05 D4 */ stfs f0, 0x5d4(r30) -/* 8073D6AC D0 3E 05 D8 */ stfs f1, 0x5d8(r30) -/* 8073D6B0 D0 5E 05 DC */ stfs f2, 0x5dc(r30) -/* 8073D6B4 C0 1E 05 D4 */ lfs f0, 0x5d4(r30) -/* 8073D6B8 D0 1E 05 E0 */ stfs f0, 0x5e0(r30) -/* 8073D6BC C0 1E 05 D8 */ lfs f0, 0x5d8(r30) -/* 8073D6C0 D0 1E 05 E4 */ stfs f0, 0x5e4(r30) -/* 8073D6C4 C0 1E 05 DC */ lfs f0, 0x5dc(r30) -/* 8073D6C8 D0 1E 05 E8 */ stfs f0, 0x5e8(r30) -/* 8073D6CC 38 61 00 20 */ addi r3, r1, 0x20 -/* 8073D6D0 38 C1 00 2C */ addi r6, r1, 0x2c -/* 8073D6D4 4B B3 36 ED */ bl cLib_offsetPos__FP4cXyzPC4cXyzsPC4cXyz -/* 8073D6D8 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8073D6DC D0 1E 05 BC */ stfs f0, 0x5bc(r30) -/* 8073D6E0 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 8073D6E4 D0 1E 05 C0 */ stfs f0, 0x5c0(r30) -/* 8073D6E8 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8073D6EC D0 1E 05 C4 */ stfs f0, 0x5c4(r30) -/* 8073D6F0 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8073D6F4 D0 1E 05 C8 */ stfs f0, 0x5c8(r30) -/* 8073D6F8 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 8073D6FC D0 1E 05 CC */ stfs f0, 0x5cc(r30) -/* 8073D700 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8073D704 D0 1E 05 D0 */ stfs f0, 0x5d0(r30) -/* 8073D708 C0 1E 05 D4 */ lfs f0, 0x5d4(r30) -/* 8073D70C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8073D710 C0 1E 05 D8 */ lfs f0, 0x5d8(r30) -/* 8073D714 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8073D718 C0 1E 05 DC */ lfs f0, 0x5dc(r30) -/* 8073D71C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8073D720 C0 1E 05 BC */ lfs f0, 0x5bc(r30) -/* 8073D724 D0 01 00 08 */ stfs f0, 8(r1) -/* 8073D728 C0 1E 05 C0 */ lfs f0, 0x5c0(r30) -/* 8073D72C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8073D730 C0 1E 05 C4 */ lfs f0, 0x5c4(r30) -/* 8073D734 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8073D738 38 7F 02 48 */ addi r3, r31, 0x248 -/* 8073D73C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8073D740 38 A1 00 08 */ addi r5, r1, 8 -/* 8073D744 C0 3E 05 F4 */ lfs f1, 0x5f4(r30) -/* 8073D748 38 C0 00 00 */ li r6, 0 -/* 8073D74C 4B A4 33 95 */ bl Set__9dCamera_cF4cXyz4cXyzfs -/* 8073D750 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 8073D754 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 8073D758 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8073D75C 7C 08 03 A6 */ mtlr r0 -/* 8073D760 38 21 00 40 */ addi r1, r1, 0x40 -/* 8073D764 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopingCam__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopingCam__8daE_PH_cFv.s deleted file mode 100644 index 36f7bf2b636..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopingCam__8daE_PH_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8073D5C4: -/* 8073D5C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8073D5C8 7C 08 02 A6 */ mflr r0 -/* 8073D5CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8073D5D0 7C 66 1B 78 */ mr r6, r3 -/* 8073D5D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073D5D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073D5DC 88 03 5D B0 */ lbz r0, 0x5db0(r3) -/* 8073D5E0 7C 00 07 74 */ extsb r0, r0 -/* 8073D5E4 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 8073D5E8 7C 63 02 14 */ add r3, r3, r0 -/* 8073D5EC 80 63 5D 74 */ lwz r3, 0x5d74(r3) -/* 8073D5F0 C0 06 05 D4 */ lfs f0, 0x5d4(r6) -/* 8073D5F4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8073D5F8 C0 06 05 D8 */ lfs f0, 0x5d8(r6) -/* 8073D5FC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8073D600 C0 06 05 DC */ lfs f0, 0x5dc(r6) -/* 8073D604 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8073D608 C0 06 05 BC */ lfs f0, 0x5bc(r6) -/* 8073D60C D0 01 00 08 */ stfs f0, 8(r1) -/* 8073D610 C0 06 05 C0 */ lfs f0, 0x5c0(r6) -/* 8073D614 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8073D618 C0 06 05 C4 */ lfs f0, 0x5c4(r6) -/* 8073D61C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8073D620 38 63 02 48 */ addi r3, r3, 0x248 -/* 8073D624 38 81 00 14 */ addi r4, r1, 0x14 -/* 8073D628 38 A1 00 08 */ addi r5, r1, 8 -/* 8073D62C C0 26 05 F4 */ lfs f1, 0x5f4(r6) -/* 8073D630 38 C0 00 00 */ li r6, 0 -/* 8073D634 4B A4 34 AD */ bl Set__9dCamera_cF4cXyz4cXyzfs -/* 8073D638 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8073D63C 7C 08 03 A6 */ mtlr r0 -/* 8073D640 38 21 00 20 */ addi r1, r1, 0x20 -/* 8073D644 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/StopAction__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/StopAction__8daE_PH_cFv.s deleted file mode 100644 index f33e98875e7..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/StopAction__8daE_PH_cFv.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_8073FBDC: -/* 8073FBDC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8073FBE0 7C 08 02 A6 */ mflr r0 -/* 8073FBE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8073FBE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8073FBEC 4B C2 25 F1 */ bl _savegpr_29 -/* 8073FBF0 7C 7D 1B 78 */ mr r29, r3 -/* 8073FBF4 3C 80 80 74 */ lis r4, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073FBF8 3B E4 1B F4 */ addi r31, r4, lit_3767@l /* 0x80741BF4@l */ -/* 8073FBFC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073FC00 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073FC04 83 C4 5D AC */ lwz r30, 0x5dac(r4) -/* 8073FC08 88 03 05 B0 */ lbz r0, 0x5b0(r3) -/* 8073FC0C 2C 00 00 01 */ cmpwi r0, 1 -/* 8073FC10 41 82 00 F4 */ beq lbl_8073FD04 -/* 8073FC14 40 80 00 10 */ bge lbl_8073FC24 -/* 8073FC18 2C 00 00 00 */ cmpwi r0, 0 -/* 8073FC1C 40 80 00 14 */ bge lbl_8073FC30 -/* 8073FC20 48 00 01 38 */ b lbl_8073FD58 -lbl_8073FC24: -/* 8073FC24 2C 00 00 03 */ cmpwi r0, 3 -/* 8073FC28 40 80 01 30 */ bge lbl_8073FD58 -/* 8073FC2C 48 00 01 04 */ b lbl_8073FD30 -lbl_8073FC30: -/* 8073FC30 80 1D 06 28 */ lwz r0, 0x628(r29) -/* 8073FC34 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073FC38 41 82 00 0C */ beq lbl_8073FC44 -/* 8073FC3C 2C 00 00 0B */ cmpwi r0, 0xb -/* 8073FC40 40 82 00 20 */ bne lbl_8073FC60 -lbl_8073FC44: -/* 8073FC44 A8 9D 06 66 */ lha r4, 0x666(r29) -/* 8073FC48 A8 7D 06 12 */ lha r3, 0x612(r29) -/* 8073FC4C 38 03 10 00 */ addi r0, r3, 0x1000 -/* 8073FC50 7C 00 07 34 */ extsh r0, r0 -/* 8073FC54 7C 04 02 14 */ add r0, r4, r0 -/* 8073FC58 B0 1D 06 66 */ sth r0, 0x666(r29) -/* 8073FC5C 48 00 00 1C */ b lbl_8073FC78 -lbl_8073FC60: -/* 8073FC60 A8 9D 06 66 */ lha r4, 0x666(r29) -/* 8073FC64 A8 7D 06 12 */ lha r3, 0x612(r29) -/* 8073FC68 38 03 05 00 */ addi r0, r3, 0x500 -/* 8073FC6C 7C 00 07 34 */ extsh r0, r0 -/* 8073FC70 7C 04 02 14 */ add r0, r4, r0 -/* 8073FC74 B0 1D 06 66 */ sth r0, 0x666(r29) -lbl_8073FC78: -/* 8073FC78 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070462@ha */ -/* 8073FC7C 38 03 04 62 */ addi r0, r3, 0x0462 /* 0x00070462@l */ -/* 8073FC80 90 01 00 08 */ stw r0, 8(r1) -/* 8073FC84 38 7D 06 74 */ addi r3, r29, 0x674 -/* 8073FC88 38 81 00 08 */ addi r4, r1, 8 -/* 8073FC8C A8 BD 06 12 */ lha r5, 0x612(r29) -/* 8073FC90 38 A5 05 00 */ addi r5, r5, 0x500 -/* 8073FC94 38 C0 FF FF */ li r6, -1 -/* 8073FC98 81 9D 06 74 */ lwz r12, 0x674(r29) -/* 8073FC9C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8073FCA0 7D 89 03 A6 */ mtctr r12 -/* 8073FCA4 4E 80 04 21 */ bctrl -/* 8073FCA8 A8 1D 05 AE */ lha r0, 0x5ae(r29) -/* 8073FCAC 2C 00 00 00 */ cmpwi r0, 0 -/* 8073FCB0 40 82 00 18 */ bne lbl_8073FCC8 -/* 8073FCB4 38 7D 04 D4 */ addi r3, r29, 0x4d4 -/* 8073FCB8 C0 3D 04 AC */ lfs f1, 0x4ac(r29) -/* 8073FCBC C0 5F 00 08 */ lfs f2, 8(r31) -/* 8073FCC0 C0 7F 00 CC */ lfs f3, 0xcc(r31) -/* 8073FCC4 4B B2 FD 79 */ bl cLib_addCalc2__FPffff -lbl_8073FCC8: -/* 8073FCC8 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 8073FCCC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8073FCD0 41 82 00 88 */ beq lbl_8073FD58 -/* 8073FCD4 80 1D 06 28 */ lwz r0, 0x628(r29) -/* 8073FCD8 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073FCDC 40 82 00 7C */ bne lbl_8073FD58 -/* 8073FCE0 88 7D 05 B0 */ lbz r3, 0x5b0(r29) -/* 8073FCE4 38 03 00 01 */ addi r0, r3, 1 -/* 8073FCE8 98 1D 05 B0 */ stb r0, 0x5b0(r29) -/* 8073FCEC C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8073FCF0 D0 1D 06 40 */ stfs f0, 0x640(r29) -/* 8073FCF4 C0 1F 00 B4 */ lfs f0, 0xb4(r31) -/* 8073FCF8 D0 1D 06 24 */ stfs f0, 0x624(r29) -/* 8073FCFC D0 1D 06 20 */ stfs f0, 0x620(r29) -/* 8073FD00 48 00 00 58 */ b lbl_8073FD58 -lbl_8073FD04: -/* 8073FD04 4B FF EC 21 */ bl DownBoots__8daE_PH_cFv -/* 8073FD08 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 8073FD0C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8073FD10 41 82 00 48 */ beq lbl_8073FD58 -/* 8073FD14 80 1D 06 28 */ lwz r0, 0x628(r29) -/* 8073FD18 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073FD1C 40 82 00 3C */ bne lbl_8073FD58 -/* 8073FD20 C0 1F 00 B4 */ lfs f0, 0xb4(r31) -/* 8073FD24 D0 1D 06 24 */ stfs f0, 0x624(r29) -/* 8073FD28 D0 1D 06 20 */ stfs f0, 0x620(r29) -/* 8073FD2C 48 00 00 2C */ b lbl_8073FD58 -lbl_8073FD30: -/* 8073FD30 4B FF ED 21 */ bl UpBoots__8daE_PH_cFv -/* 8073FD34 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 8073FD38 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8073FD3C 41 82 00 1C */ beq lbl_8073FD58 -/* 8073FD40 80 1D 06 28 */ lwz r0, 0x628(r29) -/* 8073FD44 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073FD48 40 82 00 10 */ bne lbl_8073FD58 -/* 8073FD4C C0 1F 00 B4 */ lfs f0, 0xb4(r31) -/* 8073FD50 D0 1D 06 24 */ stfs f0, 0x624(r29) -/* 8073FD54 D0 1D 06 20 */ stfs f0, 0x620(r29) -lbl_8073FD58: -/* 8073FD58 39 61 00 20 */ addi r11, r1, 0x20 -/* 8073FD5C 4B C2 24 CD */ bl _restgpr_29 -/* 8073FD60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8073FD64 7C 08 03 A6 */ mtlr r0 -/* 8073FD68 38 21 00 20 */ addi r1, r1, 0x20 -/* 8073FD6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ToumeiAction__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ToumeiAction__8daE_PH_cFv.s deleted file mode 100644 index 737bbf08f6b..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ToumeiAction__8daE_PH_cFv.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_807408C0: -/* 807408C0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 807408C4 7C 08 02 A6 */ mflr r0 -/* 807408C8 90 01 00 44 */ stw r0, 0x44(r1) -/* 807408CC 39 61 00 40 */ addi r11, r1, 0x40 -/* 807408D0 4B C2 19 09 */ bl _savegpr_28 -/* 807408D4 7C 7D 1B 78 */ mr r29, r3 -/* 807408D8 3C 80 80 74 */ lis r4, lit_3767@ha /* 0x80741BF4@ha */ -/* 807408DC 3B C4 1B F4 */ addi r30, r4, lit_3767@l /* 0x80741BF4@l */ -/* 807408E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807408E4 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807408E8 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 807408EC 4B 8D 9E F5 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 807408F0 C0 1E 01 08 */ lfs f0, 0x108(r30) -/* 807408F4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807408F8 41 81 00 18 */ bgt lbl_80740910 -/* 807408FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80740900 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740904 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 80740908 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 8074090C 41 82 00 0C */ beq lbl_80740918 -lbl_80740910: -/* 80740910 38 00 00 00 */ li r0, 0 -/* 80740914 90 1D 05 5C */ stw r0, 0x55c(r29) -lbl_80740918: -/* 80740918 38 7D 09 74 */ addi r3, r29, 0x974 -/* 8074091C 4B 94 3B 45 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80740920 28 03 00 00 */ cmplwi r3, 0 -/* 80740924 41 82 01 40 */ beq lbl_80740A64 -/* 80740928 A8 1D 05 AE */ lha r0, 0x5ae(r29) -/* 8074092C 2C 00 00 00 */ cmpwi r0, 0 -/* 80740930 40 82 01 34 */ bne lbl_80740A64 -/* 80740934 38 7D 09 74 */ addi r3, r29, 0x974 -/* 80740938 81 9D 09 B0 */ lwz r12, 0x9b0(r29) -/* 8074093C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80740940 7D 89 03 A6 */ mtctr r12 -/* 80740944 4E 80 04 21 */ bctrl -/* 80740948 38 00 00 14 */ li r0, 0x14 -/* 8074094C B0 1D 05 AE */ sth r0, 0x5ae(r29) -/* 80740950 38 00 01 2C */ li r0, 0x12c -/* 80740954 B0 1D 05 AC */ sth r0, 0x5ac(r29) -/* 80740958 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8074095C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740960 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80740964 38 80 00 00 */ li r4, 0 -/* 80740968 90 81 00 08 */ stw r4, 8(r1) -/* 8074096C 38 00 FF FF */ li r0, -1 -/* 80740970 90 01 00 0C */ stw r0, 0xc(r1) -/* 80740974 90 81 00 10 */ stw r4, 0x10(r1) -/* 80740978 90 81 00 14 */ stw r4, 0x14(r1) -/* 8074097C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80740980 38 80 00 00 */ li r4, 0 -/* 80740984 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000878C@ha */ -/* 80740988 38 A5 87 8C */ addi r5, r5, 0x878C /* 0x0000878C@l */ -/* 8074098C 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 80740990 38 FD 01 0C */ addi r7, r29, 0x10c -/* 80740994 39 1D 04 E4 */ addi r8, r29, 0x4e4 -/* 80740998 39 20 00 00 */ li r9, 0 -/* 8074099C 39 40 00 FF */ li r10, 0xff -/* 807409A0 C0 3E 00 04 */ lfs f1, 4(r30) -/* 807409A4 4B 90 C0 ED */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 807409A8 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 807409AC 38 80 00 00 */ li r4, 0 -/* 807409B0 90 81 00 08 */ stw r4, 8(r1) -/* 807409B4 38 00 FF FF */ li r0, -1 -/* 807409B8 90 01 00 0C */ stw r0, 0xc(r1) -/* 807409BC 90 81 00 10 */ stw r4, 0x10(r1) -/* 807409C0 90 81 00 14 */ stw r4, 0x14(r1) -/* 807409C4 90 81 00 18 */ stw r4, 0x18(r1) -/* 807409C8 38 80 00 00 */ li r4, 0 -/* 807409CC 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000878D@ha */ -/* 807409D0 38 A5 87 8D */ addi r5, r5, 0x878D /* 0x0000878D@l */ -/* 807409D4 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 807409D8 38 FD 01 0C */ addi r7, r29, 0x10c -/* 807409DC 39 1D 04 E4 */ addi r8, r29, 0x4e4 -/* 807409E0 39 20 00 00 */ li r9, 0 -/* 807409E4 39 40 00 FF */ li r10, 0xff -/* 807409E8 C0 3E 00 04 */ lfs f1, 4(r30) -/* 807409EC 4B 90 C0 A5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 807409F0 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 807409F4 38 80 00 00 */ li r4, 0 -/* 807409F8 90 81 00 08 */ stw r4, 8(r1) -/* 807409FC 38 00 FF FF */ li r0, -1 -/* 80740A00 90 01 00 0C */ stw r0, 0xc(r1) -/* 80740A04 90 81 00 10 */ stw r4, 0x10(r1) -/* 80740A08 90 81 00 14 */ stw r4, 0x14(r1) -/* 80740A0C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80740A10 38 80 00 00 */ li r4, 0 -/* 80740A14 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000878E@ha */ -/* 80740A18 38 A5 87 8E */ addi r5, r5, 0x878E /* 0x0000878E@l */ -/* 80740A1C 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 80740A20 38 FD 01 0C */ addi r7, r29, 0x10c -/* 80740A24 39 1D 04 E4 */ addi r8, r29, 0x4e4 -/* 80740A28 39 20 00 00 */ li r9, 0 -/* 80740A2C 39 40 00 FF */ li r10, 0xff -/* 80740A30 C0 3E 00 04 */ lfs f1, 4(r30) -/* 80740A34 4B 90 C0 5D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80740A38 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070461@ha */ -/* 80740A3C 38 03 04 61 */ addi r0, r3, 0x0461 /* 0x00070461@l */ -/* 80740A40 90 01 00 20 */ stw r0, 0x20(r1) -/* 80740A44 38 7D 06 74 */ addi r3, r29, 0x674 -/* 80740A48 38 81 00 20 */ addi r4, r1, 0x20 -/* 80740A4C 38 A0 00 00 */ li r5, 0 -/* 80740A50 38 C0 FF FF */ li r6, -1 -/* 80740A54 81 9D 06 74 */ lwz r12, 0x674(r29) -/* 80740A58 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80740A5C 7D 89 03 A6 */ mtctr r12 -/* 80740A60 4E 80 04 21 */ bctrl -lbl_80740A64: -/* 80740A64 A8 7D 05 AE */ lha r3, 0x5ae(r29) -/* 80740A68 38 03 FF FF */ addi r0, r3, -1 -/* 80740A6C B0 1D 05 AE */ sth r0, 0x5ae(r29) -/* 80740A70 A8 1D 05 AE */ lha r0, 0x5ae(r29) -/* 80740A74 2C 00 00 00 */ cmpwi r0, 0 -/* 80740A78 41 81 00 10 */ bgt lbl_80740A88 -/* 80740A7C 38 00 00 00 */ li r0, 0 -/* 80740A80 B0 1D 05 AE */ sth r0, 0x5ae(r29) -/* 80740A84 48 00 00 54 */ b lbl_80740AD8 -lbl_80740A88: -/* 80740A88 C0 5E 00 00 */ lfs f2, 0(r30) -/* 80740A8C D0 41 00 24 */ stfs f2, 0x24(r1) -/* 80740A90 3C 60 80 74 */ lis r3, l_HIO@ha /* 0x80741DD0@ha */ -/* 80740A94 38 63 1D D0 */ addi r3, r3, l_HIO@l /* 0x80741DD0@l */ -/* 80740A98 C0 23 00 08 */ lfs f1, 8(r3) -/* 80740A9C C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 80740AA0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80740AA4 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80740AA8 D0 41 00 2C */ stfs f2, 0x2c(r1) -/* 80740AAC 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 80740AB0 28 1D 00 00 */ cmplwi r29, 0 -/* 80740AB4 41 82 00 0C */ beq lbl_80740AC0 -/* 80740AB8 80 9D 00 04 */ lwz r4, 4(r29) -/* 80740ABC 48 00 00 08 */ b lbl_80740AC4 -lbl_80740AC0: -/* 80740AC0 38 80 FF FF */ li r4, -1 -lbl_80740AC4: -/* 80740AC4 38 A1 00 24 */ addi r5, r1, 0x24 -/* 80740AC8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80740ACC 81 8C 01 38 */ lwz r12, 0x138(r12) -/* 80740AD0 7D 89 03 A6 */ mtctr r12 -/* 80740AD4 4E 80 04 21 */ bctrl -lbl_80740AD8: -/* 80740AD8 A8 7D 05 AC */ lha r3, 0x5ac(r29) -/* 80740ADC 38 03 FF FF */ addi r0, r3, -1 -/* 80740AE0 B0 1D 05 AC */ sth r0, 0x5ac(r29) -/* 80740AE4 A8 1D 05 AC */ lha r0, 0x5ac(r29) -/* 80740AE8 2C 00 00 00 */ cmpwi r0, 0 -/* 80740AEC 41 81 00 0C */ bgt lbl_80740AF8 -/* 80740AF0 38 00 00 00 */ li r0, 0 -/* 80740AF4 B0 1D 05 AC */ sth r0, 0x5ac(r29) -lbl_80740AF8: -/* 80740AF8 38 7D 0A 98 */ addi r3, r29, 0xa98 -/* 80740AFC 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80740B00 4B B2 EB 49 */ bl SetC__8cM3dGSphFRC4cXyz -/* 80740B04 38 7D 0A 98 */ addi r3, r29, 0xa98 -/* 80740B08 C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 80740B0C 4B B2 EB FD */ bl SetR__8cM3dGSphFf -/* 80740B10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80740B14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80740B18 38 63 23 3C */ addi r3, r3, 0x233c -/* 80740B1C 38 9D 09 74 */ addi r4, r29, 0x974 -/* 80740B20 4B B2 40 89 */ bl Set__4cCcSFP8cCcD_Obj -/* 80740B24 39 61 00 40 */ addi r11, r1, 0x40 -/* 80740B28 4B C2 16 FD */ bl _restgpr_28 -/* 80740B2C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80740B30 7C 08 03 A6 */ mtlr r0 -/* 80740B34 38 21 00 40 */ addi r1, r1, 0x40 -/* 80740B38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/UpBoots__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/UpBoots__8daE_PH_cFv.s deleted file mode 100644 index 5585c787060..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/UpBoots__8daE_PH_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8073EA50: -/* 8073EA50 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8073EA54 7C 08 02 A6 */ mflr r0 -/* 8073EA58 90 01 00 34 */ stw r0, 0x34(r1) -/* 8073EA5C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8073EA60 4B C2 37 7D */ bl _savegpr_29 -/* 8073EA64 7C 7F 1B 78 */ mr r31, r3 -/* 8073EA68 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073EA6C 3B C3 1B F4 */ addi r30, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073EA70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073EA74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073EA78 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 8073EA7C A8 7F 06 66 */ lha r3, 0x666(r31) -/* 8073EA80 38 03 10 00 */ addi r0, r3, 0x1000 -/* 8073EA84 B0 1F 06 66 */ sth r0, 0x666(r31) -/* 8073EA88 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070462@ha */ -/* 8073EA8C 38 03 04 62 */ addi r0, r3, 0x0462 /* 0x00070462@l */ -/* 8073EA90 90 01 00 08 */ stw r0, 8(r1) -/* 8073EA94 A8 1F 06 12 */ lha r0, 0x612(r31) -/* 8073EA98 C8 3E 00 80 */ lfd f1, 0x80(r30) -/* 8073EA9C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073EAA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073EAA4 3C 00 43 30 */ lis r0, 0x4330 -/* 8073EAA8 90 01 00 10 */ stw r0, 0x10(r1) -/* 8073EAAC C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8073EAB0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8073EAB4 C0 1F 06 24 */ lfs f0, 0x624(r31) -/* 8073EAB8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8073EABC 4B C2 35 F1 */ bl __cvt_fp2unsigned -/* 8073EAC0 7C 65 1B 78 */ mr r5, r3 -/* 8073EAC4 38 7F 06 74 */ addi r3, r31, 0x674 -/* 8073EAC8 38 81 00 08 */ addi r4, r1, 8 -/* 8073EACC 38 C0 FF FF */ li r6, -1 -/* 8073EAD0 81 9F 06 74 */ lwz r12, 0x674(r31) -/* 8073EAD4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8073EAD8 7D 89 03 A6 */ mtctr r12 -/* 8073EADC 4E 80 04 21 */ bctrl -/* 8073EAE0 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8073EAE4 D0 1F 06 34 */ stfs f0, 0x634(r31) -/* 8073EAE8 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 8073EAEC C0 1E 00 88 */ lfs f0, 0x88(r30) -/* 8073EAF0 EC 01 00 2A */ fadds f0, f1, f0 -/* 8073EAF4 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 8073EAF8 80 1D 05 70 */ lwz r0, 0x570(r29) -/* 8073EAFC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8073EB00 41 82 00 28 */ beq lbl_8073EB28 -/* 8073EB04 80 1F 06 28 */ lwz r0, 0x628(r31) -/* 8073EB08 2C 00 00 0C */ cmpwi r0, 0xc -/* 8073EB0C 40 82 00 1C */ bne lbl_8073EB28 -/* 8073EB10 88 7F 05 B0 */ lbz r3, 0x5b0(r31) -/* 8073EB14 38 03 FF FF */ addi r0, r3, -1 -/* 8073EB18 98 1F 05 B0 */ stb r0, 0x5b0(r31) -/* 8073EB1C C0 1E 00 B0 */ lfs f0, 0xb0(r30) -/* 8073EB20 D0 1F 06 24 */ stfs f0, 0x624(r31) -/* 8073EB24 D0 1F 06 20 */ stfs f0, 0x620(r31) -lbl_8073EB28: -/* 8073EB28 C0 1F 06 24 */ lfs f0, 0x624(r31) -/* 8073EB2C 80 7F 07 1C */ lwz r3, 0x71c(r31) -/* 8073EB30 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8073EB34 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 8073EB38 C0 1F 06 40 */ lfs f0, 0x640(r31) -/* 8073EB3C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073EB40 40 81 00 0C */ ble lbl_8073EB4C -/* 8073EB44 38 00 00 00 */ li r0, 0 -/* 8073EB48 98 1F 05 B0 */ stb r0, 0x5b0(r31) -lbl_8073EB4C: -/* 8073EB4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8073EB50 4B C2 36 D9 */ bl _restgpr_29 -/* 8073EB54 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8073EB58 7C 08 03 A6 */ mtlr r0 -/* 8073EB5C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8073EB60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__ct__12daE_PH_HIO_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__ct__12daE_PH_HIO_cFv.s deleted file mode 100644 index d4435f24130..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__ct__12daE_PH_HIO_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8073D44C: -/* 8073D44C 3C 80 80 74 */ lis r4, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073D450 38 A4 1B F4 */ addi r5, r4, lit_3767@l /* 0x80741BF4@l */ -/* 8073D454 3C 80 80 74 */ lis r4, __vt__12daE_PH_HIO_c@ha /* 0x80741DA8@ha */ -/* 8073D458 38 04 1D A8 */ addi r0, r4, __vt__12daE_PH_HIO_c@l /* 0x80741DA8@l */ -/* 8073D45C 90 03 00 00 */ stw r0, 0(r3) -/* 8073D460 38 00 FF FF */ li r0, -1 -/* 8073D464 98 03 00 04 */ stb r0, 4(r3) -/* 8073D468 C0 05 00 00 */ lfs f0, 0(r5) -/* 8073D46C D0 03 00 08 */ stfs f0, 8(r3) -/* 8073D470 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8073D474 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8073D478 C0 05 00 04 */ lfs f0, 4(r5) -/* 8073D47C D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8073D480 C0 05 00 08 */ lfs f0, 8(r5) -/* 8073D484 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8073D488 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 7d4e84655cc..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80741AD4: -/* 80741AD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80741AD8 7C 08 02 A6 */ mflr r0 -/* 80741ADC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80741AE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80741AE4 93 C1 00 08 */ stw r30, 8(r1) -/* 80741AE8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80741AEC 7C 9F 23 78 */ mr r31, r4 -/* 80741AF0 41 82 00 38 */ beq lbl_80741B28 -/* 80741AF4 3C 80 80 74 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80741D84@ha */ -/* 80741AF8 38 84 1D 84 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80741D84@l */ -/* 80741AFC 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80741B00 38 04 00 0C */ addi r0, r4, 0xc -/* 80741B04 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80741B08 38 04 00 18 */ addi r0, r4, 0x18 -/* 80741B0C 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80741B10 38 80 00 00 */ li r4, 0 -/* 80741B14 4B 93 44 81 */ bl __dt__9dBgS_AcchFv -/* 80741B18 7F E0 07 35 */ extsh. r0, r31 -/* 80741B1C 40 81 00 0C */ ble lbl_80741B28 -/* 80741B20 7F C3 F3 78 */ mr r3, r30 -/* 80741B24 4B B8 D2 19 */ bl __dl__FPv -lbl_80741B28: -/* 80741B28 7F C3 F3 78 */ mr r3, r30 -/* 80741B2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80741B30 83 C1 00 08 */ lwz r30, 8(r1) -/* 80741B34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80741B38 7C 08 03 A6 */ mtlr r0 -/* 80741B3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80741B40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12daE_PH_HIO_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12daE_PH_HIO_cFv.s deleted file mode 100644 index 476c0c23715..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12daE_PH_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80741B4C: -/* 80741B4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80741B50 7C 08 02 A6 */ mflr r0 -/* 80741B54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80741B58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80741B5C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80741B60 41 82 00 1C */ beq lbl_80741B7C -/* 80741B64 3C A0 80 74 */ lis r5, __vt__12daE_PH_HIO_c@ha /* 0x80741DA8@ha */ -/* 80741B68 38 05 1D A8 */ addi r0, r5, __vt__12daE_PH_HIO_c@l /* 0x80741DA8@l */ -/* 80741B6C 90 1F 00 00 */ stw r0, 0(r31) -/* 80741B70 7C 80 07 35 */ extsh. r0, r4 -/* 80741B74 40 81 00 08 */ ble lbl_80741B7C -/* 80741B78 4B B8 D1 C5 */ bl __dl__FPv -lbl_80741B7C: -/* 80741B7C 7F E3 FB 78 */ mr r3, r31 -/* 80741B80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80741B84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80741B88 7C 08 03 A6 */ mtlr r0 -/* 80741B8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80741B90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGAabFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGAabFv.s deleted file mode 100644 index 5cf37ed09e3..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80741A8C: -/* 80741A8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80741A90 7C 08 02 A6 */ mflr r0 -/* 80741A94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80741A98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80741A9C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80741AA0 41 82 00 1C */ beq lbl_80741ABC -/* 80741AA4 3C A0 80 74 */ lis r5, __vt__8cM3dGAab@ha /* 0x80741D78@ha */ -/* 80741AA8 38 05 1D 78 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80741D78@l */ -/* 80741AAC 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80741AB0 7C 80 07 35 */ extsh. r0, r4 -/* 80741AB4 40 81 00 08 */ ble lbl_80741ABC -/* 80741AB8 4B B8 D2 85 */ bl __dl__FPv -lbl_80741ABC: -/* 80741ABC 7F E3 FB 78 */ mr r3, r31 -/* 80741AC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80741AC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80741AC8 7C 08 03 A6 */ mtlr r0 -/* 80741ACC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80741AD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGSphFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGSphFv.s deleted file mode 100644 index cca285fd605..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80741A44: -/* 80741A44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80741A48 7C 08 02 A6 */ mflr r0 -/* 80741A4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80741A50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80741A54 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80741A58 41 82 00 1C */ beq lbl_80741A74 -/* 80741A5C 3C A0 80 74 */ lis r5, __vt__8cM3dGSph@ha /* 0x80741D6C@ha */ -/* 80741A60 38 05 1D 6C */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80741D6C@l */ -/* 80741A64 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80741A68 7C 80 07 35 */ extsh. r0, r4 -/* 80741A6C 40 81 00 08 */ ble lbl_80741A74 -/* 80741A70 4B B8 D2 CD */ bl __dl__FPv -lbl_80741A74: -/* 80741A74 7F E3 FB 78 */ mr r3, r31 -/* 80741A78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80741A7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80741A80 7C 08 03 A6 */ mtlr r0 -/* 80741A84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80741A88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__sinit_d_a_e_ph_cpp.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__sinit_d_a_e_ph_cpp.s deleted file mode 100644 index 5a4992bcb1f..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__sinit_d_a_e_ph_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80741B94: -/* 80741B94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80741B98 7C 08 02 A6 */ mflr r0 -/* 80741B9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80741BA0 3C 60 80 74 */ lis r3, l_HIO@ha /* 0x80741DD0@ha */ -/* 80741BA4 38 63 1D D0 */ addi r3, r3, l_HIO@l /* 0x80741DD0@l */ -/* 80741BA8 4B FF B8 A5 */ bl __ct__12daE_PH_HIO_cFv -/* 80741BAC 3C 80 80 74 */ lis r4, __dt__12daE_PH_HIO_cFv@ha /* 0x80741B4C@ha */ -/* 80741BB0 38 84 1B 4C */ addi r4, r4, __dt__12daE_PH_HIO_cFv@l /* 0x80741B4C@l */ -/* 80741BB4 3C A0 80 74 */ lis r5, lit_3762@ha /* 0x80741DC4@ha */ -/* 80741BB8 38 A5 1D C4 */ addi r5, r5, lit_3762@l /* 0x80741DC4@l */ -/* 80741BBC 4B FF B8 1D */ bl __register_global_object -/* 80741BC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80741BC4 7C 08 03 A6 */ mtlr r0 -/* 80741BC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80741BCC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/create__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/create__8daE_PH_cFv.s deleted file mode 100644 index 816f25bdbb1..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/create__8daE_PH_cFv.s +++ /dev/null @@ -1,416 +0,0 @@ -lbl_80741428: -/* 80741428 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8074142C 7C 08 02 A6 */ mflr r0 -/* 80741430 90 01 00 54 */ stw r0, 0x54(r1) -/* 80741434 39 61 00 50 */ addi r11, r1, 0x50 -/* 80741438 4B C2 0D A1 */ bl _savegpr_28 -/* 8074143C 7C 7D 1B 78 */ mr r29, r3 -/* 80741440 3C 80 80 74 */ lis r4, lit_3767@ha /* 0x80741BF4@ha */ -/* 80741444 3B E4 1B F4 */ addi r31, r4, lit_3767@l /* 0x80741BF4@l */ -/* 80741448 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8074144C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80741450 40 82 00 E8 */ bne lbl_80741538 -/* 80741454 7F A0 EB 79 */ or. r0, r29, r29 -/* 80741458 41 82 00 D4 */ beq lbl_8074152C -/* 8074145C 7C 1C 03 78 */ mr r28, r0 -/* 80741460 4B 8D 77 05 */ bl __ct__10fopAc_ac_cFv -/* 80741464 38 7C 06 74 */ addi r3, r28, 0x674 -/* 80741468 4B B7 FA FD */ bl __ct__15Z2CreatureEnemyFv -/* 8074146C 38 7C 07 20 */ addi r3, r28, 0x720 -/* 80741470 4B 93 4A 3D */ bl __ct__12dBgS_AcchCirFv -/* 80741474 3B DC 07 60 */ addi r30, r28, 0x760 -/* 80741478 7F C3 F3 78 */ mr r3, r30 -/* 8074147C 4B 93 4C 25 */ bl __ct__9dBgS_AcchFv -/* 80741480 3C 60 80 74 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80741D84@ha */ -/* 80741484 38 63 1D 84 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80741D84@l */ -/* 80741488 90 7E 00 10 */ stw r3, 0x10(r30) -/* 8074148C 38 03 00 0C */ addi r0, r3, 0xc -/* 80741490 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80741494 38 03 00 18 */ addi r0, r3, 0x18 -/* 80741498 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8074149C 38 7E 00 14 */ addi r3, r30, 0x14 -/* 807414A0 4B 93 79 C9 */ bl SetObj__16dBgS_PolyPassChkFv -/* 807414A4 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 807414A8 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 807414AC 90 1C 09 50 */ stw r0, 0x950(r28) -/* 807414B0 38 7C 09 54 */ addi r3, r28, 0x954 -/* 807414B4 4B 94 22 AD */ bl __ct__10dCcD_GSttsFv -/* 807414B8 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 807414BC 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 807414C0 90 7C 09 50 */ stw r3, 0x950(r28) -/* 807414C4 38 03 00 20 */ addi r0, r3, 0x20 -/* 807414C8 90 1C 09 54 */ stw r0, 0x954(r28) -/* 807414CC 3B 9C 09 74 */ addi r28, r28, 0x974 -/* 807414D0 7F 83 E3 78 */ mr r3, r28 -/* 807414D4 4B 94 25 55 */ bl __ct__12dCcD_GObjInfFv -/* 807414D8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 807414DC 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 807414E0 90 1C 01 20 */ stw r0, 0x120(r28) -/* 807414E4 3C 60 80 74 */ lis r3, __vt__8cM3dGAab@ha /* 0x80741D78@ha */ -/* 807414E8 38 03 1D 78 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80741D78@l */ -/* 807414EC 90 1C 01 1C */ stw r0, 0x11c(r28) -/* 807414F0 3C 60 80 74 */ lis r3, __vt__8cM3dGSph@ha /* 0x80741D6C@ha */ -/* 807414F4 38 03 1D 6C */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80741D6C@l */ -/* 807414F8 90 1C 01 34 */ stw r0, 0x134(r28) -/* 807414FC 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80741500 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80741504 90 7C 01 20 */ stw r3, 0x120(r28) -/* 80741508 38 03 00 58 */ addi r0, r3, 0x58 -/* 8074150C 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80741510 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80741514 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80741518 90 7C 00 3C */ stw r3, 0x3c(r28) -/* 8074151C 38 03 00 2C */ addi r0, r3, 0x2c -/* 80741520 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80741524 38 03 00 84 */ addi r0, r3, 0x84 -/* 80741528 90 1C 01 34 */ stw r0, 0x134(r28) -lbl_8074152C: -/* 8074152C 80 1D 04 A0 */ lwz r0, 0x4a0(r29) -/* 80741530 60 00 00 08 */ ori r0, r0, 8 -/* 80741534 90 1D 04 A0 */ stw r0, 0x4a0(r29) -lbl_80741538: -/* 80741538 38 7D 06 6C */ addi r3, r29, 0x66c -/* 8074153C 3C 80 80 74 */ lis r4, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 80741540 38 84 1D 0C */ addi r4, r4, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 80741544 4B 8E B9 79 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80741548 7C 7E 1B 78 */ mr r30, r3 -/* 8074154C 2C 1E 00 04 */ cmpwi r30, 4 -/* 80741550 40 82 04 D8 */ bne lbl_80741A28 -/* 80741554 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80741558 54 00 07 3E */ clrlwi r0, r0, 0x1c -/* 8074155C 98 1D 06 60 */ stb r0, 0x660(r29) -/* 80741560 38 60 00 02 */ li r3, 2 -/* 80741564 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80741568 7C 04 07 74 */ extsb r4, r0 -/* 8074156C 4B 8E C4 C5 */ bl dComIfGs_isZoneSwitch__Fii -/* 80741570 2C 03 00 00 */ cmpwi r3, 0 -/* 80741574 41 82 00 18 */ beq lbl_8074158C -/* 80741578 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 8074157C 28 00 00 04 */ cmplwi r0, 4 -/* 80741580 40 82 00 0C */ bne lbl_8074158C -/* 80741584 38 60 00 05 */ li r3, 5 -/* 80741588 48 00 04 A4 */ b lbl_80741A2C -lbl_8074158C: -/* 8074158C 38 60 00 02 */ li r3, 2 -/* 80741590 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80741594 7C 04 07 74 */ extsb r4, r0 -/* 80741598 4B 8E C4 99 */ bl dComIfGs_isZoneSwitch__Fii -/* 8074159C 2C 03 00 00 */ cmpwi r3, 0 -/* 807415A0 41 82 00 18 */ beq lbl_807415B8 -/* 807415A4 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 807415A8 28 00 00 05 */ cmplwi r0, 5 -/* 807415AC 40 82 00 0C */ bne lbl_807415B8 -/* 807415B0 38 60 00 05 */ li r3, 5 -/* 807415B4 48 00 04 78 */ b lbl_80741A2C -lbl_807415B8: -/* 807415B8 7F A3 EB 78 */ mr r3, r29 -/* 807415BC 3C 80 80 74 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x8073D9EC@ha */ -/* 807415C0 38 84 D9 EC */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x8073D9EC@l */ -/* 807415C4 38 A0 11 E0 */ li r5, 0x11e0 -/* 807415C8 4B 8D 8E E9 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 807415CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807415D0 40 82 00 0C */ bne lbl_807415DC -/* 807415D4 38 60 00 05 */ li r3, 5 -/* 807415D8 48 00 04 54 */ b lbl_80741A2C -lbl_807415DC: -/* 807415DC C0 1F 00 00 */ lfs f0, 0(r31) -/* 807415E0 D0 1D 05 30 */ stfs f0, 0x530(r29) -/* 807415E4 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 807415E8 54 00 E7 3E */ rlwinm r0, r0, 0x1c, 0x1c, 0x1f -/* 807415EC B0 1D 05 B4 */ sth r0, 0x5b4(r29) -/* 807415F0 A8 7D 05 B4 */ lha r3, 0x5b4(r29) -/* 807415F4 7C 60 07 35 */ extsh. r0, r3 -/* 807415F8 41 82 00 0C */ beq lbl_80741604 -/* 807415FC 2C 03 00 0F */ cmpwi r3, 0xf -/* 80741600 40 82 00 0C */ bne lbl_8074160C -lbl_80741604: -/* 80741604 38 00 00 46 */ li r0, 0x46 -/* 80741608 B0 1D 05 B4 */ sth r0, 0x5b4(r29) -lbl_8074160C: -/* 8074160C 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 80741610 28 00 00 03 */ cmplwi r0, 3 -/* 80741614 41 82 00 34 */ beq lbl_80741648 -/* 80741618 28 00 00 02 */ cmplwi r0, 2 -/* 8074161C 41 82 00 2C */ beq lbl_80741648 -/* 80741620 28 00 00 04 */ cmplwi r0, 4 -/* 80741624 41 82 00 24 */ beq lbl_80741648 -/* 80741628 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 8074162C 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80741630 98 1D 06 61 */ stb r0, 0x661(r29) -/* 80741634 88 7D 06 61 */ lbz r3, 0x661(r29) -/* 80741638 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 8074163C 7C 04 07 74 */ extsb r4, r0 -/* 80741640 4B 91 01 AD */ bl dPath_GetRoomPath__Fii -/* 80741644 90 7D 06 44 */ stw r3, 0x644(r29) -lbl_80741648: -/* 80741648 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 8074164C 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80741650 98 1D 06 63 */ stb r0, 0x663(r29) -/* 80741654 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80741658 54 00 46 3E */ srwi r0, r0, 0x18 -/* 8074165C 98 1D 06 64 */ stb r0, 0x664(r29) -/* 80741660 88 1D 06 63 */ lbz r0, 0x663(r29) -/* 80741664 28 00 00 FF */ cmplwi r0, 0xff -/* 80741668 40 82 00 0C */ bne lbl_80741674 -/* 8074166C 38 00 00 00 */ li r0, 0 -/* 80741670 98 1D 06 63 */ stb r0, 0x663(r29) -lbl_80741674: -/* 80741674 88 1D 06 64 */ lbz r0, 0x664(r29) -/* 80741678 28 00 00 FF */ cmplwi r0, 0xff -/* 8074167C 40 82 00 0C */ bne lbl_80741688 -/* 80741680 38 00 00 00 */ li r0, 0 -/* 80741684 98 1D 06 64 */ stb r0, 0x664(r29) -lbl_80741688: -/* 80741688 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 8074168C 80 63 00 04 */ lwz r3, 4(r3) -/* 80741690 38 03 00 24 */ addi r0, r3, 0x24 -/* 80741694 90 1D 05 04 */ stw r0, 0x504(r29) -/* 80741698 38 7D 07 20 */ addi r3, r29, 0x720 -/* 8074169C C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 807416A0 FC 40 08 90 */ fmr f2, f1 -/* 807416A4 4B 93 48 B5 */ bl SetWall__12dBgS_AcchCirFff -/* 807416A8 3C 60 80 74 */ lis r3, data_80741DC0@ha /* 0x80741DC0@ha */ -/* 807416AC 8C 03 1D C0 */ lbzu r0, data_80741DC0@l(r3) /* 0x80741DC0@l */ -/* 807416B0 28 00 00 00 */ cmplwi r0, 0 -/* 807416B4 40 82 00 20 */ bne lbl_807416D4 -/* 807416B8 38 00 00 01 */ li r0, 1 -/* 807416BC 98 03 00 00 */ stb r0, 0(r3) -/* 807416C0 98 1D 0A D0 */ stb r0, 0xad0(r29) -/* 807416C4 38 00 FF FF */ li r0, -1 -/* 807416C8 3C 60 80 74 */ lis r3, l_HIO@ha /* 0x80741DD0@ha */ -/* 807416CC 38 63 1D D0 */ addi r3, r3, l_HIO@l /* 0x80741DD0@l */ -/* 807416D0 98 03 00 04 */ stb r0, 4(r3) -lbl_807416D4: -/* 807416D4 C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 807416D8 D0 1D 05 20 */ stfs f0, 0x520(r29) -/* 807416DC 7F A3 EB 78 */ mr r3, r29 -/* 807416E0 C0 3F 00 E8 */ lfs f1, 0xe8(r31) -/* 807416E4 FC 40 08 90 */ fmr f2, f1 -/* 807416E8 FC 60 08 90 */ fmr f3, f1 -/* 807416EC C0 9F 00 E0 */ lfs f4, 0xe0(r31) -/* 807416F0 FC A0 20 90 */ fmr f5, f4 -/* 807416F4 FC C0 20 90 */ fmr f6, f4 -/* 807416F8 4B 8D 8E 51 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 807416FC 38 00 00 00 */ li r0, 0 -/* 80741700 90 01 00 08 */ stw r0, 8(r1) -/* 80741704 38 7D 07 60 */ addi r3, r29, 0x760 -/* 80741708 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 8074170C 38 BD 04 BC */ addi r5, r29, 0x4bc -/* 80741710 7F A6 EB 78 */ mr r6, r29 -/* 80741714 38 E0 00 01 */ li r7, 1 -/* 80741718 39 1D 07 20 */ addi r8, r29, 0x720 -/* 8074171C 39 3D 04 F8 */ addi r9, r29, 0x4f8 -/* 80741720 39 40 00 00 */ li r10, 0 -/* 80741724 4B 93 4B 25 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80741728 38 00 00 04 */ li r0, 4 -/* 8074172C 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80741730 38 00 00 22 */ li r0, 0x22 -/* 80741734 98 1D 05 46 */ stb r0, 0x546(r29) -/* 80741738 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 8074173C C0 3F 00 C4 */ lfs f1, 0xc4(r31) -/* 80741740 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80741744 EC 21 00 2A */ fadds f1, f1, f0 -/* 80741748 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8074174C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80741750 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80741754 D0 41 00 30 */ stfs f2, 0x30(r1) -/* 80741758 38 7D 06 74 */ addi r3, r29, 0x674 -/* 8074175C 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80741760 38 A1 00 28 */ addi r5, r1, 0x28 -/* 80741764 38 C0 00 03 */ li r6, 3 -/* 80741768 38 E0 00 01 */ li r7, 1 -/* 8074176C 4B B7 F9 29 */ bl init__15Z2CreatureEnemyFP3VecP3VecUcUc -/* 80741770 38 1D 06 74 */ addi r0, r29, 0x674 -/* 80741774 90 1D 0A B4 */ stw r0, 0xab4(r29) -/* 80741778 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 8074177C 80 A3 00 04 */ lwz r5, 4(r3) -/* 80741780 93 A5 00 14 */ stw r29, 0x14(r5) -/* 80741784 38 E0 00 00 */ li r7, 0 -/* 80741788 3C 60 80 74 */ lis r3, JointCallBack__FP8J3DJointi@ha /* 0x8073D904@ha */ -/* 8074178C 38 83 D9 04 */ addi r4, r3, JointCallBack__FP8J3DJointi@l /* 0x8073D904@l */ -/* 80741790 48 00 00 20 */ b lbl_807417B0 -lbl_80741794: -/* 80741794 54 E0 04 3F */ clrlwi. r0, r7, 0x10 -/* 80741798 41 82 00 14 */ beq lbl_807417AC -/* 8074179C 80 66 00 28 */ lwz r3, 0x28(r6) -/* 807417A0 54 E0 13 BA */ rlwinm r0, r7, 2, 0xe, 0x1d -/* 807417A4 7C 63 00 2E */ lwzx r3, r3, r0 -/* 807417A8 90 83 00 04 */ stw r4, 4(r3) -lbl_807417AC: -/* 807417AC 38 E7 00 01 */ addi r7, r7, 1 -lbl_807417B0: -/* 807417B0 80 C5 00 04 */ lwz r6, 4(r5) -/* 807417B4 A0 66 00 2C */ lhz r3, 0x2c(r6) -/* 807417B8 54 E0 04 3E */ clrlwi r0, r7, 0x10 -/* 807417BC 7C 00 18 40 */ cmplw r0, r3 -/* 807417C0 41 80 FF D4 */ blt lbl_80741794 -/* 807417C4 38 00 10 00 */ li r0, 0x1000 -/* 807417C8 B0 1D 06 10 */ sth r0, 0x610(r29) -/* 807417CC 38 00 05 00 */ li r0, 0x500 -/* 807417D0 B0 1D 06 12 */ sth r0, 0x612(r29) -/* 807417D4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 807417D8 D0 1D 06 24 */ stfs f0, 0x624(r29) -/* 807417DC 7F A3 EB 78 */ mr r3, r29 -/* 807417E0 4B FF BC AD */ bl initCcSph__8daE_PH_cFv -/* 807417E4 38 7D 06 74 */ addi r3, r29, 0x674 -/* 807417E8 3C 80 80 74 */ lis r4, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 807417EC 38 84 1D 0C */ addi r4, r4, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 807417F0 4B B8 03 A1 */ bl setEnemyName__15Z2CreatureEnemyFPCc -/* 807417F4 C0 1F 00 88 */ lfs f0, 0x88(r31) -/* 807417F8 D0 1D 05 2C */ stfs f0, 0x52c(r29) -/* 807417FC 38 00 00 01 */ li r0, 1 -/* 80741800 98 1D 05 B2 */ stb r0, 0x5b2(r29) -/* 80741804 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 80741808 28 00 00 03 */ cmplwi r0, 3 -/* 8074180C 40 82 00 4C */ bne lbl_80741858 -/* 80741810 80 1D 0A 10 */ lwz r0, 0xa10(r29) -/* 80741814 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80741818 90 1D 0A 10 */ stw r0, 0xa10(r29) -/* 8074181C 80 1D 0A 10 */ lwz r0, 0xa10(r29) -/* 80741820 60 00 00 04 */ ori r0, r0, 4 -/* 80741824 90 1D 0A 10 */ stw r0, 0xa10(r29) -/* 80741828 38 00 00 00 */ li r0, 0 -/* 8074182C 98 1D 05 46 */ stb r0, 0x546(r29) -/* 80741830 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80741834 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80741838 D0 1D 05 50 */ stfs f0, 0x550(r29) -/* 8074183C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80741840 D0 1D 05 58 */ stfs f0, 0x558(r29) -/* 80741844 C0 3F 00 EC */ lfs f1, 0xec(r31) -/* 80741848 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8074184C EC 01 00 2A */ fadds f0, f1, f0 -/* 80741850 D0 1D 05 54 */ stfs f0, 0x554(r29) -/* 80741854 48 00 00 38 */ b lbl_8074188C -lbl_80741858: -/* 80741858 28 00 00 02 */ cmplwi r0, 2 -/* 8074185C 41 82 00 14 */ beq lbl_80741870 -/* 80741860 28 00 00 04 */ cmplwi r0, 4 -/* 80741864 41 82 00 0C */ beq lbl_80741870 -/* 80741868 28 00 00 05 */ cmplwi r0, 5 -/* 8074186C 40 82 00 18 */ bne lbl_80741884 -lbl_80741870: -/* 80741870 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80741874 D0 1D 05 2C */ stfs f0, 0x52c(r29) -/* 80741878 38 00 00 00 */ li r0, 0 -/* 8074187C 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80741880 48 00 00 0C */ b lbl_8074188C -lbl_80741884: -/* 80741884 7F A3 EB 78 */ mr r3, r29 -/* 80741888 4B FF C3 4D */ bl SearchNearP__8daE_PH_cFv -lbl_8074188C: -/* 8074188C 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 80741890 28 00 00 05 */ cmplwi r0, 5 -/* 80741894 40 82 00 94 */ bne lbl_80741928 -/* 80741898 4B A3 FD A9 */ bl dCam_getBody__Fv -/* 8074189C 7C 7C 1B 78 */ mr r28, r3 -/* 807418A0 C0 23 00 58 */ lfs f1, 0x58(r3) -/* 807418A4 C0 03 06 F4 */ lfs f0, 0x6f4(r3) -/* 807418A8 EC 01 00 2A */ fadds f0, f1, f0 -/* 807418AC D0 1D 05 F4 */ stfs f0, 0x5f4(r29) -/* 807418B0 38 61 00 1C */ addi r3, r1, 0x1c -/* 807418B4 7F 84 E3 78 */ mr r4, r28 -/* 807418B8 4B A4 05 E1 */ bl Center__9dCamera_cFv -/* 807418BC C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 807418C0 D0 1D 05 D4 */ stfs f0, 0x5d4(r29) -/* 807418C4 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 807418C8 D0 1D 05 D8 */ stfs f0, 0x5d8(r29) -/* 807418CC C0 01 00 24 */ lfs f0, 0x24(r1) -/* 807418D0 D0 1D 05 DC */ stfs f0, 0x5dc(r29) -/* 807418D4 C0 1D 05 D4 */ lfs f0, 0x5d4(r29) -/* 807418D8 D0 1D 05 E0 */ stfs f0, 0x5e0(r29) -/* 807418DC C0 1D 05 D8 */ lfs f0, 0x5d8(r29) -/* 807418E0 D0 1D 05 E4 */ stfs f0, 0x5e4(r29) -/* 807418E4 C0 1D 05 DC */ lfs f0, 0x5dc(r29) -/* 807418E8 D0 1D 05 E8 */ stfs f0, 0x5e8(r29) -/* 807418EC 38 61 00 10 */ addi r3, r1, 0x10 -/* 807418F0 7F 84 E3 78 */ mr r4, r28 -/* 807418F4 4B A4 05 71 */ bl Eye__9dCamera_cFv -/* 807418F8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 807418FC D0 1D 05 BC */ stfs f0, 0x5bc(r29) -/* 80741900 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80741904 D0 1D 05 C0 */ stfs f0, 0x5c0(r29) -/* 80741908 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 8074190C D0 1D 05 C4 */ stfs f0, 0x5c4(r29) -/* 80741910 C0 1D 05 BC */ lfs f0, 0x5bc(r29) -/* 80741914 D0 1D 05 C8 */ stfs f0, 0x5c8(r29) -/* 80741918 C0 1D 05 C0 */ lfs f0, 0x5c0(r29) -/* 8074191C D0 1D 05 CC */ stfs f0, 0x5cc(r29) -/* 80741920 C0 1D 05 C4 */ lfs f0, 0x5c4(r29) -/* 80741924 D0 1D 05 D0 */ stfs f0, 0x5d0(r29) -lbl_80741928: -/* 80741928 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 8074192C 28 00 00 04 */ cmplwi r0, 4 -/* 80741930 41 82 00 0C */ beq lbl_8074193C -/* 80741934 28 00 00 05 */ cmplwi r0, 5 -/* 80741938 40 82 00 2C */ bne lbl_80741964 -lbl_8074193C: -/* 8074193C C0 5F 00 00 */ lfs f2, 0(r31) -/* 80741940 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 80741944 D0 43 00 18 */ stfs f2, 0x18(r3) -/* 80741948 7F A3 EB 78 */ mr r3, r29 -/* 8074194C 38 80 00 04 */ li r4, 4 -/* 80741950 38 A0 00 00 */ li r5, 0 -/* 80741954 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 80741958 4B FF C1 D1 */ bl SetAnm__8daE_PH_cFiiff -/* 8074195C 38 00 00 0E */ li r0, 0xe -/* 80741960 90 1D 06 28 */ stw r0, 0x628(r29) -lbl_80741964: -/* 80741964 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80741968 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8074196C 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80741970 3C 80 80 74 */ lis r4, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 80741974 38 84 1D 0C */ addi r4, r4, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 80741978 38 84 00 05 */ addi r4, r4, 5 -/* 8074197C 4B C2 70 19 */ bl strcmp -/* 80741980 2C 03 00 00 */ cmpwi r3, 0 -/* 80741984 40 82 00 60 */ bne lbl_807419E4 -/* 80741988 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 8074198C 28 00 00 02 */ cmplwi r0, 2 -/* 80741990 40 82 00 54 */ bne lbl_807419E4 -/* 80741994 38 60 00 02 */ li r3, 2 -/* 80741998 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 8074199C 7C 04 07 74 */ extsb r4, r0 -/* 807419A0 4B 8E C0 91 */ bl dComIfGs_isZoneSwitch__Fii -/* 807419A4 2C 03 00 00 */ cmpwi r3, 0 -/* 807419A8 40 82 00 3C */ bne lbl_807419E4 -/* 807419AC 38 00 00 00 */ li r0, 0 -/* 807419B0 98 1D 05 B2 */ stb r0, 0x5b2(r29) -/* 807419B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807419B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807419BC 38 80 00 10 */ li r4, 0x10 -/* 807419C0 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 807419C4 7C 05 07 74 */ extsb r5, r0 -/* 807419C8 4B 8F 38 E9 */ bl offSwitch__10dSv_info_cFii -/* 807419CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807419D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807419D4 38 80 00 3F */ li r4, 0x3f -/* 807419D8 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 807419DC 7C 05 07 74 */ extsb r5, r0 -/* 807419E0 4B 8F 38 D1 */ bl offSwitch__10dSv_info_cFii -lbl_807419E4: -/* 807419E4 88 1D 06 63 */ lbz r0, 0x663(r29) -/* 807419E8 C8 3F 00 A8 */ lfd f1, 0xa8(r31) -/* 807419EC 90 01 00 3C */ stw r0, 0x3c(r1) -/* 807419F0 3C 00 43 30 */ lis r0, 0x4330 -/* 807419F4 90 01 00 38 */ stw r0, 0x38(r1) -/* 807419F8 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 807419FC EC 00 08 28 */ fsubs f0, f0, f1 -/* 80741A00 3C 60 80 74 */ lis r3, l_HIO@ha /* 0x80741DD0@ha */ -/* 80741A04 38 63 1D D0 */ addi r3, r3, l_HIO@l /* 0x80741DD0@l */ -/* 80741A08 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80741A0C 38 00 00 00 */ li r0, 0 -/* 80741A10 98 1D 05 B1 */ stb r0, 0x5b1(r29) -/* 80741A14 80 1D 04 9C */ lwz r0, 0x49c(r29) -/* 80741A18 60 00 40 00 */ ori r0, r0, 0x4000 -/* 80741A1C 90 1D 04 9C */ stw r0, 0x49c(r29) -/* 80741A20 7F A3 EB 78 */ mr r3, r29 -/* 80741A24 4B FF F9 E5 */ bl daE_PH_Execute__FP8daE_PH_c -lbl_80741A28: -/* 80741A28 7F C3 F3 78 */ mr r3, r30 -lbl_80741A2C: -/* 80741A2C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80741A30 4B C2 07 F5 */ bl _restgpr_28 -/* 80741A34 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80741A38 7C 08 03 A6 */ mtlr r0 -/* 80741A3C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80741A40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ctrlJoint__8daE_PH_cFP8J3DJointP8J3DModel.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ctrlJoint__8daE_PH_cFP8J3DJointP8J3DModel.s deleted file mode 100644 index 4b2c9d36a57..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ctrlJoint__8daE_PH_cFP8J3DJointP8J3DModel.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8073D850: -/* 8073D850 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8073D854 7C 08 02 A6 */ mflr r0 -/* 8073D858 90 01 00 24 */ stw r0, 0x24(r1) -/* 8073D85C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8073D860 4B C2 49 79 */ bl _savegpr_28 -/* 8073D864 7C 7C 1B 78 */ mr r28, r3 -/* 8073D868 7C BD 2B 78 */ mr r29, r5 -/* 8073D86C A3 E4 00 14 */ lhz r31, 0x14(r4) -/* 8073D870 80 65 00 84 */ lwz r3, 0x84(r5) -/* 8073D874 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8073D878 1F DF 00 30 */ mulli r30, r31, 0x30 -/* 8073D87C 7C 60 F2 14 */ add r3, r0, r30 -/* 8073D880 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8073D884 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8073D888 4B C0 8C 29 */ bl PSMTXCopy -/* 8073D88C 2C 1F 00 02 */ cmpwi r31, 2 -/* 8073D890 40 82 00 2C */ bne lbl_8073D8BC -/* 8073D894 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8073D898 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8073D89C A8 9C 06 68 */ lha r4, 0x668(r28) -/* 8073D8A0 4B 8C EB 95 */ bl mDoMtx_YrotM__FPA4_fs -/* 8073D8A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8073D8A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8073D8AC A8 1C 06 66 */ lha r0, 0x666(r28) -/* 8073D8B0 7C 00 00 D0 */ neg r0, r0 -/* 8073D8B4 7C 04 07 34 */ extsh r4, r0 -/* 8073D8B8 4B 8C EA E5 */ bl mDoMtx_XrotM__FPA4_fs -lbl_8073D8BC: -/* 8073D8BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8073D8C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8073D8C4 80 9D 00 84 */ lwz r4, 0x84(r29) -/* 8073D8C8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8073D8CC 7C 80 F2 14 */ add r4, r0, r30 -/* 8073D8D0 4B C0 8B E1 */ bl PSMTXCopy -/* 8073D8D4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8073D8D8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8073D8DC 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 8073D8E0 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 8073D8E4 4B C0 8B CD */ bl PSMTXCopy -/* 8073D8E8 38 60 00 01 */ li r3, 1 -/* 8073D8EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8073D8F0 4B C2 49 35 */ bl _restgpr_28 -/* 8073D8F4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8073D8F8 7C 08 03 A6 */ mtlr r0 -/* 8073D8FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8073D900 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Create__FP10fopAc_ac_c.s deleted file mode 100644 index f91465940ac..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8073DAE4: -/* 8073DAE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8073DAE8 7C 08 02 A6 */ mflr r0 -/* 8073DAEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073DAF0 48 00 39 39 */ bl create__8daE_PH_cFv -/* 8073DAF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073DAF8 7C 08 03 A6 */ mtlr r0 -/* 8073DAFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8073DB00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Delete__FP8daE_PH_c.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Delete__FP8daE_PH_c.s deleted file mode 100644 index 6b29e3d1cbb..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Delete__FP8daE_PH_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8073DB04: -/* 8073DB04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8073DB08 7C 08 02 A6 */ mflr r0 -/* 8073DB0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073DB10 48 00 36 F1 */ bl Delete__8daE_PH_cFv -/* 8073DB14 38 60 00 01 */ li r3, 1 -/* 8073DB18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073DB1C 7C 08 03 A6 */ mtlr r0 -/* 8073DB20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8073DB24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Draw__FP8daE_PH_c.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Draw__FP8daE_PH_c.s deleted file mode 100644 index aa3cbc64a50..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Draw__FP8daE_PH_c.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_807412E8: -/* 807412E8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 807412EC 7C 08 02 A6 */ mflr r0 -/* 807412F0 90 01 00 34 */ stw r0, 0x34(r1) -/* 807412F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 807412F8 4B C2 0E E5 */ bl _savegpr_29 -/* 807412FC 7C 7D 1B 78 */ mr r29, r3 -/* 80741300 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 80741304 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 80741308 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 8074130C 83 C3 00 04 */ lwz r30, 4(r3) -/* 80741310 88 1D 06 60 */ lbz r0, 0x660(r29) -/* 80741314 28 00 00 03 */ cmplwi r0, 3 -/* 80741318 41 82 00 A8 */ beq lbl_807413C0 -/* 8074131C 88 1D 05 B2 */ lbz r0, 0x5b2(r29) -/* 80741320 28 00 00 00 */ cmplwi r0, 0 -/* 80741324 41 82 00 C8 */ beq lbl_807413EC -/* 80741328 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 8074132C C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 80741330 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80741334 EC 21 00 2A */ fadds f1, f1, f0 -/* 80741338 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8074133C D0 01 00 08 */ stfs f0, 8(r1) -/* 80741340 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80741344 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80741348 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8074134C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80741350 38 80 00 00 */ li r4, 0 -/* 80741354 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80741358 38 DD 01 0C */ addi r6, r29, 0x10c -/* 8074135C 4B A6 24 69 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80741360 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80741364 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80741368 80 9E 00 04 */ lwz r4, 4(r30) -/* 8074136C 38 BD 01 0C */ addi r5, r29, 0x10c -/* 80741370 4B A6 3A 31 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80741374 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 80741378 4B 8C FE 49 */ bl entryDL__16mDoExt_McaMorfSOFv -/* 8074137C 80 7D 07 18 */ lwz r3, 0x718(r29) -/* 80741380 38 80 00 00 */ li r4, 0 -/* 80741384 7F C5 F3 78 */ mr r5, r30 -/* 80741388 38 C1 00 08 */ addi r6, r1, 8 -/* 8074138C C0 3F 00 C8 */ lfs f1, 0xc8(r31) -/* 80741390 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80741394 C0 7D 04 D4 */ lfs f3, 0x4d4(r29) -/* 80741398 C0 9D 07 F8 */ lfs f4, 0x7f8(r29) -/* 8074139C 38 FD 08 50 */ addi r7, r29, 0x850 -/* 807413A0 39 1D 01 0C */ addi r8, r29, 0x10c -/* 807413A4 39 20 00 00 */ li r9, 0 -/* 807413A8 C0 BF 00 04 */ lfs f5, 4(r31) -/* 807413AC 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 807413B0 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 807413B4 4B 8E D5 5D */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 807413B8 90 7D 07 18 */ stw r3, 0x718(r29) -/* 807413BC 48 00 00 30 */ b lbl_807413EC -lbl_807413C0: -/* 807413C0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 807413C4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 807413C8 38 80 00 00 */ li r4, 0 -/* 807413CC 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 807413D0 38 DD 01 0C */ addi r6, r29, 0x10c -/* 807413D4 4B A6 23 F1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 807413D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 807413DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 807413E0 80 9E 00 04 */ lwz r4, 4(r30) -/* 807413E4 38 BD 01 0C */ addi r5, r29, 0x10c -/* 807413E8 4B A6 39 B9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -lbl_807413EC: -/* 807413EC 38 60 00 01 */ li r3, 1 -/* 807413F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 807413F4 4B C2 0E 35 */ bl _restgpr_29 -/* 807413F8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 807413FC 7C 08 03 A6 */ mtlr r0 -/* 80741400 38 21 00 30 */ addi r1, r1, 0x30 -/* 80741404 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Execute__FP8daE_PH_c.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Execute__FP8daE_PH_c.s deleted file mode 100644 index 3ff17a3b2a3..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Execute__FP8daE_PH_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80741408: -/* 80741408 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8074140C 7C 08 02 A6 */ mflr r0 -/* 80741410 90 01 00 14 */ stw r0, 0x14(r1) -/* 80741414 4B FF F7 29 */ bl Execute__8daE_PH_cFv -/* 80741418 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8074141C 7C 08 03 A6 */ mtlr r0 -/* 80741420 38 21 00 10 */ addi r1, r1, 0x10 -/* 80741424 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD0.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD0.s deleted file mode 100644 index 107baa273dc..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80741BD0: -/* 80741BD0 38 63 FF DC */ addi r3, r3, -36 -/* 80741BD4 4B FF FF 00 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD8.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD8.s deleted file mode 100644 index 128d5c28a77..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD8.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80741BD8: -/* 80741BD8 38 63 FF EC */ addi r3, r3, -20 -/* 80741BDC 4B FF FE F8 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/initCcSph__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/initCcSph__8daE_PH_cFv.s deleted file mode 100644 index 9c4964f74ec..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/initCcSph__8daE_PH_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8073D48C: -/* 8073D48C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8073D490 7C 08 02 A6 */ mflr r0 -/* 8073D494 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073D498 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8073D49C 7C 7F 1B 78 */ mr r31, r3 -/* 8073D4A0 38 7F 09 38 */ addi r3, r31, 0x938 -/* 8073D4A4 38 80 00 FF */ li r4, 0xff -/* 8073D4A8 38 A0 00 FF */ li r5, 0xff -/* 8073D4AC 7F E6 FB 78 */ mr r6, r31 -/* 8073D4B0 4B 94 63 B1 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 8073D4B4 38 7F 09 74 */ addi r3, r31, 0x974 -/* 8073D4B8 3C 80 80 74 */ lis r4, ccSphSrc@ha /* 0x80741C00@ha */ -/* 8073D4BC 38 84 1C 00 */ addi r4, r4, ccSphSrc@l /* 0x80741C00@l */ -/* 8073D4C0 4B 94 75 75 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 8073D4C4 38 1F 09 38 */ addi r0, r31, 0x938 -/* 8073D4C8 90 1F 09 B8 */ stw r0, 0x9b8(r31) -/* 8073D4CC 38 7F 0A 98 */ addi r3, r31, 0xa98 -/* 8073D4D0 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8073D4D4 4B B3 21 75 */ bl SetC__8cM3dGSphFRC4cXyz -/* 8073D4D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8073D4DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073D4E0 7C 08 03 A6 */ mtlr r0 -/* 8073D4E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8073D4E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/other_bg_check__FP8daE_PH_cP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/other_bg_check__FP8daE_PH_cP10fopAc_ac_c.s deleted file mode 100644 index 7887c4f1b90..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/other_bg_check__FP8daE_PH_cP10fopAc_ac_c.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_8073D4EC: -/* 8073D4EC 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 8073D4F0 7C 08 02 A6 */ mflr r0 -/* 8073D4F4 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 8073D4F8 93 E1 00 9C */ stw r31, 0x9c(r1) -/* 8073D4FC 93 C1 00 98 */ stw r30, 0x98(r1) -/* 8073D500 7C 9E 23 78 */ mr r30, r4 -/* 8073D504 7C 7F 1B 78 */ mr r31, r3 -/* 8073D508 38 61 00 20 */ addi r3, r1, 0x20 -/* 8073D50C 4B 93 A7 5D */ bl __ct__11dBgS_LinChkFv -/* 8073D510 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 8073D514 D0 01 00 08 */ stfs f0, 8(r1) -/* 8073D518 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 8073D51C D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8073D520 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 8073D524 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8073D528 3C 60 80 74 */ lis r3, lit_3805@ha /* 0x80741C40@ha */ -/* 8073D52C C0 43 1C 40 */ lfs f2, lit_3805@l(r3) /* 0x80741C40@l */ -/* 8073D530 EC 01 10 2A */ fadds f0, f1, f2 -/* 8073D534 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8073D538 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 8073D53C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8073D540 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 8073D544 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 8073D548 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 8073D54C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8073D550 EC 01 10 2A */ fadds f0, f1, f2 -/* 8073D554 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8073D558 38 61 00 20 */ addi r3, r1, 0x20 -/* 8073D55C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8073D560 38 A1 00 08 */ addi r5, r1, 8 -/* 8073D564 7F E6 FB 78 */ mr r6, r31 -/* 8073D568 4B 93 A7 FD */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 8073D56C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073D570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073D574 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8073D578 38 81 00 20 */ addi r4, r1, 0x20 -/* 8073D57C 4B 93 6E 39 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 8073D580 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8073D584 41 82 00 18 */ beq lbl_8073D59C -/* 8073D588 38 61 00 20 */ addi r3, r1, 0x20 -/* 8073D58C 38 80 FF FF */ li r4, -1 -/* 8073D590 4B 93 A7 4D */ bl __dt__11dBgS_LinChkFv -/* 8073D594 38 60 00 01 */ li r3, 1 -/* 8073D598 48 00 00 14 */ b lbl_8073D5AC -lbl_8073D59C: -/* 8073D59C 38 61 00 20 */ addi r3, r1, 0x20 -/* 8073D5A0 38 80 FF FF */ li r4, -1 -/* 8073D5A4 4B 93 A7 39 */ bl __dt__11dBgS_LinChkFv -/* 8073D5A8 38 60 00 00 */ li r3, 0 -lbl_8073D5AC: -/* 8073D5AC 83 E1 00 9C */ lwz r31, 0x9c(r1) -/* 8073D5B0 83 C1 00 98 */ lwz r30, 0x98(r1) -/* 8073D5B4 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 8073D5B8 7C 08 03 A6 */ mtlr r0 -/* 8073D5BC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8073D5C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setBaseMtx__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setBaseMtx__8daE_PH_cFv.s deleted file mode 100644 index ec1f532ee85..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setBaseMtx__8daE_PH_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80741268: -/* 80741268 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8074126C 7C 08 02 A6 */ mflr r0 -/* 80741270 90 01 00 14 */ stw r0, 0x14(r1) -/* 80741274 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80741278 7C 7F 1B 78 */ mr r31, r3 -/* 8074127C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80741280 4B 8C BA E5 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80741284 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80741288 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8074128C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80741290 4B 8C B1 A5 */ bl mDoMtx_YrotM__FPA4_fs -/* 80741294 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80741298 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8074129C A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 807412A0 4B 8C B0 FD */ bl mDoMtx_XrotM__FPA4_fs -/* 807412A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807412A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807412AC A8 9F 04 E8 */ lha r4, 0x4e8(r31) -/* 807412B0 4B 8C B2 1D */ bl mDoMtx_ZrotM__FPA4_fs -/* 807412B4 80 7F 07 1C */ lwz r3, 0x71c(r31) -/* 807412B8 80 83 00 04 */ lwz r4, 4(r3) -/* 807412BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807412C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807412C4 38 84 00 24 */ addi r4, r4, 0x24 -/* 807412C8 4B C0 51 E9 */ bl PSMTXCopy -/* 807412CC 80 7F 07 1C */ lwz r3, 0x71c(r31) -/* 807412D0 4B 8C FF 1D */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 807412D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807412D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807412DC 7C 08 03 A6 */ mtlr r0 -/* 807412E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 807412E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setCcSph__8daE_PH_cFv.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setCcSph__8daE_PH_cFv.s deleted file mode 100644 index 3deabeb64e7..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setCcSph__8daE_PH_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8073D950: -/* 8073D950 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8073D954 7C 08 02 A6 */ mflr r0 -/* 8073D958 90 01 00 24 */ stw r0, 0x24(r1) -/* 8073D95C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8073D960 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8073D964 7C 7E 1B 78 */ mr r30, r3 -/* 8073D968 3C 60 80 74 */ lis r3, lit_3767@ha /* 0x80741BF4@ha */ -/* 8073D96C 3B E3 1B F4 */ addi r31, r3, lit_3767@l /* 0x80741BF4@l */ -/* 8073D970 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8073D974 D0 21 00 08 */ stfs f1, 8(r1) -/* 8073D978 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 8073D97C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8073D980 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8073D984 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 8073D988 4B 8C F3 DD */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 8073D98C 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 8073D990 4B 8C F5 B5 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 8073D994 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8073D998 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8073D99C 38 81 00 08 */ addi r4, r1, 8 -/* 8073D9A0 7C 85 23 78 */ mr r5, r4 -/* 8073D9A4 4B C0 93 C9 */ bl PSMTXMultVec -/* 8073D9A8 38 7E 0A 98 */ addi r3, r30, 0xa98 -/* 8073D9AC 38 81 00 08 */ addi r4, r1, 8 -/* 8073D9B0 4B B3 1C 99 */ bl SetC__8cM3dGSphFRC4cXyz -/* 8073D9B4 38 7E 0A 98 */ addi r3, r30, 0xa98 -/* 8073D9B8 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 8073D9BC 4B B3 1D 4D */ bl SetR__8cM3dGSphFf -/* 8073D9C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073D9C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073D9C8 38 63 23 3C */ addi r3, r3, 0x233c -/* 8073D9CC 38 9E 09 74 */ addi r4, r30, 0x974 -/* 8073D9D0 4B B2 71 D9 */ bl Set__4cCcSFP8cCcD_Obj -/* 8073D9D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8073D9D8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8073D9DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8073D9E0 7C 08 03 A6 */ mtlr r0 -/* 8073D9E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8073D9E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index cb1041f1be7..00000000000 --- a/asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_8073D9EC: -/* 8073D9EC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8073D9F0 7C 08 02 A6 */ mflr r0 -/* 8073D9F4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8073D9F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8073D9FC 4B C2 47 DD */ bl _savegpr_28 -/* 8073DA00 7C 7F 1B 78 */ mr r31, r3 -/* 8073DA04 3C 60 80 74 */ lis r3, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 8073DA08 38 63 1D 0C */ addi r3, r3, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 8073DA0C 38 80 00 14 */ li r4, 0x14 -/* 8073DA10 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8073DA14 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073DA18 3F 85 00 02 */ addis r28, r5, 2 -/* 8073DA1C 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 8073DA20 7F 85 E3 78 */ mr r5, r28 -/* 8073DA24 38 C0 00 80 */ li r6, 0x80 -/* 8073DA28 4B 8F E8 C5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8073DA2C 7C 7E 1B 78 */ mr r30, r3 -/* 8073DA30 38 60 00 58 */ li r3, 0x58 -/* 8073DA34 4B B9 12 19 */ bl __nw__FUl -/* 8073DA38 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8073DA3C 41 82 00 68 */ beq lbl_8073DAA4 -/* 8073DA40 3C 60 80 74 */ lis r3, d_a_e_ph__stringBase0@ha /* 0x80741D0C@ha */ -/* 8073DA44 38 63 1D 0C */ addi r3, r3, d_a_e_ph__stringBase0@l /* 0x80741D0C@l */ -/* 8073DA48 38 80 00 0E */ li r4, 0xe -/* 8073DA4C 7F 85 E3 78 */ mr r5, r28 -/* 8073DA50 38 C0 00 80 */ li r6, 0x80 -/* 8073DA54 4B 8F E8 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8073DA58 7C 67 1B 78 */ mr r7, r3 -/* 8073DA5C 38 1F 06 74 */ addi r0, r31, 0x674 -/* 8073DA60 90 01 00 08 */ stw r0, 8(r1) -/* 8073DA64 3C 00 00 08 */ lis r0, 8 -/* 8073DA68 90 01 00 0C */ stw r0, 0xc(r1) -/* 8073DA6C 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000084@ha */ -/* 8073DA70 38 03 00 84 */ addi r0, r3, 0x0084 /* 0x11000084@l */ -/* 8073DA74 90 01 00 10 */ stw r0, 0x10(r1) -/* 8073DA78 7F A3 EB 78 */ mr r3, r29 -/* 8073DA7C 7F C4 F3 78 */ mr r4, r30 -/* 8073DA80 38 A0 00 00 */ li r5, 0 -/* 8073DA84 38 C0 00 00 */ li r6, 0 -/* 8073DA88 39 00 00 02 */ li r8, 2 -/* 8073DA8C 3D 20 80 74 */ lis r9, lit_3768@ha /* 0x80741BF8@ha */ -/* 8073DA90 C0 29 1B F8 */ lfs f1, lit_3768@l(r9) /* 0x80741BF8@l */ -/* 8073DA94 39 20 00 00 */ li r9, 0 -/* 8073DA98 39 40 FF FF */ li r10, -1 -/* 8073DA9C 4B 8D 2D 35 */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl -/* 8073DAA0 7C 7D 1B 78 */ mr r29, r3 -lbl_8073DAA4: -/* 8073DAA4 93 BF 07 1C */ stw r29, 0x71c(r31) -/* 8073DAA8 80 7F 07 1C */ lwz r3, 0x71c(r31) -/* 8073DAAC 28 03 00 00 */ cmplwi r3, 0 -/* 8073DAB0 41 82 00 10 */ beq lbl_8073DAC0 -/* 8073DAB4 80 03 00 04 */ lwz r0, 4(r3) -/* 8073DAB8 28 00 00 00 */ cmplwi r0, 0 -/* 8073DABC 40 82 00 0C */ bne lbl_8073DAC8 -lbl_8073DAC0: -/* 8073DAC0 38 60 00 00 */ li r3, 0 -/* 8073DAC4 48 00 00 08 */ b lbl_8073DACC -lbl_8073DAC8: -/* 8073DAC8 38 60 00 01 */ li r3, 1 -lbl_8073DACC: -/* 8073DACC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8073DAD0 4B C2 47 55 */ bl _restgpr_28 -/* 8073DAD4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8073DAD8 7C 08 03 A6 */ mtlr r0 -/* 8073DADC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8073DAE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 5fe618c9448..00000000000 --- a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_807F8124: -/* 807F8124 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F8128 7C 08 02 A6 */ mflr r0 -/* 807F812C 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F8130 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807F8134 93 C1 00 08 */ stw r30, 8(r1) -/* 807F8138 7C 7F 1B 78 */ mr r31, r3 -/* 807F813C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 807F8140 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 807F8144 40 82 00 1C */ bne lbl_807F8160 -/* 807F8148 28 1F 00 00 */ cmplwi r31, 0 -/* 807F814C 41 82 00 08 */ beq lbl_807F8154 -/* 807F8150 4B 82 0A 15 */ bl __ct__10fopAc_ac_cFv -lbl_807F8154: -/* 807F8154 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 807F8158 60 00 00 08 */ ori r0, r0, 8 -/* 807F815C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_807F8160: -/* 807F8160 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 807F8164 3C 80 80 80 */ lis r4, d_a_e_yd_leaf__stringBase0@ha /* 0x807F81F4@ha */ -/* 807F8168 38 84 81 F4 */ addi r4, r4, d_a_e_yd_leaf__stringBase0@l /* 0x807F81F4@l */ -/* 807F816C 4B 83 4D 51 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 807F8170 7C 7E 1B 78 */ mr r30, r3 -/* 807F8174 2C 1E 00 04 */ cmpwi r30, 4 -/* 807F8178 40 82 00 4C */ bne lbl_807F81C4 -/* 807F817C 7F E3 FB 78 */ mr r3, r31 -/* 807F8180 3C 80 80 80 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x807F8024@ha */ -/* 807F8184 38 84 80 24 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x807F8024@l */ -/* 807F8188 38 A0 0A 80 */ li r5, 0xa80 -/* 807F818C 4B 82 23 25 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 807F8190 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807F8194 40 82 00 0C */ bne lbl_807F81A0 -/* 807F8198 38 60 00 05 */ li r3, 5 -/* 807F819C 48 00 00 2C */ b lbl_807F81C8 -lbl_807F81A0: -/* 807F81A0 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 807F81A4 80 63 00 04 */ lwz r3, 4(r3) -/* 807F81A8 38 03 00 24 */ addi r0, r3, 0x24 -/* 807F81AC 90 1F 05 04 */ stw r0, 0x504(r31) -/* 807F81B0 3C 60 80 80 */ lis r3, lit_3707@ha /* 0x807F81E8@ha */ -/* 807F81B4 C0 03 81 E8 */ lfs f0, lit_3707@l(r3) /* 0x807F81E8@l */ -/* 807F81B8 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 807F81BC 7F E3 FB 78 */ mr r3, r31 -/* 807F81C0 4B FF FD 01 */ bl daE_YD_LEAF_Execute__FP15e_yd_leaf_class -lbl_807F81C4: -/* 807F81C4 7F C3 F3 78 */ mr r3, r30 -lbl_807F81C8: -/* 807F81C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807F81CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 807F81D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F81D4 7C 08 03 A6 */ mtlr r0 -/* 807F81D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F81DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Delete__FP15e_yd_leaf_class.s b/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Delete__FP15e_yd_leaf_class.s deleted file mode 100644 index 77e1ecae8c1..00000000000 --- a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Delete__FP15e_yd_leaf_class.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_807F7FF4: -/* 807F7FF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F7FF8 7C 08 02 A6 */ mflr r0 -/* 807F7FFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F8000 3C 80 80 80 */ lis r4, d_a_e_yd_leaf__stringBase0@ha /* 0x807F81F4@ha */ -/* 807F8004 38 84 81 F4 */ addi r4, r4, d_a_e_yd_leaf__stringBase0@l /* 0x807F81F4@l */ -/* 807F8008 38 63 05 AC */ addi r3, r3, 0x5ac -/* 807F800C 4B 83 4F FD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 807F8010 38 60 00 01 */ li r3, 1 -/* 807F8014 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F8018 7C 08 03 A6 */ mtlr r0 -/* 807F801C 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F8020 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Draw__FP15e_yd_leaf_class.s b/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Draw__FP15e_yd_leaf_class.s deleted file mode 100644 index f0c46486860..00000000000 --- a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Draw__FP15e_yd_leaf_class.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_807F7E18: -/* 807F7E18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F7E1C 7C 08 02 A6 */ mflr r0 -/* 807F7E20 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F7E24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807F7E28 93 C1 00 08 */ stw r30, 8(r1) -/* 807F7E2C 7C 7E 1B 78 */ mr r30, r3 -/* 807F7E30 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 807F7E34 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 807F7E38 38 80 00 02 */ li r4, 2 -/* 807F7E3C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 807F7E40 38 DE 01 0C */ addi r6, r30, 0x10c -/* 807F7E44 4B 9A B9 81 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 807F7E48 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 807F7E4C 80 83 00 04 */ lwz r4, 4(r3) -/* 807F7E50 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 807F7E54 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 807F7E58 80 84 00 04 */ lwz r4, 4(r4) -/* 807F7E5C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 807F7E60 4B 9A CF 41 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 807F7E64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F7E68 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F7E6C 80 04 5F 88 */ lwz r0, 0x5f88(r4) -/* 807F7E70 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 807F7E74 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 807F7E78 90 1F 00 48 */ stw r0, 0x48(r31) -/* 807F7E7C 80 04 5F 8C */ lwz r0, 0x5f8c(r4) -/* 807F7E80 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 807F7E84 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 807F7E88 4B 81 87 F9 */ bl entryDL__14mDoExt_McaMorfFv -/* 807F7E8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F7E90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F7E94 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 807F7E98 90 1F 00 48 */ stw r0, 0x48(r31) -/* 807F7E9C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 807F7EA0 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 807F7EA4 38 60 00 01 */ li r3, 1 -/* 807F7EA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807F7EAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 807F7EB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F7EB4 7C 08 03 A6 */ mtlr r0 -/* 807F7EB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F7EBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Execute__FP15e_yd_leaf_class.s b/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Execute__FP15e_yd_leaf_class.s deleted file mode 100644 index f9eb03ba5e4..00000000000 --- a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Execute__FP15e_yd_leaf_class.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_807F7EC0: -/* 807F7EC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 807F7EC4 7C 08 02 A6 */ mflr r0 -/* 807F7EC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 807F7ECC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 807F7ED0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 807F7ED4 7C 7F 1B 78 */ mr r31, r3 -/* 807F7ED8 3C 60 80 80 */ lis r3, lit_3707@ha /* 0x807F81E8@ha */ -/* 807F7EDC 3B C3 81 E8 */ addi r30, r3, lit_3707@l /* 0x807F81E8@l */ -/* 807F7EE0 88 1F 05 BA */ lbz r0, 0x5ba(r31) -/* 807F7EE4 7C 00 07 75 */ extsb. r0, r0 -/* 807F7EE8 40 82 00 54 */ bne lbl_807F7F3C -/* 807F7EEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F7EF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F7EF4 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 807F7EF8 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 807F7EFC 7D 89 03 A6 */ mtctr r12 -/* 807F7F00 4E 80 04 21 */ bctrl -/* 807F7F04 80 03 00 0C */ lwz r0, 0xc(r3) -/* 807F7F08 54 00 87 7F */ rlwinm. r0, r0, 0x10, 0x1d, 0x1f -/* 807F7F0C 41 82 00 5C */ beq lbl_807F7F68 -/* 807F7F10 80 1F 04 A4 */ lwz r0, 0x4a4(r31) -/* 807F7F14 90 01 00 08 */ stw r0, 8(r1) -/* 807F7F18 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 807F7F1C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 807F7F20 38 81 00 08 */ addi r4, r1, 8 -/* 807F7F24 4B 82 18 D5 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 807F7F28 28 03 00 00 */ cmplwi r3, 0 -/* 807F7F2C 40 82 00 3C */ bne lbl_807F7F68 -/* 807F7F30 38 00 00 01 */ li r0, 1 -/* 807F7F34 98 1F 05 BA */ stb r0, 0x5ba(r31) -/* 807F7F38 48 00 00 30 */ b lbl_807F7F68 -lbl_807F7F3C: -/* 807F7F3C 38 7F 04 F0 */ addi r3, r31, 0x4f0 -/* 807F7F40 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F7F44 C0 5E 00 04 */ lfs f2, 4(r30) -/* 807F7F48 4B A7 7B 39 */ bl cLib_addCalc0__FPfff -/* 807F7F4C C0 3F 04 F0 */ lfs f1, 0x4f0(r31) -/* 807F7F50 C0 1E 00 08 */ lfs f0, 8(r30) -/* 807F7F54 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F7F58 4C 40 13 82 */ cror 2, 0, 2 -/* 807F7F5C 40 82 00 0C */ bne lbl_807F7F68 -/* 807F7F60 7F E3 FB 78 */ mr r3, r31 -/* 807F7F64 4B 82 1D 19 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_807F7F68: -/* 807F7F68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F7F6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F7F70 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 807F7F74 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 807F7F78 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 807F7F7C 4B B4 E9 6D */ bl PSMTXTrans -/* 807F7F80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F7F84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F7F88 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 807F7F8C 4B 81 44 A9 */ bl mDoMtx_YrotM__FPA4_fs -/* 807F7F90 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F7F94 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F7F98 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 807F7F9C 4B 81 44 01 */ bl mDoMtx_XrotM__FPA4_fs -/* 807F7FA0 C0 3F 04 F0 */ lfs f1, 0x4f0(r31) -/* 807F7FA4 FC 40 08 90 */ fmr f2, f1 -/* 807F7FA8 FC 60 08 90 */ fmr f3, f1 -/* 807F7FAC 4B 81 4E 8D */ bl scaleM__14mDoMtx_stack_cFfff -/* 807F7FB0 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 807F7FB4 80 83 00 04 */ lwz r4, 4(r3) -/* 807F7FB8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F7FBC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F7FC0 38 84 00 24 */ addi r4, r4, 0x24 -/* 807F7FC4 4B B4 E4 ED */ bl PSMTXCopy -/* 807F7FC8 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 807F7FCC 4B 81 86 E1 */ bl modelCalc__14mDoExt_McaMorfFv -/* 807F7FD0 38 60 00 01 */ li r3, 1 -/* 807F7FD4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 807F7FD8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 807F7FDC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 807F7FE0 7C 08 03 A6 */ mtlr r0 -/* 807F7FE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 807F7FE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 19939202551..00000000000 --- a/asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_807F8024: -/* 807F8024 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 807F8028 7C 08 02 A6 */ mflr r0 -/* 807F802C 90 01 00 34 */ stw r0, 0x34(r1) -/* 807F8030 39 61 00 30 */ addi r11, r1, 0x30 -/* 807F8034 4B B6 A1 A5 */ bl _savegpr_28 -/* 807F8038 7C 7F 1B 78 */ mr r31, r3 -/* 807F803C 38 60 00 54 */ li r3, 0x54 -/* 807F8040 4B AD 6C 0D */ bl __nw__FUl -/* 807F8044 7C 7E 1B 79 */ or. r30, r3, r3 -/* 807F8048 41 82 00 9C */ beq lbl_807F80E4 -/* 807F804C 3C 60 80 80 */ lis r3, d_a_e_yd_leaf__stringBase0@ha /* 0x807F81F4@ha */ -/* 807F8050 38 63 81 F4 */ addi r3, r3, d_a_e_yd_leaf__stringBase0@l /* 0x807F81F4@l */ -/* 807F8054 38 80 00 14 */ li r4, 0x14 -/* 807F8058 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F805C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F8060 3F 85 00 02 */ addis r28, r5, 2 -/* 807F8064 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 807F8068 7F 85 E3 78 */ mr r5, r28 -/* 807F806C 38 C0 00 80 */ li r6, 0x80 -/* 807F8070 4B 84 42 7D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 807F8074 7C 7D 1B 78 */ mr r29, r3 -/* 807F8078 3C 60 80 80 */ lis r3, d_a_e_yd_leaf__stringBase0@ha /* 0x807F81F4@ha */ -/* 807F807C 38 63 81 F4 */ addi r3, r3, d_a_e_yd_leaf__stringBase0@l /* 0x807F81F4@l */ -/* 807F8080 38 80 00 19 */ li r4, 0x19 -/* 807F8084 7F 85 E3 78 */ mr r5, r28 -/* 807F8088 38 C0 00 80 */ li r6, 0x80 -/* 807F808C 4B 84 42 61 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 807F8090 7C 64 1B 78 */ mr r4, r3 -/* 807F8094 38 00 00 01 */ li r0, 1 -/* 807F8098 90 01 00 08 */ stw r0, 8(r1) -/* 807F809C 38 00 00 00 */ li r0, 0 -/* 807F80A0 90 01 00 0C */ stw r0, 0xc(r1) -/* 807F80A4 3C 00 00 08 */ lis r0, 8 -/* 807F80A8 90 01 00 10 */ stw r0, 0x10(r1) -/* 807F80AC 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000084@ha */ -/* 807F80B0 38 03 00 84 */ addi r0, r3, 0x0084 /* 0x11000084@l */ -/* 807F80B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F80B8 7F C3 F3 78 */ mr r3, r30 -/* 807F80BC 38 A0 00 00 */ li r5, 0 -/* 807F80C0 38 C0 00 00 */ li r6, 0 -/* 807F80C4 7F A7 EB 78 */ mr r7, r29 -/* 807F80C8 39 00 00 02 */ li r8, 2 -/* 807F80CC 3D 20 80 80 */ lis r9, lit_3707@ha /* 0x807F81E8@ha */ -/* 807F80D0 C0 29 81 E8 */ lfs f1, lit_3707@l(r9) /* 0x807F81E8@l */ -/* 807F80D4 39 20 00 00 */ li r9, 0 -/* 807F80D8 39 40 FF FF */ li r10, -1 -/* 807F80DC 4B 81 7B 71 */ bl __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl -/* 807F80E0 7C 7E 1B 78 */ mr r30, r3 -lbl_807F80E4: -/* 807F80E4 93 DF 05 B4 */ stw r30, 0x5b4(r31) -/* 807F80E8 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 807F80EC 28 03 00 00 */ cmplwi r3, 0 -/* 807F80F0 41 82 00 10 */ beq lbl_807F8100 -/* 807F80F4 80 03 00 04 */ lwz r0, 4(r3) -/* 807F80F8 28 00 00 00 */ cmplwi r0, 0 -/* 807F80FC 40 82 00 0C */ bne lbl_807F8108 -lbl_807F8100: -/* 807F8100 38 60 00 00 */ li r3, 0 -/* 807F8104 48 00 00 08 */ b lbl_807F810C -lbl_807F8108: -/* 807F8108 38 60 00 01 */ li r3, 1 -lbl_807F810C: -/* 807F810C 39 61 00 30 */ addi r11, r1, 0x30 -/* 807F8110 4B B6 A1 15 */ bl _restgpr_28 -/* 807F8114 80 01 00 34 */ lwz r0, 0x34(r1) -/* 807F8118 7C 08 03 A6 */ mtlr r0 -/* 807F811C 38 21 00 30 */ addi r1, r1, 0x30 -/* 807F8120 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 565eb289ddc..98627e90f13 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -713,7 +713,7 @@ public: u8 getAttribute() const { return mAttribute; } void setAttribute(u8 attr) { mAttribute = attr; } u8 getState() const { return mState; } - bool checkState(u8 state) const { return mState & state; } + bool checkState(u8 state) const { return mState & state ? true : false; } s16 getStart() const { return mStart; } void setStart(s16 start) { mStart = start; diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 5e3eeb7d0b6..d56dd19c67b 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -13,7 +13,7 @@ public: class cBgS_PolyPassChk; class cBgS_Chk { -private: +public: /* 0x0 */ cBgS_PolyPassChk* mPolyPassChk; /* 0x4 */ cBgS_GrpPassChk* mGrpPassChk; /* 0x8 */ u32 mActorPid; diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h index ff8f28acfe3..3566c54455e 100644 --- a/include/SSystem/SComponent/c_bg_s_lin_chk.h +++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h @@ -39,6 +39,7 @@ public: bool GetPreGroundChk() const { return mPreGroundChk; } bool GetPreRoofChk() const { return mPreRoofChk; } cXyz* GetStartP() { return &mLin.GetStartP(); } + void ClrSttsRoofOff() { field_0x4c &= ~0x20000000; } }; #endif /* C_BG_S_LIN_CHK_H */ diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 785cfdedfb2..085bea40732 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -36,6 +36,7 @@ enum cCcD_ObjAtType { /* 0x00001000 */ AT_TYPE_1000 = (1 << 12), /* 0x00002000 */ AT_TYPE_ARROW = (1 << 13), /* 0x00004000 */ AT_TYPE_HOOKSHOT = (1 << 14), + /* 0x00008000 */ AT_TYPE_8000 = (1 << 15), /* 0x00010000 */ AT_TYPE_BOOMERANG = (1 << 16), /* 0x00040000 */ AT_TYPE_40000 = (1 << 18), /* 0x00080000 */ AT_TYPE_SPINNER = (1 << 19), diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 4ebe1f93588..54d717a73d7 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -55,6 +55,7 @@ struct cXyz : Vec { void operator-=(const Vec& other) { VECSubtract(this, &other, this); } void operator+=(const Vec& other) { VECAdd(this, &other, this); } void operator*=(f32 scale) { VECScale(this, this, scale); } + void operator/=(f32 scale) { VECScale(this, this, 1.0f / scale); } /* 80266C6C */ cXyz getCrossProduct(Vec const&) const; /* 80266CBC */ cXyz outprod(Vec const&) const; /* 80266CE4 */ cXyz norm() const; diff --git a/include/d/a/d_a_obj.h b/include/d/a/d_a_obj.h index 58d1cbdd2b3..18177f271f4 100644 --- a/include/d/a/d_a_obj.h +++ b/include/d/a/d_a_obj.h @@ -1,20 +1,20 @@ #ifndef D_A_D_A_OBJ_H #define D_A_D_A_OBJ_H -#include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +class dCcD_GObjInf; namespace daObj { -/* 80037038 */ void eff_break_tsubo(fopAc_ac_c*, cXyz, int); -/* 80037180 */ void make_eff_break_kotubo(fopAc_ac_c*); -/* 80037210 */ void make_eff_break_kotubo2(fopAc_ac_c*); -/* 800372A0 */ void make_eff_break_gm_kotubo(fopAc_ac_c*); -/* 80037330 */ void make_eff_break_gm_ootubo(fopAc_ac_c*); -/* 800373C0 */ void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32); -/* 80037620 */ void posMoveF_grade(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32, cXyz const*, - f32, f32, cXyz const*); -/* 80037788 */ void quat_rotBaseY(Quaternion*, cXyz const&); -/* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32); +void eff_break_tsubo(fopAc_ac_c*, cXyz, int); +void make_eff_break_kotubo(fopAc_ac_c*); +void make_eff_break_kotubo2(fopAc_ac_c*); +void make_eff_break_gm_kotubo(fopAc_ac_c*); +void make_eff_break_gm_ootubo(fopAc_ac_c*); +void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32); +void posMoveF_grade(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32, cXyz const*, f32, f32, + cXyz const*); +void quat_rotBaseY(Quaternion*, cXyz const&); +void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32); }; // namespace daObj #endif /* D_A_D_A_OBJ_H */ diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index ce296554e84..2c6ee210039 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -567,8 +567,8 @@ public: virtual MtxP getBottleMtx(); virtual BOOL checkPlayerGuard() const; virtual u32 checkPlayerFly() const { return 0; } - virtual BOOL checkFrontRoll() const { return false; } - virtual BOOL checkWolfDash() const { return false; } + virtual BOOL checkFrontRoll() const; // weak + virtual BOOL checkWolfDash() const; // weak virtual BOOL checkAutoJump() const; virtual bool checkSideStep() const; virtual bool checkWolfTriggerJump() const; @@ -612,7 +612,7 @@ public: virtual bool cancelWolfLock(fopAc_ac_c*); virtual s32 getAtnActorID() const { return -1; } virtual s32 getItemID() const; - virtual s32 getGrabActorID() const { return -1; } + virtual s32 getGrabActorID() const; // weak virtual bool exchangeGrabActor(fopAc_ac_c*); virtual bool setForceGrab(fopAc_ac_c*, int, int); virtual void setForcePutPos(cXyz const&); @@ -624,7 +624,7 @@ public: virtual void setOutPower(f32, short, int); virtual void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*); virtual void onMagneGrab(f32, f32); - virtual void onFrollCrashFlg(u8, int) {} + virtual void onFrollCrashFlg(u8, int); // weak virtual MtxP getModelJointMtx(u16); virtual MtxP getHeadMtx(); virtual bool setHookshotCarryOffset(unsigned int, cXyz const*); diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index 1ebbac54478..b9e40ee62c6 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -117,6 +117,7 @@ public: cXyz* GetOldPos() { return pm_old_pos; } f32 GetGroundH() const { return m_ground_h; } f32 GetRoofHeight() const { return m_roof_height; } + int GetTblSize() { return m_tbl_size; } void SetLin() { m_lin.SetStartEnd(*pm_old_pos, *pm_pos); } bool ChkGroundFind() { return m_flags & GROUND_FIND; } bool ChkGroundHit() { return m_flags & GROUND_HIT; } @@ -142,7 +143,7 @@ public: void ClrGroundFind() { m_flags &= ~GROUND_FIND; } u32 MaskRoofHit() { return m_flags & ROOF_HIT; } bool ChkRoofHit() { return MaskRoofHit(); } - bool ChkClrSpeedY() { return m_flags & CLR_SPEED_Y; } + bool ChkClrSpeedY() { return !(m_flags & CLR_SPEED_Y); } void SetGroundFind() { m_flags |= GROUND_FIND; } void SetGroundHit() { m_flags |= GROUND_HIT; } void SetGroundLanding() { m_flags |= GROUND_LANDING; } @@ -163,7 +164,9 @@ public: void OnLineCheckNone() { m_flags |= LINE_CHECK_NONE; } void OffLineCheckNone() { m_flags &= ~LINE_CHECK_NONE; } void SetWallNone() { m_flags |= WALL_NONE; } + void OnLineCheckHit() { m_flags |= LINE_CHECK_HIT; } cM3dGCyl* GetWallBmdCylP() { return &m_wall_cyl; } + f32 GetWallH(int i_no) { return pm_acch_cir[i_no].GetWallH(); } // inline dupe void i_ClrGroundHit() { m_flags &= ~GROUND_HIT; } @@ -183,7 +186,7 @@ public: /* 0x080 */ u32 field_0x80; /* 0x084 */ fopAc_ac_c* m_my_ac; /* 0x088 */ int m_tbl_size; - /* 0x08C */ dBgS_AcchCir* field_0x8c; + /* 0x08C */ dBgS_AcchCir* pm_acch_cir; /* 0x090 */ f32 field_0x90; /* 0x094 */ f32 field_0x94; /* 0x098 */ f32 m_ground_h; @@ -197,7 +200,7 @@ public: /* 0x0C8 */ f32 m_roof_crr_height; /* 0x0CC */ f32 field_0xcc; /* 0x0D0 */ f32 m_wtr_chk_offset; - /* 0x0D4 */ int field_0xd4; + /* 0x0D4 */ cBgS_PolyInfo* pm_out_poly_info; /* 0x0D8 */ f32 field_0xd8; /* 0x0DC */ dBgS_GndChk m_gnd; /* 0x130 */ dBgS_RoofChk m_roof; diff --git a/include/d/bg/d_bg_s_gnd_chk.h b/include/d/bg/d_bg_s_gnd_chk.h index 19db3316100..a72686488c6 100644 --- a/include/d/bg/d_bg_s_gnd_chk.h +++ b/include/d/bg/d_bg_s_gnd_chk.h @@ -20,7 +20,7 @@ class dBgS_ObjGndChk : public dBgS_GndChk { public: dBgS_ObjGndChk() { SetObj(); } - /* 8001E020 */ virtual ~dBgS_ObjGndChk(); // should be inlined + /* 8001E020 */ virtual ~dBgS_ObjGndChk() {} }; class dBgS_ObjGndChk_Wtr : public dBgS_ObjGndChk { diff --git a/include/d/bg/d_bg_s_poly_pass_chk.h b/include/d/bg/d_bg_s_poly_pass_chk.h index 5eedc5e3e29..4dc1a559cad 100644 --- a/include/d/bg/d_bg_s_poly_pass_chk.h +++ b/include/d/bg/d_bg_s_poly_pass_chk.h @@ -5,7 +5,7 @@ class cBgS_PolyPassChk { public: - virtual ~cBgS_PolyPassChk(); + virtual ~cBgS_PolyPassChk() {} }; class dBgS_PolyPassChk : public cBgS_PolyPassChk { diff --git a/include/d/bg/d_bg_s_roof_chk.h b/include/d/bg/d_bg_s_roof_chk.h index a2ac6a7ff40..6a854d64f65 100644 --- a/include/d/bg/d_bg_s_roof_chk.h +++ b/include/d/bg/d_bg_s_roof_chk.h @@ -31,4 +31,11 @@ public: /* 80140E40 */ virtual ~dBgS_LinkRoofChk() {} }; +class dBgS_ObjRoofChk : public dBgS_RoofChk { +public: + dBgS_ObjRoofChk() { SetObj(); } + + virtual ~dBgS_ObjRoofChk() {} +}; + #endif /* D_BG_D_BG_S_ROOF_CHK_H */ diff --git a/include/d/bg/d_bg_s_wtr_chk.h b/include/d/bg/d_bg_s_wtr_chk.h index f314e82a729..dfc4609a707 100644 --- a/include/d/bg/d_bg_s_wtr_chk.h +++ b/include/d/bg/d_bg_s_wtr_chk.h @@ -7,7 +7,7 @@ class dBgS_WtrChk : public dBgS_SplGrpChk { public: /* 80079164 */ dBgS_WtrChk(); - /* 8001DF30 */ virtual ~dBgS_WtrChk(); + /* 8001DF30 */ virtual ~dBgS_WtrChk() {} }; // Size: 0x54 #endif /* D_BG_D_BG_S_WTR_CHK_H */ diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 9119e1df9b3..d08c5c0591d 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -357,6 +357,7 @@ public: f32 TrimHeight() { return mTrimHeight; } int Type() { return mCurType; } int Mode() { return mNextMode; } + f32 Fovy() { return mFovY + mShake.field_0x3c; } bool i_chkFlag(u32 i_flag) { return mEventFlags & i_flag; } void i_setFlag(u32 i_flag) { mEventFlags |= i_flag; } diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 3bffd93ce10..731d2956904 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -3,7 +3,7 @@ #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAEmitter.h" -#include "dolphin/types.h" +#include "d/particle/d_particle_name.h" #include "d/kankyo/d_kankyo.h" class J3DAnmTexPattern; diff --git a/include/d/particle/d_particle_name.h b/include/d/particle/d_particle_name.h index 3bba3e49227..7b8f5d0f872 100644 --- a/include/d/particle/d_particle_name.h +++ b/include/d/particle/d_particle_name.h @@ -6,6 +6,3212 @@ struct dPa_name { static u16 j_o_id[5]; static u16 s_o_id[14]; + + // Enum names are made up, based on the filename for the particle + enum { + AK_JN_M_breakFaceRock00_e, + AK_JN_M_breakGreatRock00_e, + AK_JN_M_breakLittleRock00_e, + AK_JN_M_tuboHahen_e, + AK_JN_NG_e, + AK_JN_OK_e, + AK_JN_O_appearHeart_e, + AK_JN_O_appearLupy_e, + AK_JN_O_fire00_e, + AK_JN_appearChest00_e, + AK_JN_appearChest01_e, + AK_JN_auraBody00_e, + AK_JN_auraHead00_e, + AK_JN_auraLimbs00_e, + AK_JN_bodyAblaze00_e, + AK_JN_breakFaceRock00_e, + AK_JN_breakGreatRock00_e, + AK_JN_breakLifeball_e, + AK_JN_breakLittleRock00_e, + AK_JN_breakMajuCup00_e, + AK_JN_breakMajuPlate00_e, + AK_JN_breakMajuPot00_e, + AK_JN_chargePower00_e, + AK_JN_chargePower01_e, + AK_JN_criticalHit_e, + AK_JN_criticalHitFlash_e, + AK_JN_cureFairy00_e, + AK_JN_drowningSplash00_e, + AK_JN_elementHibana00_e, + AK_JN_elementKikuzu00_e, + AK_JN_elementKusa00_e, + AK_JN_elementShibuki00_e, + AK_JN_enemyFlash00_e, + AK_JN_enemyFreeze00_e, + AK_JN_enemyFreeze01_e, + AK_JN_enemyFreeze02_e, + AK_JN_evaporation00_e, + AK_JN_hahenLifeball_e, + AK_JN_hamon00_e, + AK_JN_heartVessel_e, + AK_JN_iceHahen00_e, + AK_JN_iceThaw00_e, + AK_JN_leafFan00_e, + AK_JN_leafParachute00_e, + AK_JN_leafParachute01_e, + AK_JN_lightSaver00_e, + AK_JN_lightSaver01_e, + AK_JN_lk_nure_pota01_e, + AK_JN_lootItem00_e, + AK_JN_ratSplash00_e, + AK_JN_roundAttack00_e, + AK_JN_roundAttack01_e, + AK_JN_roundAttack02_e, + AK_JN_roundAttackKusa_e, + AK_JN_roundAttackShibuki_e, + AK_JN_roundAttackToe_e, + AK_JN_shootingStar00_e, + AK_JN_shotenBakuen_e, + AK_JN_shotenPofu_e, + AK_JN_shotenSpirit_e, + AK_JN_sibouBakuen_e, + AK_JN_sibouFlash_e, + AK_JN_sibouPofu_e, + AK_JN_sibouSpirit_e, + AK_JN_spillWater00_e, + AK_JN_torch_e, + AK_JN_tuba00_e, + AK_JN_tuboKonagona_e, + AK_JN_uchiwaWind00_e, + AK_JN_uchiwaWind01_e, + AK_JN_windLine00_e, + AK_JP_O_kagerou00_e, + AK_JT_elementSmoke00_e, + AK_JT_elementSmoke01_e, + AK_JT_liftRockSmoke00_e, + AK_JT_roundAttackSmoke_e, + HM_J2_arwF_light00_e, + HM_J2_arwG_flame00_e, + HM_J2_arwI_cold00_e, + HM_J2_rupylight_e, + IT_JN_M_sts_hahen_e, + IT_JN_O_happa01_e, + IT_JN_O_kusa_ken_e, + IT_JN_O_kusa_run_e, + IT_JN_arwF_hinoko00_e, + IT_JN_arwF_hitA00_e, + IT_JN_arwF_hitB00_e, + IT_JN_arwFir_fchip00_e, + IT_JN_arwFir_fire00_e, + IT_JN_arwFir_out00_e, + IT_JN_arwG_flash00_e, + IT_JN_arwG_hitA00_e, + IT_JN_arwG_tsubu00_e, + IT_JN_arwI_hitA00_e, + IT_JN_arwI_kirakira00_e, + IT_JN_arwI_reiki00_e, + IT_JN_arwIce_kira00_e, + IT_JN_arwIce_out00_e, + IT_JN_arwIce_smoke00_e, + IT_JN_arwIce_suiteki00_e, + IT_JN_arw_blur00_e, + IT_JN_bm_hibana_e, + IT_JN_bmex_senko_e, + IT_JN_dokuro00_e, + IT_JN_flower_p_e, + IT_JN_flower_w_e, + IT_JN_getitem_flash_l00_e, + IT_JN_getitem_flash_s00_e, + IT_JN_getitem_halo00_e, + IT_JN_getitem_star00_e, + IT_JN_hamon01_e, + IT_JN_happa02_e, + IT_JN_hm_senko00_e, + IT_JN_hm_senpu00_e, + IT_JN_hm_syogeki00_e, + IT_JN_hm_wp00_e, + IT_JN_kakomi_fire_a00_e, + IT_JN_kakomi_fire_b00_e, + IT_JN_kakomi_steam00_e, + IT_JN_ktr_fire_e, + IT_JN_lk_geppu00_e, + IT_JN_lk_nure_pota00_e, + IT_JN_lk_nure_shibuki00_e, + IT_JN_lk_swimk_l_e, + IT_JN_mizushibuki_a_e, + IT_JN_piyohit00_e, + IT_JN_piyopiyo00_e, + IT_JN_sWoodLeaf00_e, + IT_JN_sk_fire_a_e, + IT_JN_sk_hahen_a_e, + IT_JN_sts_hahen_e, + IT_JN_takara_nakaf_e, + IT_JN_takara_pakaf_e, + IT_JN_takara_pakaf_soto_e, + IT_JN_takara_tsubu_e, + IT_JN_takara_uef_e, + IT_JN_takara_volm_e, + IT_JN_tr2_shibuki_a_e, + IT_JN_tr2_shibuki_b_e, + IT_JN_tr_hahen_a_e, + IT_JN_tr_hahen_b_e, + IT_JN_tr_hahen_c_e, + IT_JN_wp_hamon01_e, + IT_JN_wp_hamon02_e, + IT_JN_wp_hamon03_e, + IT_JN_wp_shibuki_e, + IT_JP_kakomi_kagero00_e, + IT_JT_bm_smoke_e, + IT_JT_bmex_hahen_e, + IT_JT_bmex_smoke01_e, + IT_JT_bmex_smoke02_e, + IT_JT_bmex_smokeLight_e, + IT_JT_ktr_smoke_e, + IT_JT_mizubashira_e, + IT_JT_sk_smoke_e, + IT_JT_watersmoke00_e, + ZI_J_bombex_a_e, + ZI_J_bombex_b_e, + ZI_J_bombex_c_e, + ZI_J_bombex_d_e, + AK_SN_O_ghostShipFire00_e, + AK_SN_bmosBall00_e, + AK_SN_bmosBreak00_e, + AK_SN_bmosBreak01_e, + AK_SN_bmosEye00_e, + AK_SN_bmosWait00_e, + AK_SN_bridgeRopeFire00_e, + AK_SN_fallenLeafBomb00_e, + AK_SN_fallenLeafFan00_e, + AK_SN_fallenLeafFire00_e, + AK_SN_fallenLeafFire01_e, + AK_SN_fallenLeafRun00_e, + AK_SN_flamethrower00_e, + AK_SN_hidarumaFire_e, + AK_SN_hitShieldLight00_e, + AK_SN_kindanHoushi00_e, + AK_SN_kira00_e, + AK_SN_kutaniVessel_e, + AK_SN_mirrorShield00_e, + AK_SN_mozFire00_e, + AK_SN_mozFire01_e, + AK_SN_oshiriKurokoge_e, + AK_SN_pigDassui_e, + AK_SN_pigGas00_e, + AK_SN_pirateShipTail00_e, + AK_SN_steam00_e, + AK_SN_steam01_e, + AK_SN_warpPotClose00_e, + AK_SN_warpPotFire00_e, + AK_SN_warpPotFire01_e, + AK_SN_warpPotOpen00_e, + AK_SP_MtDragonKagerou_e, + AK_ST_fallenLeafSmoke00_e, + AK_ST_pigDigSmoke00_e, + IT_SN_O_unitFire_a_e, + IT_SN_O_unitFire_b_e, + IT_SN_bokkuri_hahen00_e, + IT_SN_bokkuri_matsu00_e, + IT_SN_bokkuri_tane00_e, + IT_SN_bokkuri_toge00_e, + IT_SN_flower_oF00_e, + IT_SN_flower_oL00_e, + IT_SN_hamSW_star00_e, + IT_SN_hamSW_syougeki00_e, + IT_SN_himekuji_a_e, + IT_SN_himekuji_b_e, + IT_SN_ktr_yuka_e, + IT_SN_lk_blur00_e, + IT_SN_lk_fkshot_suna00_e, + IT_SN_lk_freezKira00_e, + IT_SN_lk_freezSmoke00_e, + IT_SN_pf_bikon01_e, + IT_SN_tg_kururinp_blur_g00_e, + IT_SN_tg_kururinp_blur_r00_e, + IT_SN_tg_kururinp_kami_l00_e, + IT_SN_tg_kururinp_kami_m00_e, + IT_SN_tg_kururinp_kami_r00_e, + IT_SN_tgsyoku_rock00_e, + IT_SN_wpot_bitya_e, + IT_SN_wpot_pitya_e, + IT_SN_wpot_pitya_c_e, + IT_SN_wpot_shibuki_e, + IT_SN_wpot_yuka_e, + IT_ST_bokkuri_smoke00_e, + IT_ST_jmpflower_smoke00_e, + IT_ST_tgsyoku_smoke00_e, + ZI_S_screenKagerou01_e, + ZI_S_wbClod_a_e, + ZI_S_wbSmoke_a_e, + ZI_S_test01_e, + ZI_J_dashSmoke_a_e, + ZI_J_downSmoke_a_e, + ZI_J_testSmoke_a01_e, + ZI_J_testSmoke_a02_e, + ZI_J_testSmoke_b01_e, + ZI_J_testSmoke_b02_e, + ZI_J_testSmoke_c01_e, + ZI_J_testSmoke_c02_e, + ZI_S_boro_arm_e, + ZI_S_boro_back_e, + ZI_S_fire_arm_e, + ZI_S_fire_back_a_e, + ZI_S_fire_back_b_e, + ZI_S_fire_hand_e, + ZI_S_fire_neck_e, + ZI_S_hibana_back_e, + ZI_S_smoke_back_e, + ZI_S_fm_boro_arm_e, + ZI_S_fm_boro_back_e, + ZI_S_fm_fire_arm_e, + ZI_S_fm_fire_back_a_e, + ZI_S_fm_fire_back_b_e, + ZI_S_fm_fire_hand_e, + ZI_S_fm_fire_neck_e, + ZI_S_fm_hibana_back_e, + ZI_S_fm_smoke_back_e, + ZI_J_O_fire_a_e, + ZI_J_O_fire_b_e, + ZI_J_O_fire_c_e, + ZI_J_O_kagerou_e, + ZI_S_O_unitFire_a_e, + ZI_S_O_unitFire_b_e, + ZI_S_O_unitFire_c_e, + ZI_J_rollSmoke_a_e, + ZI_J_deadEfect_a_e, + ZI_J_deadEfect_b_e, + ZI_J_deadEfect_c_e, + ZI_J_deadEfect_d_e, + ZI_J_deadEfect_e_e, + ZI_S_sara_fire_a_e, + ZI_S_sara_fire_b_e, + ZI_S_sara_fire_c_e, + ZI_S_O_fire2_a_e, + ZI_S_O_fire2_b_e, + ZI_S_O_kagerou2_e, + ZI_S_rd_arrowFire_a_e, + ZI_J_hitCR_a_e, + ZI_J_hitCR_b_e, + ZI_J_hitCR_c_e, + ZI_J_hitNG_a_e, + ZI_J_hitNG_b_e, + ZI_J_hitOK_a_e, + ZI_J_hitOK_b_e, + ZI_S_fm_attack1_a_e, + ZI_J_sunKagerou01_e, + ZI_J_setTest_a_e, + ZI_J_setTest_b_e, + ZI_S_hako_burn_a_e, + ZI_S_hako_burn_b_e, + ZI_S_hako_burn_c_e, + ZI_S_hako_burn_d_e, + ZI_S_hako_burn_e_e, + ZI_S_fm_footFire_a_e, + ZI_S_fm_footFire_b_e, + ZI_S_fm_footFire_c_e, + ZI_S_hs_brakeKusa_a_e, + ZI_S_hs_brakeSmoke_a_e, + ZI_S_hs_brakeSmoke_b_e, + ZI_S_hs_brakeSmoke_c_e, + ZI_S_hs_runKusa_a_e, + ZI_S_hs_runSmoke_a_e, + ZI_S_hs_runSmoke_b_e, + ZI_S_hs_runSmoke_c_e, + ZI_S_lk_brakeKusa_a_e, + ZI_S_lk_brakeSmoke_a_e, + ZI_S_lk_brakeSmoke_b_e, + ZI_S_lk_brakeSmoke_c_e, + ZI_S_lk_jumpKusa_a_e, + ZI_S_lk_jumpSmoke_a_e, + ZI_S_lk_jumpSmoke_b_e, + ZI_S_lk_jumpSmoke_c_e, + ZI_S_lk_landKusa_a_e, + ZI_S_lk_landSmoke_a_e, + ZI_S_lk_landSmoke_b_e, + ZI_S_lk_landSmoke_c_e, + ZI_S_lk_rollKusa_a_e, + ZI_S_lk_rollSmoke_a_e, + ZI_S_lk_rollSmoke_b_e, + ZI_S_lk_rollSmoke_c_e, + ZI_S_lk_runKusa_a_e, + ZI_S_lk_runSmoke_a_e, + ZI_S_lk_runSmoke_b_e, + ZI_S_lk_runSmoke_c_e, + ZI_J_dashKusa_a_e, + ZI_J_dashSmoke_b_e, + ZI_J_dashSmoke_c_e, + ZI_J_downKusa_a_e, + ZI_J_downSmoke_b_e, + ZI_J_downSmoke_c_e, + ZI_S_hs_runWtr01_a_e, + ZI_S_hs_runWtr02_a_e, + ZI_S_hs_runWtr03_a_e, + ZI_S_fm_roar_a_e, + ZI_S_fm_tame_a_e, + ZI_S_fm_tame_b_e, + ZI_S_fm_tame_c_e, + ZI_S_fm_tenjyou_e, + ZI_S_fm_hasiraFire_a_e, + ZI_S_lk_runWtr01_a_e, + ZI_S_lk_runWtr02_a_e, + ZI_J_deadEfect_f_e, + ZI_J_deadEfect_g_e, + ZI_S_shutterSmoke_a_e, + ZI_J_O_kusa_ken_e, + ZI_J_O_kusa_run_e, + ZI_J_kaitengiri_a_e, + ZI_J_kaitengiri_b_e, + ZI_J_kaitengiri_c_e, + ZI_J_M_tuboHahen_e, + ZI_J_tuboHahen_e, + ZI_J_tuba00_e, + ZI_S_dnTailBlur_a_e, + ZI_S_dnTailBlur_b_e, + ZI_J_bombEX_a_e, + ZI_J_bombEX_b_e, + ZI_J_bombEX_c_e, + ZI_J_bombEX_d_e, + ZI_J_bombEX_e_e, + ZI_J_bombEX_f_e, + ZI_J_bombEX_g_e, + ZI_J_bombEX_h_e, + ZI_S_test0608_e, + ZI_S_hibashira_foot_a_e, + ZI_S_hibashira_foot_b_e, + ZI_S_hibashira_foot_c_e, + ZI_S_hibashira_head_a_e, + ZI_S_hibashira_head_b_e, + ZI_S_yoganbashira_foot_a_e, + ZI_S_yoganbashira_foot_b_e, + ZI_S_yoganbashira_foot_c_e, + ZI_S_yoganbashira_head_a_e, + ZI_S_yoganbashira_head_b_e, + ZI_S_O_wakimizu_a_e, + ZI_S_O_wakimizu_b_e, + ZI_S_O_wakimizu_c_e, + ZI_S_fm_downHamon_a_e, + ZI_S_fm_downHamon_b_e, + ZI_S_fm_downHamon_c_e, + ZI_S_fm_downHamon_ind_e, + ZI_S_fm_downSplash_a_e, + ZI_S_fm_downSplash_b_e, + ZI_S_fm_downYuge_a_e, + ZI_S_fm_hamon_a_e, + ZI_S_fm_hamon_ind_e, + ZI_S_fm_yuge_a_e, + ZI_S_fm_kaen_a_e, + ZI_S_fm_kaen_b_e, + ZI_S_fm_kaen_c_e, + ZI_S_fm_kaen_d_e, + ZI_J_gate_a_e, + ZI_J_gate_b_e, + ZI_J_gate_c_e, + ZI_J_gate_d_e, + ZI_J_gate_e_e, + ZI_S_fs_fadeout_a_e, + ZI_S_fs_kantera_a_e, + ZI_S_fs_kantera_b_e, + ZI_S_fs_syaboPachi_a_e, + ZI_S_fs_syabon_a_e, + ZI_S_O_fm_hamon_a_e, + ZI_S_O_fm_hamon_ind_e, + ZI_S_O_fm_splash_large_e, + ZI_S_O_fm_splash_small_e, + ZI_S_fm_boil_a_e, + ZI_S_fm_boil_b_e, + ZI_S_fm_boil_ind_e, + ZI_S_fm_yuge_b_e, + ZI_S_fm_splash_large_e, + ZI_S_tk2_attack_a_e, + ZI_S_tk2_attack_b_e, + ZI_S_tk2_ball_a_e, + ZI_S_tk_attack_a_e, + ZI_S_tk_attack_b_e, + ZI_S_tk_ball_a_e, + ZI_S_tk_ball_b_e, + ZI_S_fm_splash_large2_e, + ZI_S_fm_coreAt_a_e, + ZI_S_fm_coreAt_b_e, + ZI_S_fm_coreAt_c_e, + ZI_S_fm_tame2_a_e, + ZI_S_fm_tame2_b_e, + ZI_S_nv_glow_a_e, + ZI_S_nv_tail_a_e, + ZI_S_sz_shibuki_a_e, + ZI_S_sz_shibuki_b_e, + ZI_S_sz_shibuki_c_e, + ZI_S_sz_shibuki_d_e, + ZI_S_O_kusa0H_ken_e, + ZI_S_O_kusa0I_ken_e, + ZI_S_kabe01_rock_a_e, + ZI_S_kabe01_smoke_a_e, + ZI_J_dashWtrA_a_e, + ZI_J_dashWtrA_b_e, + ZI_J_dashWtrA_c_e, + ZI_J_hamon_a_e, + ZI_J_hamon_ind_e, + ZI_J_landWtrA_a_e, + ZI_J_landWtrA_b_e, + ZI_J_landWtrA_c_e, + ZI_J_landWtrA_d_e, + ZI_J_downWtrA_a_e, + ZI_J_downWtrA_b_e, + ZI_J_downWtrA_c_e, + ZI_J_downWtrA_d_e, + ZI_J_hikinami_a_e, + ZI_J_mizubashira_a_e, + ZI_J_mizubashira_b_e, + ZI_J_syabon_pachin_a_e, + ZI_J_syabon_pachin_b_e, + ZI_S_db_taieki_a_e, + ZI_S_db_yodaburu_a_e, + ZI_S_db_yodahit_a_e, + ZI_S_db_yodareM1_a_e, + ZI_S_db_yodareM1_b_e, + ZI_S_db_yodareM2_a_e, + ZI_S_kg_taieki_a_e, + ZI_S_sf_baraKusa_a_e, + ZI_S_sf_baraSmoke_a_e, + ZI_S_sf_getup_a_e, + ZI_S_sf_shield_a_e, + ZI_S_sf_shield_b_e, + ZI_S_sh_appear_a_e, + ZI_S_sh_appear_b_e, + ZI_S_sh_appear_c_e, + ZI_S_sh_disappear_a_e, + ZI_S_sh_disappear_b_e, + ZI_S_sh_disappear_c_e, + ZI_S_sh_yodahit_a_e, + ZI_S_sh_yodapota_a_e, + ZI_S_sh_yodapota_b_e, + ZI_S_ai_coreHit_a_e, + ZI_S_ai_coreHit_b_e, + ZI_S_bs_appear_a_e, + ZI_S_bs_appear_b_e, + ZI_S_bs_konagona_a_e, + ZI_S_bs_konagona_b_e, + ZI_S_bs_konagona_c_e, + ZI_S_db_yodapota_a_e, + ZI_J_arwB_hibana_a_e, + ZI_J_arwB_smoke_a_e, + ZI_J_arwB_smoke_b_e, + ZI_J_zenkaiScreen_a_e, + ZI_J_zenkaiScreen_b_e, + ZI_J_zenkaiScreen_flash_e, + ZI_J_wl_kaitenAt_a_e, + ZI_J_wl_kaitenAt_b_e, + ZI_S_hukuBlock_hikari_a_e, + ZI_S_hukuBlock_hikari_b_e, + ZI_J_lk_abuku_a_e, + ZI_S_tetsusaku_a_e, + ZI_S_tetsusaku_b_e, + ZI_S_tetsusaku_c_e, + ZI_J_bombEX_i_e, + ZI_S_ai_flash_a_e, + ZI_S_goma_chip_a_e, + ZI_S_goma_smoke_a_e, + ZI_J_kaitengiriH_a_e, + ZI_J_kaitengiriH_b_e, + ZI_J_zenkaiScreen2_a_e, + ZI_J_zenkaiScreen2_b_e, + ZI_J_zenkaiScreen2_c_e, + ZI_J_boom_flash_a01_e, + ZI_J_boom_hit_a_e, + ZI_J_boom_hit_b_e, + ZI_J_boom_leaf_a_e, + ZI_J_boom_tame_a01_e, + ZI_J_boom_tame_b01_e, + ZI_J_boom_tame_c01_e, + ZI_J_boom_wait_a01_e, + ZI_J_boom_wait_b01_e, + ZI_J_boom_kiseki_a_e, + ZI_J_boom_kiseki_b_e, + ZI_J_dig00_a_e, + ZI_S_pm_leafblow_a_e, + ZI_S_pm_leafblow_b_e, + ZI_S_pm_leafblow_c_e, + ZI_S_maki_fire_a_e, + ZI_S_maki_fire_b_e, + ZI_S_maki_fire_c_e, + ZI_S_maki_fire_d_e, + ZI_S_maki_fire_ind_e, + ZI_S_maki_hit_a_e, + ZI_S_maki_hit_b_e, + ZI_S_maki_hit_c_e, + ZI_S_mkdemo_boom_flash_a_e, + ZI_S_mkdemo_boom_hit_a_e, + ZI_S_mkdemo_boom_hit_b_e, + ZI_S_mkdemo_boom_kiseki_a_e, + ZI_S_mkdemo_boom_kiseki_b_e, + ZI_S_mkdemo_boom_tame_a_e, + ZI_S_mkdemo_boom_tame_b_e, + ZI_S_mkdemo_boom_tame_c_e, + ZI_S_mkdemo_boom_wait_a_e, + ZI_S_mkdemo_boom_wait_b_e, + ZI_S_ba_fire_a_e, + ZI_S_ba_fire_b_e, + ZI_S_ba_fire_c_e, + ZI_S_ba_fire_d_e, + ZI_S_ba_ice_a_e, + ZI_S_ba_ice_b_e, + ZI_S_ba_ice_c_e, + ZI_S_bu_fire_a_e, + ZI_S_bu_fire_b_e, + ZI_S_bu_fire_c_e, + ZI_S_bu_fire_d_e, + ZI_S_bu_ice_a_e, + ZI_S_bu_ice_b_e, + ZI_S_bu_ice_c_e, + ZI_S_fireball_a_e, + ZI_S_test_fire_backbone2_RT_e, + ZI_S_test_fire_legLR1_T_e, + ZI_S_test_fire_neck_RT_e, + ZI_S_test_fire_tail2_T_e, + ZI_S_test_fire_tail3_T_e, + ZI_S_test_fire_tail4_T_e, + ZI_S_test_fire_tail5_T_e, + ZI_S_test_fire_tail6_T_e, + ZI_S_test_smoke_backbone1_T_e, + ZI_S_test_smoke_neck_T_e, + ZI_J_ballF_a01_e, + ZI_J_ballF_aZ01_e, + ZI_J_ballF_b01_e, + ZI_J_ballF_bZ01_e, + ZI_J_test_fire_BlegL1_T_e, + ZI_J_test_fire_BlegR1_T_e, + ZI_J_test_fire_backbone2_RT_e, + ZI_J_test_fire_neck_RT_e, + ZI_J_test_fire_tail2_T_e, + ZI_J_test_fire_tail3_T_e, + ZI_J_test_fire_tail4_T_e, + ZI_J_test_fire_tail5_T_e, + ZI_J_test_fire_tail6_T_e, + ZI_J_test_smoke_backbone1_T_e, + ZI_J_test_smoke_neck_T_e, + ZI_S_kakashi_pump_a_e, + ZI_S_kakashi_wara_a_e, + ZI_S_pumpkin_a_e, + ZI_S_pumpkin_leaf_a_e, + ZI_S_pumpkin_leaf_b_e, + ZI_J_yamiFilter_a_e, + ZI_J_wl_lockAtBlur_a_e, + ZI_J_wl_lockAtBlur_b_e, + ZI_J_wl_lockAtBlur_ind_e, + ZI_J_wl_lockAtDash_a_e, + ZI_S_si_kantsu_a_e, + ZI_S_si_kantsu_b_e, + ZI_S_si_kantsu_yukaato_e, + ZI_J_spBoom_kusa_a_e, + ZI_J_spBoom_leaf_a_e, + ZI_J_spBoom_rock_a_e, + ZI_J_spBoom_smoke_a_e, + ZI_J_AtoW_a_e, + ZI_J_AtoW_b_e, + ZI_J_WtoA_a_e, + ZI_J_WtoA_b_e, + ZI_J_WtoA_c_e, + ZI_S_otiba_a_e, + ZI_S_otiba_b_e, + ZI_J_spBoom_syougeki_a_e, + ZI_J_spBoom_syougeki_b_e, + ZI_S_enemy_downWtrA_a_e, + ZI_S_enemy_downWtrA_b_e, + ZI_S_enemy_downWtrA_c_e, + ZI_S_enemy_runWtrA_a_e, + ZI_S_enemy_runWtrA_b_e, + ZI_S_enemy_runWtrA_c_e, + ZI_S_mkdemo_boom2_kiseki_a_e, + ZI_S_mkdemo_boom2_kiseki_b_e, + ZI_S_mkdemo_boom2_wait_a_e, + ZI_S_mkdemo_boom2_wait_b_e, + ZI_S_warpholeApp_a_e, + ZI_S_warpholeApp_b_e, + ZI_S_warpholeApp_c_e, + ZI_S_db_change_a_e, + ZI_S_db_change_b_e, + ZM_S_M_Nut00_e, + ZM_S_Nut00_e, + ZM_S_Nut01_e, + ZM_S_Nut02_e, + ZI_S_yamiDead_appWarp_a_e, + ZI_S_yamiDead_normal_a_e, + ZI_S_yamiDead_normal_b_e, + ZI_S_yamiDead_normal_c_e, + ZI_S_st_fallSand_a_e, + ZI_S_st_fallSand_b_e, + ZI_S_pEye_maruta_a_e, + ZI_S_otiba_c_e, + ZI_S_pEye_wRock_a_e, + ZI_S_pEye_wRock_b_e, + ZI_S_warpholeAppDemo1_a_e, + ZI_J_keyTest_e, + ZI_S_maruta_hamon_a_e, + ZI_S_maruta_shibuki_a_e, + ZI_S_maruta_shibuki_b_e, + ZM_S_KeyLight00_e, + ZM_S_KeyLight01_e, + ZI_S_wPole1_hamon_a_e, + ZI_S_wPole1_pEye_a_e, + ZI_S_wPole1_shibuki_a_e, + ZI_S_wPole1_shibuki_b_e, + ZI_S_wPole1_smoke_a_e, + ZI_S_wRock1_hamon_a_e, + ZI_S_wRock1_pEye_a_e, + ZI_S_wRock1_pEye_b_e, + ZI_S_wRock1_shibuki_a_e, + ZI_S_wRock1_shibuki_b_e, + ZI_S_wRock1_smoke_a_e, + ZM_S_BombInsectSpark00_e, + ZM_S_BombInsectSpark01_e, + ZM_S_BombInsectSpark02_e, + ZM_S_BombInsectSpark03_e, + ZM_S_BombInsectSpark04_e, + ZM_S_RB_BreakArmor00_e, + ZM_S_RB_BreakArmor01_e, + ZM_S_RB_BreakArmor02_e, + ZM_S_BombRockBreak00_e, + ZM_S_BombRockBreak01_e, + ZM_S_BombRockBreak02_e, + ZM_S_BombRockBreak03_e, + ZM_S_BombRockBreak04_e, + ZM_S_BombRockBreak05_e, + ZM_S_MDDoorOpenDust00_e, + ZM_S_MDDoorOpenDust01_e, + ZM_S_FlowerCutA00_e, + ZM_S_FlowerCutA01_e, + ZM_S_FlowerCutB00_e, + ZM_S_FlowerCutB01_e, + ZI_J_midona_bindBeam_a_e, + ZI_J_midona_bindHit_a_e, + ZI_J_midona_bind_a_e, + ZI_J_midona_bind_b_e, + ZI_J_midona_bind_c_e, + ZI_J_spBoom_water_a_e, + ZI_J_spBoom_water_b_e, + ZI_J_spBoom_water_c_e, + ZI_J_wl_buruburu_a_e, + ZI_J_lk_nureCut_backbone1_e, + ZI_J_lk_nurePota_backbone2_e, + ZI_J_lk_nurePota_waist_e, + ZI_J_wl_nurePota_backbone1_e, + ZI_J_wl_nurePota_backbone2_e, + ZI_S_demo_changeAtoW_a_e, + ZI_S_demo_changeAtoW_b_e, + ZM_S_BreakWoodBox00_e, + ZM_S_BreakWoodBox01_e, + ZM_S_BreakWoodBox02_e, + ZM_S_BreakWoodBox03_e, + ZM_S_M_BreakWoodBox00_e, + ZI_S_bq_appAbuku_a_e, + ZI_S_bq_appAbuku_b_e, + ZI_S_bq_appBreath_a_e, + ZI_S_bq_appBreath_ind_e, + ZI_S_bq_appHamon_a_e, + ZI_S_bq_appHamon_ind_e, + ZI_S_bq_appSplash_a_e, + ZI_S_bq_appSplash_b_e, + ZI_S_bq_appSplash_c_e, + ZI_S_bq_appSplash_d_e, + ZI_S_bq_appYodare_a_e, + ZI_S_kantera_fire_e, + ZI_J_kantera_fire_e, + ZI_S_ni_hane_a_e, + ZM_S_KeyLightHemiSphere00_e, + ZM_S_KeyLightHemiSphere01_e, + ZI_S_ni_hane_black_e, + ZI_S_ni_hane_brown_e, + ZI_S_ni_hane_white_e, + ZI_S_ni_hane_yellow_e, + ZI_S_bb_startClod_e, + ZI_S_bb_startFootMark_e, + ZI_S_bb_startHanaiki_e, + ZI_S_umasaku_burn_a_e, + ZI_S_umasaku_burn_b_e, + ZI_S_bh_appAbuku_a_e, + ZI_S_bh_appAbuku_b_e, + ZI_S_bh_appHamon_a_e, + ZI_S_bh_appHamon_ind_e, + ZI_S_bh_appSplash_a_e, + ZI_S_bh_appSplash_b_e, + ZM_S_BombInsectSparkTornado00_e, + ZM_S_BombInsectSparkTornado01_e, + ZM_S_BombInsectSparkTornado02_e, + ZM_S_BombInsectSparkTornado03_e, + ZM_S_BombInsectSparkTornado04_e, + ZI_S_bq_dokuato_a_e, + ZI_S_bq_dokuato_b_e, + ZI_S_bq_dokuhaki_a_e, + ZI_S_bq_dokuhaki_b_e, + ZI_S_bq_dokuhaki_c_e, + ZI_S_bh_bombDamage_a_e, + ZI_S_bh_bombDamage_b_e, + ZI_S_bh_bombDamage_c_e, + ZI_S_bh_bombDamage_d_e, + ZI_J_boom_wait_c01_e, + ZI_J_boom_wait_d01_e, + ZI_S_bq_dokuhaki_d_e, + ZM_S_HazikiAppear00_e, + ZM_S_HazikiAppear01_e, + ZM_S_HazikiPlateSmoke00_e, + ZM_S_BoarBoneBreak00_e, + ZM_S_M_BoarBoneBreak00_e, + ZM_S_gb_BombDamage00_e, + ZM_S_gb_DamageSlaver00_e, + ZM_S_gb_ReviveSlaver00_e, + ZM_S_gf_BombDamage00_e, + ZM_S_gf_BombDamage01_e, + ZM_S_gf_BombDamage02_e, + ZM_S_gf_BombDamage03_e, + ZM_S_gf_BombDamage04_e, + ZI_J_hitCR_d_e, + ZI_J_hitCR_ind_e, + ZI_J_hitOK_c_e, + ZI_J_hitOK_d_e, + ZI_S_demo04_warphole_a_e, + ZI_S_demo04_warphole_b_e, + ZI_S_bh_appSplash_c_e, + ZI_S_bh_yodapota_jawD2_e, + ZI_S_bh_yodare_jawD2_e, + ZI_S_bh_yodare_jawD3_e, + ZI_S_bh_yodare_jawU2_e, + ZI_S_bh_yodare_jawU3_e, + ZI_S_bq_appSplash_e_e, + ZI_S_bq_bombdamageYodare_a_e, + ZI_S_bq_bombdamageYodare_b_e, + ZI_S_bq_bombdamageYodare_c_e, + ZI_S_bq_deadHamon1_a_e, + ZI_S_bq_deadHamon1_ind_e, + ZI_S_bq_deadHamon2_a_e, + ZI_S_bq_deadHamon2_ind_e, + ZI_S_bq_deadHamon3_a_e, + ZI_S_bq_deadHamon3_ind_e, + ZI_S_bq_deadHamon4_a_e, + ZI_S_bq_deadHamon4_ind_e, + ZI_S_bq_deadKare_a_neck2_e, + ZI_S_bq_deadKare_a_neck3_e, + ZI_S_bq_deadKare_a_neck4_e, + ZI_S_bq_deadKare_a_neck5_e, + ZI_S_bq_deadKare_a_neck6_e, + ZI_S_bq_deadKare_a_neck7_e, + ZI_S_bq_deadKare_b_neck2_e, + ZI_S_bq_deadKare_b_neck3_e, + ZI_S_bq_deadKare_b_neck4_e, + ZI_S_bq_deadKare_b_neck5_e, + ZI_S_bq_deadKare_b_neck6_e, + ZI_S_bq_deadKare_b_neck7_e, + ZI_S_bq_deadShibuki1_a_e, + ZI_S_bq_deadShibuki1_b_e, + ZI_S_bq_deadShibuki1_c_e, + ZI_S_bq_deadShibuki2_a_e, + ZI_S_bq_deadShibuki2_b_e, + ZI_S_bq_deadShibuki2_c_e, + ZI_S_bq_deadShibuki3_a_e, + ZI_S_bq_deadShibuki3_b_e, + ZI_S_bq_deadShibuki3_c_e, + ZI_S_bq_deadShibuki4_a_e, + ZI_S_bq_deadShibuki4_b_e, + ZI_S_bq_eyeExplosion_a_e, + ZI_S_bq_eyeExplosion_b_e, + ZI_S_bq_eyeExplosion_c_e, + ZI_S_bq_eyeExplosion_d_e, + ZI_S_bq_eyeExplosion_e_e, + ZI_S_bq_eyeExplosion_f_e, + ZI_S_bq_return01Yodare_a_e, + ZI_S_bq_return01Yodare_b_e, + ZI_S_bq_return02Yodare_a_e, + ZI_S_bq_return02Yodare_b_e, + ZI_S_bq_yodapota_head_e, + ZI_S_bq_yodare_jawT2_e, + ZI_S_bq_yodare_jawT3_e, + ZI_S_bq_yodare_jawUL2_e, + ZI_S_bq_yodare_jawUR2_e, + ZI_S_tk_hane_a_e, + ZI_S_hatinosu_a_e, + ZI_S_hatinosu_b_e, + ZI_J_colHit_hibana_e, + ZM_S_gs_FeelerDeath00_e, + ZM_S_gs_FeelerDeath01_e, + ZM_S_MonkeyShutterOpenDust00_e, + ZM_S_MonkeyShutterOpenDust01_e, + ZI_J_tsutaNobori_a_e, + ZI_S_fumiSw_a_e, + ZI_S_hd_taieki_a_e, + ZI_S_hd_yodaburu_a_e, + ZI_S_hd_yodahit_a_e, + ZI_S_hd_yodapota_a_e, + ZI_S_hd_yodareM1_a_e, + ZI_S_hd_yodareM1_b_e, + ZI_S_hd_yodareM2_a_e, + ZI_S_moobkai_parapara_a_e, + ZI_S_moobkai_parapara_b_e, + ZI_S_moobkai_smoke_a_e, + ZI_S_tsuribashi_a_e, + ZI_S_ksyoku_break_a_e, + ZI_S_ksyoku_break_b_e, + ZI_S_ksyoku_break_c_e, + ZI_S_tobiy_kakera_a_e, + ZI_J_lk_binWaterN_a_e, + ZI_J_lk_binWaterN_b_e, + ZI_J_lk_binWaterN_c_e, + ZM_S_TorikusaCut00_e, + ZM_S_TorikusaCut01_e, + ZM_S_UmakusaCut00_e, + ZM_S_UmakusaCut01_e, + ZI_S_demo04_waterFallShibuki_a_e, + ZI_S_demo04_waterFallShibuki_b_e, + ZI_S_demo04_wb_shibukiL_a_e, + ZI_S_demo04_wb_shibukiL_b_e, + ZI_S_demo04_wb_shibukiL_c_e, + ZI_S_demo04_wb_shibukiS_a_e, + ZI_S_demo04_wb_shibukiS_b_e, + ZI_S_demo04_wb_shibukiS_c_e, + ZI_S_demo04_lk_flow_a_e, + ZM_S_demo04_BreakGate00_e, + ZM_S_demo04_BreakGate01_e, + ZM_S_demo04_BreakGate02_e, + ZM_S_demo04_BreakGate03_e, + ZM_S_demo04_BreakGate04_e, + ZI_S_bqRoom_waterFallShibuki_a_e, + ZI_S_bqRoom_waterFallShibuki_b_e, + ZI_S_bqRoom_waterFallShibuki_c_e, + ZI_S_bqRoom_waterFallShibuki_d_e, + ZM_S_BoomerangDoorOpenA00_e, + ZM_S_BoomerangDoorOpenA01_e, + ZM_S_BoomerangDoorOpenB00_e, + ZM_S_BoomerangDoorOpenC00_e, + ZM_S_BoomerangDoorOpenC01_e, + ZI_J_kantera_swingFire_e, + ZM_S_HanjyoGobogobo00_e, + ZM_S_HanjyoGobogobo01_e, + ZM_S_HanjyoGobogobo02_e, + ZI_S_demo04_wb_clod_a_e, + ZI_S_demo04_wb_clod_b_e, + ZI_J_swa_kirari_a_e, + ZI_S_bq_eyeExplosion_g_e, + ZI_J_swa_kirari_b_e, + ZI_J_swa_kirari_c_e, + ZI_S_bq_eyeCutU_a_e, + ZI_S_bq_eyeCutU_b_e, + ZI_S_bq_eyeCutU_c_e, + ZM_S_SandWormDive00_e, + ZM_S_SandWormDive01_e, + ZM_S_SandWormDive02_e, + ZM_S_SandWormDive03_e, + ZM_S_SandWormJump00_e, + ZM_S_SandWormJump01_e, + ZM_S_SandWormRun00_e, + ZM_S_SandWormRun01_e, + ZM_S_SandWormRun02_e, + ZM_S_SandWormStruggle00_e, + ZM_S_OrcAttackBlur00_e, + ZM_S_OrcAttackBlur01_e, + ZM_S_OrcSpit00_e, + ZM_S_SandWormHide00_e, + ZM_S_SandWormHide01_e, + ZM_S_SandWormHide02_e, + ZM_S_SandWormAttackSign00_e, + ZM_S_SandWormAttackSign01_e, + ZI_S_grS_smoke_a_e, + ZI_S_grS_smoke_b_e, + ZI_S_grS_smoke_c_e, + ZI_S_grS_smoke_d_e, + ZI_S_grS_smoke_e_e, + ZI_S_grS_smoke_f_e, + ZI_J_houshiTest_e, + ZI_S_hShizukuAppGlow_a_e, + ZI_S_hShizukuAppLine_a_e, + ZI_S_hShizukuRelLine_a_e, + ZI_S_hShizuku_a_e, + ZI_S_hShizuku_b_e, + ZI_S_hShizuku_c_e, + ZI_S_hShizuku_d_e, + ZI_S_hShizuku_e_e, + ZI_S_nsBarrier_coll_a_e, + ZI_S_nsBarrier_coll_b_e, + ZI_S_tp_disappear_a_e, + ZI_S_ym_elecAt_a_e, + ZI_S_ym_elecAt_b_e, + ZI_S_ym_elecAt_c_e, + ZI_S_ym_elecAt_d_e, + ZI_S_md_leadBlur_a_e, + ZI_S_md_leadBlur_b_e, + ZI_S_seiA_shizuku_a_e, + ZI_S_seiA_shizuku_b_e, + ZI_S_seiA_shizuku_c_e, + ZI_S_seiA_shizuku_d_e, + ZI_S_seiA_shizuku_e_e, + ZI_S_seiA_shizuku_f_e, + ZI_S_seiA_shizuku_g_e, + ZI_S_digThroughA_a_e, + ZI_S_digThroughA_b_e, + ZI_S_digThroughA_buru_a_e, + ZI_S_digThroughA_buru_b_e, + ZI_S_digThroughA_c_e, + ZI_S_digThroughA_d_e, + ZI_S_O_lv1d_fire_a_e, + ZI_S_O_lv1d_fire_b_e, + ZI_S_ym_digA_a_e, + ZI_S_ym_digA_b_e, + ZI_S_ym_dig01_a_e, + ZI_S_ym_dig01_b_e, + ZI_S_001_e, + ZF_J_fire00_glow_e, + ZF_J_fire01_spark_e, + ZF_J_fire02_fire_e, + ZF_S_box00_sand_e, + ZF_S_box01_smoke_e, + ZF_S_box02_board_s_e, + ZF_S_box03_board_l_e, + ZF_S_box04_rock_e, + ZF_S_rollingG00_rock_e, + ZF_S_rollingG01_smkTail_e, + ZF_S_rollingG02_smkCrcl_e, + ZI_J_arw_blur_a_e, + ZF_S_dfburst00_hit_e, + ZF_S_dfburst01_smkS_e, + ZF_S_dfburst02_smkL_e, + ZF_S_dfburst03_spark_e, + ZF_S_spitout00_spray_e, + ZF_S_spitout01_spit_e, + ZI_S_demo09_cut11_kasanFilter_a_e, + ZI_S_demo09_cut15_s2Spot_a_e, + ZI_S_demo09_cut15_s2Spot_b_e, + ZI_S_demo09_cut15_s2Spot_c_e, + ZI_S_demo09_cut20_2_BL_3_e, + ZI_S_demo09_cut20_2_BR_3_e, + ZI_S_demo09_cut20_2_FL_2_e, + ZI_S_demo09_cut20_2_FR_2_e, + ZI_S_demo09_cut20_2_backbone_1_e, + ZI_S_demo09_cut20_2_backbone_2_e, + ZI_S_demo09_cut20_2_head_e, + ZI_S_demo09_cut20_2_neck_e, + ZI_S_demo09_cut20_2_sizuku01_e, + ZI_S_demo09_cut20_2_sizuku02_e, + ZI_S_demo09_cut20_2_tail_4_e, + ZI_S_demo09_cut20_2_waist_e, + ZI_S_demo09_cut20_BL_3_e, + ZI_S_demo09_cut20_BR_3_e, + ZI_S_demo09_cut20_FL_2_e, + ZI_S_demo09_cut20_FR_2_e, + ZI_S_demo09_cut20_backbone_2_e, + ZI_S_demo09_cut20_head_e, + ZI_S_demo09_cut20_sizuku01_e, + ZI_S_demo09_cut20_sizuku02_e, + ZI_S_demo09_cut20_tail_4_e, + ZI_S_demo09_cut6_crown_a_e, + ZI_S_demo09_cut6_crown_b_e, + ZI_S_demo09_cut6_crown_c_e, + ZI_S_demo09_cut6_crown_d_e, + ZI_S_demo09_cut6_crown_e_e, + ZI_S_demo09_cut6_crown_f_e, + ZI_S_demo09_cut6_sizuku_a_e, + ZI_S_demo09_cut6_sizuku_b_e, + ZI_S_demo09_cut6_sizuku_c_e, + ZI_S_demo09_cut6_sizuku_d_e, + ZI_S_demo09_cut6_sizuku_e_e, + ZI_S_demo09_cut6_sizuku_f_e, + ZI_S_demo09_cut6_sizuku_g_e, + ZF_S_geyser00clm_e, + ZF_S_geyser01smk_e, + ZF_S_geyser02smk_e, + ZF_S_geyserPre00_e, + ZF_S_geyserSrc00smk_e, + ZF_S_geyserSrc01spry_e, + ZI_S_bq_converge_filter_e, + ZI_S_bq_converge_filterOut_e, + ZI_S_bq_converge_hide_e, + ZI_S_bq_converge_polygon_a_e, + ZI_S_bq_converge_polygon_b_e, + ZI_S_bq_deadExp_poly_body2_e, + ZI_S_bq_deadExp_poly_core1_e, + ZI_S_bq_deadExp_poly_core6_e, + ZI_S_bq_deadExp_poly_neck1_e, + ZI_S_bq_deadExp_poly_neck2_e, + ZI_S_bq_deadExp_poly_neck3_e, + ZI_S_bq_deadExp_poly_neck4_e, + ZI_S_bq_deadExp_poly_neck5_e, + ZI_S_bq_deadExp_poly_neck6_e, + ZI_S_bq_deadExp_poly_neck7_e, + ZI_S_bq_deadExp_smoke_body2_e, + ZI_S_bq_deadExp_smoke_core1_e, + ZI_S_bq_deadExp_smoke_neck1_e, + ZI_S_bq_deadExp_smoke_neck2_e, + ZI_S_bq_deadExp_smoke_neck3_e, + ZI_S_bq_deadExp_smoke_neck4_e, + ZI_S_bq_deadExp_smoke_neck5_e, + ZI_S_bq_deadExp_smoke_neck6_e, + ZI_S_bq_deadExp_smoke_neck7_e, + ZI_S_yStone_a_e, + ZF_S_seirei00_sprit_e, + ZF_S_seirei01_cir_e, + ZF_S_seirei01_cir1_e, + ZI_J_hb_magne_a_e, + ZI_J_hb_magne_b_e, + ZI_J_hb_magne_c_e, + ZF_S_geyserSrc00sand_e, + ZF_S_geyserSrc01smk_e, + ZF_S_webfire00_fire_kabe_e, + ZF_S_webfire00_fire_strng_e, + ZF_S_webfire00_fire_yuka_e, + ZI_S_fm_coreGlow_a_e, + ZI_S_fm_coreHit_a_e, + ZI_S_fm_coreHit_b_e, + ZI_S_fm_saitenka_a_e, + ZI_S_fm_saitenka_b_e, + ZI_S_fm_saitenka_c_e, + ZF_S_webfire00_fire_strng__e, + ZF_S_column00_rock_s_e, + ZF_S_column01_rock_l_e, + ZF_S_column02_sand_e, + ZF_S_column03_smk_e, + ZF_S_columnBrk1_00_rock_s_e, + ZF_S_columnBrk1_01_rock_l_e, + ZF_S_columnBrk1_02_sand_e, + ZF_S_columnBrk1_03_smk_e, + ZF_S_columnBrk2_00_rock_s_e, + ZF_S_columnBrk2_01_rock_l_e, + ZF_S_columnBrk2_02_sand_e, + ZF_S_columnBrk2_03_smk_e, + ZI_S_mg_attackA_hibana_a_e, + ZI_S_mg_attackA_hibana_b_e, + ZI_S_mg_attackB_hibana_a_e, + ZI_S_mg_attackB_hibana_b_e, + ZI_S_mg_ball_hibana_a_e, + ZI_S_mg_ball_hibana_b_e, + ZI_S_mg_excite_hibana_a_e, + ZI_S_mg_stand_hibanaL_a_e, + ZI_S_mg_stand_hibanaR_a_e, + ZI_S_hShizuku_f_e, + ZI_S_fm_opdemo_coreGlow_a_e, + ZI_S_bqRoom_waterFallShibuki2_a_e, + ZI_S_bqRoom_waterFallShibuki2_b_e, + ZI_S_bqRoom_waterFallShibuki2_c_e, + ZI_S_bqRoom_waterFallShibuki2_d_e, + ZF_S_YgConst00_e, + ZF_S_YkFly00_WingL3_e, + ZF_S_YkFly00_WingR3_e, + ZF_S_YkWait00_sphere_e, + ZF_S_YrAttack00_sphere_e, + ZF_S_YrDamage00_HandL1_e, + ZF_S_YrDamage00_HandL3_e, + ZF_S_YrDamage00_HandR1_e, + ZF_S_YrDamage00_HandR3_e, + ZF_S_YrFly00_HandL1_e, + ZF_S_YrFly00_HandL3_e, + ZF_S_YrFly00_HandR1_e, + ZF_S_YrFly00_HandR3_e, + ZF_S_YrWait00_sphere_e, + ZF_S_YrDamage00_backbone1_e, + ZI_S_demo04_01_kasanFilter_a_e, + ZI_S_demo04_01_kasanFilter_b_e, + ZI_S_demo04_01_kodouFilter_a_e, + ZI_S_demo04_01_zoomFilter_a_e, + ZF_S_YrDamage00_HandL2_e, + ZF_S_YrDamage00_HandR2_e, + ZI_S_demo09_cut7_sizuku_a_e, + ZI_S_demo09_cut7_sizuku_b_e, + ZI_S_demo09_cut7_sizuku_c_e, + ZI_S_demo09_cut7_sizuku_d_e, + ZI_S_demo09_cut7_sizuku_e_e, + ZI_S_demo09_cut7_sizuku_f_e, + ZI_S_demo09_cut7_sizuku_g_e, + ZI_S_mgRoom_tenjyou_a_e, + ZF_S_bm_brokenEye_b_l_e, + ZF_S_bm_brokenEye_b_s_e, + ZF_S_bm_brokenEye_f_l_e, + ZF_S_bm_brokenEye_f_s_e, + ZF_S_bm_brokenSmk_b_e, + ZF_S_bm_brokenSmk_f_e, + ZI_S_lk_warp_disapp_a_e, + ZI_S_mgRoom_chainBreak_a_e, + ZI_S_mgRoom_daizaFall_a_e, + ZI_S_mgRoom_daizaFall_b_e, + ZI_S_mgRoom_daizaFall_c_e, + ZI_S_mg_ketsumoe_a_e, + ZI_S_mg_ketsumoe_b_e, + ZI_S_mg_youganhane_a_e, + ZI_S_mg_youganhane_b_e, + ZI_S_mg_youganhane_c_e, + ZI_S_demo09_cut16_kasanFilter_a_e, + ZI_S_demo09_cut16_ray_a_e, + ZF_S_bm_gearRock_e, + ZF_S_bm_gearSpark_e, + ZF_S_bm_nessenBurn00_e, + ZF_S_bm_nessenBurn01_e, + ZF_S_bm_nessenHeat_e, + ZF_S_bm_nessenSplash00_e, + ZF_S_bm_nessenSplash01_e, + ZF_S_bm_nessenSrc00_e, + ZF_S_bm_nessenSrc01_e, + ZF_S_bm_smoke_e, + ZI_J_zenkaiScreen_flash_off_e, + ZF_S_bm_nessenSplash02_e, + ZI_S_dd_fire_a_e, + ZI_S_dd_fire_b_e, + ZI_S_dd_fire_c_e, + ZI_S_dd_fire_d_e, + ZI_S_dd_hibana_a_e, + ZI_S_dd_suikomi_a_e, + ZI_S_dd_suikomi_b_e, + ZF_S_sb_awaAttack_e, + ZF_S_sb_awaAttackSmoke_e, + ZF_S_sb_awaDeath00_e, + ZF_S_sb_awaDeath01_e, + ZF_S_sb_awaDefence_e, + ZF_S_sb_awaDefenceSmoke_e, + ZF_S_sb_awaSmokeL_e, + ZF_S_sb_awaSmokeS_e, + ZI_S_fm_converge_filter_e, + ZI_S_fm_converge_filterOut_e, + ZI_S_fm_converge_hide_e, + ZI_S_fm_converge_polygon_a_e, + ZI_S_fm_coreGlow_b_e, + ZI_S_fm_coreHit_c_e, + ZI_S_fm_deadExp_poly_armL1_e, + ZI_S_fm_deadExp_poly_armR1_e, + ZI_S_fm_deadExp_poly_handL_e, + ZI_S_fm_deadExp_poly_handR_e, + ZI_S_fm_deadExp_poly_head_e, + ZI_S_fm_deadExp_poly_legL2_e, + ZI_S_fm_deadExp_poly_legR2_e, + ZI_S_fm_deadExp_poly_waist_e, + ZI_S_fm_deadExp_smoke_armL1_e, + ZI_S_fm_deadExp_smoke_armL2_e, + ZI_S_fm_deadExp_smoke_armR1_e, + ZI_S_fm_deadExp_smoke_armR2_e, + ZI_S_fm_deadExp_smoke_head_e, + ZI_S_fm_deadExp_smoke_legL2_e, + ZI_S_fm_deadExp_smoke_legR2_e, + ZI_S_fm_deadExp_smoke_waist_e, + ZI_S_fm_enddemo_coreCrash_a_e, + ZI_S_fm_enddemo_coreSpark_a_e, + ZI_S_fm_enddemo_coreSpark_b_e, + ZI_S_fm_enddemo_coreSpark_c_e, + ZI_S_fm_enddemo_coreSpark_d_e, + ZI_S_fm_opdemo_coreGlow_b_e, + ZI_S_hitodama_a_e, + ZI_S_hitodama_b_e, + ZI_S_demo06_01_cut08_mdPower_a_e, + ZI_S_demo06_01_cut08_mdPower_b_e, + ZI_S_demo06_01_cut08_mdPower_c_e, + ZI_S_demo06_01_cut08_mdPower_d_e, + ZI_S_demo06_01_cut09_chainBreak_a_e, + ZF_S_sb_awaSheild_e, + ZF_S_sb_awaSheildSmoke_e, + ZI_S_fForest_fogHole_a_e, + ZI_S_lk_fForestFog_nml_e, + ZI_S_lk_fForestFog_tw_e, + ZF_S_sb_blood_e, + ZI_S_portal_app_a01_e, + ZI_S_portal_app_a02_e, + ZI_S_portal_app_b_e, + ZI_S_portal_app_c_e, + ZF_S_clash00_centerSmoke_e, + ZF_S_clash01_centerSand_e, + ZF_S_clash02_smoke_e, + ZF_S_clash03_rock_e, + ZF_S_clash04_rockSmall_e, + ZF_S_clash05_fireBit_e, + ZF_S_fallenVRock00_tailsmoke_e, + ZF_S_fallenVRock01_tailFire_e, + ZF_S_fallenVRock02_wrapFire_e, + ZF_S_fallenVRock03_spark_e, + ZI_S_lk_warp_app_a_e, + ZI_S_wl_warp_app_a_e, + ZI_S_wl_warp_app_b_e, + ZI_S_wl_warp_app_c_e, + ZI_S_wl_warp_app_d_e, + ZI_S_wl_warp_app_e_e, + ZI_S_wl_warp_app_f_e, + ZI_S_wl_warp_disapp_a_e, + ZF_S_geyserPre01_e, + ZF_S_bombRoom00_glow_e, + ZF_S_bombRoom01_fire_e, + ZF_S_bombRoom00_fire_e, + ZI_S_dk_elec_a_e, + ZI_S_dk_elec_b_e, + ZI_S_dk_elec_c_e, + ZI_S_dk_elec_d_e, + ZI_S_dk_elec_e_e, + ZI_S_dk_elec_f_e, + ZF_S_bgSand00_smoke_e, + ZF_S_bgSand01_splash_e, + ZI_S_dd_bombDamage_a_e, + ZI_S_dd_bombDamage_b_e, + ZI_S_dd_bombDamage_c_e, + ZI_S_dd_bombDamage_d_e, + ZF_S_tt_AttackJump00_smoke_e, + ZF_S_tt_MoveJump00_smoke_e, + ZI_S_bombRoom00_GameOver_a_e, + ZI_S_bombRoom00_GameOver_b_e, + ZI_S_bombRoom00_GameOver_c_e, + ZI_S_bombRoom00_GameOver_d_e, + ZF_S_tt_damageArrowBlue00_orange_e, + ZF_S_tt_damageArrowRed00_purple_e, + ZI_S_bombRoom00_WhiteOut_a_e, + ZF_S_tt_damageArrowBlue01_orange_e, + ZF_S_tt_damageArrowRed01_purple_e, + ZF_S_tt_legOffBackboneL00_splash_e, + ZF_S_tt_legOffBackboneL01_splash_e, + ZF_S_tt_legOffBackboneR00_splash_e, + ZF_S_tt_legOffBackboneR01_splash_e, + ZI_S_md_bunkai_backbone2_e, + ZI_S_md_bunkai_head_e, + ZI_S_md_bunkai_waist_e, + ZI_S_md_ketsugo_backbone2_e, + ZI_S_md_ketsugo_head_e, + ZI_S_md_ketsugo_waist_e, + ZI_S_pipeFire_a_e, + ZI_S_pipeFire_b_e, + ZI_S_pipeFire_c_e, + ZI_S_pipeFire_d_e, + ZI_S_pipeFire_e_e, + ZI_S_yoganbashira_l_head_a_e, + ZI_S_yoganbashira_l_head_b_e, + ZI_S_yoganbashira_l_head_c_e, + ZI_S_yoganbashira_m_head_a_e, + ZI_S_yoganbashira_m_head_b_e, + ZI_S_yoganbashira_m_head_c_e, + ZI_S_yoganbashira_s_head_a_e, + ZI_S_yoganbashira_s_head_b_e, + ZI_S_yoganbashira_s_head_c_e, + ZI_S_nioiTag_a_e, + ZF_S_bridgeBurned00_plane_e, + ZF_S_bridgeBurned01_fire_s_e, + ZF_S_bridgeBurned02_fire_ind_e, + ZF_S_bridgeBurned03_fire_l_e, + ZI_S_hm_atFire_a_e, + ZI_S_hm_dead_a_e, + ZI_S_hm_dead_b_e, + ZI_S_hm_dead_c_e, + ZI_S_hm_fire_a_e, + ZI_S_hm_landing_a_e, + ZI_S_hm_landing_b_e, + ZI_S_hm_sippuFire_a_e, + ZF_S_demo06_01cut11_mdFly_backbone2_e, + ZF_S_demo06_01cut11_mdFly_head_e, + ZF_S_demo06_01cut11_mdFly_waist_e, + ZF_S_demo06_01cut13_mdBunkai_backbone2_e, + ZF_S_demo06_01cut13_mdBunkai_head_e, + ZF_S_demo06_01cut13_mdBunkai_waist_e, + ZF_S_demo06_01cut13_mdFly_backbone2_e, + ZF_S_demo06_01cut13_mdFly_head_e, + ZF_S_demo06_01cut13_mdFly_waist_e, + ZF_S_demo06_01cut13_mdKetsugo_backbone2_e, + ZF_S_demo06_01cut13_mdKetsugo_head_e, + ZF_S_demo06_01cut13_mdKetsugo_waist_e, + ZF_S_bombWndA00_glass_e, + ZF_S_bombWndA01_glass_e, + ZF_S_bombWndA02_wood_e, + ZF_S_bombWndB00_glass_e, + ZF_S_bombWndB01_glass_e, + ZF_S_bombWndB02_wood_e, + ZI_S_bajyoHashi_warpDemo_a001_e, + ZI_S_bajyoHashi_warpDemo_b001_e, + ZI_S_bajyoHashi_warpDemo_b002_e, + ZI_S_bajyoHashi_warpDemo_b003_e, + ZI_S_bajyoHashi_warpDemo_b004_e, + ZI_S_bajyoHashi_warpDemo_b005_e, + ZI_S_bajyoHashi_warpDemo_b006_e, + ZI_S_bajyoHashi_warpDemo_b007_e, + ZI_S_bajyoHashi_warpDemo_b008_e, + ZI_S_bajyoHashi_warpDemo_c001_e, + ZI_S_bajyoHashi_warpDemo_c002_e, + ZI_S_bajyoHashi_warpDemo_c003_e, + ZI_S_bajyoHashi_warpDemo_c004_e, + ZI_S_bajyoHashi_warpDemo_c005_e, + ZI_S_bajyoHashi_warpDemo_c006_e, + ZI_S_bajyoHashi_warpDemo_c007_e, + ZI_S_bajyoHashi_warpDemo_c008_e, + ZI_S_bajyoHashi_warpDemo_c009_e, + ZI_S_bajyoHashi_warpDemo_c010_e, + ZI_S_bajyoHashi_warpDemo_c011_e, + ZI_S_bajyoHashi_warpDemo_c012_e, + ZI_S_bajyoHashi_warpDemo_d001_e, + ZI_S_bajyoHashi_warpDemo_e001_e, + ZI_S_bajyoHashi_warpDemo_e002_e, + ZF_S_bombWndB02_glass_e, + ZI_S_obj_burn_a_e, + ZI_S_obj_burn_b_e, + ZI_S_obj_burn_c_e, + ZI_S_obj_burn_d_e, + ZI_S_hm_fire_b_e, + ZI_S_yoganHinoko_a_e, + ZI_S_yoganHinoko_b_e, + ZI_S_kakarikoBridge_app_a_e, + ZI_S_kakarikoBridge_app_b_e, + ZI_S_kakarikoBridge_app_c_e, + ZI_S_kakarikoBridge_app_d_e, + ZI_S_kakarikoBridge_app_e_e, + ZI_S_kakarikoBridge_disapp_a_e, + ZI_S_kakarikoBridge_disapp_b_e, + ZI_S_kakarikoBridge_disapp_c_e, + ZI_S_kakarikoBridge_disapp_d_e, + ZI_S_kakarikoBridge_disapp_e_e, + ZF_S_bSumouHarite02Bou_trace_e, + ZF_S_bSumouHarite02Link_trace_e, + ZF_S_bSumouSweat00_sand_e, + ZF_S_bSumouSweat01_sweat_e, + ZF_S_bSumouTackleBFingerL1_shock_e, + ZF_S_bSumouTackleBFingerR1_shock_e, + ZF_S_bSumouTackleLHandL_shock_e, + ZF_S_bSumouTackleLHandR_shock_e, + ZF_S_bSumouMawashi00BouFingerL1_shock_e, + ZF_S_bSumouMawashi00BouFingerR1_shock_e, + ZF_S_bSumouTackleLCenter_shockL_e, + ZF_S_bSumouTackleLCenter_shockR_e, + ZF_S_bSumouTackleBCenter_shockL_e, + ZF_S_bSumouTackleBCenter_shockR_e, + ZF_S_bSumouSweatPush_sweat_e, + ZF_S_bSumouTackleB_BCenter_shockL_e, + ZF_S_bSumouTackleB_BCenter_shockR_e, + ZI_S_brPortal_a_e, + ZI_S_brPortal_b_e, + ZI_S_brPortal_c_e, + ZI_S_brPortal_d_e, + ZI_S_deadEfLight_a_e, + ZI_S_deadEfLight_b_e, + ZI_S_deadEfLight_c_e, + ZI_S_deadEfLight_d_e, + ZI_S_dtEgg_haretsu_a_e, + ZI_S_dtEgg_haretsu_b_e, + ZI_S_dt_bombDamage_a_e, + ZI_S_dt_bombDamage_b_e, + ZI_S_dt_bombDamage_c_e, + ZI_S_dt_bombDamage_d_e, + ZI_S_dt_bombDamage_e_e, + ZI_S_dt_deadShibuki_a_e, + ZI_S_dt_deadShibuki_b_e, + ZI_S_dt_deadYodare_a_e, + ZI_S_dt_deadYodare_b_e, + ZI_S_dt_deadYodare_c_e, + ZI_S_dt_deadYodare_d_e, + ZI_S_dt_downDamageA_shibuki_a_e, + ZI_S_dt_downDamageA_yodare_a_e, + ZI_S_dt_downDamageB_shibuki_a_e, + ZI_S_dt_downDamageB_yodare_a_e, + ZI_S_dt_dwHamon_a_e, + ZI_S_dt_dwHamon_b_e, + ZI_S_dt_hamon_a_e, + ZI_S_dt_hamon_b_e, + ZI_S_dt_jumpSt_a_e, + ZI_S_dt_jumpSt_b_e, + ZI_S_dt_jumpSt_c_e, + ZI_S_dt_jumpSt_d_e, + ZI_S_dt_jumpSt_e_e, + ZI_S_dt_jumpSt_f_e, + ZI_S_dt_stepShibuki_a_e, + ZI_S_dt_swingShibuki_a_e, + ZI_S_dt_tyakusuiLarge_a_e, + ZI_S_dt_tyakusuiLarge_b_e, + ZI_S_dt_tyakusuiLarge_c_e, + ZI_S_dt_tyakusuiLarge_d_e, + ZI_S_dt_tyakusuiLarge_e_e, + ZI_S_dt_tyakusuiSmall_a_e, + ZI_S_dt_tyakusuiSmall_b_e, + ZI_S_dt_tyakusuiSmall_c_e, + ZI_S_dt_tyakusuiSmall_d_e, + ZI_S_dt_tyakusuiSmall_e_e, + ZF_S_HBomb00_smoke_e, + ZF_S_HBomb01_fireAnim_e, + ZF_S_HBomb02_fire00_e, + ZF_S_HBomb02_fire01_e, + ZF_S_HBomb02_fire02_e, + ZF_S_HBomb02_fire03_e, + ZF_S_HBomb02_fire04_e, + ZF_S_HBomb02_fire05_e, + ZF_S_HBomb02_fire06_e, + ZF_S_HBombExL00_b_e, + ZF_S_HBombExL00_d_e, + ZF_S_HBombExL00_h_e, + ZF_S_HBombExL01_0_e, + ZF_S_HBombExL01_1_e, + ZF_S_HBombExL01_b_e, + ZF_S_HBombExL01_c_e, + ZF_S_HBombExL01_d_e, + ZF_S_HBombExL01_e_e, + ZF_S_HBombExL01_f_e, + ZF_S_HBombExL01_g_e, + ZF_S_HBombExL01_h_e, + ZF_S_HBombExL01_i_e, + ZF_S_HBombEx_b_e, + ZF_S_HBombEx_c_e, + ZF_S_HBombEx_d_e, + ZF_S_HBombEx_e_e, + ZF_S_HBombEx_f_e, + ZF_S_HBombEx_g_e, + ZF_S_HBombEx_h_e, + ZF_S_HBombEx_i_e, + ZF_S_HBombSmoke00_e, + ZF_S_HBombSmoke01_e, + ZI_S_dt_deadHakidashi_a_e, + ZI_S_dt_deadHakidashi_b_e, + ZI_S_dt_deadHakidashi_c_e, + ZI_S_dt_deadHakidashi_d_e, + ZF_S_DBrockBrk00_smoke_e, + ZF_S_DBrockBrk01_sand_e, + ZF_S_DBrockBrk02_rock_e, + ZF_S_DBrockFallen00_smoke_e, + ZF_S_DBrockFallen01_sand_e, + ZF_S_DBrockFallen02_rock_e, + ZF_S_M_DBrockBrk_e, + ZF_S_bm_brokenEye_hit01_e, + ZF_S_bm_brokenEye_hit02_e, + ZF_S_bm_brokenEye_hit03_e, + ZF_S_bm_brokenEye_hit04_e, + ZF_S_KInn00_smoke_e, + ZF_S_KInn01_smoke_e, + ZF_S_HBombExL01_j_e, + ZF_S_HBombExL01_k_e, + ZI_S_fl_breath_a_e, + ZI_S_fl_breath_b_e, + ZI_S_fl_dead_a_e, + ZI_S_fl_dead_b_e, + ZI_S_fl_dead_c_e, + ZI_S_fl_dead_d_e, + ZI_S_fl_dead_e_e, + ZI_S_fl_hit_a_e, + ZI_S_fl_hit_b_e, + ZI_S_fl_reiki_a_e, + ZI_S_fl_reiki_b_e, + ZI_S_fl_reiki_c_e, + ZI_S_fl_reiki_d_e, + ZI_S_fl_reiki_e_e, + ZI_S_fz_dead_a_e, + ZI_S_fz_dead_b_e, + ZI_S_fz_hit_a_e, + ZF_S_KInn02_fire_e, + ZF_S_KInn03_spark_e, + ZF_S_KInn04_glow_e, + ZI_S_sm_dead_a_e, + ZI_S_sm_dead_b_e, + ZI_S_caravan_fireA_a_e, + ZI_S_caravan_fireA_b_e, + ZI_S_caravan_fireB_a_e, + ZI_S_caravan_fireB_b_e, + ZI_S_va_footSmoke_a_e, + ZI_S_va_footSmoke_b_e, + ZI_S_va_kenAura_a_e, + ZI_S_va_kenBlur_a_e, + ZI_S_va_kenBlur_b_e, + ZI_S_va_attackA_a_e, + ZI_S_va_attackA_b_e, + ZI_S_va_attackA_c_e, + zl2_va_bug_armL02_e, + zl2_va_bug_armL03_e, + zl2_va_bug_armL05_e, + zl2_va_bug_armR02_e, + zl2_va_bug_armR03_e, + zl2_va_bug_armR05_e, + zl2_va_bug_backbone01_e, + zl2_va_bug_backbone02_e, + zl2_va_bug_head_e, + zl2_va_bug_legL02_e, + zl2_va_bug_legR02_e, + zl2_va_bug_tailcroth02_e, + ZI_S_va_opWeapon_a_e, + ZI_S_va_opWeapon_b_e, + ZI_S_va_opWeapon_c_e, + ZI_S_va_bug_armL02_e, + ZI_S_va_bug_armL03_e, + ZI_S_va_bug_armL05_e, + ZI_S_va_bug_armR02_e, + ZI_S_va_bug_armR03_e, + ZI_S_va_bug_armR05_e, + ZI_S_va_bug_backbone01_e, + ZI_S_va_bug_backbone02_e, + ZI_S_va_bug_head_e, + ZI_S_va_bug_legL02_e, + ZI_S_va_bug_legR02_e, + ZI_S_va_bug_tailcroth02_e, + ZI_S_basya_burnFire_a_e, + ZI_S_basya_burnFire_b_e, + ZI_S_basya_burnFire_c_e, + ZI_S_basya_burnFire_d_e, + ZI_S_basya_burnFire_e_e, + ZI_S_basya_burnFire_f_e, + ZI_S_basya_burnFire_g_e, + ZI_S_basya_burnFire_h_e, + ZI_S_basya_burnGlow_a_e, + ZI_S_basya_burnSmoke_a_e, + ZF_S_ItaMato_boad00_e, + ZF_S_ItaMato_boad01_e, + ZF_S_ItaMato_smk_e, + ZF_S_KHdesk_boad_e, + ZF_S_KHdesk_smk_e, + ZI_S_ds_smokeAt_a_e, + ZF_S_VolcBom00_splash_e, + ZF_S_VolcBom01_smkCircle1_e, + ZF_S_VolcBom02_smkCircle2_e, + ZF_S_VolcBom03_rockL_e, + ZF_S_VolcBom04_rockS_e, + ZF_S_VolcBom05_flash_e, + ZF_S_VolcBom06_fireBit_e, + ZI_S_va_opScreenFlash_a_e, + ZI_S_va_opScreenFlash_b_e, + ZI_S_va_opWeaponGlow_a_e, + ZI_S_va_opWeapon_d_e, + ZI_S_ww_blur_a_e, + ZF_S_YcDamage00_HandLR2_e, + ZF_S_YcDamage01_backbone1_e, + ZF_S_YcDash_HandLR2_e, + ZF_S_YcFly_HandLR1_e, + ZF_S_YcFly_HandLR2_e, + ZF_S_VolcBomLoop_smk_e, + ZF_S_YcDash_HandL2_e, + ZF_S_YcDash_HandR2_e, + ZF_S_VolcBom_glow01_e, + ZI_S_dk_coreNuki_a_e, + ZI_S_dk_deadBubble_a_e, + ZI_S_dk_deadBubble_b_e, + ZF_S_YcSpeed_e, + ZF_S_M_WoodPile_boad_e, + ZF_S_WoodPile00_smk_e, + ZF_S_WoodPile01_piece_e, + ZF_S_WoodPile02_sand_e, + ZI_S_lk_takishibuki_a_e, + ZI_S_lk_takishibuki_b_e, + ZI_S_syourock_hahen_a_e, + ZF_S_CrvFence00_smk_e, + ZF_S_CrvFence01_piece_e, + ZF_S_CrvFence02_piece_e, + ZF_S_CrvFence03_sand_e, + ZF_S_CrvYagura00_smk_e, + ZF_S_CrvYagura01_piece_e, + ZF_S_CrvYagura02_piece_e, + ZF_S_CrvYagura03_sand_e, + ZF_S_CrvYagura04_smk_e, + ZF_S_CrvYagura05_smk_e, + ZI_S_oi_converge_filter_e, + ZI_S_oi_converge_filterOut_e, + ZI_S_oi_converge_hide_e, + ZI_S_oi_converge_polygon_a_e, + ZI_S_oi_converge_polygon_b_e, + ZI_S_oi_deadExp_poly_body_e, + ZI_S_oi_deadExp_poly_head_e, + ZI_S_oi_deadExp_poly_tail_e, + ZI_S_oi_deadExp_smoke_body_e, + ZI_S_oi_deadExp_smoke_head_e, + ZI_S_oi_deadExp_smoke_tail_e, + ZF_S_k_lampWater00_fall_e, + ZF_S_k_lampWater01_splash_e, + ZF_S_k_lampWater02_splash_e, + ZF_S_Pile02_sand_e, + ZI_S_yb_elec_a_e, + ZI_S_yb_elec_b_e, + ZI_S_yb_elec_c_e, + ZI_S_yb_elec_d_e, + ZI_S_yb_hamon_a_e, + ZI_S_yb_hamon_b_e, + ZI_S_yb_mizubashira_a_e, + ZI_S_yb_mizubashira_b_e, + ZI_S_yb_mizubashira_c_e, + ZI_S_yb_mizubashira_d_e, + ZI_S_yb_mizubashira_e_e, + ZI_S_yb_mizubashira_f_e, + ZI_S_yb_shibuki_a_e, + ZI_S_yb_shibuki_b_e, + ZI_S_yb_shibuki_c_e, + ZI_S_yb_shibuki_d_e, + ZI_S_yb_shibuki_e_e, + ZI_S_yb_shibuki_f_e, + ZI_S_yb_shibuki_g_e, + ZI_S_yb_shiruL_a_e, + ZI_S_yb_shiruL_b_e, + ZI_S_yb_shiruL_c_e, + ZI_S_yb_shiruR_a_e, + ZI_S_yb_shiruR_b_e, + ZI_S_yb_shiruR_c_e, + zl2_yb_boil_a_e, + zl2_yb_boil_b_e, + zl2_yb_boil_c_e, + zl2_yb_boil_d_e, + zl2_yb_boil_e_e, + zl2_yb_boil_f_e, + zl2_yb_boil_g_e, + ZI_S_yb_boil_a_e, + ZI_S_yb_boil_b_e, + ZI_S_yb_boil_c_e, + ZI_S_yb_boil_d_e, + ZI_S_yb_boil_e_e, + ZI_S_yb_boil_f_e, + ZI_S_yb_boil_g_e, + ZF_S_HorseSpeed_e, + ZF_S_YcHitA_e, + ZF_S_YcHitB_e, + ZF_S_YcWave00_wave_e, + ZF_S_YcWave01_splash_e, + ZF_S_YcWave02_drop_e, + ZI_S_yb_dead_a_e, + ZI_S_yb_dead_b_e, + ZI_S_yb_haneBlur_L_e, + ZI_S_yb_haneBlur_R_e, + ZI_S_yb_shiruDead_a_e, + ZF_S_PoFireBin00_glow_e, + ZF_S_PoFireBin01_fire_e, + ZF_S_PoFireL00_glow_e, + ZF_S_PoFireL01_fire_e, + ZF_S_PoFireS00_glow_e, + ZF_S_PoFireS01_fire_e, + ZF_S_PoGrowFire00_glow_e, + ZF_S_PoGrowFire01_fire_e, + ZF_S_PoFireA00_glow_e, + ZF_S_PoFireA01_fire_e, + ZF_S_PoFireB00_glow_e, + ZF_S_PoFireB01_fire_e, + ZF_S_PoFireC00_glow_e, + ZF_S_PoFireC01_fire_e, + ZF_S_PoFireD00_glow_e, + ZF_S_PoFireD01_fire_e, + ZF_S_PoDeath00_glow_e, + ZF_S_PoDeath01_glow_e, + ZF_S_PoDeath02_glow_e, + ZF_S_PoDeath03_glow_e, + ZI_S_icewall01_reiki_b_e, + ZI_S_icewall02_reiki_b_e, + ZI_S_icewall_break01to02_b_e, + ZI_S_icewall_break01to03_b_e, + ZI_S_icewall_break02to03_b_e, + ZI_S_icewall_break_a_e, + ZI_S_icewall_reiki_a_e, + ZI_S_lk_biribiriA_a_e, + ZI_S_lk_biribiriA_b_e, + ZI_S_lk_biribiriA_c_e, + ZI_S_lk_biribiriB_a_e, + ZI_S_lk_biribiriB_b_e, + ZI_S_lk_biribiriFS_a_e, + ZI_S_fl_breath_c_e, + ZI_S_gi_attack_a_smoke_e, + ZI_S_gi_attack_b_e, + ZI_S_gi_damage_a_e, + ZI_S_gi_damage_b_e, + ZI_S_gi_damage_c_e, + ZI_S_gi_hikizuri_a_smoke_e, + ZF_S_PoFireA01_xzsmk_e, + ZF_S_PoFireA02_fire_e, + ZF_S_PoFireA03_hahen_e, + ZF_S_PoFireA04_smk_e, + ZF_S_PoFireA05_fire_e, + ZF_S_PoFireA06_exp_e, + ZF_S_PoDeath00smk_e, + ZF_S_PoDeath01smk_e, + ZF_S_PoDeath02sp_e, + ZF_S_PoDeath03jet_e, + ZF_S_PoDeathHead00smk_e, + ZF_S_PoDeathHead01sp_e, + ZF_S_PoDeathSkirtR0200smk_e, + ZF_S_PoDeathSkirtR0201sp_e, + ZF_S_PoFireA07_fire_e, + ZI_S_hm_atFire2_a_e, + ZI_S_hm_atFire2_b_e, + ZF_S_PoFireB02_fire_e, + ZF_S_POFIREC01_FIRE, + ZI_J_test_land_e, + ZI_J_test_roll_e, + ZI_J_test_slip_e, + ZI_J_test_walk_e, + ZF_S_k_lampWater00_fall1_e, + ZI_J_test_dash_e, + ZI_S_yb_barrow_a_e, + ZI_S_yb_barrow_b_e, + ZI_S_ghost_dead_a_e, + ZI_S_ghost_dead_b_e, + ZI_S_ghost_dead_c_e, + ZI_S_ghost_dead_d_e, + ZI_S_ghost_dead_e_e, + ZF_S_PoKanFire00_e, + ZF_S_PoFireD02_fire_e, + ZI_S_dashSmoke_inWtr_a_e, + ZI_S_downSmoke_inWtr_a_e, + ZI_S_demo18_triforce_a_e, + ZI_S_demo18_triforce_b_e, + ZI_S_demo18_triforce_c_e, + ZI_S_demo18_triforce_d_e, + ZI_S_ykW_break_a_e, + ZI_S_ykW_break_b_e, + ZF_S_demo07_02_00smoke_e, + ZF_S_demo07_02_01fire_e, + ZF_S_demo10_04_SHB00_e, + ZF_S_demo10_04_SHB00_hit_e, + ZF_S_demo10_04_SWA00_e, + ZF_S_demo10_04_SWA00_hit_e, + ZF_S_demo10_04_handR_rd_e, + ZF_S_demo10_04_handR_rng_e, + ZF_S_demo15_13_00_smk_e, + ZF_S_demo15_13_01_snd_e, + ZF_S_demo15_13_02_rck_e, + ZF_S_demo10_04_SHB01_hit_e, + ZF_S_demo10_04_SWA01_hit_e, + ZI_S_hako_boro_a_e, + ZI_S_hako_boro_b_e, + ZI_S_twgate_in_a_e, + ZF_S_demo07_02_00sprt_e, + ZF_S_demo07_02_01sprt_e, + ZI_S_id_setA_a_e, + ZI_S_id_setA_b_e, + ZI_S_id_setB_a_e, + ZI_S_id_setB_b_e, + ZI_S_id_setB_c_e, + ZI_S_id_setB_d_e, + ZI_S_id_setC_a_e, + ZI_S_id_setC_b_e, + ZI_S_id_setC_c_e, + ZF_S_demo15_13_01_smk_e, + ZI_S_LV3R09_suiryu1_a_e, + ZI_S_LV3R09_suiryu1_b_e, + ZI_S_LV3R09_suiryu2_a_e, + ZI_S_LV3R09_suiryu2_b_e, + ZI_S_fm_enddemo_coreSpark_e_e, + ZI_S_fm_enddemo_coreSpark_f_e, + ZI_S_fm_enddemo_coreSpark_g_e, + ZI_S_fm_enddemo_coreSpark_h_e, + ZI_S_ykW_reiki_a_e, + ZI_S_ykW_reiki_b_e, + ZI_S_ykW_shockwave_a_e, + ZI_S_ykW_shockwave_b_e, + ZI_S_ykW_shockwave_c_e, + ZI_S_ykW_shockwave_d_e, + ZI_S_ykW_shockwave_e_e, + ZI_S_ykW_shockwave_f_e, + ZI_S_ykm_tenjyou_a_e, + ZF_S_waterClmn00_cap00_e, + ZF_S_waterClmn01_cap01_e, + ZF_S_waterClmn02_btm_e, + ZF_S_waterClmn03_top0_e, + ZF_S_waterClmn04_top1_e, + ZI_J_AtoW_c_e, + ZI_J_rev_nv_tail_a_e, + ZF_S_waterClmn05_blk_e, + ZF_S_waterClmn02_btm2_e, + ZI_S_SekizoTile_a_e, + ZI_S_SekizoTile_b_e, + ZI_S_SekizoTile_c_e, + ZI_S_mgfieldL_a_e, + ZI_S_mgfieldL_b_e, + ZI_S_mgfieldL_c_e, + ZI_S_mgfieldL_d_e, + ZI_S_mgfieldS_a_e, + ZI_S_mgfieldS_b_e, + ZI_S_mgfieldS_c_e, + ZI_S_mgfieldS_d_e, + ZF_S_TobyCannon00_smk_e, + ZF_S_TobyCannon01_smk_e, + ZF_S_YcHitA_1_e, + ZF_S_YcHitA_2_e, + ZF_S_YcHitB_1_e, + ZF_S_YcHitB_2_e, + ZI_S_mgfieldS_e_e, + ZF_S_YcWave03_splash_e, + ZF_S_riverRockHit_b_e, + ZF_S_riverRockHit_c_e, + ZF_S_riverRockHit_d_e, + ZF_S_riverRockHit_f_e, + ZF_S_riverRockHit_g_e, + ZF_S_riverRockHit_h_e, + ZF_S_riverRockHit_i_e, + ZF_S_riverRockSmoke00_smk_e, + ZF_S_riverRockSmoke01_smk_e, + ZI_J_rev_2Dnv_tail_a_e, + ZF_S_lv2Rgate00_rock_e, + ZF_S_lv2Rgate01_sand_e, + ZF_S_lv2Rgate02_smk_e, + ZF_S_lv2Rgate03_smk_e, + ZF_S_lv2Rgate04_smk_e, + ZI_J_digTga_a_e, + ZI_J_O_digTga_a_e, + ZF_S_columnBrk1_00_rock_e, + ZF_S_columnBrk1_01_sand_e, + ZF_S_columnBrk1_02_smk_e, + ZF_S_columnBrk2_00_rock_e, + ZF_S_columnBrk2_01_sand_e, + ZF_S_fairy00_glow_e, + ZF_S_fairy01_glow_e, + ZF_S_fairy02_star_e, + ZF_S_fairy03_star_e, + ZI_J_testSmoke_C01_e, + ZI_J_testSmoke_C02_e, + ZM_S_E3LogoLight00_e, + ZF_S_demo070203_smoke00_e, + ZF_S_demo070203_smoke01_e, + ZF_S_demo070207_smk00_e, + ZF_S_demo070207_smk01_e, + ZF_S_demo070203_smk00_e, + ZF_S_demo070203_smk01_e, + ZI_S_fm_addF_back_e, + ZI_S_fm_addF_waist_e, + ZI_S_fm_chainAt_a_e, + ZI_S_fm_chainAt_b_e, + ZI_S_fm_coreGlow_c_e, + ZI_S_fm_coreGlow_d_e, + ZI_S_fm_coreGlow_e_e, + ZI_S_fm_coreGlow_f_e, + ZI_S_fm_hasiraFire_b_e, + ZI_S_fm_hasiraFire_c_e, + ZI_S_fm_opRoar_a_e, + ZF_S_fairyItem00_glow_e, + ZF_S_fairyItem02_star_e, + ZF_J_fairy00_glow_e, + ZF_J_fairy01_glow_e, + ZF_J_fairy02_star_e, + ZF_J_fairy03_star_e, + ZF_J_fairyItem00_glow_e, + ZF_J_fairyItem02_star_e, + ZF_S_TobyCannon02_smk_e, + ZI_S_bg_potapota_a_e, + ZI_S_cf_potapota_a_e, + ZI_S_lm_potapota_a_e, + ZI_S_np_potapota_a_e, + ZI_S_bt_mizumore_a_e, + ZI_S_bt_mizumore_b_e, + ZI_S_bt_mizumore_c_e, + ZI_J_O_digTga_b_e, + ZF_S_demo070209_smk00_e, + ZF_S_demo070209_smk01_e, + ZI_J_boom_set_a_e, + ZI_J_boom_set_b_e, + ZI_J_lk_burnS_a_e, + ZI_J_lk_burnS_b_e, + ZF_S_M_exBarrel00board_e, + ZF_S_exBarrel01board_e, + ZI_S_obj_burn_e_e, + ZF_S_exBarrel_b_e, + ZF_S_exBarrel_c_e, + ZF_S_exBarrel_e_e, + ZF_S_exBarrel_f_e, + ZF_S_exBarrel_g_e, + ZF_S_exBarrel_h_e, + ZF_S_exBarrel_i_e, + ZF_S_TobyCannon00Line_e, + ZF_S_glowSphere_a_e, + ZF_S_glowSphere_b_e, + ZF_S_glowSphere_c_e, + ZI_J_colHit_kikuzu_e, + ZI_S_tsuribori_wfA_a_e, + ZI_S_tsuribori_wfB_a_e, + ZI_S_tsuribori_wfC_a_e, + ZI_S_tsuribori_wfD_a_e, + ZI_S_yoganshibuki_a_e, + ZI_S_yoganshibuki_b_e, + ZI_S_bug_a_e, + ZI_S_bug_b_e, + ZF_S_zoraBom00smk_e, + ZF_S_zoraBom01rock_e, + ZF_S_zoraBom02sp_e, + ZF_S_zoraBom03awa_e, + ZF_S_zoraQuake00smk_e, + ZF_S_zoraQuake01awa_e, + ZI_J_rev_PointingCursor_tail_a_e, + ZF_S_Lv3slideDoorOpen00smk_e, + ZF_S_Lv3slideDoorOpen01smk_e, + ZF_S_Lv3slideDoorOpen02smk_e, + ZF_S_Lv3slideDoorOpen03rock_e, + ZF_S_Lv3slideDoorOpen04dust_e, + ZF_S_zoraBom00smk2_e, + ZI_J_rev_PointingCursor_tail_b_e, + ZI_S_E32006_momiji01_e, + ZI_S_E32006_momiji02_e, + ZI_S_E32006_momiji03_e, + ZI_S_E32006_momiji04_e, + ZI_S_E32006_momiji05_e, + ZI_S_E32006_momiji06_e, + ZI_S_E32006_momiji07_e, + ZI_S_E32006_momiji08_e, + ZI_S_E32006_momiji09_e, + ZF_S_Lv5dm1_00_e, + ZF_S_Lv5dm1_01_e, + ZF_S_Lv5dm1_02_e, + ZF_S_Lv5dm1_03_e, + ZF_S_Lv5dm2_00_e, + ZF_S_Lv5dm2_01_e, + ZF_S_Lv5dm2_02_e, + ZF_S_Lv5dm2_03_e, + ZF_S_mmRunWave00_e, + ZF_S_mmRunWave01_e, + ZF_S_mmRunWave02_e, + ZF_S_mmStopWave00_e, + ZF_S_scDraw00_e, + ZF_S_scDraw01_e, + ZF_S_scDraw02_e, + ZF_S_scJumpBack00_e, + ZF_S_scJumpBack01_e, + ZF_S_scJumpBack02_e, + ZF_S_scLiberation00_e, + ZF_hpFire00_e, + ZF_hpFire01_e, + ZF_hpOno00_e, + ZF_S_scLiberation01_e, + ZF_S_hpFire00_e, + ZF_S_hpFire01_e, + ZF_S_hpOno00_e, + ZF_S_phDust00_e, + ZF_S_phDust01_e, + ZF_S_phDust02_e, + ZF_S_WFZoraA_a_e, + ZF_S_WFZoraA_b_e, + ZF_S_WFZoraA_c_e, + ZF_S_WFZoraB_a_e, + ZF_S_WFZoraB_b_e, + ZF_S_WFZoraC_a_e, + ZF_S_WFZoraC_b_e, + ZF_S_WFZoraD_a_e, + ZF_S_WFZoraD_b_e, + ZF_S_WFZoraE_a_e, + ZF_S_WFZoraE_b_e, + ZF_S_WFZoraF_a_e, + ZF_S_WFZoraF_b_e, + ZI_S_ykW_break_c_e, + ZI_S_ykW_coreAB_kabehit_a_e, + ZI_S_ykW_coreAB_kabehit_b_e, + ZI_S_ykW_coreA_break_a_e, + ZI_S_ykW_coreA_break_b_e, + ZI_S_ykW_coreA_break_c_e, + ZI_S_ykW_coreA_reiki_a_e, + ZI_S_ykW_coreB_break_a_e, + ZI_S_ykW_coreB_break_b_e, + ZI_S_ykW_coreB_break_c_e, + ZI_S_ykW_coreB_reiki_a_e, + ZI_S_ykW_coreC_break_a_e, + ZI_S_ykW_coreC_break_b_e, + ZI_S_ykW_coreC_break_c_e, + ZI_S_ykW_coreC_kabehit_a_e, + ZI_S_ykW_coreC_kabehit_b_e, + ZI_S_ykW_coreC_reiki_a_e, + ZI_S_ykW_core_app_a_e, + ZI_S_ykW_core_app_b_e, + ZI_S_ykW_core_app_c_e, + ZI_S_ykW_diamonddust_a_e, + ZI_S_ykW_henshin_a_e, + ZI_S_ykW_henshin_b_e, + ZI_S_ykW_henshin_c_e, + ZI_S_ykW_henshin_d_e, + ZI_S_ykW_ice_app_a_e, + ZI_S_ykW_ice_app_b_e, + ZI_S_ykW_ice_app_c_e, + ZI_S_ykW_ice_break2_a_e, + ZI_S_ykW_ice_break2_b_e, + ZI_S_ykW_ice_break2_c_e, + ZI_S_ykW_ice_break_a_e, + ZI_S_ykW_ice_break_b_e, + ZI_S_ykW_ice_break_c_e, + ZI_S_ykW_ice_reiki_a_e, + ZI_S_ykW_kabehit_a_e, + ZI_S_ykW_kabehit_b_e, + ZI_S_ykW_madoware_a_e, + ZI_S_ykW_madoware_b_e, + ZI_S_ykW_madoware_c_e, + ZI_S_ykW_madoware_d_e, + ZF_S_d34c0203_00_e, + ZF_S_d34c0203_01_e, + ZF_S_d34c0203_02_e, + ZF_S_d34c0203_03_e, + ZF_S_d34c0203_04_e, + ZF_S_d34c0203_05_e, + ZF_S_d34c0203_06_e, + ZF_S_d34c0203_07_e, + ZF_S_d34c0409_00_e, + ZF_S_d34c0304_00_e, + ZF_S_d34c0304_01_e, + ZF_S_d34c0304_02_e, + ZF_S_A_atack_a00_e, + ZF_S_A_atack_b00_e, + ZF_S_A_atack_b01_e, + ZF_S_A_atack_b02_e, + ZF_S_A_atack_b03_e, + ZF_S_ArmorBrk00_e, + ZF_S_ArmorBrk01_e, + ZF_S_ArmorBrk02_e, + ZF_S_tnA_atack_a00_e, + ZF_S_tnA_atack_b00_e, + ZF_S_tnA_atack_b01_e, + ZF_S_tnA_atack_b02_e, + ZF_S_tnA_atack_b03_e, + ZF_S_tnArmorBrk00_e, + ZF_S_tnArmorBrk01_e, + ZF_S_tnArmorBrk02_e, + ZF_S_L5KitFire00_e, + ZF_S_L5KitFire01_e, + ZF_S_L5KitFire02_e, + ZF_S_L5KitFire03_e, + ZF_S_L5KitFire04_e, + ZF_S_L5KitFire05_e, + ZF_S_L5ChimSmk00_e, + ZF_S_L5ChimSmk01_e, + ZF_S_L5ChimSmk02_e, + ZF_S_tnArmor00_e, + ZI_S_octhashi_smoke_a_e, + ZI_S_oi_fish_app_a_e, + ZI_S_oi_fish_app_b_e, + ZI_S_oi_fish_haki_a_e, + ZI_S_oi_fish_haki_b_e, + ZI_S_oi_fish_haki_c_e, + ZI_S_oi_fish_haki_d_e, + ZI_S_oi_fish_syototsu_a_e, + ZI_S_oi_fish_syototsu_b_e, + ZI_S_oi_fish_syototsu_c_e, + ZI_S_oi_fish_syototsu_d_e, + ZI_S_oi_fish_syototsu_e_e, + ZI_S_oi_haisui_a_e, + ZI_S_oi_haisui_b_e, + ZI_S_oi_haisui_c_e, + ZI_S_oi_haisui_d_e, + ZI_S_oi_iso_app_a_e, + ZI_S_oi_iso_app_b_e, + ZI_S_oi_iso_app_c_e, + ZI_S_oi_iso_app_d_e, + ZI_S_oi_iso_app_e_e, + ZI_S_oi_iso_app_f_e, + ZI_S_oi_iso_coreHit_a_e, + ZI_S_oi_iso_coreHit_b_e, + ZI_S_oi_iso_haki_a_e, + ZI_S_oi_iso_haki_b_e, + ZI_S_oi_iso_haki_c_e, + ZI_S_oi_iso_haki_d_e, + ZI_S_oi_iso_haki_e_e, + ZI_S_oi_syoku_appSmoke_a_e, + ZI_S_oi_fish_coreSashi_a_e, + ZI_S_oi_iso_disapp_a_e, + ZF_S_tnArmor01_e, + ZI_S_pm_hide_a_e, + ZI_S_pm_hide_b_e, + ZI_S_yd_yodaburu_a_e, + ZI_S_yd_yodahit_a_e, + ZI_S_yd_yodapota_a_e, + ZI_S_yd_yodareM1_a_e, + ZI_S_yd_yodareM1_b_e, + ZI_S_yd_yodareM2_a_e, + ZI_J_lk_sh_burn_a_e, + ZI_J_lk_sh_burn_b_e, + ZI_J_lk_sh_burn_c_e, + ZI_J_lk_sh_burn_d_e, + ZI_S_lk_FreezEnd_a_e, + ZI_S_lk_FreezEnd_b_e, + ZI_S_lk_Freez_a_e, + ZI_S_dashSand_a_e, + ZI_S_dashSnow_a_e, + ZI_S_dashSnow_b_e, + ZI_S_downSand_a_e, + ZI_S_downSnow_a_e, + ZI_S_downSnow_b_e, + ZF_S_d2201c05_00_e, + ZF_S_d2201c05_01_e, + ZF_S_d2201c08_00_e, + ZF_S_d2201c10_00_e, + ZF_S_d2201c10_01_e, + ZF_S_d2201c10_02_e, + ZF_S_d2201c10_03_e, + ZF_S_d22_0101_00_e, + ZF_S_d22_0101_01_e, + ZF_S_d22_0101_02_e, + ZF_S_d22_0102_00_e, + ZF_S_d22_0102_01_e, + ZF_S_d22_0102_02_e, + ZF_S_d22_0102_03_e, + ZF_S_d22_0102_04_e, + ZF_S_d22_0102_05_e, + ZF_S_d22_0102_06_e, + ZF_S_d22_0102_07_e, + ZF_S_d22_0102_08_e, + ZF_S_d22_0104_00_e, + ZF_S_d22_0104_01_e, + ZF_S_d22_0104_02_e, + ZF_S_d22_0104_03_e, + ZF_S_d22_0104_04_e, + ZF_S_d22_0104_05_e, + ZF_S_d22_0107_00_e, + ZF_S_d22_0107_01_e, + ZF_S_d22_0107_02_e, + ZF_S_d22_0107_03_e, + ZF_S_d22_0109_00_e, + ZF_S_d22_0109_01_e, + ZI_S_box_app_a_e, + ZI_S_box_app_b_e, + ZI_S_box_app_c_e, + ZI_S_box_app_d_e, + ZI_S_box_app_e_e, + ZI_S_box_app_f_e, + ZI_S_va_atBallHit_a_e, + ZI_S_va_atBallHit_b_e, + ZI_S_va_atBall_a_e, + ZI_S_va_atBall_b_e, + ZI_S_va_atBall_c_e, + ZI_S_digSand_a_e, + ZI_S_digSnow_a_e, + ZI_S_digThroughSnow_a_e, + ZI_S_digThroughSnow_b_e, + ZI_S_digThroughSnow_buru_a_e, + ZI_S_digThroughSnow_buru_b_e, + ZI_S_digThroughSnow_c_e, + ZI_S_digThroughSnow_d_e, + ZF_S_KakureSaku1_00_e, + ZF_S_KakureSaku1_01_e, + ZF_S_KakureSaku1_02_e, + ZF_S_KakureSaku2_00_e, + ZF_S_KakureSaku2_01_e, + ZF_S_KakureSaku2_02_e, + ZI_S_wtrBombEX_a_e, + ZI_S_wtrBombEX_b_e, + ZI_S_wtrBombEX_c_e, + ZI_S_wtrBombEX_d_e, + ZI_S_wtrBombEX_e_e, + ZI_S_wtrBombEX_f_e, + ZI_S_wtrBombEX_g_e, + ZI_S_wtrBombEX_h_e, + ZI_S_zm_app_a_e, + ZI_S_zm_ballHit_a_e, + ZI_S_zm_ballHit_b_e, + ZI_S_zm_ballHit_c_e, + ZI_S_zm_ballHit_d_e, + ZI_S_zm_ball_a_e, + ZI_S_zm_ball_b_e, + ZI_S_zm_ball_c_e, + ZI_S_zm_disapp_a_e, + ZI_S_zm_disapp_b_e, + ZI_S_zm_hassya_a_e, + ZI_S_zm_tame_a_e, + ZI_S_lk_sb_woodSnow_a_e, + ZI_S_wtrBombEX2_a_e, + ZI_S_wtrBombEX2_b_e, + ZI_S_wtrBombEX2_c_e, + ZI_S_wtrBombEX2_d_e, + ZI_S_wtrBombEX2_e_e, + ZI_S_wtrBombEX2_f_e, + ZI_S_wtrBombEX2_g_e, + ZI_S_wtrBombEX2_h_e, + ZI_S_wtrBombEX2_i_e, + ZF_S_d21_20_00armL2_e, + ZF_S_d21_20_01hand_L_1_e, + ZF_S_d21_20_02backbone2_3_e, + ZF_S_d21_20_03hand_L_1_e, + ZF_S_d21_21_00sholder_L_e, + ZF_S_d21_21_01neck_2_e, + ZF_S_d21_21_02neck_2_e, + ZF_S_d21_21_03arm_R1_1_e, + ZF_S_d21_21_04arm_R2_1_e, + ZF_S_d21_22_00head_2_e, + ZF_S_d21_22_01backbone2_2_e, + ZF_S_d21_22_02backbone2_2_e, + ZF_S_d21_23_00head_2_e, + ZF_S_d21_23_01backbone2_2_e, + ZF_S_d21_23_02hand_R_1_e, + ZF_S_d21_23_03head_2_e, + ZF_S_d21_25_00head_2_e, + ZF_S_d21_25_01backbone2_2_e, + ZF_S_d21_25_02head_2_e, + ZF_S_d21_26_00armR2_e, + ZF_S_d21_26_01armL2_e, + ZF_S_d21_26_02center_2_e, + ZF_S_d21_26_03center_2_e, + ZF_S_d21_26_00armL2_e, + ZF_S_waterClmn06_srf_e, + ZF_S_waterClmn07_srf_e, + ZI_S_va_footSmokeFloat_a_e, + ZI_S_va_footSmokeFloat_b_e, + ZI_S_pz_BodyAura_a_e, + ZI_S_pz_BodyAura_b_e, + ZI_S_pz_BodyHoushi_a_e, + ZI_S_pz_BodyHoushi_b_e, + ZI_S_pz_app_a_e, + ZI_S_pz_ball_app_a_e, + ZI_S_pz_ball_app_b_e, + ZI_S_pz_ball_app_c_e, + ZI_S_pz_ball_exp_a_e, + ZI_S_pz_ball_kiseki_a_e, + ZI_S_pz_ball_shoot_a_e, + ZI_S_pz_dead_a_e, + ZI_S_pz_dead_b_e, + ZI_S_pz_dead_c_e, + ZI_S_pz_disapp_a_e, + ZI_S_yd_tane_a_e, + ZI_S_yd_tane_land_a_e, + ZI_S_yd_tane_land_b_e, + ZF_S_d20_06Water00_e, + ZF_S_d20_06Water01_e, + ZF_S_d20_06Water02_e, + ZF_S_d20_06Water03_e, + ZF_S_d20_08Smoke00_e, + ZF_S_d20_08Smoke01_e, + ZF_S_d20_09Glow0_e, + ZF_S_d20_09Glow1_e, + ZF_S_d20_09SandA00_e, + ZF_S_d20_09SandA01_e, + ZF_S_d20_09SandA02_e, + ZF_S_d20_09SandB00_e, + ZF_S_d20_09SandB01_e, + ZF_S_d20_09SandB02_e, + ZF_S_d20_22Sand00_e, + ZF_S_d20_22Sand01_e, + ZF_S_d20_22Sand02_e, + ZF_S_d20_31Inju00_e, + ZF_S_d20_31Inju01_e, + ZF_S_d20_43Warp00_e, + ZF_S_d20_43Warp01_e, + ZF_S_d20_43Warp02_e, + ZI_S_cs_kidou_a_e, + ZI_S_cs_kidou_b_e, + ZI_S_lake_abuku_a_e, + ZI_S_lake_suiryu_a_e, + ZI_S_lake_suiryu_b_e, + ZI_S_lake_suiryu_c_e, + ZR_J_2Dnv_tail_a_e, + ZR_J_PointingCursor_tail_a_e, + ZR_J_PointingCursor_tail_b_e, + ZR_J_nv_tail_a_e, + ZI_J_sp_out_a_e, + ZI_J_sp_out_b_e, + ZI_S_lk_warp2_disapp_a_e, + ZI_S_wl_warp2_disapp_a_e, + ZF_S_PGateClose00_e, + ZF_S_PGateClose01_e, + ZF_S_PGateClose02_e, + ZF_S_PGateClose03_e, + ZF_S_PGateClose04_e, + ZF_S_PGateClose05_e, + ZF_S_PGateOpen00_e, + ZF_S_PGateOpen01_e, + ZF_S_PGateOpen02_e, + ZF_S_PGateOpen03_e, + ZF_S_bm6_BeamBurn00_e, + ZF_S_bm6_BeamBurn01_e, + ZF_S_bm6_BeamGlow00_e, + ZF_S_bm6_BeamGlow01_e, + ZF_S_bm6_BeamGlow02_e, + ZF_S_bm6_BeamGlow03_e, + ZF_S_bm6_Beameye00_e, + ZF_S_bm6_Beameye01_e, + ZF_S_bm6_Break00_e, + ZF_S_bm6_Break01_e, + ZF_S_bm6_Break02_e, + ZF_J_gHeart00_e, + ZF_J_gHeart01_e, + ZF_J_gHeart02_e, + ZF_S_SBoots00footL_e, + ZF_S_SBoots01legL2_e, + ZF_S_SBoots02legR2_e, + ZF_S_SBoots03footR_e, + ZF_S_d11_22_00backbone2_e, + ZF_S_d11_22_01head_e, + ZF_S_d11_22_02backbone2_e, + ZF_S_d11_22_03backbone2_e, + ZF_S_d11_22_04backbone1_e, + ZF_S_d14_08_00backbone2_e, + ZF_S_d14_08_01head_e, + ZF_S_d14_08_02wingL1_e, + ZF_S_d14_08_03wingL3_e, + ZF_S_d14_08_04wingR1_e, + ZF_S_d14_08_05wingR3_e, + ZF_S_d14_08_06wingR3_e, + ZF_S_d14_08_07wingL3_e, + ZF_S_d14_08_08backbone1_e, + ZF_S_d14_08_09sizuku_e, + ZF_S_d14_08_10leg_L_2_e, + ZF_S_d14_08_00wingL1_e, + ZF_S_d14_08_01wingL3_e, + ZF_S_d14_08_02wingR1_e, + ZF_S_d14_08_03wingR3_e, + ZF_S_d14_08_04wingR3_e, + ZF_S_d14_08_05wingL3_e, + ZF_S_d14_08_06sizuku_e, + ZF_S_d14_08_07leg_L_2_e, + ZF_S_d18_07hotaru00_e, + ZI_S_zan_app_a_e, + ZI_S_zan_disapp_a_e, + ZI_S_zan_disapp_b_e, + ZI_S_zan_headLanding_a_e, + ZI_S_zan_headLanding_b_e, + ZI_S_zan_headLanding_c_e, + ZI_S_zan_spinAt_a_e, + ZI_S_zan_spinAt_b_e, + ZI_S_zz_app_a_e, + ZI_S_zz_disapp_a_e, + ZI_S_zz_hanaikiL_a_e, + ZI_S_zz_hanaikiR_a_e, + ZI_S_zz_rot_a_e, + ZF_S_d18_26hotaru00_e, + ZF_S_bm6_Beameye02_e, + ZI_S_zan_ball_a_e, + ZI_S_zan_ball_b_e, + ZI_S_zan_ball_c_e, + ZI_S_zan_ball_d_e, + ZI_S_pz_ball2_shoot_a_e, + ZI_S_pz_ball2_shoot_b_e, + ZI_S_pz_ball2_tame_a_e, + ZI_S_pz_ball2_tame_b_e, + ZI_S_hzel_ballAHit_a_e, + ZI_S_hzel_ballAHit_b_e, + ZI_S_hzel_ballAHit_c_e, + ZI_S_hzel_ballA_a_e, + ZI_S_hzel_ballA_b_e, + ZI_S_hzel_ballA_c_e, + ZI_S_hzel_damage_backbone2_a_e, + ZI_S_hzel_damage_backbone2_b_e, + ZI_S_hzel_damage_backbone2_c_e, + ZI_S_hzel_damage_waist_a_e, + ZI_S_hzel_damage_waist_b_e, + ZI_S_hzel_damage_waist_c_e, + ZF_S_d18_07andaishinB00_e, + ZF_S_d18_07andaishinB01_e, + ZF_S_d18_07andaishinB02_e, + ZF_S_d18_07andaishinB03_e, + ZF_S_d18_07andaishinB04_e, + ZF_S_d18_07andaishinB05_e, + ZF_S_d18_07andaishinG00_e, + ZF_S_d18_07andaishinG01_e, + ZF_S_d18_07andaishinG02_e, + ZF_S_d18_07andaishinG03_e, + ZF_S_d18_07andaishinG04_e, + ZF_S_d18_07andaishinG05_e, + ZF_S_d18_07andaishinR00_e, + ZF_S_d18_07andaishinR01_e, + ZF_S_d18_07andaishinR02_e, + ZF_S_d18_07andaishinR03_e, + ZF_S_d18_07andaishinR04_e, + ZF_S_d18_07andaishinR05_e, + ZF_S_d18_07SandaishinB00_e, + ZF_S_d18_07SandaishinB01_e, + ZF_S_d18_07SandaishinB02_e, + ZF_S_d18_07SandaishinB03_e, + ZF_S_d18_07SandaishinB04_e, + ZF_S_d18_07SandaishinB05_e, + ZF_S_d18_07SandaishinG00_e, + ZF_S_d18_07SandaishinG01_e, + ZF_S_d18_07SandaishinG02_e, + ZF_S_d18_07SandaishinG03_e, + ZF_S_d18_07SandaishinG04_e, + ZF_S_d18_07SandaishinG05_e, + ZF_S_d18_07SandaishinR00_e, + ZF_S_d18_07SandaishinR01_e, + ZF_S_d18_07SandaishinR02_e, + ZF_S_d18_07SandaishinR03_e, + ZF_S_d18_07SandaishinR04_e, + ZF_S_d18_07SandaishinR05_e, + ZI_S_hzel_triangleAt_a_e, + ZI_S_hzel_triangleAt_b_e, + ZI_S_hzel_triangleAt_c_e, + ZI_S_hzel_triangleAt_d_e, + ZI_S_hzel_triangleAt_e_e, + ZF_S_d18_09Glow00_e, + ZF_S_d18_09Glow01_e, + ZF_S_d18_09Glow02_e, + ZF_S_d18_09SandaishinB00_e, + ZF_S_d18_09SandaishinB01_e, + ZF_S_d18_09SandaishinB02_e, + ZF_S_d18_09SandaishinB03_e, + ZF_S_d18_09SandaishinB04_e, + ZF_S_d18_09SandaishinB05_e, + ZF_S_d18_09SandaishinG00_e, + ZF_S_d18_09SandaishinG01_e, + ZF_S_d18_09SandaishinG02_e, + ZF_S_d18_09SandaishinG03_e, + ZF_S_d18_09SandaishinG04_e, + ZF_S_d18_09SandaishinG05_e, + ZF_S_d18_09SandaishinR00_e, + ZF_S_d18_09SandaishinR01_e, + ZF_S_d18_09SandaishinR02_e, + ZF_S_d18_09SandaishinR03_e, + ZF_S_d18_09SandaishinR04_e, + ZF_S_d18_09SandaishinR05_e, + ZI_S_hzel_swdLight_a_e, + ZF_S_d18_09hotaru00_e, + ZF_S_d18_20johatu00_e, + ZF_S_d18_20johatu00footL_e, + ZF_S_d18_20johatu01footR_e, + ZF_S_d18_20johatu02al_podA_e, + ZF_S_d18_20johatu03backbone1_e, + ZF_S_d18_20johatu04head_e, + ZF_S_d18_20johatu05armR2_e, + ZF_S_d18_20johatu06armL2_e, + ZF_S_d18_20johatu07egL2_e, + ZF_S_d18_20johatu08legR2_e, + ZF_S_d18_20johatu09armR2_e, + ZF_S_d18_20johatu07legL2_e, + ZF_S_d18_07hotaru01_e, + ZI_S_garw_blur_a_e, + ZI_S_garw_hit_a_e, + ZI_S_garw_hit_b_e, + ZI_S_garw_hit_c_e, + ZI_S_garw_hit_d_e, + ZI_S_garw_hit_e_e, + ZI_S_garw_hit_f_e, + ZI_S_garw_relord_a_e, + ZI_S_garw_relord_b_e, + ZI_S_garw_relord_c_e, + ZI_S_garw_relord_d_e, + ZF_S_d25_16haretsu00_e, + ZF_S_d25_16haretsu01_e, + ZF_S_d25_16haretsu02_e, + ZF_S_d25_16haretsu03_e, + ZI_S_lure_shibuki_loop_a_e, + ZI_S_lure_shibuki_loop_b_e, + ZI_S_lure_shibuki_onetime_a_e, + ZI_S_lure_shibuki_onetime_b_e, + ZI_S_lk_biribiriC_a_e, + ZI_S_lk_biribiriC_b_e, + ZI_S_lk_biribiriC_c_e, + ZF_S_L5KitFire03a_e, + ZF_S_L5KitFire04a_e, + ZF_S_d34c0304_03_e, + ZF_S_d28_03Glow00_e, + ZF_S_d28_03Glow01_e, + ZF_S_d28_03Glow02_e, + ZF_S_d28_03Glow03_e, + ZF_S_d28_03Glow04_e, + ZF_S_d28_03Glow05_e, + ZF_S_d28_03Glow06_e, + ZF_S_d28_03Glow07_e, + ZF_S_d28_03Glow08_e, + ZF_S_d27_23G00_backbone1_e, + ZF_S_d27_23G01_backbone1_e, + ZF_S_d27_23G02_armL2_e, + ZF_S_d27_28_G00up_e, + ZF_S_d27_29_G00_e, + ZF_S_d27_29_G01_e, + ZF_S_d27_30_G00_e, + ZF_S_d27_28_G00_e, + ZF_S_d27_28_G01_e, + ZI_S_dr_coreHit_a_e, + ZI_S_dr_coreHit_b_e, + ZI_S_dr_fire_a_e, + ZI_S_dr_fire_b_e, + ZI_S_dr_fire_c_e, + ZI_S_dr_fire_d_e, + ZI_S_dr_landSmoke_a_e, + ZI_S_mirror_app_a_e, + ZI_S_mirror_app_b_e, + ZI_S_mirror_app_c_e, + ZI_S_mirror_app_d_e, + ZI_S_mirror_scaledown_a_e, + ZI_S_mirror_syusoku_a_e, + ZI_S_mirror_syusoku_b_e, + ZI_S_mirror_syusoku_c_e, + ZI_S_mirror_syusoku_d_e, + ZI_S_mirror_syusoku_e_e, + ZI_S_mirror_syusoku_f_e, + ZI_S_mirror_syusoku_g_e, + ZI_S_ds_ball_a_e, + ZI_S_ds_ball_b_e, + ZI_S_ds_ball_c_e, + ZI_S_ds_ball_d_e, + ZI_S_ds_smokeAt_b_e, + ZI_S_ds_smokeAt_c_e, + ZI_S_d25_brPortal_a_e, + ZI_S_d25_brPortal_b_e, + ZI_S_d25_brPortal_c_e, + ZI_S_d25_brPortal_d_e, + ZI_S_bombRock_dl_break_a_e, + ZI_S_bombRock_dl_break_b_e, + ZI_S_bombRock_dl_break_c_e, + ZI_S_bombRock_dl_break_d_e, + ZI_S_bombRock_dl_break_e_e, + ZI_S_bombRock_dl_break_f_e, + ZI_S_bombRock_ds_break_a_e, + ZI_S_bombRock_ds_break_b_e, + ZI_S_bombRock_ds_break_c_e, + ZI_S_bombRock_ds_break_d_e, + ZI_S_bombRock_ds_break_e_e, + ZI_S_bombRock_ds_break_f_e, + ZI_S_bombRock_fl_break_a_e, + ZI_S_bombRock_fl_break_b_e, + ZI_S_bombRock_fl_break_c_e, + ZI_S_bombRock_fl_break_d_e, + ZI_S_bombRock_fl_break_e_e, + ZI_S_bombRock_fl_break_f_e, + ZI_S_bombRock_dlw_break_a_e, + ZI_S_bombRock_dlw_break_b_e, + ZI_S_bombRock_dlw_break_c_e, + ZI_S_bombRock_dlw_break_d_e, + ZI_S_bombRock_dsw_break_a_e, + ZI_S_bombRock_dsw_break_b_e, + ZI_S_bombRock_dsw_break_c_e, + ZI_S_bombRock_dsw_break_d_e, + ZI_J_lk_djgiri_a_e, + ZI_J_lk_djgiri_b_e, + ZI_J_lk_djgiri_c_e, + ZI_J_lk_djgiri_d_e, + ZI_J_lk_djgiri_e_e, + ZI_J_lk_djgiri_f_e, + ZI_S_O_kaiso01_ken_e, + ZI_S_O_kusa01_ken_e, + ZI_S_O_kusa02_ken_e, + ZF_S_skyCannon00_smk_e, + ZF_S_skyCannon01_smk_e, + ZF_S_skyCannon02_smk_e, + ZF_S_d30_02_09_tear00_e, + ZF_S_d30_02_09_tear01_e, + ZF_S_d30_02_09_tear02_e, + ZF_S_d30_02_09_tear03_e, + ZF_S_d30_02_17sand00_e, + ZF_S_d30_02_17sand01_e, + ZF_S_d30_02_18hahen00_e, + ZF_S_d30_02_18hahen01_e, + ZI_S_dr_grindL_a_e, + ZI_S_dr_grindL_b_e, + ZI_S_dr_grindL_c_e, + ZI_S_dr_grindL_d_e, + ZI_S_dr_grindR_a_e, + ZI_S_dr_grindR_b_e, + ZI_S_dr_grindR_c_e, + ZI_S_dr_grindR_d_e, + ZF_S_d28_01_03MtoZ00_e, + ZF_S_d28_01_03MtoZ01_e, + ZF_S_d28_01_03MtoZ02_e, + ZF_S_d28_01_04MtoZ00_e, + ZF_S_d28_01_04MtoZ01_e, + ZF_S_d28_01_04MtoZ02_e, + ZI_S_elecGate_a_e, + ZI_J_lk_warp_app_a_e, + ZI_J_lk_warp_disapp_a_e, + ZI_J_wl_warp_app_a_e, + ZI_J_wl_warp_app_b_e, + ZI_J_wl_warp_app_c_e, + ZI_J_wl_warp_app_d_e, + ZI_J_wl_warp_app_e_e, + ZI_J_wl_warp_app_f_e, + ZI_J_wl_warp_disapp_a_e, + ZI_J_wtrBombEX2_a_e, + ZI_J_wtrBombEX2_b_e, + ZI_J_wtrBombEX2_c_e, + ZI_J_wtrBombEX2_d_e, + ZI_J_wtrBombEX2_e_e, + ZI_J_wtrBombEX2_f_e, + ZI_J_wtrBombEX2_g_e, + ZI_J_wtrBombEX2_h_e, + ZI_J_wtrBombEX2_i_e, + ZI_J_wtrBombEX_a_e, + ZI_J_wtrBombEX_b_e, + ZI_J_wtrBombEX_c_e, + ZI_J_wtrBombEX_d_e, + ZI_J_wtrBombEX_e_e, + ZI_J_wtrBombEX_f_e, + ZI_J_wtrBombEX_g_e, + ZI_J_wtrBombEX_h_e, + ZM_J_BombInsectSpark00_e, + ZM_J_BombInsectSpark01_e, + ZM_J_BombInsectSpark02_e, + ZM_J_BombInsectSpark03_e, + ZM_J_BombInsectSpark04_e, + ZI_S_zBalloon_pachin_a_e, + ZI_S_zBalloon_pachin_b_e, + ZI_S_gdg_appear_a_e, + ZI_S_gdg_start_a_e, + ZM_J_BombInsectSparkTornado00_e, + ZM_J_BombInsectSparkTornado01_e, + ZM_J_BombInsectSparkTornado02_e, + ZM_J_BombInsectSparkTornado03_e, + ZM_J_BombInsectSparkTornado04_e, + ZI_J_bug_a_e, + ZI_J_bug_b_e, + ZF_S_d28_02_02HCasBrk00smk_e, + ZF_S_d28_02_02HCasBrk01blur_e, + ZF_S_d28_02_02HCasBrk02rock_e, + ZF_S_d28_02_02HCasBrk03rock_e, + ZF_S_d28_02_02HCasBrk04rock_e, + ZF_S_d28_02_02HCasBrk05bkSmk_e, + ZF_S_d28_02_02HCasBrk06smk_e, + ZF_S_d28_02_02HCasBrk07bkSmk_e, + ZF_S_d28_02_02HCasBrk08smk_e, + ZF_S_d28_02_02HCasBrk09blur_e, + ZF_S_d28_02_02HCasBrk10preThdr_e, + ZI_J_kaitengiriL_a_e, + ZI_J_kaitengiriL_b_e, + ZI_J_kaitengiriL_c_e, + ZI_J_kaitengiriL_d_e, + ZF_S_d32_04_09Chain00_e, + ZF_S_d32_04_09Chain01_e, + ZF_S_d32_04_09Chain02_e, + ZF_S_d32_04_13Chain00_e, + ZF_S_d32_04_13Chain01_e, + ZF_S_d32_04_13Chain02_e, + ZF_S_d32_04_14KnjJohatu00_e, + ZF_S_d32_04_14KnjJohatu01_e, + ZF_S_d32_04_14KnjJohatu02_e, + ZF_S_d32_04_14KnjJohatu03_e, + ZF_S_d32_04_14KnjJohatu04_e, + ZI_S_egnd_ball_a_e, + ZI_S_egnd_ball_b_e, + ZI_S_egnd_ball_c_e, + ZI_S_egnd_ball_d_e, + ZI_S_egnd_ball_e_e, + ZI_S_egnd_ball_hassya_a_e, + ZI_S_egnd_ball_hit_a_e, + ZI_S_egnd_ball_hit_b_e, + ZI_S_egnd_ball_hit_c_e, + ZI_S_egnd_ball_hit_d_e, + ZI_S_egnd_ball_hit_e_e, + ZF_S_d18_06SandaishinB00_e, + ZF_S_d18_06SandaishinB01_e, + ZF_S_d18_06SandaishinB02_e, + ZF_S_d18_06SandaishinB03_e, + ZF_S_d18_06SandaishinB04_e, + ZF_S_d18_06SandaishinB05_e, + ZF_S_d18_06SandaishinG00_e, + ZF_S_d18_06SandaishinG01_e, + ZF_S_d18_06SandaishinG02_e, + ZF_S_d18_06SandaishinG03_e, + ZF_S_d18_06SandaishinG04_e, + ZF_S_d18_06SandaishinG05_e, + ZF_S_d18_06SandaishinR00_e, + ZF_S_d18_06SandaishinR01_e, + ZF_S_d18_06SandaishinR02_e, + ZF_S_d18_06SandaishinR03_e, + ZF_S_d18_06SandaishinR04_e, + ZF_S_d18_06SandaishinR05_e, + ZF_S_d30_02_17sand02_e, + ZI_J_pcnk_blur_a_e, + ZI_S_ww_appSnow_a_e, + ZI_S_ww_appSnow_b_e, + ZI_J_lk_swl_a_e, + ZI_J_lk_swl_b_e, + ZI_S_canoe_shibuki_a_e, + ZI_S_canoe_shibuki_b_e, + ZI_S_rb_attack_a_e, + ZI_S_rb_attack_b_e, + ZI_S_rb_attack_c_e, + ZI_S_rb_spinAt_a_e, + ZI_S_rb_spinAt_b_e, + ZI_J_lk_dungeonwp_a_e, + ZI_S_zh_kidou_Ayubi2_a_e, + ZI_S_zh_kidou_Ayubi2_b_e, + ZI_S_zh_kidou_Byubi1_a_e, + ZI_S_zh_kidou_Byubi1_b_e, + ZI_S_zh_kidou_Dyubi2_a_e, + ZI_S_zh_kidou_Dyubi2_b_e, + ZI_S_zh_kidou_Oyubi3_a_e, + ZI_S_zh_kidou_Oyubi3_b_e, + ZI_S_zh_kidou_hand2_a_e, + ZI_S_zh_kidou_hand2_b_e, + ZI_S_zh_kidou_hand2_c_e, + ZI_S_zh_landing_a_e, + ZI_S_zh_landing_b_e, + ZI_S_zh_landing_c_e, + ZI_S_zh_landing_d_e, + ZI_S_ns_change_a_e, + ZI_S_ns_change_b_e, + ZI_S_lv6tgroll_hakai_a_e, + ZI_S_lv6tgroll_hakai_b_e, + ZI_S_lv6tgroll_hakai_c_e, + ZI_S_lv6tgroll_hakai_d_e, + ZI_S_lv6tgroll_hakai_e_e, + ZI_S_lv6tgroll_hakai_f_e, + ZI_S_lv6toge_hakai_a_e, + ZI_S_lv6toge_hakai_b_e, + ZI_S_lv6toge_hakai_c_e, + ZI_S_lv6toge_hakai_d_e, + ZF_S_d28_01_01_00_e, + ZF_S_d28_01_01_01_e, + ZF_S_d28_01_01_02_e, + ZF_S_d28_01_09_00_e, + ZF_S_d28_01_09_01_e, + ZF_S_d28_01_09_02_e, + ZF_S_d28_01_09_03_e, + ZF_S_d28_01_09_03_2_e, + ZF_S_d28_01_09_04_e, + ZF_S_d28_01_09_04_2_e, + ZF_S_d28_01_09_05_e, + ZF_S_d28_01_09_05_2_e, + ZF_S_d28_01_09_06_e, + ZF_S_d28_01_09_07_e, + ZF_S_L5KitFire03b_e, + ZF_S_L5KitFire03c_e, + ZF_S_L5KitFire04b_e, + ZF_S_L5KitFire04c_e, + ZI_S_tsurara_break_a_e, + ZI_S_tsurara_break_b_e, + ZI_S_tsurara_break_c_e, + ZI_S_tsurara_landing_a_e, + ZI_S_zrDrock_break_a_e, + ZI_S_zrDrock_break_b_e, + ZI_S_zrDrock_break_c_e, + ZI_S_zrDrock_break_d_e, + ZI_S_zrDrock_break_e_e, + ZI_S_zrDrock_break_loop_e, + ZI_S_M_marotaru_break_e, + ZI_S_marotaru_break_a_e, + ZI_S_marotaru_break_b_e, + ZI_S_marotaru_break_c_e, + ZI_S_marotaru_break_d_e, + ZI_S_marotaru_break_e_e, + ZI_J_wl_attackA_a_e, + ZI_J_wl_attackA_b_e, + ZI_S_mrMirror_a_e, + ZI_S_mrPanel_a_e, + Zi_S_fairy_sprit_a_e, + Zi_S_fairy_sprit_b_e, + Zi_S_fairy_sprit_c_e, + ZI_S_canoe_shibuki_hit_e, + ZF_S_d18_seiA_shizuku_a_e, + ZI_S_lv3_R03_wfallL_a01_e, + ZI_S_lv3_R03_wfallL_a02_e, + ZI_S_lv3_R03_wfallL_b01_e, + ZI_S_lv3_R03_wfallL_b02_e, + ZI_S_lv3_R03_wfallR_a01_e, + ZI_S_lv3_R03_wfallR_a02_e, + ZI_S_lv3_R03_wfallR_b01_e, + ZI_S_lv3_R03_wfallR_b02_e, + ZI_S_lv3_R07_suisya_a01_e, + ZI_S_lv3_R07_suisya_a02_e, + ZI_S_lv3_R07_wfall_a01_e, + ZI_S_lv3_R07_wfall_a02_e, + ZI_S_lv3_R08_wfall_a01_e, + ZI_S_lv3_R08_wfall_a02_e, + ZI_S_lv3_R08_wfall_b01_e, + ZI_S_lv3_R08_wfall_b02_e, + ZI_S_lv3_R10_suimon_a_e, + ZI_S_lv3_R10_wfall_a01_e, + ZI_S_lv3_R10_wfall_a02_e, + ZI_S_lv3_R10_wfall_b01_e, + ZI_S_lv3_R10_wfall_b02_e, + ZI_S_lv3_R11_suisya_a01_e, + ZI_S_lv3_R11_suisya_a02_e, + ZI_S_lv3_R11_wfall_a01_e, + ZI_S_lv3_R11_wfall_a02_e, + ZI_S_lv3_R11_wfall_b01_e, + ZI_S_lv3_R11_wfall_b02_e, + ZI_S_lv3_R13_suimon_a_e, + ZI_S_lv3_R13_wfall_a01_e, + ZI_S_lv3_R13_wfall_a02_e, + ZI_S_lv3_R13_wfall_b01_e, + ZI_S_lv3_R13_wfall_b02_e, + ZI_S_lv3_R13_wfall_c01_e, + ZI_S_lv3_R13_wfall_c02_e, + ZF_S_d32_01_mono00sand_e, + ZF_S_d32_01_mono01sand_e, + ZF_S_d32_01_mono02sand_e, + ZF_S_d32_01_mono03sand_e, + ZF_S_d32_01_table00sand_e, + ZF_S_d32_01_table01sand_e, + ZF_S_d32_01_table02sand_e, + ZF_S_d32_01_twist00sand_e, + ZI_S_lv4slpH_kidou_a_e, + ZI_S_lv4slpH_kidou_b_e, + ZI_S_lv4slpH_kidou_c_e, + ZI_S_lv4slpH_kidou_d_e, + ZI_S_lv4slpH_kidou_e_e, + ZI_S_lv4slpH_kidou_f_e, + ZI_S_lv4slpH_kidou_g_e, + ZI_S_lv4toge_appear_a_e, + ZI_S_lv4toge_break_a_e, + ZI_S_lv4toge_break_b_e, + ZI_S_lv4toge_break_c_e, + ZI_S_lv4toge_break_d_e, + ZI_S_rafbaz_smoke_a_e, + ZI_S_iceblock_break_a_e, + ZI_S_iceblock_break_b_e, + ZI_S_iceblock_reiki_a_e, + ZI_S_iceblock_reiki_b_e, + ZI_J_colHit_ice_e, + ZI_S_lv5taiho_firing_a_e, + ZI_S_lv5taiho_firing_b_e, + ZI_S_lv5taiho_firing_c_e, + ZI_S_lv5kagu_break_a_e, + ZI_S_lv5kagu_break_b_e, + ZI_S_lv5kagu_break_c_e, + ZI_S_lv5kagu_break_d_e, + ZF_S_Lv4slideDoorOpen00smk_e, + ZF_S_Lv4slideDoorOpen01smk_e, + ZF_S_Lv4slideDoorOpen02smk_e, + ZF_S_Lv4slideDoorOpen03rock_e, + ZF_S_Lv4slideDoorOpen04dust_e, + ZI_S_gbEgg_haretsu_a_e, + ZI_S_gbEgg_haretsu_b_e, + ZI_S_goma_beamHit_a_e, + ZI_S_goma_beamHit_b_e, + ZI_S_goma_beamHit_c_e, + ZI_S_goma_beamHit_d_e, + ZI_S_goma_sekizoHit_a_e, + ZI_S_goma_sekizoHit_b_e, + ZI_S_goma_sekizoHit_c_e, + ZI_S_goma_sekizoHit_d_e, + ZF_S_d24_01_02_chain00AChain2_e, + ZF_S_d24_01_02_chain00BChain2_e, + ZF_S_d24_01_02_chain00CChain2_e, + ZF_S_d24_01_02_chain00DChain2_e, + ZF_S_d24_01_02_chain00GChain2_e, + ZF_S_d24_01_02_chain00HChain2_e, + ZF_S_d24_01_02_chain00monolith_e, + ZF_S_d24_01_02_mono00smk_e, + ZF_S_d24_01_02_mono01sp_e, + ZF_S_d24_01_02_mono02smk_e, + ZI_S_lv3_R02_suisya_a01_e, + ZI_S_lv3_R02_suisya_a02_e, + ZI_S_lv3_R02_suisya_b01_e, + ZI_S_lv3_R02_suisya_b02_e, + ZF_S_d18_02WaterA00_e, + ZF_S_d18_02WaterA01_e, + ZF_S_d18_02WaterA02_e, + ZF_S_d18_02WaterA03_e, + ZF_S_d18_02WaterB00_e, + ZF_S_d18_02WaterB01_e, + ZF_S_d18_02WaterB02_e, + ZF_S_d18_02WaterB03_e, + ZF_S_d18_02WaterC00_e, + ZF_S_d18_02WaterC01_e, + ZF_S_d18_03WaterA00_e, + ZF_S_d18_03WaterA01_e, + ZF_S_d18_03WaterB00_e, + ZF_S_d18_03WaterB01_e, + ZF_S_d18_03WaterC00_e, + ZF_S_d18_03WaterC01_e, + ZF_S_d18_04WaterA00_e, + ZF_S_d18_04WaterB00_e, + ZF_S_d18_04WaterB01_e, + ZF_S_d18_04WaterB02_e, + ZF_S_d18_04WaterB03_e, + ZF_S_d18_04WaterC00_e, + ZF_S_d18_04WaterC01_e, + ZF_S_d27_02_06jyaki00light_e, + ZF_S_d27_02_06jyaki01light_e, + ZF_S_d27_02_06jyaki02yami_e, + ZF_S_d27_02_09jyaki00yami_e, + ZF_S_d27_02_09jyaki01smk_e, + ZF_S_d27_02_09jyaki02smk_e, + ZF_S_d27_02_09jyaki03smk_e, + ZF_S_d27_02_12jyaki00yami_e, + ZF_S_d27_02_12jyaki01yami_e, + ZI_S_SkyCannon_crash_app_a_e, + ZI_S_SkyCannon_crash_app_b_e, + ZI_S_SkyCannon_crash_app_c_e, + ZI_S_SkyCannon_crash_disapp_a_e, + ZI_S_SkyCannon_crash_disapp_b_e, + ZI_S_SkyCannon_crash_disapp_c_e, + ZI_S_SkyCannon_crash_disapp_d_e, + ZI_S_VolcBom_app_a_e, + ZI_S_VolcBom_disapp_a_e, + ZI_S_VolcBom_start_a_e, + ZI_S_VolcBom_start_b_e, + ZI_S_VolcBom_start_c_e, + ZI_S_bajyoHashi_app_a_e, + ZI_S_bajyoHashi_disapp_a_e, + ZI_S_bajyoHashi_end_a_e, + ZI_S_bajyoHashi_end_b_e, + ZI_S_bajyoHashi_start_a_e, + ZI_S_bajyoHashi_start_b_e, + ZI_S_bajyoHashi_start_c_e, + ZI_S_bajyoHashi_start_d_e, + ZI_S_kakarikoBridge_app_f_e, + ZI_S_kakarikoBridge_end_a_e, + ZI_S_kakarikoBridge_end_b_e, + ZI_S_kakarikoBridge_start_a_e, + ZI_S_kakarikoBridge_start_b_e, + ZI_S_kakarikoBridge_start_c_e, + ZI_S_goma_dead_a_e, + ZI_S_SkyCannon_crash_bind_a_e, + ZI_S_SkyCannon_crash_bind_b_e, + ZI_S_SkyCannon_crash_bind_c_e, + ZI_S_SkyCannon_crash_bind_d_e, + ZI_S_VolcBom_bind_a_e, + ZI_S_VolcBom_bind_b_e, + ZI_S_VolcBom_bind_c_e, + ZI_S_VolcBom_bind_d_e, + ZI_S_bajyoHashi_bind_a_e, + ZI_S_bajyoHashi_bind_b_e, + ZI_S_bajyoHashi_bind_c_e, + ZI_S_bajyoHashi_bind_d_e, + ZI_S_kakarikoBridge_bind_a_e, + ZI_S_kakarikoBridge_bind_b_e, + ZI_S_kakarikoBridge_bind_c_e, + ZI_S_kakarikoBridge_bind_d_e, + ZI_S_objwarp_bindbeam_a_e, + ZF_S_d32_04_24yami00_e, + ZI_S_lv7brdg_break_a_e, + ZI_S_lv7brdg_break_b_e, + ZI_S_lv7brdg_break_c_e, + ZI_S_lv7brdg_break_d_e, + ZI_S_lv7brdg_break_e_e, + ZI_S_lv7brdg_break_f_e, + ZI_S_lv7brdg_break_g_e, + ZI_S_lv7brdg_break_h_e, + ZI_S_lv7brdg_break_i_e, + ZI_S_lv7R02_wind_a_e, + ZI_S_lv7R02_wind_b_e, + ZI_S_lv7R04_wind_a_e, + ZI_S_lv7R04_wind_b_e, + ZI_S_lv7R05_wind1_a_e, + ZI_S_lv7R05_wind1_b_e, + ZI_S_lv7R07_wind1_a_e, + ZI_S_lv7R07_wind1_b_e, + ZI_S_lv7R14_wind_a_e, + ZI_S_lv7R14_wind_b_e, + ZI_S_lv7R14_wind_c_e, + ZI_S_lv7R51_wind_a_e, + ZI_S_lv7R51_wind_b_e, + ZI_S_lv7R05_wind_a_e, + ZI_S_lv7R05_wind_b_e, + ZI_S_lv7R07_wind_a_e, + ZI_S_lv7R07_wind_b_e, + ZI_J_wl_attackblurA_a_e, + ZF_S_demo15_25_00_smk_e, + ZF_S_demo15_25_01_smk_e, + ZF_S_d25_16haretsu04_e, + ZF_S_d25_16haretsu05_e, + ZI_S_lv6CHblk_break_a_e, + ZI_S_lv6CHblk_break_b_e, + ZI_S_lv6CHblk_break_c_e, + ZI_S_lv6CHblk_break_d_e, + ZI_S_lv6CHblk_break_e_e, + ZI_S_lv6SWgate_break_a_e, + ZI_S_lv6SWgate_break_b_e, + ZI_S_lv6SWgate_break_c_e, + ZI_S_lv6SWgate_break_d_e, + ZI_S_lv6SWgate_break_e_e, + ZF_S_demo06_01cut13_mdBunkai_head0_e, + ZI_S_kn_magicball_a_e, + ZI_S_kn_magicball_b_e, + ZI_S_kn_magicball_c_e, + ZI_S_kn_mbHit_a_e, + ZI_S_kn_mbHit_b_e, + ZI_S_kn_mbHit_c_e, + ZI_S_SekiDoor_open_a_e, + ZI_S_SekiDoor_open_b_e, + ZI_S_SekiDoor_stop_a_e, + ZI_S_SekiDoor_stop_b_e, + ZI_S_kakosekidaiza_a_e, + ZF_S_d18_02WaterA04_e, + ZF_S_d18_02WaterB04_e, + ZI_S_goma_coreHit_a_e, + ZI_S_goma_coreHit_b_e, + ZI_S_goma_coreHit_c_e, + ZI_S_lk_sb_a_e, + ZF_S_d18_03WaterA02_e, + ZF_S_d18_03WaterB02_e, + ZF_S_d18_03WaterC02_e, + ZF_S_d20_06Water04_e, + ZF_S_d20_06Water05_e, + ZI_S_egnd_biribiri_a_e, + ZI_S_egnd_biribiri_b_e, + ZI_S_egnd_biribiri_c_e, + ZI_S_egnd_tsubazeri_a_e, + ZI_S_egnd_tsubazeri_b_e, + ZI_S_egnd_downSmoke_a_e, + ZI_S_egnd_waitSmoke_a_e, + ZI_S_egnd_waitSmoke_b_e, + ZI_J_lk_swl_c_e, + ZI_S_lk_swl_get_a_e, + ZF_S_d18_seiA_shizuku_b_e, + ZF_S_d18_seiA_shizuku_c_e, + ZF_S_d18_seiA_shizuku_d_e, + ZF_S_d18_seiA_shizuku_e_e, + ZF_S_d18_seiA_shizuku_f_e, + ZF_S_d18_seiA_shizuku_g_e, + ZI_J_kaitengiriD_a_e, + ZI_J_kaitengiriD_b_e, + ZI_J_kaitengiriD_c_e, + ZI_J_kaitengiriD_d_e, + ZI_J_kaitengiriD_e_e, + ZI_J_kaitengiriD_f_e, + ZF_S_d18_097SandaishinR04_e, + ZF_S_d26_01_05_rod00rainbow_e, + ZF_S_d26_01_05_rod01rainbow_e, + ZF_S_d26_01_05_rod02rainbow_e, + ZF_S_d26_01_05_rod03glow_e, + ZF_S_d26_01_05_rod04senko_e, + ZF_S_d26_01_05_rod05glow_e, + ZF_S_d26_01_05_rod06senko_e, + ZF_S_d26_01_05_rod07glass_e, + ZF_S_d26_01_06_2d00senko_e, + ZF_S_d26_01_06_2d01senko_e, + ZF_S_d26_01_07_hakai00senko_e, + ZF_S_d26_01_07_hakai01senko_e, + ZF_S_d26_01_07_hakai02senko_e, + ZI_S_zntA_app_a_e, + ZI_S_zntA_disapp_a_e, + ZI_S_zntA_disapp_b_e, + ZI_S_zntA_zk_app_a_e, + ZI_S_zntA_zk_app_b_e, + ZI_S_zntA_zk_app_c_e, + ZI_S_zntA_zk_app_ind_e, + ZI_S_zntA_zk_sasi_a_e, + ZI_S_zntA_zk_sasi_b_e, + ZI_S_zntA_zk_sasi_c_e, + ZF_S_d27_27G00_e, + ZI_S_ds_attack_a_e, + ZI_S_ds_attack_b_e, + ZI_S_ds_opdemo_armL1_a_e, + ZI_S_ds_opdemo_armL1_b_e, + ZI_S_ds_opdemo_armL2_a_e, + ZI_S_ds_opdemo_armL2_b_e, + ZI_S_ds_opdemo_armR1_a_e, + ZI_S_ds_opdemo_armR1_b_e, + ZI_S_ds_opdemo_armR2_a_e, + ZI_S_ds_opdemo_armR2_b_e, + ZI_S_ds_opdemo_backbone4_a_e, + ZI_S_ds_opdemo_backbone4_b_e, + ZI_S_ds_opdemo_handL_a_e, + ZI_S_ds_opdemo_handL_b_e, + ZI_S_ds_opdemo_handR_a_e, + ZI_S_ds_opdemo_handR_b_e, + ZI_S_ds_opdemo_head_a_e, + ZI_S_ds_opdemo_head_b_e, + ZI_S_ds_opdemo_ryusa_a_e, + ZF_S_d20_09Sand00_e, + ZF_S_d28_01_01_03_e, + ZI_S_ds_backboneHit_a_e, + ZI_S_ds_backboneHit_b_e, + ZI_S_ds_bboneBreakLv1_a_e, + ZI_S_ds_bboneBreakLv1_b_e, + ZI_S_ds_bboneBreakLv1_c_e, + ZI_S_ds_bboneBreakLv1_d_e, + ZI_S_ds_bboneBreakLv2_a_e, + ZI_S_ds_bboneBreakLv2_b_e, + ZI_S_ds_bboneBreakLv2_c_e, + ZI_S_ds_bboneBreakLv2_d_e, + ZI_S_ds_bboneBreakLv3_a_e, + ZI_S_ds_bboneBreakLv3_b_e, + ZI_S_ds_bboneBreakLv3_c_e, + ZI_S_ds_bboneBreakLv3_d_e, + ZI_S_zs_app_a_e, + ZI_S_zs_app_b_e, + ZI_S_zs_hit_a_e, + ZI_S_zs_hit_b_e, + ZI_S_zs_hit_c_e, + ZF_S_d28_01_01_04_e, + ZI_S_suisho_a_e, + ZF_S_d28_01_04MtoZ03_e, + ZI_S_ds_bboneSmokeLv1_a_e, + ZI_S_ds_bboneSmokeLv1_b_e, + ZI_S_ds_bboneSmokeLv2_a_e, + ZI_S_ds_bboneSmokeLv2_b_e, + ZI_S_ds_bboneSmokeLv3_a_e, + ZI_S_ds_bboneSmokeLv3_b_e, + ZI_S_ds_headSmoke_a_e, + ZI_S_ds_head_fallsand_a_e, + ZI_S_ds_head_fallsand_b_e, + ZI_S_zk_edemo_sashi_a_e, + ZI_S_zk_edemo_sashi_b_e, + ZI_S_ds_ball_tame_a_e, + ZF_S_d34c0409_01_e, + ZI_S_pouya_kira_a_e, + ZI_S_lv9Pillar_break_a_e, + ZI_S_lv9Pillar_break_b_e, + ZI_S_lv9Pillar_break_c_e, + ZI_S_lv9Pillar_break_d_e, + ZI_S_lv5yuka_break_a_e, + ZI_S_lv5yuka_break_b_e, + ZI_S_lv5yuka_break_c_e, + ZI_S_lv5yuka_break_d_e, + ZF_S_d20_27_zBallA00_e, + ZF_S_d20_27_zBallA01_e, + ZF_S_d20_27_zBallA02_e, + ZF_S_d20_27_zBallA03_e, + ZF_S_d20_27_zBallB00_e, + ZF_S_d20_27_zBallB01_e, + ZF_S_d20_27_zBallB03_e, + ZF_S_d20_27_zBallC01_e, + ZF_S_d20_27_zBallC03_e, + ZF_S_d20_zBall00_e, + ZF_S_d20_zBall01_e, + ZF_S_d20_zBall02_e, + ZF_S_d20_zBall03_e, + ZI_S_iceleaf_break_a_e, + ZI_S_iceleaf_break_b_e, + ZI_J_kirakira_a_e, + ZI_S_Fdrop_get_a_e, + ZF_S_demo07_02_02smoke_e, + ZF_S_demo07_02_03smoke_e, + ZF_S_d18_20johatu10_e, + ZF_S_d34c0409_02_e, + ZF_S_d34c0409_03_e, + ZI_S_mgn_dashjump_a_e, + ZI_S_mgn_exit_a_e, + ZI_S_mgn_headcoreHit_a_e, + ZI_S_mgn_headcoreHit_b_e, + ZI_S_mgn_headcore_a_e, + ZI_S_zk_disapp_a_e, + ZI_S_egnd_downSmoke_b_e, + ZI_S_mgn_bodycoreHit_a_e, + ZF_S_d26_01_07_hakai03senko_e, + ZI_S_egnd_ball_f_e, + ZI_S_ds_lastdmg_sandSmoke1_a_e, + ZI_S_ds_lastdmg_sandSmoke1_b_e, + ZI_S_ds_lastdmg_sandSmoke2_a_e, + ZI_S_ds_lastdmg_sandSmoke2_b_e, + ZF_S_d27_02_12jyaki02yami_e, + ZI_S_gw_coll_a_e, + ZI_S_gw_coll_b_e, + ZF_S_demo18_triforce_e_e, + ZF_S_demo18_triforce_f_e, + ZF_S_demo18_triforce_g_e, + ZF_S_demo18_triforce_h_e, + ZF_S_demo18_triforce_i_e, + ZF_S_demo18_triforce_j_e, + ZF_S_d27_02_13jyaki00yami_e, + ZF_S_d27_02_13jyaki01yami_e, + ZF_S_d27_02_13jyaki02yami_e, + ZF_S_d20_43Warp03_e, + ZF_S_d20_43Warp04_e, + ZF_S_d20_43Warp05_e, + ZF_S_d20_43Warp06_e, + ZF_S_d20_43Warp07_e, + ZF_S_d20_43Warp08_e, + ZF_S_d20_43Warp09_e, + ZF_S_d20_43Warp10_e, + ZF_S_demo28_02_warpFilter_a_e, + ZF_S_demo28_02_warpFilter_b_e, + ZF_S_demo28_02_warpFilter_c_e, + ZF_S_demo28_02_warpFilter_d_e, + ZF_S_d20_41midYaki_a_e, + ZI_S_Bdoor_LV1_open_a_e, + ZI_S_Bdoor_LV1_open_b_e, + ZI_S_Bdoor_LV1_open_c_e, + ZI_S_Bdoor_LV2_open_a_e, + ZI_S_Bdoor_LV2_open_b_e, + ZI_S_Bdoor_LV2_open_c_e, + ZI_S_Bdoor_LV4_open_a_e, + ZI_S_Bdoor_LV4_open_b_e, + ZI_S_Bdoor_LV4_open_c_e, + ZI_S_Bdoor_LV4_open_d_e, + ZI_S_Bdoor_LV6_open_a_e, + ZI_S_Bdoor_LV6_open_b_e, + ZI_S_Bdoor_LV6_open_c_e, + ZI_S_Bdoor_LV6_open_d_e, + ZI_S_shutterSmoke_b_e, + ZI_S_otiyuki_a_e, + ZI_J_kaitengiri_inWtr_a_e, + ZI_J_kaitengiri_inWtr_b_e, + ZF_S_d18_seiA_shizuku_h_e, + ZF_S_d18_seiA_shizuku_i_e, + ZF_S_d18_seiA_shizuku_j_e, + ZI_S_demo09_cut6_sizuku_h_e, + ZI_S_demo09_cut6_sizuku_i_e, + ZI_S_demo09_cut6_sizuku_j_e, + ZI_S_demo09_cut7_sizuku_h_e, + ZI_S_demo09_cut7_sizuku_i_e, + ZI_S_demo09_cut7_sizuku_j_e, + ZI_S_seiA_shizuku_h_e, + ZI_S_seiA_shizuku_i_e, + ZI_S_seiA_shizuku_j_e, + ZF_S_d21_20_04backbone2_3_e, + ZF_S_d21_20_05head_e, + ZF_S_d21_20_06backbone2_3_e, + ZF_S_d21_21_05backbone2_2_e, + ZF_S_d21_21_06head_2_e, + ZF_S_d21_21_07armR2_1_e, + ZF_S_d21_22_03backbone2_2_e, + ZF_S_d21_22_04head_2_e, + ZF_S_d21_23_04backbone2_2_e, + ZF_S_d21_23_05head_2_e, + ZF_S_d28_01_03MtoZ03_e, + ZF_S_d28_01_03MtoZ04_e, + ZF_S_d28_01_04MtoZ04_e, + ZF_S_d28_01_04MtoZ05_e, + ZI_S_octhashi_downSmoke_a_e, + ZF_S_phLv7Dust00_e, + ZF_S_phLv7Dust01_e, + ZF_S_phLv7Dust02_e, + ZF_S_phLv7Dust03_e, + ZI_S_fd_gate00_rock_e, + ZI_S_fd_gate01_sand_e, + ZI_S_fd_gate02_smk_e, + ZI_S_fd_gate03_smk_e, + ZI_S_fd_gate04_smk_e, + ZF_S_d24_01_02_chain01monolith_e, + ZF_S_d28_01_01_05_e, + ZF_S_d2201c08_01_e, + ZF_S_d20_08Smoke02_e, + ZF_S_d20_09Glow2_e, + ZF_S_d28_01_09a02_e, + ZF_S_f_spell00glow_e, + ZF_S_f_spell01senko_e, + ZF_S_d33_02_gsph00senko_e, + ZF_S_d33_02_gsph01senko_e, + ZF_S_d33_02_gsph02tail_e, + ZF_S_d33_02_gsph03tail_e, + ZF_S_f_spell02senko_e, + }; }; #endif /* D_PARTICLE_D_PARTICLE_NAME_H */ diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 0db75df02e8..9099b6883ba 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -6,8 +6,10 @@ #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_searcher.h" #include "d/bg/d_bg_s.h" +#include "d/bg/d_bg_s_gnd_chk.h" #include "d/bg/d_bg_s_lin_chk.h" #include "d/bg/d_bg_s_wtr_chk.h" +#include "d/bg/d_bg_s_roof_chk.h" #define fopAcM_SetupActor(ptr,ClassName) \ if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ @@ -60,24 +62,35 @@ struct fopAcM_search_prm { /* 0x0A */ s8 mSubType; }; +class l_HIO { +public: + /* 8001E098 */ ~l_HIO() {} +}; + dBgS& dComIfG_Bgsp(); class fopAcM_lc_c { public: - static dBgS_LinChk* getLineCheck() { return (dBgS_LinChk*)&mLineCheck; } - static bool checkMoveBG() { return dComIfG_Bgsp().ChkMoveBG(*(dBgS_LinChk*)&mLineCheck); } - static cXyz* getCrossP() { return ((dBgS_LinChk*)&mLineCheck)->GetCrossP(); } + fopAcM_lc_c() { + mLineCheck.ClrSttsRoofOff(); + } + + static dBgS_ObjLinChk* getLineCheck() { return &mLineCheck; } + static bool checkMoveBG() { return dComIfG_Bgsp().ChkMoveBG(mLineCheck); } + static cXyz* getCrossP() { return mLineCheck.GetCrossP(); } static bool lineCheck(const cXyz*, const cXyz*, const fopAc_ac_c*); - static u8 mLineCheck[112]; + + static dBgS_ObjLinChk mLineCheck; }; class dBgS_RoofChk; class fopAcM_rc_c { public: - static dBgS_RoofChk* getRoofCheck() { return (dBgS_RoofChk*)&mRoofCheck; } + static dBgS_ObjRoofChk* getRoofCheck() { return &mRoofCheck; } static f32 getRoofY() { return mRoofY; } static bool roofCheck(const cXyz*); - static u8 mRoofCheck[80]; + + static dBgS_ObjRoofChk mRoofCheck; static f32 mRoofY; }; @@ -85,27 +98,25 @@ class dBgS_GndChk; class fopAcM_gc_c { public: static bool gndCheck(const cXyz*); - static u8 mGndCheck[84]; // this is dBgS_GndChk but all static data in the TU probably needs to be setup first (otherwise causes a reordering problem with the __sinit function) + static dBgS_ObjGndChk mGndCheck; static f32 mGroundY; - // this avoids having to include d_bg_s.h here - static inline bool getTriPla(cM3dGPla* pPlane); - static inline int getRoomId(); - static inline int getPolyColor(); - - static dBgS_GndChk* getGroundCheck() { return (dBgS_GndChk*)&mGndCheck; } + static bool getTriPla(cM3dGPla* i_plane) { return dComIfG_Bgsp().GetTriPla(mGndCheck, i_plane); } + static int getRoomId() { return dComIfG_Bgsp().GetRoomId(mGndCheck); } + static int getPolyColor() { return dComIfG_Bgsp().GetPolyColor(mGndCheck); } + static dBgS_ObjGndChk* getGroundCheck() { return &mGndCheck; } static f32 getGroundY() { return mGroundY; } }; class fopAcM_wt_c { public: - static dBgS_WtrChk* getWaterCheck() { return (dBgS_WtrChk*)&mWaterCheck; } - static f32 getWaterY() { return mWaterY[0]; } - static int getPolyAtt0() { return dComIfG_Bgsp().GetPolyAtt0(*(dBgS_WtrChk*)&mWaterCheck); } + static dBgS_WtrChk* getWaterCheck() { return &mWaterCheck; } + static f32 getWaterY() { return mWaterY; } + static int getPolyAtt0() { return dComIfG_Bgsp().GetPolyAtt0(mWaterCheck); } static bool waterCheck(const cXyz*); - static u8 mWaterCheck[84 + 4 /* padding */]; - static f32 mWaterY[1 + 1 /* padding */]; + static dBgS_WtrChk mWaterCheck; + static f32 mWaterY; }; class dKy_tevstr_c; diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 54500005808..75eb46954e0 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -32,13 +32,7 @@ public: void setFrame(f32 frame) { mFrameCtrl.setFrame(frame); } void setPlayMode(int i_mode) { mFrameCtrl.setAttribute(i_mode); } void setLoopFrame(f32 i_frame) { mFrameCtrl.setLoop(i_frame); } - bool isStop() { - bool stopped = true; - if (!mFrameCtrl.checkState(1) && mFrameCtrl.getRate() != 0.0f) { - stopped = false; - } - return stopped; - } + bool isStop() { return mFrameCtrl.checkState(1) || mFrameCtrl.getRate() == 0.0f; } void reset() { mFrameCtrl.reset(); } private: @@ -152,7 +146,9 @@ public: void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); } - void remove(J3DModelData* i_modelData) { i_modelData->getJointNodePointer(0)->setMtxCalc(NULL); } + void remove(J3DModelData* i_modelData) { + i_modelData->getJointNodePointer(0)->setMtxCalc(NULL); + } J3DAnmTransform* getBckAnm() { return mAnm; } @@ -264,7 +260,8 @@ public: virtual void execute(u16) = 0; }; -class mDoExt_morf_c : public J3DMtxCalcNoAnm { +class mDoExt_morf_c + : public J3DMtxCalcNoAnm { public: /* 8000F950 */ mDoExt_morf_c(); /* 8000FB7C */ void setMorf(f32 i_morf); @@ -276,13 +273,7 @@ public: void changeAnm(J3DAnmTransform* anm) { mpAnm = anm; } u8 getPlayMode() { return mFrameCtrl.getAttribute(); } void setPlayMode(int mode) { mFrameCtrl.setAttribute(mode); } - bool isStop() { - bool stopped = true; - if (!mFrameCtrl.checkState(1) && mFrameCtrl.getRate() != 0.0f) { - stopped = false; - } - return stopped; - } + bool isStop() { return mFrameCtrl.checkState(1) || mFrameCtrl.getRate() == 0.0f; } bool isLoop() { return mFrameCtrl.checkState(2); } f32 getStartFrame() { return mFrameCtrl.getStart(); } void setStartFrame(f32 frame) { mFrameCtrl.setStart(frame); } @@ -315,7 +306,8 @@ public: int, Z2Creature*, u32, u32); /* 800108F0 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate, f32 i_start, f32 i_end); + /* 80010E70 */ void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate, + f32 i_start, f32 i_end); /* 800110B0 */ int play(u32, s8); /* 80011154 */ void updateDL(); /* 800111C0 */ void entryDL(); @@ -345,9 +337,8 @@ public: /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, int, void*, u32, u32); - /* 8000FD94 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, - int, void*, u32, u32); + /* 8000FD94 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, + J3DAnmTransform*, int, f32, int, int, int, void*, u32, u32); /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*); /* 800105C8 */ u32 play(Vec*, u32, s8); /* 80010680 */ void entryDL(); @@ -424,7 +415,8 @@ private: /* 0x20 */ Quaternion* mOldFrameQuaternion; }; // Size: 0x24 -struct mDoExt_MtxCalcAnmBlendTbl : public J3DMtxCalcNoAnm { +struct mDoExt_MtxCalcAnmBlendTbl + : public J3DMtxCalcNoAnm { mDoExt_MtxCalcAnmBlendTbl(int num, mDoExt_AnmRatioPack* anmRatio) { mNum = num; mAnmRatio = anmRatio; @@ -447,7 +439,9 @@ struct mDoExt_MtxCalcAnmBlendTbl : public J3DMtxCalcNoAnmcurrent.pos; + end.y += 100.0f; + + start = start_actor->current.pos; + start.y += 100.0f; + + line_chk.Set(&start, &end, start_actor); + if (dComIfG_Bgsp().LineCross(&line_chk)) { + return true; + } + + return false; } -#pragma pop /* 8073D5C4-8073D648 000264 0084+00 1/1 0/0 0/0 .text SetStopingCam__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SetStopingCam() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopingCam__8daE_PH_cFv.s" +void daE_PH_c::SetStopingCam() { + camera_class* camera_p = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + + camera_p->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); } -#pragma pop /* 8073D648-8073D768 0002E8 0120+00 1/1 0/0 0/0 .text SetStopCam__8daE_PH_cF4cXyzffs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SetStopCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetStopCam__8daE_PH_cF4cXyzffs.s" +void daE_PH_c::SetStopCam(cXyz i_center, f32 i_offsetZ, f32 i_offsetY, s16 i_offsetAngle) { + camera_class* camera_p = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + cXyz offset(0.0f, i_offsetY, i_offsetZ); + cXyz eye_offset(0.0f, 0.0f, 0.0f); + + mCamCenter.set(i_center.x, i_center.y, i_center.z); + mCamCenterTarget = mCamCenter; + + cLib_offsetPos(&eye_offset, &i_center, i_offsetAngle, &offset); + mCamEye = eye_offset; + mCamEyeTarget = eye_offset; + + camera_p->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); } -#pragma pop /* 8073D768-8073D7AC 000408 0044+00 1/1 0/0 0/0 .text SetCMoveCam__8daE_PH_cF4cXyzff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SetCMoveCam(cXyz param_0, f32 param_1, f32 param_2) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCMoveCam__8daE_PH_cF4cXyzff.s" +void daE_PH_c::SetCMoveCam(cXyz i_target, f32 i_scale, f32 i_maxStep) { + mCamCenterTarget = i_target; + cLib_addCalcPos2(&mCamCenter, mCamCenterTarget, i_scale, i_maxStep); } -#pragma pop /* 8073D7AC-8073D850 00044C 00A4+00 1/1 0/0 0/0 .text SetReleaseCam__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SetReleaseCam() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetReleaseCam__8daE_PH_cFv.s" +void daE_PH_c::SetReleaseCam() { + camera_class* camera_p = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + + camera_p->mCamera.Reset(mCamCenter, mCamEye); + camera_p->mCamera.Start(); + camera_p->mCamera.SetTrimSize(0); + i_dComIfGp_event_reset(); } -#pragma pop /* 8073D850-8073D904 0004F0 00B4+00 1/1 0/0 0/0 .text ctrlJoint__8daE_PH_cFP8J3DJointP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ctrlJoint__8daE_PH_cFP8J3DJointP8J3DModel.s" +int daE_PH_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { + int jnt_no = i_joint->getJntNo(); + mDoMtx_stack_c::copy(i_model->i_getAnmMtx(jnt_no)); + + if (jnt_no == PH_JNT_HEAD) { + mDoMtx_stack_c::YrotM(mHeadRotY); + mDoMtx_stack_c::XrotM(-mHeadRotX); + } + + i_model->i_setAnmMtx(jnt_no, mDoMtx_stack_c::get()); + cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + return 1; } -#pragma pop /* 8073D904-8073D950 0005A4 004C+00 1/1 0/0 0/0 .text JointCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void JointCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/JointCallBack__FP8J3DJointi.s" +static int JointCallBack(J3DJoint* i_joint, int param_1) { + if (param_1 == 0) { + J3DModel* model = j3dSys.getModel(); + daE_PH_c* a_this = (daE_PH_c*)model->getUserArea(); + if (a_this != NULL) { + a_this->ctrlJoint(i_joint, model); + } + } + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80741C44-80741C48 000050 0004+00 0/4 0/0 0/0 .rodata @4021 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4021 = -10.0f; -COMPILER_STRIP_GATE(0x80741C44, &lit_4021); -#pragma pop - -/* 80741C48-80741C4C 000054 0004+00 0/3 0/0 0/0 .rodata @4022 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4022 = 80.0f; -COMPILER_STRIP_GATE(0x80741C48, &lit_4022); -#pragma pop /* 8073D950-8073D9EC 0005F0 009C+00 1/1 0/0 0/0 .text setCcSph__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::setCcSph() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setCcSph__8daE_PH_cFv.s" -} -#pragma pop +void daE_PH_c::setCcSph() { + cXyz center(0.0f, AREG_F(0) + -10.0f, 0.0f); -/* ############################################################################################## */ -/* 80741D0C-80741D0C 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80741D0C = "E_PH"; -#pragma pop + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::multVec(¢er, ¢er); + + mCcSph.SetC(center); + mCcSph.SetR(AREG_F(1) + 80.0f); + dComIfG_Ccsp()->Set(&mCcSph); +} + +int daE_PH_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PH", PH_BMD); + JUT_ASSERT(modelData != 0); + + mpMorf = new mDoExt_McaMorfSO( + modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PH", ANM_WAIT), + J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + if (mpMorf == NULL || mpMorf->getModel() == NULL) { + return 0; + } + + return 1; +} /* 8073D9EC-8073DAE4 00068C 00F8+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 8073DAE4-8073DB04 000784 0020+00 1/0 0/0 0/0 .text daE_PH_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_PH_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Create__FP10fopAc_ac_c.s" +static int daE_PH_Create(fopAc_ac_c* i_this) { + fopAcM_GetID(i_this); + return static_cast(i_this)->create(); } -#pragma pop /* 8073DB04-8073DB28 0007A4 0024+00 1/0 0/0 0/0 .text daE_PH_Delete__FP8daE_PH_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_PH_Delete(daE_PH_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Delete__FP8daE_PH_c.s" +static int daE_PH_Delete(daE_PH_c* i_this) { + fopAcM_GetID(i_this); + i_this->Delete(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80741C4C-80741C50 000058 0004+00 1/1 0/0 0/0 .rodata @4064 */ -SECTION_RODATA static f32 const lit_4064 = -1.0f; -COMPILER_STRIP_GATE(0x80741C4C, &lit_4064); /* 8073DB28-8073DBD4 0007C8 00AC+00 5/5 0/0 0/0 .text SetAnm__8daE_PH_cFiiff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SetAnm(int param_0, int param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetAnm__8daE_PH_cFiiff.s" +void daE_PH_c::SetAnm(int i_anmID, int i_attr, f32 i_morf, f32 i_speed) { + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("E_PH", i_anmID); + mpMorf->setAnm(anm, i_attr, i_morf, i_speed, 0.0f, -1.0f); + mAnmID = i_anmID; } -#pragma pop - -/* ############################################################################################## */ -/* 80741C50-80741C54 00005C 0004+00 0/1 0/0 0/0 .rodata @4128 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4128 = 1000000000.0f; -COMPILER_STRIP_GATE(0x80741C50, &lit_4128); -#pragma pop - -/* 80741C54-80741C5C 000060 0008+00 0/7 0/0 0/0 .rodata @4129 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4129[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80741C54, &lit_4129); -#pragma pop - -/* 80741C5C-80741C64 000068 0008+00 0/7 0/0 0/0 .rodata @4130 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4130[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80741C5C, &lit_4130); -#pragma pop - -/* 80741C64-80741C6C 000070 0008+00 0/7 0/0 0/0 .rodata @4131 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4131[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80741C64, &lit_4131); -#pragma pop /* 8073DBD4-8073DDF8 000874 0224+00 1/1 0/0 0/0 .text SearchNearP__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SearchNearP() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNearP__8daE_PH_cFv.s" -} -#pragma pop +void daE_PH_c::SearchNearP() { + f32 nearest_dist = 1000000000.0f; -/* ############################################################################################## */ -/* 80741C6C-80741C70 000078 0004+00 0/4 0/0 0/0 .rodata @4196 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4196 = 5.0f; -COMPILER_STRIP_GATE(0x80741C6C, &lit_4196); -#pragma pop + for (int i = 0; i < mpPath->m_num; i++) { + f32 pnt_dist = current.pos.absXZ(dPath_GetPnt(mpPath, i)->m_position); + if (pnt_dist < nearest_dist) { + nearest_dist = pnt_dist; + + mCurrentPntNo = i; + mCurrentPntPos.x = current.pos.x; + mCurrentPntPos.y = current.pos.y; + mCurrentPntPos.z = current.pos.z; + + if (mCurrentPntNo == mpPath->m_num - 1) { + if (dPath_ChkClose(mpPath)) { + mCurrentPntNo = 0; + } else { + mCurrentPntNo--; + } + } else { + mCurrentPntNo++; + } + + if (mAction == 1) { + SetCheckAngle(); + } else { + S_SetAngle(); + } + } + } +} /* 8073DDF8-8073E068 000A98 0270+00 2/2 0/0 0/0 .text FlyAnm__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::FlyAnm() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm__8daE_PH_cFv.s" +void daE_PH_c::FlyAnm() { + if (mAnmID == ANM_DAMAGE_ARROW || mAnmID == ANM_HANG_START || mAnmID == ANM_HANG_WAIT) { + if (mpMorf->isStop()) { + SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); + } + + mFlyRockEMKey = dComIfGp_particle_set(mFlyRockEMKey, 0x878C, ¤t.pos, &mTevStr, + &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); + mFlyTsubuEMKey = + dComIfGp_particle_set(mFlyTsubuEMKey, 0x878D, ¤t.pos, &mTevStr, &shape_angle, + NULL, 0xFF, NULL, -1, NULL, NULL, NULL); + } + + if (mAnmID == ANM_HANG_START || mAnmID == ANM_WAIT) { + if (fopAcM_checkHookCarryNow(this) && i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + field_0x630 = -10.0f - BREG_F(0); + field_0x5ae = 15; + field_0x616 = 0x1000; + field_0x618 = 0x1000; + SetAnm(ANM_HANG_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); + } else if (mAnmID != ANM_WAIT) { + SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); + } + } else if (mAnmID == ANM_HANG_WAIT) { + if (!fopAcM_checkHookCarryNow(this) || !i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + SetAnm(ANM_HANG_END, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, mAnmSpeed); + } + } else if (mAnmID == ANM_HANG_END) { + if (mpMorf->isStop()) { + SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80741C70-80741C74 00007C 0004+00 1/1 0/0 0/0 .rodata @4213 */ -SECTION_RODATA static f32 const lit_4213 = 50.0f; -COMPILER_STRIP_GATE(0x80741C70, &lit_4213); - -/* 80741C74-80741C7C 000080 0008+00 3/7 0/0 0/0 .rodata @4215 */ -SECTION_RODATA static u8 const lit_4215[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80741C74, &lit_4215); /* 80741DC0-80741DC4 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80741DC0[4]; - -/* 80741DC4-80741DD0 00000C 000C+00 1/1 0/0 0/0 .bss @3762 */ -static u8 lit_3762[12]; +static u8 initialized; /* 80741DD0-80741DEC 000018 001C+00 8/8 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[28]; +static daE_PH_HIO_c l_HIO; /* 8073E068-8073E22C 000D08 01C4+00 1/1 0/0 0/0 .text SetShapeAngle__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SetShapeAngle() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetShapeAngle__8daE_PH_cFv.s" +void daE_PH_c::SetShapeAngle() { + mHeadRotX += field_0x612 * mAnmSpeed; + mSound.startCreatureSoundLevel(Z2SE_EN_PH_PROPELLER, field_0x612 * mAnmSpeed, -1); + + cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + field_0x61c = cLib_targetAngleY(¤t.pos, &target_pos); + + s16 prev_angle = current.angle.y; + cLib_chaseAngleS(¤t.angle.y, field_0x61c, + l_HIO.mRotationInterpolation * (field_0x5b4 * 0x100)); + + s16 temp_r4 = prev_angle - current.angle.y; + if (field_0x5b4 != 0x46) { + cLib_addCalcAngleS2(&shape_angle.y, current.angle.y, 0x20, 0x1000); + } + + cLib_chaseAngleS(&shape_angle.x, -temp_r4 * (AREG_F(5) + 50.0f), 0x30); } -#pragma pop - -/* ############################################################################################## */ -/* 80741C7C-80741C80 000088 0004+00 0/4 0/0 0/0 .rodata @4284 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4284 = 10.0f; -COMPILER_STRIP_GATE(0x80741C7C, &lit_4284); -#pragma pop - -/* 80741C80-80741C84 00008C 0004+00 0/3 0/0 0/0 .rodata @4285 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4285 = 20.0f; -COMPILER_STRIP_GATE(0x80741C80, &lit_4285); -#pragma pop - -/* 80741C84-80741C88 000090 0004+00 1/2 0/0 0/0 .rodata @4286 */ -SECTION_RODATA static f32 const lit_4286 = 3.0f / 50.0f; -COMPILER_STRIP_GATE(0x80741C84, &lit_4286); - -/* 80741C88-80741C8C 000094 0004+00 0/2 0/0 0/0 .rodata @4287 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4287 = -1000000000.0f; -COMPILER_STRIP_GATE(0x80741C88, &lit_4287); -#pragma pop /* 8073E22C-8073E4A4 000ECC 0278+00 1/1 0/0 0/0 .text GoTarget__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::GoTarget() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/GoTarget__8daE_PH_cFv.s" +void daE_PH_c::GoTarget() { + cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + cLib_addCalc2(&speed.y, mTargetSpeedY, l_HIO.mRotationYInterpolation, 10.0f); + cLib_addCalc2(&speedF, mTargetSpeedF, 0.1f, 20.0f); + + SetShapeAngle(); + + int factor = current.pos.absXZ(target_pos) / speedF; + if (factor == 0) { + factor = 1; + } + + mTargetSpeedY = (target_pos.y - current.pos.y) / (f32)factor; + + cLib_chaseF(&mAnmSpeed, field_0x620, 0.06f); + cLib_chaseAngleS(&field_0x612, field_0x610 * mAnmSpeed, 0x10); + mpMorf->setPlaySpeed(mAnmSpeed); + + if (mAcch.GetGroundH() != -1000000000.0f && current.pos.y < mAcch.GetGroundH() + 100.0f) { + current.pos.y = mAcch.GetGroundH() + 100.0f; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80741C8C-80741C90 000098 0004+00 0/2 0/0 0/0 .rodata @4406 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4406 = 1.5f; -COMPILER_STRIP_GATE(0x80741C8C, &lit_4406); -#pragma pop - -/* 80741C90-80741C94 00009C 0004+00 0/3 0/0 0/0 .rodata @4407 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4407 = 0.5f; -COMPILER_STRIP_GATE(0x80741C90, &lit_4407); -#pragma pop - -/* 80741C94-80741C9C 0000A0 0004+04 0/2 0/0 0/0 .rodata @4408 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4408[1 + 1 /* padding */] = { - 4.0f / 5.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80741C94, &lit_4408); -#pragma pop - -/* 80741C9C-80741CA4 0000A8 0008+00 0/3 0/0 0/0 .rodata @4410 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4410[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80741C9C, &lit_4410); -#pragma pop /* 8073E4A4-8073E8B0 001144 040C+00 2/2 0/0 0/0 .text SetCheckAngle__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SetCheckAngle() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetCheckAngle__8daE_PH_cFv.s" +void daE_PH_c::SetCheckAngle() { + cXyz sp34(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + mCurrentPntPos = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position; + + cXyz sp40(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + cXyz sp4C(sp34.x - sp40.x, sp34.y - sp40.y, sp34.z - sp40.z); + field_0x61e = cLib_targetAngleY(&sp34, &sp40); + + mTargetSpeedF = + (l_HIO.mSpeed + (f32)mMoveSpeed) * (1.5f - fabsf(cM_ssin(cM_atan2s(sp4C.y, sp4C.absXZ())))); + + cXyz sp58(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + field_0x61c = cLib_targetAngleY(¤t.pos, &sp58); + + field_0x620 = -cM_ssin(cM_atan2s(sp4C.y, sp4C.absXZ())) * 0.5f + 1.0f; + if (field_0x620 < 0.8f) { + field_0x620 = 0.8f; + } + + field_0x5b8 = field_0x620; + mStopTimer = l_HIO.mStopTime + (f32)mStopTimePrm; + + if (sp34.x == sp40.x && sp34.z == sp40.z) { + mAction = 0; + } } -#pragma pop /* 8073E8B0-8073E924 001550 0074+00 1/1 0/0 0/0 .text C_CheckPoint__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::C_CheckPoint() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_CheckPoint__8daE_PH_cFv.s" -} -#pragma pop +bool daE_PH_c::C_CheckPoint() { + cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + s16 angle = field_0x61e - cLib_targetAngleY(&target_pos, ¤t.pos); -/* ############################################################################################## */ -/* 80741CA4-80741CA8 0000B0 0004+00 0/3 0/0 0/0 .rodata @4447 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4447 = 3.0f; -COMPILER_STRIP_GATE(0x80741CA4, &lit_4447); -#pragma pop + if (angle < 0x4000 && angle > -0x4000) { + return true; + } + + return false; +} /* 8073E924-8073EA50 0015C4 012C+00 2/2 0/0 0/0 .text DownBoots__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::DownBoots() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DownBoots__8daE_PH_cFv.s" +void daE_PH_c::DownBoots() { + s16 temp_r0 = (f32)(field_0x612 * mAnmSpeed); + mHeadRotX += temp_r0; + + mSound.startCreatureSoundLevel(Z2SE_EN_PH_PROPELLER, (f32)field_0x612 * mAnmSpeed, -1); + speed.y = 0.0f; + + daPy_py_c* player_p = daPy_getPlayerActorClass(); + speedF = 0.0f; + current.pos.y += -10.0f; + + if (!player_p->i_checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { + mCAction++; + mAnmSpeed = nREG_F(0) + 3.0f; + field_0x620 = nREG_F(0) + 3.0f; + } + + mpMorf->setPlaySpeed(mAnmSpeed); } -#pragma pop /* 8073EA50-8073EB64 0016F0 0114+00 2/2 0/0 0/0 .text UpBoots__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::UpBoots() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/UpBoots__8daE_PH_cFv.s" -} -#pragma pop +void daE_PH_c::UpBoots() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + mHeadRotX += 0x1000; -/* ############################################################################################## */ -/* 80741CA8-80741CAC 0000B4 0004+00 1/2 0/0 0/0 .rodata @4501 */ -SECTION_RODATA static f32 const lit_4501 = 6.0f; -COMPILER_STRIP_GATE(0x80741CA8, &lit_4501); + mSound.startCreatureSoundLevel(Z2SE_EN_PH_PROPELLER, field_0x612 * mAnmSpeed, -1); + + mTargetSpeedY = 0.0f; + current.pos.y += 10.0f; + + if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + mCAction--; + mAnmSpeed = nREG_F(0) + 3.0f; + field_0x620 = nREG_F(0) + 3.0f; + } + + mpMorf->setPlaySpeed(mAnmSpeed); + + if (current.pos.y > field_0x640) { + mCAction = 0; + } +} /* 8073EB64-8073ED0C 001804 01A8+00 1/1 0/0 0/0 .text C_Action__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::C_Action() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/C_Action__8daE_PH_cFv.s" +void daE_PH_c::C_Action() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + switch (mCAction) { + case 0: + if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + mCAction++; + field_0x640 = current.pos.y; + mAnmSpeed = nREG_F(0) + 6.0f; + field_0x620 = nREG_F(0) + 6.0f; + } + + if (!player_p->i_checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { + field_0x620 = field_0x5b8; + } + + if (C_CheckPoint()) { + if (field_0x662) { + SearchBackPos(); + } else { + SearchNextPos(); + } + + SetCheckAngle(); + } + + GoTarget(); + break; + case 1: + DownBoots(); + if (!player_p->i_checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { + field_0x620 = field_0x5b8; + } + break; + case 2: + GoTarget(); + + if (C_CheckPoint()) { + if (field_0x662) { + SearchBackPos(); + } else { + SearchNextPos(); + } + + SetCheckAngle(); + } + + UpBoots(); + if (!player_p->i_checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { + field_0x620 = field_0x5b8; + } + break; + } + + cLib_chaseF(&mAnmSpeed, field_0x620, 0.06f); + FlyAnm(); } -#pragma pop /* 8073ED0C-8073ED58 0019AC 004C+00 2/2 0/0 0/0 .text SearchNextPos__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SearchNextPos() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchNextPos__8daE_PH_cFv.s" +void daE_PH_c::SearchNextPos() { + cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + + if (mCurrentPntNo + 1 >= mpPath->m_num) { + if (dPath_ChkClose(mpPath)) { + mCurrentPntNo = 0; + } else { + mCurrentPntNo--; + field_0x662 = 1; + } + } else { + mCurrentPntNo++; + } } -#pragma pop /* 8073ED58-8073EDA0 0019F8 0048+00 2/2 0/0 0/0 .text SearchBackPos__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SearchBackPos() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SearchBackPos__8daE_PH_cFv.s" -} -#pragma pop +void daE_PH_c::SearchBackPos() { + cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); -/* ############################################################################################## */ -/* 80741CAC-80741CB0 0000B8 0004+00 1/2 0/0 0/0 .rodata @4548 */ -SECTION_RODATA static f32 const lit_4548 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x80741CAC, &lit_4548); + if (mCurrentPntNo <= 0) { + if (dPath_ChkClose(mpPath)) { + mCurrentPntNo = mpPath->m_num; + } else { + mCurrentPntNo++; + field_0x662 = 0; + } + } else { + mCurrentPntNo--; + } +} /* 8073EDA0-8073EE68 001A40 00C8+00 1/1 0/0 0/0 .text S_SetPlaySpeed__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::S_SetPlaySpeed() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetPlaySpeed__8daE_PH_cFv.s" +void daE_PH_c::S_SetPlaySpeed() { + mHeadRotX += field_0x612; + + mSound.startCreatureSoundLevel(Z2SE_EN_PH_PROPELLER, field_0x612, -1); + + cLib_chaseF(&mAnmSpeed, field_0x620, yREG_F(8) + 0.3f); + cLib_chaseAngleS(&field_0x612, field_0x610 * field_0x620, 0x10); + mpMorf->setPlaySpeed(mAnmSpeed); } -#pragma pop - -/* ############################################################################################## */ -/* 80741CB0-80741CB4 0000BC 0004+00 0/1 0/0 0/0 .rodata @4642 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4642 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80741CB0, &lit_4642); -#pragma pop - -/* 80741CB4-80741CB8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4643 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4643 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80741CB4, &lit_4643); -#pragma pop /* 8073EE68-8073F250 001B08 03E8+00 1/1 0/0 0/0 .text S_GoTarget__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::S_GoTarget() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_GoTarget__8daE_PH_cFv.s" -} -#pragma pop +void daE_PH_c::S_GoTarget() { + cXyz unused(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); -/* ############################################################################################## */ -/* 80741CB8-80741CBC 0000C4 0004+00 0/3 0/0 0/0 .rodata @4688 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4688 = 200.0f; -COMPILER_STRIP_GATE(0x80741CB8, &lit_4688); -#pragma pop + if (mAcch.GetGroundH() != -1000000000.0f && current.pos.y < mAcch.GetGroundH() + 100.0f) { + current.pos.y = mAcch.GetGroundH() + 100.0f; + } + + cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + cLib_addCalc2(&speedF, mTargetSpeedF, 0.01f, 20.0f); + + int factor = current.pos.absXZ(target_pos) / speedF; + if (factor == 0) { + factor = 1; + } + + mTargetSpeedY = (target_pos.y - current.pos.y) / (f32)factor; + + if (field_0x654.x == target_pos.x && field_0x654.z == target_pos.z) { + int factor = (current.pos.abs(target_pos) / speedF); + f32 unused = factor; + mTargetSpeedY = (target_pos.y - current.pos.y) / factor; + } + + f32 prev_y = current.pos.y; + cLib_chasePos(¤t.pos, target_pos, speedF); + current.pos.y = prev_y; + + cLib_addCalc2(&speed.y, mTargetSpeedY, 0.05f, 10.0f); + cLib_chaseAngleS(&field_0x612, field_0x610 * mAnmSpeed, 0x10); + S_SetPlaySpeed(); +} /* 8073F250-8073F3D4 001EF0 0184+00 1/1 0/0 0/0 .text S_CheckPoint__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::S_CheckPoint() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_CheckPoint__8daE_PH_cFv.s" +bool daE_PH_c::S_CheckPoint() { + cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + + if (current.pos.abs(target_pos) < 200.0f && mStopTimer == 0) { + if (field_0x662) { + SearchBackPos(); + } else { + SearchNextPos(); + } + + return true; + } + + return false; } -#pragma pop /* 8073F3D4-8073F8C8 002074 04F4+00 2/2 0/0 0/0 .text S_SetAngle__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::S_SetAngle() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_SetAngle__8daE_PH_cFv.s" -} -#pragma pop +void daE_PH_c::S_SetAngle() { + cXyz sp30(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); -/* ############################################################################################## */ -/* 80741CBC-80741CC0 0000C8 0004+00 0/4 0/0 0/0 .rodata @4886 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4886 = 1000.0f; -COMPILER_STRIP_GATE(0x80741CBC, &lit_4886); -#pragma pop + field_0x654 = mCurrentPntPos; + mCurrentPntPos = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position; + + cXyz sp3C(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); + cXyz sp48(sp3C.x - sp30.x, sp3C.y - sp30.y, sp3C.z - sp30.z); + + field_0x61e = cM_atan2s(sp48.x, sp48.z); + + mTargetSpeedF = + (l_HIO.mSpeed + (f32)mMoveSpeed) * (1.5f - fabsf(cM_ssin(cM_atan2s(sp48.y, sp48.absXZ())))); + + if (sp30.x == sp3C.x && sp30.z == sp3C.z) { + mTargetSpeedF = l_HIO.mSpeed + (f32)mMoveSpeed; + } + + field_0x620 = cM_ssin(cM_atan2s(sp48.y, sp48.absXZ())) * 1.5f + 1.0f; + if (field_0x620 < 0.8f) { + field_0x620 = 0.8f; + } + + field_0x63c = sp30.abs(sp3C); + mStopTimer = l_HIO.mStopTime + (f32)mStopTimePrm; +} /* 8073F8C8-8073FB70 002568 02A8+00 1/1 0/0 0/0 .text FlyAnm2__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::FlyAnm2() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/FlyAnm2__8daE_PH_cFv.s" +void daE_PH_c::FlyAnm2() { + if (mAnmID == ANM_DAMAGE_ARROW || mAnmID == ANM_HANG_START || mAnmID == ANM_HANG_WAIT) { + if (mpMorf->isStop()) { + SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); + } + + mFlyRockEMKey = dComIfGp_particle_set(mFlyRockEMKey, 0x878C, ¤t.pos, &mTevStr, + &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); + mFlyTsubuEMKey = + dComIfGp_particle_set(mFlyTsubuEMKey, 0x878D, ¤t.pos, &mTevStr, &shape_angle, + NULL, 0xFF, NULL, -1, NULL, NULL, NULL); + } + + if (mAnmID == ANM_WAIT) { + if (fopAcM_searchPlayerDistance(this) < 1000.0f && + i_dComIfGp_checkPlayerStatus1(0, 0x10000)) + { + mAttentionInfo.mFlags = 0; + field_0x630 = -10.0f - BREG_F(0); + field_0x5ae = 15; + field_0x616 = 0x1000; + field_0x618 = 0x1000; + SetAnm(ANM_HANG_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); + } else if (fopAcM_checkHookCarryNow(this)) { + mAttentionInfo.mFlags = 0; + } else if (mAnmID != ANM_WAIT) { + SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); + } + } else if (mAnmID == ANM_HANG_WAIT) { + mAttentionInfo.mFlags = 0; + + if (!fopAcM_checkHookCarryNow(this) || !i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + SetAnm(ANM_HANG_END, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, mAnmSpeed); + } + } else if (mAnmID == ANM_HANG_END) { + if (mpMorf->isStop()) { + SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); + } + } } -#pragma pop /* 8073FB70-8073FBDC 002810 006C+00 1/1 0/0 0/0 .text S_Action__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::S_Action() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/S_Action__8daE_PH_cFv.s" -} -#pragma pop +void daE_PH_c::S_Action() { + if (S_CheckPoint()) { + S_SetAngle(); + } -/* ############################################################################################## */ -/* 80741CC0-80741CC4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4924 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4924 = 30.0f; -COMPILER_STRIP_GATE(0x80741CC0, &lit_4924); -#pragma pop + FlyAnm(); + + if (mStopTimer > 0) { + speed.y = 0.0f; + speedF = 0.0f; + } else { + S_GoTarget(); + } +} /* 8073FBDC-8073FD70 00287C 0194+00 1/1 0/0 0/0 .text StopAction__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::StopAction() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/StopAction__8daE_PH_cFv.s" +void daE_PH_c::StopAction() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + switch (mCAction) { + case 0: + if (mAnmID == ANM_HANG_WAIT || mAnmID == ANM_HANG_START) { + mHeadRotX += (s16)(field_0x612 + 0x1000); + } else { + mHeadRotX += (s16)(field_0x612 + 0x500); + } + + mSound.startCreatureSoundLevel(Z2SE_EN_PH_PROPELLER, field_0x612 + 0x500, -1); + + if (field_0x5ae == 0) { + cLib_addCalc2(¤t.pos.y, orig.pos.y, 0.1f, nREG_F(1) + 30.0f); + } + + if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + mCAction++; + field_0x640 = current.pos.y; + mAnmSpeed = nREG_F(0) + 6.0f; + field_0x620 = nREG_F(0) + 6.0f; + } + break; + case 1: + DownBoots(); + if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + mAnmSpeed = nREG_F(0) + 6.0f; + field_0x620 = nREG_F(0) + 6.0f; + } + break; + case 2: + UpBoots(); + + if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + mAnmSpeed = nREG_F(0) + 6.0f; + field_0x620 = nREG_F(0) + 6.0f; + } + break; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80741CC4-80741CC8 0000D0 0004+00 1/2 0/0 0/0 .rodata @4979 */ -SECTION_RODATA static f32 const lit_4979 = 2000.0f; -COMPILER_STRIP_GATE(0x80741CC4, &lit_4979); - -/* 80741CC8-80741CCC 0000D4 0004+00 1/1 0/0 0/0 .rodata @4980 */ -SECTION_RODATA static f32 const lit_4980 = 3000.0f; -COMPILER_STRIP_GATE(0x80741CC8, &lit_4980); - -/* 80741D0C-80741D0C 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80741D11 = "D_MN07A"; -#pragma pop /* 8073FD70-80740024 002A10 02B4+00 1/1 0/0 0/0 .text Action__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::Action() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Action__8daE_PH_cFv.s" +void daE_PH_c::Action() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + switch (mAction) { + case 1: + C_Action(); + fopAcM_posMoveF(this, mCcStts.GetCCMoveP()); + AttentionSet(); + + if (fopAcM_searchPlayerDistance(this) > 2000.0f || other_bg_check(this, player_p)) { + mAttentionInfo.mFlags = 0; + } + break; + case 2: + if (field_0x5b2) { + StopAction(); + + if (fopAcM_searchPlayerDistance(this) > 3000.0f || other_bg_check(this, player_p)) { + mAttentionInfo.mFlags = 0; + } + + cXyz* cc_move_p = mCcStts.GetCCMoveP(); + if (cc_move_p != NULL) { + current.pos.x += cc_move_p->x; + current.pos.y += cc_move_p->y; + current.pos.z += cc_move_p->z; + } + + FlyAnm2(); + AttentionSet(); + + if (strcmp(dComIfGp_getStartStageName(), "D_MN07A") == 0) { + if (mAnmID == ANM_HANG_START) { + dComIfGs_onZoneSwitch(0x18, fopAcM_GetRoomNo(this)); + } + + if (!dComIfGs_isSwitch(0x3F, fopAcM_GetRoomNo(this))) { + fopAcM_delete(this); + } + } + } else { + mAttentionInfo.mFlags = 0; + + if (dComIfGs_isSwitch(0x3F, fopAcM_GetRoomNo(this))) { + field_0x5b2 = 1; + } + } + + mCcSph.OnCoSetBit(); + break; + default: + if (fopAcM_searchPlayerDistance(this) > 2000.0f || other_bg_check(this, player_p)) { + mAttentionInfo.mFlags = 0; + } + + S_Action(); + + cXyz* cc_move_p = mCcStts.GetCCMoveP(); + if (cc_move_p != NULL) { + current.pos.x += cc_move_p->x; + current.pos.y += cc_move_p->y; + current.pos.z += cc_move_p->z; + } + + current.pos.y += speed.y; + AttentionSet(); + break; + } + + ObjHit(); + BaseSet(); + + mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mAcch.CrrPos(dComIfG_Bgsp()); } -#pragma pop /* 80740024-80740098 002CC4 0074+00 1/1 0/0 0/0 .text SetHeadAngle__8daE_PH_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::SetHeadAngle(s16 param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/SetHeadAngle__8daE_PH_cFs.s" +void daE_PH_c::SetHeadAngle(s16 i_targetAngle) { + cLib_addCalcAngleS2(&field_0x612, i_targetAngle, 0x10, 0x1000); + mHeadRotX += field_0x612; + + mSound.startCreatureSoundLevel(Z2SE_EN_PH_PROPELLER, field_0x612, -1); } -#pragma pop - -/* ############################################################################################## */ -/* 80741CCC-80741CD0 0000D8 0004+00 0/1 0/0 0/0 .rodata @5051 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5051 = -2638.0f; -COMPILER_STRIP_GATE(0x80741CCC, &lit_5051); -#pragma pop - -/* 80741CD0-80741CD4 0000DC 0004+00 0/1 0/0 0/0 .rodata @5052 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5052 = 2566.0f; -COMPILER_STRIP_GATE(0x80741CD0, &lit_5052); -#pragma pop - -/* 80741CD4-80741CD8 0000E0 0004+00 0/2 0/0 0/0 .rodata @5053 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5053 = 500.0f; -COMPILER_STRIP_GATE(0x80741CD4, &lit_5053); -#pragma pop - -/* 80741CD8-80741CDC 0000E4 0004+00 0/1 0/0 0/0 .rodata @5054 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5054 = 40.0f; -COMPILER_STRIP_GATE(0x80741CD8, &lit_5054); -#pragma pop - -/* 80741CDC-80741CE0 0000E8 0004+00 0/2 0/0 0/0 .rodata @5055 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5055 = -500.0f; -COMPILER_STRIP_GATE(0x80741CDC, &lit_5055); -#pragma pop /* 80740098-80740318 002D38 0280+00 1/1 0/0 0/0 .text CamAction__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::CamAction() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/CamAction__8daE_PH_cFv.s" +void daE_PH_c::CamAction() { + cXyz sp20(0.0f, 0.0f, 0.0f); + + mDoMtx_stack_c::copy(mpMorf->getModel()->i_getAnmMtx(2)); + mDoMtx_stack_c::multVec(&sp20, &sp20); + sp20.y += yREG_F(3); + + cXyz sp2C; + cXyz sp38; + + switch (mCamAction) { + case 0: + sp2C.set(-2638.0f, 0.0f, 2566.0f); + + if (dComIfGs_isSwitch(0x10, fopAcM_GetRoomNo(this))) { + SetStopCam(sp20, 500.0f, 100.0f, cLib_targetAngleY(¤t.pos, &sp2C)); + mCamAction++; + } + break; + case 1: + SetCMoveCam(sp20, 0.1f, 40.0f); + SetStopingCam(); + break; + case 2: + sp2C.set(0.0f, 0.0f, 0.0f); + SetStopCam(sp20, 2000.0f, 1000.0f, cLib_targetAngleY(&sp2C, ¤t.pos)); + mCamAction++; + break; + case 3: + SetCMoveCam(sp20, 0.1f, 40.0f); + SetStopingCam(); + + if (mTimers[0] == 0) { + mCamAction++; + } + break; + case 4: + mCamEye.set(0.0f, 200.0f, -500.0f); + mCamCenter.set(0.0f, 100.0f, 0.0f); + SetReleaseCam(); + + Z2GetAudioMgr()->bgmStart(Z2BGM_DRAGON_BTL02, 0, 0); + i_fopAcM_onSwitch(this, 0x3F); + break; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80741CE0-80741CE4 0000EC 0004+00 0/2 0/0 0/0 .rodata @5163 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5163 = 150.0f; -COMPILER_STRIP_GATE(0x80741CE0, &lit_5163); -#pragma pop - -/* 80741CE4-80741CE8 0000F0 0004+00 0/1 0/0 0/0 .rodata @5164 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5164 = 154.0f; -COMPILER_STRIP_GATE(0x80741CE4, &lit_5164); -#pragma pop - -/* 80741CE8-80741CEC 0000F4 0004+00 0/1 0/0 0/0 .rodata @5165 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5165 = 70.0f; -COMPILER_STRIP_GATE(0x80741CE8, &lit_5165); -#pragma pop - -/* 80741CEC-80741CF0 0000F8 0004+00 0/1 0/0 0/0 .rodata @5166 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5166 = 126.0f; -COMPILER_STRIP_GATE(0x80741CEC, &lit_5166); -#pragma pop - -/* 80741CF0-80741CF4 0000FC 0004+00 0/1 0/0 0/0 .rodata @5167 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5167 = -9.0f / 5.0f; -COMPILER_STRIP_GATE(0x80741CF0, &lit_5167); -#pragma pop - -/* 80741CF4-80741CF8 000100 0004+00 0/1 0/0 0/0 .rodata @5168 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5168 = 15.0f; -COMPILER_STRIP_GATE(0x80741CF4, &lit_5168); -#pragma pop - -/* 80741CF8-80741CFC 000104 0004+00 0/1 0/0 0/0 .rodata @5169 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5169 = 3.5f; -COMPILER_STRIP_GATE(0x80741CF8, &lit_5169); -#pragma pop /* 80740318-807408C0 002FB8 05A8+00 1/1 0/0 0/0 .text DemoAction__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::DemoAction() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/DemoAction__8daE_PH_cFv.s" -} -#pragma pop +void daE_PH_c::DemoAction() { + switch (mCAction) { + case 0: + if (dComIfGs_isSwitch(0x10, fopAcM_GetRoomNo(this))) { + mCAction++; + mAnmID = 100; + mTimers[0] = 50; -/* ############################################################################################## */ -/* 80741CFC-80741D00 000108 0004+00 0/1 0/0 0/0 .rodata @5218 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5218 = 2300.0f; -COMPILER_STRIP_GATE(0x80741CFC, &lit_5218); -#pragma pop + if (mAction == 4) { + mTimers[0] = cM_rndF(100.0f) + 150.0f; + } + } + + speed.y = 0.0f; + break; + case 1: + if (mTimers[0] == 0 && mAnmID != ANM_APPEAR) { + mpMorf->setPlaySpeed(1.0f); + mAnmID = ANM_APPEAR; + } + + if (mpMorf->checkFrame(154) && mAnmID == ANM_APPEAR) { + speed.y = yREG_F(0) + 70.0f; + mSound.startCreatureSound(Z2SE_EN_PH_APPEAR, 0, -1); + mCAction++; + } + + if (mpMorf->getFrame() > 126.0f && mAnmID == ANM_APPEAR) { + SetHeadAngle(0x2000); + } + break; + case 2: + speed.y += yREG_F(1) + -1.8f; + + if (mpMorf->isStop()) { + mCAction++; + mTimers[0] = 50; + SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f); + } + + if (speed.y <= 0.0f) { + SetHeadAngle(0x1000); + cLib_addCalcAngleS2(&field_0x612, 0x1000, 0x10, 0x1000); + cLib_addCalcAngleS2(&field_0x612, 0x1000, 0x10, 0x1000); + } else { + SetHeadAngle(0x2000); + } + break; + case 3: + cLib_addCalc2(&speed.y, 15.0f, yREG_F(6) + 0.3f, yREG_F(7) + 3.5f); + + if (mAction == 5) { + if (speed.y >= 0.0f) { + speed.y = 0.0f; + SetHeadAngle(0x1000); + cLib_addCalcAngleS2(&field_0x612, 0x1000, 0x10, 0x1000); + } else { + SetHeadAngle(0x1000); + cLib_addCalcAngleS2(&field_0x612, 0x1000, 0x10, 0x1000); + } + } else { + SetHeadAngle(0x1500); + } + + if (mTimers[0] == 0) { + mCAction++; + mCamAction++; + mTimers[0] = 300; + mTimers[1] = 360; + } + + mpMorf->setPlaySpeed(speed.y / 20.0f + 1.0f); + break; + case 4: + cLib_addCalc2(&speed.y, 15.0f, 0.1f, 0.5f); + + if (mAction == 5) { + if (mTimers[0] > 220) { + speed.y = 0.0f; + SetHeadAngle(0x1000); + cLib_addCalcAngleS2(&field_0x612, 0x1000, 0x10, 0x1000); + } else { + SetHeadAngle(0x1500); + } + } else { + SetHeadAngle(0x1500); + } + + mpMorf->setPlaySpeed(speed.y / 20.0f + 1.0f); + + if (mTimers[1] == 0 || !i_dComIfGp_event_runCheck()) { + fopAcM_delete(this); + } + break; + } + + cXyz* cc_move_p = mCcStts.GetCCMoveP(); + if (cc_move_p != NULL) { + current.pos.x += cc_move_p->x; + current.pos.y += cc_move_p->y; + current.pos.z += cc_move_p->z; + } + current.pos.y += speed.y; + + if (mAnmID == ANM_APPEAR) { + mDemoRockEMKey = + dComIfGp_particle_set(mDemoRockEMKey, 0x8C6F, ¤t.pos, &mTevStr, &shape_angle, + NULL, 0xFF, NULL, -1, NULL, NULL, NULL); + mDemoTsubuEMKey = + dComIfGp_particle_set(mDemoTsubuEMKey, 0x8C70, ¤t.pos, &mTevStr, &shape_angle, + NULL, 0xFF, NULL, -1, NULL, NULL, NULL); + mDemoRock2EMKey = + dComIfGp_particle_set(mDemoRock2EMKey, 0x8C71, ¤t.pos, &mTevStr, &shape_angle, + NULL, 0xFF, NULL, -1, NULL, NULL, NULL); + mDemoRock3EMKey = + dComIfGp_particle_set(mDemoRock3EMKey, 0x8C72, ¤t.pos, &mTevStr, &shape_angle, + NULL, 0xFF, NULL, -1, NULL, NULL, NULL); + } +} /* 807408C0-80740B3C 003560 027C+00 1/1 0/0 0/0 .text ToumeiAction__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::ToumeiAction() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ToumeiAction__8daE_PH_cFv.s" +void daE_PH_c::ToumeiAction() { + cXyz hs_offset; + + if (fopAcM_searchPlayerDistance(this) > XREG_F(1) + 2300.0f || + i_dComIfGp_checkPlayerStatus1(0, 0x10000)) + { + mAttentionInfo.mFlags = 0; + } + + if (mCcSph.ChkTgHit() && field_0x5ae == 0) { + mCcSph.ClrTgHit(); + field_0x5ae = 20; + mStopTimer = 300; + + dComIfGp_particle_set(0x878C, ¤t.pos, &mTevStr, &shape_angle, NULL); + dComIfGp_particle_set(0x878D, ¤t.pos, &mTevStr, &shape_angle, NULL); + dComIfGp_particle_set(0x878E, ¤t.pos, &mTevStr, &shape_angle, NULL); + + mSound.startCreatureSound(Z2SE_EN_PH_HIT, 0, -1); + } + + field_0x5ae--; + if (field_0x5ae <= 0) { + field_0x5ae = 0; + } else { + hs_offset.set(0.0f, l_HIO.mHangPos - 80.0f, 0.0f); + daPy_getPlayerActorClass()->setHookshotCarryOffset(fopAcM_GetID(this), &hs_offset); + } + + mStopTimer--; + if (mStopTimer <= 0) { + mStopTimer = 0; + } + + mCcSph.SetC(current.pos); + mCcSph.SetR(AREG_F(1) + 80.0f); + dComIfG_Ccsp()->Set(&mCcSph); } -#pragma pop /* 80740B3C-80740C3C 0037DC 0100+00 1/1 0/0 0/0 .text Execute__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::Execute() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Execute__8daE_PH_cFv.s" +int daE_PH_c::Execute() { + daPy_getPlayerActorClass(); + cXyz sp28; + + EyeSet(); + + switch (mAction) { + case 3: + ToumeiAction(); + break; + case 4: + case 5: + for (int i = 0; i < 3; i++) { + mTimers[i]--; + if (mTimers[i] <= 0) { + mTimers[i] = 0; + } + } + + De_Timer(); + DemoAction(); + + if (mAction == 5) { + CamAction(); + } + + mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + break; + default: + De_Timer(); + Action(); + break; + } + + setBaseMtx(); + + if (mAction != 3) { + setCcSph(); + } + + return 1; } -#pragma pop /* 80740C3C-80740E70 0038DC 0234+00 1/1 0/0 0/0 .text AttentionSet__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::AttentionSet() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/AttentionSet__8daE_PH_cFv.s" +void daE_PH_c::AttentionSet() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + cXyz sp38; + + if (mAnmID != ANM_HANG_START && mAnmID != ANM_HANG_WAIT && mAnmID != ANM_HANG_END) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN07A") == 0) { + mAttentionInfo.field_0x0[2] = 0x52; + } else { + mAttentionInfo.field_0x0[2] = 0x53; + } + + mAttentionInfo.mFlags = 4; + } else if (current.pos.absXZ(fopAcM_GetPosition(player_p)) > 1000.0f) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN07A") == 0) { + mAttentionInfo.field_0x0[2] = 0x52; + } else { + mAttentionInfo.field_0x0[2] = 0x53; + } + } else { + mAttentionInfo.field_0x0[2] = 0; + mAttentionInfo.mFlags = 0; + } + + if (player_p->checkDragonHangRide()) { + mAttentionInfo.field_0x0[2] = 0; + mAttentionInfo.mFlags = 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80741D00-80741D04 00010C 0004+00 0/1 0/0 0/0 .rodata @5359 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5359 = 2.0f; -COMPILER_STRIP_GATE(0x80741D00, &lit_5359); -#pragma pop - -/* 80741D04-80741D08 000110 0004+00 0/1 0/0 0/0 .rodata @5360 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5360 = -15.0f; -COMPILER_STRIP_GATE(0x80741D04, &lit_5360); -#pragma pop /* 80740E70-807410B0 003B10 0240+00 1/1 0/0 0/0 .text ObjHit__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::ObjHit() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/ObjHit__8daE_PH_cFv.s" +void daE_PH_c::ObjHit() { + f32 y = l_HIO.mHangPos; + y -= 80.0f; + + cM_ssin(shape_angle.x); + + cXyz hs_offset(0.0f, y + KREG_F(8), 0.0f); + + if (i_dComIfGp_checkPlayerStatus0(0, 0x4000)) { + mCcSph.OffTgShield(); + } else { + mCcSph.OnTgShield(); + } + + if (field_0x5ae > 0) { + daPy_getPlayerActorClass()->setHookshotCarryOffset(fopAcM_GetID(this), &hs_offset); + cLib_chaseAngleS(&shape_angle.x, 0, 0x100); + cLib_chaseF(&field_0x630, BREG_F(0) + 0.0f, 1.0f); + cLib_chaseF(&mAnmSpeed, yREG_F(10) + 2.0f, yREG_F(11) + 0.5f); + + current.pos.y += field_0x630; + mCcSph.ClrTgHit(); + } else { + mCcSph.OnTgSetBit(); + + if (mCcSph.ChkTgHit()) { + mAtInfo.mpCollider = mCcSph.GetTgHitObj(); + cCcD_Obj* hit_obj = mCcSph.GetTgHitObj(); + + field_0x630 = -15.0f - BREG_F(0); + field_0x5ae = 15; + field_0x616 = 0x1000; + field_0x618 = 0x1000; + + if (hit_obj->ChkAtType(AT_TYPE_HOOKSHOT)) { + field_0x616 = 0x1000; + field_0x618 = 0x1000; + SetAnm(ANM_HANG_START, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f); + } else { + SetAnm(ANM_DAMAGE_ARROW, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f); + } + + dComIfGp_particle_set(0x878E, ¤t.pos, &mTevStr, &shape_angle, NULL); + mSound.startCreatureSound(Z2SE_EN_PH_HIT, 0, -1); + mCcSph.OffTgSetBit(); + } + } } -#pragma pop /* 807410B0-8074117C 003D50 00CC+00 1/1 0/0 0/0 .text BaseSet__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::BaseSet() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/BaseSet__8daE_PH_cFv.s" +void daE_PH_c::BaseSet() { + cLib_chaseAngleS(&field_0x616, 0, 0x40); + field_0x61a += field_0x618; + + shape_angle.x = field_0x616 * cM_ssin(field_0x61a); + mHeadRotY = field_0x616 * cM_ssin(field_0x61a); } -#pragma pop /* 8074117C-807411C0 003E1C 0044+00 1/1 0/0 0/0 .text De_Timer__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::De_Timer() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/De_Timer__8daE_PH_cFv.s" -} -#pragma pop +void daE_PH_c::De_Timer() { + field_0x5ae--; + if (field_0x5ae <= 0) { + field_0x5ae = 0; + } -/* ############################################################################################## */ -/* 80741D08-80741D0C 000114 0004+00 1/1 0/0 0/0 .rodata @5389 */ -SECTION_RODATA static f32 const lit_5389 = 170.0f; -COMPILER_STRIP_GATE(0x80741D08, &lit_5389); + mStopTimer--; + if (mStopTimer < 0) { + mStopTimer = 0; + } +} /* 807411C0-80741200 003E60 0040+00 1/1 0/0 0/0 .text EyeSet__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::EyeSet() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/EyeSet__8daE_PH_cFv.s" +void daE_PH_c::EyeSet() { + mEyePos = current.pos; + mEyePos.y += TREG_F(2); + + mAttentionInfo.mPosition.x = current.pos.x; + mAttentionInfo.mPosition.z = current.pos.z; + mAttentionInfo.mPosition.y = current.pos.y + 170.0f + TREG_F(1); } -#pragma pop /* 80741200-80741268 003EA0 0068+00 1/1 0/0 0/0 .text Delete__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::Delete() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/Delete__8daE_PH_cFv.s" +int daE_PH_c::Delete() { + dComIfG_resDelete(&mPhase, "E_PH"); + if (mInitializedHIO) { + initialized = 0; + } + + if (mHeap != NULL) { + mpMorf->stopZelAnime(); + } + + return 1; } -#pragma pop /* 80741268-807412E8 003F08 0080+00 1/1 0/0 0/0 .text setBaseMtx__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/setBaseMtx__8daE_PH_cFv.s" +void daE_PH_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_stack_c::XrotM(shape_angle.x); + mDoMtx_stack_c::ZrotM(shape_angle.z); + + mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpMorf->modelCalc(); +} + +int daE_PH_c::Draw() { + J3DModel* model = mpMorf->getModel(); + + if (mAction != 3) { + if (field_0x5b2) { + cXyz sp28; + sp28.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(model, &mTevStr); + mpMorf->entryDL(); + + mShadowKey = dComIfGd_setShadow(mShadowKey, 0, model, &sp28, BREG_F(16) + 1000.0f, + BREG_F(17) + 100.0f, current.pos.y, mAcch.GetGroundH(), + mAcch.m_gnd, &mTevStr, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); + } + } else { + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(model, &mTevStr); + } + + return 1; } -#pragma pop /* 807412E8-80741408 003F88 0120+00 1/0 0/0 0/0 .text daE_PH_Draw__FP8daE_PH_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_PH_Draw(daE_PH_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Draw__FP8daE_PH_c.s" +static int daE_PH_Draw(daE_PH_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 80741408-80741428 0040A8 0020+00 2/1 0/0 0/0 .text daE_PH_Execute__FP8daE_PH_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_PH_Execute(daE_PH_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/daE_PH_Execute__FP8daE_PH_c.s" +static int daE_PH_Execute(daE_PH_c* i_this) { + return i_this->Execute(); } -#pragma pop /* 80741428-80741A44 0040C8 061C+00 1/1 0/0 0/0 .text create__8daE_PH_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_PH_c::create() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/create__8daE_PH_cFv.s" -} -#pragma pop +int daE_PH_c::create() { + fopAcM_SetupActor(this, daE_PH_c); -/* 80741A44-80741A8C 0046E4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGSph::~cM3dGSph() { -extern "C" asm void __dt__8cM3dGSphFv() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGSphFv.s" -} -#pragma pop + int phase_state = dComIfG_resLoad(&mPhase, "E_PH"); + if (phase_state == cPhs_COMPLEATE_e) { + mAction = fopAcM_GetParam(this) & 0xF; -/* 80741A8C-80741AD4 00472C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__8cM3dGAabFv.s" -} -#pragma pop + if (dComIfGs_isZoneSwitch(2, fopAcM_GetRoomNo(this)) && mAction == 4) { + return cPhs_ERROR_e; + } -/* 80741AD4-80741B44 004774 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12dBgS_ObjAcchFv.s" + if (dComIfGs_isZoneSwitch(2, fopAcM_GetRoomNo(this)) && mAction == 5) { + return cPhs_ERROR_e; + } + + OS_REPORT("E_PH PARAM %x\n", fopAcM_GetParam(this)); + + if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x11E0)) { + return cPhs_ERROR_e; + } + + mGravity = 0.0f; + + field_0x5b4 = (fopAcM_GetParam(this) >> 4) & 0xF; + if (field_0x5b4 == 0 || field_0x5b4 == 15) { + field_0x5b4 = 70; + } + + if (mAction != 3 && mAction != 2 && mAction != 4) { + mPathNo = fopAcM_GetParam(this) >> 8; + mpPath = dPath_GetRoomPath(mPathNo, fopAcM_GetRoomNo(this)); + } + + mMoveSpeed = fopAcM_GetParam(this) >> 0x10; + mStopTimePrm = fopAcM_GetParam(this) >> 0x18; + + if (mMoveSpeed == 0xFF) { + mMoveSpeed = 0; + } + + if (mStopTimePrm == 0xFF) { + mStopTimePrm = 0; + } + + fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + mAcchCir.SetWall(100.0f, 100.0f); + + if (!initialized) { + initialized = 1; + mInitializedHIO = 1; + l_HIO.field_0x4 = -1; + } + + fopAcM_setCullSizeFar(this, 3.0f); + fopAcM_setCullSizeBox(this, -500.0f, -500.0f, -500.0f, 500.0f, 500.0f, 500.0f); + + mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + &fopAcM_GetSpeed_p(this), NULL, NULL); + + mAttentionInfo.mFlags = 4; + mAttentionInfo.field_0x0[2] = 0x22; + + cXyz sp3C(current.pos.x, current.pos.y + 200.0f, current.pos.z); + mSound.init(¤t.pos, &sp3C, 3, 1); + mAtInfo.mpSound = &mSound; + + J3DModel* model = mpMorf->getModel(); + model->setUserArea((u32)this); + + for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) { + if (i != 0) { + model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack); + } + } + + field_0x610 = 0x1000; + field_0x612 = 0x500; + mAnmSpeed = 1.0f; + + initCcSph(); + + mSound.setEnemyName("E_PH"); + + speedF = 10.0f; + field_0x5b2 = 1; + + if (mAction == 3) { + mCcSph.OffTgShield(); + mCcSph.OnTgNoHitMark(); + + mAttentionInfo.field_0x0[2] = 0; + mAttentionInfo.mFlags = 0; + + cXyz sp48(current.pos.x, current.pos.y, current.pos.z); + mAttentionInfo.mPosition.x = current.pos.x; + mAttentionInfo.mPosition.z = current.pos.z; + mAttentionInfo.mPosition.y = current.pos.y + 150.0f + TREG_F(1); + } else if (mAction == 2 || mAction == 4 || mAction == 5) { + speedF = 0.0f; + mAttentionInfo.mFlags = 0; + } else { + SearchNearP(); + } + + if (mAction == 5) { + dCamera_c* camera_p = dCam_getBody(); + mCamFovY = camera_p->Fovy(); + + mCamCenter = camera_p->Center(); + mCamCenterTarget = mCamCenter; + + mCamEye = camera_p->Eye(); + mCamEyeTarget = mCamEye; + } + + if (mAction == 4 || mAction == 5) { + mpMorf->setPlaySpeed(0.0f); + SetAnm(ANM_APPEAR, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 0.0f); + mAnmID = ANM_WAIT; + } + + if (strcmp(dComIfGp_getStartStageName(), "D_MN07A") == 0 && mAction == 2) { + if (!dComIfGs_isZoneSwitch(2, fopAcM_GetRoomNo(this))) { + field_0x5b2 = 0; + i_fopAcM_offSwitch(this, 0x10); + i_fopAcM_offSwitch(this, 0x3F); + } + } + + l_HIO.mSpeed = mMoveSpeed; + mCamAction = 0; + fopAcM_OnStatus(this, 0x4000); + daE_PH_Execute(this); + } + + return phase_state; } -#pragma pop /* 80741B44-80741B4C 0047E4 0008+00 1/0 0/0 0/0 .text daE_PH_IsDelete__FP8daE_PH_c */ -static bool daE_PH_IsDelete(daE_PH_c* param_0) { - return true; +static int daE_PH_IsDelete(daE_PH_c* i_this) { + return 1; } -/* 80741B4C-80741B94 0047EC 0048+00 2/1 0/0 0/0 .text __dt__12daE_PH_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daE_PH_HIO_c::~daE_PH_HIO_c() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__dt__12daE_PH_HIO_cFv.s" -} -#pragma pop +/* 80741D1C-80741D3C -00001 0020+00 1/0 0/0 0/0 .data l_daE_PH_Method */ +static actor_method_class l_daE_PH_Method = { + (process_method_func)daE_PH_Create, (process_method_func)daE_PH_Delete, + (process_method_func)daE_PH_Execute, (process_method_func)daE_PH_IsDelete, + (process_method_func)daE_PH_Draw, +}; -/* 80741B94-80741BD0 004834 003C+00 0/0 1/0 0/0 .text __sinit_d_a_e_ph_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_e_ph_cpp() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/__sinit_d_a_e_ph_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80741B94, __sinit_d_a_e_ph_cpp); -#pragma pop - -/* 80741BD0-80741BD8 004870 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80741BD0() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD0.s" -} -#pragma pop - -/* 80741BD8-80741BE0 004878 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80741BD8() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_ph/d_a_e_ph/func_80741BD8.s" -} -#pragma pop - -/* 80741D0C-80741D0C 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80741D3C-80741D6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_PH */ +extern actor_process_profile_definition g_profile_E_PH = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_E_PH, + &g_fpcLf_Method.mBase, + sizeof(daE_PH_c), + 0, + 0, + &g_fopAc_Method.base, + 131, + &l_daE_PH_Method, + 0x244100, + fopAc_ENEMY_e, + fopAc_CULLBOX_CUSTOM_e, +}; \ No newline at end of file diff --git a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp index a140da8fb3b..0b9446db6e7 100644 --- a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp +++ b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp @@ -1,214 +1,119 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_e_yd_leaf -// +/** + * d_a_e_yd_leaf.cpp + * + */ #include "rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_McaMorf { - /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, - int, void*, u32, u32); - /* 80010680 */ void entryDL(); - /* 800106AC */ void modelCalc(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct e_yd_leaf_class {}; - -struct dKy_tevstr_c {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -// -// Forward References: -// - -extern "C" static void daE_YD_LEAF_Draw__FP15e_yd_leaf_class(); -extern "C" static void daE_YD_LEAF_Execute__FP15e_yd_leaf_class(); -extern "C" static bool daE_YD_LEAF_IsDelete__FP15e_yd_leaf_class(); -extern "C" static void daE_YD_LEAF_Delete__FP15e_yd_leaf_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daE_YD_LEAF_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_e_yd_leaf__stringBase0; -extern "C" extern void* g_profile_E_YD_LEAF[12]; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void -__ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl(); -extern "C" void entryDL__14mDoExt_McaMorfFv(); -extern "C" void modelCalc__14mDoExt_McaMorfFv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -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 cLib_addCalc0__FPfff(); -extern "C" void* __nw__FUl(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; - -// -// Declarations: -// +#include "d/com/d_com_inf_game.h" /* 807F7E18-807F7EC0 000078 00A8+00 1/0 0/0 0/0 .text daE_YD_LEAF_Draw__FP15e_yd_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YD_LEAF_Draw(e_yd_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Draw__FP15e_yd_leaf_class.s" +static int daE_YD_LEAF_Draw(e_yd_leaf_class* i_this) { + g_env_light.settingTevStruct(2, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(), &i_this->mTevStr); + + dComIfGd_setListDark(); + i_this->mpMorf->entryDL(); + dComIfGd_setList(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 807F81E8-807F81EC 000000 0004+00 3/3 0/0 0/0 .rodata @3707 */ -SECTION_RODATA static f32 const lit_3707 = 1.0f; -COMPILER_STRIP_GATE(0x807F81E8, &lit_3707); - -/* 807F81EC-807F81F0 000004 0004+00 0/1 0/0 0/0 .rodata @3708 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3708 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(0x807F81EC, &lit_3708); -#pragma pop - -/* 807F81F0-807F81F4 000008 0004+00 0/1 0/0 0/0 .rodata @3709 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3709 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x807F81F0, &lit_3709); -#pragma pop /* 807F7EC0-807F7FEC 000120 012C+00 2/1 0/0 0/0 .text daE_YD_LEAF_Execute__FP15e_yd_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YD_LEAF_Execute(e_yd_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Execute__FP15e_yd_leaf_class.s" +static int daE_YD_LEAF_Execute(e_yd_leaf_class* i_this) { + if (i_this->field_0x5ba == 0) { + stage_stag_info_class* pstag = i_dComIfGp_getStage()->getStagInfo(); + if (dStage_stagInfo_GetSTType(pstag) != ST_FIELD && + fopAcM_SearchByID(i_this->mParentPcId) == NULL) + { + i_this->field_0x5ba = 1; + } + } else { + cLib_addCalc0(&i_this->mScale.y, 1.0f, 0.08f); + + if (i_this->mScale.y <= 0.01f) { + fopAcM_delete(i_this); + } + } + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::XrotM(i_this->shape_angle.x); + mDoMtx_stack_c::scaleM(i_this->mScale.y, i_this->mScale.y, i_this->mScale.y); + i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpMorf->modelCalc(); + return 1; } -#pragma pop /* 807F7FEC-807F7FF4 00024C 0008+00 1/0 0/0 0/0 .text daE_YD_LEAF_IsDelete__FP15e_yd_leaf_class */ -static bool daE_YD_LEAF_IsDelete(e_yd_leaf_class* param_0) { - return true; +static int daE_YD_LEAF_IsDelete(e_yd_leaf_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 807F81F4-807F81F4 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_807F81F4 = "E_YD"; -#pragma pop - /* 807F7FF4-807F8024 000254 0030+00 1/0 0/0 0/0 .text daE_YD_LEAF_Delete__FP15e_yd_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YD_LEAF_Delete(e_yd_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Delete__FP15e_yd_leaf_class.s" +static int daE_YD_LEAF_Delete(e_yd_leaf_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "E_YD"); + return 1; } -#pragma pop /* 807F8024-807F8124 000284 0100+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + e_yd_leaf_class* a_this = static_cast(i_this); + + a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_YD", 0x19), NULL, + NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YD", 0x14), + 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); + if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { + return 0; + } + + return 1; } -#pragma pop /* 807F8124-807F81E0 000384 00BC+00 1/0 0/0 0/0 .text daE_YD_LEAF_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YD_LEAF_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf/daE_YD_LEAF_Create__FP10fopAc_ac_c.s" -} -#pragma pop +static int daE_YD_LEAF_Create(fopAc_ac_c* i_this) { + e_yd_leaf_class* a_this = static_cast(i_this); + fopAcM_SetupActor(a_this, e_yd_leaf_class); + + int phase_state = dComIfG_resLoad(&a_this->mPhase, "E_YD"); + if (phase_state == cPhs_COMPLEATE_e) { + OS_REPORT("E_YD_LEAF//////////////E_YD_LEAF SET 1 !!\n"); + + if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0xA80)) { + OS_REPORT("//////////////E_YD_LEAF SET NON !!\n"); + return cPhs_ERROR_e; + } + + OS_REPORT("//////////////E_YD_LEAF SET 2 !!\n"); + + fopAcM_SetMtx(a_this, a_this->mpMorf->getModel()->getBaseTRMtx()); + a_this->mScale.y = 1.0f; + daE_YD_LEAF_Execute(a_this); + } + + return phase_state; +} -/* ############################################################################################## */ /* 807F81FC-807F821C -00001 0020+00 1/0 0/0 0/0 .data l_daE_YD_LEAF_Method */ -SECTION_DATA static void* l_daE_YD_LEAF_Method[8] = { - (void*)daE_YD_LEAF_Create__FP10fopAc_ac_c, - (void*)daE_YD_LEAF_Delete__FP15e_yd_leaf_class, - (void*)daE_YD_LEAF_Execute__FP15e_yd_leaf_class, - (void*)daE_YD_LEAF_IsDelete__FP15e_yd_leaf_class, - (void*)daE_YD_LEAF_Draw__FP15e_yd_leaf_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daE_YD_LEAF_Method = { + (process_method_func)daE_YD_LEAF_Create, (process_method_func)daE_YD_LEAF_Delete, + (process_method_func)daE_YD_LEAF_Execute, (process_method_func)daE_YD_LEAF_IsDelete, + (process_method_func)daE_YD_LEAF_Draw, }; /* 807F821C-807F824C -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_YD_LEAF */ -SECTION_DATA extern void* g_profile_E_YD_LEAF[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01CE0000, (void*)&g_fpcLf_Method, - (void*)0x000005C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00910000, (void*)&l_daE_YD_LEAF_Method, - (void*)0x00040000, (void*)NULL, +extern actor_process_profile_definition g_profile_E_YD_LEAF = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_E_YD_LEAF, + &g_fpcLf_Method.mBase, + sizeof(e_yd_leaf_class), + 0, + 0, + &g_fopAc_Method.base, + 145, + &l_daE_YD_LEAF_Method, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; - -/* 807F81F4-807F81F4 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp index 63b2f86da3a..34a3d45ed18 100644 --- a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp +++ b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp @@ -53,7 +53,7 @@ int daTagSpring_c::execute() { if (checkArea() && fopAcM_wt_c::waterCheck(&player_p->current.pos) && (!i_dComIfGp_checkPlayerStatus0(0, 0x100000) && - fopAcM_wt_c::mWaterY[0] > player_p->current.pos.y || + fopAcM_wt_c::mWaterY > player_p->current.pos.y || i_dComIfGp_checkPlayerStatus0(0, 0x100000))) { if (mTimer != 0) { diff --git a/src/d/a/d_a_no_chg_room.cpp b/src/d/a/d_a_no_chg_room.cpp index 164cbad4540..28681c91d9b 100644 --- a/src/d/a/d_a_no_chg_room.cpp +++ b/src/d/a/d_a_no_chg_room.cpp @@ -98,10 +98,6 @@ int daNocrm_c::execute() { return 1; } -inline int fopAcM_gc_c::getRoomId() { - return dComIfG_Bgsp().GetRoomId(*(dBgS_GndChk*)mGndCheck); -} - /* 80145508-801455A8 13FE48 00A0+00 1/1 0/0 0/0 .text getRoomNo__9daNocrm_cFi */ int daNocrm_c::getRoomNo(int param_0) { if (mRoomNo[param_0] < 0) { diff --git a/src/d/a/d_a_obj.cpp b/src/d/a/d_a_obj.cpp index 3804ea5c24e..3c0d4c816f2 100644 --- a/src/d/a/d_a_obj.cpp +++ b/src/d/a/d_a_obj.cpp @@ -1,330 +1,227 @@ -// -// Generated By: dol2asm -// Translation Unit: d/a/d_a_obj -// +/** + * d_a_obj.cpp + * + */ #include "d/a/d_a_obj.h" -#include "dol2asm.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" -// -// Forward References: -// - -extern "C" void eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi(); -extern "C" void make_eff_break_kotubo__5daObjFP10fopAc_ac_c(); -extern "C" void make_eff_break_kotubo2__5daObjFP10fopAc_ac_c(); -extern "C" void make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c(); -extern "C" void make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c(); -extern "C" void posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff(); -extern "C" static void func_800373F0(); -extern "C" static void func_800374EC(); -extern "C" void posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz(); -extern "C" void quat_rotBaseY__5daObjFP10QuaternionRC4cXyz(); -extern "C" void HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl(); -extern "C" void GetCoCP__12cCcD_CylAttrFv(); -extern "C" void GetCoCP__12cCcD_SphAttrFv(); -extern "C" extern char const* const d_a_d_a_obj__stringBase0; - -// -// External References: -// - -extern "C" void __dt__4cXyzFv(); -extern "C" void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void GetAc__22dCcD_GAtTgCoCommonBaseFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObjSe__12dCcD_GObjInfFv(); -extern "C" void checkMasterSwordEquip__9daPy_py_cFv(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __ml__4cXyzCFf(); -extern "C" void __dv__4cXyzCFf(); -extern "C" void outprod__4cXyzCFRC3Vec(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM3d_CrawVec__FRC3VecRC3VecP3Vec(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __register_global_object(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" u8 mTsubo__13dPa_control_c[64]; -extern "C" f32 Zero__4cXyz[3]; -extern "C" u8 BaseY__4cXyz[12]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450DF0[8]; -extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803792A8-803792A8 005908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803792A8 = "Always"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803792AF = ""; -#pragma pop - -/* 80451D98-80451D9C 000398 0004+00 6/6 0/0 0/0 .sdata2 @3671 */ -SECTION_SDATA2 static f32 lit_3671 = 1.0f; +namespace daObj { /* 80037038-80037180 031978 0148+00 4/4 0/0 0/0 .text eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi */ -#ifdef NONMATCHING -// Matches with literals -void daObj::eff_break_tsubo(fopAc_ac_c* param_0, cXyz param_1, int param_2) { +void eff_break_tsubo(fopAc_ac_c* i_actor, cXyz i_scale, int i_type) { J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20); J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42); - s32 roomNo = fopAcM_GetRoomNo(param_0); + s32 roomNo = fopAcM_GetRoomNo(i_actor); - // not sure what's up with mEcallback. Probably the argument type for dComIfGp_particle_set is wrong. - JPABaseEmitter* emitter = (JPABaseEmitter*)dComIfGp_particle_set( - 0x15C, ¶m_0->current.pos, NULL, NULL, 0xFF, (dPa_modelEcallBack*)&dPa_modelEcallBack::mEcallback, - roomNo, NULL, NULL, ¶m_1); + JPABaseEmitter* emitter = dComIfGp_particle_set( + dPa_name::ZI_J_M_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF, + (dPa_modelEcallBack*)&dPa_modelEcallBack::mEcallback, roomNo, NULL, NULL, &i_scale); - dPa_modelEcallBack::setModel(emitter, tubo_bmd, param_0->mTevStr, 3, tubo_btp, 0, param_2); + dPa_modelEcallBack::setModel(emitter, tubo_bmd, i_actor->mTevStr, 3, tubo_btp, 0, i_type); - s32 roomNo2 = fopAcM_GetRoomNo(param_0); - dComIfGp_particle_set(0x15D, ¶m_0->current.pos, NULL, NULL, 0xFF, - dPa_control_c::getTsuboSelectTexEcallBack(param_2), - roomNo2, NULL, NULL, ¶m_1); + s32 roomNo2 = fopAcM_GetRoomNo(i_actor); + dComIfGp_particle_set(dPa_name::ZI_J_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF, + dPa_control_c::getTsuboSelectTexEcallBack(i_type), roomNo2, NULL, NULL, + &i_scale); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj::eff_break_tsubo(fopAc_ac_c* param_0, cXyz param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_obj/eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 804245E8-804245F4 051308 000C+00 1/1 0/0 0/0 .bss @3677 */ -static u8 lit_3677[12]; - -/* 804245F4-80424600 051314 000C+00 1/1 0/0 0/0 .bss scale$3676 */ -static f32 scale_3676[3]; /* 80037180-80037210 031AC0 0090+00 0/0 0/0 2/2 .text make_eff_break_kotubo__5daObjFP10fopAc_ac_c */ -// matches with literals -#ifdef NONMATCHING -void daObj::make_eff_break_kotubo(fopAc_ac_c* param_0) { +void make_eff_break_kotubo(fopAc_ac_c* i_actor) { static cXyz scale(1.0f, 1.0f, 1.0f); - eff_break_tsubo(param_0, scale, 0); + eff_break_tsubo(i_actor, scale, 0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj::make_eff_break_kotubo(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_obj/make_eff_break_kotubo__5daObjFP10fopAc_ac_c.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80424600-8042460C 051320 000C+00 1/1 0/0 0/0 .bss @3692 */ -static u8 lit_3692[12]; - -/* 8042460C-80424618 05132C 000C+00 1/1 0/0 0/0 .bss scale$3691 */ -static f32 scale_3691[3]; /* 80037210-800372A0 031B50 0090+00 0/0 0/0 2/2 .text make_eff_break_kotubo2__5daObjFP10fopAc_ac_c */ -// matches with literals -#ifdef NONMATCHING -void daObj::make_eff_break_kotubo2(fopAc_ac_c* param_0) { +void make_eff_break_kotubo2(fopAc_ac_c* i_actor) { static cXyz scale(1.0f, 1.0f, 1.0f); - eff_break_tsubo(param_0, scale, 1); + eff_break_tsubo(i_actor, scale, 1); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj::make_eff_break_kotubo2(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_obj/make_eff_break_kotubo2__5daObjFP10fopAc_ac_c.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80424618-80424624 051338 000C+00 1/1 0/0 0/0 .bss @3719 */ -static u8 lit_3719[12]; - -/* 80424624-80424630 051344 000C+00 1/1 0/0 0/0 .bss scale$3718 */ -static f32 scale_3718[3]; /* 800372A0-80037330 031BE0 0090+00 0/0 0/0 1/1 .text * make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c */ -// matches with literals -#ifdef NONMATCHING -void daObj::make_eff_break_gm_kotubo(fopAc_ac_c* param_0) { +void make_eff_break_gm_kotubo(fopAc_ac_c* i_actor) { static cXyz scale(1.0f, 1.0f, 1.0f); - eff_break_tsubo(param_0, scale, 3); + eff_break_tsubo(i_actor, scale, 3); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj::make_eff_break_gm_kotubo(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_obj/make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80424630-8042463C 051350 000C+00 1/1 0/0 0/0 .bss @3732 */ -static u8 lit_3732[12]; - -/* 8042463C-80424648 05135C 000C+00 1/1 0/0 0/0 .bss scale$3731 */ -static f32 scale_3731[3]; - -/* 80451D9C-80451DA0 00039C 0004+00 1/1 0/0 0/0 .sdata2 @3714 */ -SECTION_SDATA2 static f32 lit_3714 = 2.0f; /* 80037330-800373C0 031C70 0090+00 0/0 0/0 1/1 .text * make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c */ -// matches with literals -#ifdef NONMATCHING -void daObj::make_eff_break_gm_ootubo(fopAc_ac_c* param_0) { +void make_eff_break_gm_ootubo(fopAc_ac_c* i_actor) { static cXyz scale(2.0f, 2.0f, 2.0f); - eff_break_tsubo(param_0, scale, 4); + eff_break_tsubo(i_actor, scale, 4); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj::make_eff_break_gm_ootubo(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_obj/make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80451DA0-80451DA4 0003A0 0004+00 4/4 0/0 0/0 .sdata2 @3801 */ -SECTION_SDATA2 static u8 lit_3801[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; /* 800373C0-800373F0 031D00 0030+00 0/0 0/0 4/4 .text * posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj::posMoveF_stream(fopAc_ac_c* param_0, cXyz const* param_1, cXyz const* param_2, - f32 param_3, f32 param_4) { - nofralloc -#include "asm/d/a/d_a_obj/posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff.s" +void posMoveF_stream(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* param_2, f32 param_3, + f32 param_4) { + posMoveF_grade(i_actor, param_1, param_2, param_3, param_4, NULL, 0.0f, 0.0f, NULL); } -#pragma pop - -/* ############################################################################################## */ -/* 80451DA4-80451DA8 0003A4 0004+00 2/2 0/0 0/0 .sdata2 @3836 */ -SECTION_SDATA2 static f32 lit_3836 = -1.0f; /* 800373F0-800374EC 031D30 00FC+00 1/1 0/0 0/0 .text * posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800373F0() { - nofralloc -#include "asm/d/a/d_a_obj/func_800373F0.s" + +namespace { +void posMoveF_resist_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* stream_spd, f32 param_3, + f32 param_4) { + const cXyz sp20 = i_actor->speed - *stream_spd; + cXyz sp14(sp20.x * param_3, sp20.y * param_3, sp20.z * param_3); + + sp14.x += param_4 * (sp20.x * fabsf(sp20.x)); + sp14.y += param_4 * (sp20.y * fabsf(sp20.y)); + sp14.z += param_4 * (sp20.z * fabsf(sp20.z)); + + sp14 *= -1.0f; + pos->set(sp14); } -#pragma pop /* 800374EC-80037620 031E2C 0134+00 1/1 0/0 0/0 .text * posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800374EC() { - nofralloc -#include "asm/d/a/d_a_obj/func_800374EC.s" +void posMoveF_grade_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* param_2, f32 friction, + f32 no_grade_cos, const cXyz* param_5, const cXyz* param_6) { + pos->set(cXyz::Zero); + + if (param_2 != NULL) { + cXyz sp28(*param_5); + sp28.y += i_actor->mGravity; + + if (param_6 != NULL) { + sp28 += *param_6; + } + + if (sp28.inprod(*param_2) < 0.0f) { + if (param_2->y <= no_grade_cos) { + cXyz sp34; + cM3d_CrawVec(*param_2, sp28, &sp34); + *pos += sp34; + } + + cXyz sp40; + cM3d_CrawVec(*param_2, i_actor->speed, &sp40); + *pos -= sp40 * friction; + } + } } -#pragma pop +} // namespace /* 80037620-80037788 031F60 0168+00 1/1 0/0 0/0 .text * posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj::posMoveF_grade(fopAc_ac_c* param_0, cXyz const* param_1, cXyz const* param_2, - f32 param_3, f32 param_4, cXyz const* param_5, f32 param_6, - f32 param_7, cXyz const* param_8) { - nofralloc -#include "asm/d/a/d_a_obj/posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz.s" +void posMoveF_grade(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* stream_spd, f32 param_3, + f32 param_4, cXyz const* param_5, f32 friction, f32 no_grade_cos, + cXyz const* param_8) { + JUT_ASSERT(stream_spd != 0); + + cXyz spAC; + posMoveF_resist_acc(&spAC, i_actor, stream_spd, param_3, param_4); + + JUT_ASSERT((friction >= 0.0f) && (friction < 1.0f) && (no_grade_cos >= 0.0f) && + (no_grade_cos <= 1.0f)); + + cXyz spB8; + posMoveF_grade_acc(&spB8, i_actor, param_5, friction, no_grade_cos, &spAC, param_8); + + f32 speedF = fopAcM_GetSpeedF(i_actor); + f32 gravity = fopAcM_GetGravity(i_actor); + cXyz& speed_p = fopAcM_GetSpeed_p(i_actor); + + f32 speed_x = spB8.x + (spAC.x + (speedF * cM_ssin(i_actor->current.angle.y))); + f32 speed_y = spB8.y + (spAC.y + (speed_p.y + gravity)); + f32 speed_z = spB8.z + (spAC.z + (speedF * cM_scos(i_actor->current.angle.y))); + + if (param_8 != NULL) { + speed_x += param_8->x; + speed_y += param_8->y; + speed_z += param_8->z; + } + + if (speed_y < fopAcM_GetMaxFallSpeed(i_actor)) { + speed_y = fopAcM_GetMaxFallSpeed(i_actor); + } + + fopAcM_SetSpeed(i_actor, speed_x, speed_y, speed_z); + fopAcM_SetSpeedF(i_actor, JMAFastSqrt((speed_x * speed_x) + (speed_z * speed_z))); + i_actor->current.angle.y = cM_atan2s(speed_x, speed_z); + fopAcM_posMove(i_actor, param_1); } -#pragma pop - -/* ############################################################################################## */ -/* 80379298-803792A8 0058F8 0010+00 1/1 0/0 0/0 .rodata zero_quat$3920 */ -SECTION_RODATA static f32 const zero_quat[4] = { - 0.0f, - 0.0f, - 0.0f, - 1.0f, -}; -COMPILER_STRIP_GATE(0x80379298, &zero_quat); - -/* 80451DA8-80451DB0 0003A8 0004+04 1/1 0/0 0/0 .sdata2 @3956 */ -SECTION_SDATA2 static f32 lit_3956[1 + 1 /* padding */] = { - 9.99999905104687e-09f, - /* padding */ - 0.0f, -}; /* 80037788-80037900 0320C8 0178+00 0/0 0/0 1/1 .text quat_rotBaseY__5daObjFP10QuaternionRC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj::quat_rotBaseY(Quaternion* param_0, cXyz const& param_1) { - nofralloc -#include "asm/d/a/d_a_obj/quat_rotBaseY__5daObjFP10QuaternionRC4cXyz.s" +void quat_rotBaseY(Quaternion* quat, cXyz const& param_1) { + static const Quaternion zero_quat = {0.0f, 0.0f, 0.0f, 1.0f}; + + f32 var_f31 = param_1.abs2(); + if (var_f31 > 9.999999E-9f) { + cXyz sp4C = cXyz::BaseY.outprod(param_1); + + f32 var_f30 = sp4C.abs2(); + if (var_f30 > 9.999999E-9f) { + cXyz sp58 = param_1 / var_f31; + f32 var_f1 = acos(cXyz::BaseY.inprod(sp58)); + sp4C /= JMAFastSqrt(var_f30); + mDoMtx_quatRotAxisRad(quat, &sp4C, var_f1); + } else { + *quat = zero_quat; + } + } else { + *quat = zero_quat; + } } -#pragma pop /* 80037900-80037A4C 032240 014C+00 0/0 0/0 3/3 .text * HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj::HitSeStart(cXyz const* param_0, int param_1, dCcD_GObjInf const* param_2, - u32 param_3) { - nofralloc -#include "asm/d/a/d_a_obj/HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl.s" +void HitSeStart(cXyz const* i_sePos, int i_roomNo, dCcD_GObjInf const* i_CcObj, u32 param_3) { + int hit_se = const_cast(i_CcObj)->GetTgHitObjSe(); + fopAc_ac_c* hit_actor = const_cast(i_CcObj)->GetTgHitAc(); + cCcD_Obj* hit_obj = const_cast(i_CcObj)->GetTgHitObj(); + bool master_sword_hit = false; + u32 sfx; + + if (hit_se != dCcD_SE_NONE) { + if (hit_actor != NULL && hit_obj != NULL) { + if (hit_obj->ChkAtType(AT_TYPE_8000)) { + sfx = Z2SE_HIT_HAMMER; + } else if (hit_obj->ChkAtType(AT_TYPE_ARROW)) { + sfx = Z2SE_HIT_ARROW_REBOUND; + } else if (hit_obj->ChkAtType(AT_TYPE_HOOKSHOT)) { + sfx = Z2SE_HIT_HOOKSHOT_REBOUND; + } else { + if (fopAcM_GetProfName(hit_actor) == PROC_ALINK && + daPy_py_c::checkMasterSwordEquip()) + { + master_sword_hit = true; + } + + if (hit_se == dCcD_SE_WOOD) { + sfx = Z2SE_HIT_WOOD_WEAPON; + } else if (hit_se == dCcD_SE_METAL) { + sfx = Z2SE_HIT_HOOKSHOT_REBOUND; + } else if (master_sword_hit) { + sfx = Z2SE_HIT_SWORD; + } else { + sfx = Z2SE_HIT_SWORD; + } + } + } + + s8 reverb = dComIfGp_getReverb(i_roomNo); + mDoAud_seStart(sfx, i_sePos, param_3 & 0xFF, (s8)reverb); + } } -#pragma pop +} // namespace daObj /* 80037A4C-80037A54 03238C 0008+00 0/0 2/0 0/0 .text GetCoCP__12cCcD_CylAttrFv */ #pragma push @@ -347,5 +244,3 @@ extern "C" asm void GetCoCP__12cCcD_SphAttrFv() { #include "asm/d/a/d_a_obj/GetCoCP__12cCcD_SphAttrFv.s" } #pragma pop - -/* 803792A8-803792A8 005908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 26d5645bc0a..9c9f33ede66 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -1,164 +1,24 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_acch -// - -// Temporary fix until the TU matches -#define __dt__12dBgS_AcchCirFv_DEFINED +/** + * d_bg_s_acch.cpp + * BG collision Actor Check + */ #include "d/bg/d_bg_s_acch.h" #include "d/a/d_a_player.h" #include "d/bg/d_bg_s.h" -#include "dol2asm.h" +#include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "global.h" -// -// Forward References: -// - -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void ClrWallHit__12dBgS_AcchCirFv(); -extern "C" void SetWallR__12dBgS_AcchCirFf(); -extern "C" void CalcWallRR__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void SetWallHDirect__12dBgS_AcchCirFf(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Init__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir(); -extern "C" void GroundCheckInit__9dBgS_AcchFR4dBgS(); -extern "C" void GroundCheck__9dBgS_AcchFR4dBgS(); -extern "C" void GroundRoofProc__9dBgS_AcchFR4dBgS(); -extern "C" void LineCheck__9dBgS_AcchFR4dBgS(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void GetWallAllR__9dBgS_AcchFv(); -extern "C" void SetWallCir__9dBgS_AcchFv(); -extern "C" void CalcWallBmdCyl__9dBgS_AcchFv(); -extern "C" void SetGroundUpY__9dBgS_AcchFf(); -extern "C" void GetWallAllLowH__9dBgS_AcchFv(); -extern "C" void GetWallAllLowH_R__9dBgS_AcchFv(); -extern "C" void GetSpeedY__9dBgS_AcchFv(); -extern "C" void GetWallAddY__9dBgS_AcchFR3Vec(); -extern "C" void SetNowActorInfo__9dBgS_AcchFiPvUi(); -extern "C" void SetWallPolyIndex__9dBgS_AcchFii(); -extern "C" void CalcMovePosWork__9dBgS_AcchFv(); -extern "C" void CalcWallRR__9dBgS_AcchFv(); -extern "C" void SetMoveBGOnly__9dBgS_AcchFv(); -extern "C" void ClrMoveBGOnly__9dBgS_AcchFv(); -extern "C" void SetGndThinCellingOff__9dBgS_AcchFv(); -extern "C" void ClrGndThinCellingOff__9dBgS_AcchFv(); -extern "C" void ChkGndThinCellingOff__9dBgS_AcchFv(); -extern "C" void OnWallSort__9dBgS_AcchFv(); -extern "C" void ChkWallSort__9dBgS_AcchFv(); -extern "C" void ChkLineDown__9dBgS_AcchFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" static void func_80077484(); -extern "C" static void func_8007748C(); -extern "C" u32 checkPlayerFly__9daPy_py_cCFv(); - -// -// External References: -// - -extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); -extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); -extern "C" void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(); -extern "C" void WallCorrect__4dBgSFP9dBgS_Acch(); -extern "C" void WallCorrectSort__4dBgSFP9dBgS_Acch(); -extern "C" void RoofChk__4dBgSFP12dBgS_RoofChk(); -extern "C" void SplGrpChk__4dBgSFP14dBgS_SplGrpChk(); -extern "C" void MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb(); -extern "C" void RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c(); -extern "C" void __ct__8dBgS_ChkFv(); -extern "C" void __dt__8dBgS_ChkFv(); -extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv(); -extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv(); -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_GndChkFv(); -extern "C" void Set__14dBgS_SplGrpChkFR4cXyzf(); -extern "C" void __dt__14dBgS_SplGrpChkFv(); -extern "C" void SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk(); -extern "C" void SetUnderwaterRoof__16dBgS_PolyPassChkFv(); -extern "C" void __ct__12dBgS_RoofChkFv(); -extern "C" void __dt__12dBgS_RoofChkFv(); -extern "C" void __ct__11dBgS_WtrChkFv(); -extern "C" void __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void SetExtChk__8cBgS_ChkFR8cBgS_Chk(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void __ct__11cBgS_LinChkFv(); -extern "C" void __dt__11cBgS_LinChkFv(); -extern "C" void Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ClearPi__13cBgS_PolyInfoFv(); -extern "C" void SetActorInfo__13cBgS_PolyInfoFiPvUi(); -extern "C" void SetPolyIndex__13cBgS_PolyInfoFi(); -extern "C" void cBgW_CheckBGround__Ff(); -extern "C" void __ct__8cM3dGCirFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void Set__8cM3dGCirFffff(); -extern "C" void Set__8cM3dGCylFRC4cXyzff(); -extern "C" void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz(); -extern "C" void getCrossYLessD__8cM3dGPlaCFRC3VecPf(); -extern "C" void __dl__FPv(); -extern "C" void __register_global_object(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__11dBgS_WtrChk[12]; -extern "C" extern void* __vt__8cM3dGCyl[3]; -extern "C" extern void* __vt__8cM3dGLin[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern s8 data_80450F68; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803AB640-803AB664 008760 0024+00 2/2 0/0 0/0 .data __vt__9dBgS_Acch */ -SECTION_DATA extern void* __vt__9dBgS_Acch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9dBgS_AcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_8007748C, - (void*)NULL, - (void*)NULL, - (void*)func_80077484, -}; - -/* 803AB664-803AB670 008784 000C+00 2/2 3/3 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 804526C0-804526C4 000CC0 0004+00 11/11 0/0 0/0 .sdata2 @4025 */ -SECTION_SDATA2 static u8 lit_4025[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 80075EAC-80075F14 0707EC 0068+00 0/0 4/4 336/336 .text __ct__12dBgS_AcchCirFv */ dBgS_AcchCir::dBgS_AcchCir() { m_flags = 0; - f32 tmp_0 = FLOAT_LABEL(lit_4025); - m_wall_rr = tmp_0; - field_0x2c = tmp_0; - m_wall_h = tmp_0; - m_wall_r = tmp_0; + m_wall_rr = 0.0f; + field_0x2c = 0.0f; + m_wall_h = 0.0f; + m_wall_r = 0.0f; m_wall_angle_y = 0; - m_wall_h_direct = tmp_0; + m_wall_h_direct = 0.0f; } /* 80075F14-80075F40 070854 002C+00 1/1 0/0 0/0 .text ClrWallHit__12dBgS_AcchCirFv */ @@ -168,8 +28,8 @@ void dBgS_AcchCir::ClrWallHit() { } /* 80075F40-80075F48 070880 0008+00 1/1 2/2 109/109 .text SetWallR__12dBgS_AcchCirFf */ -void dBgS_AcchCir::SetWallR(f32 r) { - m_wall_r = r; +void dBgS_AcchCir::SetWallR(f32 i_wall_r) { + m_wall_r = i_wall_r; } /* 80075F48-80075F58 070888 0010+00 1/1 0/0 0/0 .text CalcWallRR__12dBgS_AcchCirFv */ @@ -178,44 +38,21 @@ void dBgS_AcchCir::CalcWallRR() { } /* 80075F58-80075F80 070898 0028+00 0/0 3/3 272/272 .text SetWall__12dBgS_AcchCirFff */ -void dBgS_AcchCir::SetWall(f32 wall_h, f32 wall_r) { - SetWallH(wall_h); - SetWallR(wall_r); +void dBgS_AcchCir::SetWall(f32 i_wall_h, f32 i_wall_r) { + SetWallH(i_wall_h); + SetWallR(i_wall_r); } /* 80075F80-80075F94 0708C0 0014+00 1/1 0/0 1/1 .text SetWallHDirect__12dBgS_AcchCirFf */ -void dBgS_AcchCir::SetWallHDirect(f32 h_direct) { +void dBgS_AcchCir::SetWallHDirect(f32 i_h_direct) { m_flags |= WALL_H_DIRECT; - m_wall_h_direct = h_direct; + m_wall_h_direct = i_h_direct; } /* 80075F94-800760A0 0708D4 010C+00 3/2 6/6 468/468 .text __dt__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_Acch::~dBgS_Acch() { -extern "C" asm void __dt__9dBgS_AcchFv() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/__dt__9dBgS_AcchFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804526C4-804526C8 000CC4 0004+00 5/5 0/0 0/0 .sdata2 @4089 */ -SECTION_SDATA2 static f32 lit_4089 = -1000000000.0f; - -/* 804526C8-804526CC 000CC8 0004+00 1/1 0/0 0/0 .sdata2 @4090 */ -SECTION_SDATA2 static f32 lit_4090 = 60.0f; - -/* 804526CC-804526D0 000CCC 0004+00 3/3 0/0 0/0 .sdata2 @4091 */ -SECTION_SDATA2 static f32 lit_4091 = 1000000000.0f; - -/* 804526D0-804526D4 000CD0 0004+00 1/1 0/0 0/0 .sdata2 @4092 */ -SECTION_SDATA2 static f32 lit_4092 = 1000.0f; +dBgS_Acch::~dBgS_Acch() {} /* 800760A0-800761CC 0709E0 012C+00 0/0 4/4 338/338 .text __ct__9dBgS_AcchFv */ -// matches with literals -#ifdef NONMATCHING dBgS_Acch::dBgS_Acch() { SetPolyPassChk(GetPolyPassChkInfo()); SetGrpPassChk(GetGrpPassChkInfo()); @@ -235,7 +72,7 @@ dBgS_Acch::dBgS_Acch() { field_0xbc = 0.0f; m_tbl_size = 0; - field_0x8c = NULL; + pm_acch_cir = NULL; m_roof_height = 1000000000.0f; m_roof_crr_height = 0.0f; @@ -247,65 +84,59 @@ dBgS_Acch::dBgS_Acch() { pm_angle = NULL; pm_shape_angle = NULL; m_my_ac = NULL; - field_0xd4 = 0; + pm_out_poly_info = NULL; field_0xd8 = -1000000000.0f; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_Acch::dBgS_Acch() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/__ct__9dBgS_AcchFv.s" -} -#pragma pop -#endif /* 800761CC-80076248 070B0C 007C+00 1/1 0/0 0/0 .text Init__9dBgS_AcchFv */ void dBgS_Acch::Init() { ClrWallHit(); for (int i = 0; i < m_tbl_size; i++) { - static_cast(field_0x8c + i)->ClrWallHit(); - static_cast(field_0x8c + i)->ClrWallHDirect(); + pm_acch_cir[i].ClrWallHit(); + pm_acch_cir[i].ClrWallHDirect(); } } /* 80076248-80076288 070B88 0040+00 0/0 2/2 314/314 .text * Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz */ -void dBgS_Acch::Set(cXyz* p_pos, cXyz* p_old_pos, fopAc_ac_c* p_actor, int table_size, - dBgS_AcchCir* param_4, cXyz* p_speed, csXyz* p_angle, csXyz* p_shape_angle) { - pm_pos = p_pos; - pm_old_pos = p_old_pos; - m_my_ac = p_actor; - SetActorPid(fopAcM_GetID(p_actor)); - pm_speed = p_speed; - m_tbl_size = table_size; - field_0x8c = param_4; - pm_angle = p_angle; - pm_shape_angle = p_shape_angle; +void dBgS_Acch::Set(cXyz* i_pos, cXyz* i_old_pos, fopAc_ac_c* i_actor, int i_tbl_size, + dBgS_AcchCir* i_acchcir, cXyz* i_speed, csXyz* i_angle, csXyz* i_shape_angle) { + pm_pos = i_pos; + pm_old_pos = i_old_pos; + + JUT_ASSERT(pm_pos != 0); + JUT_ASSERT(pm_old_pos != 0); + + m_my_ac = i_actor; + SetActorPid(fopAcM_GetID(i_actor)); + pm_speed = i_speed; + m_tbl_size = i_tbl_size; + pm_acch_cir = i_acchcir; + pm_angle = i_angle; + pm_shape_angle = i_shape_angle; } /* 80076288-800762D8 070BC8 0050+00 0/0 1/1 7/7 .text * Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir */ -void dBgS_Acch::Set(fopAc_ac_c* p_actor, int table_size, dBgS_AcchCir* param_2) { - m_tbl_size = table_size; - field_0x8c = param_2; - m_my_ac = p_actor; +void dBgS_Acch::Set(fopAc_ac_c* i_actor, int i_tbl_size, dBgS_AcchCir* i_acchcir) { + m_tbl_size = i_tbl_size; + pm_acch_cir = i_acchcir; + m_my_ac = i_actor; - SetActorPid(fopAcM_GetID(p_actor)); - pm_pos = &fopAcM_GetPosition_p(p_actor); - pm_old_pos = &fopAcM_GetOldPosition_p(p_actor); - pm_speed = &fopAcM_GetSpeed_p(p_actor); - pm_angle = &fopAcM_GetAngle_p(p_actor); - pm_shape_angle = &fopAcM_GetShapeAngle_p(p_actor); + SetActorPid(fopAcM_GetID(i_actor)); + pm_pos = &fopAcM_GetPosition_p(i_actor); + pm_old_pos = &fopAcM_GetOldPosition_p(i_actor); + pm_speed = &fopAcM_GetSpeed_p(i_actor); + pm_angle = &fopAcM_GetAngle_p(i_actor); + pm_shape_angle = &fopAcM_GetShapeAngle_p(i_actor); } /* 800762D8-80076350 070C18 0078+00 1/1 0/0 0/0 .text GroundCheckInit__9dBgS_AcchFR4dBgS */ -void dBgS_Acch::GroundCheckInit(dBgS& param_0) { +void dBgS_Acch::GroundCheckInit(dBgS& i_bgs) { if (!(m_flags & 2)) { - m_ground_h = lit_4089; - m_gnd.SetExtChk(static_cast(*this)); + m_ground_h = -1000000000.0f; + m_gnd.SetExtChk(*this); field_0xb4 = ChkGroundHit(); i_ClrGroundHit(); ClrGroundLanding(); @@ -313,150 +144,219 @@ void dBgS_Acch::GroundCheckInit(dBgS& param_0) { } } -/* 80450F68-80450F70 000468 0008+00 0/0 1/1 0/0 .sbss None */ -s8 data_80450F68; - /* 80076350-8007654C 070C90 01FC+00 2/2 0/0 0/0 .text GroundCheck__9dBgS_AcchFR4dBgS */ -// issues with tmpRoofChk -#ifdef NONMATCHING -/* 80424B2C-80424B80 05184C 0050+04 1/1 0/0 0/0 .bss tmpRoofChk$4165 */ -static dBgS_RoofChk tmpRoofChk; - -void dBgS_Acch::GroundCheck(dBgS& param_0) { +void dBgS_Acch::GroundCheck(dBgS& i_bgs) { if (!(m_flags & GRND_NONE)) { cXyz grnd_pos; - grnd_pos.x = pm_pos->x; - grnd_pos.y = pm_pos->y; - grnd_pos.z = pm_pos->z; + grnd_pos = *pm_pos; grnd_pos.y += field_0x94 + (field_0x9c - field_0x90); if (!ChkGndThinCellingOff()) { - if (data_80450F68 == 0) { - dBgS_RoofChk tmpRoofChk; - data_80450F68 = 1; - } + static dBgS_RoofChk tmpRoofChk; tmpRoofChk.SetActorPid(m_gnd.GetActorPid()); tmpRoofChk.i_SetPos(*pm_pos); - f32 tmp = param_0.RoofChk(&tmpRoofChk); - if (grnd_pos.y > tmp) { - grnd_pos.y = tmp; + + f32 roof_chk = i_bgs.RoofChk(&tmpRoofChk); + if (grnd_pos.y > roof_chk) { + grnd_pos.y = roof_chk; } } + field_0x94 = 0.0f; m_gnd.SetPos(&grnd_pos); - m_ground_h = param_0.GroundCross(&m_gnd); + m_ground_h = i_bgs.GroundCross(&m_gnd); - if (lit_4089 != m_ground_h) { + if (m_ground_h != -1000000000.0f) { field_0xbc = m_ground_h + field_0x90; if (field_0xbc > field_0xb8) { pm_pos->y = field_0xbc; + if (ChkClrSpeedY() && pm_speed != NULL) { pm_speed->y = 0.0f; } - param_0.GetTriPla(m_gnd, &field_0xa0); + + i_bgs.GetTriPla(m_gnd, &field_0xa0); SetGroundFind(); SetGroundHit(); + if (field_0xc0 == 0) { field_0xc0 = 1; - param_0.RideCallBack(m_gnd, m_my_ac); + i_bgs.RideCallBack(m_gnd, m_my_ac); } + if (field_0xb4 == 0) { SetGroundLanding(); } } - if (field_0xb4 && !ChkGroundHit()) { - SetGroundAway(); - } + } + + if (field_0xb4 && !i_ChkGroundHit()) { + SetGroundAway(); } } } -#else -/* ############################################################################################## */ -/* 80424B20-80424B2C 051840 000C+00 1/1 0/0 0/0 .bss @4166 */ -static u8 lit_4166[12]; - -/* 80424B2C-80424B80 05184C 0050+04 1/1 0/0 0/0 .bss tmpRoofChk$4165 */ -static u8 tmpRoofChk[80 + 4 /* padding */]; - -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::GroundCheck(dBgS& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/GroundCheck__9dBgS_AcchFR4dBgS.s" -} -#pragma pop -#endif /* 8007654C-80076624 070E8C 00D8+00 1/1 0/0 0/0 .text GroundRoofProc__9dBgS_AcchFR4dBgS */ -void dBgS_Acch::GroundRoofProc(dBgS& param_0) { - if (lit_4089 != m_ground_h) { +void dBgS_Acch::GroundRoofProc(dBgS& i_bgs) { + if (m_ground_h != -1000000000.0f) { if (field_0xbc < field_0xcc && field_0xcc < pm_pos->y) { pm_pos->y = field_0xcc; } if (!(m_flags & ROOF_NONE) && m_ground_h >= m_roof_height) { - m_roof.SetExtChk(static_cast(*this)); + m_roof.SetExtChk(*this); ClrRoofHit(); - cXyz roof_pos; - roof_pos.x = pm_pos->x; - roof_pos.y = pm_pos->y; - roof_pos.z = pm_pos->z; + cXyz roof_pos(*pm_pos); m_roof.i_SetPos(roof_pos); - m_roof_height = param_0.RoofChk(&m_roof); + m_roof_height = i_bgs.RoofChk(&m_roof); } } } -/* ############################################################################################## */ -/* 804526D4-804526D8 000CD4 0004+00 1/1 0/0 0/0 .sdata2 @4424 */ -SECTION_SDATA2 static f32 lit_4424 = 1.0f; - /* 80076624-80076AAC 070F64 0488+00 1/1 0/0 0/0 .text LineCheck__9dBgS_AcchFR4dBgS */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::LineCheck(dBgS& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/LineCheck__9dBgS_AcchFR4dBgS.s" +void dBgS_Acch::LineCheck(dBgS& i_bgs) { + dBgS_RoofChk roof_chk; + roof_chk.SetActorPid(m_gnd.GetActorPid()); + roof_chk.i_SetPos(*GetOldPos()); + + f32 temp_f31 = dComIfG_Bgsp().RoofChk(&roof_chk); + + f32 var_f30 = 1000000000.0f; + bool var_r30 = false; + bool var_r29 = false; + + for (int i = 0; i < GetTblSize(); i++) { + cBgS_LinChk lin_chk; + cXyz old_pos; + cXyz pos; + + old_pos = *pm_old_pos; + pos = *pm_pos; + + f32 temp_f0 = GetWallH(i); + f32 var_f2 = temp_f0; + if (temp_f31 < old_pos.y + temp_f0) { + if (var_r29) { + continue; + } else { + var_f2 = (temp_f31 - old_pos.y) - 1.0f; + var_r29 = true; + } + } + + if (var_f30 > var_f2) { + var_f30 = var_f2; + } + + old_pos.y += var_f2; + pos.y += var_f2; + + if (GetSpeedY() < 0.0f) { + if (m_my_ac != NULL && fopAcM_GetName(m_my_ac) == PROC_ALINK && + !static_cast(m_my_ac)->checkPlayerFly() && ChkLink()) + { + pos.y -= GetSpeedY(); + } + } + + lin_chk.Set2(&old_pos, &pos, GetActorPid()); + lin_chk.SetExtChk(*this); + + if (i_bgs.LineCross(&lin_chk)) { + *GetPos() = lin_chk.i_GetCross(); + OnLineCheckHit(); + + if (pm_out_poly_info != NULL) + *pm_out_poly_info = lin_chk; + + cM3dGPla plane; + i_bgs.GetTriPla(lin_chk, &plane); + if (!cBgW_CheckBGround(plane.mNormal.y)) { + VECAdd(GetPos(), &plane.mNormal, GetPos()); + if (!cM3d_IsZero(JMAFastSqrt(plane.mNormal.x * plane.mNormal.x + + plane.mNormal.z * plane.mNormal.z))) + { + pm_acch_cir[i].SetWallHDirect(GetPos()->y); + } + + GetPos()->y -= pm_acch_cir[i].GetWallH(); + } else { + GetPos()->y -= 1.0f; + GroundCheck(i_bgs); + var_r30 = true; + } + } + } + + if (ChkLineDown()) { + f32 temp_f1 = GetOldPos()->y - GetPos()->y; + + if (var_f30 != 1000000000.0f && !var_r30 && !cM3d_IsZero(temp_f1)) { + cBgS_LinChk lin_chk; + cXyz old_pos; + cXyz pos; + + old_pos = *GetPos(); + pos = old_pos; + + old_pos.y += var_f30; + + lin_chk.Set2(&old_pos, &pos, GetActorPid()); + lin_chk.SetExtChk(*this); + + if (i_bgs.LineCross(&lin_chk)) { + *GetPos() = lin_chk.i_GetCross(); + OnLineCheckHit(); + + if (pm_out_poly_info != NULL) + *pm_out_poly_info = lin_chk; + + GetPos()->y -= 1.0f; + GroundCheck(i_bgs); + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 804526D8-804526DC 000CD8 0004+00 1/1 0/0 0/0 .sdata2 @4554 */ -SECTION_SDATA2 static f32 lit_4554 = 50.0f; - -/* 804526DC-804526E0 000CDC 0004+00 1/1 0/0 0/0 .sdata2 @4555 */ -SECTION_SDATA2 static f32 lit_4555 = 1000000.0f; /* 80076AAC-80076F84 0713EC 04D8+00 0/0 15/15 414/414 .text CrrPos__9dBgS_AcchFR4dBgS */ -// close -#ifdef NONMATCHING -void dBgS_Acch::CrrPos(dBgS& param_0) { +void dBgS_Acch::CrrPos(dBgS& i_bgs) { bool bvar9; if (!(m_flags & 1)) { - param_0.MoveBgCrrPos(m_gnd, ChkGroundHit(), pm_pos, pm_angle, pm_shape_angle, false, false); + JUT_ASSERT(pm_pos != 0); + JUT_ASSERT(pm_old_pos != 0); + + JUT_ASSERT(fpclassify(pm_pos->x) == 1); + JUT_ASSERT(fpclassify(pm_pos->y) == 1); + JUT_ASSERT(fpclassify(pm_pos->z) == 1); + + JUT_ASSERT(-1.0e32f < pm_pos->x && pm_pos->x < 1.0e32f); + JUT_ASSERT(-1.0e32f < pm_pos->y); + JUT_ASSERT(pm_pos->y < 1.0e32f); + JUT_ASSERT(-1.0e32f < pm_pos->z && pm_pos->z < 1.0e32f); + + i_bgs.MoveBgCrrPos(m_gnd, ChkGroundHit(), pm_pos, pm_angle, pm_shape_angle, false, false); if (!ChkGroundHit()) { bvar9 = false; if (ChkWallHit()) { for (int i = 0; i < m_tbl_size; i++) { - if (static_cast(field_0x8c + i)->ChkWallHit()) { - param_0.MoveBgCrrPos(*static_cast(field_0x8c + i), true, - pm_pos, pm_angle, pm_shape_angle, true, false); + if (pm_acch_cir[i].ChkWallHit()) { + i_bgs.MoveBgCrrPos(pm_acch_cir[i], true, pm_pos, pm_angle, pm_shape_angle, + true, false); bvar9 = true; break; } } } + if (!bvar9 && ChkRoofHit()) { - param_0.MoveBgCrrPos(m_roof, true, pm_pos, pm_angle, pm_shape_angle, false, true); + i_bgs.MoveBgCrrPos(m_roof, true, pm_pos, pm_angle, pm_shape_angle, false, true); } } - GroundCheckInit(param_0); + GroundCheckInit(i_bgs); Init(); f32 tmp = GetWallAllLowH_R(); @@ -472,26 +372,27 @@ void dBgS_Acch::CrrPos(dBgS& param_0) { OffLineCheckHit(); if (!ChkLineCheckNone() && !cM3d_IsZero(tmp) && - (dvar10 > (tmp * tmp) || fvar12 > fvar1 || dvar11 > field_0x9c || ChkLineCheck())) { + (dvar10 > (tmp * tmp) || fvar12 > fvar1 || dvar11 > field_0x9c || ChkLineCheck())) + { bvar2 = true; - LineCheck(param_0); + LineCheck(i_bgs); } if (!(m_flags & WALL_NONE)) { if (ChkWallSort()) { - param_0.WallCorrectSort(this); + i_bgs.WallCorrectSort(this); } else { - param_0.WallCorrect(this); + i_bgs.WallCorrect(this); } } if (ChkWallHit() && bvar2) { - LineCheck(param_0); + LineCheck(i_bgs); } field_0xcc = 1000000000.0f; if (!(m_flags & ROOF_NONE)) { - m_roof.SetExtChk(static_cast(*this)); + m_roof.SetExtChk(*this); ClrRoofHit(); cXyz roof_pos; roof_pos.x = pm_pos->x; @@ -499,19 +400,22 @@ void dBgS_Acch::CrrPos(dBgS& param_0) { roof_pos.z = pm_pos->z; m_roof.i_SetPos(roof_pos); - m_roof_height = param_0.RoofChk(&m_roof); + m_roof_height = i_bgs.RoofChk(&m_roof); - // register issues - if (1000000000.0f != m_roof_height && GetPos()->y > 1000000000.0f + m_roof_crr_height) { - field_0xcc = m_roof_height - m_roof_crr_height; - SetRoofHit(); + if (m_roof_height != 1000000000.0f) { + f32 y = GetPos()->y; + + if (y + m_roof_crr_height > m_roof_height) { + field_0xcc = m_roof_height - m_roof_crr_height; + SetRoofHit(); + } } } if (!(m_flags & GRND_NONE)) { ClrGroundFind(); - GroundCheck(param_0); - GroundRoofProc(param_0); + GroundCheck(i_bgs); + GroundRoofProc(i_bgs); } else { if (field_0xcc < GetPos()->y) { GetPos()->y = field_0xcc; @@ -521,36 +425,39 @@ void dBgS_Acch::CrrPos(dBgS& param_0) { if (!(m_flags & 0x400)) { ClrWaterHit(); ClrWaterIn(); - f32 tmp4 = -1000000000.0f; m_wtr.SetHeight(-1000000000.0f); - f32 tmp3 = m_ground_h; - if (tmp4 == tmp3) { - tmp3 = GetPos()->y - 50.0f; // register issues + f32 var_f29; + f32 var_f30; + + f32 temp_f1_5 = m_ground_h; + if (temp_f1_5 == -1000000000.0f) { + var_f29 = GetPos()->y - 50.0f; } else { - tmp3 = 50.0f; // needs to be fmr + var_f29 = temp_f1_5; } if (m_wtr_mode == 1) { - tmp4 = tmp3 + m_wtr_chk_offset; + var_f30 = var_f29 + m_wtr_chk_offset; } else { dBgS_RoofChk roof_chk; roof_chk.SetUnderwaterRoof(); roof_chk.i_SetPos(*pm_pos); - tmp4 = param_0.RoofChk(&roof_chk); - if (1000000000.0f == tmp4) { - tmp4 = GetPos()->y + 1000000.0f; + + var_f30 = i_bgs.RoofChk(&roof_chk); + if (var_f30 == 1000000000.0f) { + var_f30 = GetPos()->y + 1000000.0f; } } - cXyz xyz; - xyz.x = pm_pos->x; - xyz.y = pm_pos->y; - xyz.z = pm_pos->z; - xyz.y = tmp3; - m_wtr.Set(xyz, tmp4); - m_wtr.SetPassChkInfo(static_cast(*this)); - if (param_0.WaterChk(&m_wtr)) { + cXyz wtr_pos; + wtr_pos = *pm_pos; + wtr_pos.y = var_f29; + + m_wtr.Set(wtr_pos, var_f30); + m_wtr.SetPassChkInfo(*this); + + if (i_bgs.WaterChk(&m_wtr)) { SetWaterHit(); if (m_wtr.GetHeight() > GetPos()->y) { SetWaterIn(); @@ -559,23 +466,13 @@ void dBgS_Acch::CrrPos(dBgS& param_0) { } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::CrrPos(dBgS& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/CrrPos__9dBgS_AcchFR4dBgS.s" -} -#pragma pop -#endif /* 80076F84-80076FC0 0718C4 003C+00 1/1 0/0 0/0 .text GetWallAllR__9dBgS_AcchFv */ f32 dBgS_Acch::GetWallAllR() { - f32 ret = FLOAT_LABEL(lit_4025); + f32 ret = 0.0f; for (int i = 0; i < m_tbl_size; i++) { - f32 wall_r = static_cast(field_0x8c + i)->GetWallR(); + f32 wall_r = pm_acch_cir[i].GetWallR(); if (ret < wall_r) { ret = wall_r; } @@ -586,33 +483,33 @@ f32 dBgS_Acch::GetWallAllR() { /* 80076FC0-8007703C 071900 007C+00 1/1 0/0 0/0 .text SetWallCir__9dBgS_AcchFv */ void dBgS_Acch::SetWallCir() { for (int i = 0; i < m_tbl_size; i++) { - static_cast(field_0x8c + i)->SetCir(*pm_pos); + pm_acch_cir[i].SetCir(*pm_pos); } } /* 8007703C-80077114 07197C 00D8+00 1/1 0/0 0/0 .text CalcWallBmdCyl__9dBgS_AcchFv */ -// matches with literals -#ifdef NONMATCHING void dBgS_Acch::CalcWallBmdCyl() { if (m_tbl_size <= 0) { m_wall_cyl.Set(*pm_pos, 0.0f, 0.0f); } else { f32 dvar8 = GetWallAllR(); - f32 dvar9 = field_0x8c->GetWallH(); - f32 dvar10 = field_0x8c->GetWallH(); + f32 dvar9 = pm_acch_cir->GetWallH(); + f32 dvar10 = pm_acch_cir->GetWallH(); + if (m_tbl_size >= 1) { for (int i = 0; i < m_tbl_size; i++) { - f32 tmp = static_cast(field_0x8c + i)->GetWallH(); + f32 tmp = pm_acch_cir[i].GetWallH(); if (dvar9 > tmp) { - dvar9 = static_cast(field_0x8c + i)->GetWallH(); + dvar9 = pm_acch_cir[i].GetWallH(); } - f32 tmp2 = static_cast(field_0x8c + i)->GetWallH(); + f32 tmp2 = pm_acch_cir[i].GetWallH(); if (dvar10 < tmp2) { - dvar10 = static_cast(field_0x8c + i)->GetWallH(); + dvar10 = pm_acch_cir[i].GetWallH(); } } } + cXyz xyz; xyz.x = pm_pos->x; xyz.y = pm_pos->y; @@ -622,16 +519,6 @@ void dBgS_Acch::CalcWallBmdCyl() { m_wall_cyl.Set(xyz, dvar8, dvar10 - dvar9); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::CalcWallBmdCyl() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/CalcWallBmdCyl__9dBgS_AcchFv.s" -} -#pragma pop -#endif /* 80077114-80077128 071A54 0014+00 0/0 0/0 24/24 .text SetGroundUpY__9dBgS_AcchFf */ void dBgS_Acch::SetGroundUpY(f32 param_0) { @@ -642,35 +529,37 @@ void dBgS_Acch::SetGroundUpY(f32 param_0) { /* 80077128-80077178 071A68 0050+00 1/1 0/0 0/0 .text GetWallAllLowH__9dBgS_AcchFv */ f32 dBgS_Acch::GetWallAllLowH() { if (m_tbl_size <= 0) { - return FLOAT_LABEL(lit_4025); + return 0.0f; } - f32 tmp = field_0x8c->GetWallH(); + f32 tmp = pm_acch_cir->GetWallH(); for (int i = 1; i < m_tbl_size; i++) { - f32 tmp2 = static_cast(field_0x8c + i)->GetWallH(); + f32 tmp2 = pm_acch_cir[i].GetWallH(); if (tmp > tmp2) { - tmp = static_cast(field_0x8c + i)->GetWallH(); + tmp = pm_acch_cir[i].GetWallH(); } } + return tmp; } /* 80077178-800771E4 071AB8 006C+00 1/1 0/0 0/0 .text GetWallAllLowH_R__9dBgS_AcchFv */ f32 dBgS_Acch::GetWallAllLowH_R() { if (m_tbl_size <= 0) { - return FLOAT_LABEL(lit_4025); + return 0.0f; } int index = 0; - f32 tmp = field_0x8c->GetWallH(); + f32 tmp = pm_acch_cir->GetWallH(); for (int i = 1; i < m_tbl_size; i++) { - f32 tmp2 = static_cast(field_0x8c + i)->GetWallH(); + f32 tmp2 = pm_acch_cir[i].GetWallH(); if (tmp > tmp2) { - tmp = static_cast(field_0x8c + i)->GetWallH(); + tmp = pm_acch_cir[i].GetWallH(); index = i; } } - return static_cast(field_0x8c + index)->GetWallR(); + + return pm_acch_cir[index].GetWallR(); } /* 800771E4-80077200 071B24 001C+00 1/1 4/4 0/0 .text GetSpeedY__9dBgS_AcchFv */ @@ -678,20 +567,11 @@ f32 dBgS_Acch::GetSpeedY() { if (pm_speed != NULL) { return pm_speed->y; } - return FLOAT_LABEL(lit_4025); + + return 0.0f; } -/* ############################################################################################## */ -/* 804526E0-804526E8 000CE0 0004+04 1/1 0/0 0/0 .sdata2 @4762 */ -SECTION_SDATA2 static f32 lit_4762[1 + 1 /* padding */] = { - 0.5f, - /* padding */ - 0.0f, -}; - /* 80077200-80077278 071B40 0078+00 0/0 4/4 0/0 .text GetWallAddY__9dBgS_AcchFR3Vec */ -// matches with literals -#ifdef NONMATCHING f32 dBgS_Acch::GetWallAddY(Vec& param_0) { if (!ChkGroundFind() || field_0xa0.mNormal.y < 0.5f) { return 0.0f; @@ -704,18 +584,9 @@ f32 dBgS_Acch::GetWallAddY(Vec& param_0) { } return -tmp; } + return 0.0f; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dBgS_Acch::GetWallAddY(Vec& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/GetWallAddY__9dBgS_AcchFR3Vec.s" -} -#pragma pop -#endif /* 80077278-80077288 071BB8 0010+00 0/0 2/2 0/0 .text SetNowActorInfo__9dBgS_AcchFiPvUi */ @@ -727,9 +598,8 @@ void dBgS_Acch::SetNowActorInfo(int bg_index, void* param_1, unsigned int param_ /* 80077288-800772E8 071BC8 0060+00 0/0 4/4 0/0 .text SetWallPolyIndex__9dBgS_AcchFii */ void dBgS_Acch::SetWallPolyIndex(int index, int poly_index) { - static_cast(field_0x8c + index) - ->SetActorInfo(m_bg_index, field_0x7c, field_0x80); - static_cast(field_0x8c + index)->SetPolyIndex(poly_index); + pm_acch_cir[index].SetActorInfo(m_bg_index, field_0x7c, field_0x80); + pm_acch_cir[index].SetPolyIndex(poly_index); } /* 800772E8-8007732C 071C28 0044+00 0/0 6/6 0/0 .text CalcMovePosWork__9dBgS_AcchFv */ @@ -742,7 +612,7 @@ void dBgS_Acch::CalcMovePosWork() { /* 8007732C-80077388 071C6C 005C+00 0/0 2/2 0/0 .text CalcWallRR__9dBgS_AcchFv */ void dBgS_Acch::CalcWallRR() { for (int i = 0; i < m_tbl_size; i++) { - static_cast(field_0x8c + i)->CalcWallRR(); + pm_acch_cir[i].CalcWallRR(); } } @@ -791,39 +661,4 @@ bool dBgS_Acch::ChkLineDown() { return m_flags & LINE_DOWN; } -/* 80077414-80077484 071D54 0070+00 1/0 2/2 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_AcchCir::~dBgS_AcchCir() { -extern "C" asm void __dt__12dBgS_AcchCirFv() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 80077484-8007748C 071DC4 0008+00 1/0 0/0 0/0 .text @36@__dt__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077484() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/func_80077484.s" -} -#pragma pop - -/* 8007748C-80077494 071DCC 0008+00 1/0 0/0 0/0 .text @20@__dt__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007748C() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/func_8007748C.s" -} -#pragma pop - -/* 80077494-8007749C 071DD4 0008+00 0/0 1/0 0/0 .text checkPlayerFly__9daPy_py_cCFv */ -// u32 daPy_py_c::checkPlayerFly() const { -extern "C" u32 checkPlayerFly__9daPy_py_cCFv() { - return 0; -} +#pragma nosyminline on \ No newline at end of file diff --git a/src/d/bg/d_bg_s_chk.cpp b/src/d/bg/d_bg_s_chk.cpp index bc8251a5e41..710b6b2cfe4 100644 --- a/src/d/bg/d_bg_s_chk.cpp +++ b/src/d/bg/d_bg_s_chk.cpp @@ -1,6 +1,6 @@ /** * d_bg_s_chk.cpp - * + * BG Collision Check Base */ #include "d/bg/d_bg_s_chk.h" diff --git a/src/d/bg/d_bg_s_gnd_chk.cpp b/src/d/bg/d_bg_s_gnd_chk.cpp index 80a76e431a5..8cb66556a74 100644 --- a/src/d/bg/d_bg_s_gnd_chk.cpp +++ b/src/d/bg/d_bg_s_gnd_chk.cpp @@ -1,159 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_gnd_chk -// +/** + * d_bg_s_gnd_chk.cpp + * BG Collision Ground Check + */ #include "d/bg/d_bg_s_gnd_chk.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_GndChkFv(); -extern "C" void __ct__18dBgS_ObjGndChk_WtrFv(); -extern "C" void __dt__18dBgS_ObjGndChk_WtrFv(); -extern "C" void __ct__18dBgS_ObjGndChk_SplFv(); -extern "C" void __dt__18dBgS_ObjGndChk_SplFv(); -extern "C" void __dt__18dBgS_ObjGndChk_AllFv(); -extern "C" void __dt__14dBgS_CamGndChkFv(); -extern "C" void __ct__18dBgS_CamGndChk_WtrFv(); -extern "C" void __dt__18dBgS_CamGndChk_WtrFv(); -extern "C" static void func_80077B10(); -extern "C" static void func_80077B18(); -extern "C" static void func_80077B20(); -extern "C" static void func_80077B28(); -extern "C" static void func_80077B30(); -extern "C" static void func_80077B38(); -extern "C" static void func_80077B40(); -extern "C" static void func_80077B48(); -extern "C" static void func_80077B50(); -extern "C" static void func_80077B58(); -extern "C" static void func_80077B60(); -extern "C" static void func_80077B68(); -extern "C" static void func_80077B70(); -extern "C" static void func_80077B78(); -extern "C" static void func_80077B80(); -extern "C" static void func_80077B88(); -extern "C" static void func_80077B90(); -extern "C" static void func_80077B98(); - -// -// External References: -// - -extern "C" void __ct__8dBgS_ChkFv(); -extern "C" void __dt__8dBgS_ChkFv(); -extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv(); -extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void SetCam__16dBgS_PolyPassChkFv(); -extern "C" void __ct__11cBgS_GndChkFv(); -extern "C" void __dt__11cBgS_GndChkFv(); -extern "C" void __dl__FPv(); -extern "C" extern void* __vt__14dBgS_ObjGndChk[12 + 1 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803AB688-803AB6B8 0087A8 0030+00 2/2 0/0 0/0 .data __vt__18dBgS_CamGndChk_Wtr */ -SECTION_DATA extern void* __vt__18dBgS_CamGndChk_Wtr[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18dBgS_CamGndChk_WtrFv, - (void*)NULL, - (void*)NULL, - (void*)func_80077B88, - (void*)NULL, - (void*)NULL, - (void*)func_80077B98, - (void*)NULL, - (void*)NULL, - (void*)func_80077B90, -}; - -/* 803AB6B8-803AB6E8 0087D8 0030+00 2/2 2/2 0/0 .data __vt__14dBgS_CamGndChk */ -SECTION_DATA extern void* __vt__14dBgS_CamGndChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14dBgS_CamGndChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80077B70, - (void*)NULL, - (void*)NULL, - (void*)func_80077B80, - (void*)NULL, - (void*)NULL, - (void*)func_80077B78, -}; - -/* 803AB6E8-803AB718 008808 0030+00 1/1 3/3 8/8 .data __vt__18dBgS_ObjGndChk_All */ -SECTION_DATA extern void* __vt__18dBgS_ObjGndChk_All[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18dBgS_ObjGndChk_AllFv, - (void*)NULL, - (void*)NULL, - (void*)func_80077B58, - (void*)NULL, - (void*)NULL, - (void*)func_80077B68, - (void*)NULL, - (void*)NULL, - (void*)func_80077B60, -}; - -/* 803AB718-803AB748 008838 0030+00 2/2 0/0 0/0 .data __vt__18dBgS_ObjGndChk_Spl */ -SECTION_DATA extern void* __vt__18dBgS_ObjGndChk_Spl[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18dBgS_ObjGndChk_SplFv, - (void*)NULL, - (void*)NULL, - (void*)func_80077B40, - (void*)NULL, - (void*)NULL, - (void*)func_80077B50, - (void*)NULL, - (void*)NULL, - (void*)func_80077B48, -}; - -/* 803AB748-803AB778 008868 0030+00 2/2 0/0 0/0 .data __vt__18dBgS_ObjGndChk_Wtr */ -SECTION_DATA extern void* __vt__18dBgS_ObjGndChk_Wtr[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18dBgS_ObjGndChk_WtrFv, - (void*)NULL, - (void*)NULL, - (void*)func_80077B28, - (void*)NULL, - (void*)NULL, - (void*)func_80077B38, - (void*)NULL, - (void*)NULL, - (void*)func_80077B30, -}; - -/* 803AB778-803AB7A8 008898 0030+00 2/2 0/0 0/0 .data __vt__11dBgS_GndChk */ -SECTION_DATA extern void* __vt__11dBgS_GndChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11dBgS_GndChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80077B10, - (void*)NULL, - (void*)NULL, - (void*)func_80077B20, - (void*)NULL, - (void*)NULL, - (void*)func_80077B18, -}; /* 8007757C-800775F0 071EBC 0074+00 3/3 15/15 289/289 .text __ct__11dBgS_GndChkFv */ dBgS_GndChk::dBgS_GndChk() { @@ -162,15 +12,7 @@ dBgS_GndChk::dBgS_GndChk() { } /* 800775F0-80077678 071F30 0088+00 8/7 13/13 295/295 .text __dt__11dBgS_GndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_GndChk::~dBgS_GndChk() { -extern "C" asm void __dt__11dBgS_GndChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__dt__11dBgS_GndChkFv.s" -} -#pragma pop +dBgS_GndChk::~dBgS_GndChk() {} /* 80077678-80077710 071FB8 0098+00 0/0 0/0 1/1 .text __ct__18dBgS_ObjGndChk_WtrFv */ dBgS_ObjGndChk_Wtr::dBgS_ObjGndChk_Wtr() { @@ -179,15 +21,7 @@ dBgS_ObjGndChk_Wtr::dBgS_ObjGndChk_Wtr() { } /* 80077710-800777B0 072050 00A0+00 4/3 0/0 1/1 .text __dt__18dBgS_ObjGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjGndChk_Wtr::~dBgS_ObjGndChk_Wtr() { -extern "C" asm void __dt__18dBgS_ObjGndChk_WtrFv() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_WtrFv.s" -} -#pragma pop +dBgS_ObjGndChk_Wtr::~dBgS_ObjGndChk_Wtr() {} /* 800777B0-80077848 0720F0 0098+00 0/0 0/0 61/61 .text __ct__18dBgS_ObjGndChk_SplFv */ dBgS_ObjGndChk_Spl::dBgS_ObjGndChk_Spl() { @@ -196,37 +30,13 @@ dBgS_ObjGndChk_Spl::dBgS_ObjGndChk_Spl() { } /* 80077848-800778E8 072188 00A0+00 4/3 0/0 61/61 .text __dt__18dBgS_ObjGndChk_SplFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjGndChk_Spl::~dBgS_ObjGndChk_Spl() { -extern "C" asm void __dt__18dBgS_ObjGndChk_SplFv() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_SplFv.s" -} -#pragma pop +dBgS_ObjGndChk_Spl::~dBgS_ObjGndChk_Spl() {} /* 800778E8-80077988 072228 00A0+00 4/3 3/3 7/7 .text __dt__18dBgS_ObjGndChk_AllFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjGndChk_All::~dBgS_ObjGndChk_All() { -extern "C" asm void __dt__18dBgS_ObjGndChk_AllFv() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_AllFv.s" -} -#pragma pop +dBgS_ObjGndChk_All::~dBgS_ObjGndChk_All() {} /* 80077988-80077A00 0722C8 0078+00 5/4 2/2 0/0 .text __dt__14dBgS_CamGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_CamGndChk::~dBgS_CamGndChk() { -extern "C" asm void __dt__14dBgS_CamGndChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__dt__14dBgS_CamGndChkFv.s" -} -#pragma pop +dBgS_CamGndChk::~dBgS_CamGndChk() {} /* 80077A00-80077A98 072340 0098+00 0/0 5/5 1/1 .text __ct__18dBgS_CamGndChk_WtrFv */ dBgS_CamGndChk_Wtr::dBgS_CamGndChk_Wtr() { @@ -235,192 +45,4 @@ dBgS_CamGndChk_Wtr::dBgS_CamGndChk_Wtr() { } /* 80077A98-80077B10 0723D8 0078+00 4/3 5/5 1/1 .text __dt__18dBgS_CamGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_CamGndChk_Wtr::~dBgS_CamGndChk_Wtr() { -extern "C" asm void __dt__18dBgS_CamGndChk_WtrFv() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_CamGndChk_WtrFv.s" -} -#pragma pop - -/* 80077B10-80077B18 072450 0008+00 1/0 0/0 0/0 .text @20@__dt__11dBgS_GndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B10() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B10.s" -} -#pragma pop - -/* 80077B18-80077B20 072458 0008+00 1/0 0/0 0/0 .text @76@__dt__11dBgS_GndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B18() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B18.s" -} -#pragma pop - -/* 80077B20-80077B28 072460 0008+00 1/0 0/0 0/0 .text @60@__dt__11dBgS_GndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B20() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B20.s" -} -#pragma pop - -/* 80077B28-80077B30 072468 0008+00 1/0 0/0 0/0 .text @20@__dt__18dBgS_ObjGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B28() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B28.s" -} -#pragma pop - -/* 80077B30-80077B38 072470 0008+00 1/0 0/0 0/0 .text @76@__dt__18dBgS_ObjGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B30() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B30.s" -} -#pragma pop - -/* 80077B38-80077B40 072478 0008+00 1/0 0/0 0/0 .text @60@__dt__18dBgS_ObjGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B38() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B38.s" -} -#pragma pop - -/* 80077B40-80077B48 072480 0008+00 1/0 0/0 0/0 .text @20@__dt__18dBgS_ObjGndChk_SplFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B40() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B40.s" -} -#pragma pop - -/* 80077B48-80077B50 072488 0008+00 1/0 0/0 0/0 .text @76@__dt__18dBgS_ObjGndChk_SplFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B48() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B48.s" -} -#pragma pop - -/* 80077B50-80077B58 072490 0008+00 1/0 0/0 0/0 .text @60@__dt__18dBgS_ObjGndChk_SplFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B50() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B50.s" -} -#pragma pop - -/* 80077B58-80077B60 072498 0008+00 1/0 0/0 0/0 .text @20@__dt__18dBgS_ObjGndChk_AllFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B58() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B58.s" -} -#pragma pop - -/* 80077B60-80077B68 0724A0 0008+00 1/0 0/0 0/0 .text @76@__dt__18dBgS_ObjGndChk_AllFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B60() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B60.s" -} -#pragma pop - -/* 80077B68-80077B70 0724A8 0008+00 1/0 0/0 0/0 .text @60@__dt__18dBgS_ObjGndChk_AllFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B68() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B68.s" -} -#pragma pop - -/* 80077B70-80077B78 0724B0 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_CamGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B70() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B70.s" -} -#pragma pop - -/* 80077B78-80077B80 0724B8 0008+00 1/0 0/0 0/0 .text @76@__dt__14dBgS_CamGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B78() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B78.s" -} -#pragma pop - -/* 80077B80-80077B88 0724C0 0008+00 1/0 0/0 0/0 .text @60@__dt__14dBgS_CamGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B80() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B80.s" -} -#pragma pop - -/* 80077B88-80077B90 0724C8 0008+00 1/0 0/0 0/0 .text @20@__dt__18dBgS_CamGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B88() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B88.s" -} -#pragma pop - -/* 80077B90-80077B98 0724D0 0008+00 1/0 0/0 0/0 .text @76@__dt__18dBgS_CamGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B90() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B90.s" -} -#pragma pop - -/* 80077B98-80077BA0 0724D8 0008+00 1/0 0/0 0/0 .text @60@__dt__18dBgS_CamGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077B98() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/func_80077B98.s" -} -#pragma pop +dBgS_CamGndChk_Wtr::~dBgS_CamGndChk_Wtr() {} diff --git a/src/d/bg/d_bg_s_grp_pass_chk.cpp b/src/d/bg/d_bg_s_grp_pass_chk.cpp index a391f199026..73e799c33ec 100644 --- a/src/d/bg/d_bg_s_grp_pass_chk.cpp +++ b/src/d/bg/d_bg_s_grp_pass_chk.cpp @@ -1,6 +1,7 @@ -// -// d/bg/d_bg_s_grp_pass_chk.cpp -// +/** + * d_bg_s_grp_pass_chk.cpp + * + */ #include "d/bg/d_bg_s_grp_pass_chk.h" diff --git a/src/d/bg/d_bg_s_lin_chk.cpp b/src/d/bg/d_bg_s_lin_chk.cpp index 0b42f66990f..bce774363d3 100644 --- a/src/d/bg/d_bg_s_lin_chk.cpp +++ b/src/d/bg/d_bg_s_lin_chk.cpp @@ -1,254 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_lin_chk -// +/** + * d_bg_s_lin_chk.cpp + * BG Collision Line Check + */ #include "d/bg/d_bg_s_lin_chk.h" -#include "dol2asm.h" #include "f_op/f_op_actor_mng.h" -// -// Forward References: -// - -extern "C" void __ct__11dBgS_LinChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -extern "C" void __ct__14dBgS_CamLinChkFv(); -extern "C" void __dt__14dBgS_CamLinChkFv(); -extern "C" void __ct__21dBgS_CamLinChk_NorWtrFv(); -extern "C" void __dt__21dBgS_CamLinChk_NorWtrFv(); -extern "C" void __ct__14dBgS_ObjLinChkFv(); -extern "C" void __dt__14dBgS_ObjLinChkFv(); -extern "C" void __ct__15dBgS_LinkLinChkFv(); -extern "C" void __dt__15dBgS_LinkLinChkFv(); -extern "C" void __ct__15dBgS_BombLinChkFv(); -extern "C" void __dt__15dBgS_BombLinChkFv(); -extern "C" void __ct__16dBgS_ArrowLinChkFv(); -extern "C" void __dt__16dBgS_ArrowLinChkFv(); -extern "C" void __ct__20dBgS_BoomerangLinChkFv(); -extern "C" void __dt__20dBgS_BoomerangLinChkFv(); -extern "C" void __ct__15dBgS_RopeLinChkFv(); -extern "C" void __dt__15dBgS_RopeLinChkFv(); -extern "C" void __ct__16dBgS_HorseLinChkFv(); -extern "C" void __dt__16dBgS_HorseLinChkFv(); -extern "C" static void func_80078534(); -extern "C" static void func_8007853C(); -extern "C" static void func_80078544(); -extern "C" static void func_8007854C(); -extern "C" static void func_80078554(); -extern "C" static void func_8007855C(); -extern "C" static void func_80078564(); -extern "C" static void func_8007856C(); -extern "C" static void func_80078574(); -extern "C" static void func_8007857C(); -extern "C" static void func_80078584(); -extern "C" static void func_8007858C(); -extern "C" static void func_80078594(); -extern "C" static void func_8007859C(); -extern "C" static void func_800785A4(); -extern "C" static void func_800785AC(); -extern "C" static void func_800785B4(); -extern "C" static void func_800785BC(); -extern "C" static void func_800785C4(); -extern "C" static void func_800785CC(); -extern "C" static void func_800785D4(); -extern "C" static void func_800785DC(); -extern "C" static void func_800785E4(); -extern "C" static void func_800785EC(); -extern "C" static void func_800785F4(); -extern "C" static void func_800785FC(); -extern "C" static void func_80078604(); -extern "C" static void func_8007860C(); -extern "C" static void func_80078614(); -extern "C" static void func_8007861C(); - -// -// External References: -// - -extern "C" void __ct__8dBgS_ChkFv(); -extern "C" void __dt__8dBgS_ChkFv(); -extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv(); -extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void SetCam__16dBgS_PolyPassChkFv(); -extern "C" void SetLink__16dBgS_PolyPassChkFv(); -extern "C" void SetArrow__16dBgS_PolyPassChkFv(); -extern "C" void SetBomb__16dBgS_PolyPassChkFv(); -extern "C" void SetBoomerang__16dBgS_PolyPassChkFv(); -extern "C" void SetRope__16dBgS_PolyPassChkFv(); -extern "C" void SetHorse__16dBgS_PolyPassChkFv(); -extern "C" void __ct__11cBgS_LinChkFv(); -extern "C" void __dt__11cBgS_LinChkFv(); -extern "C" void Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803AB7C0-803AB7F0 0088E0 0030+00 2/2 0/0 0/0 .data __vt__16dBgS_HorseLinChk */ -SECTION_DATA extern void* __vt__16dBgS_HorseLinChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16dBgS_HorseLinChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_8007860C, - (void*)NULL, - (void*)NULL, - (void*)func_8007861C, - (void*)NULL, - (void*)NULL, - (void*)func_80078614, -}; - -/* 803AB7F0-803AB820 008910 0030+00 2/2 0/0 0/0 .data __vt__15dBgS_RopeLinChk */ -SECTION_DATA extern void* __vt__15dBgS_RopeLinChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15dBgS_RopeLinChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_800785F4, - (void*)NULL, - (void*)NULL, - (void*)func_80078604, - (void*)NULL, - (void*)NULL, - (void*)func_800785FC, -}; - -/* 803AB820-803AB850 008940 0030+00 2/2 0/0 0/0 .data __vt__20dBgS_BoomerangLinChk */ -SECTION_DATA extern void* __vt__20dBgS_BoomerangLinChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__20dBgS_BoomerangLinChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_800785DC, - (void*)NULL, - (void*)NULL, - (void*)func_800785EC, - (void*)NULL, - (void*)NULL, - (void*)func_800785E4, -}; - -/* 803AB850-803AB880 008970 0030+00 2/2 0/0 0/0 .data __vt__16dBgS_ArrowLinChk */ -SECTION_DATA extern void* __vt__16dBgS_ArrowLinChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16dBgS_ArrowLinChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_800785C4, - (void*)NULL, - (void*)NULL, - (void*)func_800785D4, - (void*)NULL, - (void*)NULL, - (void*)func_800785CC, -}; - -/* 803AB880-803AB8B0 0089A0 0030+00 2/2 0/0 0/0 .data __vt__15dBgS_BombLinChk */ -SECTION_DATA extern void* __vt__15dBgS_BombLinChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15dBgS_BombLinChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_800785AC, - (void*)NULL, - (void*)NULL, - (void*)func_800785BC, - (void*)NULL, - (void*)NULL, - (void*)func_800785B4, -}; - -/* 803AB8B0-803AB8E0 0089D0 0030+00 2/2 0/0 0/0 .data __vt__15dBgS_LinkLinChk */ -SECTION_DATA extern void* __vt__15dBgS_LinkLinChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15dBgS_LinkLinChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80078594, - (void*)NULL, - (void*)NULL, - (void*)func_800785A4, - (void*)NULL, - (void*)NULL, - (void*)func_8007859C, -}; - -/* 803AB8E0-803AB910 008A00 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjLinChk */ -SECTION_DATA extern void* __vt__14dBgS_ObjLinChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14dBgS_ObjLinChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_8007857C, - (void*)NULL, - (void*)NULL, - (void*)func_8007858C, - (void*)NULL, - (void*)NULL, - (void*)func_80078584, -}; - -/* 803AB910-803AB940 008A30 0030+00 2/2 0/0 0/0 .data __vt__21dBgS_CamLinChk_NorWtr */ -SECTION_DATA extern void* __vt__21dBgS_CamLinChk_NorWtr[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__21dBgS_CamLinChk_NorWtrFv, - (void*)NULL, - (void*)NULL, - (void*)func_80078564, - (void*)NULL, - (void*)NULL, - (void*)func_80078574, - (void*)NULL, - (void*)NULL, - (void*)func_8007856C, -}; - -/* 803AB940-803AB970 008A60 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_CamLinChk */ -SECTION_DATA extern void* __vt__14dBgS_CamLinChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14dBgS_CamLinChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_8007854C, - (void*)NULL, - (void*)NULL, - (void*)func_8007855C, - (void*)NULL, - (void*)NULL, - (void*)func_80078554, -}; - -/* 803AB970-803AB9A0 008A90 0030+00 2/2 0/0 0/0 .data __vt__11dBgS_LinChk */ -SECTION_DATA extern void* __vt__11dBgS_LinChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11dBgS_LinChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80078534, - (void*)NULL, - (void*)NULL, - (void*)func_80078544, - (void*)NULL, - (void*)NULL, - (void*)func_8007853C, -}; - /* 80077C68-80077CDC 0725A8 0074+00 8/8 3/3 388/388 .text __ct__11dBgS_LinChkFv */ dBgS_LinChk::dBgS_LinChk() { SetPolyPassChk(GetPolyPassChkInfo()); @@ -256,15 +13,7 @@ dBgS_LinChk::dBgS_LinChk() { } /* 80077CDC-80077D64 07261C 0088+00 12/11 5/5 378/378 .text __dt__11dBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_LinChk::~dBgS_LinChk() { -extern "C" asm void __dt__11dBgS_LinChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__11dBgS_LinChkFv.s" -} -#pragma pop +dBgS_LinChk::~dBgS_LinChk() {} /* 80077D64-80077DA4 0726A4 0040+00 0/0 15/15 307/307 .text * Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c */ @@ -285,15 +34,7 @@ dBgS_CamLinChk::dBgS_CamLinChk() { } /* 80077E00-80077E78 072740 0078+00 5/4 12/12 1/1 .text __dt__14dBgS_CamLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_CamLinChk::~dBgS_CamLinChk() { -extern "C" asm void __dt__14dBgS_CamLinChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_CamLinChkFv.s" -} -#pragma pop +dBgS_CamLinChk::~dBgS_CamLinChk() {} /* 80077E78-80077EE4 0727B8 006C+00 0/0 0/0 1/1 .text __ct__21dBgS_CamLinChk_NorWtrFv */ dBgS_CamLinChk_NorWtr::dBgS_CamLinChk_NorWtr() { @@ -302,15 +43,7 @@ dBgS_CamLinChk_NorWtr::dBgS_CamLinChk_NorWtr() { } /* 80077EE4-80077F5C 072824 0078+00 4/3 0/0 1/1 .text __dt__21dBgS_CamLinChk_NorWtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_CamLinChk_NorWtr::~dBgS_CamLinChk_NorWtr() { -extern "C" asm void __dt__21dBgS_CamLinChk_NorWtrFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__21dBgS_CamLinChk_NorWtrFv.s" -} -#pragma pop +dBgS_CamLinChk_NorWtr::~dBgS_CamLinChk_NorWtr() {} /* 80077F5C-80077FB8 07289C 005C+00 0/0 4/4 9/9 .text __ct__14dBgS_ObjLinChkFv */ dBgS_ObjLinChk::dBgS_ObjLinChk() { @@ -318,15 +51,7 @@ dBgS_ObjLinChk::dBgS_ObjLinChk() { } /* 80077FB8-80078030 0728F8 0078+00 4/3 2/2 11/11 .text __dt__14dBgS_ObjLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjLinChk::~dBgS_ObjLinChk() { -extern "C" asm void __dt__14dBgS_ObjLinChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_ObjLinChkFv.s" -} -#pragma pop +dBgS_ObjLinChk::~dBgS_ObjLinChk() {} /* 80078030-8007808C 072970 005C+00 0/0 1/1 4/4 .text __ct__15dBgS_LinkLinChkFv */ dBgS_LinkLinChk::dBgS_LinkLinChk() { @@ -334,15 +59,7 @@ dBgS_LinkLinChk::dBgS_LinkLinChk() { } /* 8007808C-80078104 0729CC 0078+00 4/3 1/1 5/5 .text __dt__15dBgS_LinkLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_LinkLinChk::~dBgS_LinkLinChk() { -extern "C" asm void __dt__15dBgS_LinkLinChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_LinkLinChkFv.s" -} -#pragma pop +dBgS_LinkLinChk::~dBgS_LinkLinChk() {} /* 80078104-80078160 072A44 005C+00 0/0 0/0 1/1 .text __ct__15dBgS_BombLinChkFv */ dBgS_BombLinChk::dBgS_BombLinChk() { @@ -350,15 +67,7 @@ dBgS_BombLinChk::dBgS_BombLinChk() { } /* 80078160-800781D8 072AA0 0078+00 4/3 0/0 1/1 .text __dt__15dBgS_BombLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_BombLinChk::~dBgS_BombLinChk() { -extern "C" asm void __dt__15dBgS_BombLinChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_BombLinChkFv.s" -} -#pragma pop +dBgS_BombLinChk::~dBgS_BombLinChk() {} /* 800781D8-80078240 072B18 0068+00 0/0 1/1 2/2 .text __ct__16dBgS_ArrowLinChkFv */ dBgS_ArrowLinChk::dBgS_ArrowLinChk() { @@ -367,15 +76,7 @@ dBgS_ArrowLinChk::dBgS_ArrowLinChk() { } /* 80078240-800782B8 072B80 0078+00 4/3 1/1 2/2 .text __dt__16dBgS_ArrowLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ArrowLinChk::~dBgS_ArrowLinChk() { -extern "C" asm void __dt__16dBgS_ArrowLinChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_ArrowLinChkFv.s" -} -#pragma pop +dBgS_ArrowLinChk::~dBgS_ArrowLinChk() {} /* 800782B8-80078314 072BF8 005C+00 0/0 1/1 1/1 .text __ct__20dBgS_BoomerangLinChkFv */ dBgS_BoomerangLinChk::dBgS_BoomerangLinChk() { @@ -383,15 +84,7 @@ dBgS_BoomerangLinChk::dBgS_BoomerangLinChk() { } /* 80078314-8007838C 072C54 0078+00 4/3 1/1 1/1 .text __dt__20dBgS_BoomerangLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_BoomerangLinChk::~dBgS_BoomerangLinChk() { -extern "C" asm void __dt__20dBgS_BoomerangLinChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__20dBgS_BoomerangLinChkFv.s" -} -#pragma pop +dBgS_BoomerangLinChk::~dBgS_BoomerangLinChk() {} /* 8007838C-800783E8 072CCC 005C+00 0/0 1/1 0/0 .text __ct__15dBgS_RopeLinChkFv */ dBgS_RopeLinChk::dBgS_RopeLinChk() { @@ -399,15 +92,7 @@ dBgS_RopeLinChk::dBgS_RopeLinChk() { } /* 800783E8-80078460 072D28 0078+00 4/3 1/1 0/0 .text __dt__15dBgS_RopeLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_RopeLinChk::~dBgS_RopeLinChk() { -extern "C" asm void __dt__15dBgS_RopeLinChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_RopeLinChkFv.s" -} -#pragma pop +dBgS_RopeLinChk::~dBgS_RopeLinChk() {} /* 80078460-800784BC 072DA0 005C+00 0/0 0/0 1/1 .text __ct__16dBgS_HorseLinChkFv */ dBgS_HorseLinChk::dBgS_HorseLinChk() { @@ -415,317 +100,4 @@ dBgS_HorseLinChk::dBgS_HorseLinChk() { } /* 800784BC-80078534 072DFC 0078+00 4/3 0/0 1/1 .text __dt__16dBgS_HorseLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_HorseLinChk::~dBgS_HorseLinChk() { -extern "C" asm void __dt__16dBgS_HorseLinChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_HorseLinChkFv.s" -} -#pragma pop - -/* 80078534-8007853C 072E74 0008+00 1/0 0/0 0/0 .text @20@__dt__11dBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078534() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_80078534.s" -} -#pragma pop - -/* 8007853C-80078544 072E7C 0008+00 1/0 0/0 0/0 .text @104@__dt__11dBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007853C() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_8007853C.s" -} -#pragma pop - -/* 80078544-8007854C 072E84 0008+00 1/0 0/0 0/0 .text @88@__dt__11dBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078544() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_80078544.s" -} -#pragma pop - -/* 8007854C-80078554 072E8C 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_CamLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007854C() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_8007854C.s" -} -#pragma pop - -/* 80078554-8007855C 072E94 0008+00 1/0 0/0 0/0 .text @104@__dt__14dBgS_CamLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078554() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_80078554.s" -} -#pragma pop - -/* 8007855C-80078564 072E9C 0008+00 1/0 0/0 0/0 .text @88@__dt__14dBgS_CamLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007855C() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_8007855C.s" -} -#pragma pop - -/* 80078564-8007856C 072EA4 0008+00 1/0 0/0 0/0 .text @20@__dt__21dBgS_CamLinChk_NorWtrFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078564() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_80078564.s" -} -#pragma pop - -/* 8007856C-80078574 072EAC 0008+00 1/0 0/0 0/0 .text @104@__dt__21dBgS_CamLinChk_NorWtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007856C() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_8007856C.s" -} -#pragma pop - -/* 80078574-8007857C 072EB4 0008+00 1/0 0/0 0/0 .text @88@__dt__21dBgS_CamLinChk_NorWtrFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078574() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_80078574.s" -} -#pragma pop - -/* 8007857C-80078584 072EBC 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007857C() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_8007857C.s" -} -#pragma pop - -/* 80078584-8007858C 072EC4 0008+00 1/0 0/0 0/0 .text @104@__dt__14dBgS_ObjLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078584() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_80078584.s" -} -#pragma pop - -/* 8007858C-80078594 072ECC 0008+00 1/0 0/0 0/0 .text @88@__dt__14dBgS_ObjLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007858C() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_8007858C.s" -} -#pragma pop - -/* 80078594-8007859C 072ED4 0008+00 1/0 0/0 0/0 .text @20@__dt__15dBgS_LinkLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078594() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_80078594.s" -} -#pragma pop - -/* 8007859C-800785A4 072EDC 0008+00 1/0 0/0 0/0 .text @104@__dt__15dBgS_LinkLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007859C() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_8007859C.s" -} -#pragma pop - -/* 800785A4-800785AC 072EE4 0008+00 1/0 0/0 0/0 .text @88@__dt__15dBgS_LinkLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785A4() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785A4.s" -} -#pragma pop - -/* 800785AC-800785B4 072EEC 0008+00 1/0 0/0 0/0 .text @20@__dt__15dBgS_BombLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785AC() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785AC.s" -} -#pragma pop - -/* 800785B4-800785BC 072EF4 0008+00 1/0 0/0 0/0 .text @104@__dt__15dBgS_BombLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785B4() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785B4.s" -} -#pragma pop - -/* 800785BC-800785C4 072EFC 0008+00 1/0 0/0 0/0 .text @88@__dt__15dBgS_BombLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785BC() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785BC.s" -} -#pragma pop - -/* 800785C4-800785CC 072F04 0008+00 1/0 0/0 0/0 .text @20@__dt__16dBgS_ArrowLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785C4() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785C4.s" -} -#pragma pop - -/* 800785CC-800785D4 072F0C 0008+00 1/0 0/0 0/0 .text @104@__dt__16dBgS_ArrowLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785CC() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785CC.s" -} -#pragma pop - -/* 800785D4-800785DC 072F14 0008+00 1/0 0/0 0/0 .text @88@__dt__16dBgS_ArrowLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785D4() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785D4.s" -} -#pragma pop - -/* 800785DC-800785E4 072F1C 0008+00 1/0 0/0 0/0 .text @20@__dt__20dBgS_BoomerangLinChkFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785DC() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785DC.s" -} -#pragma pop - -/* 800785E4-800785EC 072F24 0008+00 1/0 0/0 0/0 .text @104@__dt__20dBgS_BoomerangLinChkFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785E4() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785E4.s" -} -#pragma pop - -/* 800785EC-800785F4 072F2C 0008+00 1/0 0/0 0/0 .text @88@__dt__20dBgS_BoomerangLinChkFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785EC() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785EC.s" -} -#pragma pop - -/* 800785F4-800785FC 072F34 0008+00 1/0 0/0 0/0 .text @20@__dt__15dBgS_RopeLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785F4() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785F4.s" -} -#pragma pop - -/* 800785FC-80078604 072F3C 0008+00 1/0 0/0 0/0 .text @104@__dt__15dBgS_RopeLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_800785FC() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_800785FC.s" -} -#pragma pop - -/* 80078604-8007860C 072F44 0008+00 1/0 0/0 0/0 .text @88@__dt__15dBgS_RopeLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078604() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_80078604.s" -} -#pragma pop - -/* 8007860C-80078614 072F4C 0008+00 1/0 0/0 0/0 .text @20@__dt__16dBgS_HorseLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007860C() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_8007860C.s" -} -#pragma pop - -/* 80078614-8007861C 072F54 0008+00 1/0 0/0 0/0 .text @104@__dt__16dBgS_HorseLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078614() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_80078614.s" -} -#pragma pop - -/* 8007861C-80078624 072F5C 0008+00 1/0 0/0 0/0 .text @88@__dt__16dBgS_HorseLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007861C() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/func_8007861C.s" -} -#pragma pop +dBgS_HorseLinChk::~dBgS_HorseLinChk() {} diff --git a/src/d/bg/d_bg_s_poly_pass_chk.cpp b/src/d/bg/d_bg_s_poly_pass_chk.cpp index 5824576391a..86c7e93140b 100644 --- a/src/d/bg/d_bg_s_poly_pass_chk.cpp +++ b/src/d/bg/d_bg_s_poly_pass_chk.cpp @@ -1,77 +1,25 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_poly_pass_chk -// +/** + * d_bg_s_poly_pass_chk.h + * BG Collision Poly Passthrough Check +*/ #include "d/bg/d_bg_s_poly_pass_chk.h" -#include "dol2asm.h" -// -// Forward References: -// - -extern "C" void __ct__16dBgS_PolyPassChkFv(); -extern "C" void __dt__16dBgS_PolyPassChkFv(); -extern "C" void SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void ClrObj__16dBgS_PolyPassChkFv(); -extern "C" void SetCam__16dBgS_PolyPassChkFv(); -extern "C" void ClrCam__16dBgS_PolyPassChkFv(); -extern "C" void SetLink__16dBgS_PolyPassChkFv(); -extern "C" void ClrLink__16dBgS_PolyPassChkFv(); -extern "C" void SetArrow__16dBgS_PolyPassChkFv(); -extern "C" void SetBomb__16dBgS_PolyPassChkFv(); -extern "C" void ClrBomb__16dBgS_PolyPassChkFv(); -extern "C" void SetBoomerang__16dBgS_PolyPassChkFv(); -extern "C" void SetRope__16dBgS_PolyPassChkFv(); -extern "C" void SetUnderwaterRoof__16dBgS_PolyPassChkFv(); -extern "C" void SetHorse__16dBgS_PolyPassChkFv(); -extern "C" void ChkNoHorse__16dBgS_PolyPassChkFv(); -extern "C" void SetStatue__16dBgS_PolyPassChkFv(); -extern "C" void ClrStatue__16dBgS_PolyPassChkFv(); -extern "C" void SetIronBall__16dBgS_PolyPassChkFv(); -extern "C" void ClrIronBall__16dBgS_PolyPassChkFv(); -extern "C" void __dt__16cBgS_PolyPassChkFv(); - -// -// External References: -// - -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803ABA38-803ABA44 008B58 000C+00 2/2 0/0 0/0 .data __vt__16dBgS_PolyPassChk */ -SECTION_DATA extern void* __vt__16dBgS_PolyPassChk[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16dBgS_PolyPassChkFv, -}; - -/* 803ABA44-803ABA50 008B64 000C+00 3/3 0/0 0/0 .data __vt__16cBgS_PolyPassChk */ -SECTION_DATA extern void* __vt__16cBgS_PolyPassChk[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16cBgS_PolyPassChkFv, -}; - -dBgS_PolyPassChk::dBgS_PolyPassChk() - : mObject(false), mCamera(false), mLink(false), mArrow(false), mBomb(false), mBoomerang(false), - mRope(false), mUnderwaterRoof(false), mHorse(false), mStatue(false), mIronBall(false) {} - -/* 80078DB0-80078E0C 0736F0 005C+00 1/0 1/1 0/0 .text __dt__16dBgS_PolyPassChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_PolyPassChk::~dBgS_PolyPassChk() { -extern "C" asm void __dt__16dBgS_PolyPassChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_poly_pass_chk/__dt__16dBgS_PolyPassChkFv.s" +dBgS_PolyPassChk::dBgS_PolyPassChk() { + mObject = false; + mCamera = false; + mLink = false; + mArrow = false; + mBomb = false; + mBoomerang = false; + mRope = false; + mUnderwaterRoof = false; + mHorse = false; + mStatue = false; + mIronBall = false; } -#pragma pop + +dBgS_PolyPassChk::~dBgS_PolyPassChk() {} void dBgS_PolyPassChk::SetPassChkInfo(dBgS_PolyPassChk& chk) { *this = chk; @@ -131,9 +79,11 @@ void dBgS_PolyPassChk::SetHorse() { bool dBgS_PolyPassChk::ChkNoHorse() { if (ChkObj() || ChkCam() || ChkLink() || ChkArrow() || ChkBomb() || ChkBoomerang() || - ChkRope() || ChkUnderwaterRoof()) { + ChkRope() || ChkUnderwaterRoof()) + { return true; } + return !ChkHorse(); } @@ -152,5 +102,3 @@ void dBgS_PolyPassChk::SetIronBall() { void dBgS_PolyPassChk::ClrIronBall() { mIronBall = false; } - -cBgS_PolyPassChk::~cBgS_PolyPassChk() {} diff --git a/src/d/bg/d_bg_s_roof_chk.cpp b/src/d/bg/d_bg_s_roof_chk.cpp index db13db1670e..ab4e040fa76 100644 --- a/src/d/bg/d_bg_s_roof_chk.cpp +++ b/src/d/bg/d_bg_s_roof_chk.cpp @@ -1,6 +1,6 @@ /** * d_bg_s_roof_chk.cpp - * + * BG Collision Roof Check */ #include "d/bg/d_bg_s_roof_chk.h" diff --git a/src/d/bg/d_bg_s_sph_chk.cpp b/src/d/bg/d_bg_s_sph_chk.cpp index 7c9671a17cd..85d3b0e6787 100644 --- a/src/d/bg/d_bg_s_sph_chk.cpp +++ b/src/d/bg/d_bg_s_sph_chk.cpp @@ -1,6 +1,6 @@ /** * d_bg_s_sph_chk.cpp - * + * BG Collision Sphere Check */ #include "d/bg/d_bg_s_sph_chk.h" diff --git a/src/d/bg/d_bg_s_spl_grp_chk.cpp b/src/d/bg/d_bg_s_spl_grp_chk.cpp index aed701f8a15..848fafb5aae 100644 --- a/src/d/bg/d_bg_s_spl_grp_chk.cpp +++ b/src/d/bg/d_bg_s_spl_grp_chk.cpp @@ -1,6 +1,6 @@ /** * d_bg_s_spl_grp_chk.cpp - * + * BG Collision Special Group Check */ #include "d/bg/d_bg_s_spl_grp_chk.h" diff --git a/src/d/bg/d_bg_s_wtr_chk.cpp b/src/d/bg/d_bg_s_wtr_chk.cpp index 6e1c83835d8..2c8e5a3b2f1 100644 --- a/src/d/bg/d_bg_s_wtr_chk.cpp +++ b/src/d/bg/d_bg_s_wtr_chk.cpp @@ -1,6 +1,6 @@ /** * d_bg_s_wtr_chk.cpp - * + * BG Collision Water Check */ #include "d/bg/d_bg_s_wtr_chk.h" diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index ef72b21eeb9..30c3353d8d9 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -88,10 +88,6 @@ static int dkWmark_Delete(dkWmark_c* i_this) { return 1; } -inline bool fopAcM_gc_c::getTriPla(cM3dGPla* i_plane) { - return dComIfG_Bgsp().GetTriPla(*(dBgS_GndChk*)mGndCheck, i_plane); -} - /* 802616C4-80261964 25C004 02A0+00 2/2 0/0 0/0 .text setMatrix__9dkWmark_cFv */ BOOL dkWmark_c::setMatrix() { cXyz chk_pos(mPos.x, mPos.y + 100.0f, mPos.z); diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index 28d7fe6f2c9..03e00a2411a 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -15,14 +15,6 @@ /* 80454FF0-80454FF8 0035F0 0007+01 1/1 0/0 0/0 .sdata2 l_arcName */ static const char l_arcName[] = "Always"; -inline int fopAcM_gc_c::getRoomId() { - return dComIfG_Bgsp().GetRoomId(*(dBgS_GndChk*)mGndCheck); -} - -inline int fopAcM_gc_c::getPolyColor() { - return dComIfG_Bgsp().GetPolyColor(*(dBgS_GndChk*)mGndCheck); -} - /* 80261B54-80261F04 25C494 03B0+00 1/1 0/0 0/0 .text create__11dkWpillar_cFv */ int dkWpillar_c::create() { new (this) dkWpillar_c(); diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index 32b555c52fb..30ea35ac452 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -385,12 +385,3 @@ void dLib_time_c::startTime() { m_timeStopped = false; } } - -/* ############################################################################################## */ -/* 80450DF0-80450DF8 -00001 0008+00 0/0 4/4 0/0 .sbss None */ -/* 80450DF0 0001+00 data_80450DF0 None */ -/* 80450DF1 0001+00 data_80450DF1 None */ -/* 80450DF2 0001+00 data_80450DF2 None */ -/* 80450DF3 0005+00 data_80450DF3 None */ -extern u8 struct_80450DF0[8]; -u8 struct_80450DF0[8] ALIGN_DECL(8); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 24858228bec..1df3eea83c6 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -8,7 +8,6 @@ #include "JSystem/JKernel/JKRSolidHeap.h" #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_math.h" -#include "d/a/d_a_player.h" #include "d/d_item.h" #include "d/d_path.h" #include "d/d_procname.h" @@ -21,6 +20,7 @@ #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_mtx.h" #include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h" +#include "d/a/d_a_player.h" #define MAKE_ITEM_PARAMS(itemNo, itemBitNo, param_2, param_3) \ ((itemNo & 0xFF) << 0 | (itemBitNo & 0xFF) << 0x8 | param_2 << 0x10 | (param_3 & 0xF) << 0x18) @@ -29,9 +29,6 @@ // Types: // -struct l_HIO { - /* 8001E098 */ ~l_HIO(); -}; // // Forward References: @@ -2022,9 +2019,10 @@ s32 fopAcM_plAngleCheck(fopAc_ac_c const* i_actor, s16 i_angle) { return 1; } -/* ############################################################################################## */ -/* 803F1C00-803F1C0C 01E920 000C+00 1/1 0/0 0/0 .bss @4176 */ -static u8 lit_4176[12]; +/* 80450CCC-80450CD0 0001CC 0001+03 1/1 0/0 0/0 .sbss l_hio */ +static l_HIO l_hio; + +static fopAcM_lc_c l_actorLC; /* 803F1C0C-803F1C18 01E92C 000C+00 0/0 0/0 0/0 .bss @5078 */ #pragma push @@ -2050,26 +2048,11 @@ static u8 lit_5115[12]; static u8 max[12]; #pragma pop -/* 803F1C3C-803F1C48 01E95C 000C+00 0/1 0/0 0/0 .bss @6481 */ -#pragma push -#pragma force_active on -static u8 lit_6481[12]; -#pragma pop - /* 803F1C48-803F1CB8 01E968 0070+00 1/2 4/4 9/9 .bss mLineCheck__11fopAcM_lc_c */ -u8 fopAcM_lc_c::mLineCheck[112]; - -/* 803F1CB8-803F1CC4 01E9D8 000C+00 0/1 0/0 0/0 .bss @6503 */ -#pragma push -#pragma force_active on -static u8 lit_6503[12]; -#pragma pop +dBgS_ObjLinChk fopAcM_lc_c::mLineCheck; /* 803F1CC4-803F1D18 01E9E4 0054+00 2/3 6/6 26/26 .bss mGndCheck__11fopAcM_gc_c */ -u8 fopAcM_gc_c::mGndCheck[84]; - -/* 80450CCC-80450CD0 0001CC 0001+03 1/1 0/0 0/0 .sbss l_hio */ -static u8 l_hio[1 + 3 /* padding */]; +dBgS_ObjGndChk fopAcM_gc_c::mGndCheck; /* 80450CD0-80450CD4 0001D0 0004+00 2/2 7/7 103/103 .sbss mGroundY__11fopAcM_gc_c */ f32 fopAcM_gc_c::mGroundY; @@ -2340,30 +2323,17 @@ fopAc_ac_c* fopAcM_searchFromName4Event(char const* name, s16 eventID) { return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObject4EventCB, &prm); } -/* ############################################################################################## */ -/* 803F1D18-803F1D24 01EA38 000C+00 0/1 0/0 0/0 .bss @6509 */ -#pragma push -#pragma force_active on -static u8 lit_6509[12]; -#pragma pop - /* 803F1D24-803F1D74 01EA44 0050+00 1/2 1/1 1/1 .bss mRoofCheck__11fopAcM_rc_c */ -u8 fopAcM_rc_c::mRoofCheck[80]; - -/* 803F1D74-803F1D80 01EA94 000C+00 0/1 0/0 0/0 .bss @6519 */ -#pragma push -#pragma force_active on -static u8 lit_6519[12]; -#pragma pop +dBgS_ObjRoofChk fopAcM_rc_c::mRoofCheck; /* 803F1D80-803F1DD8 01EAA0 0054+04 2/3 3/3 4/4 .bss mWaterCheck__11fopAcM_wt_c */ -u8 fopAcM_wt_c::mWaterCheck[84 + 4 /* padding */]; +dBgS_WtrChk fopAcM_wt_c::mWaterCheck; /* 80450CD4-80450CD8 0001D4 0004+00 1/1 0/0 3/3 .sbss mRoofY__11fopAcM_rc_c */ f32 fopAcM_rc_c::mRoofY; /* 80450CD8-80450CE0 0001D8 0004+04 2/2 4/4 19/19 .sbss mWaterY__11fopAcM_wt_c */ -f32 fopAcM_wt_c::mWaterY[1 + 1 /* padding */]; +f32 fopAcM_wt_c::mWaterY; /* 80451C58-80451C5C 000258 0004+00 2/2 0/0 0/0 .sdata2 @6353 */ SECTION_SDATA2 static f32 lit_6353 = -1000000000.0f; @@ -2497,8 +2467,8 @@ asm s16 fopAcM_getPolygonAngle(cM3dGPla const* param_0, s16 param_1) { /* 8001DC68-8001DCBC 0185A8 0054+00 0/0 5/5 21/21 .text * lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c */ bool fopAcM_lc_c::lineCheck(cXyz const* param_0, cXyz const* param_1, fopAc_ac_c const* param_2) { - ((dBgS_LinChk*)mLineCheck)->Set(param_0, param_1, param_2); - dComIfG_Bgsp().LineCross((cBgS_LinChk*)mLineCheck); + mLineCheck.Set(param_0, param_1, param_2); + dComIfG_Bgsp().LineCross(&mLineCheck); } /* 8001DCBC-8001DD1C 0185FC 0060+00 1/1 10/10 108/108 .text gndCheck__11fopAcM_gc_cFPC4cXyz */ @@ -2558,232 +2528,4 @@ void fopAcM_initManager() { /* empty function */ } -/* ############################################################################################## */ -/* 803A37CC-803A37FC 0008EC 0030+00 2/2 0/0 0/0 .data __vt__15dBgS_ObjRoofChk */ -SECTION_DATA extern void* __vt__15dBgS_ObjRoofChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15dBgS_ObjRoofChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_8001E104, - (void*)NULL, - (void*)NULL, - (void*)func_8001E114, - (void*)NULL, - (void*)NULL, - (void*)func_8001E10C, -}; - -/* 803A37FC-803A382C 00091C 0030+00 1/1 2/2 0/0 .data __vt__11dBgS_WtrChk */ -SECTION_DATA extern void* __vt__11dBgS_WtrChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11dBgS_WtrChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_8001E0EC, - (void*)NULL, - (void*)NULL, - (void*)func_8001E0FC, - (void*)NULL, - (void*)NULL, - (void*)func_8001E0F4, -}; - -/* 803A382C-803A3860 00094C 0030+04 2/2 10/10 0/0 .data __vt__14dBgS_ObjGndChk */ -SECTION_DATA extern void* __vt__14dBgS_ObjGndChk[12 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14dBgS_ObjGndChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_8001E0D4, - (void*)NULL, - (void*)NULL, - (void*)func_8001E0E4, - (void*)NULL, - (void*)NULL, - (void*)func_8001E0DC, - /* padding */ - NULL, -}; - -/* 8001DE14-8001DF30 018754 011C+00 0/0 1/0 0/0 .text __sinit_f_op_actor_mng_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_f_op_actor_mng_cpp(){nofralloc -#include "asm/f_op/f_op_actor_mng/__sinit_f_op_actor_mng_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8001DE14, __sinit_f_op_actor_mng_cpp); -#pragma pop - -/* 8001DF30-8001DFA8 018870 0078+00 5/4 0/0 0/0 .text __dt__11dBgS_WtrChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_WtrChk::~dBgS_WtrChk() { -extern "C" asm void __dt__11dBgS_WtrChkFv() { - nofralloc -#include "asm/f_op/f_op_actor_mng/__dt__11dBgS_WtrChkFv.s" -} -#pragma pop - -/* 8001DFA8-8001E020 0188E8 0078+00 5/4 0/0 0/0 .text __dt__15dBgS_ObjRoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjRoofChk::~dBgS_ObjRoofChk() { -extern "C" asm void __dt__15dBgS_ObjRoofChkFv() { - nofralloc -#include "asm/f_op/f_op_actor_mng/__dt__15dBgS_ObjRoofChkFv.s" -} -#pragma pop - -/* 8001E020-8001E098 018960 0078+00 5/4 0/0 0/0 .text __dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { -extern "C" asm void __dt__14dBgS_ObjGndChkFv() { - nofralloc -#include "asm/f_op/f_op_actor_mng/__dt__14dBgS_ObjGndChkFv.s" -} -#pragma pop - -/* 8001E098-8001E0D4 0189D8 003C+00 1/1 0/0 0/0 .text __dt__5l_HIOFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm l_HIO::~l_HIO() { - nofralloc -#include "asm/f_op/f_op_actor_mng/__dt__5l_HIOFv.s" -} -#pragma pop - -/* 8001E0D4-8001E0DC 018A14 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8001E0D4() { - nofralloc -#include "asm/f_op/f_op_actor_mng/func_8001E0D4.s" -} -#pragma pop - -/* 8001E0DC-8001E0E4 018A1C 0008+00 1/0 0/0 0/0 .text @76@__dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8001E0DC() { - nofralloc -#include "asm/f_op/f_op_actor_mng/func_8001E0DC.s" -} -#pragma pop - -/* 8001E0E4-8001E0EC 018A24 0008+00 1/0 0/0 0/0 .text @60@__dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8001E0E4() { - nofralloc -#include "asm/f_op/f_op_actor_mng/func_8001E0E4.s" -} -#pragma pop - -/* 8001E0EC-8001E0F4 018A2C 0008+00 1/0 0/0 0/0 .text @16@__dt__11dBgS_WtrChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8001E0EC() { - nofralloc -#include "asm/f_op/f_op_actor_mng/func_8001E0EC.s" -} -#pragma pop - -/* 8001E0F4-8001E0FC 018A34 0008+00 1/0 0/0 0/0 .text @52@__dt__11dBgS_WtrChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8001E0F4() { - nofralloc -#include "asm/f_op/f_op_actor_mng/func_8001E0F4.s" -} -#pragma pop - -/* 8001E0FC-8001E104 018A3C 0008+00 1/0 0/0 0/0 .text @36@__dt__11dBgS_WtrChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8001E0FC() { - nofralloc -#include "asm/f_op/f_op_actor_mng/func_8001E0FC.s" -} -#pragma pop - -/* 8001E104-8001E10C 018A44 0008+00 1/0 0/0 0/0 .text @16@__dt__15dBgS_ObjRoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8001E104() { - nofralloc -#include "asm/f_op/f_op_actor_mng/func_8001E104.s" -} -#pragma pop - -/* 8001E10C-8001E114 018A4C 0008+00 1/0 0/0 0/0 .text @52@__dt__15dBgS_ObjRoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8001E10C() { - nofralloc -#include "asm/f_op/f_op_actor_mng/func_8001E10C.s" -} -#pragma pop - -/* 8001E114-8001E11C 018A54 0008+00 1/0 0/0 0/0 .text @36@__dt__15dBgS_ObjRoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8001E114() { - nofralloc -#include "asm/f_op/f_op_actor_mng/func_8001E114.s" -} -#pragma pop - -/* 8001E11C-8001E120 018A5C 0004+00 0/0 1/0 0/0 .text onFrollCrashFlg__9daPy_py_cFUci */ -// void daPy_py_c::onFrollCrashFlg(u8 param_0, int param_1) { -extern "C" void onFrollCrashFlg__9daPy_py_cFUci() { - /* empty function */ -} - -/* 8001E120-8001E128 018A60 0008+00 0/0 1/0 0/0 .text checkWolfDash__9daPy_py_cCFv */ -// int daPy_py_c::checkWolfDash() const { -extern "C" int checkWolfDash__9daPy_py_cCFv() { - return false; -} - -/* 8001E128-8001E130 018A68 0008+00 0/0 1/0 0/0 .text checkFrontRoll__9daPy_py_cCFv */ -// int daPy_py_c::checkFrontRoll() const { -extern "C" int checkFrontRoll__9daPy_py_cCFv() { - return false; -} - -/* 8001E130-8001E138 018A70 0008+00 0/0 1/0 0/0 .text checkHorseRide__9daPy_py_cCFv */ -// u32 daPy_py_c::checkHorseRide() const { -extern "C" u32 checkHorseRide__9daPy_py_cCFv() { - return false; -} - -/* 8001E138-8001E140 018A78 0008+00 0/0 1/0 0/0 .text getGrabActorID__9daPy_py_cCFv */ -// s32 daPy_py_c::getGrabActorID() const { -extern "C" s32 getGrabActorID__9daPy_py_cCFv() { - return -1; -} - -/* 803788C8-803788C8 004F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma nosyminline on \ No newline at end of file diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index 4a4d35f810b..61c682fe1bf 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -9,6 +9,39 @@ #include "f_op/f_op_draw_tag.h" #include "f_pc/f_pc_manager.h" +// TODO: this is a hack to get f_op_actor_mng.cpp weak function order correct +// at the moment, if these are made into inlined virtuals, they incorrectly generate before thunks + +/* 8001E11C-8001E120 018A5C 0004+00 0/0 1/0 0/0 .text onFrollCrashFlg__9daPy_py_cFUci */ +// void daPy_py_c::onFrollCrashFlg(u8 param_0, int param_1) { +extern "C" void onFrollCrashFlg__9daPy_py_cFUci() { + /* empty function */ +} + +/* 8001E120-8001E128 018A60 0008+00 0/0 1/0 0/0 .text checkWolfDash__9daPy_py_cCFv */ +// int daPy_py_c::checkWolfDash() const { +extern "C" int checkWolfDash__9daPy_py_cCFv() { + return false; +} + +/* 8001E128-8001E130 018A68 0008+00 0/0 1/0 0/0 .text checkFrontRoll__9daPy_py_cCFv */ +// int daPy_py_c::checkFrontRoll() const { +extern "C" int checkFrontRoll__9daPy_py_cCFv() { + return false; +} + +/* 8001E130-8001E138 018A70 0008+00 0/0 1/0 0/0 .text checkHorseRide__9daPy_py_cCFv */ +// u32 daPy_py_c::checkHorseRide() const { +extern "C" u32 checkHorseRide__9daPy_py_cCFv() { + return false; +} + +/* 8001E138-8001E140 018A78 0008+00 0/0 1/0 0/0 .text getGrabActorID__9daPy_py_cCFv */ +// s32 daPy_py_c::getGrabActorID() const { +extern "C" s32 getGrabActorID__9daPy_py_cCFv() { + return -1; +} + /* 8001E140-8001E180 018A80 0040+00 1/0 0/0 0/0 .text fopCam_Draw__FP12camera_class */ static s32 fopCam_Draw(camera_class* i_this) { s32 cam_proc = 1;