From 5e05ae38f8541fddd79341bdcf75488b07ca9122 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sun, 15 Jan 2023 11:10:23 -0800 Subject: [PATCH 1/2] d_a_b_oh2 / d_a_obj_web0 / d_a_obj_web1 (#243) * d_a_obj_web0 / d_a_obj_web1 * remove asm * d_a_set_bgobj * d_cc_s work * remove asm * build fix * fix tp.py progress check and rel sha1 check * clean up some bg files --- .clang-format | 15 +- Progress.md | 36 +- asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s | 32 - asm/d/bg/d_bg_s_chk/func_80077574.s | 3 - .../d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s | 39 - asm/d/bg/d_bg_s_roof_chk/func_8007914C.s | 3 - asm/d/bg/d_bg_s_roof_chk/func_80079154.s | 3 - asm/d/bg/d_bg_s_roof_chk/func_8007915C.s | 3 - asm/d/bg/d_bg_s_sph_chk/func_80078B70.s | 3 - asm/d/bg/d_bg_s_sph_chk/func_80078B78.s | 3 - asm/d/bg/d_bg_s_sph_chk/func_80078B80.s | 3 - asm/d/bg/d_bg_s_sph_chk/func_80078B88.s | 3 - asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s | 3 - asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s | 3 - asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s | 3 - asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s | 26 - ...CcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s | 72 -- asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s | 8 - ...fP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s | 147 --- ...12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s | 28 - ...ange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s | 127 --- ...ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s | 52 - asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s | 51 - ..._4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s | 223 ----- asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s | 39 - ...hapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s | 161 --- asm/d/cc/d_cc_s/func_800861B4.s | 38 - asm/d/cc/d_cc_s/func_80086AC0.s | 192 ---- .../d_a_b_oh2/__dt__12J3DFrameCtrlFv.s | 20 - .../d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s | 17 - .../a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s | 17 - .../d_a_b_oh2/action__FP11b_oh2_class.s | 146 --- .../daB_OH2_Create__FP10fopAc_ac_c.s | 104 -- .../daB_OH2_Delete__FP11b_oh2_class.s | 22 - .../d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s | 40 - .../daB_OH2_Execute__FP11b_oh2_class.s | 62 -- .../d_a_b_oh2/dmcalc__FP11b_oh2_class.s | 223 ----- .../d_a_b_oh2/nodeCallBack__FP8J3DJointi.s | 64 -- .../d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s | 198 ---- .../d_a_mg_rod/uki_catch__FP13dmg_rod_class.s | 8 +- .../CreateInit__12daSetBgObj_cFv.s | 34 - .../d_a_set_bgobj/Delete__12daSetBgObj_cFv.s | 13 - .../d_a_set_bgobj/create__12daSetBgObj_cFv.s | 39 - .../daSetBgObj_Create__FP10fopAc_ac_c.s | 9 - .../daSetBgObj_Delete__FP12daSetBgObj_c.s | 9 - .../daNpc_Henna_Create__FP10fopAc_ac_c.s | 20 +- .../demo_camera_shop__FP15npc_henna_class.s | 8 +- .../env_control__FP15npc_henna_class.s | 8 +- .../henna_shop__FP15npc_henna_class.s | 8 +- .../daNpc_Inko_Execute__FP14npc_inko_class.s | 16 +- .../d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s | 7 - .../d_a_obj_web0/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s | 20 - .../d_a_obj_web0/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_web0/__dt__8cM3dGSphFv.s | 20 - .../d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s | 16 - .../daObj_Web0_Create__FP10fopAc_ac_c.s | 189 ---- .../daObj_Web0_Delete__FP14obj_web0_class.s | 28 - .../daObj_Web0_Draw__FP14obj_web0_class.s | 32 - .../useHeapInit__FP10fopAc_ac_c.s | 117 --- .../d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s | 7 - .../d_a_obj_web1/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s | 20 - .../d_a_obj_web1/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_web1/__dt__8cM3dGCylFv.s | 20 - .../d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s | 16 - .../d_a_obj_web1/action__FP14obj_web1_class.s | 172 ---- .../daObj_Web1_Create__FP10fopAc_ac_c.s | 184 ---- .../daObj_Web1_Delete__FP14obj_web1_class.s | 34 - .../daObj_Web1_Draw__FP14obj_web1_class.s | 32 - .../daObj_Web1_Execute__FP14obj_web1_class.s | 186 ---- ..._back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s | 57 -- .../useHeapInit__FP10fopAc_ac_c.s | 128 --- include/JSystem/J3DGraphAnimator/J3DModel.h | 1 + .../JSystem/J3DGraphAnimator/J3DMtxBuffer.h | 1 + include/SSystem/SComponent/c_bg_w.h | 2 +- include/SSystem/SComponent/c_cc_d.h | 46 +- include/SSystem/SComponent/c_cc_s.h | 3 +- include/SSystem/SComponent/c_m3d_g_cps.h | 8 +- include/SSystem/SComponent/c_m3d_g_sph.h | 6 +- include/SSystem/SComponent/c_xyz.h | 1 + include/Z2AudioLib/Z2Creature.h | 9 +- include/c/c_damagereaction.h | 4 + include/d/a/d_a_item_static.h | 4 +- include/d/a/d_a_obj_item.h | 8 + include/d/a/d_a_player.h | 6 +- include/d/bg/d_bg_s.h | 2 + include/d/bg/d_bg_w.h | 1 + include/d/cc/d_cc_d.h | 167 +++- include/d/cc/d_cc_s.h | 12 +- include/d/com/d_com_inf_game.h | 86 +- include/d/d_item_data.h | 4 +- include/d/d_jnt_col.h | 12 +- include/d/particle/d_particle.h | 1 + include/dolphin/gx/GX.h | 4 + include/f_op/f_op_actor_mng.h | 18 + include/m_Do/m_Do_mtx.h | 16 +- include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h | 39 +- include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h | 13 +- .../rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h | 31 +- .../rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h | 36 +- rel/d/a/b/d_a_b_go/d_a_b_go.cpp | 1 - rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp | 763 ++++++--------- rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp | 2 +- rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp | 219 ++--- rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp | 2 +- rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp | 2 +- rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp | 681 ++++++------- rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp | 918 ++++++------------ src/c/c_damagereaction.cpp | 13 +- src/d/a/d_a_obj_item.cpp | 150 ++- src/d/bg/d_bg_pc.cpp | 7 +- src/d/bg/d_bg_s.cpp | 21 - src/d/bg/d_bg_s_chk.cpp | 61 +- src/d/bg/d_bg_s_movebg_actor.cpp | 15 - src/d/bg/d_bg_s_roof_chk.cpp | 97 +- src/d/bg/d_bg_s_sph_chk.cpp | 103 +- src/d/bg/d_bg_s_spl_grp_chk.cpp | 88 +- src/d/bg/d_bg_s_wtr_chk.cpp | 7 +- src/d/bg/d_bg_w_base.cpp | 121 +-- src/d/cc/d_cc_mass_s.cpp | 13 +- src/d/cc/d_cc_s.cpp | 847 ++++++++++------ src/d/com/d_com_static.cpp | 4 +- src/d/d_jnt_col.cpp | 21 +- src/m_Do/m_Do_machine_exception.cpp | 17 - tools/tp.py | 11 +- 126 files changed, 2217 insertions(+), 6277 deletions(-) delete mode 100644 asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s delete mode 100644 asm/d/bg/d_bg_s_chk/func_80077574.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/func_8007914C.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/func_80079154.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/func_8007915C.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/func_80078B70.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/func_80078B78.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/func_80078B80.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/func_80078B88.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s delete mode 100644 asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s delete mode 100644 asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s delete mode 100644 asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s delete mode 100644 asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s delete mode 100644 asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s delete mode 100644 asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s delete mode 100644 asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s delete mode 100644 asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s delete mode 100644 asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s delete mode 100644 asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s delete mode 100644 asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s delete mode 100644 asm/d/cc/d_cc_s/func_800861B4.s delete mode 100644 asm/d/cc/d_cc_s/func_80086AC0.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s delete mode 100644 asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s diff --git a/.clang-format b/.clang-format index 79d9ae3b2e5..867b90cecc5 100644 --- a/.clang-format +++ b/.clang-format @@ -20,7 +20,19 @@ AlwaysBreakTemplateDeclarations: true BinPackArguments: true BinPackParameters: true BreakBeforeBinaryOperators: None -BreakBeforeBraces: Attach +BreakBeforeBraces: Custom +BraceWrapping: + AfterControlStatement: MultiLine + AfterFunction: false + AfterEnum: false + AfterClass: false + AfterCaseLabel: false + AfterNamespace: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeElse: false + BeforeWhile: false BreakBeforeTernaryOperators: false BreakConstructorInitializersBeforeComma: false ColumnLimit: 100 @@ -57,6 +69,7 @@ PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Left +ReferenceAlignment: Left ReflowComments: true SortIncludes: true SpaceAfterCStyleCast: false diff --git a/Progress.md b/Progress.md index de4e5c62a26..583bcfc3c56 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 21.920933% | 788396 | 3596544 +.text | 22.050391% | 793052 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 30.152472% | 1212332 | 4020672 +Total | 30.268274% | 1216988 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 30.152472% | 1212332 | 4020672 -RELs | 33.321461% | 3832076 | 11500324 -Total | 32.500543% | 5044408 | 15520996 +main.dol | 30.268274% | 1216988 | 4020672 +RELs | 33.041295% | 3799856 | 11500324 +Total | 32.322951% | 5016844 | 15520996 ## RELs @@ -37,7 +37,7 @@ d_a_vrbox | 48.327138% | 1040 | 2152 d_a_sq | 35.488722% | 3776 | 10640 d_a_ppolamp | 42.341463% | 1736 | 4100 d_a_demo_item | 33.863165% | 3920 | 11576 -d_a_cstaf | 100.000000% | 11860 | 11860 +d_a_cstaf | 32.377740% | 3840 | 11860 d_a_bg | 41.505376% | 3860 | 9300 d_a_tboxSw | 100.000000% | 1016 | 1016 d_a_title | 39.558574% | 2796 | 7068 @@ -94,7 +94,7 @@ d_a_grass | 49.074395% | 28312 | 57692 d_a_dshutter | 46.003263% | 2256 | 4904 d_a_tbox | 30.165503% | 9332 | 30936 d_a_peru | 33.139234% | 10244 | 30912 -d_a_set_bgobj | 65.342960% | 724 | 1108 +d_a_set_bgobj | 100.000000% | 1108 | 1108 d_a_mant | 86.020312% | 40316 | 46868 d_a_cstatue | 29.155833% | 6728 | 23076 d_a_swTime | 63.076923% | 656 | 1040 @@ -167,7 +167,7 @@ d_a_tag_mwait | 35.082873% | 1016 | 2896 d_a_tag_ajnot | 56.493506% | 696 | 1232 d_a_tag_hstop | 100.000000% | 3424 | 3424 d_a_tag_chgrestart | 48.868778% | 864 | 1768 -d_a_tag_cstasw | 100.000000% | 2560 | 2560 +d_a_tag_cstasw | 51.406250% | 1316 | 2560 d_a_tag_lv5soup | 100.000000% | 1908 | 1908 d_a_tag_lantern | 52.013423% | 1240 | 2384 d_a_tag_guard | 54.421769% | 640 | 1176 @@ -181,7 +181,7 @@ d_a_door_push | 37.997725% | 2672 | 7032 d_a_door_shutter | 37.465797% | 14240 | 38008 d_a_door_bossL5 | 39.221790% | 4032 | 10280 d_a_door_mbossL1 | 34.467633% | 10372 | 30092 -d_a_door_bossl1 | 100.000000% | 18732 | 18732 +d_a_door_bossl1 | 39.355114% | 7372 | 18732 d_a_door_knob00 | 37.500000% | 4608 | 12288 d_a_door_boss | 40.856890% | 3700 | 9056 d_a_kytag10 | 31.720430% | 944 | 2976 @@ -300,7 +300,7 @@ d_a_obj_gm | 35.212957% | 4696 | 13336 d_a_obj_szbridge | 43.280632% | 1752 | 4048 d_a_obj_lv3Water | 44.263566% | 4568 | 10320 d_a_obj_lv1Candle00 | 41.348158% | 2380 | 5756 -d_a_obj_ktonfire | 100.000000% | 4404 | 4404 +d_a_obj_ktonfire | 45.504087% | 2004 | 4404 d_a_obj_sw | 27.590884% | 4068 | 14744 d_a_obj_lv6bemos2 | 32.122093% | 7072 | 22016 d_a_obj_kazeneko | 45.277127% | 2320 | 5124 @@ -354,7 +354,7 @@ d_a_obj_bubblePilar | 44.760583% | 2580 | 5764 d_a_obj_well_cover | 45.704467% | 1596 | 3492 d_a_obj_mato | 37.093023% | 2552 | 6880 d_a_obj_lv4RailWall | 41.496973% | 3016 | 7268 -d_a_obj_stonemark | 100.000000% | 2040 | 2040 +d_a_obj_stonemark | 52.549020% | 1072 | 2040 d_a_obj_gomikabe | 37.032799% | 3884 | 10488 d_a_obj_lv5IceWall | 39.937435% | 3064 | 7672 d_a_obj_life_container | 34.456243% | 3764 | 10924 @@ -384,7 +384,7 @@ d_a_obj_stopper | 31.675996% | 3848 | 12148 d_a_obj_ten | 30.064631% | 5396 | 17948 d_a_obj_mhole | 35.548173% | 2140 | 6020 d_a_obj_fmobj | 55.200000% | 1104 | 2000 -d_a_obj_swallshutter | 100.000000% | 5864 | 5864 +d_a_obj_swallshutter | 41.268759% | 2420 | 5864 d_a_obj_takaraDai | 46.376812% | 2304 | 4968 d_a_obj_ice_l | 34.815373% | 1848 | 5308 d_a_obj_fallobj | 31.929604% | 2032 | 6364 @@ -403,7 +403,7 @@ d_a_obj_swBallA | 35.803945% | 2396 | 6692 d_a_obj_cwall | 30.455195% | 5968 | 19596 d_a_obj_picture | 35.041841% | 4020 | 11472 d_a_obj_ladder | 42.348485% | 2236 | 5280 -d_a_obj_gptaru | 100.000000% | 14020 | 14020 +d_a_obj_gptaru | 33.238231% | 4660 | 14020 d_a_obj_rotTrap | 45.877144% | 3316 | 7228 d_a_obj_swspinner | 39.141631% | 1824 | 4660 d_a_obj_lv3saka00 | 50.576369% | 1404 | 2776 @@ -461,7 +461,7 @@ d_a_obj_lv8Lift | 35.532359% | 3404 | 9580 d_a_obj_zcloth | 52.373418% | 1324 | 2528 d_a_obj_katatsumuri | 31.170697% | 5208 | 16708 d_a_obj_togeTrap | 41.746183% | 3500 | 8384 -d_a_obj_web0 | 44.054441% | 2460 | 5584 +d_a_obj_web0 | 75.286533% | 4204 | 5584 d_a_obj_ganonwall | 38.930481% | 1456 | 3740 d_a_obj_kantera | 37.623762% | 2432 | 6464 d_a_obj_gra_rock | 37.947123% | 2928 | 7716 @@ -523,9 +523,9 @@ d_a_obj_kbacket | 33.053127% | 3932 | 11896 d_a_obj_lv4prelvtr | 48.664688% | 1312 | 2696 d_a_obj_ihasi | 43.372216% | 1636 | 3772 d_a_obj_pdwall | 40.192308% | 1672 | 4160 -d_a_obj_web1 | 42.480942% | 2452 | 5772 +d_a_obj_web1 | 100.000000% | 5772 | 5772 d_a_obj_hfuta | 39.073970% | 2768 | 7084 -d_a_obj_lv2candle | 100.000000% | 6960 | 6960 +d_a_obj_lv2candle | 38.160920% | 2656 | 6960 d_a_obj_wood_pendulum | 44.455748% | 1748 | 3932 d_a_obj_onsen | 49.239281% | 1424 | 2892 d_a_obj_hasu2 | 41.190476% | 1384 | 3360 @@ -781,8 +781,8 @@ d_a_b_zant | 22.203940% | 19432 | 87516 d_a_b_gos | 43.551689% | 3404 | 7816 d_a_b_dr | 27.536664% | 18476 | 67096 d_a_b_zant_mobile | 36.326402% | 4612 | 12696 -d_a_b_oh2 | 37.960954% | 2100 | 5532 +d_a_b_oh2 | 100.000000% | 5532 | 5532 d_a_b_bq | 28.033347% | 11164 | 39824 d_a_b_zant_sima | 40.995025% | 1648 | 4020 d_a_b_gm | 30.376176% | 11628 | 38280 -Total | 33.321461% | 3832076 | 11500324 +Total | 33.041295% | 3799856 | 11500324 diff --git a/asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s b/asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s deleted file mode 100644 index 6a2e31a8204..00000000000 --- a/asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800774E8: -/* 800774E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800774EC 7C 08 02 A6 */ mflr r0 -/* 800774F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800774F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800774F8 93 C1 00 08 */ stw r30, 8(r1) -/* 800774FC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80077500 7C 9F 23 78 */ mr r31, r4 -/* 80077504 41 82 00 40 */ beq lbl_80077544 -/* 80077508 3C 60 80 3B */ lis r3, __vt__8dBgS_Chk@ha /* 0x803AB670@ha */ -/* 8007750C 38 63 B6 70 */ addi r3, r3, __vt__8dBgS_Chk@l /* 0x803AB670@l */ -/* 80077510 90 7E 00 00 */ stw r3, 0(r30) -/* 80077514 38 03 00 0C */ addi r0, r3, 0xc -/* 80077518 90 1E 00 10 */ stw r0, 0x10(r30) -/* 8007751C 38 7E 00 10 */ addi r3, r30, 0x10 -/* 80077520 38 80 00 00 */ li r4, 0 -/* 80077524 48 00 06 A1 */ bl __dt__15dBgS_GrpPassChkFv -/* 80077528 7F C3 F3 78 */ mr r3, r30 -/* 8007752C 38 80 00 00 */ li r4, 0 -/* 80077530 48 00 18 81 */ bl __dt__16dBgS_PolyPassChkFv -/* 80077534 7F E0 07 35 */ extsh. r0, r31 -/* 80077538 40 81 00 0C */ ble lbl_80077544 -/* 8007753C 7F C3 F3 78 */ mr r3, r30 -/* 80077540 48 25 77 FD */ bl __dl__FPv -lbl_80077544: -/* 80077544 7F C3 F3 78 */ mr r3, r30 -/* 80077548 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007754C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80077550 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077554 7C 08 03 A6 */ mtlr r0 -/* 80077558 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007755C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_chk/func_80077574.s b/asm/d/bg/d_bg_s_chk/func_80077574.s deleted file mode 100644 index a8786a3ad12..00000000000 --- a/asm/d/bg/d_bg_s_chk/func_80077574.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80077574: -/* 80077574 38 63 FF F0 */ addi r3, r3, -16 -/* 80077578 4B FF FF 70 */ b __dt__8dBgS_ChkFv diff --git a/asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s b/asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s deleted file mode 100644 index 0889f89f37f..00000000000 --- a/asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80079090: -/* 80079090 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80079094 7C 08 02 A6 */ mflr r0 -/* 80079098 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007909C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800790A0 93 C1 00 08 */ stw r30, 8(r1) -/* 800790A4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 800790A8 7C 9F 23 78 */ mr r31, r4 -/* 800790AC 41 82 00 5C */ beq lbl_80079108 -/* 800790B0 3C 60 80 3B */ lis r3, __vt__12dBgS_RoofChk@ha /* 0x803ABA50@ha */ -/* 800790B4 38 63 BA 50 */ addi r3, r3, __vt__12dBgS_RoofChk@l /* 0x803ABA50@l */ -/* 800790B8 90 7E 00 0C */ stw r3, 0xc(r30) -/* 800790BC 38 03 00 0C */ addi r0, r3, 0xc -/* 800790C0 90 1E 00 20 */ stw r0, 0x20(r30) -/* 800790C4 38 03 00 18 */ addi r0, r3, 0x18 -/* 800790C8 90 1E 00 24 */ stw r0, 0x24(r30) -/* 800790CC 38 03 00 24 */ addi r0, r3, 0x24 -/* 800790D0 90 1E 00 34 */ stw r0, 0x34(r30) -/* 800790D4 38 7E 00 24 */ addi r3, r30, 0x24 -/* 800790D8 38 80 00 00 */ li r4, 0 -/* 800790DC 4B FF E4 0D */ bl __dt__8dBgS_ChkFv -/* 800790E0 38 7E 00 10 */ addi r3, r30, 0x10 -/* 800790E4 38 80 00 00 */ li r4, 0 -/* 800790E8 48 1E EA 89 */ bl __dt__8cBgS_ChkFv -/* 800790EC 7F C3 F3 78 */ mr r3, r30 -/* 800790F0 38 80 00 00 */ li r4, 0 -/* 800790F4 48 1E EF BD */ bl __dt__13cBgS_PolyInfoFv -/* 800790F8 7F E0 07 35 */ extsh. r0, r31 -/* 800790FC 40 81 00 0C */ ble lbl_80079108 -/* 80079100 7F C3 F3 78 */ mr r3, r30 -/* 80079104 48 25 5C 39 */ bl __dl__FPv -lbl_80079108: -/* 80079108 7F C3 F3 78 */ mr r3, r30 -/* 8007910C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80079110 83 C1 00 08 */ lwz r30, 8(r1) -/* 80079114 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80079118 7C 08 03 A6 */ mtlr r0 -/* 8007911C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80079120 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_roof_chk/func_8007914C.s b/asm/d/bg/d_bg_s_roof_chk/func_8007914C.s deleted file mode 100644 index d0be4b27775..00000000000 --- a/asm/d/bg/d_bg_s_roof_chk/func_8007914C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007914C: -/* 8007914C 38 63 FF F0 */ addi r3, r3, -16 -/* 80079150 4B FF FF 40 */ b __dt__12dBgS_RoofChkFv diff --git a/asm/d/bg/d_bg_s_roof_chk/func_80079154.s b/asm/d/bg/d_bg_s_roof_chk/func_80079154.s deleted file mode 100644 index 60f8eb63c23..00000000000 --- a/asm/d/bg/d_bg_s_roof_chk/func_80079154.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80079154: -/* 80079154 38 63 FF CC */ addi r3, r3, -52 -/* 80079158 4B FF FF 38 */ b __dt__12dBgS_RoofChkFv diff --git a/asm/d/bg/d_bg_s_roof_chk/func_8007915C.s b/asm/d/bg/d_bg_s_roof_chk/func_8007915C.s deleted file mode 100644 index 1d3e4b92cbf..00000000000 --- a/asm/d/bg/d_bg_s_roof_chk/func_8007915C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8007915C: -/* 8007915C 38 63 FF DC */ addi r3, r3, -36 -/* 80079160 4B FF FF 30 */ b __dt__12dBgS_RoofChkFv diff --git a/asm/d/bg/d_bg_s_sph_chk/func_80078B70.s b/asm/d/bg/d_bg_s_sph_chk/func_80078B70.s deleted file mode 100644 index b819d5414b6..00000000000 --- a/asm/d/bg/d_bg_s_sph_chk/func_80078B70.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078B70: -/* 80078B70 38 63 FF EC */ addi r3, r3, -20 -/* 80078B74 4B FF FF 4C */ b __dt__11dBgS_SphChkFv diff --git a/asm/d/bg/d_bg_s_sph_chk/func_80078B78.s b/asm/d/bg/d_bg_s_sph_chk/func_80078B78.s deleted file mode 100644 index 03f2360f7e0..00000000000 --- a/asm/d/bg/d_bg_s_sph_chk/func_80078B78.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078B78: -/* 80078B78 38 63 FF DC */ addi r3, r3, -36 -/* 80078B7C 4B FF FF 44 */ b __dt__11dBgS_SphChkFv diff --git a/asm/d/bg/d_bg_s_sph_chk/func_80078B80.s b/asm/d/bg/d_bg_s_sph_chk/func_80078B80.s deleted file mode 100644 index cbea27e447d..00000000000 --- a/asm/d/bg/d_bg_s_sph_chk/func_80078B80.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078B80: -/* 80078B80 38 63 FF B8 */ addi r3, r3, -72 -/* 80078B84 4B FF FF 3C */ b __dt__11dBgS_SphChkFv diff --git a/asm/d/bg/d_bg_s_sph_chk/func_80078B88.s b/asm/d/bg/d_bg_s_sph_chk/func_80078B88.s deleted file mode 100644 index 926bf7e4f10..00000000000 --- a/asm/d/bg/d_bg_s_sph_chk/func_80078B88.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078B88: -/* 80078B88 38 63 FF C8 */ addi r3, r3, -56 -/* 80078B8C 4B FF FF 34 */ b __dt__11dBgS_SphChkFv diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s b/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s deleted file mode 100644 index 7642295c535..00000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078D4C: -/* 80078D4C 38 63 FF F0 */ addi r3, r3, -16 -/* 80078D50 4B FF FF 28 */ b __dt__14dBgS_SplGrpChkFv diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s b/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s deleted file mode 100644 index f1167fcc89b..00000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078D54: -/* 80078D54 38 63 FF CC */ addi r3, r3, -52 -/* 80078D58 4B FF FF 20 */ b __dt__14dBgS_SplGrpChkFv diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s b/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s deleted file mode 100644 index faafca6cac7..00000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80078D5C: -/* 80078D5C 38 63 FF DC */ addi r3, r3, -36 -/* 80078D60 4B FF FF 18 */ b __dt__14dBgS_SplGrpChkFv diff --git a/asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s b/asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s deleted file mode 100644 index e75aedc0448..00000000000 --- a/asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8007E640: -/* 8007E640 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007E644 7C 08 02 A6 */ mflr r0 -/* 8007E648 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007E64C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007E650 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8007E654 41 82 00 30 */ beq lbl_8007E684 -/* 8007E658 3C 60 80 3B */ lis r3, __vt__9dBgW_Base@ha /* 0x803ABCC8@ha */ -/* 8007E65C 38 03 BC C8 */ addi r0, r3, __vt__9dBgW_Base@l /* 0x803ABCC8@l */ -/* 8007E660 90 1F 00 04 */ stw r0, 4(r31) -/* 8007E664 41 82 00 10 */ beq lbl_8007E674 -/* 8007E668 3C 60 80 3B */ lis r3, __vt__9cBgW_BgId@ha /* 0x803ABDB8@ha */ -/* 8007E66C 38 03 BD B8 */ addi r0, r3, __vt__9cBgW_BgId@l /* 0x803ABDB8@l */ -/* 8007E670 90 1F 00 04 */ stw r0, 4(r31) -lbl_8007E674: -/* 8007E674 7C 80 07 35 */ extsh. r0, r4 -/* 8007E678 40 81 00 0C */ ble lbl_8007E684 -/* 8007E67C 7F E3 FB 78 */ mr r3, r31 -/* 8007E680 48 25 06 BD */ bl __dl__FPv -lbl_8007E684: -/* 8007E684 7F E3 FB 78 */ mr r3, r31 -/* 8007E688 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007E68C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007E690 7C 08 03 A6 */ mtlr r0 -/* 8007E694 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007E698 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s b/asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s deleted file mode 100644 index 591d09f8a32..00000000000 --- a/asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80086754: -/* 80086754 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80086758 7C 08 02 A6 */ mflr r0 -/* 8008675C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086760 39 61 00 30 */ addi r11, r1, 0x30 -/* 80086764 48 2D BA 79 */ bl _savegpr_29 -/* 80086768 7C BD 2B 78 */ mr r29, r5 -/* 8008676C 7C DE 33 78 */ mr r30, r6 -/* 80086770 7C FF 3B 78 */ mr r31, r7 -/* 80086774 C0 04 00 84 */ lfs f0, 0x84(r4) -/* 80086778 D0 01 00 08 */ stfs f0, 8(r1) -/* 8008677C C0 04 00 88 */ lfs f0, 0x88(r4) -/* 80086780 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80086784 C0 04 00 8C */ lfs f0, 0x8c(r4) -/* 80086788 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8008678C 38 61 00 08 */ addi r3, r1, 8 -/* 80086790 48 2C 09 C1 */ bl PSVECMag -/* 80086794 FC 00 0A 10 */ fabs f0, f1 -/* 80086798 FC 20 00 18 */ frsp f1, f0 -/* 8008679C C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 800867A0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800867A4 40 80 00 88 */ bge lbl_8008682C -/* 800867A8 80 9D 00 0C */ lwz r4, 0xc(r29) -/* 800867AC 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 800867B0 28 04 00 00 */ cmplwi r4, 0 -/* 800867B4 41 82 00 0C */ beq lbl_800867C0 -/* 800867B8 28 03 00 00 */ cmplwi r3, 0 -/* 800867BC 40 82 00 1C */ bne lbl_800867D8 -lbl_800867C0: -/* 800867C0 C0 02 8D 78 */ lfs f0, lit_3705(r2) -/* 800867C4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800867C8 D0 01 00 08 */ stfs f0, 8(r1) -/* 800867CC C0 02 8D 80 */ lfs f0, lit_3925(r2) -/* 800867D0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800867D4 48 00 00 64 */ b lbl_80086838 -lbl_800867D8: -/* 800867D8 38 63 04 D0 */ addi r3, r3, 0x4d0 -/* 800867DC 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 800867E0 38 A1 00 08 */ addi r5, r1, 8 -/* 800867E4 48 2C 08 D1 */ bl PSVECSubtract -/* 800867E8 38 61 00 08 */ addi r3, r1, 8 -/* 800867EC 48 2C 09 65 */ bl PSVECMag -/* 800867F0 FC 00 0A 10 */ fabs f0, f1 -/* 800867F4 FC 20 00 18 */ frsp f1, f0 -/* 800867F8 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 800867FC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80086800 40 80 00 1C */ bge lbl_8008681C -/* 80086804 C0 02 8D 78 */ lfs f0, lit_3705(r2) -/* 80086808 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8008680C D0 01 00 08 */ stfs f0, 8(r1) -/* 80086810 C0 02 8D 80 */ lfs f0, lit_3925(r2) -/* 80086814 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80086818 48 00 00 20 */ b lbl_80086838 -lbl_8008681C: -/* 8008681C 38 61 00 08 */ addi r3, r1, 8 -/* 80086820 7C 64 1B 78 */ mr r4, r3 -/* 80086824 48 2C 08 D1 */ bl PSVECNormalize -/* 80086828 48 00 00 10 */ b lbl_80086838 -lbl_8008682C: -/* 8008682C 38 61 00 08 */ addi r3, r1, 8 -/* 80086830 7C 64 1B 78 */ mr r4, r3 -/* 80086834 48 2C 08 C1 */ bl PSVECNormalize -lbl_80086838: -/* 80086838 38 61 00 08 */ addi r3, r1, 8 -/* 8008683C 7F E4 FB 78 */ mr r4, r31 -/* 80086840 48 1E 7D 31 */ bl cM3d_CalcVecZAngle__FRC3VecP5csXyz -/* 80086844 39 61 00 30 */ addi r11, r1, 0x30 -/* 80086848 48 2D B9 E1 */ bl _restgpr_29 -/* 8008684C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80086850 7C 08 03 A6 */ mtlr r0 -/* 80086854 38 21 00 30 */ addi r1, r1, 0x30 -/* 80086858 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s b/asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s deleted file mode 100644 index b28c4c267f0..00000000000 --- a/asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80087330: -/* 80087330 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80087334 3C 60 80 3B */ lis r3, m_mtrl_hit_tbl__4dCcS@ha /* 0x803AC3A4@ha */ -/* 80087338 38 03 C3 A4 */ addi r0, r3, m_mtrl_hit_tbl__4dCcS@l /* 0x803AC3A4@l */ -/* 8008733C 7C 60 22 14 */ add r3, r0, r4 -/* 80087340 54 A0 1D 78 */ rlwinm r0, r5, 3, 0x15, 0x1c -/* 80087344 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80087348 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s b/asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 63b64691d27..00000000000 --- a/asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,147 +0,0 @@ -lbl_80086D8C: -/* 80086D8C 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80086D90 7C 08 02 A6 */ mflr r0 -/* 80086D94 90 01 00 94 */ stw r0, 0x94(r1) -/* 80086D98 DB E1 00 88 */ stfd f31, 0x88(r1) -/* 80086D9C 39 61 00 88 */ addi r11, r1, 0x88 -/* 80086DA0 48 2D B4 25 */ bl _savegpr_23 -/* 80086DA4 7C 79 1B 78 */ mr r25, r3 -/* 80086DA8 7C 97 23 78 */ mr r23, r4 -/* 80086DAC 7C B8 2B 78 */ mr r24, r5 -/* 80086DB0 FF E0 08 90 */ fmr f31, f1 -/* 80086DB4 7C DA 33 78 */ mr r26, r6 -/* 80086DB8 7C FB 3B 78 */ mr r27, r7 -/* 80086DBC 7D 1C 43 78 */ mr r28, r8 -/* 80086DC0 A0 03 28 04 */ lhz r0, 0x2804(r3) -/* 80086DC4 28 00 00 00 */ cmplwi r0, 0 -/* 80086DC8 40 82 00 0C */ bne lbl_80086DD4 -/* 80086DCC 38 60 00 00 */ li r3, 0 -/* 80086DD0 48 00 01 D0 */ b lbl_80086FA0 -lbl_80086DD4: -/* 80086DD4 54 03 13 BA */ rlwinm r3, r0, 2, 0xe, 0x1d -/* 80086DD8 3B A3 10 00 */ addi r29, r3, 0x1000 -/* 80086DDC 7F B9 EA 14 */ add r29, r25, r29 -/* 80086DE0 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80086DE4 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80086DE8 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086DEC 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80086DF0 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80086DF4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086DF8 38 61 00 3C */ addi r3, r1, 0x3c -/* 80086DFC 48 1E 81 8D */ bl __ct__8cM3dGCpsFv -/* 80086E00 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80086E04 38 63 36 08 */ addi r3, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80086E08 90 61 00 38 */ stw r3, 0x38(r1) -/* 80086E0C 3B E3 00 58 */ addi r31, r3, 0x58 -/* 80086E10 93 E1 00 54 */ stw r31, 0x54(r1) -/* 80086E14 3B C1 00 3C */ addi r30, r1, 0x3c -/* 80086E18 7F C3 F3 78 */ mr r3, r30 -/* 80086E1C 7E E4 BB 78 */ mr r4, r23 -/* 80086E20 7F 05 C3 78 */ mr r5, r24 -/* 80086E24 FC 20 F8 90 */ fmr f1, f31 -/* 80086E28 48 1E 81 D9 */ bl Set__8cM3dGCpsFRC4cXyzRC4cXyzf -/* 80086E2C 38 61 00 1C */ addi r3, r1, 0x1c -/* 80086E30 48 1D D1 95 */ bl CalcAabBox__12cCcD_CpsAttrFv -/* 80086E34 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80086E38 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80086E3C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80086E40 38 79 28 08 */ addi r3, r25, 0x2808 -/* 80086E44 38 81 00 0C */ addi r4, r1, 0xc -/* 80086E48 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80086E4C 48 1D C8 55 */ bl CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab -/* 80086E50 3B 39 10 00 */ addi r25, r25, 0x1000 -/* 80086E54 48 00 01 00 */ b lbl_80086F54 -lbl_80086E58: -/* 80086E58 80 79 00 00 */ lwz r3, 0(r25) -/* 80086E5C 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80086E60 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80086E64 41 82 00 EC */ beq lbl_80086F50 -/* 80086E68 48 1D CB E1 */ bl GetAc__8cCcD_ObjFv -/* 80086E6C 7C 03 D0 40 */ cmplw r3, r26 -/* 80086E70 41 82 00 E0 */ beq lbl_80086F50 -/* 80086E74 80 79 00 00 */ lwz r3, 0(r25) -/* 80086E78 48 1D CB D1 */ bl GetAc__8cCcD_ObjFv -/* 80086E7C 7C 03 D8 40 */ cmplw r3, r27 -/* 80086E80 41 82 00 D0 */ beq lbl_80086F50 -/* 80086E84 80 79 00 00 */ lwz r3, 0(r25) -/* 80086E88 48 1D CB C1 */ bl GetAc__8cCcD_ObjFv -/* 80086E8C 7C 03 E0 40 */ cmplw r3, r28 -/* 80086E90 41 82 00 C0 */ beq lbl_80086F50 -/* 80086E94 80 79 00 00 */ lwz r3, 0(r25) -/* 80086E98 38 63 00 48 */ addi r3, r3, 0x48 -/* 80086E9C 38 81 00 0C */ addi r4, r1, 0xc -/* 80086EA0 48 1D C4 C9 */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo -/* 80086EA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086EA8 41 82 00 A8 */ beq lbl_80086F50 -/* 80086EAC 80 79 00 00 */ lwz r3, 0(r25) -/* 80086EB0 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80086EB4 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80086EB8 7D 89 03 A6 */ mtctr r12 -/* 80086EBC 4E 80 04 21 */ bctrl -/* 80086EC0 28 03 00 00 */ cmplwi r3, 0 -/* 80086EC4 41 82 00 10 */ beq lbl_80086ED4 -/* 80086EC8 80 03 00 E8 */ lwz r0, 0xe8(r3) -/* 80086ECC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80086ED0 40 82 00 80 */ bne lbl_80086F50 -lbl_80086ED4: -/* 80086ED4 80 79 00 00 */ lwz r3, 0(r25) -/* 80086ED8 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80086EDC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80086EE0 7D 89 03 A6 */ mtctr r12 -/* 80086EE4 4E 80 04 21 */ bctrl -/* 80086EE8 38 81 00 1C */ addi r4, r1, 0x1c -/* 80086EEC 38 A1 00 08 */ addi r5, r1, 8 -/* 80086EF0 81 83 00 1C */ lwz r12, 0x1c(r3) -/* 80086EF4 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80086EF8 7D 89 03 A6 */ mtctr r12 -/* 80086EFC 4E 80 04 21 */ bctrl -/* 80086F00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086F04 41 82 00 4C */ beq lbl_80086F50 -/* 80086F08 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80086F0C 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80086F10 90 01 00 18 */ stw r0, 0x18(r1) -/* 80086F14 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80086F18 38 03 36 08 */ addi r0, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80086F1C 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086F20 93 E1 00 54 */ stw r31, 0x54(r1) -/* 80086F24 7F C3 F3 78 */ mr r3, r30 -/* 80086F28 38 80 00 00 */ li r4, 0 -/* 80086F2C 48 1E 80 79 */ bl __dt__8cM3dGCpsFv -/* 80086F30 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80086F34 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80086F38 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086F3C 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80086F40 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80086F44 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086F48 38 60 00 01 */ li r3, 1 -/* 80086F4C 48 00 00 54 */ b lbl_80086FA0 -lbl_80086F50: -/* 80086F50 3B 39 00 04 */ addi r25, r25, 4 -lbl_80086F54: -/* 80086F54 7C 19 E8 40 */ cmplw r25, r29 -/* 80086F58 41 80 FF 00 */ blt lbl_80086E58 -/* 80086F5C 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80086F60 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80086F64 90 01 00 18 */ stw r0, 0x18(r1) -/* 80086F68 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80086F6C 38 03 36 08 */ addi r0, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80086F70 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086F74 93 E1 00 54 */ stw r31, 0x54(r1) -/* 80086F78 7F C3 F3 78 */ mr r3, r30 -/* 80086F7C 38 80 00 00 */ li r4, 0 -/* 80086F80 48 1E 80 25 */ bl __dt__8cM3dGCpsFv -/* 80086F84 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80086F88 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80086F8C 90 01 00 38 */ stw r0, 0x38(r1) -/* 80086F90 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80086F94 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80086F98 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086F9C 38 60 00 00 */ li r3, 0 -lbl_80086FA0: -/* 80086FA0 CB E1 00 88 */ lfd f31, 0x88(r1) -/* 80086FA4 39 61 00 88 */ addi r11, r1, 0x88 -/* 80086FA8 48 2D B2 69 */ bl _restgpr_23 -/* 80086FAC 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80086FB0 7C 08 03 A6 */ mtlr r0 -/* 80086FB4 38 21 00 90 */ addi r1, r1, 0x90 -/* 80086FB8 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s b/asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s deleted file mode 100644 index f9c8d890c5f..00000000000 --- a/asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8008734C: -/* 8008734C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80087350 7C 08 02 A6 */ mflr r0 -/* 80087354 90 01 00 14 */ stw r0, 0x14(r1) -/* 80087358 80 05 00 9C */ lwz r0, 0x9c(r5) -/* 8008735C 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 -/* 80087360 41 82 00 2C */ beq lbl_8008738C -/* 80087364 88 04 00 75 */ lbz r0, 0x75(r4) -/* 80087368 28 00 00 00 */ cmplwi r0, 0 -/* 8008736C 40 82 00 20 */ bne lbl_8008738C -/* 80087370 80 E4 00 10 */ lwz r7, 0x10(r4) -/* 80087374 3C C0 00 10 */ lis r6, 0x0010 /* 0x00101C00@ha */ -/* 80087378 38 06 1C 00 */ addi r0, r6, 0x1C00 /* 0x00101C00@l */ -/* 8008737C 7C E0 00 39 */ and. r0, r7, r0 -/* 80087380 41 82 00 0C */ beq lbl_8008738C -/* 80087384 38 60 00 01 */ li r3, 1 -/* 80087388 48 00 00 18 */ b lbl_800873A0 -lbl_8008738C: -/* 8008738C 88 84 00 75 */ lbz r4, 0x75(r4) -/* 80087390 88 A5 00 B9 */ lbz r5, 0xb9(r5) -/* 80087394 4B FF FF 9D */ bl ChkAtTgMtrlHit__4dCcSFUcUc -/* 80087398 7C 60 00 34 */ cntlzw r0, r3 -/* 8008739C 54 03 D9 7E */ srwi r3, r0, 5 -lbl_800873A0: -/* 800873A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800873A4 7C 08 03 A6 */ mtlr r0 -/* 800873A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800873AC 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s b/asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s deleted file mode 100644 index 2029fe74d17..00000000000 --- a/asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_80085F28: -/* 80085F28 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80085F2C 7C 08 02 A6 */ mflr r0 -/* 80085F30 90 01 00 54 */ stw r0, 0x54(r1) -/* 80085F34 39 61 00 50 */ addi r11, r1, 0x50 -/* 80085F38 48 2D C2 91 */ bl _savegpr_24 -/* 80085F3C 7C 78 1B 78 */ mr r24, r3 -/* 80085F40 7C 99 23 78 */ mr r25, r4 -/* 80085F44 7C BA 2B 78 */ mr r26, r5 -/* 80085F48 7C DB 33 78 */ mr r27, r6 -/* 80085F4C 7C FC 3B 78 */ mr r28, r7 -/* 80085F50 7F 23 CB 78 */ mr r3, r25 -/* 80085F54 81 99 00 3C */ lwz r12, 0x3c(r25) -/* 80085F58 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80085F5C 7D 89 03 A6 */ mtctr r12 -/* 80085F60 4E 80 04 21 */ bctrl -/* 80085F64 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80085F68 40 82 00 0C */ bne lbl_80085F74 -/* 80085F6C 38 60 00 00 */ li r3, 0 -/* 80085F70 48 00 01 70 */ b lbl_800860E0 -lbl_80085F74: -/* 80085F74 7F 43 D3 78 */ mr r3, r26 -/* 80085F78 81 9A 00 3C */ lwz r12, 0x3c(r26) -/* 80085F7C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80085F80 7D 89 03 A6 */ mtctr r12 -/* 80085F84 4E 80 04 21 */ bctrl -/* 80085F88 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80085F8C 40 82 00 0C */ bne lbl_80085F98 -/* 80085F90 38 60 00 00 */ li r3, 0 -/* 80085F94 48 00 01 4C */ b lbl_800860E0 -lbl_80085F98: -/* 80085F98 48 1D DA B1 */ bl GetAc__8cCcD_ObjFv -/* 80085F9C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80085FA0 40 82 00 0C */ bne lbl_80085FAC -/* 80085FA4 38 60 00 00 */ li r3, 0 -/* 80085FA8 48 00 01 38 */ b lbl_800860E0 -lbl_80085FAC: -/* 80085FAC 7F 03 C3 78 */ mr r3, r24 -/* 80085FB0 7F A4 EB 78 */ mr r4, r29 -/* 80085FB4 80 B9 00 44 */ lwz r5, 0x44(r25) -/* 80085FB8 80 DA 00 44 */ lwz r6, 0x44(r26) -/* 80085FBC 38 E1 00 10 */ addi r7, r1, 0x10 -/* 80085FC0 81 98 28 48 */ lwz r12, 0x2848(r24) -/* 80085FC4 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80085FC8 7D 89 03 A6 */ mtctr r12 -/* 80085FCC 4E 80 04 21 */ bctrl -/* 80085FD0 2C 1B 00 00 */ cmpwi r27, 0 -/* 80085FD4 41 82 00 B4 */ beq lbl_80086088 -/* 80085FD8 83 BF 05 28 */ lwz r29, 0x528(r31) -/* 80085FDC 28 1D 00 00 */ cmplwi r29, 0 -/* 80085FE0 41 82 00 A8 */ beq lbl_80086088 -/* 80085FE4 7F A3 EB 78 */ mr r3, r29 -/* 80085FE8 7F 84 E3 78 */ mr r4, r28 -/* 80085FEC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80085FF0 38 C1 00 24 */ addi r6, r1, 0x24 -/* 80085FF4 38 E1 00 08 */ addi r7, r1, 8 -/* 80085FF8 39 00 00 00 */ li r8, 0 -/* 80085FFC 4B FB 0C 49 */ bl getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi -/* 80086000 2C 03 00 00 */ cmpwi r3, 0 -/* 80086004 41 80 00 7C */ blt lbl_80086080 -/* 80086008 80 9D 00 00 */ lwz r4, 0(r29) -/* 8008600C 1C 03 00 0C */ mulli r0, r3, 0xc -/* 80086010 7C 64 02 14 */ add r3, r4, r0 -/* 80086014 88 03 00 01 */ lbz r0, 1(r3) -/* 80086018 2C 00 00 03 */ cmpwi r0, 3 -/* 8008601C 40 82 00 64 */ bne lbl_80086080 -/* 80086020 38 61 00 10 */ addi r3, r1, 0x10 -/* 80086024 4B F8 6E E9 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz -/* 80086028 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8008602C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80086030 3C 80 80 43 */ lis r4, BaseZ__4cXyz@ha /* 0x80430D3C@ha */ -/* 80086034 38 84 0D 3C */ addi r4, r4, BaseZ__4cXyz@l /* 0x80430D3C@l */ -/* 80086038 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8008603C 48 2C 0E 11 */ bl PSMTXMultVecSR -/* 80086040 38 61 00 08 */ addi r3, r1, 8 -/* 80086044 4B F8 6E C9 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz -/* 80086048 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8008604C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80086050 3C 80 80 43 */ lis r4, BaseZ__4cXyz@ha /* 0x80430D3C@ha */ -/* 80086054 38 84 0D 3C */ addi r4, r4, BaseZ__4cXyz@l /* 0x80430D3C@l */ -/* 80086058 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8008605C 48 2C 0D F1 */ bl PSMTXMultVecSR -/* 80086060 38 61 00 24 */ addi r3, r1, 0x24 -/* 80086064 38 81 00 18 */ addi r4, r1, 0x18 -/* 80086068 48 2C 11 2D */ bl PSVECDotProduct -/* 8008606C C0 02 8D 78 */ lfs f0, lit_3705(r2) -/* 80086070 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80086074 7C 00 00 26 */ mfcr r0 -/* 80086078 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 8008607C 48 00 00 64 */ b lbl_800860E0 -lbl_80086080: -/* 80086080 38 60 00 00 */ li r3, 0 -/* 80086084 48 00 00 5C */ b lbl_800860E0 -lbl_80086088: -/* 80086088 80 7E 00 E0 */ lwz r3, 0xe0(r30) -/* 8008608C 28 03 00 00 */ cmplwi r3, 0 -/* 80086090 41 82 00 0C */ beq lbl_8008609C -/* 80086094 A8 83 00 00 */ lha r4, 0(r3) -/* 80086098 48 00 00 08 */ b lbl_800860A0 -lbl_8008609C: -/* 8008609C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -lbl_800860A0: -/* 800860A0 AB BE 00 E4 */ lha r29, 0xe4(r30) -/* 800860A4 2C 1B 00 00 */ cmpwi r27, 0 -/* 800860A8 41 82 00 0C */ beq lbl_800860B4 -/* 800860AC 7F A0 0E 70 */ srawi r0, r29, 1 -/* 800860B0 7C 1D 07 34 */ extsh r29, r0 -lbl_800860B4: -/* 800860B4 A8 61 00 12 */ lha r3, 0x12(r1) -/* 800860B8 3C 63 00 01 */ addis r3, r3, 1 -/* 800860BC 38 03 80 00 */ addi r0, r3, -32768 -/* 800860C0 7C 03 07 34 */ extsh r3, r0 -/* 800860C4 48 1E AD 61 */ bl cLib_distanceAngleS__Fss -/* 800860C8 7F A0 07 34 */ extsh r0, r29 -/* 800860CC 7C 03 00 00 */ cmpw r3, r0 -/* 800860D0 40 81 00 0C */ ble lbl_800860DC -/* 800860D4 38 60 00 00 */ li r3, 0 -/* 800860D8 48 00 00 08 */ b lbl_800860E0 -lbl_800860DC: -/* 800860DC 38 60 00 01 */ li r3, 1 -lbl_800860E0: -/* 800860E0 39 61 00 50 */ addi r11, r1, 0x50 -/* 800860E4 48 2D C1 31 */ bl _restgpr_24 -/* 800860E8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 800860EC 7C 08 03 A6 */ mtlr r0 -/* 800860F0 38 21 00 50 */ addi r1, r1, 0x50 -/* 800860F4 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s b/asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s deleted file mode 100644 index a5cd524ee82..00000000000 --- a/asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_800860F8: -/* 800860F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800860FC 7C 08 02 A6 */ mflr r0 -/* 80086100 90 01 00 24 */ stw r0, 0x24(r1) -/* 80086104 39 61 00 20 */ addi r11, r1, 0x20 -/* 80086108 48 2D C0 C9 */ bl _savegpr_26 -/* 8008610C 7C 7A 1B 78 */ mr r26, r3 -/* 80086110 7C 9B 23 78 */ mr r27, r4 -/* 80086114 7C BC 2B 78 */ mr r28, r5 -/* 80086118 7C DD 33 78 */ mr r29, r6 -/* 8008611C 7C FE 3B 78 */ mr r30, r7 -/* 80086120 7D 1F 43 78 */ mr r31, r8 -/* 80086124 7F A3 EB 78 */ mr r3, r29 -/* 80086128 4B FF E2 B5 */ bl ChkAtNoGuard__12dCcD_GObjInfFv -/* 8008612C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086130 41 82 00 0C */ beq lbl_8008613C -/* 80086134 38 60 00 00 */ li r3, 0 -/* 80086138 48 00 00 60 */ b lbl_80086198 -lbl_8008613C: -/* 8008613C 80 7E 00 9C */ lwz r3, 0x9c(r30) -/* 80086140 54 66 07 FF */ clrlwi. r6, r3, 0x1f -/* 80086144 40 82 00 20 */ bne lbl_80086164 -/* 80086148 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 -/* 8008614C 40 82 00 18 */ bne lbl_80086164 -/* 80086150 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b -/* 80086154 41 82 00 40 */ beq lbl_80086194 -/* 80086158 88 1D 00 77 */ lbz r0, 0x77(r29) -/* 8008615C 2C 00 00 08 */ cmpwi r0, 8 -/* 80086160 40 82 00 34 */ bne lbl_80086194 -lbl_80086164: -/* 80086164 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c -/* 80086168 41 82 00 24 */ beq lbl_8008618C -/* 8008616C 7F 43 D3 78 */ mr r3, r26 -/* 80086170 7F 64 DB 78 */ mr r4, r27 -/* 80086174 7F 85 E3 78 */ mr r5, r28 -/* 80086178 7C C0 00 34 */ cntlzw r0, r6 -/* 8008617C 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 80086180 7F E7 FB 78 */ mr r7, r31 -/* 80086184 4B FF FD A5 */ bl ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz -/* 80086188 48 00 00 10 */ b lbl_80086198 -lbl_8008618C: -/* 8008618C 38 60 00 01 */ li r3, 1 -/* 80086190 48 00 00 08 */ b lbl_80086198 -lbl_80086194: -/* 80086194 38 60 00 00 */ li r3, 0 -lbl_80086198: -/* 80086198 39 61 00 20 */ addi r11, r1, 0x20 -/* 8008619C 48 2D C0 81 */ bl _restgpr_26 -/* 800861A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800861A4 7C 08 03 A6 */ mtlr r0 -/* 800861A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800861AC 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s b/asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s deleted file mode 100644 index 380d5e181e6..00000000000 --- a/asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80086360: -/* 80086360 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80086364 28 00 00 FF */ cmplwi r0, 0xff -/* 80086368 40 82 00 0C */ bne lbl_80086374 -/* 8008636C 38 60 00 0A */ li r3, 0xa -/* 80086370 4E 80 00 20 */ blr -lbl_80086374: -/* 80086374 28 00 00 FE */ cmplwi r0, 0xfe -/* 80086378 40 82 00 0C */ bne lbl_80086384 -/* 8008637C 38 60 00 09 */ li r3, 9 -/* 80086380 4E 80 00 20 */ blr -lbl_80086384: -/* 80086384 28 00 00 D9 */ cmplwi r0, 0xd9 -/* 80086388 41 80 00 0C */ blt lbl_80086394 -/* 8008638C 38 60 00 08 */ li r3, 8 -/* 80086390 4E 80 00 20 */ blr -lbl_80086394: -/* 80086394 28 00 00 B5 */ cmplwi r0, 0xb5 -/* 80086398 41 80 00 0C */ blt lbl_800863A4 -/* 8008639C 38 60 00 07 */ li r3, 7 -/* 800863A0 4E 80 00 20 */ blr -lbl_800863A4: -/* 800863A4 28 00 00 91 */ cmplwi r0, 0x91 -/* 800863A8 41 80 00 0C */ blt lbl_800863B4 -/* 800863AC 38 60 00 06 */ li r3, 6 -/* 800863B0 4E 80 00 20 */ blr -lbl_800863B4: -/* 800863B4 28 00 00 6D */ cmplwi r0, 0x6d -/* 800863B8 41 80 00 0C */ blt lbl_800863C4 -/* 800863BC 38 60 00 05 */ li r3, 5 -/* 800863C0 4E 80 00 20 */ blr -lbl_800863C4: -/* 800863C4 28 00 00 49 */ cmplwi r0, 0x49 -/* 800863C8 41 80 00 0C */ blt lbl_800863D4 -/* 800863CC 38 60 00 04 */ li r3, 4 -/* 800863D0 4E 80 00 20 */ blr -lbl_800863D4: -/* 800863D4 28 00 00 25 */ cmplwi r0, 0x25 -/* 800863D8 41 80 00 0C */ blt lbl_800863E4 -/* 800863DC 38 60 00 03 */ li r3, 3 -/* 800863E0 4E 80 00 20 */ blr -lbl_800863E4: -/* 800863E4 28 00 00 02 */ cmplwi r0, 2 -/* 800863E8 41 80 00 0C */ blt lbl_800863F4 -/* 800863EC 38 60 00 02 */ li r3, 2 -/* 800863F0 4E 80 00 20 */ blr -lbl_800863F4: -/* 800863F4 20 00 00 01 */ subfic r0, r0, 1 -/* 800863F8 7C 00 00 34 */ cntlzw r0, r0 -/* 800863FC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80086400 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s b/asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s deleted file mode 100644 index 4a6279a88ef..00000000000 --- a/asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s +++ /dev/null @@ -1,223 +0,0 @@ -lbl_8008640C: -/* 8008640C 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80086410 7C 08 02 A6 */ mflr r0 -/* 80086414 90 01 00 94 */ stw r0, 0x94(r1) -/* 80086418 DB E1 00 80 */ stfd f31, 0x80(r1) -/* 8008641C F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 80086420 DB C1 00 70 */ stfd f30, 0x70(r1) -/* 80086424 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 /* qr0 */ -/* 80086428 DB A1 00 60 */ stfd f29, 0x60(r1) -/* 8008642C F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 /* qr0 */ -/* 80086430 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086434 48 2D BD 99 */ bl _savegpr_25 -/* 80086438 7C 7A 1B 78 */ mr r26, r3 -/* 8008643C 7C 9B 23 78 */ mr r27, r4 -/* 80086440 7C BC 2B 78 */ mr r28, r5 -/* 80086444 7C DD 33 78 */ mr r29, r6 -/* 80086448 7C FE 3B 78 */ mr r30, r7 -/* 8008644C FF A0 08 90 */ fmr f29, f1 -/* 80086450 80 04 00 2C */ lwz r0, 0x2c(r4) -/* 80086454 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80086458 40 82 02 CC */ bne lbl_80086724 -/* 8008645C 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 80086460 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80086464 41 82 00 08 */ beq lbl_8008646C -/* 80086468 48 00 02 BC */ b lbl_80086724 -lbl_8008646C: -/* 8008646C 80 1B 00 44 */ lwz r0, 0x44(r27) -/* 80086470 28 00 00 00 */ cmplwi r0, 0 -/* 80086474 41 82 02 B0 */ beq lbl_80086724 -/* 80086478 80 1D 00 44 */ lwz r0, 0x44(r29) -/* 8008647C 28 00 00 00 */ cmplwi r0, 0 -/* 80086480 40 82 00 08 */ bne lbl_80086488 -/* 80086484 48 00 02 A0 */ b lbl_80086724 -lbl_80086488: -/* 80086488 FC 00 EA 10 */ fabs f0, f29 -/* 8008648C FC 20 00 18 */ frsp f1, f0 -/* 80086490 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 80086494 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80086498 41 80 02 8C */ blt lbl_80086724 -/* 8008649C 7F A5 EB 78 */ mr r5, r29 -/* 800864A0 81 83 28 48 */ lwz r12, 0x2848(r3) -/* 800864A4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 800864A8 7D 89 03 A6 */ mtctr r12 -/* 800864AC 4E 80 04 21 */ bctrl -/* 800864B0 3B E0 00 00 */ li r31, 0 -/* 800864B4 80 1B 00 2C */ lwz r0, 0x2c(r27) -/* 800864B8 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800864BC 41 82 00 14 */ beq lbl_800864D0 -/* 800864C0 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 800864C4 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800864C8 41 82 00 08 */ beq lbl_800864D0 -/* 800864CC 3B E0 00 01 */ li r31, 1 -lbl_800864D0: -/* 800864D0 80 9B 00 44 */ lwz r4, 0x44(r27) -/* 800864D4 88 04 00 14 */ lbz r0, 0x14(r4) -/* 800864D8 28 00 00 00 */ cmplwi r0, 0 -/* 800864DC 40 82 00 14 */ bne lbl_800864F0 -/* 800864E0 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 800864E4 88 03 00 14 */ lbz r0, 0x14(r3) -/* 800864E8 28 00 00 00 */ cmplwi r0, 0 -/* 800864EC 41 82 02 38 */ beq lbl_80086724 -lbl_800864F0: -/* 800864F0 88 04 00 14 */ lbz r0, 0x14(r4) -/* 800864F4 28 00 00 FF */ cmplwi r0, 0xff -/* 800864F8 40 82 00 18 */ bne lbl_80086510 -/* 800864FC 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 80086500 88 03 00 14 */ lbz r0, 0x14(r3) -/* 80086504 28 00 00 FF */ cmplwi r0, 0xff -/* 80086508 40 82 00 08 */ bne lbl_80086510 -/* 8008650C 48 00 02 18 */ b lbl_80086724 -lbl_80086510: -/* 80086510 88 84 00 14 */ lbz r4, 0x14(r4) -/* 80086514 7F 43 D3 78 */ mr r3, r26 -/* 80086518 4B FF FE 49 */ bl GetRank__4dCcSFUc -/* 8008651C 7C 79 1B 78 */ mr r25, r3 -/* 80086520 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 80086524 88 83 00 14 */ lbz r4, 0x14(r3) -/* 80086528 7F 43 D3 78 */ mr r3, r26 -/* 8008652C 4B FF FE 35 */ bl GetRank__4dCcSFUc -/* 80086530 1C B9 00 0B */ mulli r5, r25, 0xb -/* 80086534 3C 80 80 3B */ lis r4, rank_tbl@ha /* 0x803AC328@ha */ -/* 80086538 38 04 C3 28 */ addi r0, r4, rank_tbl@l /* 0x803AC328@l */ -/* 8008653C 7C 80 2A 14 */ add r4, r0, r5 -/* 80086540 7C 04 18 AE */ lbzx r0, r4, r3 -/* 80086544 C0 42 8D 7C */ lfs f2, lit_3924(r2) -/* 80086548 C8 22 8D 88 */ lfd f1, lit_3927(r2) -/* 8008654C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80086550 3C 60 43 30 */ lis r3, 0x4330 -/* 80086554 90 61 00 30 */ stw r3, 0x30(r1) -/* 80086558 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8008655C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80086560 EF E2 00 32 */ fmuls f31, f2, f0 -/* 80086564 20 00 00 64 */ subfic r0, r0, 0x64 -/* 80086568 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8008656C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80086570 90 61 00 38 */ stw r3, 0x38(r1) -/* 80086574 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 80086578 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8008657C EF C2 00 32 */ fmuls f30, f2, f0 -/* 80086580 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80086584 41 82 00 20 */ beq lbl_800865A4 -/* 80086588 7F C3 F3 78 */ mr r3, r30 -/* 8008658C 7F 84 E3 78 */ mr r4, r28 -/* 80086590 38 A1 00 08 */ addi r5, r1, 8 -/* 80086594 48 2C 0B 21 */ bl PSVECSubtract -/* 80086598 38 61 00 08 */ addi r3, r1, 8 -/* 8008659C 48 2C 0B B5 */ bl PSVECMag -/* 800865A0 48 00 00 48 */ b lbl_800865E8 -lbl_800865A4: -/* 800865A4 C0 3E 00 00 */ lfs f1, 0(r30) -/* 800865A8 C0 1C 00 00 */ lfs f0, 0(r28) -/* 800865AC EC 61 00 28 */ fsubs f3, f1, f0 -/* 800865B0 D0 61 00 08 */ stfs f3, 8(r1) -/* 800865B4 C0 42 8D 78 */ lfs f2, lit_3705(r2) -/* 800865B8 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 800865BC C0 3E 00 08 */ lfs f1, 8(r30) -/* 800865C0 C0 1C 00 08 */ lfs f0, 8(r28) -/* 800865C4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800865C8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800865CC EC 23 00 F2 */ fmuls f1, f3, f3 -/* 800865D0 EC 00 00 32 */ fmuls f0, f0, f0 -/* 800865D4 EC 21 00 2A */ fadds f1, f1, f0 -/* 800865D8 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 800865DC 40 81 00 0C */ ble lbl_800865E8 -/* 800865E0 FC 00 08 34 */ frsqrte f0, f1 -/* 800865E4 EC 20 00 72 */ fmuls f1, f0, f1 -lbl_800865E8: -/* 800865E8 FC 00 0A 10 */ fabs f0, f1 -/* 800865EC FC 00 00 18 */ frsp f0, f0 -/* 800865F0 C0 4D 8C 00 */ lfs f2, G_CM3D_F_ABS_MIN(r13) -/* 800865F4 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 800865F8 41 80 00 9C */ blt lbl_80086694 -/* 800865FC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80086600 41 82 00 40 */ beq lbl_80086640 -/* 80086604 38 61 00 08 */ addi r3, r1, 8 -/* 80086608 7C 64 1B 78 */ mr r4, r3 -/* 8008660C EC 3D 08 24 */ fdivs f1, f29, f1 -/* 80086610 48 2C 0A C9 */ bl PSVECScale -/* 80086614 C0 02 8D 80 */ lfs f0, lit_3925(r2) -/* 80086618 EF FF 00 32 */ fmuls f31, f31, f0 -/* 8008661C 38 61 00 08 */ addi r3, r1, 8 -/* 80086620 38 81 00 20 */ addi r4, r1, 0x20 -/* 80086624 FC 20 F8 90 */ fmr f1, f31 -/* 80086628 48 2C 0A B1 */ bl PSVECScale -/* 8008662C 38 61 00 08 */ addi r3, r1, 8 -/* 80086630 38 81 00 14 */ addi r4, r1, 0x14 -/* 80086634 FC 20 F0 90 */ fmr f1, f30 -/* 80086638 48 2C 0A A1 */ bl PSVECScale -/* 8008663C 48 00 00 A0 */ b lbl_800866DC -lbl_80086640: -/* 80086640 EC 3D 08 24 */ fdivs f1, f29, f1 -/* 80086644 C0 01 00 08 */ lfs f0, 8(r1) -/* 80086648 EC 60 00 72 */ fmuls f3, f0, f1 -/* 8008664C D0 61 00 08 */ stfs f3, 8(r1) -/* 80086650 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80086654 EC 40 00 72 */ fmuls f2, f0, f1 -/* 80086658 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 8008665C FC 00 18 50 */ fneg f0, f3 -/* 80086660 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80086664 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80086668 C0 22 8D 78 */ lfs f1, lit_3705(r2) -/* 8008666C D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80086670 FC 00 10 50 */ fneg f0, f2 -/* 80086674 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80086678 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8008667C EC 03 07 B2 */ fmuls f0, f3, f30 -/* 80086680 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80086684 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80086688 EC 02 07 B2 */ fmuls f0, f2, f30 -/* 8008668C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80086690 48 00 00 4C */ b lbl_800866DC -lbl_80086694: -/* 80086694 C0 02 8D 78 */ lfs f0, lit_3705(r2) -/* 80086698 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8008669C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 800866A0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 800866A4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 800866A8 FC 00 EA 10 */ fabs f0, f29 -/* 800866AC FC 00 00 18 */ frsp f0, f0 -/* 800866B0 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 800866B4 41 80 00 1C */ blt lbl_800866D0 -/* 800866B8 FC 00 E8 50 */ fneg f0, f29 -/* 800866BC EC 00 07 F2 */ fmuls f0, f0, f31 -/* 800866C0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800866C4 EC 1D 07 B2 */ fmuls f0, f29, f30 -/* 800866C8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 800866CC 48 00 00 10 */ b lbl_800866DC -lbl_800866D0: -/* 800866D0 FC 00 F8 50 */ fneg f0, f31 -/* 800866D4 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800866D8 D3 C1 00 14 */ stfs f30, 0x14(r1) -lbl_800866DC: -/* 800866DC 80 7B 00 44 */ lwz r3, 0x44(r27) -/* 800866E0 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 800866E4 C0 41 00 24 */ lfs f2, 0x24(r1) -/* 800866E8 C0 61 00 28 */ lfs f3, 0x28(r1) -/* 800866EC 48 1D D2 49 */ bl PlusCcMove__9cCcD_SttsFfff -/* 800866F0 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 800866F4 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 800866F8 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 800866FC C0 61 00 1C */ lfs f3, 0x1c(r1) -/* 80086700 48 1D D2 35 */ bl PlusCcMove__9cCcD_SttsFfff -/* 80086704 7F 83 E3 78 */ mr r3, r28 -/* 80086708 38 81 00 20 */ addi r4, r1, 0x20 -/* 8008670C 7F 85 E3 78 */ mr r5, r28 -/* 80086710 48 2C 09 81 */ bl PSVECAdd -/* 80086714 7F C3 F3 78 */ mr r3, r30 -/* 80086718 38 81 00 14 */ addi r4, r1, 0x14 -/* 8008671C 7F C5 F3 78 */ mr r5, r30 -/* 80086720 48 2C 09 71 */ bl PSVECAdd -lbl_80086724: -/* 80086724 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 80086728 CB E1 00 80 */ lfd f31, 0x80(r1) -/* 8008672C E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 /* qr0 */ -/* 80086730 CB C1 00 70 */ lfd f30, 0x70(r1) -/* 80086734 E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 /* qr0 */ -/* 80086738 CB A1 00 60 */ lfd f29, 0x60(r1) -/* 8008673C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086740 48 2D BA D9 */ bl _restgpr_25 -/* 80086744 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80086748 7C 08 03 A6 */ mtlr r0 -/* 8008674C 38 21 00 90 */ addi r1, r1, 0x90 -/* 80086750 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s b/asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s deleted file mode 100644 index dcc8491adb2..00000000000 --- a/asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8008721C: -/* 8008721C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80087220 7C 08 02 A6 */ mflr r0 -/* 80087224 90 01 00 14 */ stw r0, 0x14(r1) -/* 80087228 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8008722C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80087230 41 82 00 60 */ beq lbl_80087290 -/* 80087234 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80087238 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 8008723C 90 7F 00 1C */ stw r3, 0x1c(r31) -/* 80087240 38 03 00 58 */ addi r0, r3, 0x58 -/* 80087244 90 1F 00 30 */ stw r0, 0x30(r31) -/* 80087248 34 1F 00 20 */ addic. r0, r31, 0x20 -/* 8008724C 41 82 00 10 */ beq lbl_8008725C -/* 80087250 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 80087254 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 80087258 90 1F 00 30 */ stw r0, 0x30(r31) -lbl_8008725C: -/* 8008725C 28 1F 00 00 */ cmplwi r31, 0 -/* 80087260 41 82 00 20 */ beq lbl_80087280 -/* 80087264 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80087268 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8008726C 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 80087270 41 82 00 10 */ beq lbl_80087280 -/* 80087274 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80087278 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 8008727C 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_80087280: -/* 80087280 7C 80 07 35 */ extsh. r0, r4 -/* 80087284 40 81 00 0C */ ble lbl_80087290 -/* 80087288 7F E3 FB 78 */ mr r3, r31 -/* 8008728C 48 24 7A B1 */ bl __dl__FPv -lbl_80087290: -/* 80087290 7F E3 FB 78 */ mr r3, r31 -/* 80087294 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80087298 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8008729C 7C 08 03 A6 */ mtlr r0 -/* 800872A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800872A4 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s b/asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 439310d42ad..00000000000 --- a/asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,161 +0,0 @@ -lbl_80086FBC: -/* 80086FBC 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80086FC0 7C 08 02 A6 */ mflr r0 -/* 80086FC4 90 01 00 84 */ stw r0, 0x84(r1) -/* 80086FC8 39 61 00 80 */ addi r11, r1, 0x80 -/* 80086FCC 48 2D B1 FD */ bl _savegpr_24 -/* 80086FD0 7C 7C 1B 78 */ mr r28, r3 -/* 80086FD4 7C B9 2B 78 */ mr r25, r5 -/* 80086FD8 7C DA 33 78 */ mr r26, r6 -/* 80086FDC 7C FB 3B 78 */ mr r27, r7 -/* 80086FE0 A0 03 28 04 */ lhz r0, 0x2804(r3) -/* 80086FE4 28 00 00 00 */ cmplwi r0, 0 -/* 80086FE8 40 82 00 0C */ bne lbl_80086FF4 -/* 80086FEC 38 60 00 00 */ li r3, 0 -/* 80086FF0 48 00 02 14 */ b lbl_80087204 -lbl_80086FF4: -/* 80086FF4 54 03 13 BA */ rlwinm r3, r0, 2, 0xe, 0x1d -/* 80086FF8 3B A3 10 00 */ addi r29, r3, 0x1000 -/* 80086FFC 7F BC EA 14 */ add r29, r28, r29 -/* 80087000 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80087004 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80087008 90 01 00 48 */ stw r0, 0x48(r1) -/* 8008700C 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80087010 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80087014 90 01 00 44 */ stw r0, 0x44(r1) -/* 80087018 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 8008701C 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 80087020 3B E1 00 4C */ addi r31, r1, 0x4c -/* 80087024 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80087028 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 8008702C 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80087030 90 61 00 48 */ stw r3, 0x48(r1) -/* 80087034 3B C3 00 58 */ addi r30, r3, 0x58 -/* 80087038 93 C1 00 5C */ stw r30, 0x5c(r1) -/* 8008703C C0 04 00 00 */ lfs f0, 0(r4) -/* 80087040 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80087044 C0 04 00 04 */ lfs f0, 4(r4) -/* 80087048 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8008704C C0 04 00 08 */ lfs f0, 8(r4) -/* 80087050 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80087054 C0 02 8D 90 */ lfs f0, lit_4336(r2) -/* 80087058 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8008705C 7F E3 FB 78 */ mr r3, r31 -/* 80087060 38 81 00 1C */ addi r4, r1, 0x1c -/* 80087064 48 1E 86 45 */ bl Set__8cM3dGSphFRC9cM3dGSphS -/* 80087068 38 61 00 2C */ addi r3, r1, 0x2c -/* 8008706C 48 1D D6 75 */ bl CalcAabBox__12cCcD_SphAttrFv -/* 80087070 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80087074 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80087078 90 01 00 18 */ stw r0, 0x18(r1) -/* 8008707C 38 7C 28 08 */ addi r3, r28, 0x2808 -/* 80087080 38 81 00 0C */ addi r4, r1, 0xc -/* 80087084 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80087088 48 1D C6 19 */ bl CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab -/* 8008708C 3B 9C 10 00 */ addi r28, r28, 0x1000 -/* 80087090 48 00 01 20 */ b lbl_800871B0 -lbl_80087094: -/* 80087094 80 7C 00 00 */ lwz r3, 0(r28) -/* 80087098 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 8008709C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800870A0 41 82 01 0C */ beq lbl_800871AC -/* 800870A4 48 1D C9 A5 */ bl GetAc__8cCcD_ObjFv -/* 800870A8 7C 03 D0 40 */ cmplw r3, r26 -/* 800870AC 41 82 01 00 */ beq lbl_800871AC -/* 800870B0 80 7C 00 00 */ lwz r3, 0(r28) -/* 800870B4 48 1D C9 95 */ bl GetAc__8cCcD_ObjFv -/* 800870B8 7C 03 D8 40 */ cmplw r3, r27 -/* 800870BC 41 82 00 F0 */ beq lbl_800871AC -/* 800870C0 80 7C 00 00 */ lwz r3, 0(r28) -/* 800870C4 38 63 00 48 */ addi r3, r3, 0x48 -/* 800870C8 38 81 00 0C */ addi r4, r1, 0xc -/* 800870CC 48 1D C2 9D */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo -/* 800870D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800870D4 41 82 00 D8 */ beq lbl_800871AC -/* 800870D8 80 7C 00 00 */ lwz r3, 0(r28) -/* 800870DC 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 800870E0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 800870E4 7D 89 03 A6 */ mtctr r12 -/* 800870E8 4E 80 04 21 */ bctrl -/* 800870EC 28 03 00 00 */ cmplwi r3, 0 -/* 800870F0 41 82 00 10 */ beq lbl_80087100 -/* 800870F4 80 03 00 E8 */ lwz r0, 0xe8(r3) -/* 800870F8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800870FC 40 82 00 B0 */ bne lbl_800871AC -lbl_80087100: -/* 80087100 80 7C 00 00 */ lwz r3, 0(r28) -/* 80087104 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80087108 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8008710C 7D 89 03 A6 */ mtctr r12 -/* 80087110 4E 80 04 21 */ bctrl -/* 80087114 7C 78 1B 78 */ mr r24, r3 -/* 80087118 38 81 00 2C */ addi r4, r1, 0x2c -/* 8008711C 38 A1 00 08 */ addi r5, r1, 8 -/* 80087120 81 83 00 1C */ lwz r12, 0x1c(r3) -/* 80087124 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 80087128 7D 89 03 A6 */ mtctr r12 -/* 8008712C 4E 80 04 21 */ bctrl -/* 80087130 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80087134 41 82 00 78 */ beq lbl_800871AC -/* 80087138 7F 03 C3 78 */ mr r3, r24 -/* 8008713C 7F 24 CB 78 */ mr r4, r25 -/* 80087140 81 98 00 1C */ lwz r12, 0x1c(r24) -/* 80087144 81 8C 00 54 */ lwz r12, 0x54(r12) -/* 80087148 7D 89 03 A6 */ mtctr r12 -/* 8008714C 4E 80 04 21 */ bctrl -/* 80087150 80 19 00 00 */ lwz r0, 0(r25) -/* 80087154 2C 00 00 02 */ cmpwi r0, 2 -/* 80087158 41 82 00 54 */ beq lbl_800871AC -/* 8008715C 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80087160 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80087164 90 01 00 18 */ stw r0, 0x18(r1) -/* 80087168 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 8008716C 38 03 35 40 */ addi r0, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80087170 90 01 00 48 */ stw r0, 0x48(r1) -/* 80087174 93 C1 00 5C */ stw r30, 0x5c(r1) -/* 80087178 28 1F 00 00 */ cmplwi r31, 0 -/* 8008717C 41 82 00 10 */ beq lbl_8008718C -/* 80087180 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 80087184 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 80087188 90 01 00 5C */ stw r0, 0x5c(r1) -lbl_8008718C: -/* 8008718C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80087190 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80087194 90 01 00 48 */ stw r0, 0x48(r1) -/* 80087198 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 8008719C 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 800871A0 90 01 00 44 */ stw r0, 0x44(r1) -/* 800871A4 38 60 00 01 */ li r3, 1 -/* 800871A8 48 00 00 5C */ b lbl_80087204 -lbl_800871AC: -/* 800871AC 3B 9C 00 04 */ addi r28, r28, 4 -lbl_800871B0: -/* 800871B0 7C 1C E8 40 */ cmplw r28, r29 -/* 800871B4 41 80 FE E0 */ blt lbl_80087094 -/* 800871B8 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 800871BC 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 800871C0 90 01 00 18 */ stw r0, 0x18(r1) -/* 800871C4 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 800871C8 38 03 35 40 */ addi r0, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 800871CC 90 01 00 48 */ stw r0, 0x48(r1) -/* 800871D0 93 C1 00 5C */ stw r30, 0x5c(r1) -/* 800871D4 28 1F 00 00 */ cmplwi r31, 0 -/* 800871D8 41 82 00 10 */ beq lbl_800871E8 -/* 800871DC 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 800871E0 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 800871E4 90 01 00 5C */ stw r0, 0x5c(r1) -lbl_800871E8: -/* 800871E8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 800871EC 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 800871F0 90 01 00 48 */ stw r0, 0x48(r1) -/* 800871F4 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 800871F8 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 800871FC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80087200 38 60 00 00 */ li r3, 0 -lbl_80087204: -/* 80087204 39 61 00 80 */ addi r11, r1, 0x80 -/* 80087208 48 2D B0 0D */ bl _restgpr_24 -/* 8008720C 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80087210 7C 08 03 A6 */ mtlr r0 -/* 80087214 38 21 00 80 */ addi r1, r1, 0x80 -/* 80087218 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/func_800861B4.s b/asm/d/cc/d_cc_s/func_800861B4.s deleted file mode 100644 index b2285729426..00000000000 --- a/asm/d/cc/d_cc_s/func_800861B4.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800861B4: -/* 800861B4 81 81 00 08 */ lwz r12, 8(r1) -/* 800861B8 81 68 00 10 */ lwz r11, 0x10(r8) -/* 800861BC 80 69 00 10 */ lwz r3, 0x10(r9) -/* 800861C0 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 800861C4 41 82 00 38 */ beq lbl_800861FC -/* 800861C8 90 6A 00 0C */ stw r3, 0xc(r10) -/* 800861CC 80 06 00 58 */ lwz r0, 0x58(r6) -/* 800861D0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800861D4 41 82 00 28 */ beq lbl_800861FC -/* 800861D8 80 07 00 9C */ lwz r0, 0x9c(r7) -/* 800861DC 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 800861E0 40 82 00 1C */ bne lbl_800861FC -/* 800861E4 80 6A 00 10 */ lwz r3, 0x10(r10) -/* 800861E8 80 09 00 10 */ lwz r0, 0x10(r9) -/* 800861EC 7C 03 00 40 */ cmplw r3, r0 -/* 800861F0 40 82 00 0C */ bne lbl_800861FC -/* 800861F4 38 60 00 01 */ li r3, 1 -/* 800861F8 4E 80 00 20 */ blr -lbl_800861FC: -/* 800861FC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 80086200 41 82 00 38 */ beq lbl_80086238 -/* 80086204 91 6C 00 14 */ stw r11, 0x14(r12) -/* 80086208 80 07 00 9C */ lwz r0, 0x9c(r7) -/* 8008620C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80086210 41 82 00 28 */ beq lbl_80086238 -/* 80086214 80 06 00 58 */ lwz r0, 0x58(r6) -/* 80086218 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 8008621C 40 82 00 1C */ bne lbl_80086238 -/* 80086220 80 6C 00 18 */ lwz r3, 0x18(r12) -/* 80086224 80 08 00 10 */ lwz r0, 0x10(r8) -/* 80086228 7C 03 00 40 */ cmplw r3, r0 -/* 8008622C 40 82 00 0C */ bne lbl_80086238 -/* 80086230 38 60 00 01 */ li r3, 1 -/* 80086234 4E 80 00 20 */ blr -lbl_80086238: -/* 80086238 38 60 00 00 */ li r3, 0 -/* 8008623C 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_s/func_80086AC0.s b/asm/d/cc/d_cc_s/func_80086AC0.s deleted file mode 100644 index 9fefacd1973..00000000000 --- a/asm/d/cc/d_cc_s/func_80086AC0.s +++ /dev/null @@ -1,192 +0,0 @@ -lbl_80086AC0: -/* 80086AC0 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80086AC4 7C 08 02 A6 */ mflr r0 -/* 80086AC8 90 01 00 64 */ stw r0, 0x64(r1) -/* 80086ACC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086AD0 48 2D B6 DD */ bl _savegpr_17 -/* 80086AD4 7C 76 1B 78 */ mr r22, r3 -/* 80086AD8 7C 97 23 78 */ mr r23, r4 -/* 80086ADC 7C B8 2B 78 */ mr r24, r5 -/* 80086AE0 7C D9 33 78 */ mr r25, r6 -/* 80086AE4 7C FA 3B 78 */ mr r26, r7 -/* 80086AE8 7D 5B 53 78 */ mr r27, r10 -/* 80086AEC 83 81 00 68 */ lwz r28, 0x68(r1) -/* 80086AF0 83 A1 00 6C */ lwz r29, 0x6c(r1) -/* 80086AF4 83 C1 00 70 */ lwz r30, 0x70(r1) -/* 80086AF8 83 E1 00 74 */ lwz r31, 0x74(r1) -/* 80086AFC 7D 14 43 78 */ mr r20, r8 -/* 80086B00 7D 33 4B 78 */ mr r19, r9 -/* 80086B04 7F 24 CB 78 */ mr r4, r25 -/* 80086B08 7F 45 D3 78 */ mr r5, r26 -/* 80086B0C 7E 86 A3 78 */ mr r6, r20 -/* 80086B10 7E 67 9B 78 */ mr r7, r19 -/* 80086B14 7F E8 FB 78 */ mr r8, r31 -/* 80086B18 4B FF F5 E1 */ bl ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz -/* 80086B1C 7C 75 1B 78 */ mr r21, r3 -/* 80086B20 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80086B24 41 82 00 BC */ beq lbl_80086BE0 -/* 80086B28 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80086B2C D0 14 00 78 */ stfs f0, 0x78(r20) -/* 80086B30 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80086B34 D0 14 00 7C */ stfs f0, 0x7c(r20) -/* 80086B38 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80086B3C D0 14 00 80 */ stfs f0, 0x80(r20) -/* 80086B40 C0 13 00 BC */ lfs f0, 0xbc(r19) -/* 80086B44 D0 14 00 90 */ stfs f0, 0x90(r20) -/* 80086B48 C0 13 00 C0 */ lfs f0, 0xc0(r19) -/* 80086B4C D0 14 00 94 */ stfs f0, 0x94(r20) -/* 80086B50 C0 13 00 C4 */ lfs f0, 0xc4(r19) -/* 80086B54 D0 14 00 98 */ stfs f0, 0x98(r20) -/* 80086B58 28 1D 00 00 */ cmplwi r29, 0 -/* 80086B5C 41 82 00 18 */ beq lbl_80086B74 -/* 80086B60 88 1D 00 05 */ lbz r0, 5(r29) -/* 80086B64 2C 00 00 00 */ cmpwi r0, 0 -/* 80086B68 40 82 00 0C */ bne lbl_80086B74 -/* 80086B6C 88 13 00 BB */ lbz r0, 0xbb(r19) -/* 80086B70 98 1D 00 05 */ stb r0, 5(r29) -lbl_80086B74: -/* 80086B74 80 9C 00 10 */ lwz r4, 0x10(r28) -/* 80086B78 38 74 00 58 */ addi r3, r20, 0x58 -/* 80086B7C 4B FF CA FD */ bl SetHitApid__22dCcD_GAtTgCoCommonBaseFUi -/* 80086B80 56 A0 06 3F */ clrlwi. r0, r21, 0x18 -/* 80086B84 40 82 00 38 */ bne lbl_80086BBC -/* 80086B88 88 13 00 BA */ lbz r0, 0xba(r19) -/* 80086B8C 2C 00 00 08 */ cmpwi r0, 8 -/* 80086B90 40 82 00 38 */ bne lbl_80086BC8 -/* 80086B94 88 14 00 75 */ lbz r0, 0x75(r20) -/* 80086B98 28 00 00 02 */ cmplwi r0, 2 -/* 80086B9C 41 82 00 2C */ beq lbl_80086BC8 -/* 80086BA0 88 14 00 77 */ lbz r0, 0x77(r20) -/* 80086BA4 2C 00 00 00 */ cmpwi r0, 0 -/* 80086BA8 41 82 00 14 */ beq lbl_80086BBC -/* 80086BAC 2C 00 00 05 */ cmpwi r0, 5 -/* 80086BB0 41 82 00 0C */ beq lbl_80086BBC -/* 80086BB4 2C 00 00 08 */ cmpwi r0, 8 -/* 80086BB8 40 82 00 10 */ bne lbl_80086BC8 -lbl_80086BBC: -/* 80086BBC 80 14 00 5C */ lwz r0, 0x5c(r20) -/* 80086BC0 60 00 00 01 */ ori r0, r0, 1 -/* 80086BC4 90 14 00 5C */ stw r0, 0x5c(r20) -lbl_80086BC8: -/* 80086BC8 80 1E 00 1C */ lwz r0, 0x1c(r30) -/* 80086BCC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80086BD0 41 82 00 10 */ beq lbl_80086BE0 -/* 80086BD4 80 14 00 5C */ lwz r0, 0x5c(r20) -/* 80086BD8 60 00 00 02 */ ori r0, r0, 2 -/* 80086BDC 90 14 00 5C */ stw r0, 0x5c(r20) -lbl_80086BE0: -/* 80086BE0 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80086BE4 41 82 00 98 */ beq lbl_80086C7C -/* 80086BE8 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80086BEC D0 13 00 D4 */ stfs f0, 0xd4(r19) -/* 80086BF0 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80086BF4 D0 13 00 D8 */ stfs f0, 0xd8(r19) -/* 80086BF8 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80086BFC D0 13 00 DC */ stfs f0, 0xdc(r19) -/* 80086C00 C0 14 00 84 */ lfs f0, 0x84(r20) -/* 80086C04 D0 13 00 C8 */ stfs f0, 0xc8(r19) -/* 80086C08 C0 14 00 88 */ lfs f0, 0x88(r20) -/* 80086C0C D0 13 00 CC */ stfs f0, 0xcc(r19) -/* 80086C10 C0 14 00 8C */ lfs f0, 0x8c(r20) -/* 80086C14 D0 13 00 D0 */ stfs f0, 0xd0(r19) -/* 80086C18 28 1E 00 00 */ cmplwi r30, 0 -/* 80086C1C 41 82 00 18 */ beq lbl_80086C34 -/* 80086C20 88 1D 00 04 */ lbz r0, 4(r29) -/* 80086C24 2C 00 00 00 */ cmpwi r0, 0 -/* 80086C28 40 82 00 0C */ bne lbl_80086C34 -/* 80086C2C 88 14 00 77 */ lbz r0, 0x77(r20) -/* 80086C30 98 1E 00 04 */ stb r0, 4(r30) -lbl_80086C34: -/* 80086C34 80 9B 00 10 */ lwz r4, 0x10(r27) -/* 80086C38 38 73 00 9C */ addi r3, r19, 0x9c -/* 80086C3C 4B FF CA 3D */ bl SetHitApid__22dCcD_GAtTgCoCommonBaseFUi -/* 80086C40 56 A0 06 3F */ clrlwi. r0, r21, 0x18 -/* 80086C44 41 82 00 14 */ beq lbl_80086C58 -/* 80086C48 80 13 00 A0 */ lwz r0, 0xa0(r19) -/* 80086C4C 60 00 00 02 */ ori r0, r0, 2 -/* 80086C50 90 13 00 A0 */ stw r0, 0xa0(r19) -/* 80086C54 48 00 00 10 */ b lbl_80086C64 -lbl_80086C58: -/* 80086C58 7F 83 E3 78 */ mr r3, r28 -/* 80086C5C 88 99 00 14 */ lbz r4, 0x14(r25) -/* 80086C60 48 1D CD 11 */ bl PlusDmg__9cCcD_SttsFi -lbl_80086C64: -/* 80086C64 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 80086C68 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80086C6C 41 82 00 10 */ beq lbl_80086C7C -/* 80086C70 80 13 00 A0 */ lwz r0, 0xa0(r19) -/* 80086C74 60 00 00 01 */ ori r0, r0, 1 -/* 80086C78 90 13 00 A0 */ stw r0, 0xa0(r19) -lbl_80086C7C: -/* 80086C7C 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80086C80 41 82 00 3C */ beq lbl_80086CBC -/* 80086C84 82 34 00 60 */ lwz r17, 0x60(r20) -/* 80086C88 28 11 00 00 */ cmplwi r17, 0 -/* 80086C8C 41 82 00 30 */ beq lbl_80086CBC -/* 80086C90 7E 63 9B 78 */ mr r3, r19 -/* 80086C94 48 1D CD B5 */ bl GetAc__8cCcD_ObjFv -/* 80086C98 7C 72 1B 78 */ mr r18, r3 -/* 80086C9C 7E 83 A3 78 */ mr r3, r20 -/* 80086CA0 48 1D CD A9 */ bl GetAc__8cCcD_ObjFv -/* 80086CA4 7E 84 A3 78 */ mr r4, r20 -/* 80086CA8 7E 45 93 78 */ mr r5, r18 -/* 80086CAC 7E 66 9B 78 */ mr r6, r19 -/* 80086CB0 7E 2C 8B 78 */ mr r12, r17 -/* 80086CB4 7D 89 03 A6 */ mtctr r12 -/* 80086CB8 4E 80 04 21 */ bctrl -lbl_80086CBC: -/* 80086CBC 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80086CC0 41 82 00 3C */ beq lbl_80086CFC -/* 80086CC4 82 33 00 A4 */ lwz r17, 0xa4(r19) -/* 80086CC8 28 11 00 00 */ cmplwi r17, 0 -/* 80086CCC 41 82 00 30 */ beq lbl_80086CFC -/* 80086CD0 7E 83 A3 78 */ mr r3, r20 -/* 80086CD4 48 1D CD 75 */ bl GetAc__8cCcD_ObjFv -/* 80086CD8 7C 72 1B 78 */ mr r18, r3 -/* 80086CDC 7E 63 9B 78 */ mr r3, r19 -/* 80086CE0 48 1D CD 69 */ bl GetAc__8cCcD_ObjFv -/* 80086CE4 7E 64 9B 78 */ mr r4, r19 -/* 80086CE8 7E 45 93 78 */ mr r5, r18 -/* 80086CEC 7E 86 A3 78 */ mr r6, r20 -/* 80086CF0 7E 2C 8B 78 */ mr r12, r17 -/* 80086CF4 7D 89 03 A6 */ mtctr r12 -/* 80086CF8 4E 80 04 21 */ bctrl -lbl_80086CFC: -/* 80086CFC 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80086D00 41 82 00 74 */ beq lbl_80086D74 -/* 80086D04 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80086D08 41 82 00 6C */ beq lbl_80086D74 -/* 80086D0C 38 74 00 58 */ addi r3, r20, 0x58 -/* 80086D10 4B FF CA 39 */ bl ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv -/* 80086D14 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086D18 41 82 00 14 */ beq lbl_80086D2C -/* 80086D1C 38 73 00 9C */ addi r3, r19, 0x9c -/* 80086D20 4B FF CA 29 */ bl ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv -/* 80086D24 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80086D28 40 82 00 4C */ bne lbl_80086D74 -lbl_80086D2C: -/* 80086D2C 38 74 00 58 */ addi r3, r20, 0x58 -/* 80086D30 4B FF C9 E9 */ bl SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv -/* 80086D34 38 73 00 9C */ addi r3, r19, 0x9c -/* 80086D38 4B FF C9 E1 */ bl SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv -/* 80086D3C 93 81 00 08 */ stw r28, 8(r1) -/* 80086D40 93 A1 00 0C */ stw r29, 0xc(r1) -/* 80086D44 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80086D48 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80086D4C 92 A1 00 18 */ stw r21, 0x18(r1) -/* 80086D50 7E C3 B3 78 */ mr r3, r22 -/* 80086D54 7E E4 BB 78 */ mr r4, r23 -/* 80086D58 7F 05 C3 78 */ mr r5, r24 -/* 80086D5C 7F 26 CB 78 */ mr r6, r25 -/* 80086D60 7F 47 D3 78 */ mr r7, r26 -/* 80086D64 7E 88 A3 78 */ mr r8, r20 -/* 80086D68 7E 69 9B 78 */ mr r9, r19 -/* 80086D6C 7F 6A DB 78 */ mr r10, r27 -/* 80086D70 4B FF FA ED */ bl ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb -lbl_80086D74: -/* 80086D74 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086D78 48 2D B4 81 */ bl _restgpr_17 -/* 80086D7C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80086D80 7C 08 03 A6 */ mtlr r0 -/* 80086D84 38 21 00 60 */ addi r1, r1, 0x60 -/* 80086D88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index fa265f54468..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8061E820: -/* 8061E820 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061E824 7C 08 02 A6 */ mflr r0 -/* 8061E828 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061E82C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061E830 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8061E834 41 82 00 1C */ beq lbl_8061E850 -/* 8061E838 3C A0 80 62 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x8061EADC@ha */ -/* 8061E83C 38 05 EA DC */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x8061EADC@l */ -/* 8061E840 90 1F 00 00 */ stw r0, 0(r31) -/* 8061E844 7C 80 07 35 */ extsh. r0, r4 -/* 8061E848 40 81 00 08 */ ble lbl_8061E850 -/* 8061E84C 4B CB 04 F1 */ bl __dl__FPv -lbl_8061E850: -/* 8061E850 7F E3 FB 78 */ mr r3, r31 -/* 8061E854 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061E858 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061E85C 7C 08 03 A6 */ mtlr r0 -/* 8061E860 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061E864 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s deleted file mode 100644 index dc7737c20f8..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8061E19C: -/* 8061E19C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061E1A0 7C 08 02 A6 */ mflr r0 -/* 8061E1A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061E1A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061E1AC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8061E1B0 41 82 00 10 */ beq lbl_8061E1C0 -/* 8061E1B4 7C 80 07 35 */ extsh. r0, r4 -/* 8061E1B8 40 81 00 08 */ ble lbl_8061E1C0 -/* 8061E1BC 4B CB 0B 81 */ bl __dl__FPv -lbl_8061E1C0: -/* 8061E1C0 7F E3 FB 78 */ mr r3, r31 -/* 8061E1C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061E1C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061E1CC 7C 08 03 A6 */ mtlr r0 -/* 8061E1D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061E1D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s deleted file mode 100644 index 9f7631614ba..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8061E9EC: -/* 8061E9EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061E9F0 7C 08 02 A6 */ mflr r0 -/* 8061E9F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061E9F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061E9FC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8061EA00 41 82 00 10 */ beq lbl_8061EA10 -/* 8061EA04 7C 80 07 35 */ extsh. r0, r4 -/* 8061EA08 40 81 00 08 */ ble lbl_8061EA10 -/* 8061EA0C 4B CB 03 31 */ bl __dl__FPv -lbl_8061EA10: -/* 8061EA10 7F E3 FB 78 */ mr r3, r31 -/* 8061EA14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061EA18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061EA1C 7C 08 03 A6 */ mtlr r0 -/* 8061EA20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061EA24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s deleted file mode 100644 index 8142dc60777..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s +++ /dev/null @@ -1,146 +0,0 @@ -lbl_8061E1D8: -/* 8061E1D8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8061E1DC 7C 08 02 A6 */ mflr r0 -/* 8061E1E0 90 01 00 44 */ stw r0, 0x44(r1) -/* 8061E1E4 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 8061E1E8 93 C1 00 38 */ stw r30, 0x38(r1) -/* 8061E1EC 7C 7E 1B 78 */ mr r30, r3 -/* 8061E1F0 3C 60 80 62 */ lis r3, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061E1F4 3B E3 EA 38 */ addi r31, r3, lit_3678@l /* 0x8061EA38@l */ -/* 8061E1F8 A8 1E 05 CE */ lha r0, 0x5ce(r30) -/* 8061E1FC 2C 00 00 00 */ cmpwi r0, 0 -/* 8061E200 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061E204 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061E208 80 63 00 00 */ lwz r3, 0(r3) -/* 8061E20C 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 8061E210 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E214 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8061E218 80 83 00 0C */ lwz r4, 0xc(r3) -/* 8061E21C 80 7E 05 C8 */ lwz r3, 0x5c8(r30) -/* 8061E220 38 03 00 08 */ addi r0, r3, 8 -/* 8061E224 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 8061E228 7C 64 02 14 */ add r3, r4, r0 -/* 8061E22C 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E230 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E234 4B D2 82 7D */ bl PSMTXCopy -/* 8061E238 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E23C 38 83 D4 70 */ addi r4, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E240 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 8061E244 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 8061E248 C0 04 00 1C */ lfs f0, 0x1c(r4) -/* 8061E24C D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 8061E250 C0 04 00 2C */ lfs f0, 0x2c(r4) -/* 8061E254 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 8061E258 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061E25C 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061E260 80 63 00 00 */ lwz r3, 0(r3) -/* 8061E264 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 8061E268 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E26C 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8061E270 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8061E274 4B D2 82 3D */ bl PSMTXCopy -/* 8061E278 C0 7F 00 24 */ lfs f3, 0x24(r31) -/* 8061E27C C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 8061E280 80 1E 05 C8 */ lwz r0, 0x5c8(r30) -/* 8061E284 C8 3F 00 30 */ lfd f1, 0x30(r31) -/* 8061E288 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8061E28C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8061E290 3C 00 43 30 */ lis r0, 0x4330 -/* 8061E294 90 01 00 30 */ stw r0, 0x30(r1) -/* 8061E298 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8061E29C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8061E2A0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8061E2A4 EC 23 00 2A */ fadds f1, f3, f0 -/* 8061E2A8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8061E2AC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8061E2B0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8061E2B4 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 8061E2B8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E2BC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E2C0 38 81 00 20 */ addi r4, r1, 0x20 -/* 8061E2C4 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8061E2C8 4B D2 8A A5 */ bl PSMTXMultVec -/* 8061E2CC 38 61 00 08 */ addi r3, r1, 8 -/* 8061E2D0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8061E2D4 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8061E2D8 4B C4 88 5D */ bl __mi__4cXyzCFRC3Vec -/* 8061E2DC C0 21 00 08 */ lfs f1, 8(r1) -/* 8061E2E0 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 8061E2E4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8061E2E8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8061E2EC C0 41 00 10 */ lfs f2, 0x10(r1) -/* 8061E2F0 D0 41 00 28 */ stfs f2, 0x28(r1) -/* 8061E2F4 4B C4 93 81 */ bl cM_atan2s__Fff -/* 8061E2F8 B0 7E 04 E6 */ sth r3, 0x4e6(r30) -/* 8061E2FC C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8061E300 EC 20 00 32 */ fmuls f1, f0, f0 -/* 8061E304 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8061E308 EC 00 00 32 */ fmuls f0, f0, f0 -/* 8061E30C EC 41 00 2A */ fadds f2, f1, f0 -/* 8061E310 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8061E314 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8061E318 40 81 00 0C */ ble lbl_8061E324 -/* 8061E31C FC 00 10 34 */ frsqrte f0, f2 -/* 8061E320 EC 40 00 B2 */ fmuls f2, f0, f2 -lbl_8061E324: -/* 8061E324 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 8061E328 4B C4 93 4D */ bl cM_atan2s__Fff -/* 8061E32C 7C 03 00 D0 */ neg r0, r3 -/* 8061E330 B0 1E 04 E4 */ sth r0, 0x4e4(r30) -/* 8061E334 7F C3 F3 78 */ mr r3, r30 -/* 8061E338 4B FF FB 15 */ bl dmcalc__FP11b_oh2_class -/* 8061E33C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E340 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E344 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 8061E348 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 8061E34C C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 8061E350 4B D2 85 99 */ bl PSMTXTrans -/* 8061E354 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E358 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E35C A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 8061E360 4B 9E E0 D5 */ bl mDoMtx_YrotM__FPA4_fs -/* 8061E364 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E368 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E36C A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 8061E370 4B 9E E0 2D */ bl mDoMtx_XrotM__FPA4_fs -/* 8061E374 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E378 80 83 00 04 */ lwz r4, 4(r3) -/* 8061E37C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8061E380 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8061E384 38 84 00 24 */ addi r4, r4, 0x24 -/* 8061E388 4B D2 81 29 */ bl PSMTXCopy -/* 8061E38C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8061E390 7C 03 07 74 */ extsb r3, r0 -/* 8061E394 4B A0 EC D9 */ bl dComIfGp_getReverb__Fi -/* 8061E398 7C 65 1B 78 */ mr r5, r3 -/* 8061E39C 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E3A0 38 80 00 00 */ li r4, 0 -/* 8061E3A4 4B 9F 2D 0D */ bl play__16mDoExt_McaMorfSOFUlSc -/* 8061E3A8 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061E3AC 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061E3B0 80 63 00 00 */ lwz r3, 0(r3) -/* 8061E3B4 C0 23 05 2C */ lfs f1, 0x52c(r3) -/* 8061E3B8 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8061E3BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8061E3C0 4C 40 13 82 */ cror 2, 0, 2 -/* 8061E3C4 40 82 00 1C */ bne lbl_8061E3E0 -/* 8061E3C8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8061E3CC 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E3D0 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8061E3D4 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E3D8 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8061E3DC 48 00 00 14 */ b lbl_8061E3F0 -lbl_8061E3E0: -/* 8061E3E0 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E3E4 4B 9E F0 45 */ bl play__14mDoExt_baseAnmFv -/* 8061E3E8 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E3EC 4B 9E F0 3D */ bl play__14mDoExt_baseAnmFv -lbl_8061E3F0: -/* 8061E3F0 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E3F4 4B 9F 2D F9 */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 8061E3F8 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 8061E3FC 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 8061E400 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8061E404 7C 08 03 A6 */ mtlr r0 -/* 8061E408 38 21 00 40 */ addi r1, r1, 0x40 -/* 8061E40C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 4300d812485..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,104 +0,0 @@ -lbl_8061E868: -/* 8061E868 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8061E86C 7C 08 02 A6 */ mflr r0 -/* 8061E870 90 01 00 34 */ stw r0, 0x34(r1) -/* 8061E874 39 61 00 30 */ addi r11, r1, 0x30 -/* 8061E878 4B D4 39 65 */ bl _savegpr_29 -/* 8061E87C 7C 7E 1B 78 */ mr r30, r3 -/* 8061E880 3C 80 80 62 */ lis r4, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061E884 3B E4 EA 38 */ addi r31, r4, lit_3678@l /* 0x8061EA38@l */ -/* 8061E888 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8061E88C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8061E890 40 82 00 68 */ bne lbl_8061E8F8 -/* 8061E894 7F C0 F3 79 */ or. r0, r30, r30 -/* 8061E898 41 82 00 54 */ beq lbl_8061E8EC -/* 8061E89C 7C 1D 03 78 */ mr r29, r0 -/* 8061E8A0 4B 9F A2 C5 */ bl __ct__10fopAc_ac_cFv -/* 8061E8A4 38 7D 06 60 */ addi r3, r29, 0x660 -/* 8061E8A8 3C 80 80 62 */ lis r4, __ct__4cXyzFv@ha /* 0x8061EA2C@ha */ -/* 8061E8AC 38 84 EA 2C */ addi r4, r4, __ct__4cXyzFv@l /* 0x8061EA2C@l */ -/* 8061E8B0 3C A0 80 62 */ lis r5, __dt__4cXyzFv@ha /* 0x8061E19C@ha */ -/* 8061E8B4 38 A5 E1 9C */ addi r5, r5, __dt__4cXyzFv@l /* 0x8061E19C@l */ -/* 8061E8B8 38 C0 00 0C */ li r6, 0xc -/* 8061E8BC 38 E0 00 1F */ li r7, 0x1f -/* 8061E8C0 4B D4 34 A1 */ bl __construct_array -/* 8061E8C4 38 7D 07 D4 */ addi r3, r29, 0x7d4 -/* 8061E8C8 3C 80 80 62 */ lis r4, __ct__5csXyzFv@ha /* 0x8061EA28@ha */ -/* 8061E8CC 38 84 EA 28 */ addi r4, r4, __ct__5csXyzFv@l /* 0x8061EA28@l */ -/* 8061E8D0 3C A0 80 62 */ lis r5, __dt__5csXyzFv@ha /* 0x8061E9EC@ha */ -/* 8061E8D4 38 A5 E9 EC */ addi r5, r5, __dt__5csXyzFv@l /* 0x8061E9EC@l */ -/* 8061E8D8 38 C0 00 06 */ li r6, 6 -/* 8061E8DC 38 E0 00 1F */ li r7, 0x1f -/* 8061E8E0 4B D4 34 81 */ bl __construct_array -/* 8061E8E4 38 7D 08 98 */ addi r3, r29, 0x898 -/* 8061E8E8 4B CA 26 7D */ bl __ct__15Z2CreatureEnemyFv -lbl_8061E8EC: -/* 8061E8EC 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 8061E8F0 60 00 00 08 */ ori r0, r0, 8 -/* 8061E8F4 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_8061E8F8: -/* 8061E8F8 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 8061E8FC 3C 80 80 62 */ lis r4, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E900 38 84 EA 84 */ addi r4, r4, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E904 4B A0 E5 B9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8061E908 7C 7D 1B 78 */ mr r29, r3 -/* 8061E90C 2C 1D 00 04 */ cmpwi r29, 4 -/* 8061E910 40 82 00 C0 */ bne lbl_8061E9D0 -/* 8061E914 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8061E918 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8061E91C 90 1E 05 C8 */ stw r0, 0x5c8(r30) -/* 8061E920 7F C3 F3 78 */ mr r3, r30 -/* 8061E924 3C 80 80 62 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x8061E540@ha */ -/* 8061E928 38 84 E5 40 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x8061E540@l */ -/* 8061E92C 38 A0 23 E0 */ li r5, 0x23e0 -/* 8061E930 4B 9F BB 81 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8061E934 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8061E938 40 82 00 0C */ bne lbl_8061E944 -/* 8061E93C 38 60 00 05 */ li r3, 5 -/* 8061E940 48 00 00 94 */ b lbl_8061E9D4 -lbl_8061E944: -/* 8061E944 38 7E 08 98 */ addi r3, r30, 0x898 -/* 8061E948 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8061E94C 7C 85 23 78 */ mr r5, r4 -/* 8061E950 38 C0 00 03 */ li r6, 3 -/* 8061E954 38 E0 00 01 */ li r7, 1 -/* 8061E958 4B CA 27 3D */ bl init__15Z2CreatureEnemyFP3VecP3VecUcUc -/* 8061E95C C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8061E960 4B C4 8F F5 */ bl cM_rndF__Ff -/* 8061E964 FC 00 08 1E */ fctiwz f0, f1 -/* 8061E968 D8 01 00 08 */ stfd f0, 8(r1) -/* 8061E96C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8061E970 B0 1E 05 CC */ sth r0, 0x5cc(r30) -/* 8061E974 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8061E978 4B C4 8F DD */ bl cM_rndF__Ff -/* 8061E97C FC 00 08 1E */ fctiwz f0, f1 -/* 8061E980 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8061E984 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061E988 B0 1E 05 DC */ sth r0, 0x5dc(r30) -/* 8061E98C 38 60 00 00 */ li r3, 0 -/* 8061E990 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 8061E994 38 00 00 1F */ li r0, 0x1f -/* 8061E998 7C 09 03 A6 */ mtctr r0 -lbl_8061E99C: -/* 8061E99C 38 03 06 64 */ addi r0, r3, 0x664 -/* 8061E9A0 7C 1E 05 2E */ stfsx f0, r30, r0 -/* 8061E9A4 38 63 00 0C */ addi r3, r3, 0xc -/* 8061E9A8 42 00 FF F4 */ bdnz lbl_8061E99C -/* 8061E9AC 38 00 00 0A */ li r0, 0xa -/* 8061E9B0 B0 1E 05 D8 */ sth r0, 0x5d8(r30) -/* 8061E9B4 C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 8061E9B8 4B C4 8F D5 */ bl cM_rndFX__Ff -/* 8061E9BC C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 8061E9C0 EC 00 08 2A */ fadds f0, f0, f1 -/* 8061E9C4 D0 1E 05 E4 */ stfs f0, 0x5e4(r30) -/* 8061E9C8 7F C3 F3 78 */ mr r3, r30 -/* 8061E9CC 4B FF FA 45 */ bl daB_OH2_Execute__FP11b_oh2_class -lbl_8061E9D0: -/* 8061E9D0 7F A3 EB 78 */ mr r3, r29 -lbl_8061E9D4: -/* 8061E9D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8061E9D8 4B D4 38 51 */ bl _restgpr_29 -/* 8061E9DC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8061E9E0 7C 08 03 A6 */ mtlr r0 -/* 8061E9E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8061E9E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s deleted file mode 100644 index ab45e38caa4..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8061E4F0: -/* 8061E4F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061E4F4 7C 08 02 A6 */ mflr r0 -/* 8061E4F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061E4FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061E500 7C 7F 1B 78 */ mr r31, r3 -/* 8061E504 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 8061E508 3C 80 80 62 */ lis r4, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E50C 38 84 EA 84 */ addi r4, r4, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E510 4B A0 EA F9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8061E514 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 8061E518 28 00 00 00 */ cmplwi r0, 0 -/* 8061E51C 41 82 00 0C */ beq lbl_8061E528 -/* 8061E520 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 8061E524 4B 9F 2D ED */ bl stopZelAnime__16mDoExt_McaMorfSOFv -lbl_8061E528: -/* 8061E528 38 60 00 01 */ li r3, 1 -/* 8061E52C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061E530 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061E534 7C 08 03 A6 */ mtlr r0 -/* 8061E538 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061E53C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s deleted file mode 100644 index 20688404663..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8061DDB0: -/* 8061DDB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061DDB4 7C 08 02 A6 */ mflr r0 -/* 8061DDB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061DDBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061DDC0 93 C1 00 08 */ stw r30, 8(r1) -/* 8061DDC4 7C 7E 1B 78 */ mr r30, r3 -/* 8061DDC8 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 8061DDCC 83 E3 00 04 */ lwz r31, 4(r3) -/* 8061DDD0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8061DDD4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8061DDD8 38 80 00 00 */ li r4, 0 -/* 8061DDDC 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8061DDE0 38 DE 01 0C */ addi r6, r30, 0x10c -/* 8061DDE4 4B B8 59 E1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8061DDE8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8061DDEC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8061DDF0 80 9F 00 04 */ lwz r4, 4(r31) -/* 8061DDF4 38 BE 01 0C */ addi r5, r30, 0x10c -/* 8061DDF8 4B B8 6F A9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8061DDFC 80 9F 00 04 */ lwz r4, 4(r31) -/* 8061DE00 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061DE04 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8061DE08 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061DE0C 4B 9E F8 CD */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8061DE10 80 9F 00 04 */ lwz r4, 4(r31) -/* 8061DE14 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061DE18 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8061DE1C 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061DE20 4B 9E F9 89 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 8061DE24 38 7E 05 B8 */ addi r3, r30, 0x5b8 -/* 8061DE28 38 80 00 00 */ li r4, 0 -/* 8061DE2C 4B 9F 09 95 */ bl entryDL__21mDoExt_invisibleModelFP4cXyz -/* 8061DE30 38 60 00 01 */ li r3, 1 -/* 8061DE34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061DE38 83 C1 00 08 */ lwz r30, 8(r1) -/* 8061DE3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061DE40 7C 08 03 A6 */ mtlr r0 -/* 8061DE44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061DE48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s deleted file mode 100644 index d4990bffbc6..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8061E410: -/* 8061E410 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8061E414 7C 08 02 A6 */ mflr r0 -/* 8061E418 90 01 00 24 */ stw r0, 0x24(r1) -/* 8061E41C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8061E420 7C 7F 1B 78 */ mr r31, r3 -/* 8061E424 4B 9F 9E 85 */ bl cDmrNowMidnaTalk__Fv -/* 8061E428 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E42C 41 82 00 0C */ beq lbl_8061E438 -/* 8061E430 38 60 00 01 */ li r3, 1 -/* 8061E434 48 00 00 A0 */ b lbl_8061E4D4 -lbl_8061E438: -/* 8061E438 80 1F 05 C8 */ lwz r0, 0x5c8(r31) -/* 8061E43C 2C 00 00 00 */ cmpwi r0, 0 -/* 8061E440 40 82 00 24 */ bne lbl_8061E464 -/* 8061E444 80 1F 04 A4 */ lwz r0, 0x4a4(r31) -/* 8061E448 90 01 00 08 */ stw r0, 8(r1) -/* 8061E44C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 8061E450 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 8061E454 38 81 00 08 */ addi r4, r1, 8 -/* 8061E458 4B 9F B3 A1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8061E45C 3C 80 80 62 */ lis r4, boss@ha /* 0x8061EAE8@ha */ -/* 8061E460 90 64 EA E8 */ stw r3, boss@l(r4) /* 0x8061EAE8@l */ -lbl_8061E464: -/* 8061E464 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061E468 80 03 EA E8 */ lwz r0, boss@l(r3) /* 0x8061EAE8@l */ -/* 8061E46C 28 00 00 00 */ cmplwi r0, 0 -/* 8061E470 40 82 00 0C */ bne lbl_8061E47C -/* 8061E474 38 60 00 01 */ li r3, 1 -/* 8061E478 48 00 00 5C */ b lbl_8061E4D4 -lbl_8061E47C: -/* 8061E47C A8 7F 05 CC */ lha r3, 0x5cc(r31) -/* 8061E480 38 03 00 01 */ addi r0, r3, 1 -/* 8061E484 B0 1F 05 CC */ sth r0, 0x5cc(r31) -/* 8061E488 38 60 00 00 */ li r3, 0 -/* 8061E48C 38 00 00 04 */ li r0, 4 -/* 8061E490 7C 09 03 A6 */ mtctr r0 -lbl_8061E494: -/* 8061E494 38 A3 05 D2 */ addi r5, r3, 0x5d2 -/* 8061E498 7C 9F 2A AE */ lhax r4, r31, r5 -/* 8061E49C 2C 04 00 00 */ cmpwi r4, 0 -/* 8061E4A0 41 82 00 0C */ beq lbl_8061E4AC -/* 8061E4A4 38 04 FF FF */ addi r0, r4, -1 -/* 8061E4A8 7C 1F 2B 2E */ sthx r0, r31, r5 -lbl_8061E4AC: -/* 8061E4AC 38 63 00 02 */ addi r3, r3, 2 -/* 8061E4B0 42 00 FF E4 */ bdnz lbl_8061E494 -/* 8061E4B4 A8 7F 05 DA */ lha r3, 0x5da(r31) -/* 8061E4B8 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E4BC 41 82 00 0C */ beq lbl_8061E4C8 -/* 8061E4C0 38 03 FF FF */ addi r0, r3, -1 -/* 8061E4C4 B0 1F 05 DA */ sth r0, 0x5da(r31) -lbl_8061E4C8: -/* 8061E4C8 7F E3 FB 78 */ mr r3, r31 -/* 8061E4CC 4B FF FD 0D */ bl action__FP11b_oh2_class -/* 8061E4D0 38 60 00 01 */ li r3, 1 -lbl_8061E4D4: -/* 8061E4D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8061E4D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8061E4DC 7C 08 03 A6 */ mtlr r0 -/* 8061E4E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8061E4E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s deleted file mode 100644 index 1f83341231a..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s +++ /dev/null @@ -1,223 +0,0 @@ -lbl_8061DE4C: -/* 8061DE4C 94 21 FF 30 */ stwu r1, -0xd0(r1) -/* 8061DE50 7C 08 02 A6 */ mflr r0 -/* 8061DE54 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 8061DE58 DB E1 00 C0 */ stfd f31, 0xc0(r1) -/* 8061DE5C F3 E1 00 C8 */ psq_st f31, 200(r1), 0, 0 /* qr0 */ -/* 8061DE60 DB C1 00 B0 */ stfd f30, 0xb0(r1) -/* 8061DE64 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, 0 /* qr0 */ -/* 8061DE68 DB A1 00 A0 */ stfd f29, 0xa0(r1) -/* 8061DE6C F3 A1 00 A8 */ psq_st f29, 168(r1), 0, 0 /* qr0 */ -/* 8061DE70 DB 81 00 90 */ stfd f28, 0x90(r1) -/* 8061DE74 F3 81 00 98 */ psq_st f28, 152(r1), 0, 0 /* qr0 */ -/* 8061DE78 DB 61 00 80 */ stfd f27, 0x80(r1) -/* 8061DE7C F3 61 00 88 */ psq_st f27, 136(r1), 0, 0 /* qr0 */ -/* 8061DE80 DB 41 00 70 */ stfd f26, 0x70(r1) -/* 8061DE84 F3 41 00 78 */ psq_st f26, 120(r1), 0, 0 /* qr0 */ -/* 8061DE88 DB 21 00 60 */ stfd f25, 0x60(r1) -/* 8061DE8C F3 21 00 68 */ psq_st f25, 104(r1), 0, 0 /* qr0 */ -/* 8061DE90 DB 01 00 50 */ stfd f24, 0x50(r1) -/* 8061DE94 F3 01 00 58 */ psq_st f24, 88(r1), 0, 0 /* qr0 */ -/* 8061DE98 39 61 00 50 */ addi r11, r1, 0x50 -/* 8061DE9C 4B D4 43 2D */ bl _savegpr_24 -/* 8061DEA0 7C 7C 1B 78 */ mr r28, r3 -/* 8061DEA4 3C 60 80 62 */ lis r3, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061DEA8 3B E3 EA 38 */ addi r31, r3, lit_3678@l /* 0x8061EA38@l */ -/* 8061DEAC C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 8061DEB0 D0 1C 06 60 */ stfs f0, 0x660(r28) -/* 8061DEB4 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 8061DEB8 D0 1C 06 64 */ stfs f0, 0x664(r28) -/* 8061DEBC C0 1C 04 D8 */ lfs f0, 0x4d8(r28) -/* 8061DEC0 D0 1C 06 68 */ stfs f0, 0x668(r28) -/* 8061DEC4 3B DC 06 6C */ addi r30, r28, 0x66c -/* 8061DEC8 3B BC 07 DA */ addi r29, r28, 0x7da -/* 8061DECC 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DED0 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DED4 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DED8 A8 9C 04 E6 */ lha r4, 0x4e6(r28) -/* 8061DEDC 4B 9E E5 01 */ bl mDoMtx_YrotS__FPA4_fs -/* 8061DEE0 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DEE4 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DEE8 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DEEC A8 9C 04 E4 */ lha r4, 0x4e4(r28) -/* 8061DEF0 4B 9E E4 AD */ bl mDoMtx_XrotM__FPA4_fs -/* 8061DEF4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8061DEF8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8061DEFC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8061DF00 A8 1C 05 D8 */ lha r0, 0x5d8(r28) -/* 8061DF04 2C 00 00 00 */ cmpwi r0, 0 -/* 8061DF08 41 82 00 10 */ beq lbl_8061DF18 -/* 8061DF0C C0 1F 00 08 */ lfs f0, 8(r31) -/* 8061DF10 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8061DF14 48 00 00 38 */ b lbl_8061DF4C -lbl_8061DF18: -/* 8061DF18 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061DF1C 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061DF20 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DF24 A8 03 47 52 */ lha r0, 0x4752(r3) -/* 8061DF28 2C 00 00 65 */ cmpwi r0, 0x65 -/* 8061DF2C 40 82 00 10 */ bne lbl_8061DF3C -/* 8061DF30 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8061DF34 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8061DF38 48 00 00 14 */ b lbl_8061DF4C -lbl_8061DF3C: -/* 8061DF3C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8061DF40 C0 03 5D 04 */ lfs f0, 0x5d04(r3) -/* 8061DF44 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8061DF48 D0 01 00 28 */ stfs f0, 0x28(r1) -lbl_8061DF4C: -/* 8061DF4C 38 61 00 20 */ addi r3, r1, 0x20 -/* 8061DF50 38 81 00 08 */ addi r4, r1, 8 -/* 8061DF54 4B C5 2F 99 */ bl MtxPosition__FP4cXyzP4cXyz -/* 8061DF58 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8061DF5C D0 21 00 20 */ stfs f1, 0x20(r1) -/* 8061DF60 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 8061DF64 C0 1C 05 E4 */ lfs f0, 0x5e4(r28) -/* 8061DF68 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8061DF6C C3 FF 00 00 */ lfs f31, 0(r31) -/* 8061DF70 FF C0 08 90 */ fmr f30, f1 -/* 8061DF74 C3 BF 00 14 */ lfs f29, 0x14(r31) -/* 8061DF78 3C 60 80 62 */ lis r3, boss@ha /* 0x8061EAE8@ha */ -/* 8061DF7C 38 63 EA E8 */ addi r3, r3, boss@l /* 0x8061EAE8@l */ -/* 8061DF80 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DF84 C0 03 05 2C */ lfs f0, 0x52c(r3) -/* 8061DF88 FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 8061DF8C 40 80 00 14 */ bge lbl_8061DFA0 -/* 8061DF90 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 8061DF94 C0 03 47 A0 */ lfs f0, 0x47a0(r3) -/* 8061DF98 EF A1 00 2A */ fadds f29, f1, f0 -/* 8061DF9C C3 DF 00 18 */ lfs f30, 0x18(r31) -lbl_8061DFA0: -/* 8061DFA0 3B 40 00 01 */ li r26, 1 -/* 8061DFA4 C3 7F 00 1C */ lfs f27, 0x1c(r31) -/* 8061DFA8 C3 9F 00 04 */ lfs f28, 4(r31) -/* 8061DFAC 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DFB0 3B 63 07 68 */ addi r27, r3, calc_mtx@l /* 0x80450768@l */ -lbl_8061DFB4: -/* 8061DFB4 C0 3E 00 00 */ lfs f1, 0(r30) -/* 8061DFB8 C0 1E FF F4 */ lfs f0, -0xc(r30) -/* 8061DFBC EC 21 00 28 */ fsubs f1, f1, f0 -/* 8061DFC0 C0 01 00 08 */ lfs f0, 8(r1) -/* 8061DFC4 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8061DFC8 EF 41 00 2A */ fadds f26, f1, f0 -/* 8061DFCC C0 3E 00 04 */ lfs f1, 4(r30) -/* 8061DFD0 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8061DFD4 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8061DFD8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061DFDC EC 3E 00 2A */ fadds f1, f30, f0 -/* 8061DFE0 FC 01 E8 40 */ fcmpo cr0, f1, f29 -/* 8061DFE4 40 80 00 08 */ bge lbl_8061DFEC -/* 8061DFE8 FC 20 E8 90 */ fmr f1, f29 -lbl_8061DFEC: -/* 8061DFEC C0 1E FF F8 */ lfs f0, -8(r30) -/* 8061DFF0 EF 21 00 28 */ fsubs f25, f1, f0 -/* 8061DFF4 C0 3E 00 08 */ lfs f1, 8(r30) -/* 8061DFF8 C0 1E FF FC */ lfs f0, -4(r30) -/* 8061DFFC EC 21 00 28 */ fsubs f1, f1, f0 -/* 8061E000 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8061E004 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8061E008 EF 01 00 2A */ fadds f24, f1, f0 -/* 8061E00C EF FF 06 F2 */ fmuls f31, f31, f27 -/* 8061E010 FC 20 D0 90 */ fmr f1, f26 -/* 8061E014 FC 40 C0 90 */ fmr f2, f24 -/* 8061E018 4B C4 96 5D */ bl cM_atan2s__Fff -/* 8061E01C 7C 78 07 34 */ extsh r24, r3 -/* 8061E020 EC 3A 06 B2 */ fmuls f1, f26, f26 -/* 8061E024 EC 18 06 32 */ fmuls f0, f24, f24 -/* 8061E028 EC 41 00 2A */ fadds f2, f1, f0 -/* 8061E02C FC 02 E0 40 */ fcmpo cr0, f2, f28 -/* 8061E030 40 81 00 0C */ ble lbl_8061E03C -/* 8061E034 FC 00 10 34 */ frsqrte f0, f2 -/* 8061E038 EC 40 00 B2 */ fmuls f2, f0, f2 -lbl_8061E03C: -/* 8061E03C FC 20 C8 90 */ fmr f1, f25 -/* 8061E040 4B C4 96 35 */ bl cM_atan2s__Fff -/* 8061E044 7C 03 00 D0 */ neg r0, r3 -/* 8061E048 7C 19 07 34 */ extsh r25, r0 -/* 8061E04C 80 7B 00 00 */ lwz r3, 0(r27) -/* 8061E050 7F 04 C3 78 */ mr r4, r24 -/* 8061E054 4B 9E E3 89 */ bl mDoMtx_YrotS__FPA4_fs -/* 8061E058 80 7B 00 00 */ lwz r3, 0(r27) -/* 8061E05C 7F 24 CB 78 */ mr r4, r25 -/* 8061E060 4B 9E E3 3D */ bl mDoMtx_XrotM__FPA4_fs -/* 8061E064 38 61 00 20 */ addi r3, r1, 0x20 -/* 8061E068 38 81 00 14 */ addi r4, r1, 0x14 -/* 8061E06C 4B C5 2E 81 */ bl MtxPosition__FP4cXyzP4cXyz -/* 8061E070 C0 3E FF F4 */ lfs f1, -0xc(r30) -/* 8061E074 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8061E078 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061E07C D0 1E 00 00 */ stfs f0, 0(r30) -/* 8061E080 C0 3E FF F8 */ lfs f1, -8(r30) -/* 8061E084 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 8061E088 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061E08C D0 1E 00 04 */ stfs f0, 4(r30) -/* 8061E090 C0 3E FF FC */ lfs f1, -4(r30) -/* 8061E094 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 8061E098 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061E09C D0 1E 00 08 */ stfs f0, 8(r30) -/* 8061E0A0 B3 3D FF FA */ sth r25, -6(r29) -/* 8061E0A4 B3 1D FF FC */ sth r24, -4(r29) -/* 8061E0A8 3B 5A 00 01 */ addi r26, r26, 1 -/* 8061E0AC 2C 1A 00 1F */ cmpwi r26, 0x1f -/* 8061E0B0 3B DE 00 0C */ addi r30, r30, 0xc -/* 8061E0B4 3B BD 00 06 */ addi r29, r29, 6 -/* 8061E0B8 41 80 FE FC */ blt lbl_8061DFB4 -/* 8061E0BC C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 8061E0C0 D0 1C 05 E0 */ stfs f0, 0x5e0(r28) -/* 8061E0C4 A8 7C 05 DC */ lha r3, 0x5dc(r28) -/* 8061E0C8 38 03 07 D0 */ addi r0, r3, 0x7d0 -/* 8061E0CC B0 1C 05 DC */ sth r0, 0x5dc(r28) -/* 8061E0D0 38 C0 00 00 */ li r6, 0 -/* 8061E0D4 38 60 00 00 */ li r3, 0 -/* 8061E0D8 3C 80 80 62 */ lis r4, boss@ha /* 0x8061EAE8@ha */ -/* 8061E0DC 38 A4 EA E8 */ addi r5, r4, boss@l /* 0x8061EAE8@l */ -/* 8061E0E0 C0 5F 00 00 */ lfs f2, 0(r31) -/* 8061E0E4 38 00 00 1E */ li r0, 0x1e -/* 8061E0E8 7C 09 03 A6 */ mtctr r0 -lbl_8061E0EC: -/* 8061E0EC 80 85 00 00 */ lwz r4, 0(r5) -/* 8061E0F0 C0 04 05 2C */ lfs f0, 0x52c(r4) -/* 8061E0F4 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 8061E0F8 40 81 00 38 */ ble lbl_8061E130 -/* 8061E0FC A8 1C 05 DC */ lha r0, 0x5dc(r28) -/* 8061E100 7C 00 32 14 */ add r0, r0, r6 -/* 8061E104 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8061E108 3C 80 80 44 */ lis r4, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8061E10C 38 84 9A 20 */ addi r4, r4, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8061E110 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8061E114 C0 7C 05 E0 */ lfs f3, 0x5e0(r28) -/* 8061E118 EC 22 18 2A */ fadds f1, f2, f3 -/* 8061E11C EC 03 00 32 */ fmuls f0, f3, f0 -/* 8061E120 EC 01 00 2A */ fadds f0, f1, f0 -/* 8061E124 38 03 05 E8 */ addi r0, r3, 0x5e8 -/* 8061E128 7C 1C 05 2E */ stfsx f0, r28, r0 -/* 8061E12C 48 00 00 0C */ b lbl_8061E138 -lbl_8061E130: -/* 8061E130 38 03 05 E8 */ addi r0, r3, 0x5e8 -/* 8061E134 7C 5C 05 2E */ stfsx f2, r28, r0 -lbl_8061E138: -/* 8061E138 38 63 00 04 */ addi r3, r3, 4 -/* 8061E13C 38 C6 D8 F0 */ addi r6, r6, -10000 -/* 8061E140 42 00 FF AC */ bdnz lbl_8061E0EC -/* 8061E144 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 /* qr0 */ -/* 8061E148 CB E1 00 C0 */ lfd f31, 0xc0(r1) -/* 8061E14C E3 C1 00 B8 */ psq_l f30, 184(r1), 0, 0 /* qr0 */ -/* 8061E150 CB C1 00 B0 */ lfd f30, 0xb0(r1) -/* 8061E154 E3 A1 00 A8 */ psq_l f29, 168(r1), 0, 0 /* qr0 */ -/* 8061E158 CB A1 00 A0 */ lfd f29, 0xa0(r1) -/* 8061E15C E3 81 00 98 */ psq_l f28, 152(r1), 0, 0 /* qr0 */ -/* 8061E160 CB 81 00 90 */ lfd f28, 0x90(r1) -/* 8061E164 E3 61 00 88 */ psq_l f27, 136(r1), 0, 0 /* qr0 */ -/* 8061E168 CB 61 00 80 */ lfd f27, 0x80(r1) -/* 8061E16C E3 41 00 78 */ psq_l f26, 120(r1), 0, 0 /* qr0 */ -/* 8061E170 CB 41 00 70 */ lfd f26, 0x70(r1) -/* 8061E174 E3 21 00 68 */ psq_l f25, 104(r1), 0, 0 /* qr0 */ -/* 8061E178 CB 21 00 60 */ lfd f25, 0x60(r1) -/* 8061E17C E3 01 00 58 */ psq_l f24, 88(r1), 0, 0 /* qr0 */ -/* 8061E180 CB 01 00 50 */ lfd f24, 0x50(r1) -/* 8061E184 39 61 00 50 */ addi r11, r1, 0x50 -/* 8061E188 4B D4 40 8D */ bl _restgpr_24 -/* 8061E18C 80 01 00 D4 */ lwz r0, 0xd4(r1) -/* 8061E190 7C 08 03 A6 */ mtlr r0 -/* 8061E194 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8061E198 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s deleted file mode 100644 index 8193816ddfd..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_8061DCB8: -/* 8061DCB8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8061DCBC 7C 08 02 A6 */ mflr r0 -/* 8061DCC0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8061DCC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8061DCC8 4B D4 45 11 */ bl _savegpr_28 -/* 8061DCCC 2C 04 00 00 */ cmpwi r4, 0 -/* 8061DCD0 40 82 00 C4 */ bne lbl_8061DD94 -/* 8061DCD4 A3 E3 00 14 */ lhz r31, 0x14(r3) -/* 8061DCD8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8061DCDC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8061DCE0 83 C3 00 38 */ lwz r30, 0x38(r3) -/* 8061DCE4 83 9E 00 14 */ lwz r28, 0x14(r30) -/* 8061DCE8 28 1C 00 00 */ cmplwi r28, 0 -/* 8061DCEC 41 82 00 A8 */ beq lbl_8061DD94 -/* 8061DCF0 1C 1F 00 0C */ mulli r0, r31, 0xc -/* 8061DCF4 7C 7C 02 14 */ add r3, r28, r0 -/* 8061DCF8 C0 23 06 60 */ lfs f1, 0x660(r3) -/* 8061DCFC C0 43 06 64 */ lfs f2, 0x664(r3) -/* 8061DD00 C0 63 06 68 */ lfs f3, 0x668(r3) -/* 8061DD04 38 60 00 00 */ li r3, 0 -/* 8061DD08 4B C5 31 55 */ bl MtxTrans__FfffUc -/* 8061DD0C 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DD10 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DD14 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DD18 1F BF 00 06 */ mulli r29, r31, 6 -/* 8061DD1C 7C 9C EA 14 */ add r4, r28, r29 -/* 8061DD20 A8 84 07 D6 */ lha r4, 0x7d6(r4) -/* 8061DD24 4B 9E E7 11 */ bl mDoMtx_YrotM__FPA4_fs -/* 8061DD28 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DD2C 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DD30 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DD34 7C 9C EA 14 */ add r4, r28, r29 -/* 8061DD38 A8 84 07 D4 */ lha r4, 0x7d4(r4) -/* 8061DD3C 4B 9E E6 61 */ bl mDoMtx_XrotM__FPA4_fs -/* 8061DD40 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DD44 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DD48 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DD4C 38 80 C0 00 */ li r4, -16384 -/* 8061DD50 4B 9E E6 E5 */ bl mDoMtx_YrotM__FPA4_fs -/* 8061DD54 57 E0 10 3A */ slwi r0, r31, 2 -/* 8061DD58 7C 7C 02 14 */ add r3, r28, r0 -/* 8061DD5C C0 43 05 E8 */ lfs f2, 0x5e8(r3) -/* 8061DD60 3C 60 80 62 */ lis r3, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061DD64 C0 23 EA 38 */ lfs f1, lit_3678@l(r3) /* 0x8061EA38@l */ -/* 8061DD68 FC 60 10 90 */ fmr f3, f2 -/* 8061DD6C 38 60 00 01 */ li r3, 1 -/* 8061DD70 4B C5 31 35 */ bl MtxScale__FfffUc -/* 8061DD74 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8061DD78 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8061DD7C 80 63 00 00 */ lwz r3, 0(r3) -/* 8061DD80 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 8061DD84 80 84 00 0C */ lwz r4, 0xc(r4) -/* 8061DD88 1C 1F 00 30 */ mulli r0, r31, 0x30 -/* 8061DD8C 7C 84 02 14 */ add r4, r4, r0 -/* 8061DD90 4B D2 87 21 */ bl PSMTXCopy -lbl_8061DD94: -/* 8061DD94 38 60 00 01 */ li r3, 1 -/* 8061DD98 39 61 00 20 */ addi r11, r1, 0x20 -/* 8061DD9C 4B D4 44 89 */ bl _restgpr_28 -/* 8061DDA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8061DDA4 7C 08 03 A6 */ mtlr r0 -/* 8061DDA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8061DDAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index a9c44b7c127..00000000000 --- a/asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,198 +0,0 @@ -lbl_8061E540: -/* 8061E540 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8061E544 7C 08 02 A6 */ mflr r0 -/* 8061E548 90 01 00 34 */ stw r0, 0x34(r1) -/* 8061E54C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8061E550 4B D4 3C 89 */ bl _savegpr_28 -/* 8061E554 7C 7E 1B 78 */ mr r30, r3 -/* 8061E558 3C 60 80 62 */ lis r3, lit_3678@ha /* 0x8061EA38@ha */ -/* 8061E55C 3B E3 EA 38 */ addi r31, r3, lit_3678@l /* 0x8061EA38@l */ -/* 8061E560 38 60 00 58 */ li r3, 0x58 -/* 8061E564 4B CB 06 E9 */ bl __nw__FUl -/* 8061E568 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8061E56C 41 82 00 70 */ beq lbl_8061E5DC -/* 8061E570 3C 60 80 62 */ lis r3, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E574 38 63 EA 84 */ addi r3, r3, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E578 38 80 00 29 */ li r4, 0x29 -/* 8061E57C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8061E580 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8061E584 3C A5 00 02 */ addis r5, r5, 2 -/* 8061E588 38 C0 00 80 */ li r6, 0x80 -/* 8061E58C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8061E590 4B A1 DD 5D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8061E594 7C 64 1B 78 */ mr r4, r3 -/* 8061E598 38 1E 08 98 */ addi r0, r30, 0x898 -/* 8061E59C 90 01 00 08 */ stw r0, 8(r1) -/* 8061E5A0 38 00 00 00 */ li r0, 0 -/* 8061E5A4 90 01 00 0C */ stw r0, 0xc(r1) -/* 8061E5A8 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000284@ha */ -/* 8061E5AC 38 03 02 84 */ addi r0, r3, 0x0284 /* 0x11000284@l */ -/* 8061E5B0 90 01 00 10 */ stw r0, 0x10(r1) -/* 8061E5B4 7F A3 EB 78 */ mr r3, r29 -/* 8061E5B8 38 A0 00 00 */ li r5, 0 -/* 8061E5BC 38 C0 00 00 */ li r6, 0 -/* 8061E5C0 38 E0 00 00 */ li r7, 0 -/* 8061E5C4 39 00 00 02 */ li r8, 2 -/* 8061E5C8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8061E5CC 39 20 00 00 */ li r9, 0 -/* 8061E5D0 39 40 FF FF */ li r10, -1 -/* 8061E5D4 4B 9F 21 FD */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl -/* 8061E5D8 7C 7D 1B 78 */ mr r29, r3 -lbl_8061E5DC: -/* 8061E5DC 93 BE 05 B4 */ stw r29, 0x5b4(r30) -/* 8061E5E0 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E5E4 28 03 00 00 */ cmplwi r3, 0 -/* 8061E5E8 41 82 00 10 */ beq lbl_8061E5F8 -/* 8061E5EC 80 83 00 04 */ lwz r4, 4(r3) -/* 8061E5F0 28 04 00 00 */ cmplwi r4, 0 -/* 8061E5F4 40 82 00 0C */ bne lbl_8061E600 -lbl_8061E5F8: -/* 8061E5F8 38 60 00 00 */ li r3, 0 -/* 8061E5FC 48 00 02 0C */ b lbl_8061E808 -lbl_8061E600: -/* 8061E600 38 7E 05 B8 */ addi r3, r30, 0x5b8 -/* 8061E604 38 A0 00 01 */ li r5, 1 -/* 8061E608 4B 9E FF 35 */ bl create__21mDoExt_invisibleModelFP8J3DModelUc -/* 8061E60C 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E610 40 82 00 0C */ bne lbl_8061E61C -/* 8061E614 38 60 00 00 */ li r3, 0 -/* 8061E618 48 00 01 F0 */ b lbl_8061E808 -lbl_8061E61C: -/* 8061E61C 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E620 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E624 93 C3 00 14 */ stw r30, 0x14(r3) -/* 8061E628 38 C0 00 00 */ li r6, 0 -/* 8061E62C 3C 60 80 62 */ lis r3, nodeCallBack__FP8J3DJointi@ha /* 0x8061DCB8@ha */ -/* 8061E630 38 83 DC B8 */ addi r4, r3, nodeCallBack__FP8J3DJointi@l /* 0x8061DCB8@l */ -/* 8061E634 48 00 00 1C */ b lbl_8061E650 -lbl_8061E638: -/* 8061E638 80 65 00 04 */ lwz r3, 4(r5) -/* 8061E63C 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8061E640 54 C0 13 BA */ rlwinm r0, r6, 2, 0xe, 0x1d -/* 8061E644 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8061E648 90 83 00 04 */ stw r4, 4(r3) -/* 8061E64C 38 C6 00 01 */ addi r6, r6, 1 -lbl_8061E650: -/* 8061E650 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E654 80 A3 00 04 */ lwz r5, 4(r3) -/* 8061E658 80 65 00 04 */ lwz r3, 4(r5) -/* 8061E65C A0 63 00 2C */ lhz r3, 0x2c(r3) -/* 8061E660 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 8061E664 7C 00 18 40 */ cmplw r0, r3 -/* 8061E668 41 80 FF D0 */ blt lbl_8061E638 -/* 8061E66C 38 60 00 18 */ li r3, 0x18 -/* 8061E670 4B CB 05 DD */ bl __nw__FUl -/* 8061E674 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8061E678 41 82 00 20 */ beq lbl_8061E698 -/* 8061E67C 3C 80 80 62 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8061EADC@ha */ -/* 8061E680 38 04 EA DC */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8061EADC@l */ -/* 8061E684 90 1D 00 00 */ stw r0, 0(r29) -/* 8061E688 38 80 00 00 */ li r4, 0 -/* 8061E68C 4B D0 9D 71 */ bl init__12J3DFrameCtrlFs -/* 8061E690 38 00 00 00 */ li r0, 0 -/* 8061E694 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_8061E698: -/* 8061E698 93 BE 05 C0 */ stw r29, 0x5c0(r30) -/* 8061E69C 80 1E 05 C0 */ lwz r0, 0x5c0(r30) -/* 8061E6A0 28 00 00 00 */ cmplwi r0, 0 -/* 8061E6A4 40 82 00 0C */ bne lbl_8061E6B0 -/* 8061E6A8 38 60 00 00 */ li r3, 0 -/* 8061E6AC 48 00 01 5C */ b lbl_8061E808 -lbl_8061E6B0: -/* 8061E6B0 3C 60 80 62 */ lis r3, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E6B4 38 63 EA 84 */ addi r3, r3, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E6B8 38 80 00 36 */ li r4, 0x36 -/* 8061E6BC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8061E6C0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8061E6C4 3F 85 00 02 */ addis r28, r5, 2 -/* 8061E6C8 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 8061E6CC 7F 85 E3 78 */ mr r5, r28 -/* 8061E6D0 38 C0 00 80 */ li r6, 0x80 -/* 8061E6D4 4B A1 DC 19 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8061E6D8 7C 65 1B 78 */ mr r5, r3 -/* 8061E6DC 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E6E0 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E6E4 80 83 00 04 */ lwz r4, 4(r3) -/* 8061E6E8 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E6EC 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061E6F0 38 C0 00 01 */ li r6, 1 -/* 8061E6F4 38 E0 00 02 */ li r7, 2 -/* 8061E6F8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8061E6FC 39 00 00 00 */ li r8, 0 -/* 8061E700 39 20 FF FF */ li r9, -1 -/* 8061E704 4B 9E EF 39 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 8061E708 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E70C 40 82 00 0C */ bne lbl_8061E718 -/* 8061E710 38 60 00 00 */ li r3, 0 -/* 8061E714 48 00 00 F4 */ b lbl_8061E808 -lbl_8061E718: -/* 8061E718 C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 8061E71C 4B C4 92 39 */ bl cM_rndF__Ff -/* 8061E720 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E724 D0 23 00 10 */ stfs f1, 0x10(r3) -/* 8061E728 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 8061E72C 4B C4 92 61 */ bl cM_rndFX__Ff -/* 8061E730 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8061E734 EC 00 08 2A */ fadds f0, f0, f1 -/* 8061E738 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061E73C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8061E740 38 60 00 18 */ li r3, 0x18 -/* 8061E744 4B CB 05 09 */ bl __nw__FUl -/* 8061E748 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8061E74C 41 82 00 20 */ beq lbl_8061E76C -/* 8061E750 3C 80 80 62 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8061EADC@ha */ -/* 8061E754 38 04 EA DC */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8061EADC@l */ -/* 8061E758 90 1D 00 00 */ stw r0, 0(r29) -/* 8061E75C 38 80 00 00 */ li r4, 0 -/* 8061E760 4B D0 9C 9D */ bl init__12J3DFrameCtrlFs -/* 8061E764 38 00 00 00 */ li r0, 0 -/* 8061E768 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_8061E76C: -/* 8061E76C 93 BE 05 C4 */ stw r29, 0x5c4(r30) -/* 8061E770 80 1E 05 C4 */ lwz r0, 0x5c4(r30) -/* 8061E774 28 00 00 00 */ cmplwi r0, 0 -/* 8061E778 40 82 00 0C */ bne lbl_8061E784 -/* 8061E77C 38 60 00 00 */ li r3, 0 -/* 8061E780 48 00 00 88 */ b lbl_8061E808 -lbl_8061E784: -/* 8061E784 3C 60 80 62 */ lis r3, d_a_b_oh2__stringBase0@ha /* 0x8061EA84@ha */ -/* 8061E788 38 63 EA 84 */ addi r3, r3, d_a_b_oh2__stringBase0@l /* 0x8061EA84@l */ -/* 8061E78C 38 80 00 2F */ li r4, 0x2f -/* 8061E790 7F 85 E3 78 */ mr r5, r28 -/* 8061E794 38 C0 00 80 */ li r6, 0x80 -/* 8061E798 4B A1 DB 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8061E79C 7C 65 1B 78 */ mr r5, r3 -/* 8061E7A0 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061E7A4 80 63 00 04 */ lwz r3, 4(r3) -/* 8061E7A8 80 83 00 04 */ lwz r4, 4(r3) -/* 8061E7AC 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E7B0 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061E7B4 38 C0 00 01 */ li r6, 1 -/* 8061E7B8 38 E0 00 02 */ li r7, 2 -/* 8061E7BC C0 3F 00 00 */ lfs f1, 0(r31) -/* 8061E7C0 39 00 00 00 */ li r8, 0 -/* 8061E7C4 39 20 FF FF */ li r9, -1 -/* 8061E7C8 4B 9E EF 45 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 8061E7CC 2C 03 00 00 */ cmpwi r3, 0 -/* 8061E7D0 40 82 00 0C */ bne lbl_8061E7DC -/* 8061E7D4 38 60 00 00 */ li r3, 0 -/* 8061E7D8 48 00 00 30 */ b lbl_8061E808 -lbl_8061E7DC: -/* 8061E7DC C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 8061E7E0 4B C4 91 75 */ bl cM_rndF__Ff -/* 8061E7E4 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E7E8 D0 23 00 10 */ stfs f1, 0x10(r3) -/* 8061E7EC C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 8061E7F0 4B C4 91 9D */ bl cM_rndFX__Ff -/* 8061E7F4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8061E7F8 EC 00 08 2A */ fadds f0, f0, f1 -/* 8061E7FC 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061E800 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8061E804 38 60 00 01 */ li r3, 1 -lbl_8061E808: -/* 8061E808 39 61 00 30 */ addi r11, r1, 0x30 -/* 8061E80C 4B D4 3A 19 */ bl _restgpr_28 -/* 8061E810 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8061E814 7C 08 03 A6 */ mtlr r0 -/* 8061E818 38 21 00 30 */ addi r1, r1, 0x30 -/* 8061E81C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/uki_catch__FP13dmg_rod_class.s b/asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/uki_catch__FP13dmg_rod_class.s index 3f3ef172801..aa5528f62ae 100644 --- a/asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/uki_catch__FP13dmg_rod_class.s +++ b/asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/uki_catch__FP13dmg_rod_class.s @@ -253,8 +253,8 @@ lbl_804B4530: /* 804B4548 88 1F 0C 3D */ lbz r0, 0xc3d(r31) /* 804B454C 28 00 00 01 */ cmplwi r0, 1 /* 804B4550 40 82 00 6C */ bne lbl_804B45BC -/* 804B4554 3C 60 80 45 */ lis r3, struct_80450C9C+0x2@ha /* 0x80450C9E@ha */ -/* 804B4558 88 03 0C 9E */ lbz r0, struct_80450C9C+0x2@l(r3) /* 0x80450C9E@l */ +/* 804B4554 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x2@ha /* 0x80450C9E@ha */ +/* 804B4558 88 03 0C 9E */ lbz r0, cDmr_SkipInfo+0x2@l(r3) /* 0x80450C9E@l */ /* 804B455C 28 00 00 00 */ cmplwi r0, 0 /* 804B4560 41 82 00 20 */ beq lbl_804B4580 /* 804B4564 38 7C 14 74 */ addi r3, r28, 0x1474 @@ -272,8 +272,8 @@ lbl_804B4580: /* 804B4590 38 E0 00 00 */ li r7, 0 /* 804B4594 4B D9 59 FD */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 804B4598 38 00 00 01 */ li r0, 1 -/* 804B459C 3C 60 80 45 */ lis r3, struct_80450C9C+0x2@ha /* 0x80450C9E@ha */ -/* 804B45A0 98 03 0C 9E */ stb r0, struct_80450C9C+0x2@l(r3) /* 0x80450C9E@l */ +/* 804B459C 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x2@ha /* 0x80450C9E@ha */ +/* 804B45A0 98 03 0C 9E */ stb r0, cDmr_SkipInfo+0x2@l(r3) /* 0x80450C9E@l */ lbl_804B45A4: /* 804B45A4 80 7D 00 40 */ lwz r3, 0x40(r29) /* 804B45A8 28 03 00 00 */ cmplwi r3, 0 diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s deleted file mode 100644 index 420f07183af..00000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80485D78: -/* 80485D78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485D7C 7C 08 02 A6 */ mflr r0 -/* 80485D80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485D84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80485D88 7C 7F 1B 78 */ mr r31, r3 -/* 80485D8C 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80485D90 3C 80 80 48 */ lis r4, l_specName@ha /* 0x80485F00@ha */ -/* 80485D94 38 84 5F 00 */ addi r4, r4, l_specName@l /* 0x80485F00@l */ -/* 80485D98 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80485D9C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80485DA0 3C A5 00 02 */ addis r5, r5, 2 -/* 80485DA4 38 C0 00 80 */ li r6, 0x80 -/* 80485DA8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80485DAC 4B BB 65 D1 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80485DB0 A0 03 00 00 */ lhz r0, 0(r3) -/* 80485DB4 54 00 08 3C */ slwi r0, r0, 1 -/* 80485DB8 3C 60 80 48 */ lis r3, l_bg_profName@ha /* 0x80485F10@ha */ -/* 80485DBC 38 63 5F 10 */ addi r3, r3, l_bg_profName@l /* 0x80485F10@l */ -/* 80485DC0 7C 63 02 AE */ lhax r3, r3, r0 -/* 80485DC4 80 9F 00 B0 */ lwz r4, 0xb0(r31) -/* 80485DC8 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80485DCC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80485DD0 7C 06 07 74 */ extsb r6, r0 -/* 80485DD4 38 FF 04 DC */ addi r7, r31, 0x4dc -/* 80485DD8 39 1F 04 EC */ addi r8, r31, 0x4ec -/* 80485DDC 39 20 FF FF */ li r9, -1 -/* 80485DE0 4B B9 3F B9 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc -/* 80485DE4 38 60 00 01 */ li r3, 1 -/* 80485DE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80485DEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485DF0 7C 08 03 A6 */ mtlr r0 -/* 80485DF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485DF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s deleted file mode 100644 index 296b3714d95..00000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80485E88: -/* 80485E88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485E8C 7C 08 02 A6 */ mflr r0 -/* 80485E90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485E94 7C 64 1B 78 */ mr r4, r3 -/* 80485E98 38 64 05 68 */ addi r3, r4, 0x568 -/* 80485E9C 38 84 05 70 */ addi r4, r4, 0x570 -/* 80485EA0 4B BA 71 69 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80485EA4 38 60 00 01 */ li r3, 1 -/* 80485EA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485EAC 7C 08 03 A6 */ mtlr r0 -/* 80485EB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485EB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s deleted file mode 100644 index 02c002daadf..00000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80485DFC: -/* 80485DFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485E00 7C 08 02 A6 */ mflr r0 -/* 80485E04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485E08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80485E0C 7C 7F 1B 78 */ mr r31, r3 -/* 80485E10 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80485E14 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80485E18 40 82 00 1C */ bne lbl_80485E34 -/* 80485E1C 28 1F 00 00 */ cmplwi r31, 0 -/* 80485E20 41 82 00 08 */ beq lbl_80485E28 -/* 80485E24 4B B9 2D 41 */ bl __ct__10fopAc_ac_cFv -lbl_80485E28: -/* 80485E28 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80485E2C 60 00 00 08 */ ori r0, r0, 8 -/* 80485E30 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80485E34: -/* 80485E34 7F E3 FB 78 */ mr r3, r31 -/* 80485E38 4B BA BA 39 */ bl getArcName__12daSetBgObj_cFP10fopAc_ac_c -/* 80485E3C 7C 65 1B 78 */ mr r5, r3 -/* 80485E40 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80485E44 3C 80 80 48 */ lis r4, d_a_set_bgobj__stringBase0@ha /* 0x80485F0C@ha */ -/* 80485E48 38 84 5F 0C */ addi r4, r4, d_a_set_bgobj__stringBase0@l /* 0x80485F0C@l */ -/* 80485E4C 4C C6 31 82 */ crclr 6 -/* 80485E50 4B EE 06 8D */ bl sprintf -/* 80485E54 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80485E58 38 9F 05 70 */ addi r4, r31, 0x570 -/* 80485E5C 4B BA 70 61 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80485E60 2C 03 00 04 */ cmpwi r3, 4 -/* 80485E64 40 82 00 10 */ bne lbl_80485E74 -/* 80485E68 7F E3 FB 78 */ mr r3, r31 -/* 80485E6C 4B FF FF 0D */ bl CreateInit__12daSetBgObj_cFv -/* 80485E70 38 60 00 05 */ li r3, 5 -lbl_80485E74: -/* 80485E74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80485E78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485E7C 7C 08 03 A6 */ mtlr r0 -/* 80485E80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485E84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s deleted file mode 100644 index cb1ffef2129..00000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80485ED8: -/* 80485ED8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485EDC 7C 08 02 A6 */ mflr r0 -/* 80485EE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485EE4 4B FF FF 19 */ bl create__12daSetBgObj_cFv -/* 80485EE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485EEC 7C 08 03 A6 */ mtlr r0 -/* 80485EF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485EF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s b/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s deleted file mode 100644 index 24c75c2f334..00000000000 --- a/asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80485EB8: -/* 80485EB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80485EBC 7C 08 02 A6 */ mflr r0 -/* 80485EC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80485EC4 4B FF FF C5 */ bl Delete__12daSetBgObj_cFv -/* 80485EC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80485ECC 7C 08 03 A6 */ mtlr r0 -/* 80485ED0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80485ED4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/daNpc_Henna_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/daNpc_Henna_Create__FP10fopAc_ac_c.s index 41145f25268..5a35b39990e 100644 --- a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/daNpc_Henna_Create__FP10fopAc_ac_c.s +++ b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/daNpc_Henna_Create__FP10fopAc_ac_c.s @@ -105,8 +105,8 @@ lbl_80549800: /* 805498B0 88 1E 04 E3 */ lbz r0, 0x4e3(r30) /* 805498B4 98 1E 04 CF */ stb r0, 0x4cf(r30) /* 805498B8 3B 40 60 00 */ li r26, 0x6000 -/* 805498BC 3C 60 80 45 */ lis r3, struct_80450C9C+0x0@ha /* 0x80450C9C@ha */ -/* 805498C0 88 03 0C 9C */ lbz r0, struct_80450C9C+0x0@l(r3) /* 0x80450C9C@l */ +/* 805498BC 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x0@ha /* 0x80450C9C@ha */ +/* 805498C0 88 03 0C 9C */ lbz r0, cDmr_SkipInfo+0x0@l(r3) /* 0x80450C9C@l */ /* 805498C4 28 00 00 00 */ cmplwi r0, 0 /* 805498C8 41 82 00 24 */ beq lbl_805498EC /* 805498CC 7F C3 F3 78 */ mr r3, r30 @@ -431,8 +431,8 @@ lbl_80549D8C: /* 80549D94 88 9C 12 FE */ lbz r4, 0x12fe(r28) /* 80549D98 28 04 00 04 */ cmplwi r4, 4 /* 80549D9C 41 82 00 20 */ beq lbl_80549DBC -/* 80549DA0 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80549DA4 8C 03 0C 9F */ lbzu r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80549DA0 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80549DA4 8C 03 0C 9F */ lbzu r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ /* 80549DA8 28 00 00 06 */ cmplwi r0, 6 /* 80549DAC 40 82 00 10 */ bne lbl_80549DBC /* 80549DB0 38 00 00 00 */ li r0, 0 @@ -441,19 +441,19 @@ lbl_80549D8C: lbl_80549DBC: /* 80549DBC 28 04 00 04 */ cmplwi r4, 4 /* 80549DC0 40 82 00 28 */ bne lbl_80549DE8 -/* 80549DC4 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80549DC8 88 03 0C 9F */ lbz r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80549DC4 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80549DC8 88 03 0C 9F */ lbz r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ /* 80549DCC 28 00 00 02 */ cmplwi r0, 2 /* 80549DD0 41 82 00 0C */ beq lbl_80549DDC /* 80549DD4 28 00 00 03 */ cmplwi r0, 3 /* 80549DD8 40 82 00 10 */ bne lbl_80549DE8 lbl_80549DDC: /* 80549DDC 38 00 00 00 */ li r0, 0 -/* 80549DE0 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80549DE4 98 03 0C 9F */ stb r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80549DE0 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80549DE4 98 03 0C 9F */ stb r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ lbl_80549DE8: -/* 80549DE8 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80549DEC 88 03 0C 9F */ lbz r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80549DE8 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80549DEC 88 03 0C 9F */ lbz r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ /* 80549DF0 98 1C 12 CC */ stb r0, 0x12cc(r28) /* 80549DF4 38 00 00 01 */ li r0, 1 /* 80549DF8 98 1F 02 81 */ stb r0, 0x281(r31) diff --git a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/demo_camera_shop__FP15npc_henna_class.s b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/demo_camera_shop__FP15npc_henna_class.s index 1a95d3155a0..476a53bff1f 100644 --- a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/demo_camera_shop__FP15npc_henna_class.s +++ b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/demo_camera_shop__FP15npc_henna_class.s @@ -653,8 +653,8 @@ lbl_80545F64: /* 80545FC0 38 E0 FF FF */ li r7, -1 /* 80545FC4 4B AE 11 AD */ bl dStage_changeScene__FifUlScsi /* 80545FC8 38 00 00 01 */ li r0, 1 -/* 80545FCC 3C 60 80 45 */ lis r3, struct_80450C9C+0x0@ha /* 0x80450C9C@ha */ -/* 80545FD0 98 03 0C 9C */ stb r0, struct_80450C9C+0x0@l(r3) /* 0x80450C9C@l */ +/* 80545FCC 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x0@ha /* 0x80450C9C@ha */ +/* 80545FD0 98 03 0C 9C */ stb r0, cDmr_SkipInfo+0x0@l(r3) /* 0x80450C9C@l */ /* 80545FD4 38 00 00 00 */ li r0, 0 /* 80545FD8 3C 60 80 45 */ lis r3, struct_80450C98+0x2@ha /* 0x80450C9A@ha */ /* 80545FDC 98 03 0C 9A */ stb r0, struct_80450C98+0x2@l(r3) /* 0x80450C9A@l */ @@ -1377,8 +1377,8 @@ lbl_80546A34: /* 80546A40 38 C0 00 00 */ li r6, 0 /* 80546A44 38 E0 00 00 */ li r7, 0 /* 80546A48 4B D0 35 49 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80546A4C 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80546A50 8C 03 0C 9D */ lbzu r0, struct_80450C9C+0x1@l(r3) /* 0x80450C9D@l */ +/* 80546A4C 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80546A50 8C 03 0C 9D */ lbzu r0, cDmr_SkipInfo+0x1@l(r3) /* 0x80450C9D@l */ /* 80546A54 60 00 00 80 */ ori r0, r0, 0x80 /* 80546A58 98 03 00 00 */ stb r0, 0(r3) /* 80546A5C 48 00 02 6C */ b lbl_80546CC8 diff --git a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/env_control__FP15npc_henna_class.s b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/env_control__FP15npc_henna_class.s index c09b253530d..91753ce5a1a 100644 --- a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/env_control__FP15npc_henna_class.s +++ b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/env_control__FP15npc_henna_class.s @@ -103,8 +103,8 @@ lbl_805487F0: /* 80548800 4B D1 F1 55 */ bl cM_rndF__Ff /* 80548804 FC 01 F8 40 */ fcmpo cr0, f1, f31 /* 80548808 40 80 00 90 */ bge lbl_80548898 -/* 8054880C 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80548810 38 63 0C 9F */ addi r3, r3, struct_80450C9C+0x3@l /* 0x80450C9F@l */ +/* 8054880C 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80548810 38 63 0C 9F */ addi r3, r3, cDmr_SkipInfo+0x3@l /* 0x80450C9F@l */ /* 80548814 88 63 00 00 */ lbz r3, 0(r3) /* 80548818 28 03 00 00 */ cmplwi r3, 0 /* 8054881C 40 82 00 10 */ bne lbl_8054882C @@ -142,8 +142,8 @@ lbl_80548884: /* 80548888 98 1F 12 CC */ stb r0, 0x12cc(r31) lbl_8054888C: /* 8054888C 88 1F 12 CC */ lbz r0, 0x12cc(r31) -/* 80548890 3C 60 80 45 */ lis r3, struct_80450C9C+0x3@ha /* 0x80450C9F@ha */ -/* 80548894 98 03 0C 9F */ stb r0, struct_80450C9C+0x3@l(r3) /* 0x80450C9F@l */ +/* 80548890 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x3@ha /* 0x80450C9F@ha */ +/* 80548894 98 03 0C 9F */ stb r0, cDmr_SkipInfo+0x3@l(r3) /* 0x80450C9F@l */ lbl_80548898: /* 80548898 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ /* 8054889C CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/henna_shop__FP15npc_henna_class.s b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/henna_shop__FP15npc_henna_class.s index 4fbca3e723f..ef9c548dfc7 100644 --- a/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/henna_shop__FP15npc_henna_class.s +++ b/asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/henna_shop__FP15npc_henna_class.s @@ -271,8 +271,8 @@ lbl_80543D04: /* 80543D34 4B AF 0C 89 */ bl isEventBit__11dSv_event_cCFUs /* 80543D38 2C 03 00 00 */ cmpwi r3, 0 /* 80543D3C 41 82 00 14 */ beq lbl_80543D50 -/* 80543D40 3C 60 80 45 */ lis r3, struct_80450C9C+0x0@ha /* 0x80450C9C@ha */ -/* 80543D44 88 03 0C 9C */ lbz r0, struct_80450C9C+0x0@l(r3) /* 0x80450C9C@l */ +/* 80543D40 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x0@ha /* 0x80450C9C@ha */ +/* 80543D44 88 03 0C 9C */ lbz r0, cDmr_SkipInfo+0x0@l(r3) /* 0x80450C9C@l */ /* 80543D48 28 00 00 00 */ cmplwi r0, 0 /* 80543D4C 41 82 00 6C */ beq lbl_80543DB8 lbl_80543D50: @@ -286,8 +286,8 @@ lbl_80543D50: /* 80543D6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ /* 80543D70 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80543D74 4B AF E6 F5 */ bl reset__14dEvt_control_cFv -/* 80543D78 3C 60 80 45 */ lis r3, struct_80450C9C+0x0@ha /* 0x80450C9C@ha */ -/* 80543D7C 8C 03 0C 9C */ lbzu r0, struct_80450C9C+0x0@l(r3) /* 0x80450C9C@l */ +/* 80543D78 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x0@ha /* 0x80450C9C@ha */ +/* 80543D7C 8C 03 0C 9C */ lbzu r0, cDmr_SkipInfo+0x0@l(r3) /* 0x80450C9C@l */ /* 80543D80 28 00 00 00 */ cmplwi r0, 0 /* 80543D84 41 82 00 18 */ beq lbl_80543D9C /* 80543D88 38 00 00 00 */ li r0, 0 diff --git a/asm/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko/daNpc_Inko_Execute__FP14npc_inko_class.s b/asm/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko/daNpc_Inko_Execute__FP14npc_inko_class.s index 3a4ea10122d..a43d9f5376f 100644 --- a/asm/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko/daNpc_Inko_Execute__FP14npc_inko_class.s +++ b/asm/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko/daNpc_Inko_Execute__FP14npc_inko_class.s @@ -943,8 +943,8 @@ lbl_80A0DA5C: /* 80A0DA9C 41 82 00 1C */ beq lbl_80A0DAB8 /* 80A0DAA0 38 00 00 28 */ li r0, 0x28 /* 80A0DAA4 98 03 07 B5 */ stb r0, 0x7b5(r3) -/* 80A0DAA8 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80A0DAAC 8C 03 0C 9D */ lbzu r0, struct_80450C9C+0x1@l(r3) /* 0x80450C9D@l */ +/* 80A0DAA8 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80A0DAAC 8C 03 0C 9D */ lbzu r0, cDmr_SkipInfo+0x1@l(r3) /* 0x80450C9D@l */ /* 80A0DAB0 60 00 00 40 */ ori r0, r0, 0x40 /* 80A0DAB4 98 03 00 00 */ stb r0, 0(r3) lbl_80A0DAB8: @@ -996,8 +996,8 @@ lbl_80A0DB00: /* 80A0DB64 98 03 07 BA */ stb r0, 0x7ba(r3) /* 80A0DB68 48 00 00 3C */ b lbl_80A0DBA4 lbl_80A0DB6C: -/* 80A0DB6C 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80A0DB70 88 03 0C 9D */ lbz r0, struct_80450C9C+0x1@l(r3) /* 0x80450C9D@l */ +/* 80A0DB6C 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80A0DB70 88 03 0C 9D */ lbz r0, cDmr_SkipInfo+0x1@l(r3) /* 0x80450C9D@l */ /* 80A0DB74 54 03 07 BE */ clrlwi r3, r0, 0x1e /* 80A0DB78 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 80A0DB7C 41 82 00 18 */ beq lbl_80A0DB94 @@ -1020,8 +1020,8 @@ lbl_80A0DBA4: /* 80A0DBB8 4B 83 C3 D9 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 80A0DBBC 38 00 00 01 */ li r0, 1 /* 80A0DBC0 98 1D 05 F4 */ stb r0, 0x5f4(r29) -/* 80A0DBC4 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80A0DBC8 38 83 0C 9D */ addi r4, r3, struct_80450C9C+0x1@l /* 0x80450C9D@l */ +/* 80A0DBC4 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80A0DBC8 38 83 0C 9D */ addi r4, r3, cDmr_SkipInfo+0x1@l /* 0x80450C9D@l */ /* 80A0DBCC 88 64 00 00 */ lbz r3, 0(r4) /* 80A0DBD0 38 03 00 01 */ addi r0, r3, 1 /* 80A0DBD4 98 04 00 00 */ stb r0, 0(r4) @@ -1036,8 +1036,8 @@ lbl_80A0DBE4: /* 80A0DBF4 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) /* 80A0DBF8 C0 18 04 D8 */ lfs f0, 0x4d8(r24) /* 80A0DBFC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80A0DC00 3C 60 80 45 */ lis r3, struct_80450C9C+0x1@ha /* 0x80450C9D@ha */ -/* 80A0DC04 88 03 0C 9D */ lbz r0, struct_80450C9C+0x1@l(r3) /* 0x80450C9D@l */ +/* 80A0DC00 3C 60 80 45 */ lis r3, cDmr_SkipInfo+0x1@ha /* 0x80450C9D@ha */ +/* 80A0DC04 88 03 0C 9D */ lbz r0, cDmr_SkipInfo+0x1@l(r3) /* 0x80450C9D@l */ /* 80A0DC08 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 80A0DC0C 41 82 00 60 */ beq lbl_80A0DC6C /* 80A0DC10 A8 1D 05 A2 */ lha r0, 0x5a2(r29) diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s deleted file mode 100644 index 58b5ef965dd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80D3452C: -/* 80D3452C 3C 80 80 D3 */ lis r4, __vt__16daObj_Web0_HIO_c@ha /* 0x80D3527C@ha */ -/* 80D34530 38 04 52 7C */ addi r0, r4, __vt__16daObj_Web0_HIO_c@l /* 0x80D3527C@l */ -/* 80D34534 90 03 00 00 */ stw r0, 0(r3) -/* 80D34538 38 00 FF FF */ li r0, -1 -/* 80D3453C 98 03 00 04 */ stb r0, 4(r3) -/* 80D34540 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index cf54007e2c8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D34D44: -/* 80D34D44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D34D48 7C 08 02 A6 */ mflr r0 -/* 80D34D4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D34D50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D34D54 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D34D58 41 82 00 1C */ beq lbl_80D34D74 -/* 80D34D5C 3C A0 80 D3 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80D35270@ha */ -/* 80D34D60 38 05 52 70 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80D35270@l */ -/* 80D34D64 90 1F 00 00 */ stw r0, 0(r31) -/* 80D34D68 7C 80 07 35 */ extsh. r0, r4 -/* 80D34D6C 40 81 00 08 */ ble lbl_80D34D74 -/* 80D34D70 4B 59 9F CD */ bl __dl__FPv -lbl_80D34D74: -/* 80D34D74 7F E3 FB 78 */ mr r3, r31 -/* 80D34D78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D34D7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D34D80 7C 08 03 A6 */ mtlr r0 -/* 80D34D84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D34D88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s deleted file mode 100644 index 68ab5226e1a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D350E4: -/* 80D350E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D350E8 7C 08 02 A6 */ mflr r0 -/* 80D350EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D350F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D350F4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D350F8 41 82 00 1C */ beq lbl_80D35114 -/* 80D350FC 3C A0 80 D3 */ lis r5, __vt__16daObj_Web0_HIO_c@ha /* 0x80D3527C@ha */ -/* 80D35100 38 05 52 7C */ addi r0, r5, __vt__16daObj_Web0_HIO_c@l /* 0x80D3527C@l */ -/* 80D35104 90 1F 00 00 */ stw r0, 0(r31) -/* 80D35108 7C 80 07 35 */ extsh. r0, r4 -/* 80D3510C 40 81 00 08 */ ble lbl_80D35114 -/* 80D35110 4B 59 9C 2D */ bl __dl__FPv -lbl_80D35114: -/* 80D35114 7F E3 FB 78 */ mr r3, r31 -/* 80D35118 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D3511C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35120 7C 08 03 A6 */ mtlr r0 -/* 80D35124 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35128 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s deleted file mode 100644 index 0cbf3503094..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D3509C: -/* 80D3509C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D350A0 7C 08 02 A6 */ mflr r0 -/* 80D350A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D350A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D350AC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D350B0 41 82 00 1C */ beq lbl_80D350CC -/* 80D350B4 3C A0 80 D3 */ lis r5, __vt__8cM3dGAab@ha /* 0x80D35264@ha */ -/* 80D350B8 38 05 52 64 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80D35264@l */ -/* 80D350BC 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80D350C0 7C 80 07 35 */ extsh. r0, r4 -/* 80D350C4 40 81 00 08 */ ble lbl_80D350CC -/* 80D350C8 4B 59 9C 75 */ bl __dl__FPv -lbl_80D350CC: -/* 80D350CC 7F E3 FB 78 */ mr r3, r31 -/* 80D350D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D350D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D350D8 7C 08 03 A6 */ mtlr r0 -/* 80D350DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D350E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s deleted file mode 100644 index 4db51a42f56..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D35054: -/* 80D35054 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35058 7C 08 02 A6 */ mflr r0 -/* 80D3505C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35060 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35064 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D35068 41 82 00 1C */ beq lbl_80D35084 -/* 80D3506C 3C A0 80 D3 */ lis r5, __vt__8cM3dGSph@ha /* 0x80D35258@ha */ -/* 80D35070 38 05 52 58 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80D35258@l */ -/* 80D35074 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80D35078 7C 80 07 35 */ extsh. r0, r4 -/* 80D3507C 40 81 00 08 */ ble lbl_80D35084 -/* 80D35080 4B 59 9C BD */ bl __dl__FPv -lbl_80D35084: -/* 80D35084 7F E3 FB 78 */ mr r3, r31 -/* 80D35088 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D3508C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35090 7C 08 03 A6 */ mtlr r0 -/* 80D35094 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35098 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s deleted file mode 100644 index bf746eae2e9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D3512C: -/* 80D3512C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35130 7C 08 02 A6 */ mflr r0 -/* 80D35134 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35138 3C 60 80 D3 */ lis r3, l_HIO@ha /* 0x80D352A0@ha */ -/* 80D3513C 38 63 52 A0 */ addi r3, r3, l_HIO@l /* 0x80D352A0@l */ -/* 80D35140 4B FF F3 ED */ bl __ct__16daObj_Web0_HIO_cFv -/* 80D35144 3C 80 80 D3 */ lis r4, __dt__16daObj_Web0_HIO_cFv@ha /* 0x80D350E4@ha */ -/* 80D35148 38 84 50 E4 */ addi r4, r4, __dt__16daObj_Web0_HIO_cFv@l /* 0x80D350E4@l */ -/* 80D3514C 3C A0 80 D3 */ lis r5, lit_3643@ha /* 0x80D35294@ha */ -/* 80D35150 38 A5 52 94 */ addi r5, r5, lit_3643@l /* 0x80D35294@l */ -/* 80D35154 4B FF F3 65 */ bl __register_global_object -/* 80D35158 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3515C 7C 08 03 A6 */ mtlr r0 -/* 80D35160 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35164 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s deleted file mode 100644 index bf1c63d473d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,189 +0,0 @@ -lbl_80D34D8C: -/* 80D34D8C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D34D90 7C 08 02 A6 */ mflr r0 -/* 80D34D94 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D34D98 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D34D9C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80D34DA0 7C 7F 1B 78 */ mr r31, r3 -/* 80D34DA4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D34DA8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D34DAC 40 82 00 A8 */ bne lbl_80D34E54 -/* 80D34DB0 7F E0 FB 79 */ or. r0, r31, r31 -/* 80D34DB4 41 82 00 94 */ beq lbl_80D34E48 -/* 80D34DB8 7C 1E 03 78 */ mr r30, r0 -/* 80D34DBC 4B 2E 3D A9 */ bl __ct__10fopAc_ac_cFv -/* 80D34DC0 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80D34DC4 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80D34DC8 90 1E 05 DC */ stw r0, 0x5dc(r30) -/* 80D34DCC 38 7E 05 E0 */ addi r3, r30, 0x5e0 -/* 80D34DD0 4B 34 E9 91 */ bl __ct__10dCcD_GSttsFv -/* 80D34DD4 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80D34DD8 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80D34DDC 90 7E 05 DC */ stw r3, 0x5dc(r30) -/* 80D34DE0 38 03 00 20 */ addi r0, r3, 0x20 -/* 80D34DE4 90 1E 05 E0 */ stw r0, 0x5e0(r30) -/* 80D34DE8 3B DE 06 00 */ addi r30, r30, 0x600 -/* 80D34DEC 7F C3 F3 78 */ mr r3, r30 -/* 80D34DF0 4B 34 EC 39 */ bl __ct__12dCcD_GObjInfFv -/* 80D34DF4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80D34DF8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80D34DFC 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80D34E00 3C 60 80 D3 */ lis r3, __vt__8cM3dGAab@ha /* 0x80D35264@ha */ -/* 80D34E04 38 03 52 64 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80D35264@l */ -/* 80D34E08 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 80D34E0C 3C 60 80 D3 */ lis r3, __vt__8cM3dGSph@ha /* 0x80D35258@ha */ -/* 80D34E10 38 03 52 58 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80D35258@l */ -/* 80D34E14 90 1E 01 34 */ stw r0, 0x134(r30) -/* 80D34E18 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80D34E1C 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80D34E20 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80D34E24 38 03 00 58 */ addi r0, r3, 0x58 -/* 80D34E28 90 1E 01 34 */ stw r0, 0x134(r30) -/* 80D34E2C 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80D34E30 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80D34E34 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80D34E38 38 03 00 2C */ addi r0, r3, 0x2c -/* 80D34E3C 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80D34E40 38 03 00 84 */ addi r0, r3, 0x84 -/* 80D34E44 90 1E 01 34 */ stw r0, 0x134(r30) -lbl_80D34E48: -/* 80D34E48 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D34E4C 60 00 00 08 */ ori r0, r0, 8 -/* 80D34E50 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D34E54: -/* 80D34E54 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80D34E58 3C 80 80 D3 */ lis r4, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34E5C 38 84 51 BC */ addi r4, r4, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34E60 4B 2F 80 5D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D34E64 7C 7E 1B 78 */ mr r30, r3 -/* 80D34E68 2C 1E 00 04 */ cmpwi r30, 4 -/* 80D34E6C 40 82 01 CC */ bne lbl_80D35038 -/* 80D34E70 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D34E74 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80D34E78 2C 04 00 FF */ cmpwi r4, 0xff -/* 80D34E7C 41 82 00 28 */ beq lbl_80D34EA4 -/* 80D34E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D34E84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D34E88 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D34E8C 7C 05 07 74 */ extsb r5, r0 -/* 80D34E90 4B 30 04 D1 */ bl isSwitch__10dSv_info_cCFii -/* 80D34E94 2C 03 00 00 */ cmpwi r3, 0 -/* 80D34E98 41 82 00 0C */ beq lbl_80D34EA4 -/* 80D34E9C 38 60 00 05 */ li r3, 5 -/* 80D34EA0 48 00 01 9C */ b lbl_80D3503C -lbl_80D34EA4: -/* 80D34EA4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D34EA8 98 1F 05 70 */ stb r0, 0x570(r31) -/* 80D34EAC 88 1F 05 70 */ lbz r0, 0x570(r31) -/* 80D34EB0 28 00 00 FF */ cmplwi r0, 0xff -/* 80D34EB4 40 82 00 0C */ bne lbl_80D34EC0 -/* 80D34EB8 38 00 00 00 */ li r0, 0 -/* 80D34EBC 98 1F 05 70 */ stb r0, 0x570(r31) -lbl_80D34EC0: -/* 80D34EC0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D34EC4 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80D34EC8 98 1F 05 71 */ stb r0, 0x571(r31) -/* 80D34ECC 7F E3 FB 78 */ mr r3, r31 -/* 80D34ED0 3C 80 80 D3 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80D34B94@ha */ -/* 80D34ED4 38 84 4B 94 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80D34B94@l */ -/* 80D34ED8 38 A0 0A 20 */ li r5, 0xa20 -/* 80D34EDC 4B 2E 55 D5 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D34EE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D34EE4 40 82 00 0C */ bne lbl_80D34EF0 -/* 80D34EE8 38 60 00 05 */ li r3, 5 -/* 80D34EEC 48 00 01 50 */ b lbl_80D3503C -lbl_80D34EF0: -/* 80D34EF0 80 9F 05 C0 */ lwz r4, 0x5c0(r31) -/* 80D34EF4 28 04 00 00 */ cmplwi r4, 0 -/* 80D34EF8 41 82 00 28 */ beq lbl_80D34F20 -/* 80D34EFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D34F00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D34F04 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D34F08 7F E5 FB 78 */ mr r5, r31 -/* 80D34F0C 4B 33 FA FD */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80D34F10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D34F14 41 82 00 0C */ beq lbl_80D34F20 -/* 80D34F18 38 60 00 05 */ li r3, 5 -/* 80D34F1C 48 00 01 20 */ b lbl_80D3503C -lbl_80D34F20: -/* 80D34F20 3C 60 80 D3 */ lis r3, data_80D35290@ha /* 0x80D35290@ha */ -/* 80D34F24 8C 03 52 90 */ lbzu r0, data_80D35290@l(r3) /* 0x80D35290@l */ -/* 80D34F28 28 00 00 00 */ cmplwi r0, 0 -/* 80D34F2C 40 82 00 20 */ bne lbl_80D34F4C -/* 80D34F30 38 00 00 01 */ li r0, 1 -/* 80D34F34 98 1F 07 39 */ stb r0, 0x739(r31) -/* 80D34F38 98 03 00 00 */ stb r0, 0(r3) -/* 80D34F3C 38 00 FF FF */ li r0, -1 -/* 80D34F40 3C 60 80 D3 */ lis r3, l_HIO@ha /* 0x80D352A0@ha */ -/* 80D34F44 38 63 52 A0 */ addi r3, r3, l_HIO@l /* 0x80D352A0@l */ -/* 80D34F48 98 03 00 04 */ stb r0, 4(r3) -lbl_80D34F4C: -/* 80D34F4C 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D34F50 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D34F54 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80D34F58 7F E3 FB 78 */ mr r3, r31 -/* 80D34F5C 3C 80 80 D3 */ lis r4, lit_4014@ha /* 0x80D351A8@ha */ -/* 80D34F60 C0 24 51 A8 */ lfs f1, lit_4014@l(r4) /* 0x80D351A8@l */ -/* 80D34F64 FC 40 08 90 */ fmr f2, f1 -/* 80D34F68 FC 60 08 90 */ fmr f3, f1 -/* 80D34F6C 4B 2E 55 BD */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80D34F70 7F E3 FB 78 */ mr r3, r31 -/* 80D34F74 3C 80 80 D3 */ lis r4, lit_4015@ha /* 0x80D351AC@ha */ -/* 80D34F78 C0 24 51 AC */ lfs f1, lit_4015@l(r4) /* 0x80D351AC@l */ -/* 80D34F7C FC 40 08 90 */ fmr f2, f1 -/* 80D34F80 FC 60 08 90 */ fmr f3, f1 -/* 80D34F84 4B 2E 55 B5 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80D34F88 38 00 00 1E */ li r0, 0x1e -/* 80D34F8C B0 1F 05 62 */ sth r0, 0x562(r31) -/* 80D34F90 B0 1F 05 60 */ sth r0, 0x560(r31) -/* 80D34F94 38 7F 05 C4 */ addi r3, r31, 0x5c4 -/* 80D34F98 38 80 00 FA */ li r4, 0xfa -/* 80D34F9C 38 A0 00 00 */ li r5, 0 -/* 80D34FA0 7F E6 FB 78 */ mr r6, r31 -/* 80D34FA4 4B 34 E8 BD */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80D34FA8 38 7F 06 00 */ addi r3, r31, 0x600 -/* 80D34FAC 3C 80 80 D3 */ lis r4, cc_sph_src@ha /* 0x80D351C8@ha */ -/* 80D34FB0 38 84 51 C8 */ addi r4, r4, cc_sph_src@l /* 0x80D351C8@l */ -/* 80D34FB4 4B 34 FA 81 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80D34FB8 38 1F 05 C4 */ addi r0, r31, 0x5c4 -/* 80D34FBC 90 1F 06 44 */ stw r0, 0x644(r31) -/* 80D34FC0 80 1F 06 9C */ lwz r0, 0x69c(r31) -/* 80D34FC4 60 00 00 04 */ ori r0, r0, 4 -/* 80D34FC8 90 1F 06 9C */ stw r0, 0x69c(r31) -/* 80D34FCC 88 1F 05 71 */ lbz r0, 0x571(r31) -/* 80D34FD0 28 00 00 FF */ cmplwi r0, 0xff -/* 80D34FD4 41 82 00 44 */ beq lbl_80D35018 -/* 80D34FD8 28 00 00 00 */ cmplwi r0, 0 -/* 80D34FDC 41 82 00 3C */ beq lbl_80D35018 -/* 80D34FE0 3C 60 80 D3 */ lis r3, lit_4017@ha /* 0x80D351B4@ha */ -/* 80D34FE4 C8 23 51 B4 */ lfd f1, lit_4017@l(r3) /* 0x80D351B4@l */ -/* 80D34FE8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D34FEC 3C 60 43 30 */ lis r3, 0x4330 -/* 80D34FF0 90 61 00 08 */ stw r3, 8(r1) -/* 80D34FF4 C8 01 00 08 */ lfd f0, 8(r1) -/* 80D34FF8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80D34FFC D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 80D35000 88 1F 05 71 */ lbz r0, 0x571(r31) -/* 80D35004 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35008 90 61 00 10 */ stw r3, 0x10(r1) -/* 80D3500C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80D35010 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80D35014 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -lbl_80D35018: -/* 80D35018 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80D3501C D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 80D35020 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80D35024 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80D35028 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80D3502C D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 80D35030 7F E3 FB 78 */ mr r3, r31 -/* 80D35034 4B FF F7 61 */ bl daObj_Web0_Execute__FP14obj_web0_class -lbl_80D35038: -/* 80D35038 7F C3 F3 78 */ mr r3, r30 -lbl_80D3503C: -/* 80D3503C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D35040 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80D35044 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D35048 7C 08 03 A6 */ mtlr r0 -/* 80D3504C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D35050 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s deleted file mode 100644 index 573f302947a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80D34B2C: -/* 80D34B2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D34B30 7C 08 02 A6 */ mflr r0 -/* 80D34B34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D34B38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D34B3C 7C 7F 1B 78 */ mr r31, r3 -/* 80D34B40 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80D34B44 3C 80 80 D3 */ lis r4, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34B48 38 84 51 BC */ addi r4, r4, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34B4C 4B 2F 84 BD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D34B50 88 1F 07 39 */ lbz r0, 0x739(r31) -/* 80D34B54 28 00 00 00 */ cmplwi r0, 0 -/* 80D34B58 41 82 00 10 */ beq lbl_80D34B68 -/* 80D34B5C 38 00 00 00 */ li r0, 0 -/* 80D34B60 3C 60 80 D3 */ lis r3, data_80D35290@ha /* 0x80D35290@ha */ -/* 80D34B64 98 03 52 90 */ stb r0, data_80D35290@l(r3) /* 0x80D35290@l */ -lbl_80D34B68: -/* 80D34B68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D34B6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D34B70 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D34B74 80 9F 05 C0 */ lwz r4, 0x5c0(r31) -/* 80D34B78 4B 33 F6 D9 */ bl Release__4cBgSFP9dBgW_Base -/* 80D34B7C 38 60 00 01 */ li r3, 1 -/* 80D34B80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D34B84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D34B88 7C 08 03 A6 */ mtlr r0 -/* 80D34B8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D34B90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s deleted file mode 100644 index be75744a079..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80D34544: -/* 80D34544 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D34548 7C 08 02 A6 */ mflr r0 -/* 80D3454C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D34550 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D34554 7C 7F 1B 78 */ mr r31, r3 -/* 80D34558 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D3455C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D34560 38 80 00 10 */ li r4, 0x10 -/* 80D34564 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80D34568 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80D3456C 4B 46 F2 59 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D34570 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D34574 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D34578 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80D3457C 80 84 00 04 */ lwz r4, 4(r4) -/* 80D34580 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80D34584 4B 47 08 1D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D34588 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D3458C 80 83 00 04 */ lwz r4, 4(r3) -/* 80D34590 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80D34594 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80D34598 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D3459C 4B 2D 92 0D */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80D345A0 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D345A4 4B 2D 97 21 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D345A8 38 60 00 01 */ li r3, 1 -/* 80D345AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D345B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D345B4 7C 08 03 A6 */ mtlr r0 -/* 80D345B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D345BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index f5205827849..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,117 +0,0 @@ -lbl_80D34B94: -/* 80D34B94 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D34B98 7C 08 02 A6 */ mflr r0 -/* 80D34B9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D34BA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D34BA4 4B 62 D6 39 */ bl _savegpr_29 -/* 80D34BA8 7C 7E 1B 78 */ mr r30, r3 -/* 80D34BAC 3C 60 80 D3 */ lis r3, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34BB0 38 63 51 BC */ addi r3, r3, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34BB4 38 80 00 05 */ li r4, 5 -/* 80D34BB8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D34BBC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D34BC0 3F E5 00 02 */ addis r31, r5, 2 -/* 80D34BC4 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80D34BC8 7F E5 FB 78 */ mr r5, r31 -/* 80D34BCC 38 C0 00 80 */ li r6, 0x80 -/* 80D34BD0 4B 30 77 1D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D34BD4 3C 80 00 08 */ lis r4, 8 -/* 80D34BD8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D34BDC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D34BE0 4B 2E 00 75 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D34BE4 90 7E 05 74 */ stw r3, 0x574(r30) -/* 80D34BE8 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 80D34BEC 28 00 00 00 */ cmplwi r0, 0 -/* 80D34BF0 40 82 00 0C */ bne lbl_80D34BFC -/* 80D34BF4 38 60 00 00 */ li r3, 0 -/* 80D34BF8 48 00 01 34 */ b lbl_80D34D2C -lbl_80D34BFC: -/* 80D34BFC 38 60 00 18 */ li r3, 0x18 -/* 80D34C00 4B 59 A0 4D */ bl __nw__FUl -/* 80D34C04 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80D34C08 41 82 00 20 */ beq lbl_80D34C28 -/* 80D34C0C 3C 80 80 D3 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80D35270@ha */ -/* 80D34C10 38 04 52 70 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80D35270@l */ -/* 80D34C14 90 1D 00 00 */ stw r0, 0(r29) -/* 80D34C18 38 80 00 00 */ li r4, 0 -/* 80D34C1C 4B 5F 37 E1 */ bl init__12J3DFrameCtrlFs -/* 80D34C20 38 00 00 00 */ li r0, 0 -/* 80D34C24 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80D34C28: -/* 80D34C28 93 BE 05 78 */ stw r29, 0x578(r30) -/* 80D34C2C 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 80D34C30 28 00 00 00 */ cmplwi r0, 0 -/* 80D34C34 40 82 00 0C */ bne lbl_80D34C40 -/* 80D34C38 38 60 00 00 */ li r3, 0 -/* 80D34C3C 48 00 00 F0 */ b lbl_80D34D2C -lbl_80D34C40: -/* 80D34C40 3C 60 80 D3 */ lis r3, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34C44 38 63 51 BC */ addi r3, r3, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34C48 38 80 00 08 */ li r4, 8 -/* 80D34C4C 7F E5 FB 78 */ mr r5, r31 -/* 80D34C50 38 C0 00 80 */ li r6, 0x80 -/* 80D34C54 4B 30 76 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D34C58 7C 65 1B 78 */ mr r5, r3 -/* 80D34C5C 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80D34C60 80 83 00 04 */ lwz r4, 4(r3) -/* 80D34C64 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D34C68 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D34C6C 38 C0 00 01 */ li r6, 1 -/* 80D34C70 38 E0 00 00 */ li r7, 0 -/* 80D34C74 3D 00 80 D3 */ lis r8, lit_3724@ha /* 0x80D3517C@ha */ -/* 80D34C78 C0 28 51 7C */ lfs f1, lit_3724@l(r8) /* 0x80D3517C@l */ -/* 80D34C7C 39 00 00 00 */ li r8, 0 -/* 80D34C80 39 20 FF FF */ li r9, -1 -/* 80D34C84 4B 2D 8A 89 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80D34C88 2C 03 00 00 */ cmpwi r3, 0 -/* 80D34C8C 40 82 00 0C */ bne lbl_80D34C98 -/* 80D34C90 38 60 00 00 */ li r3, 0 -/* 80D34C94 48 00 00 98 */ b lbl_80D34D2C -lbl_80D34C98: -/* 80D34C98 3C 60 80 D3 */ lis r3, lit_3917@ha /* 0x80D351A4@ha */ -/* 80D34C9C C0 03 51 A4 */ lfs f0, lit_3917@l(r3) /* 0x80D351A4@l */ -/* 80D34CA0 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D34CA4 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80D34CA8 38 60 00 C0 */ li r3, 0xc0 -/* 80D34CAC 4B 59 9F A1 */ bl __nw__FUl -/* 80D34CB0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80D34CB4 41 82 00 0C */ beq lbl_80D34CC0 -/* 80D34CB8 4B 34 6C B9 */ bl __ct__4dBgWFv -/* 80D34CBC 7C 60 1B 78 */ mr r0, r3 -lbl_80D34CC0: -/* 80D34CC0 90 1E 05 C0 */ stw r0, 0x5c0(r30) -/* 80D34CC4 80 1E 05 C0 */ lwz r0, 0x5c0(r30) -/* 80D34CC8 28 00 00 00 */ cmplwi r0, 0 -/* 80D34CCC 40 82 00 0C */ bne lbl_80D34CD8 -/* 80D34CD0 38 60 00 00 */ li r3, 0 -/* 80D34CD4 48 00 00 58 */ b lbl_80D34D2C -lbl_80D34CD8: -/* 80D34CD8 3C 60 80 D3 */ lis r3, d_a_obj_web0__stringBase0@ha /* 0x80D351BC@ha */ -/* 80D34CDC 38 63 51 BC */ addi r3, r3, d_a_obj_web0__stringBase0@l /* 0x80D351BC@l */ -/* 80D34CE0 38 80 00 0B */ li r4, 0xb -/* 80D34CE4 7F E5 FB 78 */ mr r5, r31 -/* 80D34CE8 38 C0 00 80 */ li r6, 0x80 -/* 80D34CEC 4B 30 76 01 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D34CF0 7C 64 1B 78 */ mr r4, r3 -/* 80D34CF4 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 80D34CF8 38 A0 00 01 */ li r5, 1 -/* 80D34CFC 38 DE 05 90 */ addi r6, r30, 0x590 -/* 80D34D00 4B 34 52 39 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80D34D04 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80D34D08 28 00 00 01 */ cmplwi r0, 1 -/* 80D34D0C 40 82 00 0C */ bne lbl_80D34D18 -/* 80D34D10 38 60 00 00 */ li r3, 0 -/* 80D34D14 48 00 00 18 */ b lbl_80D34D2C -lbl_80D34D18: -/* 80D34D18 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075A24@ha */ -/* 80D34D1C 38 03 5A 24 */ addi r0, r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075A24@l */ -/* 80D34D20 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 80D34D24 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80D34D28 38 60 00 01 */ li r3, 1 -lbl_80D34D2C: -/* 80D34D2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D34D30 4B 62 D4 F9 */ bl _restgpr_29 -/* 80D34D34 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D34D38 7C 08 03 A6 */ mtlr r0 -/* 80D34D3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D34D40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s deleted file mode 100644 index 82c2183aa86..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80D353AC: -/* 80D353AC 3C 80 80 D3 */ lis r4, __vt__16daObj_Web1_HIO_c@ha /* 0x80D361E4@ha */ -/* 80D353B0 38 04 61 E4 */ addi r0, r4, __vt__16daObj_Web1_HIO_c@l /* 0x80D361E4@l */ -/* 80D353B4 90 03 00 00 */ stw r0, 0(r3) -/* 80D353B8 38 00 FF FF */ li r0, -1 -/* 80D353BC 98 03 00 04 */ stb r0, 4(r3) -/* 80D353C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 4ecc0d8629e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D35C9C: -/* 80D35C9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35CA0 7C 08 02 A6 */ mflr r0 -/* 80D35CA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35CA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35CAC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D35CB0 41 82 00 1C */ beq lbl_80D35CCC -/* 80D35CB4 3C A0 80 D3 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80D361D8@ha */ -/* 80D35CB8 38 05 61 D8 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80D361D8@l */ -/* 80D35CBC 90 1F 00 00 */ stw r0, 0(r31) -/* 80D35CC0 7C 80 07 35 */ extsh. r0, r4 -/* 80D35CC4 40 81 00 08 */ ble lbl_80D35CCC -/* 80D35CC8 4B 59 90 75 */ bl __dl__FPv -lbl_80D35CCC: -/* 80D35CCC 7F E3 FB 78 */ mr r3, r31 -/* 80D35CD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D35CD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35CD8 7C 08 03 A6 */ mtlr r0 -/* 80D35CDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35CE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s deleted file mode 100644 index 31ad5f064ae..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D36028: -/* 80D36028 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D3602C 7C 08 02 A6 */ mflr r0 -/* 80D36030 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D36034 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D36038 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D3603C 41 82 00 1C */ beq lbl_80D36058 -/* 80D36040 3C A0 80 D3 */ lis r5, __vt__16daObj_Web1_HIO_c@ha /* 0x80D361E4@ha */ -/* 80D36044 38 05 61 E4 */ addi r0, r5, __vt__16daObj_Web1_HIO_c@l /* 0x80D361E4@l */ -/* 80D36048 90 1F 00 00 */ stw r0, 0(r31) -/* 80D3604C 7C 80 07 35 */ extsh. r0, r4 -/* 80D36050 40 81 00 08 */ ble lbl_80D36058 -/* 80D36054 4B 59 8C E9 */ bl __dl__FPv -lbl_80D36058: -/* 80D36058 7F E3 FB 78 */ mr r3, r31 -/* 80D3605C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D36060 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D36064 7C 08 03 A6 */ mtlr r0 -/* 80D36068 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3606C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s deleted file mode 100644 index a0857e7e036..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D35FE0: -/* 80D35FE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35FE4 7C 08 02 A6 */ mflr r0 -/* 80D35FE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35FEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35FF0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D35FF4 41 82 00 1C */ beq lbl_80D36010 -/* 80D35FF8 3C A0 80 D3 */ lis r5, __vt__8cM3dGAab@ha /* 0x80D361CC@ha */ -/* 80D35FFC 38 05 61 CC */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80D361CC@l */ -/* 80D36000 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80D36004 7C 80 07 35 */ extsh. r0, r4 -/* 80D36008 40 81 00 08 */ ble lbl_80D36010 -/* 80D3600C 4B 59 8D 31 */ bl __dl__FPv -lbl_80D36010: -/* 80D36010 7F E3 FB 78 */ mr r3, r31 -/* 80D36014 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D36018 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3601C 7C 08 03 A6 */ mtlr r0 -/* 80D36020 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D36024 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s deleted file mode 100644 index b75148c9db4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D35F98: -/* 80D35F98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35F9C 7C 08 02 A6 */ mflr r0 -/* 80D35FA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35FA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35FA8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D35FAC 41 82 00 1C */ beq lbl_80D35FC8 -/* 80D35FB0 3C A0 80 D3 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80D361C0@ha */ -/* 80D35FB4 38 05 61 C0 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80D361C0@l */ -/* 80D35FB8 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80D35FBC 7C 80 07 35 */ extsh. r0, r4 -/* 80D35FC0 40 81 00 08 */ ble lbl_80D35FC8 -/* 80D35FC4 4B 59 8D 79 */ bl __dl__FPv -lbl_80D35FC8: -/* 80D35FC8 7F E3 FB 78 */ mr r3, r31 -/* 80D35FCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D35FD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35FD4 7C 08 03 A6 */ mtlr r0 -/* 80D35FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35FDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s deleted file mode 100644 index 2c58f808bdd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D36070: -/* 80D36070 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D36074 7C 08 02 A6 */ mflr r0 -/* 80D36078 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3607C 3C 60 80 D3 */ lis r3, l_HIO@ha /* 0x80D36208@ha */ -/* 80D36080 38 63 62 08 */ addi r3, r3, l_HIO@l /* 0x80D36208@l */ -/* 80D36084 4B FF F3 29 */ bl __ct__16daObj_Web1_HIO_cFv -/* 80D36088 3C 80 80 D3 */ lis r4, __dt__16daObj_Web1_HIO_cFv@ha /* 0x80D36028@ha */ -/* 80D3608C 38 84 60 28 */ addi r4, r4, __dt__16daObj_Web1_HIO_cFv@l /* 0x80D36028@l */ -/* 80D36090 3C A0 80 D3 */ lis r5, lit_3643@ha /* 0x80D361FC@ha */ -/* 80D36094 38 A5 61 FC */ addi r5, r5, lit_3643@l /* 0x80D361FC@l */ -/* 80D36098 4B FF F2 A1 */ bl __register_global_object -/* 80D3609C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D360A0 7C 08 03 A6 */ mtlr r0 -/* 80D360A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D360A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s deleted file mode 100644 index 2636e59c84e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s +++ /dev/null @@ -1,172 +0,0 @@ -lbl_80D35508: -/* 80D35508 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D3550C 7C 08 02 A6 */ mflr r0 -/* 80D35510 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D35514 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D35518 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80D3551C 7C 7E 1B 78 */ mr r30, r3 -/* 80D35520 3C 60 80 D3 */ lis r3, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35524 3B E3 60 C0 */ addi r31, r3, lit_3703@l /* 0x80D360C0@l */ -/* 80D35528 A8 7E 05 A8 */ lha r3, 0x5a8(r30) -/* 80D3552C 7C 60 07 35 */ extsh. r0, r3 -/* 80D35530 41 82 00 74 */ beq lbl_80D355A4 -/* 80D35534 2C 03 00 3C */ cmpwi r3, 0x3c -/* 80D35538 41 82 00 14 */ beq lbl_80D3554C -/* 80D3553C 2C 03 00 28 */ cmpwi r3, 0x28 -/* 80D35540 41 82 00 0C */ beq lbl_80D3554C -/* 80D35544 2C 03 00 14 */ cmpwi r3, 0x14 -/* 80D35548 40 82 00 50 */ bne lbl_80D35598 -lbl_80D3554C: -/* 80D3554C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D35550 7C 03 07 74 */ extsb r3, r0 -/* 80D35554 4B 2F 7B 19 */ bl dComIfGp_getReverb__Fi -/* 80D35558 7C 67 1B 78 */ mr r7, r3 -/* 80D3555C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080114@ha */ -/* 80D35560 38 03 01 14 */ addi r0, r3, 0x0114 /* 0x00080114@l */ -/* 80D35564 90 01 00 08 */ stw r0, 8(r1) -/* 80D35568 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80D3556C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80D35570 80 63 00 00 */ lwz r3, 0(r3) -/* 80D35574 38 81 00 08 */ addi r4, r1, 8 -/* 80D35578 38 BE 05 38 */ addi r5, r30, 0x538 -/* 80D3557C 38 C0 00 00 */ li r6, 0 -/* 80D35580 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80D35584 FC 40 08 90 */ fmr f2, f1 -/* 80D35588 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 80D3558C FC 80 18 90 */ fmr f4, f3 -/* 80D35590 39 00 00 00 */ li r8, 0 -/* 80D35594 4B 57 63 F1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80D35598: -/* 80D35598 A8 7E 05 A8 */ lha r3, 0x5a8(r30) -/* 80D3559C 38 03 FF FF */ addi r0, r3, -1 -/* 80D355A0 B0 1E 05 A8 */ sth r0, 0x5a8(r30) -lbl_80D355A4: -/* 80D355A4 A8 1E 05 9E */ lha r0, 0x59e(r30) -/* 80D355A8 2C 00 00 01 */ cmpwi r0, 1 -/* 80D355AC 41 82 00 80 */ beq lbl_80D3562C -/* 80D355B0 40 80 00 10 */ bge lbl_80D355C0 -/* 80D355B4 2C 00 00 00 */ cmpwi r0, 0 -/* 80D355B8 40 80 00 14 */ bge lbl_80D355CC -/* 80D355BC 48 00 00 A4 */ b lbl_80D35660 -lbl_80D355C0: -/* 80D355C0 2C 00 00 0A */ cmpwi r0, 0xa -/* 80D355C4 41 82 00 94 */ beq lbl_80D35658 -/* 80D355C8 48 00 00 98 */ b lbl_80D35660 -lbl_80D355CC: -/* 80D355CC A8 1E 05 A6 */ lha r0, 0x5a6(r30) -/* 80D355D0 2C 00 00 00 */ cmpwi r0, 0 -/* 80D355D4 40 82 00 8C */ bne lbl_80D35660 -/* 80D355D8 38 7E 06 30 */ addi r3, r30, 0x630 -/* 80D355DC 4B 34 EE 85 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80D355E0 28 03 00 00 */ cmplwi r3, 0 -/* 80D355E4 41 82 00 7C */ beq lbl_80D35660 -/* 80D355E8 38 00 00 06 */ li r0, 6 -/* 80D355EC B0 1E 05 A6 */ sth r0, 0x5a6(r30) -/* 80D355F0 38 7E 06 30 */ addi r3, r30, 0x630 -/* 80D355F4 4B 34 EF 05 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80D355F8 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80D355FC 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80D35600 41 82 00 0C */ beq lbl_80D3560C -/* 80D35604 38 00 00 0A */ li r0, 0xa -/* 80D35608 B0 1E 05 9E */ sth r0, 0x59e(r30) -lbl_80D3560C: -/* 80D3560C 38 7E 06 30 */ addi r3, r30, 0x630 -/* 80D35610 4B 34 EF 39 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80D35614 88 03 00 75 */ lbz r0, 0x75(r3) -/* 80D35618 28 00 00 01 */ cmplwi r0, 1 -/* 80D3561C 40 82 00 44 */ bne lbl_80D35660 -/* 80D35620 38 00 00 0A */ li r0, 0xa -/* 80D35624 B0 1E 05 9E */ sth r0, 0x59e(r30) -/* 80D35628 48 00 00 38 */ b lbl_80D35660 -lbl_80D3562C: -/* 80D3562C A8 1E 05 A2 */ lha r0, 0x5a2(r30) -/* 80D35630 2C 00 00 00 */ cmpwi r0, 0 -/* 80D35634 40 82 00 2C */ bne lbl_80D35660 -/* 80D35638 38 7E 05 7C */ addi r3, r30, 0x57c -/* 80D3563C 3C 80 00 04 */ lis r4, 4 -/* 80D35640 38 A0 00 21 */ li r5, 0x21 -/* 80D35644 38 C0 00 00 */ li r6, 0 -/* 80D35648 4B 58 8E 5D */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -/* 80D3564C 7F C3 F3 78 */ mr r3, r30 -/* 80D35650 4B 2E 46 2D */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80D35654 48 00 00 0C */ b lbl_80D35660 -lbl_80D35658: -/* 80D35658 38 00 00 01 */ li r0, 1 -/* 80D3565C 98 1E 05 B4 */ stb r0, 0x5b4(r30) -lbl_80D35660: -/* 80D35660 A8 9E 05 A8 */ lha r4, 0x5a8(r30) -/* 80D35664 1C 04 0F 00 */ mulli r0, r4, 0xf00 -/* 80D35668 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80D3566C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80D35670 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80D35674 7C 83 04 2E */ lfsx f4, r3, r0 -/* 80D35678 C0 7E 05 B0 */ lfs f3, 0x5b0(r30) -/* 80D3567C C0 5F 00 10 */ lfs f2, 0x10(r31) -/* 80D35680 C8 3F 00 30 */ lfd f1, 0x30(r31) -/* 80D35684 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 80D35688 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3568C 3C 00 43 30 */ lis r0, 0x4330 -/* 80D35690 90 01 00 10 */ stw r0, 0x10(r1) -/* 80D35694 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80D35698 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80D3569C EC 00 01 32 */ fmuls f0, f0, f4 -/* 80D356A0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D356A4 EC 03 00 2A */ fadds f0, f3, f0 -/* 80D356A8 D0 1E 04 F0 */ stfs f0, 0x4f0(r30) -/* 80D356AC C0 3E 04 F0 */ lfs f1, 0x4f0(r30) -/* 80D356B0 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80D356B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D356B8 40 80 00 08 */ bge lbl_80D356C0 -/* 80D356BC D0 1E 04 F0 */ stfs f0, 0x4f0(r30) -lbl_80D356C0: -/* 80D356C0 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80D356C4 A8 7E 05 AA */ lha r3, 0x5aa(r30) -/* 80D356C8 7C 60 07 35 */ extsh. r0, r3 -/* 80D356CC 41 82 00 80 */ beq lbl_80D3574C -/* 80D356D0 2C 03 00 64 */ cmpwi r3, 0x64 -/* 80D356D4 40 81 00 20 */ ble lbl_80D356F4 -/* 80D356D8 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 80D356DC A8 7E 05 9E */ lha r3, 0x59e(r30) -/* 80D356E0 38 03 00 01 */ addi r0, r3, 1 -/* 80D356E4 B0 1E 05 9E */ sth r0, 0x59e(r30) -/* 80D356E8 38 00 00 00 */ li r0, 0 -/* 80D356EC B0 1E 05 A2 */ sth r0, 0x5a2(r30) -/* 80D356F0 48 00 00 28 */ b lbl_80D35718 -lbl_80D356F4: -/* 80D356F4 2C 03 00 50 */ cmpwi r3, 0x50 -/* 80D356F8 40 81 00 0C */ ble lbl_80D35704 -/* 80D356FC C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80D35700 48 00 00 18 */ b lbl_80D35718 -lbl_80D35704: -/* 80D35704 2C 03 00 04 */ cmpwi r3, 4 -/* 80D35708 41 80 00 0C */ blt lbl_80D35714 -/* 80D3570C C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80D35710 48 00 00 08 */ b lbl_80D35718 -lbl_80D35714: -/* 80D35714 C0 3F 00 08 */ lfs f1, 8(r31) -lbl_80D35718: -/* 80D35718 C0 5F 00 24 */ lfs f2, 0x24(r31) -/* 80D3571C C0 1E 05 AC */ lfs f0, 0x5ac(r30) -/* 80D35720 EC 42 00 32 */ fmuls f2, f2, f0 -/* 80D35724 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80D35728 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80D3572C 40 81 00 08 */ ble lbl_80D35734 -/* 80D35730 FC 40 00 90 */ fmr f2, f0 -lbl_80D35734: -/* 80D35734 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80D35738 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80D3573C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80D35740 A8 7E 05 AA */ lha r3, 0x5aa(r30) -/* 80D35744 38 03 FF FF */ addi r0, r3, -1 -/* 80D35748 B0 1E 05 AA */ sth r0, 0x5aa(r30) -lbl_80D3574C: -/* 80D3574C 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 80D35750 C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 80D35754 FC 60 10 90 */ fmr f3, f2 -/* 80D35758 4B 53 A2 E5 */ bl cLib_addCalc2__FPffff -/* 80D3575C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D35760 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80D35764 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D35768 7C 08 03 A6 */ mtlr r0 -/* 80D3576C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D35770 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s deleted file mode 100644 index abd6f7d7cd1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,184 +0,0 @@ -lbl_80D35CE4: -/* 80D35CE4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D35CE8 7C 08 02 A6 */ mflr r0 -/* 80D35CEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D35CF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D35CF4 4B 62 C4 E9 */ bl _savegpr_29 -/* 80D35CF8 7C 7E 1B 78 */ mr r30, r3 -/* 80D35CFC 3C 80 80 D3 */ lis r4, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35D00 3B E4 60 C0 */ addi r31, r4, lit_3703@l /* 0x80D360C0@l */ -/* 80D35D04 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D35D08 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D35D0C 40 82 00 B0 */ bne lbl_80D35DBC -/* 80D35D10 7F C0 F3 79 */ or. r0, r30, r30 -/* 80D35D14 41 82 00 9C */ beq lbl_80D35DB0 -/* 80D35D18 7C 1D 03 78 */ mr r29, r0 -/* 80D35D1C 4B 2E 2E 49 */ bl __ct__10fopAc_ac_cFv -/* 80D35D20 38 7D 05 7C */ addi r3, r29, 0x57c -/* 80D35D24 4B 58 8B 21 */ bl __ct__16Z2SoundObjSimpleFv -/* 80D35D28 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80D35D2C 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80D35D30 90 1D 06 0C */ stw r0, 0x60c(r29) -/* 80D35D34 38 7D 06 10 */ addi r3, r29, 0x610 -/* 80D35D38 4B 34 DA 29 */ bl __ct__10dCcD_GSttsFv -/* 80D35D3C 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80D35D40 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80D35D44 90 7D 06 0C */ stw r3, 0x60c(r29) -/* 80D35D48 38 03 00 20 */ addi r0, r3, 0x20 -/* 80D35D4C 90 1D 06 10 */ stw r0, 0x610(r29) -/* 80D35D50 3B BD 06 30 */ addi r29, r29, 0x630 -/* 80D35D54 7F A3 EB 78 */ mr r3, r29 -/* 80D35D58 4B 34 DC D1 */ bl __ct__12dCcD_GObjInfFv -/* 80D35D5C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80D35D60 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80D35D64 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80D35D68 3C 60 80 D3 */ lis r3, __vt__8cM3dGAab@ha /* 0x80D361CC@ha */ -/* 80D35D6C 38 03 61 CC */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80D361CC@l */ -/* 80D35D70 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 80D35D74 3C 60 80 D3 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80D361C0@ha */ -/* 80D35D78 38 03 61 C0 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80D361C0@l */ -/* 80D35D7C 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80D35D80 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80D35D84 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80D35D88 90 7D 01 20 */ stw r3, 0x120(r29) -/* 80D35D8C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80D35D90 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80D35D94 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80D35D98 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80D35D9C 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80D35DA0 38 03 00 2C */ addi r0, r3, 0x2c -/* 80D35DA4 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80D35DA8 38 03 00 84 */ addi r0, r3, 0x84 -/* 80D35DAC 90 1D 01 38 */ stw r0, 0x138(r29) -lbl_80D35DB0: -/* 80D35DB0 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80D35DB4 60 00 00 08 */ ori r0, r0, 8 -/* 80D35DB8 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80D35DBC: -/* 80D35DBC 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80D35DC0 3C 80 80 D3 */ lis r4, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35DC4 38 84 61 20 */ addi r4, r4, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35DC8 4B 2F 70 F5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D35DCC 7C 7D 1B 78 */ mr r29, r3 -/* 80D35DD0 2C 1D 00 04 */ cmpwi r29, 4 -/* 80D35DD4 40 82 01 A8 */ bne lbl_80D35F7C -/* 80D35DD8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D35DDC 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80D35DE0 28 04 00 FF */ cmplwi r4, 0xff -/* 80D35DE4 41 82 00 28 */ beq lbl_80D35E0C -/* 80D35DE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35DEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35DF0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D35DF4 7C 05 07 74 */ extsb r5, r0 -/* 80D35DF8 4B 2F F5 69 */ bl isSwitch__10dSv_info_cCFii -/* 80D35DFC 2C 03 00 00 */ cmpwi r3, 0 -/* 80D35E00 41 82 00 0C */ beq lbl_80D35E0C -/* 80D35E04 38 60 00 05 */ li r3, 5 -/* 80D35E08 48 00 01 78 */ b lbl_80D35F80 -lbl_80D35E0C: -/* 80D35E0C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D35E10 98 1E 05 70 */ stb r0, 0x570(r30) -/* 80D35E14 88 1E 05 70 */ lbz r0, 0x570(r30) -/* 80D35E18 28 00 00 FF */ cmplwi r0, 0xff -/* 80D35E1C 40 82 00 0C */ bne lbl_80D35E28 -/* 80D35E20 38 00 00 00 */ li r0, 0 -/* 80D35E24 98 1E 05 70 */ stb r0, 0x570(r30) -lbl_80D35E28: -/* 80D35E28 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D35E2C 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80D35E30 98 1E 05 71 */ stb r0, 0x571(r30) -/* 80D35E34 7F C3 F3 78 */ mr r3, r30 -/* 80D35E38 3C 80 80 D3 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80D35AC0@ha */ -/* 80D35E3C 38 84 5A C0 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80D35AC0@l */ -/* 80D35E40 3C A0 00 05 */ lis r5, 0x0005 /* 0x0004B000@ha */ -/* 80D35E44 38 A5 B0 00 */ addi r5, r5, 0xB000 /* 0x0004B000@l */ -/* 80D35E48 4B 2E 46 69 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D35E4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D35E50 40 82 00 0C */ bne lbl_80D35E5C -/* 80D35E54 38 60 00 05 */ li r3, 5 -/* 80D35E58 48 00 01 28 */ b lbl_80D35F80 -lbl_80D35E5C: -/* 80D35E5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35E60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35E64 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D35E68 80 9E 05 F0 */ lwz r4, 0x5f0(r30) -/* 80D35E6C 7F C5 F3 78 */ mr r5, r30 -/* 80D35E70 4B 33 EB 99 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80D35E74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D35E78 41 82 00 0C */ beq lbl_80D35E84 -/* 80D35E7C 38 60 00 05 */ li r3, 5 -/* 80D35E80 48 00 01 00 */ b lbl_80D35F80 -lbl_80D35E84: -/* 80D35E84 3C 60 80 D3 */ lis r3, data_80D361F8@ha /* 0x80D361F8@ha */ -/* 80D35E88 8C 03 61 F8 */ lbzu r0, data_80D361F8@l(r3) /* 0x80D361F8@l */ -/* 80D35E8C 28 00 00 00 */ cmplwi r0, 0 -/* 80D35E90 40 82 00 20 */ bne lbl_80D35EB0 -/* 80D35E94 38 00 00 01 */ li r0, 1 -/* 80D35E98 98 1E 07 6C */ stb r0, 0x76c(r30) -/* 80D35E9C 98 03 00 00 */ stb r0, 0(r3) -/* 80D35EA0 38 00 FF FF */ li r0, -1 -/* 80D35EA4 3C 60 80 D3 */ lis r3, l_HIO@ha /* 0x80D36208@ha */ -/* 80D35EA8 38 63 62 08 */ addi r3, r3, l_HIO@l /* 0x80D36208@l */ -/* 80D35EAC 98 03 00 04 */ stb r0, 4(r3) -lbl_80D35EB0: -/* 80D35EB0 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80D35EB4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D35EB8 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80D35EBC 7F C3 F3 78 */ mr r3, r30 -/* 80D35EC0 C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 80D35EC4 FC 40 08 90 */ fmr f2, f1 -/* 80D35EC8 FC 60 08 90 */ fmr f3, f1 -/* 80D35ECC 4B 2E 46 5D */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80D35ED0 7F C3 F3 78 */ mr r3, r30 -/* 80D35ED4 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80D35ED8 FC 40 08 90 */ fmr f2, f1 -/* 80D35EDC FC 60 08 90 */ fmr f3, f1 -/* 80D35EE0 4B 2E 46 59 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80D35EE4 88 1E 05 71 */ lbz r0, 0x571(r30) -/* 80D35EE8 28 00 00 FF */ cmplwi r0, 0xff -/* 80D35EEC 41 82 00 28 */ beq lbl_80D35F14 -/* 80D35EF0 28 00 00 00 */ cmplwi r0, 0 -/* 80D35EF4 41 82 00 20 */ beq lbl_80D35F14 -/* 80D35EF8 C8 3F 00 58 */ lfd f1, 0x58(r31) -/* 80D35EFC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D35F00 3C 00 43 30 */ lis r0, 0x4330 -/* 80D35F04 90 01 00 08 */ stw r0, 8(r1) -/* 80D35F08 C8 01 00 08 */ lfd f0, 8(r1) -/* 80D35F0C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80D35F10 D0 1E 04 EC */ stfs f0, 0x4ec(r30) -lbl_80D35F14: -/* 80D35F14 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80D35F18 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80D35F1C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80D35F20 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80D35F24 38 7E 05 F4 */ addi r3, r30, 0x5f4 -/* 80D35F28 38 80 00 FF */ li r4, 0xff -/* 80D35F2C 38 A0 00 00 */ li r5, 0 -/* 80D35F30 7F C6 F3 78 */ mr r6, r30 -/* 80D35F34 4B 34 D9 2D */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80D35F38 38 7E 06 30 */ addi r3, r30, 0x630 -/* 80D35F3C 3C 80 80 D3 */ lis r4, cc_cyl_src@ha /* 0x80D3612C@ha */ -/* 80D35F40 38 84 61 2C */ addi r4, r4, cc_cyl_src@l /* 0x80D3612C@l */ -/* 80D35F44 4B 34 E9 71 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80D35F48 38 1E 05 F4 */ addi r0, r30, 0x5f4 -/* 80D35F4C 90 1E 06 74 */ stw r0, 0x674(r30) -/* 80D35F50 80 1E 06 CC */ lwz r0, 0x6cc(r30) -/* 80D35F54 60 00 00 04 */ ori r0, r0, 4 -/* 80D35F58 90 1E 06 CC */ stw r0, 0x6cc(r30) -/* 80D35F5C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80D35F60 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80D35F64 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80D35F68 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80D35F6C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80D35F70 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80D35F74 7F C3 F3 78 */ mr r3, r30 -/* 80D35F78 4B FF F7 FD */ bl daObj_Web1_Execute__FP14obj_web1_class -lbl_80D35F7C: -/* 80D35F7C 7F A3 EB 78 */ mr r3, r29 -lbl_80D35F80: -/* 80D35F80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D35F84 4B 62 C2 A5 */ bl _restgpr_29 -/* 80D35F88 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D35F8C 7C 08 03 A6 */ mtlr r0 -/* 80D35F90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D35F94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s deleted file mode 100644 index 17b1f716537..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80D35A44: -/* 80D35A44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D35A48 7C 08 02 A6 */ mflr r0 -/* 80D35A4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D35A50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D35A54 7C 7F 1B 78 */ mr r31, r3 -/* 80D35A58 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80D35A5C 3C 80 80 D3 */ lis r4, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35A60 38 84 61 20 */ addi r4, r4, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35A64 4B 2F 75 A5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D35A68 88 1F 07 6C */ lbz r0, 0x76c(r31) -/* 80D35A6C 28 00 00 00 */ cmplwi r0, 0 -/* 80D35A70 41 82 00 10 */ beq lbl_80D35A80 -/* 80D35A74 38 00 00 00 */ li r0, 0 -/* 80D35A78 3C 60 80 D3 */ lis r3, data_80D361F8@ha /* 0x80D361F8@ha */ -/* 80D35A7C 98 03 61 F8 */ stb r0, data_80D361F8@l(r3) /* 0x80D361F8@l */ -lbl_80D35A80: -/* 80D35A80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35A84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35A88 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D35A8C 80 9F 05 F0 */ lwz r4, 0x5f0(r31) -/* 80D35A90 4B 33 E7 C1 */ bl Release__4cBgSFP9dBgW_Base -/* 80D35A94 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 80D35A98 28 00 00 00 */ cmplwi r0, 0 -/* 80D35A9C 41 82 00 0C */ beq lbl_80D35AA8 -/* 80D35AA0 38 7F 05 7C */ addi r3, r31, 0x57c -/* 80D35AA4 4B 58 85 55 */ bl deleteObject__14Z2SoundObjBaseFv -lbl_80D35AA8: -/* 80D35AA8 38 60 00 01 */ li r3, 1 -/* 80D35AAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D35AB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35AB4 7C 08 03 A6 */ mtlr r0 -/* 80D35AB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D35ABC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s deleted file mode 100644 index 83ef2e5939d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80D353C4: -/* 80D353C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D353C8 7C 08 02 A6 */ mflr r0 -/* 80D353CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D353D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D353D4 7C 7F 1B 78 */ mr r31, r3 -/* 80D353D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D353DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D353E0 38 80 00 10 */ li r4, 0x10 -/* 80D353E4 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80D353E8 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80D353EC 4B 46 E3 D9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D353F0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D353F4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D353F8 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80D353FC 80 84 00 04 */ lwz r4, 4(r4) -/* 80D35400 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80D35404 4B 46 F9 9D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D35408 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D3540C 80 83 00 04 */ lwz r4, 4(r3) -/* 80D35410 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80D35414 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80D35418 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D3541C 4B 2D 83 8D */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80D35420 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D35424 4B 2D 88 A1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D35428 38 60 00 01 */ li r3, 1 -/* 80D3542C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D35430 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D35434 7C 08 03 A6 */ mtlr r0 -/* 80D35438 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3543C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s deleted file mode 100644 index 686f931d1c9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s +++ /dev/null @@ -1,186 +0,0 @@ -lbl_80D35774: -/* 80D35774 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80D35778 7C 08 02 A6 */ mflr r0 -/* 80D3577C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80D35780 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80D35784 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80D35788 7C 7E 1B 78 */ mr r30, r3 -/* 80D3578C 3C 60 80 D3 */ lis r3, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35790 3B E3 60 C0 */ addi r31, r3, lit_3703@l /* 0x80D360C0@l */ -/* 80D35794 A8 7E 05 9C */ lha r3, 0x59c(r30) -/* 80D35798 38 03 00 01 */ addi r0, r3, 1 -/* 80D3579C B0 1E 05 9C */ sth r0, 0x59c(r30) -/* 80D357A0 38 60 00 00 */ li r3, 0 -/* 80D357A4 38 00 00 02 */ li r0, 2 -/* 80D357A8 7C 09 03 A6 */ mtctr r0 -lbl_80D357AC: -/* 80D357AC 38 A3 05 A2 */ addi r5, r3, 0x5a2 -/* 80D357B0 7C 9E 2A AE */ lhax r4, r30, r5 -/* 80D357B4 2C 04 00 00 */ cmpwi r4, 0 -/* 80D357B8 41 82 00 0C */ beq lbl_80D357C4 -/* 80D357BC 38 04 FF FF */ addi r0, r4, -1 -/* 80D357C0 7C 1E 2B 2E */ sthx r0, r30, r5 -lbl_80D357C4: -/* 80D357C4 38 63 00 02 */ addi r3, r3, 2 -/* 80D357C8 42 00 FF E4 */ bdnz lbl_80D357AC -/* 80D357CC A8 7E 05 A6 */ lha r3, 0x5a6(r30) -/* 80D357D0 2C 03 00 00 */ cmpwi r3, 0 -/* 80D357D4 41 82 00 0C */ beq lbl_80D357E0 -/* 80D357D8 38 03 FF FF */ addi r0, r3, -1 -/* 80D357DC B0 1E 05 A6 */ sth r0, 0x5a6(r30) -lbl_80D357E0: -/* 80D357E0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D357E4 7C 03 07 74 */ extsb r3, r0 -/* 80D357E8 4B 2F 78 85 */ bl dComIfGp_getReverb__Fi -/* 80D357EC 7C 65 1B 78 */ mr r5, r3 -/* 80D357F0 38 7E 05 7C */ addi r3, r30, 0x57c -/* 80D357F4 38 80 00 00 */ li r4, 0 -/* 80D357F8 81 9E 05 8C */ lwz r12, 0x58c(r30) -/* 80D357FC 81 8C 00 08 */ lwz r12, 8(r12) -/* 80D35800 7D 89 03 A6 */ mtctr r12 -/* 80D35804 4E 80 04 21 */ bctrl -/* 80D35808 88 7E 05 B4 */ lbz r3, 0x5b4(r30) -/* 80D3580C 7C 60 07 75 */ extsb. r0, r3 -/* 80D35810 41 82 01 08 */ beq lbl_80D35918 -/* 80D35814 7C 60 07 74 */ extsb r0, r3 -/* 80D35818 2C 00 00 01 */ cmpwi r0, 1 -/* 80D3581C 40 82 00 70 */ bne lbl_80D3588C -/* 80D35820 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80D35824 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D35828 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80D3582C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80D35830 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35834 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35838 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80D3583C 38 80 00 00 */ li r4, 0 -/* 80D35840 90 81 00 08 */ stw r4, 8(r1) -/* 80D35844 38 00 FF FF */ li r0, -1 -/* 80D35848 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D3584C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80D35850 90 81 00 14 */ stw r4, 0x14(r1) -/* 80D35854 90 81 00 18 */ stw r4, 0x18(r1) -/* 80D35858 38 80 00 00 */ li r4, 0 -/* 80D3585C 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000840E@ha */ -/* 80D35860 38 A5 84 0E */ addi r5, r5, 0x840E /* 0x0000840E@l */ -/* 80D35864 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80D35868 38 E0 00 00 */ li r7, 0 -/* 80D3586C 39 1E 04 E4 */ addi r8, r30, 0x4e4 -/* 80D35870 39 21 00 24 */ addi r9, r1, 0x24 -/* 80D35874 39 40 00 FF */ li r10, 0xff -/* 80D35878 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80D3587C 4B 31 72 15 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80D35880 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80D35884 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D35888 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_80D3588C: -/* 80D3588C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D35890 7C 03 07 74 */ extsb r3, r0 -/* 80D35894 4B 2F 77 D9 */ bl dComIfGp_getReverb__Fi -/* 80D35898 7C 67 1B 78 */ mr r7, r3 -/* 80D3589C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080112@ha */ -/* 80D358A0 38 03 01 12 */ addi r0, r3, 0x0112 /* 0x00080112@l */ -/* 80D358A4 90 01 00 20 */ stw r0, 0x20(r1) -/* 80D358A8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80D358AC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80D358B0 80 63 00 00 */ lwz r3, 0(r3) -/* 80D358B4 38 81 00 20 */ addi r4, r1, 0x20 -/* 80D358B8 38 BE 05 38 */ addi r5, r30, 0x538 -/* 80D358BC 38 C0 00 00 */ li r6, 0 -/* 80D358C0 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80D358C4 FC 40 08 90 */ fmr f2, f1 -/* 80D358C8 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 80D358CC FC 80 18 90 */ fmr f4, f3 -/* 80D358D0 39 00 00 00 */ li r8, 0 -/* 80D358D4 4B 57 6C 39 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80D358D8 88 1E 05 B4 */ lbz r0, 0x5b4(r30) -/* 80D358DC 2C 00 00 23 */ cmpwi r0, 0x23 -/* 80D358E0 40 82 00 28 */ bne lbl_80D35908 -/* 80D358E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D358E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D358EC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D358F0 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80D358F4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D358F8 7C 05 07 74 */ extsb r5, r0 -/* 80D358FC 4B 2F F9 05 */ bl onSwitch__10dSv_info_cFii -/* 80D35900 7F C3 F3 78 */ mr r3, r30 -/* 80D35904 4B 2E 43 79 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_80D35908: -/* 80D35908 88 7E 05 B4 */ lbz r3, 0x5b4(r30) -/* 80D3590C 38 03 00 01 */ addi r0, r3, 1 -/* 80D35910 98 1E 05 B4 */ stb r0, 0x5b4(r30) -/* 80D35914 48 00 00 0C */ b lbl_80D35920 -lbl_80D35918: -/* 80D35918 7F C3 F3 78 */ mr r3, r30 -/* 80D3591C 4B FF FB ED */ bl action__FP14obj_web1_class -lbl_80D35920: -/* 80D35920 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D35924 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D35928 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80D3592C C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80D35930 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80D35934 4B 61 0F B5 */ bl PSMTXTrans -/* 80D35938 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3593C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D35940 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80D35944 4B 2D 6A F1 */ bl mDoMtx_YrotM__FPA4_fs -/* 80D35948 C0 3E 04 EC */ lfs f1, 0x4ec(r30) -/* 80D3594C C0 5F 00 38 */ lfs f2, 0x38(r31) -/* 80D35950 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80D35954 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80D35958 EC 42 00 2A */ fadds f2, f2, f0 -/* 80D3595C FC 60 08 90 */ fmr f3, f1 -/* 80D35960 4B 2D 74 D9 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80D35964 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D35968 4B 2D 7A C1 */ bl play__14mDoExt_baseAnmFv -/* 80D3596C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D35970 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D35974 80 9E 05 74 */ lwz r4, 0x574(r30) -/* 80D35978 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D3597C 4B 61 0B 35 */ bl PSMTXCopy -/* 80D35980 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D35984 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D35988 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80D3598C C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80D35990 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80D35994 4B 61 0F 55 */ bl PSMTXTrans -/* 80D35998 C0 5E 04 EC */ lfs f2, 0x4ec(r30) -/* 80D3599C C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80D359A0 EC 20 00 B2 */ fmuls f1, f0, f2 -/* 80D359A4 FC 60 08 90 */ fmr f3, f1 -/* 80D359A8 4B 2D 74 91 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80D359AC C0 3F 00 00 */ lfs f1, 0(r31) -/* 80D359B0 C0 9F 00 40 */ lfs f4, 0x40(r31) -/* 80D359B4 C0 7F 00 44 */ lfs f3, 0x44(r31) -/* 80D359B8 C0 5E 04 EC */ lfs f2, 0x4ec(r30) -/* 80D359BC C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80D359C0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D359C4 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80D359C8 EC 44 00 2A */ fadds f2, f4, f0 -/* 80D359CC FC 60 08 90 */ fmr f3, f1 -/* 80D359D0 4B 2D 73 CD */ bl transM__14mDoMtx_stack_cFfff -/* 80D359D4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D359D8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D359DC 38 9E 05 C0 */ addi r4, r30, 0x5c0 -/* 80D359E0 4B 61 0A D1 */ bl PSMTXCopy -/* 80D359E4 80 7E 05 F0 */ lwz r3, 0x5f0(r30) -/* 80D359E8 4B 34 5F D9 */ bl Move__4dBgWFv -/* 80D359EC 38 7E 07 54 */ addi r3, r30, 0x754 -/* 80D359F0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80D359F4 4B 53 97 E9 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80D359F8 38 7E 07 54 */ addi r3, r30, 0x754 -/* 80D359FC C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 80D35A00 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80D35A04 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80D35A08 4B 53 97 F9 */ bl SetR__8cM3dGCylFf -/* 80D35A0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35A10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35A14 38 63 23 3C */ addi r3, r3, 0x233c -/* 80D35A18 38 9E 06 30 */ addi r4, r30, 0x630 -/* 80D35A1C 4B 52 F1 8D */ bl Set__4cCcSFP8cCcD_Obj -/* 80D35A20 38 60 00 01 */ li r3, 1 -/* 80D35A24 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80D35A28 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80D35A2C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80D35A30 7C 08 03 A6 */ mtlr r0 -/* 80D35A34 38 21 00 40 */ addi r1, r1, 0x40 -/* 80D35A38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 3117a93d256..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80D35440: -/* 80D35440 C0 25 04 D0 */ lfs f1, 0x4d0(r5) -/* 80D35444 C0 04 04 D0 */ lfs f0, 0x4d0(r4) -/* 80D35448 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80D3544C C0 25 04 D8 */ lfs f1, 0x4d8(r5) -/* 80D35450 C0 04 04 D8 */ lfs f0, 0x4d8(r4) -/* 80D35454 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80D35458 EC 22 00 B2 */ fmuls f1, f2, f2 -/* 80D3545C EC 00 00 32 */ fmuls f0, f0, f0 -/* 80D35460 EC 21 00 2A */ fadds f1, f1, f0 -/* 80D35464 3C 60 80 D3 */ lis r3, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35468 C0 03 60 C0 */ lfs f0, lit_3703@l(r3) /* 0x80D360C0@l */ -/* 80D3546C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D35470 40 81 00 0C */ ble lbl_80D3547C -/* 80D35474 FC 00 08 34 */ frsqrte f0, f1 -/* 80D35478 EC 20 00 72 */ fmuls f1, f0, f1 -lbl_80D3547C: -/* 80D3547C D0 24 05 AC */ stfs f1, 0x5ac(r4) -/* 80D35480 C0 24 05 AC */ lfs f1, 0x5ac(r4) -/* 80D35484 3C 60 80 D3 */ lis r3, lit_3704@ha /* 0x80D360C4@ha */ -/* 80D35488 C0 03 60 C4 */ lfs f0, lit_3704@l(r3) /* 0x80D360C4@l */ -/* 80D3548C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D35490 4C 80 00 20 */ bgelr -/* 80D35494 A8 05 00 08 */ lha r0, 8(r5) -/* 80D35498 2C 00 00 FD */ cmpwi r0, 0xfd -/* 80D3549C 41 82 00 08 */ beq lbl_80D354A4 -/* 80D354A0 40 82 00 48 */ bne lbl_80D354E8 -lbl_80D354A4: -/* 80D354A4 A8 04 05 AA */ lha r0, 0x5aa(r4) -/* 80D354A8 2C 00 00 00 */ cmpwi r0, 0 -/* 80D354AC 40 82 00 0C */ bne lbl_80D354B8 -/* 80D354B0 38 00 00 3C */ li r0, 0x3c -/* 80D354B4 B0 04 05 A8 */ sth r0, 0x5a8(r4) -lbl_80D354B8: -/* 80D354B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D354BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D354C0 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80D354C4 80 03 05 70 */ lwz r0, 0x570(r3) -/* 80D354C8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80D354CC 41 82 00 10 */ beq lbl_80D354DC -/* 80D354D0 38 00 00 78 */ li r0, 0x78 -/* 80D354D4 B0 04 05 AA */ sth r0, 0x5aa(r4) -/* 80D354D8 4E 80 00 20 */ blr -lbl_80D354DC: -/* 80D354DC 38 00 00 06 */ li r0, 6 -/* 80D354E0 B0 04 05 AA */ sth r0, 0x5aa(r4) -/* 80D354E4 4E 80 00 20 */ blr -lbl_80D354E8: -/* 80D354E8 2C 00 00 2E */ cmpwi r0, 0x2e -/* 80D354EC 40 82 00 10 */ bne lbl_80D354FC -/* 80D354F0 38 00 00 78 */ li r0, 0x78 -/* 80D354F4 B0 04 05 AA */ sth r0, 0x5aa(r4) -/* 80D354F8 4E 80 00 20 */ blr -lbl_80D354FC: -/* 80D354FC 38 00 00 03 */ li r0, 3 -/* 80D35500 B0 04 05 AA */ sth r0, 0x5aa(r4) -/* 80D35504 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 171c3bb040d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,128 +0,0 @@ -lbl_80D35AC0: -/* 80D35AC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D35AC4 7C 08 02 A6 */ mflr r0 -/* 80D35AC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D35ACC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D35AD0 4B 62 C7 0D */ bl _savegpr_29 -/* 80D35AD4 7C 7E 1B 78 */ mr r30, r3 -/* 80D35AD8 3C 60 80 D3 */ lis r3, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35ADC 38 63 61 20 */ addi r3, r3, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35AE0 38 80 00 05 */ li r4, 5 -/* 80D35AE4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D35AE8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D35AEC 3F E5 00 02 */ addis r31, r5, 2 -/* 80D35AF0 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80D35AF4 7F E5 FB 78 */ mr r5, r31 -/* 80D35AF8 38 C0 00 80 */ li r6, 0x80 -/* 80D35AFC 4B 30 67 F1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D35B00 3C 80 00 08 */ lis r4, 8 -/* 80D35B04 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D35B08 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D35B0C 4B 2D F1 49 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D35B10 90 7E 05 74 */ stw r3, 0x574(r30) -/* 80D35B14 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 80D35B18 28 00 00 00 */ cmplwi r0, 0 -/* 80D35B1C 40 82 00 0C */ bne lbl_80D35B28 -/* 80D35B20 38 60 00 00 */ li r3, 0 -/* 80D35B24 48 00 01 60 */ b lbl_80D35C84 -lbl_80D35B28: -/* 80D35B28 38 60 00 18 */ li r3, 0x18 -/* 80D35B2C 4B 59 91 21 */ bl __nw__FUl -/* 80D35B30 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80D35B34 41 82 00 20 */ beq lbl_80D35B54 -/* 80D35B38 3C 80 80 D3 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80D361D8@ha */ -/* 80D35B3C 38 04 61 D8 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80D361D8@l */ -/* 80D35B40 90 1D 00 00 */ stw r0, 0(r29) -/* 80D35B44 38 80 00 00 */ li r4, 0 -/* 80D35B48 4B 5F 28 B5 */ bl init__12J3DFrameCtrlFs -/* 80D35B4C 38 00 00 00 */ li r0, 0 -/* 80D35B50 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80D35B54: -/* 80D35B54 93 BE 05 78 */ stw r29, 0x578(r30) -/* 80D35B58 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 80D35B5C 28 00 00 00 */ cmplwi r0, 0 -/* 80D35B60 40 82 00 0C */ bne lbl_80D35B6C -/* 80D35B64 38 60 00 00 */ li r3, 0 -/* 80D35B68 48 00 01 1C */ b lbl_80D35C84 -lbl_80D35B6C: -/* 80D35B6C 3C 60 80 D3 */ lis r3, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35B70 38 63 61 20 */ addi r3, r3, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35B74 38 80 00 08 */ li r4, 8 -/* 80D35B78 7F E5 FB 78 */ mr r5, r31 -/* 80D35B7C 38 C0 00 80 */ li r6, 0x80 -/* 80D35B80 4B 30 67 6D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D35B84 7C 65 1B 78 */ mr r5, r3 -/* 80D35B88 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80D35B8C 80 83 00 04 */ lwz r4, 4(r3) -/* 80D35B90 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D35B94 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D35B98 38 C0 00 01 */ li r6, 1 -/* 80D35B9C 38 E0 00 00 */ li r7, 0 -/* 80D35BA0 3D 00 80 D3 */ lis r8, lit_3798@ha /* 0x80D360C8@ha */ -/* 80D35BA4 C0 28 60 C8 */ lfs f1, lit_3798@l(r8) /* 0x80D360C8@l */ -/* 80D35BA8 39 00 00 00 */ li r8, 0 -/* 80D35BAC 39 20 FF FF */ li r9, -1 -/* 80D35BB0 4B 2D 7B 5D */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80D35BB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80D35BB8 40 82 00 0C */ bne lbl_80D35BC4 -/* 80D35BBC 38 60 00 00 */ li r3, 0 -/* 80D35BC0 48 00 00 C4 */ b lbl_80D35C84 -lbl_80D35BC4: -/* 80D35BC4 3C 60 80 D3 */ lis r3, lit_3703@ha /* 0x80D360C0@ha */ -/* 80D35BC8 C0 03 60 C0 */ lfs f0, lit_3703@l(r3) /* 0x80D360C0@l */ -/* 80D35BCC 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80D35BD0 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80D35BD4 38 60 00 C0 */ li r3, 0xc0 -/* 80D35BD8 4B 59 90 75 */ bl __nw__FUl -/* 80D35BDC 7C 60 1B 79 */ or. r0, r3, r3 -/* 80D35BE0 41 82 00 0C */ beq lbl_80D35BEC -/* 80D35BE4 4B 34 5D 8D */ bl __ct__4dBgWFv -/* 80D35BE8 7C 60 1B 78 */ mr r0, r3 -lbl_80D35BEC: -/* 80D35BEC 90 1E 05 F0 */ stw r0, 0x5f0(r30) -/* 80D35BF0 80 1E 05 F0 */ lwz r0, 0x5f0(r30) -/* 80D35BF4 28 00 00 00 */ cmplwi r0, 0 -/* 80D35BF8 40 82 00 0C */ bne lbl_80D35C04 -/* 80D35BFC 38 60 00 00 */ li r3, 0 -/* 80D35C00 48 00 00 84 */ b lbl_80D35C84 -lbl_80D35C04: -/* 80D35C04 3C 60 80 D3 */ lis r3, d_a_obj_web1__stringBase0@ha /* 0x80D36120@ha */ -/* 80D35C08 38 63 61 20 */ addi r3, r3, d_a_obj_web1__stringBase0@l /* 0x80D36120@l */ -/* 80D35C0C 38 80 00 0B */ li r4, 0xb -/* 80D35C10 7F E5 FB 78 */ mr r5, r31 -/* 80D35C14 38 C0 00 80 */ li r6, 0x80 -/* 80D35C18 4B 30 66 D5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D35C1C 7C 64 1B 78 */ mr r4, r3 -/* 80D35C20 80 7E 05 F0 */ lwz r3, 0x5f0(r30) -/* 80D35C24 38 A0 00 01 */ li r5, 1 -/* 80D35C28 38 DE 05 C0 */ addi r6, r30, 0x5c0 -/* 80D35C2C 4B 34 43 0D */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80D35C30 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80D35C34 28 00 00 01 */ cmplwi r0, 1 -/* 80D35C38 40 82 00 0C */ bne lbl_80D35C44 -/* 80D35C3C 38 60 00 00 */ li r3, 0 -/* 80D35C40 48 00 00 44 */ b lbl_80D35C84 -lbl_80D35C44: -/* 80D35C44 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075A24@ha */ -/* 80D35C48 38 03 5A 24 */ addi r0, r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075A24@l */ -/* 80D35C4C 80 7E 05 F0 */ lwz r3, 0x5f0(r30) -/* 80D35C50 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80D35C54 3C 60 80 D3 */ lis r3, ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@ha /* 0x80D35440@ha */ -/* 80D35C58 38 03 54 40 */ addi r0, r3, ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@l /* 0x80D35440@l */ -/* 80D35C5C 80 7E 05 F0 */ lwz r3, 0x5f0(r30) -/* 80D35C60 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 80D35C64 38 7E 05 7C */ addi r3, r30, 0x57c -/* 80D35C68 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80D35C6C 38 A0 00 01 */ li r5, 1 -/* 80D35C70 81 9E 05 8C */ lwz r12, 0x58c(r30) -/* 80D35C74 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80D35C78 7D 89 03 A6 */ mtctr r12 -/* 80D35C7C 4E 80 04 21 */ bctrl -/* 80D35C80 38 60 00 01 */ li r3, 1 -lbl_80D35C84: -/* 80D35C84 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D35C88 4B 62 C5 A1 */ bl _restgpr_29 -/* 80D35C8C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D35C90 7C 08 03 A6 */ mtlr r0 -/* 80D35C94 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D35C98 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h index a6537a1bf2b..2211663f848 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModel.h +++ b/include/JSystem/J3DGraphAnimator/J3DModel.h @@ -80,6 +80,7 @@ public: void setUserArea(u32 area) { mUserArea = area; } u32 getUserArea() const { return mUserArea; } Vec* getBaseScale() { return &mBaseScale; } + void setAnmMtx(int i, Mtx m) { mMtxBuffer->setAnmMtx(i, m); } // is there a better way to handle inlines with same name as non-inlines? MtxP i_getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); } diff --git a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h index ee497312894..c709985d7c4 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h +++ b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h @@ -25,6 +25,7 @@ public: /* 80326EF0 */ void calcBBoardMtx(); MtxP getAnmMtx(int idx) const { return mpAnmMtx[idx]; } + void setAnmMtx(int i, Mtx m) { PSMTXCopy(m, (MtxP)mpAnmMtx[i]); } void setScaleFlag(int idx, u8 flag) { mpScaleFlagArr[idx] = flag; } u32* getCurrentViewNoPtr() { return &mCurrentViewNo; } diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h index 4e755a9cee3..54f9682c01a 100644 --- a/include/SSystem/SComponent/c_bg_w.h +++ b/include/SSystem/SComponent/c_bg_w.h @@ -13,7 +13,7 @@ public: /* 802681D4 */ bool ChkUsed() const; /* 802681C0 */ void Regist(int); - /* 8007E5F8 */ virtual ~cBgW_BgId(); + /* 8007E5F8 */ virtual ~cBgW_BgId() {} cBgW_BgId() { Ct(); } void Ct() { m_id = 0x100; } diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 40c9f774a11..581025392e4 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -30,7 +30,10 @@ enum cCcD_ObjAtType { /* 0x00000010 */ AT_TYPE_SHIELD_ATTACK = (1 << 4), /* 0x00000020 */ AT_TYPE_BOMB = (1 << 5), /* 0x00000080 */ AT_TYPE_SLINGSHOT = (1 << 7), + /* 0x00000200 */ AT_TYPE_LANTERN_SWING = (1 << 9), /* 0x00000400 */ AT_TYPE_CSTATUE_SWING = (1 << 10), + /* 0x00000800 */ AT_TYPE_800 = (1 << 11), + /* 0x00001000 */ AT_TYPE_1000 = (1 << 12), /* 0x00002000 */ AT_TYPE_ARROW = (1 << 13), /* 0x00004000 */ AT_TYPE_HOOKSHOT = (1 << 14), /* 0x00010000 */ AT_TYPE_BOOMERANG = (1 << 16), @@ -41,6 +44,7 @@ enum cCcD_ObjAtType { /* 0x00800000 */ AT_TYPE_COPY_ROD = (1 << 23), /* 0x04000000 */ AT_TYPE_MASTER_SWORD = (1 << 26), /* 0x08000000 */ AT_TYPE_MIDNA_LOCK = (1 << 27), + /* 0x10000000 */ AT_TYPE_10000000 = (1 << 28), /* 0x40000000 */ AT_TYPE_WOLF_CUT_TURN = (1 << 30), /* 0x80000000 */ AT_TYPE_WOLF_ATTACK = (1 << 31), }; @@ -53,7 +57,7 @@ public: struct Shape { /* 80167BBC */ ~Shape(); - /* 0x00 */ u32 _0; + /* 0x00 */ int _0; /* 0x04 */ f32 _4; /* 0x08 */ f32 _8; /* 0x0C */ f32 _C; @@ -146,9 +150,15 @@ public: STATIC_ASSERT(0x40 == sizeof(cCcD_CpsAttr)); +class cCcD_SrcSphAttr : public cM3dGSphS {}; + class cCcD_SphAttr : public cCcD_ShapeAttr, public cM3dGSph { public: cCcD_SphAttr() {} + void Set(const cCcD_SrcSphAttr& src) { + cM3dGSph::Set(src); + } + /* 8008721C */ virtual ~cCcD_SphAttr() {} /* 80084B44 */ virtual const cXyz& GetCoCP() const { return mCenter; } /* 80037A54 */ virtual cXyz& GetCoCP() { return mCenter; } @@ -248,26 +258,26 @@ public: STATIC_ASSERT(0x40 == sizeof(cCcD_DivideArea)); struct cCcD_SrcObjTg { - s32 mType; - s32 mSPrm; -}; + /* 0x0 */ s32 mType; + /* 0x4 */ s32 mSPrm; +}; // Size: 0x8 struct cCcD_SrcObjAt { - s32 mType; - u8 mAtp; - s32 mSPrm; -}; + /* 0x0 */ s32 mType; + /* 0x4 */ u8 mAtp; + /* 0x8 */ s32 mSPrm; +}; // Size: 0xC struct cCcD_SrcObjHitInf { - cCcD_SrcObjAt mObjAt; - cCcD_SrcObjTg mObjTg; - s32 mSPrm; -}; + /* 0x00 */ cCcD_SrcObjAt mObjAt; + /* 0x0C */ cCcD_SrcObjTg mObjTg; + /* 0x14 */ s32 mSPrm; +}; // Size: 0x18 struct cCcD_SrcObj { - int field_0x0; - cCcD_SrcObjHitInf mSrcObjHitInf; -}; + /* 0x0 */ int field_0x0; + /* 0x4 */ cCcD_SrcObjHitInf mSrcObjHitInf; +}; // Size: 0x1C class cCcD_GStts { public: @@ -299,11 +309,14 @@ public: /* 80263984 */ f32 GetWeightF() const; /* 802649E8 vt[7] */ virtual void ClrAt() {} /* 802649EC vt[8] */ virtual void ClrTg() { mTg = 0; } + u8 GetWeightUc() const { return mWeight; } void SetWeight(u8 weight) { mWeight = weight; } fopAc_ac_c* GetAc() { return mActor; } + fopAc_ac_c* GetActor() const { return mActor; } void SetActor(void* ac) { mActor = (fopAc_ac_c*)ac; } cXyz* GetCCMoveP() { return &mXyz; } + unsigned int GetApid() const { return mApid; } }; // Size = 0x1C STATIC_ASSERT(0x1C == sizeof(cCcD_Stts)); @@ -409,7 +422,7 @@ public: u32 GetAtGrp() const { return mObjAt.GetGrp(); } u32 GetCoGrp() const { return mObjCo.GetGrp(); } int GetTgType() const { return mObjTg.GetType(); } - int GetAtType() const { return mObjAt.GetType(); } + u32 GetAtType() const { return mObjAt.GetType(); } bool ChkTgSet() const { return mObjTg.ChkSet(); } bool ChkAtSet() const { return mObjAt.ChkSet(); } bool ChkCoSet() const { return mObjCo.ChkSet(); } @@ -463,6 +476,7 @@ public: cCcD_Stts* GetStts() { return mStts; } void SetStts(cCcD_Stts* stts) { mStts = stts; } cCcD_DivideInfo& GetDivideInfo() { return mDivideInfo; } + cCcD_DivideInfo* GetPDivideInfo() { return &mDivideInfo; } int ChkBsRevHit() const { return field_0x40 & 2; } private: diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index 7f65a3a1210..32c0cc8fb63 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -11,7 +11,7 @@ enum WeightType { }; class cCcS { -private: +public: /* 0x0000 */ cCcD_Obj* mpObjAt[0x100]; /* 0x0400 */ cCcD_Obj* mpObjTg[0x300]; /* 0x1000 */ cCcD_Obj* mpObjCo[0x100]; @@ -23,7 +23,6 @@ private: /* 0x2808 */ cCcD_DivideArea mDivideArea; /* 0x2848 vtable */ -public: /* 80264A6C */ cCcS(); /* 80264A94 */ void Ct(); /* 80264B60 */ void Dt(); diff --git a/include/SSystem/SComponent/c_m3d_g_cps.h b/include/SSystem/SComponent/c_m3d_g_cps.h index 14315a9fc3f..20104043daa 100644 --- a/include/SSystem/SComponent/c_m3d_g_cps.h +++ b/include/SSystem/SComponent/c_m3d_g_cps.h @@ -7,10 +7,10 @@ #include "dolphin/types.h" struct cM3dGCpsS { - Vec mStart; - Vec mEnd; - f32 mRadius; -}; + /* 0x00 */ Vec mStart; + /* 0x0C */ Vec mEnd; + /* 0x18 */ f32 mRadius; +}; // Size: 0x1C class cM3dGCps : public cM3dGLin { public: diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h index de48572064d..cc00a53c8ba 100644 --- a/include/SSystem/SComponent/c_m3d_g_sph.h +++ b/include/SSystem/SComponent/c_m3d_g_sph.h @@ -7,9 +7,9 @@ #include "dolphin/types.h" struct cM3dGSphS { - Vec mCenter; - f32 mRadius; -}; + /* 0x0 */ Vec mCenter; + /* 0xC */ f32 mRadius; +}; // Size: 0x10 class cM3dGSph { private: diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index b875f06b233..ada8df11936 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -136,6 +136,7 @@ struct cXyz : Vec { f32 getMagXZ() const { return cXyz(this->x, 0, this->z).getSquareMag(); } f32 getDotProduct(const Vec& other) const { return PSVECDotProduct(this, &other); } + f32 inprod(const Vec& other) const { return getDotProduct(other); } }; #endif /* C_XYZ_H */ diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 64e2a8e7f97..39bde53427c 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -143,6 +143,13 @@ public: /* 802C1A14 */ virtual void startCollisionSE(u32, u32); /* 802C1B7C */ void setLinkSearch(bool); /* 802C1B90 */ void setEnemyName(char const*); -}; + +private: + /* 0x90 */ JSULink mLink; + /* 0xA0 */ u8 mEnemyID; + /* 0xA1 */ u8 field_0xa1; + /* 0xA2 */ bool mLinkSearch; + /* 0xA3 */ u8 field_0xa3; +}; // Size: 0xA4 #endif /* Z2CREATURE_H */ diff --git a/include/c/c_damagereaction.h b/include/c/c_damagereaction.h index 0f417fa2740..57f932fd254 100644 --- a/include/c/c_damagereaction.h +++ b/include/c/c_damagereaction.h @@ -3,4 +3,8 @@ #include "dolphin/types.h" +BOOL cDmrNowMidnaTalk(); + +extern u8 cDmr_SkipInfo; + #endif /* C_C_DAMAGEREACTION_H */ diff --git a/include/d/a/d_a_item_static.h b/include/d/a/d_a_item_static.h index 51296740f80..16b521d8745 100644 --- a/include/d/a/d_a_item_static.h +++ b/include/d/a/d_a_item_static.h @@ -112,13 +112,13 @@ public: static u8 mFuncPtr[120]; //static procFunc mFuncPtr[9]; - static u8 m_cyl_src[68]; + static dCcD_SrcCyl m_cyl_src; static s32 m_timer_max; /* 0x92C */ s16 field_0x92c; /* 0x92E */ u16 field_0x92e; /* 0x930 */ cXyz field_0x930; - /* 0x93C */ u32 field_0x93c; + /* 0x93C */ int field_0x93c; /* 0x940 */ u16 field_0x940; /* 0x942 */ s16 field_0x942; /* 0x944 */ s16 field_0x944; diff --git a/include/d/a/d_a_obj_item.h b/include/d/a/d_a_obj_item.h index 77e766fe3cb..26c732b92e6 100644 --- a/include/d/a/d_a_obj_item.h +++ b/include/d/a/d_a_obj_item.h @@ -20,6 +20,14 @@ namespace daItem_prm { static inline u8 checkInWater(daItem_c* item) { return fopAcM_GetParamBit(item, 0x1C, 4); } + + static inline u8 getType(daItem_c* item) { + return (fopAcM_GetParam(item) >> 0x18) & 0xF; + } + + static inline u8 getSwitchNo(daItem_c* item) { + return (fopAcM_GetParam(item) >> 0x10) & 0xFF; + } }; #endif /* A_OBJ_D_A_OBJ_ITEM_H */ diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index dabaf3030e6..f48e1abd10b 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -63,9 +63,9 @@ public: HEAP_TYPE_5, }; - /* 80140DCC */ void __defctor(); // supposed to be the ctor? + /* 80140DCC */ void __defctor(); // compiler generated due to ctor with default param - daPy_anmHeap_c(u32); + daPy_anmHeap_c(u32 param_0 = 0); ~daPy_anmHeap_c(); void initData(); void* mallocBuffer(); @@ -350,6 +350,7 @@ public: RFLG0_UNK_8000000 = 0x8000000, RFLG0_UNK_4000000 = 0x4000000, RFLG0_UNK_4000 = 0x4000, + RFLG0_FRONT_ROLL_CRASH = 0x2000, RFLG0_ENEMY_ATTN_LOCK = 0x1000, RFLG0_UNK_400 = 0x400, RFLG0_UNK_80 = 0x80, @@ -692,6 +693,7 @@ public: u16 getSwordAtUpTime() const { return mSwordUpTimer; } bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); } bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); } + bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); } void offGoronSideMove() { if (i_checkGoronSideMove()) { diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index 7c53bf3373b..93680c27b9e 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -109,5 +109,7 @@ public: bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const&); bool dBgS_CheckBWallPoly(cBgS_PolyInfo const&); +void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, + bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6); #endif /* D_BG_D_BG_S_H */ diff --git a/include/d/bg/d_bg_w.h b/include/d/bg/d_bg_w.h index a2eb1be880e..e1b161626cc 100644 --- a/include/d/bg/d_bg_w.h +++ b/include/d/bg/d_bg_w.h @@ -312,6 +312,7 @@ public: /* 8007E3D8 */ virtual bool ChkGrpThrough(int, cBgS_GrpPassChk*, int); void SetCrrFunc(dBgW_CrrFunc func) { m_crr_func = func; } + void SetRideCallback(dBgW_RideCallback func) { m_ride_callback = func; } void OnMoveFlag() { m_flags |= 1; } private: diff --git a/include/d/cc/d_cc_d.h b/include/d/cc/d_cc_d.h index 53f5cad8074..1105b7c0e8d 100644 --- a/include/d/cc/d_cc_d.h +++ b/include/d/cc/d_cc_d.h @@ -4,51 +4,88 @@ #include "SSystem/SComponent/c_cc_d.h" #include "dolphin/types.h" -struct dCcD_SrcGAtTgCoCommonBase { - /* 0x00 */ u32 mGFlag; +enum dCcD_hitSe { + /* 0 */ dCcD_SE_NONE, + /* 1 */ dCcD_SE_SWORD, + /* 2 */ dCcD_SE_SHIELD_ATTACK, + /* 3 */ dCcD_SE_WOLF_KICK, + /* 4 */ dCcD_SE_WOLF_BITE, + /* 5 */ dCcD_SE_WOOD, + /* 6 */ dCcD_SE_HAMMER, + /* 7 */ dCcD_SE_ARROW_STICK, + /* 8 */ dCcD_SE_HOOKSHOT_STICK, + /* 9 */ dCcD_SE_METAL, + /* 10 */ dCcD_SE_STONE, + /* 11 */ dCcD_SE_HARD_BODY, + /* 12 */ dCcD_SE_SOFT_BODY, + /* 13 */ dCcD_SE_13, + /* 14 */ dCcD_SE_SWORD_STAB, + /* 15 */ dCcD_SE_15, + /* 16 */ dCcD_SE_SWORD_RUN, + /* 17 */ dCcD_SE_17, + /* 18 */ dCcD_SE_THROW_OBJ, + /* 19 */ dCcD_SE_SPINNER, + /* 20 */ dCcD_SE_COPYROD, + /* 21 */ dCcD_SE_STATUE_HAMMER, + /* 22 */ dCcD_SE_PACHINKO, + /* 23 */ dCcD_SE_23, }; +enum dCcG_At_Spl { + /* 0x0 */ dCcG_At_Spl_UNK_0, + /* 0x1 */ dCcG_At_Spl_UNK_1, +}; + +enum dCcG_Tg_Spl { + /* 0x0 */ dCcG_Tg_Spl_UNK_0, + /* 0x1 */ dCcG_Tg_Spl_UNK_1, +}; + +struct dCcD_SrcGAtTgCoCommonBase { + /* 0x0 */ u32 mGFlag; +}; // Size: 0x4 + struct dCcD_SrcGObjAt { - u8 mSe; - u8 mHitMark; - u8 mSpl; - u8 mMtrl; - dCcD_SrcGAtTgCoCommonBase mBase; -}; + /* 0x0 */ u8 mSe; // Sound Effect ID + /* 0x1 */ u8 mHitMark; // Hit Mark particle ID + /* 0x2 */ u8 mSpl; + /* 0x3 */ u8 mMtrl; + /* 0x4 */ dCcD_SrcGAtTgCoCommonBase mBase; +}; // Size: 0x8 struct dCcD_SrcGObjTg { - u8 mSe; - u8 mHitMark; - u8 mSpl; - u8 mMtrl; - dCcD_SrcGAtTgCoCommonBase mBase; -}; + /* 0x0 */ u8 mSe; // Sound Effect ID + /* 0x1 */ u8 mHitMark; // Hit Mark particle ID + /* 0x2 */ u8 mSpl; + /* 0x3 */ u8 mMtrl; + /* 0x4 */ dCcD_SrcGAtTgCoCommonBase mBase; +}; // Size: 0x8 struct dCcD_SrcGObjInf { - cCcD_SrcObj mObj; - dCcD_SrcGObjAt mGObjAt; - dCcD_SrcGObjTg mGObjTg; - dCcD_SrcGAtTgCoCommonBase mGObjCo; -}; + /* 0x00 */ cCcD_SrcObj mObj; + /* 0x1C */ dCcD_SrcGObjAt mGObjAt; + /* 0x24 */ dCcD_SrcGObjTg mGObjTg; + /* 0x2C */ dCcD_SrcGAtTgCoCommonBase mGObjCo; +}; // Size: 0x30 struct dCcD_SrcSph { - dCcD_SrcGObjInf mObjInf; - cM3dGSphS mSph; -}; + /* 0x00 */ dCcD_SrcGObjInf mObjInf; + /* 0x30 */ cM3dGSphS mSph; +}; // Size: 0x40 struct dCcD_SrcTri { - dCcD_SrcGObjInf mObjInf; -}; + /* 0x00 */ dCcD_SrcGObjInf mObjInf; +}; // Size: 0x30 struct dCcD_SrcCyl { - dCcD_SrcGObjInf mObjInf; - cM3dGCylS mCyl; -}; + /* 0x00 */ dCcD_SrcGObjInf mObjInf; + /* 0x30 */ cM3dGCylS mCyl; +}; // Size: 0x44 struct dCcD_SrcCps { - dCcD_SrcGObjInf mObjInf; - cM3dGCpsS mCps; -}; + /* 0x00 */ dCcD_SrcGObjInf mObjInf; + /* 0x30 */ cM3dGCpsS mCps; +}; // Size: 0x4C class dCcD_GStts : public cCcD_GStts { public: @@ -58,8 +95,17 @@ public: /* 8008523C */ virtual ~dCcD_GStts() {} void ClrTg() { mTg = 0; } void SetAtApid(unsigned int id) { mAtApid = id; } + void SetTgApid(unsigned int id) { mTgApid = id; } u8 GetRoomId() { return mRoomId; } void SetRoomId(int id) { mRoomId = id; } + unsigned int GetAtOldApid() { return mAtOldApid; } + unsigned int GetTgOldApid() { return mTgOldApid; } + bool ChkNoActor() { return field_0x1C & 1;} + bool ChkNoneActorPerfTblId() { return field_0x08 == 0xFFFF; } + dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mAt; } + void SetAtSpl(dCcG_At_Spl spl) { mAt = spl; } + dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mTg; } + void SetTgSpl(dCcG_Tg_Spl spl) { mTg = spl; } // private: /* 0x04 */ u8 mAt; @@ -85,11 +131,6 @@ public: }; // Size = 0x3C -enum dCcG_At_Spl { - /* 0x0 */ dCcG_At_Spl_UNK_0, - /* 0x1 */ dCcG_At_Spl_UNK_1, -}; - class dCcD_GObjInf; typedef void (*dCcD_HitCallback)(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -115,6 +156,7 @@ public: /* 80083724 */ void SubtractEffCounter(); /* 80083748 */ bool ChkEffCounter(); /* 80083CA0 */ virtual ~dCcD_GAtTgCoCommonBase() {} + void ResetEffCounter() { mEffCounter = 0; } u32 GetGFlag() const { return mGFlag; } u32 GetRPrm() const { return mRPrm; } @@ -122,9 +164,11 @@ public: u32 MskRPrm(u32 mask) const { return mRPrm & mask; } bool ChkSPrm(u32 mask) const { return MskSPrm(mask); } void OnSPrm(u32 flag) { mGFlag |= flag; } + void OnRPrm(u32 flag) { mRPrm |= flag; } void OffSPrm(u32 flag) { mGFlag &= ~flag; } bool ChkRPrm(u32 flag) const { return MskRPrm(flag); } void SetHitCallback(dCcD_HitCallback callback) { mHitCallback = callback; } + dCcD_HitCallback GetHitCallback() { return mHitCallback; } }; // Size = 0x1C class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase { @@ -141,6 +185,9 @@ public: u8 GetSe() { return mSe; } u8 GetSpl() { return mSpl; } u8 GetMtrl() { return mMtrl; } + u8 GetHitMark() { return mHitMark; } + void SetRVec(cXyz& vec) { mRVec = vec; } + void SetHitPos(cXyz& pos) { mHitPos = pos; } // private: /* 0x1C */ u8 mSe; @@ -160,7 +207,15 @@ public: cXyz& GetVec() { return mVec; } void SetShieldFrontRangeYAngle(s16* angle) { mShieldFrontRangeYAngle = angle; } void SetMtrl(u8 mtrl) { mMtrl = mtrl; } + u8 GetMtrl() { return mMtrl; } void SetHitMark(CcG_Tg_HitMark mark) { mHitMark = mark; } + s16* GetShieldFrontRangeYAngle() { return mShieldFrontRangeYAngle; } + s16 GetShieldRange() { return mShieldRange; } + u8 GetSpl() { return mSpl; } + u8 GetHitMark() { return mHitMark; } + void SetRVec(cXyz& vec) { mRVec = vec; } + cXyz* GetVecP() { return &mVec; } + void SetHitPos(cXyz& pos) { mHitPos = pos; } private: /* 0x1C */ u8 mSe; @@ -220,13 +275,15 @@ public: fopAc_ac_c* GetAtHitAc() { return mGObjAt.GetAc(); } bool ChkAtShieldHit() { return mGObjAt.ChkRPrm(1); } cXyz* GetAtVecP() { return mGObjAt.GetVecP(); } + cXyz* GetTgVecP() { return mGObjTg.GetVecP(); } void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetAtSpl(spl); } void SetAtHitCallback(dCcD_HitCallback callback) { mGObjAt.SetHitCallback(callback); } void SetTgHitCallback(dCcD_HitCallback callback) { mGObjTg.SetHitCallback(callback); } void SetCoHitCallback(dCcD_HitCallback callback) { mGObjCo.SetHitCallback(callback); } u8 GetAtSe() { return mGObjAt.GetSe(); } - s32 GetAtSpl() { return mGObjAt.GetSpl(); } + dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mGObjAt.GetSpl(); } u8 GetAtMtrl() { return mGObjAt.GetMtrl(); } + u8 GetTgMtrl() { return mGObjTg.GetMtrl(); } fopAc_ac_c* GetTgHitAc() { return mGObjTg.GetAc(); } void SetTgShieldFrontRangeYAngle(s16* angle) { mGObjTg.SetShieldFrontRangeYAngle(angle); } void OffTgWolfSpNoDamage() { mGObjTg.OffSPrm(0x800); } @@ -239,6 +296,44 @@ public: void OnTgShieldFrontRange() { mGObjTg.OnSPrm(0x8); } void OffTgShieldFrontRange() { mGObjTg.OffSPrm(0x8); } bool ChkTgIronBallRebound() { return mGObjTg.ChkSPrm(0x100); } + s16* GetTgShieldFrontRangeYAngle() { return mGObjTg.GetShieldFrontRangeYAngle(); } + s16 GetTgShieldRange() { return mGObjTg.GetShieldRange(); } + bool ChkTgShield() { return mGObjTg.ChkSPrm(1); } + bool ChkTgSpShield() { return mGObjTg.ChkSPrm(0x40); } + bool ChkTgSmallShield() { return mGObjTg.ChkSPrm(0x10); } + bool ChkTgShieldFrontRange() { return mGObjTg.ChkSPrm(8); } + bool ChkAtNoConHit() { return mGObjAt.ChkSPrm(1); } + bool ChkAtStopNoConHit() { return mGObjAt.ChkSPrm(0x4); } + bool ChkTgNoConHit() { return mGObjTg.ChkSPrm(2); } + bool ChkTgStopNoConHit() { return mGObjTg.ChkSPrm(0x2000); } + bool ChkCoNoCamHit() { return mGObjCo.ChkSPrm(2); } + dCcD_HitCallback GetCoHitCallback() { return mGObjCo.GetHitCallback(); } + dCcD_HitCallback GetAtHitCallback() { return mGObjAt.GetHitCallback(); } + dCcD_HitCallback GetTgHitCallback() { return mGObjTg.GetHitCallback(); } + void SetCoHitApid(unsigned int apid) { mGObjCo.SetHitApid(apid); } + void SetAtHitApid(unsigned int apid) { mGObjAt.SetHitApid(apid); } + void SetTgHitApid(unsigned int apid) { mGObjTg.SetHitApid(apid); } + void OnCoHitNoActor() { mGObjCo.OnRPrm(1); } + void OnAtHitNoActor() { mGObjAt.OnRPrm(2); } + void OnTgHitNoActor() { mGObjTg.OnRPrm(1); } + bool ChkTgWolfSpNoDamage() { return mGObjTg.ChkSPrm(0x800); } + bool ChkAtNoHitMark() { return mGObjAt.ChkSPrm(2); } + bool ChkTgNoHitMark() { return mGObjTg.ChkSPrm(4); } + bool ChkTgHookShotNoHitMark() { return mGObjTg.ChkSPrm(0x400); } + bool ChkTgArrowNoHitMark() { return mGObjTg.ChkSPrm(0x1000); } + dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mGObjTg.GetSpl(); } + int GetTgHitMark() { return mGObjTg.GetHitMark(); } + int GetAtHitMark() { return mGObjAt.GetHitMark(); } + bool ChkAtEffCounter() { return mGObjAt.ChkEffCounter(); } + bool ChkTgEffCounter() { return mGObjTg.ChkEffCounter(); } + void SetAtEffCounterTimer() { mGObjAt.SetEffCounterTimer(); } + void SetTgEffCounterTimer() { mGObjTg.SetEffCounterTimer(); } + void OnTgShieldHit() { mGObjTg.OnRPrm(2); } + void OnAtShieldHit() { mGObjAt.OnRPrm(1); } + void SetTgRVec(cXyz& vec) { mGObjTg.SetRVec(vec); } + void SetAtRVec(cXyz& vec) { mGObjAt.SetRVec(vec); } + void SetTgHitPos(cXyz& pos) { mGObjTg.SetHitPos(pos); } + void SetAtHitPos(cXyz& pos) { mGObjAt.SetHitPos(pos); } static u32 const m_hitSeID[24]; diff --git a/include/d/cc/d_cc_s.h b/include/d/cc/d_cc_s.h index 55874fcae1d..7ad3000abe6 100644 --- a/include/d/cc/d_cc_s.h +++ b/include/d/cc/d_cc_s.h @@ -11,21 +11,21 @@ public: dCcS() {} /* 80085ED4 */ void Ct(); /* 80085F08 */ void Dt(); - /* 80085F28 */ void ChkShieldFrontRange(cCcD_Obj*, cCcD_Obj*, int, cXyz const*); - /* 800860F8 */ void ChkShield(cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cXyz const*); + /* 80085F28 */ bool ChkShieldFrontRange(cCcD_Obj*, cCcD_Obj*, int, cXyz const*); + /* 800860F8 */ bool ChkShield(cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cXyz const*); /* 800861B0 */ void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*); - /* 80086360 */ void GetRank(u8); + /* 80086360 */ int GetRank(u8); /* 8008685C */ void ProcAtTgHitmark(bool, bool, cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, dCcD_GStts*, dCcD_GStts*, cXyz*, bool); - /* 80086D8C */ void ChkCamera(cXyz&, cXyz&, f32, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*); - /* 80086FBC */ void chkCameraPoint(cXyz const&, cCcD_ShapeAttr::Shape*, fopAc_ac_c*, + /* 80086D8C */ bool ChkCamera(cXyz&, cXyz&, f32, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*); + /* 80086FBC */ bool chkCameraPoint(cXyz const&, cCcD_ShapeAttr::Shape*, fopAc_ac_c*, fopAc_ac_c*); /* 800872AC */ void DrawAfter(); /* 800872B0 */ void Move(); /* 800872D0 */ void Draw(); /* 8008730C */ void MassClear(); - /* 80087330 */ void ChkAtTgMtrlHit(u8, u8); + /* 80087330 */ int ChkAtTgMtrlHit(u8, u8); /* 8008640C */ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); /* 80086240 */ virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*, diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index b6187c81c02..7b23faf7e83 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -388,7 +388,9 @@ public: } void setCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus = flag; } void onCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus |= flag; } - void offCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus &= ~flag; } + void offCameraAttentionStatus(int i, u32 flag) { + mCameraInfo[i].mCameraAttentionStatus &= ~flag; + } void setCameraInfo(int camIdx, camera_class* p_cam, int param_2, int param_3, int param_4) { mCameraInfo[camIdx].mCamera = p_cam; mCameraInfo[camIdx].field_0x4 = param_2; @@ -932,7 +934,8 @@ inline void dComIfGs_setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) { } inline void dComIfGs_setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(i_newBomb, i_bombNum, i_setNum); + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(i_newBomb, i_bombNum, + i_setNum); } inline void dComIfGs_setEmptyBottle() { @@ -1374,10 +1377,10 @@ inline bool dComIfGs_isPlayerFieldLastStayFieldDataExistFlag() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().isFieldDataExistFlag(); } -inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos, s16 i_angle, s8 i_point, - u8 i_region) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(i_stage, i_pos, i_angle, i_point, - i_region); +inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos, s16 i_angle, + s8 i_point, u8 i_region) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(i_stage, i_pos, i_angle, + i_point, i_region); } inline void dComIfGs_setStartPoint(s16 i_point) { @@ -1528,7 +1531,6 @@ inline int dComIfGs_createZone(int roomNo) { return g_dComIfG_gameInfo.info.createZone(roomNo); } - void dComIfGp_setSelectItem(int index); s32 dComIfGp_offHeapLockFlag(int flag); void dComIfGp_createSubExpHeap2D(); @@ -2350,6 +2352,12 @@ inline void dComIfGp_createSimpleModel() { g_dComIfG_gameInfo.play.createSimpleModel(); } +inline void i_dComIfGp_setHitMark(u16 i_hitmark, fopAc_ac_c* param_1, const cXyz* param_2, + const csXyz* param_3, const cXyz* param_4, u32 i_atType) { + g_dComIfG_gameInfo.play.getParticle()->setHitMark(i_hitmark, param_1, param_2, param_3, param_4, + i_atType); +} + inline s32 dComIfGp_roomControl_getStayNo() { return dStage_roomControl_c::getStayNo(); } @@ -2626,36 +2634,42 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, param_9, param_10, 1.0f); } -inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3) { - return dComIfGp_particle_set(param_0,param_1,param_2,param_3,0,0,0xFF,0,0xFFFFFFFF,0,0,0); +inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, + const dKy_tevstr_c* param_3) { + return dComIfGp_particle_set(param_0, param_1, param_2, param_3, 0, 0, 0xFF, 0, 0xFFFFFFFF, 0, + 0, 0); } -inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, - const csXyz* param_4, const cXyz* param_5, u8 param_6, - dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9, - const GXColor* param_10, const cXyz* param_11) { +inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, + const dKy_tevstr_c* param_3, const csXyz* param_4, + const cXyz* param_5, u8 param_6, + dPa_levelEcallBack* param_7, s8 param_8, + const GXColor* param_9, const GXColor* param_10, + const cXyz* param_11) { return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10, param_11, 1.0f); } inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const csXyz* param_3, - const cXyz* param_4, u8 param_5, dPa_levelEcallBack* param_6, - s8 param_7, const GXColor* param_8, const GXColor* param_9, - const cXyz* param_10) { + const cXyz* param_4, u8 param_5, + dPa_levelEcallBack* param_6, s8 param_7, + const GXColor* param_8, const GXColor* param_9, + const cXyz* param_10) { return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, NULL, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10, 1.0f); } inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, - const cXyz* param_3) { + const cXyz* param_3) { return dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL, NULL, NULL); } -inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, - const csXyz* param_3, const cXyz* param_4) { +inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, + const dKy_tevstr_c* param_2, const csXyz* param_3, + const cXyz* param_4) { return dComIfGp_particle_set(param_0, param_1, param_2, param_3, param_4, 0xFF, NULL, -1, NULL, NULL, NULL); } @@ -2666,28 +2680,34 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, NULL, NULL); } -inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, - const GXColor* param_4, const GXColor* param_5, f32 param_6, u8 param_7, - const csXyz* param_8, const cXyz* param_9, dPa_levelEcallBack* param_10, - s8 param_11, const cXyz* param_12) { - return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_3, - param_8, param_9, param_7, param_10, - param_11, param_4, param_5, param_12, - param_6); +inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* param_2, + const dKy_tevstr_c* param_3, const GXColor* param_4, + const GXColor* param_5, f32 param_6, u8 param_7, + const csXyz* param_8, const cXyz* param_9, + dPa_levelEcallBack* param_10, s8 param_11, + const cXyz* param_12) { + return g_dComIfG_gameInfo.play.getParticle()->setNormal( + param_0, param_1, param_2, param_3, param_8, param_9, param_7, param_10, param_11, param_4, + param_5, param_12, param_6); } -inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, - const GXColor* param_3, const GXColor* param_4, f32 param_5, u8 param_6, - const csXyz* param_7, const cXyz* param_8, dPa_levelEcallBack* param_9, +inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, + const dKy_tevstr_c* param_2, + const GXColor* param_3, const GXColor* param_4, + f32 param_5, u8 param_6, const csXyz* param_7, + const cXyz* param_8, dPa_levelEcallBack* param_9, s8 param_10, const cXyz* param_11) { return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_7, param_8, param_6, param_9, param_10, param_3, param_4, param_11, param_5); } -inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, - const GXColor* param_3, const GXColor* param_4, f32 param_5, u8 param_6) { - return dComIfGp_particle_setColor(param_0, param_1, param_2, param_3, param_4, param_5, param_6, NULL, NULL, NULL, -1, NULL); +inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, + const dKy_tevstr_c* param_2, + const GXColor* param_3, const GXColor* param_4, + f32 param_5, u8 param_6) { + return dComIfGp_particle_setColor(param_0, param_1, param_2, param_3, param_4, param_5, param_6, + NULL, NULL, NULL, -1, NULL); } inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) { diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index 7ae58debf38..b7158748afb 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -76,9 +76,9 @@ struct dItem_data { static u8 getShadowSize(u8 index) { return item_info[index].mShadowSize; } - static u8 getH(u8 index) { return item_info[index].mH; } + static const u8 getH(u8 index) { return item_info[index].mH; } - static u8 getR(u8 index) { return item_info[index].mR; } + static const u8 getR(u8 index) { return item_info[index].mR; } static u16 getFieldHeapSize(u8 index) { return field_item_res[index].mHeapSize; } diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h index 9d7dfc39c08..ff512aed58f 100644 --- a/include/d/d_jnt_col.h +++ b/include/d/d_jnt_col.h @@ -6,7 +6,12 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" -class dJntColData_c {}; +class dJntColData_c { +public: + u8 field_0x0; + s8 mType; + u8 field_0x2[0xC - 0x2]; +}; class dJntCol_c { public: @@ -15,12 +20,15 @@ public: /* 80035CC8 */ void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*); /* 80035DC8 */ void searchNearPos(cM3dGLin const*, cXyz const*, cXyz*, int) const; /* 80036AEC */ void getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const; - /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; + /* 80036C44 */ int getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; /* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*); bool checkPassNum(int bit) { return field_0xc & (1 << bit); } void onPassNum(int num) { field_0xc |= (1 << num); } void offPassNum(int num) { field_0xc &= ~(1 << num); } + bool checkShieldType(int i) { return getType(i) == 3; } + + s8 getType(int i) { return mData[i].mType; } /* 0x00 */ dJntColData_c* mData; /* 0x04 */ J3DModel* mModel; diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 2224e4a00fe..6a3846f1e8c 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -67,6 +67,7 @@ public: /* 8004974C */ virtual void end(); void remove() { end(); } + JPABaseEmitter* getEmitter() { return mpEmitter; } /* 0x04 */ JPABaseEmitter* mpEmitter; /* 0x08 */ const cXyz* field_0x8; diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index eb8e47bafcf..978639b8ade 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -73,6 +73,10 @@ inline void GXPosition1x16(u16 x) { GFX_FIFO(u16) = x; } +inline void GXPosition1x8(u8 x) { + GFX_FIFO(u8) = x; +} + inline void GXPosition3s8(s8 x, s8 y, s8 z) { GFX_FIFO(s8) = x; GFX_FIFO(s8) = y; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 78c3c07c2d5..bfadd5f5a7d 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -286,6 +286,10 @@ inline const cXyz& fopAcM_GetPosition_p(const fopAc_ac_c* p_actor) { return p_actor->current.pos; } +inline dJntCol_c* fopAcM_GetJntCol(fopAc_ac_c* i_actor) { + return i_actor->mJntCol; +} + inline void dComIfGs_onSwitch(int i_no, int i_roomNo); inline void dComIfGs_offSwitch(int i_no, int i_roomNo); inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo); @@ -544,6 +548,10 @@ inline f32 fopAcM_searchPlayerDistanceXZ2(const fopAc_ac_c* actor) { return fopAcM_searchActorDistanceXZ2(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0)); } +inline f32 fopAcM_searchPlayerDistanceXZ(const fopAc_ac_c* actor) { + return fopAcM_searchActorDistanceXZ(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0)); +} + inline f32 fopAcM_searchPlayerDistance(const fopAc_ac_c* actor) { return fopAcM_searchActorDistance(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0)); } @@ -555,6 +563,16 @@ inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_ mDoAud_seStart(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo)); } +inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { + s8 roomNo = fopAcM_GetRoomNo(actor); + mDoAud_seStart(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo)); +} + +inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { + s8 roomNo = fopAcM_GetRoomNo(actor); + i_mDoAud_seStartLevel(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo)); +} + extern "C" { void fopAcM_initManager__Fv(void); void fopAcM_CreateAppend__Fv(void); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 9d344948f80..642cf2fdbed 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -20,6 +20,7 @@ void mDoMtx_YrotM(Mtx, s16); void mDoMtx_MtxToRot(CMtxP, csXyz*); void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, s16 param_3); void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]); +void mDoMtx_ZrotM(Mtx mtx, s16 z); inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) { PSMTXMultVecSR(m, src, dst); @@ -37,6 +38,12 @@ inline void mDoMtx_trans(Mtx m, f32 x, f32 y, f32 z) { PSMTXTrans(m,x,y,z); } +inline void mDoMtx_multVecZero(MtxP param_0, Vec* param_1) { + param_1->x = param_0[0][3]; + param_1->y = param_0[1][3]; + param_1->z = param_0[2][3]; +} + class mDoMtx_stack_c { public: /* 8000CCC8 */ static bool push(); @@ -59,6 +66,7 @@ public: static void scaleS(f32 x, f32 y, f32 z) { PSMTXScale(now, x, y, z); } static void multVec(const Vec* a, Vec* b) { PSMTXMultVec(now, a, b); } static void multVecSR(const Vec* a, Vec* b) { PSMTXMultVecSR(now, a, b); } + static void multVecZero(Vec* v) { mDoMtx_multVecZero(now, v); } static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); } static void XYZrotM(s16 x, s16 y, s16 z) { mDoMtx_XYZrotM(now, x, y, z); } static void ZXYrotS(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotS(now, x, y, z); } @@ -66,8 +74,10 @@ public: static void YrotM(s16 y) { mDoMtx_YrotM(now, y); } static void YrotS(s16 y) { mDoMtx_YrotS(now, y); } static void XrotM(s16 x) { mDoMtx_XrotM(now, x); } + static void ZrotM(s16 z) { mDoMtx_ZrotM(now, z); } static void inverse() { PSMTXInverse(now, now); } static void concat(const Mtx m) { PSMTXConcat(now, m, now); } + static void revConcat(const Mtx m) { PSMTXConcat(m, now, now); } static void copy(const Mtx m) { PSMTXCopy(m, now); } static Mtx now; @@ -91,10 +101,4 @@ public: /* 0x118 */ mDoMtx_quatStack_c* field_0x118; }; // Size: 0x11C -inline void mDoMtx_multVecZero(MtxP param_0, Vec* param_1) { - param_1->x = param_0[0][3]; - param_1->y = param_0[1][3]; - param_1->z = param_0[2][3]; -} - #endif /* M_DO_M_DO_MTX_H */ diff --git a/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h b/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h index 97db1a0e0f9..9dae6051e79 100644 --- a/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h +++ b/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h @@ -1,6 +1,43 @@ #ifndef D_A_B_OH2_H #define D_A_B_OH2_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +// fix/move to d_a_b_ob later +class b_ob_class : public fopEn_enemy_c { +public: + /* 0x05AC */ u8 field_0x5ac[0x5c0 - 0x5ac]; + /* 0x05C0 */ mDoExt_McaMorf* field_0x5c0; + /* 0x05C4 */ u8 field_0x5c4[0x4752 - 0x5c4]; + /* 0x4752 */ s16 field_0x4752; + /* 0x4754 */ u8 field_0x4754[0x47a0 - 0x4754]; + /* 0x47A0 */ f32 field_0x47a0; + /* 0x47A4 */ u8 field_0x47a4[0x5d04 - 0x47a4]; + /* 0x5D04 */ f32 field_0x5d04; +}; + +class b_oh2_class : public fopEn_enemy_c { +public: + /* 0x5AC */ request_of_phase_process_class mPhase; + /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf; + /* 0x5B8 */ mDoExt_invisibleModel mInvisModel; + /* 0x5C0 */ mDoExt_btkAnm* mpBtk; + /* 0x5C4 */ mDoExt_brkAnm* mpBrk; + /* 0x5C8 */ int field_0x5c8; + /* 0x5CC */ s16 field_0x5cc; + /* 0x5CE */ s16 field_0x5ce; + /* 0x5D0 */ u8 field_0x5d0; + /* 0x5D2 */ s16 field_0x5d2[4]; + /* 0x5DA */ s16 field_0x5da; + /* 0x5DC */ s16 field_0x5dc; + /* 0x5E0 */ f32 field_0x5e0; + /* 0x5E4 */ f32 field_0x5e4; + /* 0x5E8 */ f32 field_0x5e8[30]; + /* 0x660 */ cXyz field_0x660[31]; + /* 0x7D4 */ csXyz field_0x7d4[31]; + /* 0x88E */ u8 field_0x88e[0x898 - 0x88e]; + /* 0x898 */ Z2CreatureEnemy mZ2Enemy; + /* 0x93C */ u8 field_0x93c[0x948 - 0x93C]; +}; #endif /* D_A_B_OH2_H */ diff --git a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h index debd03f2848..da1aa2f64ee 100644 --- a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h +++ b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h @@ -1,6 +1,17 @@ #ifndef D_A_SET_BGOBJ_H #define D_A_SET_BGOBJ_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +class daSetBgObj_c : public fopAc_ac_c { +public: + /* 80031870 */ static const char* getArcName(fopAc_ac_c*); + /* 80485D78 */ int CreateInit(); + /* 80485DFC */ int create(); + /* 80485E88 */ int Delete(); + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ const char mArcName[16]; +}; #endif /* D_A_SET_BGOBJ_H */ diff --git a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h index 1c34e122af0..0bebd778e98 100644 --- a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h +++ b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h @@ -1,6 +1,35 @@ #ifndef D_A_OBJ_WEB0_H #define D_A_OBJ_WEB0_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +class obj_web0_class : public fopAc_ac_c { +public: + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ u8 mPrm0; + /* 0x571 */ u8 mScaleXY; + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ mDoExt_brkAnm* mpBrk; + /* 0x57C */ s16 field_0x57c; + /* 0x57E */ u8 field_0x57e[0x582 - 0x57e]; + /* 0x582 */ s16 mReboundTimer; + /* 0x584 */ s16 field_0x584[2]; + /* 0x588 */ s16 mHitTimer; + /* 0x58A */ u8 field_0x58a[0x590 - 0x58a]; + /* 0x590 */ Mtx mMtx; + /* 0x5C0 */ dBgW* mpBgW; + /* 0x5C4 */ dCcD_Stts mStts; + /* 0x600 */ dCcD_Sph mSphCc; + /* 0x738 */ u8 mDeleteTimer; + /* 0x739 */ u8 field_0x739; +}; // Size: 0x73C + +class daObj_Web0_HIO_c { +public: + /* 80D3452C */ daObj_Web0_HIO_c(); + /* 80D350E4 */ virtual ~daObj_Web0_HIO_c() {} + + /* 0x4 */ s8 field_0x4; +}; #endif /* D_A_OBJ_WEB0_H */ diff --git a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h index f343cdd036c..54f73702cce 100644 --- a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h +++ b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h @@ -1,6 +1,40 @@ #ifndef D_A_OBJ_WEB1_H #define D_A_OBJ_WEB1_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +class obj_web1_class : public fopAc_ac_c { +public: + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ u8 mPrm0; + /* 0x571 */ u8 mScaleX; + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ mDoExt_brkAnm* mpBrk; + /* 0x57C */ Z2SoundObjSimple mZ2SoundObj; + /* 0x59C */ s16 field_0x59c; + /* 0x59E */ s16 mActionMode; + /* 0x5A0 */ u8 field_0x5a0[2]; + /* 0x5A2 */ s16 field_0x5a2[2]; + /* 0x5A6 */ s16 mHitTimer; + /* 0x5A8 */ s16 mReboundTimer; + /* 0x5AA */ s16 field_0x5aa; + /* 0x5AC */ f32 mDistToActor; + /* 0x5B0 */ f32 field_0x5b0; + /* 0x5B4 */ s8 mDeleteTimer; + /* 0x5B5 */ u8 field_0x5b5[0x5C0 - 0x5B5]; + /* 0x5C0 */ Mtx mMtx; + /* 0x5F0 */ dBgW* mpBgW; + /* 0x5F4 */ dCcD_Stts mStts; + /* 0x630 */ dCcD_Cyl mCylCc; + /* 0x76C */ u8 field_0x76c; +}; // Size: 0x770 + +class daObj_Web1_HIO_c { +public: + /* 80D353AC */ daObj_Web1_HIO_c(); + /* 80D36028 */ virtual ~daObj_Web1_HIO_c() {} + + /* 0x4 */ s8 field_0x4; +}; #endif /* D_A_OBJ_WEB1_H */ diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp index 4d4c48ce260..7940f6ae33f 100644 --- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp +++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp @@ -61,7 +61,6 @@ public: /* 0x5AC */ request_of_phase_process_class mPhase; /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf; /* 0x5B8 */ Z2CreatureEnemy mZ2Enemy; - /* 0x648 */ u8 field_0x648[0x14]; /* 0x65C */ int field_0x65c; /* 0x660 */ u8 field_0x660; /* 0x661 */ u8 field_0x661[0x668 - 0x661]; diff --git a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp index 187ea030527..1780ddaa75b 100644 --- a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp +++ b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp @@ -1,496 +1,337 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_b_oh2 -// +/** + * d_a_b_oh2.cpp + * Morpheel Tentacle + */ #include "rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" +#include "c/c_damagereaction.h" +#include "d/d_procname.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DModel {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 8061E19C */ ~cXyz(); - /* 8061EA2C */ cXyz(); -}; - -struct mDoExt_invisibleModel { - /* 8000E53C */ void create(J3DModel*, u8); - /* 8000E7C0 */ void entryDL(cXyz*); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature {}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 800110B0 */ void play(u32, s8); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dKy_tevstr_c {}; - -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); -}; - -struct csXyz { - /* 8061E9EC */ ~csXyz(); - /* 8061EA28 */ csXyz(); -}; - -struct b_oh2_class {}; - -struct Z2CreatureEnemy { - /* 802C0F64 */ Z2CreatureEnemy(); - /* 802C1094 */ void init(Vec*, Vec*, u8, u8); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8061E820 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" static void nodeCallBack__FP8J3DJointi(); -extern "C" static void daB_OH2_Draw__FP11b_oh2_class(); -extern "C" static void dmcalc__FP11b_oh2_class(); -extern "C" void __dt__4cXyzFv(); -extern "C" static void action__FP11b_oh2_class(); -extern "C" static void daB_OH2_Execute__FP11b_oh2_class(); -extern "C" static bool daB_OH2_IsDelete__FP11b_oh2_class(); -extern "C" static void daB_OH2_Delete__FP11b_oh2_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daB_OH2_Create__FP10fopAc_ac_c(); -extern "C" void __dt__5csXyzFv(); -extern "C" void __ct__5csXyzFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" extern char const* const d_a_b_oh2__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void create__21mDoExt_invisibleModelFP8J3DModelUc(); -extern "C" void entryDL__21mDoExt_invisibleModelFP4cXyz(); -extern "C" void -__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); -extern "C" void play__16mDoExt_McaMorfSOFUlSc(); -extern "C" void modelCalc__16mDoExt_McaMorfSOFv(); -extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv(); -extern "C" void cDmrNowMidnaTalk__Fv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -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 dComIfGp_getReverb__Fi(); -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 __mi__4cXyzCFRC3Vec(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void MtxTrans__FfffUc(); -extern "C" void MtxScale__FfffUc(); -extern "C" void MtxPosition__FP4cXyzP4cXyz(); -extern "C" void __ct__15Z2CreatureEnemyFv(); -extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void __construct_array(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -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]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8061EA38-8061EA3C 000000 0004+00 5/5 0/0 0/0 .rodata @3678 */ -SECTION_RODATA static f32 const lit_3678 = 1.0f; -COMPILER_STRIP_GATE(0x8061EA38, &lit_3678); +extern "C" extern leafdraw_method_class g_fopAc_Method; /* 8061DCB8-8061DDB0 000078 00F8+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void nodeCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/nodeCallBack__FP8J3DJointi.s" +static int nodeCallBack(J3DJoint* i_joint, int param_1) { + if (param_1 == 0) { + int jntNo = i_joint->getJntNo(); + J3DModel* model = j3dSys.getModel(); + b_oh2_class* area = (b_oh2_class*)model->getUserArea(); + + if (area != NULL) { + MtxTrans(area->field_0x660[jntNo].x, area->field_0x660[jntNo].y, + area->field_0x660[jntNo].z, 0); + mDoMtx_YrotM((MtxP)calc_mtx, area->field_0x7d4[jntNo].y); + mDoMtx_XrotM((MtxP)calc_mtx, area->field_0x7d4[jntNo].x); + mDoMtx_YrotM((MtxP)calc_mtx, -0x4000); + + MtxScale(1.0f, area->field_0x5e8[jntNo], area->field_0x5e8[jntNo], 1); + model->setAnmMtx(jntNo, (MtxP)calc_mtx); + } + } + + return 1; } -#pragma pop /* 8061DDB0-8061DE4C 000170 009C+00 1/0 0/0 0/0 .text daB_OH2_Draw__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daB_OH2_Draw(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Draw__FP11b_oh2_class.s" +static int daB_OH2_Draw(b_oh2_class* i_this) { + J3DModel* model = i_this->mpMorf->getModel(); + + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(model, &i_this->mTevStr); + + i_this->mpBtk->entry(model->getModelData()); + i_this->mpBrk->entry(model->getModelData()); + i_this->mInvisModel.entryDL(NULL); + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8061EA3C-8061EA40 000004 0004+00 0/2 0/0 0/0 .rodata @3792 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3792[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8061EA3C, &lit_3792); -#pragma pop - -/* 8061EA40-8061EA44 000008 0004+00 0/1 0/0 0/0 .rodata @3793 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3793 = 200.0f; -COMPILER_STRIP_GATE(0x8061EA40, &lit_3793); -#pragma pop - -/* 8061EA44-8061EA48 00000C 0004+00 0/1 0/0 0/0 .rodata @3794 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3794 = 100.0f; -COMPILER_STRIP_GATE(0x8061EA44, &lit_3794); -#pragma pop - -/* 8061EA48-8061EA4C 000010 0004+00 0/1 0/0 0/0 .rodata @3795 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3795 = 123.0f; -COMPILER_STRIP_GATE(0x8061EA48, &lit_3795); -#pragma pop - -/* 8061EA4C-8061EA50 000014 0004+00 0/2 0/0 0/0 .rodata @3796 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3796 = -50000.0f; -COMPILER_STRIP_GATE(0x8061EA4C, &lit_3796); -#pragma pop - -/* 8061EA50-8061EA54 000018 0004+00 0/1 0/0 0/0 .rodata @3797 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3797 = -20.0f; -COMPILER_STRIP_GATE(0x8061EA50, &lit_3797); -#pragma pop - -/* 8061EA54-8061EA58 00001C 0004+00 0/1 0/0 0/0 .rodata @3798 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3798 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(0x8061EA54, &lit_3798); -#pragma pop - -/* 8061EA58-8061EA5C 000020 0004+00 0/1 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3799 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x8061EA58, &lit_3799); -#pragma pop /* 8061EAE8-8061EAEC 000000 0004+00 3/3 0/0 0/0 .bss boss */ -static u8 boss[4]; +// pointer to main morpheel boss actor +static b_ob_class* boss; /* 8061DE4C-8061E19C 00020C 0350+00 1/1 0/0 0/0 .text dmcalc__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dmcalc(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/dmcalc__FP11b_oh2_class.s" +static void dmcalc(b_oh2_class* i_this) { + cXyz sp20; + cXyz sp14; + + i_this->field_0x660[0] = i_this->current.pos; + cXyz* var_r30 = &i_this->field_0x660[1]; + csXyz* var_r29 = &i_this->field_0x7d4[1]; + + cXyz sp8; + mDoMtx_YrotS((MtxP)calc_mtx, i_this->shape_angle.y); + mDoMtx_XrotM((MtxP)calc_mtx, i_this->shape_angle.x); + + sp20.x = 0.0f; + sp20.y = 0.0f; + if (i_this->field_0x5d2[3] != 0) { + sp20.z = 200.0f; + } else if (boss->field_0x4752 == 101) { + sp20.z = 100.0f; + } else { + sp20.z = boss->field_0x5d04 * 123.0f; + } + + MtxPosition(&sp20, &sp8); + sp20.x = 0.0f; + sp20.y = 0.0f; + sp20.z = i_this->field_0x5e4; + + f32 var_f31 = 1.0f; + f32 var_f30 = 0.0f; + f32 var_f29 = -50000.0f; + + if (boss->mSpeedF < var_f31) { + var_f29 = boss->field_0x47a0 + 100.0f; + var_f30 = -20.0f; + } + + for (int i = 1; i < 31; i++) { + f32 temp_f26 = (var_r30->x - var_r30[-1].x) + sp8.x * var_f31; + f32 var_f1 = var_f30 + (var_r30->y + (sp8.y * var_f31)); + if (var_f1 < var_f29) { + var_f1 = var_f29; + } + + f32 temp_f25 = var_f1 - var_r30[-1].y; + f32 temp_f24 = (var_r30->z - var_r30[-1].z) + sp8.z * var_f31; + var_f31 *= 0.85f; + + s16 temp_r25; + int temp_r24 = cM_atan2s(temp_f26, temp_f24); + temp_r25 = -cM_atan2s(temp_f25, JMAFastSqrt((temp_f26 * temp_f26) + (temp_f24 * temp_f24))); + + mDoMtx_YrotS((MtxP)calc_mtx, temp_r24); + mDoMtx_XrotM((MtxP)calc_mtx, temp_r25); + MtxPosition(&sp20, &sp14); + + var_r30->x = var_r30[-1].x + sp14.x; + var_r30->y = var_r30[-1].y + sp14.y; + var_r30->z = var_r30[-1].z + sp14.z; + var_r29[-1].x = temp_r25; + var_r29[-1].y = temp_r24; + + var_r30++; + var_r29++; + } + + i_this->field_0x5e0 = 0.2f; + i_this->field_0x5dc += 2000; + + int temp_r6 = 0; + for (int i = 0; i < 30; i++, temp_r6 += -10000) { + if (boss->mSpeedF > 1.0f) { + i_this->field_0x5e8[i] = i_this->field_0x5e0 + 1.0f + + (i_this->field_0x5e0 * cM_ssin(i_this->field_0x5dc + temp_r6)); + } else { + i_this->field_0x5e8[i] = 1.0f; + } + } } -#pragma pop - -/* 8061E19C-8061E1D8 00055C 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz::~cXyz() { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__4cXyzFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8061EA5C-8061EA60 000024 0004+00 0/1 0/0 0/0 .rodata @3875 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3875 = 650.0f; -COMPILER_STRIP_GATE(0x8061EA5C, &lit_3875); -#pragma pop - -/* 8061EA60-8061EA68 000028 0004+04 0/1 0/0 0/0 .rodata @3876 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3876[1 + 1 /* padding */] = { - 20.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x8061EA60, &lit_3876); -#pragma pop - -/* 8061EA68-8061EA70 000030 0008+00 0/1 0/0 0/0 .rodata @3878 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3878[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8061EA68, &lit_3878); -#pragma pop /* 8061E1D8-8061E410 000598 0238+00 1/1 0/0 0/0 .text action__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/action__FP11b_oh2_class.s" +static void action(b_oh2_class* i_this) { + cXyz local_20; + cXyz vstack_2C; + + switch (i_this->field_0x5ce) { + case 0: + break; + } + + PSMTXCopy(boss->field_0x5c0->getModel()->i_getAnmMtx(i_this->field_0x5c8 + 8), + mDoMtx_stack_c::get()); + mDoMtx_stack_c::multVecZero(&i_this->current.pos); + PSMTXCopy(boss->field_0x5c0->getModel()->i_getAnmMtx(0), mDoMtx_stack_c::get()); + + local_20.set(0.0f, 0.0f, i_this->field_0x5c8 * 20.0f + 650.0f); + mDoMtx_stack_c::multVec(&local_20, &vstack_2C); + local_20 = i_this->current.pos - vstack_2C; + + i_this->shape_angle.y = cM_atan2s(local_20.x, local_20.z); + i_this->shape_angle.x = + -cM_atan2s(local_20.y, JMAFastSqrt((local_20.x * local_20.x) + (local_20.z * local_20.z))); + + dmcalc(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); + i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + + int roomNo = fopAcM_GetRoomNo(i_this); + i_this->mpMorf->play(0, dComIfGp_getReverb(roomNo)); + + if (boss->mSpeedF <= 1.0f) { + i_this->mpBrk->setFrame(0.0f); + i_this->mpBtk->setFrame(0.0f); + } else { + i_this->mpBtk->play(); + i_this->mpBrk->play(); + } + + i_this->mpMorf->modelCalc(); } -#pragma pop /* 8061E410-8061E4E8 0007D0 00D8+00 2/1 0/0 0/0 .text daB_OH2_Execute__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daB_OH2_Execute(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Execute__FP11b_oh2_class.s" +static int daB_OH2_Execute(b_oh2_class* i_this) { + if (cDmrNowMidnaTalk()) { + return 1; + } + + if (i_this->field_0x5c8 == 0) { + boss = (b_ob_class*)fopAcM_SearchByID(i_this->mParentPcId); + } + + if (boss == NULL) { + return 1; + } + + i_this->field_0x5cc++; + + for (int i = 0; i < 4; i++) { + if (i_this->field_0x5d2[i] != 0) { + i_this->field_0x5d2[i]--; + } + } + + if (i_this->field_0x5da != 0) { + i_this->field_0x5da--; + } + + action(i_this); + return 1; } -#pragma pop /* 8061E4E8-8061E4F0 0008A8 0008+00 1/0 0/0 0/0 .text daB_OH2_IsDelete__FP11b_oh2_class */ -static bool daB_OH2_IsDelete(b_oh2_class* param_0) { - return true; +static int daB_OH2_IsDelete(b_oh2_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 8061EA84-8061EA84 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8061EA84 = "B_oh"; -#pragma pop - /* 8061E4F0-8061E540 0008B0 0050+00 1/0 0/0 0/0 .text daB_OH2_Delete__FP11b_oh2_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daB_OH2_Delete(b_oh2_class* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Delete__FP11b_oh2_class.s" +static int daB_OH2_Delete(b_oh2_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "B_oh"); + if (i_this->mHeap != NULL) { + i_this->mpMorf->stopZelAnime(); + } + + return 1; } -#pragma pop -/* ############################################################################################## */ -/* 8061EA70-8061EA74 000038 0004+00 0/1 0/0 0/0 .rodata @4048 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4048 = 39.0f; -COMPILER_STRIP_GATE(0x8061EA70, &lit_4048); -#pragma pop +/* 8061E540-8061E820 000900 02E0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + b_oh2_class* _this = static_cast(i_this); -/* 8061EA74-8061EA78 00003C 0004+00 0/1 0/0 0/0 .rodata @4049 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4049 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x8061EA74, &lit_4049); -#pragma pop + _this->mpMorf = + new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", 0x29), NULL, NULL, NULL, 2, + 1.0f, 0, -1, &_this->mZ2Enemy, 0, 0x11000284); + + if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { + return 0; + } + + if (!_this->mInvisModel.create(_this->mpMorf->getModel(), 1)) { + return 0; + } + + _this->mpMorf->getModel()->setUserArea((u32)i_this); + + for (u16 i = 0; i < _this->mpMorf->getModel()->getModelData()->getJointNum(); i++) { + _this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack( + nodeCallBack); + } + + _this->mpBtk = new mDoExt_btkAnm(); + if (_this->mpBtk == NULL) { + return 0; + } + + J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_oh", 0x36); + if (!_this->mpBtk->init(_this->mpMorf->getModel()->getModelData(), btk, TRUE, 2, 1.0f, 0, -1)) { + return 0; + } + + _this->mpBtk->setFrame(cM_rndF(39.0f)); + _this->mpBtk->setPlaySpeed(cM_rndFX(0.1f) + 1.0f); + + _this->mpBrk = new mDoExt_brkAnm(); + if (_this->mpBrk == NULL) { + return 0; + } + + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_oh", 0x2F); + if (!_this->mpBrk->init(_this->mpMorf->getModel()->getModelData(), brk, TRUE, 2, 1.0f, 0, -1)) { + return 0; + } + + _this->mpBrk->setFrame(cM_rndF(39.0f)); + _this->mpBrk->setPlaySpeed(cM_rndFX(0.1f) + 1.0f); + + return 1; +} + +/* 8061E868-8061E9EC 000C28 0184+00 1/0 0/0 0/0 .text daB_OH2_Create__FP10fopAc_ac_c */ +static int daB_OH2_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) b_oh2_class(); + fopAcM_OnCondition(i_this, 8); + } + b_oh2_class* _this = static_cast(i_this); + + int phase = dComIfG_resLoad(&_this->mPhase, "B_oh"); + if (phase == cPhs_COMPLEATE_e) { + _this->field_0x5c8 = fopAcM_GetParam(_this) & 0xFF; + + if (!fopAcM_entrySolidHeap(_this, (heapCallbackFunc)useHeapInit, 0x23E0)) { + return cPhs_ERROR_e; + } + + _this->mZ2Enemy.init(&_this->current.pos, &_this->current.pos, 3, 1); + _this->field_0x5cc = cM_rndF(65536.0f); + _this->field_0x5dc = cM_rndF(65536.0f); + + for (int i = 0; i < 31; i++) { + _this->field_0x660[i].y = -50000.0f; + } + + _this->field_0x5d2[3] = 10; + _this->field_0x5e4 = cM_rndFX(5.0f) + 50.0f; + + daB_OH2_Execute(_this); + } + + return phase; +} /* 8061EA8C-8061EAAC -00001 0020+00 1/0 0/0 0/0 .data l_daB_OH2_Method */ -SECTION_DATA static void* l_daB_OH2_Method[8] = { - (void*)daB_OH2_Create__FP10fopAc_ac_c, - (void*)daB_OH2_Delete__FP11b_oh2_class, - (void*)daB_OH2_Execute__FP11b_oh2_class, - (void*)daB_OH2_IsDelete__FP11b_oh2_class, - (void*)daB_OH2_Draw__FP11b_oh2_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daB_OH2_Method = { + (process_method_func)daB_OH2_Create, (process_method_func)daB_OH2_Delete, + (process_method_func)daB_OH2_Execute, (process_method_func)daB_OH2_IsDelete, + (process_method_func)daB_OH2_Draw, }; /* 8061EAAC-8061EADC -00001 0030+00 0/0 0/0 1/0 .data g_profile_B_OH2 */ -SECTION_DATA extern void* g_profile_B_OH2[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02100000, (void*)&g_fpcLf_Method, - (void*)0x00000948, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00DB0000, (void*)&l_daB_OH2_Method, - (void*)0x00044000, (void*)0x020E0000, +extern actor_process_profile_definition g_profile_B_OH2 = { + -3, + 7, + 0xFFFD, + PROC_B_OH2, + 0, + &g_fpcLf_Method.mBase, + sizeof(b_oh2_class), + 0, + 0, + &g_fopAc_Method, + 0x00DB, + 0, + 0, + &l_daB_OH2_Method, + 0x00044000, + 2, + 14, + 0, + 0, }; - -/* 8061EADC-8061EAE8 000050 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 8061E540-8061E820 000900 02E0+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/b/d_a_b_oh2/d_a_b_oh2/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 8061E820-8061E868 000BE0 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8061EA78-8061EA7C 000040 0004+00 0/1 0/0 0/0 .rodata @4105 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4105 = 65536.0f; -COMPILER_STRIP_GATE(0x8061EA78, &lit_4105); -#pragma pop - -/* 8061EA7C-8061EA80 000044 0004+00 0/1 0/0 0/0 .rodata @4106 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4106 = 50.0f; -COMPILER_STRIP_GATE(0x8061EA7C, &lit_4106); -#pragma pop - -/* 8061EA80-8061EA84 000048 0004+00 0/1 0/0 0/0 .rodata @4107 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4107 = 5.0f; -COMPILER_STRIP_GATE(0x8061EA80, &lit_4107); -#pragma pop - -/* 8061E868-8061E9EC 000C28 0184+00 1/0 0/0 0/0 .text daB_OH2_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daB_OH2_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/daB_OH2_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 8061E9EC-8061EA28 000DAC 003C+00 1/1 0/0 0/0 .text __dt__5csXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm csXyz::~csXyz() { - nofralloc -#include "asm/rel/d/a/b/d_a_b_oh2/d_a_b_oh2/__dt__5csXyzFv.s" -} -#pragma pop - -/* 8061EA28-8061EA2C 000DE8 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { - /* empty function */ -} - -/* 8061EA2C-8061EA30 000DEC 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { - /* empty function */ -} - -/* 8061EA84-8061EA84 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp index 2c72f1d3053..78a756ff2de 100644 --- a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp +++ b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp @@ -653,7 +653,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80450C9C[4]; +extern "C" extern u8 cDmr_SkipInfo[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); extern "C" void actionInitWait2__11daObjLife_cFv(); diff --git a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp index c8bd8b7068a..b012442ad1e 100644 --- a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp +++ b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp @@ -1,186 +1,91 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_set_bgobj -// +/** + * d_a_set_bgobj.cpp + * + */ #include "rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "d/d_procname.h" -// -// Types: -// +extern "C" extern leafdraw_method_class g_fopAc_Method; -struct request_of_phase_process_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daSetBgObj_c { - /* 80031870 */ void getArcName(fopAc_ac_c*); - /* 80485D78 */ void CreateInit(); - /* 80485DFC */ void create(); - /* 80485E88 */ void Delete(); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct csXyz {}; - -struct cXyz {}; - -// -// Forward References: -// - -extern "C" void CreateInit__12daSetBgObj_cFv(); -extern "C" void create__12daSetBgObj_cFv(); -extern "C" void Delete__12daSetBgObj_cFv(); -extern "C" static void daSetBgObj_Delete__FP12daSetBgObj_c(); -extern "C" static void daSetBgObj_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_set_bgobj__stringBase0; -extern "C" extern void* g_profile_SET_BG_OBJ[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getArcName__12daSetBgObj_cFP10fopAc_ac_c(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void sprintf(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80485F00-80485F0C 000000 0009+03 1/1 0/0 0/0 .rodata l_specName */ -SECTION_RODATA static u8 const l_specName[9 + 3 /* padding */] = { - 0x73, - 0x70, - 0x65, - 0x63, - 0x2E, - 0x64, - 0x61, - 0x74, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80485F00, &l_specName); - -/* 80485F10-80485F1C 000000 000A+02 1/1 0/0 0/0 .data l_bg_profName$3618 */ -SECTION_DATA static u8 l_bg_profName[10 + 2 /* padding */] = { - 0x02, - 0xDE, - 0x02, - 0xDE, - 0x02, - 0xDE, - 0x01, - 0x3C, - 0x01, - 0x3D, - /* padding */ - 0x00, - 0x00, -}; +static const char l_specName[] = "spec.dat"; /* 80485D78-80485DFC 000078 0084+00 1/1 0/0 0/0 .text CreateInit__12daSetBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSetBgObj_c::CreateInit() { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s" -} -#pragma pop +int daSetBgObj_c::CreateInit() { + static s16 l_bg_profName[5] = { + PROC_BG_OBJ, PROC_BG_OBJ, PROC_BG_OBJ, PROC_Obj_Flag2, PROC_Obj_Flag3, + }; -/* ############################################################################################## */ -/* 80485F0C-80485F0C 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80485F0C = "%s"; -#pragma pop + u16* spec_data_p = (u16*)dComIfG_getObjectRes(mArcName, l_specName); + fopAcM_create(l_bg_profName[*spec_data_p], fopAcM_GetParam(this), ¤t.pos, + fopAcM_GetRoomNo(this), ¤t.angle, &mScale, -1); + + return 1; +} /* 80485DFC-80485E88 0000FC 008C+00 1/1 0/0 0/0 .text create__12daSetBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSetBgObj_c::create() { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s" +int daSetBgObj_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daSetBgObj_c(); + fopAcM_OnCondition(this, 8); + } + + sprintf(mArcName, "%s", getArcName(this)); + + int phase = dComIfG_resLoad(&mPhase, mArcName); + if (phase == cPhs_COMPLEATE_e) { + CreateInit(); + phase = cPhs_ERROR_e; + } + + return phase; } -#pragma pop /* 80485E88-80485EB8 000188 0030+00 1/1 0/0 0/0 .text Delete__12daSetBgObj_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSetBgObj_c::Delete() { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s" +int daSetBgObj_c::Delete() { + dComIfG_resDelete(&mPhase, mArcName); + return 1; } -#pragma pop /* 80485EB8-80485ED8 0001B8 0020+00 1/0 0/0 0/0 .text daSetBgObj_Delete__FP12daSetBgObj_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSetBgObj_Delete(daSetBgObj_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s" +static int daSetBgObj_Delete(daSetBgObj_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 80485ED8-80485EF8 0001D8 0020+00 1/0 0/0 0/0 .text daSetBgObj_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSetBgObj_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s" +static int daSetBgObj_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* ############################################################################################## */ /* 80485F1C-80485F3C -00001 0020+00 1/0 0/0 0/0 .data l_daSetBgObj_Method */ -SECTION_DATA static void* l_daSetBgObj_Method[8] = { - (void*)daSetBgObj_Create__FP10fopAc_ac_c, - (void*)daSetBgObj_Delete__FP12daSetBgObj_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daSetBgObj_Method = { + (process_method_func)daSetBgObj_Create, + (process_method_func)daSetBgObj_Delete, }; /* 80485F3C-80485F6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SET_BG_OBJ */ -SECTION_DATA extern void* g_profile_SET_BG_OBJ[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02DD0000, (void*)&g_fpcLf_Method, - (void*)0x00000580, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02F20000, (void*)&l_daSetBgObj_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_SET_BG_OBJ = { + -3, + 7, + -3, + PROC_SET_BG_OBJ, + 0, + &g_fpcLf_Method.mBase, + sizeof(daSetBgObj_c), + 0, + 0, + &g_fopAc_Method, + 0x02F2, + 0, + 0, + &l_daSetBgObj_Method, + 0x00040100, + 0, + 14, + 0, + 0, }; - -/* 80485F0C-80485F0C 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp index e61860c3118..7a6d908e779 100644 --- a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp +++ b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp @@ -419,7 +419,7 @@ extern "C" extern u32 g_blackColor; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80450C9C[4]; +extern "C" extern u8 cDmr_SkipInfo[4]; extern "C" extern u8 data_80450CA0[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp index ea8231e94fd..c2d7c16dfef 100644 --- a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp +++ b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp @@ -175,7 +175,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C9C[4]; +extern "C" extern u8 cDmr_SkipInfo[4]; // // Declarations: diff --git a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp index 1f5d5bc4891..68a89067bf4 100644 --- a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp +++ b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp @@ -1,186 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_web0 -// +/** + * d_a_obj_web0.cpp + * Spider Web (Wall) + */ #include "rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h" +#include "SSystem/SComponent/c_math.h" +#include "d/d_procname.h" #include "dol2asm.h" -#include "dolphin/types.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_web0_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Web0_HIO_c { - /* 80D3452C */ daObj_Web0_HIO_c(); - /* 80D350E4 */ ~daObj_Web0_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -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); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 80084658 */ void ChkCoHit(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80D35054 */ ~cM3dGSph(); -}; - -struct cM3dGAab { - /* 80D3509C */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D34D44 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void __ct__16daObj_Web0_HIO_cFv(); -extern "C" static void daObj_Web0_Draw__FP14obj_web0_class(); extern "C" static void damage_check__FP14obj_web0_class(); -extern "C" static void daObj_Web0_Execute__FP14obj_web0_class(); -extern "C" static bool daObj_Web0_IsDelete__FP14obj_web0_class(); -extern "C" static void daObj_Web0_Delete__FP14obj_web0_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daObj_Web0_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__16daObj_Web0_HIO_cFv(); -extern "C" void __sinit_d_a_obj_web0_cpp(); -extern "C" extern char const* const d_a_obj_web0__stringBase0; // // External References: @@ -234,109 +62,30 @@ extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; +extern "C" extern leafdraw_method_class g_fopAc_Method; 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" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D351C8-80D35208 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src$3944 */ -SECTION_DATA static u8 cc_sph_src[64] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, -}; - -/* 80D35208-80D35228 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Web0_Method */ -SECTION_DATA static void* l_daObj_Web0_Method[8] = { - (void*)daObj_Web0_Create__FP10fopAc_ac_c, - (void*)daObj_Web0_Delete__FP14obj_web0_class, - (void*)daObj_Web0_Execute__FP14obj_web0_class, - (void*)daObj_Web0_IsDelete__FP14obj_web0_class, - (void*)daObj_Web0_Draw__FP14obj_web0_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D35228-80D35258 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB0 */ -SECTION_DATA extern void* g_profile_OBJ_WEB0[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00280000, (void*)&g_fpcLf_Method, - (void*)0x0000073C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x002F0000, (void*)&l_daObj_Web0_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80D35258-80D35264 000090 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80D35264-80D35270 00009C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80D35270-80D3527C 0000A8 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80D3527C-80D35288 0000B4 000C+00 2/2 0/0 0/0 .data __vt__16daObj_Web0_HIO_c */ -SECTION_DATA extern void* __vt__16daObj_Web0_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daObj_Web0_HIO_cFv, -}; /* 80D3452C-80D34544 0000EC 0018+00 1/1 0/0 0/0 .text __ct__16daObj_Web0_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Web0_HIO_c::daObj_Web0_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__ct__16daObj_Web0_HIO_cFv.s" +daObj_Web0_HIO_c::daObj_Web0_HIO_c() { + field_0x4 = -1; } -#pragma pop /* 80D34544-80D345C0 000104 007C+00 1/0 0/0 0/0 .text daObj_Web0_Draw__FP14obj_web0_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web0_Draw(obj_web0_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Draw__FP14obj_web0_class.s" +static int daObj_Web0_Draw(obj_web0_class* i_this) { + g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + i_this->mpBrk->entry(i_this->mpModel->getModelData()); + + mDoExt_modelUpdateDL(i_this->mpModel); + return 1; } -#pragma pop /* ############################################################################################## */ /* 80D3517C-80D35180 000000 0004+00 3/3 0/0 0/0 .rodata @3724 */ @@ -358,14 +107,58 @@ COMPILER_STRIP_GATE(0x80D35184, &lit_3726); #pragma pop /* 80D345C0-80D34794 000180 01D4+00 1/1 0/0 0/0 .text damage_check__FP14obj_web0_class */ +// matches with literals +#ifdef NONMATCHING +static void damage_check(obj_web0_class* i_this) { + i_this->mStts.Move(); + + if (i_this->mHitTimer != 0) { + return; + } + + if (i_this->mSphCc.ChkTgHit()) { + i_this->mHitTimer = 6; + + if (i_this->mSphCc.GetTgHitObj()->ChkAtType(AT_TYPE_IRON_BALL)) { + i_this->mDeleteTimer = 41; + return; + } + + if (i_this->mSphCc.GetTgHitObj()->ChkAtType(AT_TYPE_LANTERN_SWING) && + static_cast(i_this->mSphCc.GetTgHitObj())->GetAtMtrl() != 1) { + return; + } + + if (i_this->mSphCc.GetTgHitObj()->ChkAtType(AT_TYPE_BOMB) || + static_cast(i_this->mSphCc.GetTgHitObj())->GetAtMtrl() == 1) { + i_this->mDeleteTimer = 1; + return; + } + + i_this->mReboundTimer = 20; + fopAcM_seStart(i_this, Z2SE_OBJ_WEB_BOUND_L, 0); + } + + if (i_this->mSphCc.ChkCoHit()) { + i_this->mReboundTimer = 10; + } + + if (daPy_getPlayerActorClass()->checkFrontRollCrash() && + fopAcM_searchPlayerDistanceXZ(i_this) < i_this->mScale.x * 260.0f) { + i_this->mReboundTimer = 20; + fopAcM_seStart(i_this, Z2SE_OBJ_WEB_BOUND_L, 0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void damage_check(obj_web0_class* param_0) { +static asm void damage_check(obj_web0_class* i_this) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/damage_check__FP14obj_web0_class.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80D35188-80D3518C 00000C 0004+00 0/1 0/0 0/0 .rodata @3850 */ @@ -410,149 +203,261 @@ COMPILER_STRIP_GATE(0x80D3519C, &lit_3855); #pragma pop /* 80D34794-80D34B24 000354 0390+00 2/1 0/0 0/0 .text daObj_Web0_Execute__FP14obj_web0_class */ +// reg alloc +#ifdef NONMATCHING +static int daObj_Web0_Execute(obj_web0_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + + i_this->field_0x57c++; + + for (int i = 0; i < 2; i++) { + if (i_this->field_0x584[i] != 0) { + i_this->field_0x584[i]--; + } + } + + if (i_this->mHitTimer != 0) { + i_this->mHitTimer--; + } + + if (i_this->mDeleteTimer != 0) { + if (i_this->mDeleteTimer == 1) { + cXyz sp30(i_this->mScale); + sp30.z = 1.0f; + + dComIfGp_particle_set(0x840C, &i_this->current.pos, &i_this->shape_angle, &sp30); + i_this->mpBrk->setPlaySpeed(1.0f); + } else if (i_this->mDeleteTimer == 41) { + i_this->mpBrk->setPlaySpeed(1.0f); + } + + fopAcM_seStartLevel(i_this, Z2SE_OBJ_WEB_BURN, 0); + + if (i_this->mDeleteTimer == 40 || i_this->mDeleteTimer == 80) { + dComIfGs_onSwitch(fopAcM_GetParam(i_this) >> 0x18, fopAcM_GetRoomNo(i_this)); + fopAcM_delete(i_this); + } + + i_this->mDeleteTimer++; + } else { + damage_check(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::ZrotM(i_this->shape_angle.z); + mDoMtx_stack_c::scaleM(i_this->mScale.x, i_this->mScale.y, i_this->mScale.z); + + i_this->mpBrk->play(); + i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + + if (i_this->mReboundTimer != 0) { + i_this->mReboundTimer--; + } + + i_this->mScale.z = i_this->mReboundTimer * cM_ssin(i_this->mReboundTimer * 0x1900) * 0.075f; + + s16 tmp = (fopAcM_searchPlayerAngleY(i_this) + 0x4000) - i_this->shape_angle.y; + if (tmp < 0) { + mDoMtx_stack_c::YrotM(-0x8000); + } + PSMTXCopy(mDoMtx_stack_c::get(), i_this->mMtx); + + i_this->mpBgW->Move(); + + cXyz sp3C(i_this->current.pos); + if (i_this->field_0x57c & 1) { + sp3C.y -= i_this->mScale.x * 70.0f; + } + + s16 svar9 = i_this->shape_angle.y; + if (tmp < 0) { + svar9 += (s16)-0x8000; + } + + svar9 -= player->shape_angle.y; + if ((svar9 < 20000 && svar9 > -20000) || i_this->mHitTimer != 0) { + sp3C.x += 20000.0f; + } + + i_this->mSphCc.SetC(sp3C); + i_this->mSphCc.SetR(i_this->mScale.x * 150.0f); + + dComIfG_Ccsp()->Set(&i_this->mSphCc); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daObj_Web0_Execute(obj_web0_class* param_0) { +static asm int daObj_Web0_Execute(obj_web0_class* i_this) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Execute__FP14obj_web0_class.s" } #pragma pop +#endif /* 80D34B24-80D34B2C 0006E4 0008+00 1/0 0/0 0/0 .text daObj_Web0_IsDelete__FP14obj_web0_class */ -static bool daObj_Web0_IsDelete(obj_web0_class* param_0) { - return true; +static int daObj_Web0_IsDelete(obj_web0_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80D351BC-80D351BC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D351BC = "Obj_web0"; -#pragma pop - /* 80D35290-80D35294 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80D35290[4]; +static u8 data_80D35290; /* 80D34B2C-80D34B94 0006EC 0068+00 1/0 0/0 0/0 .text daObj_Web0_Delete__FP14obj_web0_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web0_Delete(obj_web0_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Delete__FP14obj_web0_class.s" -} -#pragma pop +static int daObj_Web0_Delete(obj_web0_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "Obj_web0"); -/* ############################################################################################## */ -/* 80D351A4-80D351A8 000028 0004+00 1/1 0/0 0/0 .rodata @3917 */ -SECTION_RODATA static u8 const lit_3917[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D351A4, &lit_3917); + if (i_this->field_0x739) { + data_80D35290 = 0; + } + + dComIfG_Bgsp().Release(i_this->mpBgW); + return 1; +} /* 80D34B94-80D34D44 000754 01B0+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/obj/d_a_obj_web0/d_a_obj_web0/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + obj_web0_class* _this = static_cast(i_this); + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_web0", 5); + _this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + + if (_this->mpModel == NULL) { + return 0; + } + + _this->mpBrk = new mDoExt_brkAnm(); + if (_this->mpBrk == NULL) { + return 0; + } + + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Obj_web0", 8); + if (!_this->mpBrk->init(_this->mpModel->getModelData(), brk, TRUE, 0, FLOAT_LABEL(lit_3724), 0, + -1)) { + return 0; + } + + _this->mpBrk->setPlaySpeed(0.0f); + + _this->mpBgW = new dBgW(); + if (_this->mpBgW == NULL) { + return 0; + } + + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Obj_web0", 11); + if (_this->mpBgW->Set(dzb, 1, &_this->mMtx) == 1) { + return 0; + } + + _this->mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); + return 1; } -#pragma pop - -/* 80D34D44-80D34D8C 000904 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D351A8-80D351AC 00002C 0004+00 1/1 0/0 0/0 .rodata @4014 */ -SECTION_RODATA static f32 const lit_4014 = -1000.0f; -COMPILER_STRIP_GATE(0x80D351A8, &lit_4014); - -/* 80D351AC-80D351B4 000030 0004+04 1/1 0/0 0/0 .rodata @4015 */ -SECTION_RODATA static f32 const lit_4015[1 + 1 /* padding */] = { - 1000.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80D351AC, &lit_4015); - -/* 80D351B4-80D351BC 000038 0008+00 1/1 0/0 0/0 .rodata @4017 */ -SECTION_RODATA static u8 const lit_4017[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D351B4, &lit_4017); - -/* 80D35294-80D352A0 00000C 000C+00 1/1 0/0 0/0 .bss @3643 */ -static u8 lit_3643[12]; /* 80D352A0-80D352A8 000018 0008+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; +static daObj_Web0_HIO_c l_HIO; /* 80D34D8C-80D35054 00094C 02C8+00 1/0 0/0 0/0 .text daObj_Web0_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web0_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/daObj_Web0_Create__FP10fopAc_ac_c.s" +static int daObj_Web0_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) obj_web0_class(); + fopAcM_OnCondition(i_this, 8); + } + obj_web0_class* _this = static_cast(i_this); + + static dCcD_SrcSph cc_sph_src = { + { + {0, {{0, 0, 0}, {0xD8FBFFFF, 3}, 0}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {dCcD_SE_HARD_BODY, 0, 0, 0, {3}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 40.0f, + }, + }; + + int phase = dComIfG_resLoad(&_this->mPhase, "Obj_web0"); + if (phase == cPhs_COMPLEATE_e) { + int switchNo = fopAcM_GetParam(_this) >> 0x18; + + if (switchNo != 0xFF && dComIfGs_isSwitch(switchNo, fopAcM_GetRoomNo(_this))) { + return cPhs_ERROR_e; + } + + _this->mPrm0 = fopAcM_GetParam(_this); + if (_this->mPrm0 == 0xFF) { + _this->mPrm0 = 0; + } + + _this->mScaleXY = fopAcM_GetParam(_this) >> 8; + + if (!fopAcM_entrySolidHeap(_this, (heapCallbackFunc)useHeapInit, 0xA20)) { + return cPhs_ERROR_e; + } + + if (_this->mpBgW != NULL && dComIfG_Bgsp().Regist(_this->mpBgW, _this)) { + return cPhs_ERROR_e; + } + + if (!data_80D35290) { + _this->field_0x739 = 1; + data_80D35290 = true; + l_HIO.field_0x4 = -1; + } + + fopAcM_SetMtx(_this, _this->mpModel->getBaseTRMtx()); + fopAcM_SetMin(_this, -1000.0f, -1000.0f, -1000.0f); + fopAcM_SetMax(_this, 1000.0f, 1000.0f, 1000.0f); + _this->field_0x562 = 30; + _this->field_0x560 = 30; + + _this->mStts.Init(250, 0, _this); + _this->mSphCc.Set(cc_sph_src); + _this->mSphCc.SetStts(&_this->mStts); + _this->mSphCc.OnTgNoHitMark(); + + if (_this->mScaleXY != 0xFF && _this->mScaleXY != 0) { + _this->mScale.x = _this->mScaleXY; + _this->mScale.y = _this->mScaleXY; + } + + _this->mEyePos = _this->current.pos; + daObj_Web0_Execute(_this); + } + + return phase; } -#pragma pop -/* 80D35054-80D3509C 000C14 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGSphFv.s" -} -#pragma pop +/* 80D35208-80D35228 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Web0_Method */ +static actor_method_class l_daObj_Web0_Method = { + (process_method_func)daObj_Web0_Create, (process_method_func)daObj_Web0_Delete, + (process_method_func)daObj_Web0_Execute, (process_method_func)daObj_Web0_IsDelete, + (process_method_func)daObj_Web0_Draw, +}; -/* 80D3509C-80D350E4 000C5C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80D350E4-80D3512C 000CA4 0048+00 2/1 0/0 0/0 .text __dt__16daObj_Web0_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Web0_HIO_c::~daObj_Web0_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__dt__16daObj_Web0_HIO_cFv.s" -} -#pragma pop - -/* 80D3512C-80D35168 000CEC 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_web0_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_web0_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0/__sinit_d_a_obj_web0_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80D3512C, __sinit_d_a_obj_web0_cpp); -#pragma pop - -/* 80D351BC-80D351BC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80D35228-80D35258 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB0 */ +extern actor_process_profile_definition g_profile_OBJ_WEB0 = { + -3, + 3, + -3, + PROC_OBJ_WEB0, + 0, + &g_fpcLf_Method.mBase, + sizeof(obj_web0_class), + 0, + 0, + &g_fopAc_Method, + 0x002F, + 0, + 0, + &l_daObj_Web0_Method, + 0x00040100, + 0, + 14, + 0, + 0, +}; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp index fe9e1328cbd..1b02c8d5f03 100644 --- a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp +++ b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp @@ -1,642 +1,354 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_web1 -// +/** + * d_a_obj_web1.cpp + * Spider Web (Floor) + */ #include "rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" +#include "d/d_procname.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_web1_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Web1_HIO_c { - /* 80D353AC */ daObj_Web1_HIO_c(); - /* 80D36028 */ ~daObj_Web1_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -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); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F200 */ void SetR(f32); - /* 80D35F98 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80D35FE0 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80D35C9C */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void __ct__16daObj_Web1_HIO_cFv(); -extern "C" static void daObj_Web1_Draw__FP14obj_web1_class(); -extern "C" static void ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" static void action__FP14obj_web1_class(); -extern "C" static void daObj_Web1_Execute__FP14obj_web1_class(); -extern "C" static bool daObj_Web1_IsDelete__FP14obj_web1_class(); -extern "C" static void daObj_Web1_Delete__FP14obj_web1_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daObj_Web1_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__16daObj_Web1_HIO_cFv(); -extern "C" void __sinit_d_a_obj_web1_cpp(); -extern "C" extern char const* const d_a_obj_web1__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D3612C-80D36170 000000 0044+00 1/1 0/0 0/0 .data cc_cyl_src$3969 */ -SECTION_DATA static u8 cc_cyl_src[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, -}; - -/* 80D36170-80D36190 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Web1_Method */ -SECTION_DATA static void* l_daObj_Web1_Method[8] = { - (void*)daObj_Web1_Create__FP10fopAc_ac_c, - (void*)daObj_Web1_Delete__FP14obj_web1_class, - (void*)daObj_Web1_Execute__FP14obj_web1_class, - (void*)daObj_Web1_IsDelete__FP14obj_web1_class, - (void*)daObj_Web1_Draw__FP14obj_web1_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D36190-80D361C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB1 */ -SECTION_DATA extern void* g_profile_OBJ_WEB1[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00290000, (void*)&g_fpcLf_Method, - (void*)0x00000770, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00300000, (void*)&l_daObj_Web1_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80D361C0-80D361CC 000094 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80D361CC-80D361D8 0000A0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80D361D8-80D361E4 0000AC 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80D361E4-80D361F0 0000B8 000C+00 2/2 0/0 0/0 .data __vt__16daObj_Web1_HIO_c */ -SECTION_DATA extern void* __vt__16daObj_Web1_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daObj_Web1_HIO_cFv, -}; +extern "C" extern leafdraw_method_class g_fopAc_Method; /* 80D353AC-80D353C4 0000EC 0018+00 1/1 0/0 0/0 .text __ct__16daObj_Web1_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Web1_HIO_c::daObj_Web1_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__ct__16daObj_Web1_HIO_cFv.s" +daObj_Web1_HIO_c::daObj_Web1_HIO_c() { + field_0x4 = -1; } -#pragma pop /* 80D353C4-80D35440 000104 007C+00 1/0 0/0 0/0 .text daObj_Web1_Draw__FP14obj_web1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web1_Draw(obj_web1_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Draw__FP14obj_web1_class.s" +static int daObj_Web1_Draw(obj_web1_class* i_this) { + g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + i_this->mpBrk->entry(i_this->mpModel->getModelData()); + + mDoExt_modelUpdateDL(i_this->mpModel); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80D360C0-80D360C4 000000 0004+00 5/5 0/0 0/0 .rodata @3703 */ -SECTION_RODATA static u8 const lit_3703[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D360C0, &lit_3703); - -/* 80D360C4-80D360C8 000004 0004+00 1/1 0/0 0/0 .rodata @3704 */ -SECTION_RODATA static f32 const lit_3704 = 140.0f; -COMPILER_STRIP_GATE(0x80D360C4, &lit_3704); /* 80D35440-80D35508 000180 00C8+00 1/1 0/0 0/0 .text * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void ride_call_back(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s" +static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) { + obj_web1_class* _this = static_cast(i_this); + + f32 x_diff = i_actor->current.pos.x - _this->current.pos.x; + f32 z_diff = i_actor->current.pos.z - _this->current.pos.z; + _this->mDistToActor = JMAFastSqrt((x_diff * x_diff) + (z_diff * z_diff)); + + if (_this->mDistToActor < 140.0f) { + if (fopAcM_GetName(i_actor) == PROC_ALINK || fopAcM_GetName(i_actor) == PROC_ALINK) { + if (_this->field_0x5aa == 0) { + _this->mReboundTimer = 60; + } + + if (daPy_getPlayerActorClass()->i_checkEquipHeavyBoots()) { + _this->field_0x5aa = 120; + } else { + _this->field_0x5aa = 6; + } + } else if (fopAcM_GetName(i_actor) == PROC_OBJ_GM) { + _this->field_0x5aa = 120; + } else { + _this->field_0x5aa = 3; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80D360C8-80D360CC 000008 0004+00 1/3 0/0 0/0 .rodata @3798 */ -SECTION_RODATA static f32 const lit_3798 = 1.0f; -COMPILER_STRIP_GATE(0x80D360C8, &lit_3798); - -/* 80D360CC-80D360D0 00000C 0004+00 0/2 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3799 = -1.0f; -COMPILER_STRIP_GATE(0x80D360CC, &lit_3799); -#pragma pop - -/* 80D360D0-80D360D4 000010 0004+00 0/1 0/0 0/0 .rodata @3800 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3800 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(0x80D360D0, &lit_3800); -#pragma pop - -/* 80D360D4-80D360D8 000014 0004+00 0/1 0/0 0/0 .rodata @3801 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3801 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80D360D4, &lit_3801); -#pragma pop - -/* 80D360D8-80D360DC 000018 0004+00 0/1 0/0 0/0 .rodata @3802 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3802 = 10.0f; -COMPILER_STRIP_GATE(0x80D360D8, &lit_3802); -#pragma pop - -/* 80D360DC-80D360E0 00001C 0004+00 0/1 0/0 0/0 .rodata @3803 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3803 = 5.0f; -COMPILER_STRIP_GATE(0x80D360DC, &lit_3803); -#pragma pop - -/* 80D360E0-80D360E4 000020 0004+00 0/1 0/0 0/0 .rodata @3804 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3804 = 2.0f; -COMPILER_STRIP_GATE(0x80D360E0, &lit_3804); -#pragma pop - -/* 80D360E4-80D360E8 000024 0004+00 0/1 0/0 0/0 .rodata @3805 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3805 = 0x3BA3D70A; -COMPILER_STRIP_GATE(0x80D360E4, &lit_3805); -#pragma pop - -/* 80D360E8-80D360F0 000028 0004+04 0/1 0/0 0/0 .rodata @3806 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3806[1 + 1 /* padding */] = { - 0.5f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80D360E8, &lit_3806); -#pragma pop - -/* 80D360F0-80D360F8 000030 0008+00 0/1 0/0 0/0 .rodata @3808 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3808[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D360F0, &lit_3808); -#pragma pop /* 80D35508-80D35774 000248 026C+00 1/1 0/0 0/0 .text action__FP14obj_web1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(obj_web1_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/action__FP14obj_web1_class.s" +static void action(obj_web1_class* i_this) { + if (i_this->mReboundTimer != 0) { + if (i_this->mReboundTimer == 60 || i_this->mReboundTimer == 40 || + i_this->mReboundTimer == 20) { + fopAcM_seStart(i_this, Z2SE_OBJ_WEB_BOUND_S, 0); + } + + i_this->mReboundTimer--; + } + + switch (i_this->mActionMode) { + case 0: + if (i_this->mHitTimer == 0 && i_this->mCylCc.ChkTgHit()) { + i_this->mHitTimer = 6; + + if (i_this->mCylCc.GetTgHitObj()->ChkAtType(AT_TYPE_BOMB)) { + i_this->mActionMode = 10; + } + + if (i_this->mCylCc.GetTgHitGObj()->GetAtMtrl() == 1) { + i_this->mActionMode = 10; + } + } + break; + case 1: + if (i_this->field_0x5a2[0] == 0) { + i_this->mZ2SoundObj.startCollisionSE(0x40000, 0x21, NULL); + fopAcM_delete(i_this); + } + break; + case 10: + i_this->mDeleteTimer = 1; + break; + } + + i_this->mScale.y = i_this->field_0x5b0 + + i_this->mReboundTimer * cM_ssin(i_this->mReboundTimer * 0xF00) * 0.02f; + if (i_this->mScale.y < 0.1f) { + i_this->mScale.y = 0.1f; + } + + f32 target = 0.0f; + if (i_this->field_0x5aa != 0) { + if (i_this->field_0x5aa > 100) { + target = 10.0f; + i_this->mActionMode++; + i_this->field_0x5a2[0] = 0; + } else if (i_this->field_0x5aa > 80) { + target = 5.0f; + } else if (i_this->field_0x5aa >= 4) { + target = 2.0f; + } else { + target = 1.0f; + } + + f32 fvar6 = i_this->mDistToActor * 0.005f; + if (fvar6 > 1.0f) { + fvar6 = 1.0f; + } + target *= 1.0f - fvar6; + + i_this->field_0x5aa--; + } + + cLib_addCalc2(&i_this->field_0x5b0, target, 0.5f, 0.5f); } -#pragma pop - -/* ############################################################################################## */ -/* 80D360F8-80D360FC 000038 0004+00 0/1 0/0 0/0 .rodata @3871 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3871 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80D360F8, &lit_3871); -#pragma pop - -/* 80D360FC-80D36100 00003C 0004+00 0/1 0/0 0/0 .rodata @3872 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3872 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(0x80D360FC, &lit_3872); -#pragma pop - -/* 80D36100-80D36104 000040 0004+00 0/1 0/0 0/0 .rodata @3873 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3873 = 9.0f; -COMPILER_STRIP_GATE(0x80D36100, &lit_3873); -#pragma pop - -/* 80D36104-80D36108 000044 0004+00 0/1 0/0 0/0 .rodata @3874 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3874 = -15.0f; -COMPILER_STRIP_GATE(0x80D36104, &lit_3874); -#pragma pop - -/* 80D36108-80D3610C 000048 0004+00 0/1 0/0 0/0 .rodata @3875 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3875 = 150.0f; -COMPILER_STRIP_GATE(0x80D36108, &lit_3875); -#pragma pop /* 80D35774-80D35A3C 0004B4 02C8+00 2/1 0/0 0/0 .text daObj_Web1_Execute__FP14obj_web1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web1_Execute(obj_web1_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Execute__FP14obj_web1_class.s" +static int daObj_Web1_Execute(obj_web1_class* i_this) { + i_this->field_0x59c++; + + for (int i = 0; i < 2; i++) { + if (i_this->field_0x5a2[i] != 0) { + i_this->field_0x5a2[i]--; + } + } + + if (i_this->mHitTimer != 0) { + i_this->mHitTimer--; + } + + int roomNo = fopAcM_GetRoomNo(i_this); + i_this->mZ2SoundObj.framework(0, dComIfGp_getReverb(roomNo)); + + if (i_this->mDeleteTimer != 0) { + if (i_this->mDeleteTimer == 1) { + cXyz scale; + scale.x = i_this->mScale.x; + scale.y = i_this->mScale.x; + scale.z = i_this->mScale.x; + + dComIfGp_particle_set(0x840E, &i_this->current.pos, &i_this->shape_angle, &scale); + i_this->mpBrk->setPlaySpeed(1.0f); + } + + fopAcM_seStartLevel(i_this, Z2SE_OBJ_WEB_BURN, 0); + + if (i_this->mDeleteTimer == 35) { + dComIfGs_onSwitch(fopAcM_GetParam(i_this) >> 0x18, fopAcM_GetRoomNo(i_this)); + fopAcM_delete(i_this); + } + + i_this->mDeleteTimer++; + } else { + action(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::scaleM(i_this->mScale.x, i_this->mScale.y * i_this->mScale.x + 0.05f, + i_this->mScale.x); + + i_this->mpBrk->play(); + i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::scaleM(i_this->mScale.x * 1.2f, i_this->mScale.x, i_this->mScale.x * 1.2f); + mDoMtx_stack_c::transM(0.0f, i_this->mScale.x * i_this->mScale.y * -15.0f + 9.0f, 0.0f); + PSMTXCopy(mDoMtx_stack_c::get(), i_this->mMtx); + + i_this->mpBgW->Move(); + i_this->mCylCc.SetC(i_this->current.pos); + i_this->mCylCc.SetR(i_this->mScale.x * 150.0f); + + dComIfG_Ccsp()->Set(&i_this->mCylCc); + return 1; } -#pragma pop /* 80D35A3C-80D35A44 00077C 0008+00 1/0 0/0 0/0 .text daObj_Web1_IsDelete__FP14obj_web1_class */ -static bool daObj_Web1_IsDelete(obj_web1_class* param_0) { - return true; +static int daObj_Web1_IsDelete(obj_web1_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80D36120-80D36120 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D36120 = "Obj_web1"; -#pragma pop - /* 80D361F8-80D361FC 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80D361F8[4]; +static u8 data_80D361F8; /* 80D35A44-80D35AC0 000784 007C+00 1/0 0/0 0/0 .text daObj_Web1_Delete__FP14obj_web1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web1_Delete(obj_web1_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Delete__FP14obj_web1_class.s" +static int daObj_Web1_Delete(obj_web1_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "Obj_web1"); + + if (i_this->field_0x76c) { + data_80D361F8 = 0; + } + + dComIfG_Bgsp().Release(i_this->mpBgW); + + if (i_this->mHeap != NULL) { + i_this->mZ2SoundObj.deleteObject(); + } + return 1; } -#pragma pop /* 80D35AC0-80D35C9C 000800 01DC+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/obj/d_a_obj_web1/d_a_obj_web1/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + obj_web1_class* _this = static_cast(i_this); + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_web1", 5); + _this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + + if (_this->mpModel == NULL) { + return 0; + } + + _this->mpBrk = new mDoExt_brkAnm(); + if (_this->mpBrk == NULL) { + return 0; + } + + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Obj_web1", 8); + if (!_this->mpBrk->init(_this->mpModel->getModelData(), brk, TRUE, 0, 1.0f, 0, -1)) { + return 0; + } + + _this->mpBrk->setPlaySpeed(0.0f); + + _this->mpBgW = new dBgW(); + if (_this->mpBgW == NULL) { + return 0; + } + + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Obj_web1", 11); + if (_this->mpBgW->Set(dzb, 1, &_this->mMtx) == 1) { + return 0; + } + + _this->mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); + _this->mpBgW->SetRideCallback(ride_call_back); + _this->mZ2SoundObj.init(&i_this->current.pos, 1); + return 1; } -#pragma pop - -/* 80D35C9C-80D35CE4 0009DC 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D3610C-80D36110 00004C 0004+00 0/1 0/0 0/0 .rodata @4036 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4036 = -1000.0f; -COMPILER_STRIP_GATE(0x80D3610C, &lit_4036); -#pragma pop - -/* 80D36110-80D36114 000050 0004+00 0/1 0/0 0/0 .rodata @4037 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4037 = 1000.0f; -COMPILER_STRIP_GATE(0x80D36110, &lit_4037); -#pragma pop - -/* 80D36114-80D36118 000054 0004+00 0/1 0/0 0/0 .rodata @4038 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4038 = 13.0f; -COMPILER_STRIP_GATE(0x80D36114, &lit_4038); -#pragma pop - -/* 80D36118-80D36120 000058 0008+00 0/1 0/0 0/0 .rodata @4040 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4040[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D36118, &lit_4040); -#pragma pop - -/* 80D361FC-80D36208 00000C 000C+00 1/1 0/0 0/0 .bss @3643 */ -static u8 lit_3643[12]; /* 80D36208-80D36210 000018 0008+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; +static daObj_Web1_HIO_c l_HIO; /* 80D35CE4-80D35F98 000A24 02B4+00 1/0 0/0 0/0 .text daObj_Web1_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Web1_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/daObj_Web1_Create__FP10fopAc_ac_c.s" +static int daObj_Web1_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) obj_web1_class(); + fopAcM_OnCondition(i_this, 8); + } + obj_web1_class* _this = static_cast(i_this); + + static dCcD_SrcCyl cc_cyl_src = { + { + {0, {{0, 0, 0}, {0xD8FBFFFF, 17}, 0}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {dCcD_SE_HARD_BODY, 2, 0, 0, {2}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 2.0f, + }, + }; + + int phase = dComIfG_resLoad(&_this->mPhase, "Obj_web1"); + if (phase == cPhs_COMPLEATE_e) { + u8 switchNo = fopAcM_GetParam(_this) >> 0x18; + + if (switchNo != 0xFF && dComIfGs_isSwitch(switchNo, fopAcM_GetRoomNo(_this))) { + return cPhs_ERROR_e; + } + + _this->mPrm0 = fopAcM_GetParam(_this); + if (_this->mPrm0 == 0xFF) { + _this->mPrm0 = 0; + } + + _this->mScaleX = fopAcM_GetParam(_this) >> 8; + + if (!fopAcM_entrySolidHeap(_this, (heapCallbackFunc)useHeapInit, 0x4B000)) { + return cPhs_ERROR_e; + } + + if (dComIfG_Bgsp().Regist(_this->mpBgW, _this)) { + return cPhs_ERROR_e; + } + + if (!data_80D361F8) { + _this->field_0x76c = 1; + data_80D361F8 = true; + l_HIO.field_0x4 = -1; + } + + fopAcM_SetMtx(_this, _this->mpModel->getBaseTRMtx()); + fopAcM_SetMin(_this, -1000.0f, -1000.0f, -1000.0f); + fopAcM_SetMax(_this, 1000.0f, 1000.0f, 1000.0f); + + if (_this->mScaleX != 0xFF && _this->mScaleX != 0) { + _this->mScale.x = _this->mScaleX; + } + + _this->current.pos.y -= 13.0f; + + _this->mStts.Init(255, 0, _this); + _this->mCylCc.Set(cc_cyl_src); + _this->mCylCc.SetStts(&_this->mStts); + _this->mCylCc.OnTgNoHitMark(); + + _this->mEyePos = _this->current.pos; + daObj_Web1_Execute(_this); + } + + return phase; } -#pragma pop -/* 80D35F98-80D35FE0 000CD8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGCylFv.s" -} -#pragma pop +/* 80D36170-80D36190 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Web1_Method */ +static actor_method_class l_daObj_Web1_Method = { + (process_method_func)daObj_Web1_Create, (process_method_func)daObj_Web1_Delete, + (process_method_func)daObj_Web1_Execute, (process_method_func)daObj_Web1_IsDelete, + (process_method_func)daObj_Web1_Draw, +}; -/* 80D35FE0-80D36028 000D20 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80D36028-80D36070 000D68 0048+00 2/1 0/0 0/0 .text __dt__16daObj_Web1_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Web1_HIO_c::~daObj_Web1_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__dt__16daObj_Web1_HIO_cFv.s" -} -#pragma pop - -/* 80D36070-80D360AC 000DB0 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_web1_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_web1_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1/__sinit_d_a_obj_web1_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80D36070, __sinit_d_a_obj_web1_cpp); -#pragma pop - -/* 80D36120-80D36120 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80D36190-80D361C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB1 */ +extern actor_process_profile_definition g_profile_OBJ_WEB1 = { + -3, + 3, + -3, + PROC_OBJ_WEB1, + 0, + &g_fpcLf_Method.mBase, + sizeof(obj_web1_class), + 0, + 0, + &g_fopAc_Method, + 0x0030, + 0, + 0, + &l_daObj_Web1_Method, + 0x00040100, + 0, + 14, + 0, + 0, +}; diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 2b04c61fcb0..5a871927909 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -55,6 +55,17 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; // Declarations: // +/* ############################################################################################## */ +/* 80450C98-80450C9C -00001 0004+00 0/0 0/0 50/50 .sbss None */ +extern u8 struct_80450C98[4]; +u8 struct_80450C98[4]; + +/* 80450C9C-80450CA0 -00001 0004+00 0/0 0/0 6/6 .sbss None */ +#pragma push +#pragma force_active on +u8 cDmr_SkipInfo; +#pragma pop + /* ############################################################################################## */ /* 80451BA8-80451BAC 0001A8 0004+00 1/1 0/0 0/0 .sdata2 @3731 */ SECTION_SDATA2 static f32 lit_3731 = 25.0f; @@ -97,7 +108,7 @@ void JPTraceParticleCallBack4::draw(JPABaseEmitter* param_0, JPABaseParticle* pa #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cDmrNowMidnaTalk() { +asm BOOL cDmrNowMidnaTalk() { nofralloc #include "asm/c/c_damagereaction/cDmrNowMidnaTalk__Fv.s" } diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp index 94b766c4f9f..80608168b8f 100644 --- a/src/d/a/d_a_obj_item.cpp +++ b/src/d/a/d_a_obj_item.cpp @@ -4,13 +4,13 @@ // #include "d/a/d_a_obj_item.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_item.h" +#include "d/d_item_data.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "d/d_item_data.h" -#include "d/d_item.h" -#include "d/com/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" -#include "SSystem/SComponent/c_math.h" // // Forward References: @@ -261,7 +261,7 @@ void daItem_c::initBaseMtx() { void daItem_c::setBaseMtx() { if (mpModel != NULL) { mpModel->setBaseScale(mScale); - + switch (m_itemNo) { case GREEN_RUPEE: case BLUE_RUPEE: @@ -500,18 +500,25 @@ SECTION_DATA u8 daItem_c::mFuncPtr[120] = { }; /* SECTION_DATA procFunc daItem_c::mFuncPtr[9] = { - &daItem_c::procMainNormal, &daItem_c::procMainEnemyCarry, &daItem_c::procMainSimpleGetDemo, - &daItem_c::procWaitGetDemoEvent, &daItem_c::procMainGetDemoEvent, &daItem_c::procMainBoomerangCarry, - &daItem_c::procMainSwOnWait, &daItem_c::procMainBoomHitWait, &daItem_c::procMainForceGet, + &daItem_c::procMainNormal, &daItem_c::procMainEnemyCarry, &daItem_c::procMainSimpleGetDemo, + &daItem_c::procWaitGetDemoEvent, &daItem_c::procMainGetDemoEvent, +&daItem_c::procMainBoomerangCarry, &daItem_c::procMainSwOnWait, &daItem_c::procMainBoomHitWait, +&daItem_c::procMainForceGet, }; */ /* 803B9F10-803B9F54 017030 0044+00 1/1 0/0 0/0 .data m_cyl_src__8daItem_c */ -SECTION_DATA u8 daItem_c::m_cyl_src[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x59, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, +dCcD_SrcCyl daItem_c::m_cyl_src = { + { + {0, {{0, 0, 0}, {0xFFFFFFFF, 17}, 0x59}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {dCcD_SE_NONE, 0, 0, 0, {4}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 10.0f, + 50.0f, + }, }; /* 80453574-80453578 001B74 0004+00 1/1 0/0 0/0 .sdata2 @4067 */ @@ -534,6 +541,103 @@ SECTION_SDATA2 static f32 lit_4070[1 + 1 /* padding */] = { SECTION_SDATA2 static f64 lit_4072 = 4503599627370496.0 /* cast u32 to float */; /* 8015B3D8-8015B7BC 155D18 03E4+00 1/1 0/0 0/0 .text CreateInit__8daItem_cFv */ +// matches with literals +#ifdef NONMATCHING +void daItem_c::CreateInit() { + mAcchCir.SetWall(30.0f, 30.0f); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &mSpeed, NULL, NULL); + mAcch.ClrWaterNone(); + mAcch.ClrRoofNone(); + mAcch.SetWtrChkMode(2); + mAcch.SetWaterCheckOffset(10000.0f); + + mColStatus.Init(0, 0xFF, this); + mCollider.Set(m_cyl_src); + mCollider.SetStts(&mColStatus); + mCollider.SetCoHitCallback(itemGetCoCallBack); + mCollider.SetTgHitCallback(itemGetTgCallBack); + + f32 cylHeight = dItem_data::getH(m_itemNo); + f32 cylRadius = dItem_data::getR(m_itemNo); + + if (mScale.x > 1.0f) { + cylHeight *= mScale.x; + cylRadius *= mScale.x; + } + + mCollider.SetR(cylRadius); + mCollider.SetH(cylHeight); + + setCullInfo(); + + field_0x942 = getData().field_0x16; + field_0x944 = getData().field_0x18; + + procInitNormal(); + show(); + + field_0x930.setAll(1.0f); + + switch (daItem_prm::getType(this)) { + case 5: + hide(); + procInitBoomHitWait(); + break; + case 7: + procInitForceGet(); + break; + case 4: + procInitSimpleGetDemo(); + procMainSimpleGetDemo(); + break; + default: + case 6: + field_0x93c = daItem_prm::getSwitchNo(this); + if (field_0x93c != 0xFF && !i_fopAcM_isSwitch(this, field_0x93c)) { + hide(); + setFlag(8); + procInitSwOnWait(); + } + break; + } + + initAction(); + initBaseMtx(); + animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); + + if (m_itemNo == BOOMERANG) { + itemGetNextExecute(); + } else if ((m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) && + field_0x998.getEmitter() == NULL) { + dComIfGp_particle_set(0x0C14, &field_0x9ac, NULL, NULL, -1, &field_0x998, -1, NULL, NULL, + NULL); + } + + field_0x978.init(¤t.pos, 1); + + f32 old_speedF = mSpeedF; + cXyz old_speed = mSpeed; + + mAcch.CrrPos(dComIfG_Bgsp()); + + if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > orig.pos.y + 150.0f) { + field_0x9c0 = 1; + } + + if (daItem_prm::checkInWater(this) == true) { + field_0x9c0 = 1; + } + + mSpeedF = old_speedF; + mSpeed = old_speed; + + mAcch.ClrGroundLanding(); + mAcch.i_ClrGroundHit(); + mAcch.ClrWaterHit(); + mAcch.ClrWaterIn(); + mAcch.ClrWallHit(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -542,6 +646,7 @@ asm void daItem_c::CreateInit() { #include "asm/a/obj/d_a_obj_item/CreateInit__8daItem_cFv.s" } #pragma pop +#endif /* 8015B7BC-8015B7D4 1560FC 0018+00 1/1 0/0 0/0 .text setCullInfo__8daItem_cFv */ void daItem_c::setCullInfo() { @@ -668,7 +773,8 @@ int daItem_c::_daItem_create() { phase_state = dComIfG_resLoad(&mPhase, dItem_data::getFieldArc(m_itemNo)); if (phase_state == cPhs_COMPLEATE_e) { - if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckFieldItemCreateHeap, dItem_data::getFieldHeapSize(m_itemNo))) { + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckFieldItemCreateHeap, + dItem_data::getFieldHeapSize(m_itemNo))) { return cPhs_ERROR_e; } else { CreateInit(); @@ -713,7 +819,7 @@ SECTION_SDATA2 static f32 lit_4321 = 18.0f; int daItem_c::_daItem_execute() { field_0x950 = mSpeed; CountTimer(); - + mEyePos = current.pos; mEyePos.y += (f32)dItem_data::getH(m_itemNo) * 0.5f; @@ -750,7 +856,6 @@ int daItem_c::_daItem_execute() { daPy_getPlayerActorClass()->setHookshotCarryOffset(fopAcM_GetID(this), &carry_pos); } - animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); setBaseMtx(); field_0x978.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); @@ -910,7 +1015,8 @@ void daItem_c::procInitGetDemoEvent() { fopAcM_orderItemEvent(this, 0, 0); mEvtInfo.i_onCondition(8); - m_item_id = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), NULL, NULL); + m_item_id = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), + NULL, NULL); setStatus(3); } @@ -1203,7 +1309,8 @@ void daItem_c::itemGetNextExecute() { case ORANGE_RUPEE: case SILVER_RUPEE: case PACHINKO_SHOT: - if (daPy_getPlayerActorClass()->checkCanoeRide() || daPy_getPlayerActorClass()->checkHorseRide()) { + if (daPy_getPlayerActorClass()->checkCanoeRide() || + daPy_getPlayerActorClass()->checkHorseRide()) { if (checkItemGet(m_itemNo, 1)) { haveItem = true; } @@ -1306,7 +1413,7 @@ BOOL daItem_c::checkCountTimer() { if (i_dComIfGp_event_runCheck()) { count = false; } - + if (mStatus == 5 || fopAcM_checkHookCarryNow(this)) { count = false; } @@ -1578,8 +1685,7 @@ static asm void daItem_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_d_a_obj_item_cpp() { - nofralloc +asm void __sinit_d_a_obj_item_cpp(){nofralloc #include "asm/a/obj/d_a_obj_item/__sinit_d_a_obj_item_cpp.s" } #pragma pop diff --git a/src/d/bg/d_bg_pc.cpp b/src/d/bg/d_bg_pc.cpp index e90096b82f9..8b98f83b16e 100644 --- a/src/d/bg/d_bg_pc.cpp +++ b/src/d/bg/d_bg_pc.cpp @@ -1,6 +1,9 @@ +/** + * d_bg_pc.cpp + * + */ + #include "d/bg/d_bg_pc.h" -#include "dol2asm.h" -#include "dolphin/types.h" void dBgPc::setCode(sBgPc& code) { m_code = code; diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index 5c15f0b2963..d04cba9df7c 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -1048,27 +1048,6 @@ f32 dBgS_GetNY(cBgS_PolyInfo const& poly) { return pla.mNormal.y; } -/* ############################################################################################## */ -/* 803AB608-803AB61C 008728 0014+00 0/0 3/3 0/0 .data __vt__4dBgS */ -SECTION_DATA extern void* __vt__4dBgS[5] = { - (void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__4dBgSFv, - (void*)Ct__4dBgSFv, (void*)Dt__4dBgSFv, -}; - -/* 803AB61C-803AB630 00873C 0014+00 0/0 4/4 0/0 .data __vt__4cBgS */ -SECTION_DATA extern void* __vt__4cBgS[5] = { - (void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__4cBgSFv, - (void*)Ct__4cBgSFv, (void*)Dt__4cBgSFv, -}; - -/* 803AB630-803AB640 008750 0010+00 0/0 2/2 0/0 .data __vt__11cBgS_ChkElm */ -SECTION_DATA extern void* __vt__11cBgS_ChkElm[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11cBgS_ChkElmFv, - (void*)Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv, -}; - /* 80450F68-80450F70 000468 0008+00 0/0 1/1 0/0 .sbss None */ extern u8 data_80450F68[8]; u8 data_80450F68[8] ALIGN_DECL(8); diff --git a/src/d/bg/d_bg_s_chk.cpp b/src/d/bg/d_bg_s_chk.cpp index 79474f4054d..bc8251a5e41 100644 --- a/src/d/bg/d_bg_s_chk.cpp +++ b/src/d/bg/d_bg_s_chk.cpp @@ -1,56 +1,15 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_chk -// +/** + * d_bg_s_chk.cpp + * + */ #include "d/bg/d_bg_s_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward 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" static void func_80077574(); - -// -// External References: -// - -extern "C" void __ct__15dBgS_GrpPassChkFv(); -extern "C" void __dt__15dBgS_GrpPassChkFv(); -extern "C" void __ct__16dBgS_PolyPassChkFv(); -extern "C" void __dt__16dBgS_PolyPassChkFv(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803AB670-803AB688 008790 0018+00 2/2 0/0 0/0 .data __vt__8dBgS_Chk */ -SECTION_DATA extern void* __vt__8dBgS_Chk[6] = { - (void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__8dBgS_ChkFv, (void*)NULL, (void*)NULL, - (void*)func_80077574, -}; /* 8007749C-800774E8 071DDC 004C+00 0/0 6/6 0/0 .text __ct__8dBgS_ChkFv */ dBgS_Chk::dBgS_Chk() {} /* 800774E8-80077560 071E28 0078+00 2/1 6/6 0/0 .text __dt__8dBgS_ChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_Chk::~dBgS_Chk() { -extern "C" asm void __dt__8dBgS_ChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s" -} -#pragma pop +dBgS_Chk::~dBgS_Chk() {} /* 80077560-80077564 071EA0 0004+00 0/0 6/6 0/0 .text GetPolyPassChkInfo__8dBgS_ChkFv */ cBgS_PolyPassChk* dBgS_Chk::GetPolyPassChkInfo() { @@ -61,13 +20,3 @@ cBgS_PolyPassChk* dBgS_Chk::GetPolyPassChkInfo() { cBgS_GrpPassChk* dBgS_Chk::GetGrpPassChkInfo() { return this; } - -/* 80077574-8007757C 071EB4 0008+00 1/0 0/0 0/0 .text @16@__dt__8dBgS_ChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80077574() { - nofralloc -#include "asm/d/bg/d_bg_s_chk/func_80077574.s" -} -#pragma pop diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp index 90ee3982d9f..09f479d0837 100644 --- a/src/d/bg/d_bg_s_movebg_actor.cpp +++ b/src/d/bg/d_bg_s_movebg_actor.cpp @@ -56,21 +56,6 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; // Declarations: // -/* ############################################################################################## */ -/* 803AB9A0-803AB9C8 008AC0 0028+00 1/1 0/0 34/34 .data __vt__16dBgS_MoveBgActor */ -SECTION_DATA extern void* __vt__16dBgS_MoveBgActor[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__16dBgS_MoveBgActorFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__16dBgS_MoveBgActorFPPA3_A4_f, - (void*)Draw__16dBgS_MoveBgActorFv, - (void*)Delete__16dBgS_MoveBgActorFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - /* 80078624-80078668 072F64 0044+00 0/0 0/0 173/173 .text __ct__16dBgS_MoveBgActorFv */ dBgS_MoveBgActor::dBgS_MoveBgActor() { field_0x568 = NULL; diff --git a/src/d/bg/d_bg_s_roof_chk.cpp b/src/d/bg/d_bg_s_roof_chk.cpp index fb4e37b0c8e..2a0387ec655 100644 --- a/src/d/bg/d_bg_s_roof_chk.cpp +++ b/src/d/bg/d_bg_s_roof_chk.cpp @@ -1,58 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_roof_chk -// +/** + * d_bg_s_roof_chk.cpp + * + */ #include "d/bg/d_bg_s_roof_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__12dBgS_RoofChkFv(); -extern "C" void __dt__12dBgS_RoofChkFv(); -extern "C" void Init__12dBgS_RoofChkFv(); -extern "C" static void func_8007914C(); -extern "C" static void func_80079154(); -extern "C" static void func_8007915C(); - -// -// 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 __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ClearPi__13cBgS_PolyInfoFv(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803ABA50-803ABA80 008B70 0030+00 2/2 0/0 0/0 .data __vt__12dBgS_RoofChk */ -SECTION_DATA extern void* __vt__12dBgS_RoofChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_RoofChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_8007914C, - (void*)NULL, - (void*)NULL, - (void*)func_8007915C, - (void*)NULL, - (void*)NULL, - (void*)func_80079154, -}; /* 80078FF4-80079090 073934 009C+00 0/0 10/10 1/1 .text __ct__12dBgS_RoofChkFv */ dBgS_RoofChk::dBgS_RoofChk() { @@ -66,48 +17,10 @@ dBgS_RoofChk::dBgS_RoofChk() { } /* 80079090-80079124 0739D0 0094+00 4/3 11/11 1/1 .text __dt__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_RoofChk::~dBgS_RoofChk() { -extern "C" asm void __dt__12dBgS_RoofChkFv() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s" -} -#pragma pop +dBgS_RoofChk::~dBgS_RoofChk() {} /* 80079124-8007914C 073A64 0028+00 0/0 1/1 0/0 .text Init__12dBgS_RoofChkFv */ void dBgS_RoofChk::Init() { SetNowY(1000000000.0f); ClearPi(); } - -/* 8007914C-80079154 073A8C 0008+00 1/0 0/0 0/0 .text @16@__dt__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007914C() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/func_8007914C.s" -} -#pragma pop - -/* 80079154-8007915C 073A94 0008+00 1/0 0/0 0/0 .text @52@__dt__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80079154() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/func_80079154.s" -} -#pragma pop - -/* 8007915C-80079164 073A9C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8007915C() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/func_8007915C.s" -} -#pragma pop diff --git a/src/d/bg/d_bg_s_sph_chk.cpp b/src/d/bg/d_bg_s_sph_chk.cpp index a79529cc430..e92a7e70d00 100644 --- a/src/d/bg/d_bg_s_sph_chk.cpp +++ b/src/d/bg/d_bg_s_sph_chk.cpp @@ -1,64 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_sph_chk -// +/** + * d_bg_s_sph_chk.cpp + * + */ #include "d/bg/d_bg_s_sph_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__11dBgS_SphChkFv(); -extern "C" void __dt__11dBgS_SphChkFv(); -extern "C" static void func_80078B70(); -extern "C" static void func_80078B78(); -extern "C" static void func_80078B80(); -extern "C" static void func_80078B88(); - -// -// 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 __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ClearPi__13cBgS_PolyInfoFv(); -extern "C" void __dl__FPv(); -extern "C" extern void* __vt__8cM3dGSph[3]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803AB9C8-803ABA08 008AE8 003C+04 2/2 0/0 0/0 .data __vt__11dBgS_SphChk */ -SECTION_DATA extern void* __vt__11dBgS_SphChk[15 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11dBgS_SphChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80078B70, - (void*)NULL, - (void*)NULL, - (void*)func_80078B78, - (void*)NULL, - (void*)NULL, - (void*)func_80078B88, - (void*)NULL, - (void*)NULL, - (void*)func_80078B80, - /* padding */ - NULL, -}; /* 80078A14-80078AC0 073354 00AC+00 0/0 1/1 1/1 .text __ct__11dBgS_SphChkFv */ dBgS_SphChk::dBgS_SphChk() { @@ -71,43 +16,3 @@ dBgS_SphChk::dBgS_SphChk() { /* 80078AC0-80078B70 073400 00B0+00 5/4 2/2 0/0 .text __dt__11dBgS_SphChkFv */ dBgS_SphChk::~dBgS_SphChk() {} - -/* 80078B70-80078B78 0734B0 0008+00 1/0 0/0 0/0 .text @20@__dt__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078B70() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/func_80078B70.s" -} -#pragma pop - -/* 80078B78-80078B80 0734B8 0008+00 1/0 0/0 0/0 .text @36@__dt__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078B78() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/func_80078B78.s" -} -#pragma pop - -/* 80078B80-80078B88 0734C0 0008+00 1/0 0/0 0/0 .text @72@__dt__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078B80() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/func_80078B80.s" -} -#pragma pop - -/* 80078B88-80078B90 0734C8 0008+00 1/0 0/0 0/0 .text @56@__dt__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078B88() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/func_80078B88.s" -} -#pragma pop 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 68900a8c794..aed701f8a15 100644 --- a/src/d/bg/d_bg_s_spl_grp_chk.cpp +++ b/src/d/bg/d_bg_s_spl_grp_chk.cpp @@ -1,42 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_spl_grp_chk -// +/** + * d_bg_s_spl_grp_chk.cpp + * + */ #include "d/bg/d_bg_s_spl_grp_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void Set__14dBgS_SplGrpChkFR4cXyzf(); -extern "C" void __ct__14dBgS_SplGrpChkFv(); -extern "C" void __dt__14dBgS_SplGrpChkFv(); -extern "C" void Init__14dBgS_SplGrpChkFv(); -extern "C" static void func_80078D4C(); -extern "C" static void func_80078D54(); -extern "C" static void func_80078D5C(); - -// -// 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 __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ClearPi__13cBgS_PolyInfoFv(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// /* 80078B90-80078BB0 0734D0 0020+00 0/0 2/2 3/3 .text Set__14dBgS_SplGrpChkFR4cXyzf */ void dBgS_SplGrpChk::Set(cXyz& ground, f32 roof) { @@ -44,23 +11,6 @@ void dBgS_SplGrpChk::Set(cXyz& ground, f32 roof) { m_roof = roof; } -/* ############################################################################################## */ -/* 803ABA08-803ABA38 008B28 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_SplGrpChk */ -SECTION_DATA extern void* __vt__14dBgS_SplGrpChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14dBgS_SplGrpChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80078D4C, - (void*)NULL, - (void*)NULL, - (void*)func_80078D5C, - (void*)NULL, - (void*)NULL, - (void*)func_80078D54, -}; - /* 80078BB0-80078C78 0734F0 00C8+00 0/0 1/1 0/0 .text __ct__14dBgS_SplGrpChkFv */ dBgS_SplGrpChk::dBgS_SplGrpChk() { SetPolyPassChk(GetPolyPassChkInfo()); @@ -88,33 +38,3 @@ void dBgS_SplGrpChk::Init() { SetHeight(GetPosP().y); ClearPi(); } - -/* 80078D4C-80078D54 07368C 0008+00 1/0 0/0 0/0 .text @16@__dt__14dBgS_SplGrpChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078D4C() { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s" -} -#pragma pop - -/* 80078D54-80078D5C 073694 0008+00 1/0 0/0 0/0 .text @52@__dt__14dBgS_SplGrpChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078D54() { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s" -} -#pragma pop - -/* 80078D5C-80078D64 07369C 0008+00 1/0 0/0 0/0 .text @36@__dt__14dBgS_SplGrpChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80078D5C() { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s" -} -#pragma pop diff --git a/src/d/bg/d_bg_s_wtr_chk.cpp b/src/d/bg/d_bg_s_wtr_chk.cpp index 499179c8abd..6e1c83835d8 100644 --- a/src/d/bg/d_bg_s_wtr_chk.cpp +++ b/src/d/bg/d_bg_s_wtr_chk.cpp @@ -1,6 +1,9 @@ +/** + * d_bg_s_wtr_chk.cpp + * + */ + #include "d/bg/d_bg_s_wtr_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" dBgS_WtrChk::dBgS_WtrChk() { OnWaterGrp(); diff --git a/src/d/bg/d_bg_w_base.cpp b/src/d/bg/d_bg_w_base.cpp index 050a7cdd63b..28b72cda0ab 100644 --- a/src/d/bg/d_bg_w_base.cpp +++ b/src/d/bg/d_bg_w_base.cpp @@ -1,128 +1,17 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_w_base -// +/** + * d_bg_w_base.cpp + * + */ #include "d/bg/d_bg_w_base.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__9dBgW_BaseFv(); -extern "C" void __dt__9cBgW_BgIdFv(); -extern "C" void __dt__9dBgW_BaseFv(); -extern "C" void ClrDBgWBase__9dBgW_BaseFv(); -extern "C" bool ChkMemoryError__9dBgW_BaseFv(); -extern "C" void CallRideCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" void CallArrowStickCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_cR4cXyz(); -extern "C" void CalcDiffShapeAngleY__9dBgW_BaseFs(); - -// -// External References: -// - -extern "C" void SetOldShapeAngleY__9dBgW_BaseFs(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803ABCC8-803ABDB8 008DE8 00F0+00 2/2 0/0 0/0 .data __vt__9dBgW_Base */ -SECTION_DATA extern void* __vt__9dBgW_Base[60] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9dBgW_BaseFv, - (void*)ChkMemoryError__9dBgW_BaseFv, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)SetOldShapeAngleY__9dBgW_BaseFs, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)CallRideCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_c, - (void*)CallArrowStickCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_cR4cXyz, -}; - -/* 803ABDB8-803ABDC8 008ED8 000C+04 3/3 0/0 0/0 .data __vt__9cBgW_BgId */ -SECTION_DATA extern void* __vt__9cBgW_BgId[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9cBgW_BgIdFv, - /* padding */ - NULL, -}; /* 8007E5A8-8007E5F8 078EE8 0050+00 0/0 2/2 0/0 .text __ct__9dBgW_BaseFv */ dBgW_Base::dBgW_Base() { ClrDBgWBase(); } -/* 8007E5F8-8007E640 078F38 0048+00 1/0 0/0 0/0 .text __dt__9cBgW_BgIdFv */ -cBgW_BgId::~cBgW_BgId() {} - /* 8007E640-8007E69C 078F80 005C+00 1/0 2/2 0/0 .text __dt__9dBgW_BaseFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgW_Base::~dBgW_Base() { -extern "C" asm void __dt__9dBgW_BaseFv() { - nofralloc -#include "asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s" -} -#pragma pop +dBgW_Base::~dBgW_Base() {} /* 8007E69C-8007E6D0 078FDC 0034+00 1/1 1/1 0/0 .text ClrDBgWBase__9dBgW_BaseFv */ void dBgW_Base::ClrDBgWBase() { diff --git a/src/d/cc/d_cc_mass_s.cpp b/src/d/cc/d_cc_mass_s.cpp index ef0b179a287..95c93417f1f 100644 --- a/src/d/cc/d_cc_mass_s.cpp +++ b/src/d/cc/d_cc_mass_s.cpp @@ -1,13 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: d/cc/d_cc_mass_s -// +/** + * d_cc_mass_s.cpp + * + */ #include "d/cc/d_cc_mass_s.h" #include "SSystem/SComponent/c_math.h" #include "d/cc/d_cc_d.h" -#include "dol2asm.h" -#include "dolphin/types.h" /* 800852E0-800852F0 07FC20 0010+00 1/1 0/0 0/0 .text * Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v */ @@ -156,7 +154,8 @@ u32 dCcMassS_Mng::Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitI cCcD_ShapeAttr* objShape = obj->GetShapeAttr(); cXyz unusedVec; if (obj->ChkAtSet() && !gobjInf->ChkAtNoMass() && - mCylAttr.CrossAtTg(*objShape, &unusedVec) && (field_0x200 & 1)) { + mCylAttr.CrossAtTg(*objShape, &unusedVec) && (field_0x200 & 1)) + { flagsMaybe |= 1; *p_actor = obj->GetStts()->GetAc(); if (p_hitInf != NULL) { diff --git a/src/d/cc/d_cc_s.cpp b/src/d/cc/d_cc_s.cpp index 59beb302388..3d5095e9ed9 100644 --- a/src/d/cc/d_cc_s.cpp +++ b/src/d/cc/d_cc_s.cpp @@ -1,12 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d/cc/d_cc_s -// +/** + * d_cc_s.cpp + * + */ #include "d/cc/d_cc_s.h" +#include "JSystem/JMath/JMath.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "dolphin/types.h" // // Forward References: @@ -111,38 +111,94 @@ void dCcS::Dt() { cCcS::Dt(); } -/* ############################################################################################## */ -/* 80452778-8045277C 000D78 0004+00 3/3 0/0 0/0 .sdata2 @3705 */ -SECTION_SDATA2 static u8 lit_3705[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 80085F28-800860F8 080868 01D0+00 1/1 0/0 0/0 .text * ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::ChkShieldFrontRange(cCcD_Obj* param_0, cCcD_Obj* param_1, int param_2, - cXyz const* param_3) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz.s" +bool dCcS::ChkShieldFrontRange(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, int param_2, + cXyz const* i_hitPos) { + dCcD_GObjInf* atObj = (dCcD_GObjInf*)i_atObj->GetGObjInf(); + if (atObj == NULL) { + return false; + } + + dCcD_GObjInf* tgObj = (dCcD_GObjInf*)i_tgObj->GetGObjInf(); + if (tgObj == NULL) { + return false; + } + + fopAc_ac_c* tgActor = tgObj->GetAc(); + if (tgActor == NULL) { + return false; + } + + csXyz sp10; + CalcParticleAngle(atObj, i_atObj->GetStts(), i_tgObj->GetStts(), &sp10); + + if (param_2 != 0) { + dJntCol_c* jntcol = fopAcM_GetJntCol(tgActor); + + if (jntcol != NULL) { + cXyz pos; + csXyz angle; + + int temp_r3 = jntcol->getHitmarkPosAndAngle(i_hitPos, &sp10, &pos, &angle, 0); + + if (temp_r3 >= 0 && jntcol->checkShieldType(temp_r3)) { + cXyz sp18; + mDoMtx_stack_c::ZXYrotS(sp10); + mDoMtx_stack_c::multVecSR(&cXyz::BaseZ, &sp18); + mDoMtx_stack_c::ZXYrotS(angle); + mDoMtx_stack_c::multVecSR(&cXyz::BaseZ, &pos); + + if (pos.inprod(sp18) > 0.0f) { + return true; + } else { + return false; + } + } + + return false; + } + } + + s16 var_r4; + if (tgObj->GetTgShieldFrontRangeYAngle() != NULL) { + var_r4 = *tgObj->GetTgShieldFrontRangeYAngle(); + } else { + var_r4 = fopAcM_GetShapeAngle_p(tgActor).y; + } + + s16 shield_range = tgObj->GetTgShieldRange(); + if (param_2 != 0) { + shield_range >>= 1; + } + + if (cLib_distanceAngleS(sp10.y - -0x8000, var_r4) > shield_range) { + return false; + } + + return true; } -#pragma pop /* 800860F8-800861B0 080A38 00B8+00 1/1 0/0 0/0 .text * ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::ChkShield(cCcD_Obj* param_0, cCcD_Obj* param_1, dCcD_GObjInf* param_2, - dCcD_GObjInf* param_3, cXyz const* param_4) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz.s" +bool dCcS::ChkShield(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, dCcD_GObjInf* i_atObjInf, + dCcD_GObjInf* i_tgObjInf, cXyz const* i_hitPos) { + if (i_atObjInf->ChkAtNoGuard()) { + return false; + } + + if (i_tgObjInf->ChkTgShield() || i_tgObjInf->ChkTgSpShield() || + (i_tgObjInf->ChkTgSmallShield() && i_atObjInf->GetAtSpl() == 8)) + { + if (i_tgObjInf->ChkTgShieldFrontRange()) { + return ChkShieldFrontRange(i_atObj, i_tgObj, !i_tgObjInf->ChkTgShield(), i_hitPos); + } + + return true; + } + + return false; } -#pragma pop /* 800861B0-800861B4 080AF0 0004+00 1/0 0/0 0/0 .text * CalcTgPlusDmg__4dCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts */ @@ -154,20 +210,81 @@ void dCcS::CalcTgPlusDmg(cCcD_Obj* param_0, cCcD_Obj* param_1, cCcD_Stts* param_ /* 800861B4-80086240 080AF4 008C+00 1/0 0/0 0/0 .text * ChkAtTgHitAfterCross__4dCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dCcS::ChkAtTgHitAfterCross(bool param_0, bool param_1, cCcD_GObjInf const* param_2, - cCcD_GObjInf const* param_3, cCcD_Stts* param_4, - cCcD_Stts* param_5, cCcD_GStts* param_6, cCcD_GStts* param_7) { - nofralloc -#include "asm/d/cc/d_cc_s/func_800861B4.s" +bool dCcS::ChkAtTgHitAfterCross(bool i_setAt, bool i_setTg, cCcD_GObjInf const* i_atObjInf, + cCcD_GObjInf const* i_tgObjInf, cCcD_Stts* param_4, + cCcD_Stts* param_5, cCcD_GStts* param_6, cCcD_GStts* param_7) { + dCcD_GObjInf* atObjInf = (dCcD_GObjInf*)i_atObjInf; + dCcD_GObjInf* tgObjInf = (dCcD_GObjInf*)i_tgObjInf; + + u32 tgApid = param_4->GetApid(); + u32 atApid = param_5->GetApid(); + + if (i_setAt) { + static_cast(param_6)->SetAtApid(atApid); + + if (atObjInf->ChkAtNoConHit() && !tgObjInf->ChkTgStopNoConHit()) { + if (static_cast(param_6)->GetAtOldApid() == param_5->GetApid()) { + return true; + } + } + } + + if (i_setTg) { + static_cast(param_7)->SetTgApid(tgApid); + + if (tgObjInf->ChkTgNoConHit() && !atObjInf->ChkAtStopNoConHit()) { + if (static_cast(param_7)->GetTgOldApid() == param_4->GetApid()) { + return true; + } + } + } + + return false; } -#pragma pop /* 80086240-80086360 080B80 0120+00 1/0 0/0 0/0 .text * SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts */ +// weird reg alloc +#ifdef NONMATCHING +void dCcS::SetCoGObjInf(bool param_0, bool param_1, cCcD_GObjInf* param_2, cCcD_GObjInf* param_3, + cCcD_Stts* param_4, cCcD_Stts* param_5, cCcD_GStts* param_6, + cCcD_GStts* param_7) { + if (param_0) { + static_cast(param_2)->SetCoHitApid(param_5->GetApid()); + + if (static_cast(param_7)->ChkNoActor()) { + static_cast(param_2)->OnCoHitNoActor(); + } + } + + if (param_1) { + static_cast(param_3)->SetCoHitApid(param_4->GetApid()); + + if (static_cast(param_6)->ChkNoActor()) { + static_cast(param_3)->OnCoHitNoActor(); + } + } + + if (param_0) { + dCcD_HitCallback cb = static_cast(param_2)->GetCoHitCallback(); + + if (cb != NULL) { + cb(param_2->GetAc(), static_cast(param_2), param_3->GetAc(), + static_cast(param_3)); + } + } + + if (param_1) { + dCcD_HitCallback cb = static_cast(param_3)->GetCoHitCallback(); + + if (cb != NULL) { + cb(param_3->GetAc(), static_cast(param_3), param_2->GetAc(), + static_cast(param_2)); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -178,16 +295,52 @@ asm void dCcS::SetCoGObjInf(bool param_0, bool param_1, cCcD_GObjInf* param_2, #include "asm/d/cc/d_cc_s/SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts.s" } #pragma pop +#endif /* 80086360-80086404 080CA0 00A4+00 1/1 0/0 0/0 .text GetRank__4dCcSFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::GetRank(u8 param_0) { - nofralloc -#include "asm/d/cc/d_cc_s/GetRank__4dCcSFUc.s" +int dCcS::GetRank(u8 weight) { + if (weight == 255) { + return 10; + } + + if (weight == 254) { + return 9; + } + + if (weight >= 217) { + return 8; + } + + if (weight >= 181) { + return 7; + } + + if (weight >= 145) { + return 6; + } + + if (weight >= 109) { + return 5; + } + + if (weight >= 73) { + return 4; + } + + if (weight >= 37) { + return 3; + } + + if (weight >= 2) { + return 2; + } + + if (weight == 1) { + return 1; + } + + return 0; } -#pragma pop /* 80086404-8008640C 080D44 0008+00 1/0 0/0 0/0 .text ChkNoHitGCo__4dCcSFP8cCcD_ObjP8cCcD_Obj */ bool dCcS::ChkNoHitGCo(cCcD_Obj* param_0, cCcD_Obj* param_1) { @@ -196,174 +349,208 @@ bool dCcS::ChkNoHitGCo(cCcD_Obj* param_0, cCcD_Obj* param_1) { /* ############################################################################################## */ /* 803AC328-803AC3A4 009448 0079+03 1/1 0/0 0/0 .data rank_tbl */ -SECTION_DATA static u8 rank_tbl[121 + 3 /* padding */] = { - 0x00, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x32, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x19, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x4B, - 0x5A, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x4B, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x0A, - 0x19, - 0x32, - 0x64, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x32, - 0x64, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, +static u8 rank_tbl[11][11] = { + 0x00, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x00, 0x32, 0x64, 0x64, 0x64, + 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x32, 0x4B, 0x5A, 0x64, 0x64, 0x64, 0x64, 0x64, + 0x64, 0x00, 0x00, 0x19, 0x32, 0x4B, 0x5A, 0x64, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x0A, 0x19, + 0x32, 0x4B, 0x5A, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x00, 0x0A, 0x19, 0x32, 0x4B, 0x5A, 0x64, + 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x19, 0x32, 0x4B, 0x5A, 0x64, 0x64, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0A, 0x19, 0x32, 0x4B, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x19, + 0x32, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x64, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 8045277C-80452780 000D7C 0004+00 1/1 0/0 0/0 .sdata2 @3924 */ -SECTION_SDATA2 static f32 lit_3924 = 1.0f / 100.0f; - -/* 80452780-80452788 000D80 0004+04 2/2 0/0 0/0 .sdata2 @3925 */ -SECTION_SDATA2 static f32 lit_3925[1 + 1 /* padding */] = { - -1.0f, - /* padding */ - 0.0f, -}; - -/* 80452788-80452790 000D88 0008+00 1/1 0/0 0/0 .sdata2 @3927 */ -SECTION_SDATA2 static f64 lit_3927 = 4503599627370496.0 /* cast u32 to float */; - /* 8008640C-80086754 080D4C 0348+00 1/0 0/0 0/0 .text * SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::SetPosCorrect(cCcD_Obj* param_0, cXyz* param_1, cCcD_Obj* param_2, cXyz* param_3, - f32 param_4) { - nofralloc -#include "asm/d/cc/d_cc_s/SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s" +void dCcS::SetPosCorrect(cCcD_Obj* param_0, cXyz* param_1, cCcD_Obj* param_2, cXyz* param_3, + f32 param_4) { + if (param_0->ChkCoNoCrr() || param_2->ChkCoNoCrr()) { + return; + } + + if (param_0->GetStts() == NULL || param_2->GetStts() == NULL) { + return; + } + + if (cM3d_IsZero(param_4)) { + return; + } + + SetCoGCorrectProc(param_0, param_2); + + bool bvar2 = false; + if (param_0->ChkCoSph3DCrr() && param_2->ChkCoSph3DCrr()) { + bvar2 = true; + } + + if ((param_0->GetStts()->GetWeightUc() == 0 && param_2->GetStts()->GetWeightUc() == 0) || + (param_0->GetStts()->GetWeightUc() == 0xFF && param_2->GetStts()->GetWeightUc() == 0xFF)) + { + return; + } + + int weight1 = GetRank(param_0->GetStts()->GetWeightUc()); + int weight2 = GetRank(param_2->GetStts()->GetWeightUc()); + u8 rank = rank_tbl[weight1][weight2]; + + f32 fvar1 = rank * 0.01f; + f32 fvar2 = (u8)(100 - rank) * 0.01f; + + cXyz local_b0; + cXyz local_bc; + Vec local_c8; + + f32 fvar14; + if (bvar2) { + PSVECSubtract(param_3, param_1, &local_c8); + fvar14 = PSVECMag(&local_c8); + } else { + local_c8.x = param_3->x - param_1->x; + local_c8.y = 0.0f; + local_c8.z = param_3->z - param_1->z; + fvar14 = JMAFastSqrt((local_c8.x * local_c8.x) + (local_c8.z * local_c8.z)); + } + + if (!cM3d_IsZero(fvar14)) { + if (bvar2) { + PSVECScale(&local_c8, &local_c8, param_4 / fvar14); + fvar1 *= -1.0f; + PSVECScale(&local_c8, &local_b0, fvar1); + PSVECScale(&local_c8, &local_bc, fvar2); + } else { + fvar14 = param_4 / fvar14; + local_c8.x *= fvar14; + local_c8.z *= fvar14; + + local_b0.x = -local_c8.x * fvar1; + local_b0.y = 0.0f; + local_b0.z = -local_c8.z * fvar1; + + local_bc.x = local_c8.x * fvar2; + local_bc.y = 0.0f; + local_bc.z = local_c8.z * fvar2; + } + } else { + local_b0.y = 0.0f; + local_b0.z = 0.0f; + local_bc.y = 0.0f; + local_bc.z = 0.0f; + + if (!cM3d_IsZero(param_4)) { + local_b0.x = -param_4 * fvar1; + local_bc.x = param_4 * fvar2; + } else { + local_b0.x = -fvar1; + local_bc.x = fvar2; + } + } + + param_0->GetStts()->PlusCcMove(local_b0.x, local_b0.y, local_b0.z); + param_2->GetStts()->PlusCcMove(local_bc.x, local_bc.y, local_bc.z); + *param_1 += local_b0; + *param_3 += local_bc; } -#pragma pop /* 80086754-8008685C 081094 0108+00 1/0 0/0 0/0 .text * CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::CalcParticleAngle(dCcD_GObjInf* param_0, cCcD_Stts* param_1, cCcD_Stts* param_2, - csXyz* param_3) { - nofralloc -#include "asm/d/cc/d_cc_s/CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz.s" +void dCcS::CalcParticleAngle(dCcD_GObjInf* i_atObjInf, cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts, + csXyz* o_angle) { + cXyz vec(*i_atObjInf->GetAtVecP()); + + if (cM3d_IsZero(PSVECMag(&vec))) { + fopAc_ac_c* atActor = i_atStts->GetActor(); + fopAc_ac_c* tgActor = i_tgStts->GetActor(); + + if (atActor == NULL || tgActor == NULL) { + vec.z = 0.0f; + vec.x = 0.0f; + vec.y = -1.0f; + } else { + PSVECSubtract(&tgActor->current.pos, &atActor->current.pos, &vec); + + if (cM3d_IsZero(PSVECMag(&vec))) { + vec.z = 0.0f; + vec.x = 0.0f; + vec.y = -1.0f; + } else { + PSVECNormalize(&vec, &vec); + } + } + } else { + PSVECNormalize(&vec, &vec); + } + + cM3d_CalcVecZAngle(vec, o_angle); } -#pragma pop /* 8008685C-80086AC0 08119C 0264+00 1/1 0/0 0/0 .text * ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb */ +// one branch issue +#ifdef NONMATCHING +void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Obj* param_3, + dCcD_GObjInf* i_atObjInf, dCcD_GObjInf* i_tgObjInf, cCcD_Stts* param_6, + cCcD_Stts* param_7, dCcD_GStts* param_8, dCcD_GStts* param_9, + cXyz* i_hitPos, bool i_chkShield) { + if (!i_atObjInf->ChkAtNoHitMark() && !i_tgObjInf->ChkTgNoHitMark() && + (i_atObjInf->GetAtType() != AT_TYPE_10000000 || i_tgObjInf->GetAc() == NULL || + fopAcM_checkStatus(i_tgObjInf->GetAc(), AT_TYPE_10000000))) + { + if ((i_atObjInf->GetAtType() & + (AT_TYPE_WOLF_ATTACK | AT_TYPE_WOLF_CUT_TURN | AT_TYPE_10000000 | AT_TYPE_MIDNA_LOCK | + AT_TYPE_HOOKSHOT | AT_TYPE_SHIELD_ATTACK | AT_TYPE_NORMAL_SWORD)) == 0 || + i_tgObjInf->GetTgSpl() == 1) + { + return; + } + + if ((i_atObjInf->GetAtType() != AT_TYPE_HOOKSHOT || + !i_tgObjInf->ChkTgHookShotNoHitMark()) && + (i_atObjInf->GetAtType() != AT_TYPE_ARROW || !i_tgObjInf->ChkTgArrowNoHitMark()) && + param_9->ChkNoneActorPerfTblId()) + { + if (!i_chkShield) { + if ((i_atObjInf->GetAtHitMark() != 0 || i_tgObjInf->GetTgHitMark() == 8) && + (i_atObjInf->GetAtHitMark() != 4 || i_tgObjInf->GetTgHitMark() != 4)) + { + csXyz sp10; + CalcParticleAngle(i_atObjInf, param_6, param_7, &sp10); + + if (i_tgObjInf->GetTgHitMark() == 5 || i_tgObjInf->GetTgHitMark() == 8) { + u32 atType = i_atObjInf->GetAtType(); + fopAc_ac_c* ac = i_tgObjInf->GetAc(); + + i_dComIfGp_setHitMark(2, ac, i_hitPos, &sp10, NULL, atType); + } else { + u16 hitmark; + if (i_tgObjInf->GetTgHitMark() == 3) { + hitmark = 3; + } else { + hitmark = i_atObjInf->GetAtHitMark(); + } + + if ((hitmark != 1 && hitmark != 3) || i_atObjInf->GetAtAtp() != 0) { + u32 atType = i_atObjInf->GetAtType(); + fopAc_ac_c* ac = i_tgObjInf->GetAc(); + + i_dComIfGp_setHitMark(hitmark, ac, i_hitPos, &sp10, NULL, atType); + } + } + } + } else if (i_tgObjInf->GetTgHitMark() != 0) { + csXyz sp8; + CalcParticleAngle(i_atObjInf, param_6, param_7, &sp8); + + u32 atType = i_atObjInf->GetAtType(); + fopAc_ac_c* ac = i_tgObjInf->GetAc(); + u16 hitmark = i_tgObjInf->GetTgHitMark(); + + i_dComIfGp_setHitMark(hitmark, ac, i_hitPos, &sp8, NULL, atType); + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -375,74 +562,179 @@ asm void dCcS::ProcAtTgHitmark(bool param_0, bool param_1, cCcD_Obj* param_2, cC #include "asm/d/cc/d_cc_s/func_8008685C.s" } #pragma pop +#endif /* 80086AC0-80086D8C 081400 02CC+00 1/0 0/0 0/0 .text * SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::SetAtTgGObjInf(bool param_0, bool param_1, cCcD_Obj* param_2, cCcD_Obj* param_3, - cCcD_GObjInf* param_4, cCcD_GObjInf* param_5, cCcD_Stts* param_6, - cCcD_Stts* param_7, cCcD_GStts* param_8, cCcD_GStts* param_9, - cXyz* param_10) { - nofralloc -#include "asm/d/cc/d_cc_s/func_80086AC0.s" +void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Obj* param_3, + cCcD_GObjInf* i_atObjInf, cCcD_GObjInf* i_tgObjInf, cCcD_Stts* param_6, + cCcD_Stts* param_7, cCcD_GStts* param_8, cCcD_GStts* param_9, + cXyz* i_hitPos) { + dCcD_GObjInf* atObjInf = (dCcD_GObjInf*)i_atObjInf; + dCcD_GObjInf* tgObjInf = (dCcD_GObjInf*)i_tgObjInf; + dCcD_GStts* stts1 = (dCcD_GStts*)param_8; + dCcD_GStts* stts2 = (dCcD_GStts*)param_9; + + bool chk_shield = ChkShield(param_2, param_3, atObjInf, tgObjInf, i_hitPos); + + if (i_setAt) { + atObjInf->SetAtHitPos(*i_hitPos); + atObjInf->SetAtRVec(*tgObjInf->GetTgVecP()); + + if (stts1 != NULL && stts1->GetTgSpl() == 0) { + stts1->SetTgSpl(tgObjInf->GetTgSpl()); + } + + atObjInf->SetAtHitApid(param_7->GetApid()); + + if (chk_shield || tgObjInf->GetTgHitMark() == 8 && atObjInf->GetAtMtrl() != 2 && + (atObjInf->GetAtSpl() == 0 || atObjInf->GetAtSpl() == 5 || + atObjInf->GetAtSpl() == 8)) + { + atObjInf->OnAtShieldHit(); + } + + if (stts2->ChkNoActor()) { + atObjInf->OnAtHitNoActor(); + } + } + + if (i_setTg) { + tgObjInf->SetTgHitPos(*i_hitPos); + tgObjInf->SetTgRVec(*atObjInf->GetAtVecP()); + + if (stts2 != NULL && stts1->GetAtSpl() == 0) { + stts2->SetAtSpl(atObjInf->GetAtSpl()); + } + + tgObjInf->SetTgHitApid(param_6->GetApid()); + + if (chk_shield) { + tgObjInf->OnTgShieldHit(); + } else { + param_7->PlusDmg(param_2->GetAtAtp()); + } + + if (stts1->ChkNoActor()) { + tgObjInf->OnTgHitNoActor(); + } + } + + if (i_setAt) { + dCcD_HitCallback cb = atObjInf->GetAtHitCallback(); + + if (cb != NULL) { + cb(atObjInf->GetAc(), atObjInf, tgObjInf->GetAc(), tgObjInf); + } + } + + if (i_setTg) { + dCcD_HitCallback cb = tgObjInf->GetTgHitCallback(); + + if (cb != NULL) { + cb(tgObjInf->GetAc(), tgObjInf, atObjInf->GetAc(), atObjInf); + } + } + + if (i_setAt && i_setTg && (!atObjInf->ChkAtEffCounter() || !tgObjInf->ChkTgEffCounter())) { + atObjInf->SetAtEffCounterTimer(); + tgObjInf->SetTgEffCounterTimer(); + + ProcAtTgHitmark(i_setAt, i_setTg, param_2, param_3, atObjInf, tgObjInf, param_6, param_7, + stts1, stts2, i_hitPos, chk_shield); + } } -#pragma pop /* 80086D8C-80086FBC 0816CC 0230+00 0/0 2/2 0/0 .text * ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::ChkCamera(cXyz& param_0, cXyz& param_1, f32 param_2, fopAc_ac_c* param_3, - fopAc_ac_c* param_4, fopAc_ac_c* param_5) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c.s" -} -#pragma pop +bool dCcS::ChkCamera(cXyz& param_0, cXyz& param_1, f32 param_2, fopAc_ac_c* param_3, + fopAc_ac_c* param_4, fopAc_ac_c* param_5) { + if (mObjCoCount == 0) { + return false; + } -/* ############################################################################################## */ -/* 80452790-80452798 000D90 0004+04 1/1 0/0 0/0 .sdata2 @4336 */ -SECTION_SDATA2 static f32 lit_4336[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; + cCcD_Obj** temp_r29 = &mpObjCo[mObjCoCount]; + + cCcD_CpsAttr sp48; + sp48.Set(param_0, param_1, param_2); + sp48.CalcAabBox(); + + cCcD_DivideInfo sp18; + f32 sp14; + mDivideArea.CalcDivideInfoOverArea(&sp18, sp48.GetWorkAab()); + + for (cCcD_Obj** i = mpObjCo; i < temp_r29; i++) { + if ((*i)->ChkCoSet() && (*i)->GetAc() != param_3 && (*i)->GetAc() != param_4 && + (*i)->GetAc() != param_5) + { + if ((*i)->GetPDivideInfo()->Chk(sp18)) { + dCcD_GObjInf* obj = (dCcD_GObjInf*)(*i)->GetGObjInf(); + + if (obj == NULL || !obj->ChkCoNoCamHit()) { + cCcD_ShapeAttr* shapeAttr = (*i)->GetShapeAttr(); + + if (sp48.CrossCo(*shapeAttr, &sp14)) { + return true; + } + } + } + } + } + + return false; +} /* 80086FBC-8008721C 0818FC 0260+00 0/0 1/1 0/0 .text * chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::chkCameraPoint(cXyz const& param_0, cCcD_ShapeAttr::Shape* param_1, - fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - nofralloc -#include "asm/d/cc/d_cc_s/chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c.s" -} -#pragma pop +bool dCcS::chkCameraPoint(cXyz const& param_0, cCcD_ShapeAttr::Shape* param_1, fopAc_ac_c* param_2, + fopAc_ac_c* param_3) { + if (mObjCoCount == 0) { + return false; + } -/* 8008721C-800872A8 081B5C 008C+00 0/0 2/1 0/0 .text __dt__12cCcD_SphAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_SphAttr::~cCcD_SphAttr() { -extern "C" asm void __dt__12cCcD_SphAttrFv() { - nofralloc -#include "asm/d/cc/d_cc_s/__dt__12cCcD_SphAttrFv.s" + cCcD_Obj** temp_r29 = &mpObjCo[mObjCoCount]; + + cCcD_SphAttr sp48; + cCcD_SrcSphAttr sp1C; + + sp1C.mCenter = param_0; + sp1C.mRadius = 1.0f; + sp48.Set(sp1C); + sp48.CalcAabBox(); + + cCcD_DivideInfo sp18; + f32 sp14; + mDivideArea.CalcDivideInfoOverArea(&sp18, sp48.GetWorkAab()); + + for (cCcD_Obj** i = mpObjCo; i < temp_r29; i++) { + if ((*i)->ChkCoSet() && (*i)->GetAc() != param_2 && (*i)->GetAc() != param_3) { + if ((*i)->GetPDivideInfo()->Chk(sp18)) { + dCcD_GObjInf* obj = (dCcD_GObjInf*)(*i)->GetGObjInf(); + + if (obj == NULL || !obj->ChkCoNoCamHit()) { + cCcD_ShapeAttr* shapeAttr = (*i)->GetShapeAttr(); + + if (sp48.CrossCo(*shapeAttr, &sp14)) { + shapeAttr->getShapeAccess(param_1); + + if (param_1->_0 != 2) { + return true; + } + } + } + } + } + } + + return false; } -#pragma pop /* 800872A8-800872AC 081BE8 0004+00 1/0 0/0 0/0 .text MoveAfterCheck__4dCcSFv */ -void dCcS::MoveAfterCheck() { - /* empty function */ -} +void dCcS::MoveAfterCheck() {} /* 800872AC-800872B0 081BEC 0004+00 1/1 0/0 0/0 .text DrawAfter__4dCcSFv */ -void dCcS::DrawAfter() { - /* empty function */ -} +void dCcS::DrawAfter() {} /* 800872B0-800872D0 081BF0 0020+00 0/0 1/1 0/0 .text Move__4dCcSFv */ void dCcS::Move() { @@ -463,7 +755,7 @@ void dCcS::MassClear() { /* ############################################################################################## */ /* 803AC3A4-803AC3E4 0094C4 0040+00 1/1 0/0 0/0 .data m_mtrl_hit_tbl__4dCcS */ -SECTION_DATA u8 dCcS::m_mtrl_hit_tbl[64] = { +u8 dCcS::m_mtrl_hit_tbl[64] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, @@ -471,44 +763,23 @@ SECTION_DATA u8 dCcS::m_mtrl_hit_tbl[64] = { }; /* 80087330-8008734C 081C70 001C+00 1/1 0/0 0/0 .text ChkAtTgMtrlHit__4dCcSFUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcS::ChkAtTgMtrlHit(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkAtTgMtrlHit__4dCcSFUcUc.s" +int dCcS::ChkAtTgMtrlHit(u8 i_atMtrl, u8 i_tgMtrl) { + return m_mtrl_hit_tbl[i_atMtrl + i_tgMtrl * 8]; } -#pragma pop /* 8008734C-800873B0 081C8C 0064+00 1/0 0/0 0/0 .text * ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dCcS::ChkNoHitGAtTg(cCcD_GObjInf const* param_0, cCcD_GObjInf const* param_1, - cCcD_GStts* param_2, cCcD_GStts* param_3) { - nofralloc -#include "asm/d/cc/d_cc_s/ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts.s" -} -#pragma pop +bool dCcS::ChkNoHitGAtTg(cCcD_GObjInf const* i_atObjInf, cCcD_GObjInf const* i_tgObjInf, + cCcD_GStts*, cCcD_GStts*) { + dCcD_GObjInf* atObjInf = (dCcD_GObjInf*)i_atObjInf; + dCcD_GObjInf* tgObjInf = (dCcD_GObjInf*)i_tgObjInf; -/* ############################################################################################## */ -/* 803AC3E4-803AC418 009504 0034+00 0/0 2/2 0/0 .data __vt__4dCcS */ -SECTION_DATA extern void* __vt__4dCcS[13] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CalcTgPlusDmg__4dCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts, - (void*)SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf, - (void*) - SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts, - (void*) - SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz, - (void*)ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts, - (void*) - ChkAtTgHitAfterCross__4dCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts, - (void*)ChkNoHitGCo__4dCcSFP8cCcD_ObjP8cCcD_Obj, - (void*)__dt__4dCcSFv, - (void*)MoveAfterCheck__4dCcSFv, - (void*)SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj, - (void*)CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz, -}; + if (tgObjInf->ChkTgWolfSpNoDamage() && atObjInf->GetAtMtrl() == 0 && + atObjInf->GetAtType() & + (AT_TYPE_CSTATUE_BOSS_SWING | AT_TYPE_1000 | AT_TYPE_800 | AT_TYPE_CSTATUE_SWING)) + { + return true; + } + + return ChkAtTgMtrlHit(atObjInf->GetAtMtrl(), tgObjInf->GetTgMtrl()) == 0; +} diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index aff853bd748..e5fca33ebca 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -462,10 +462,10 @@ u8 daYkgr_c::m_emitter[4]; /* 80031870-800318B4 02C1B0 0044+00 0/0 0/0 19/19 .text getArcName__12daSetBgObj_cFP10fopAc_ac_c */ -const char* daSetBgObj_c::getArcName(fopAc_ac_c* param_0) { +const char* daSetBgObj_c::getArcName(fopAc_ac_c* i_this) { static char arcName[8]; - sprintf(arcName, "@bg%04x", (u16)fopAcM_GetParam(param_0)); + sprintf(arcName, "@bg%04x", (u16)fopAcM_GetParam(i_this)); return arcName; } diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index a21ea160793..8aad481d05f 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -92,13 +92,13 @@ dJntCol_c::dJntCol_c() { /* 80035CA0-80035CC8 0305E0 0028+00 0/0 2/2 8/8 .text * init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli */ int dJntCol_c::init(fopAc_ac_c* i_actorP, dJntColData_c const* i_jntColP, J3DModel* i_modelP, - int param_3) { + int param_3) { mData = (dJntColData_c*)i_jntColP; mModel = i_modelP; field_0x8 = param_3; field_0xc = 0; if (i_actorP) { - fopAcM_SetJntCol(i_actorP,this); + fopAcM_SetJntCol(i_actorP, this); } return 1; } @@ -112,18 +112,17 @@ SECTION_SDATA2 static f32 lit_3655 = 500.0f; #ifdef NONMATCHING // regalloc, parameters are loading in wrong? void dJntCol_c::setNowLine(cM3dGLin* param_0, cXyz const* param_1, csXyz const* param_2, - cXyz* param_3) { - + cXyz* param_3) { if (param_2) { mDoMtx_stack_c::ZXYrotS(*param_2); - mDoMtx_stack_c::multVec(&cXyz::BaseZ,param_3); + mDoMtx_stack_c::multVec(&cXyz::BaseZ, param_3); } else { *param_3 = cXyz::BaseZ; } cXyz start_pos = *param_1 - *param_3 * FLOAT_LABEL(lit_3655); cXyz end_pos = *param_1 + *param_3 * FLOAT_LABEL(lit_3655); - param_0->SetStartEnd(start_pos,end_pos); + param_0->SetStartEnd(start_pos, end_pos); } #else #pragma push @@ -234,7 +233,7 @@ asm void dJntCol_c::getArrowOffsetPosAndAngle(cXyz const* param_0, csXyz const* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_0, csXyz const* param_1, cXyz* param_2, +asm int dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_0, csXyz const* param_1, cXyz* param_2, csXyz* param_3, int param_4) const { nofralloc #include "asm/d/d_jnt_col/getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi.s" @@ -244,10 +243,10 @@ asm void dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_0, csXyz const* para /* 80036FA8-80037038 0318E8 0090+00 0/0 0/0 1/1 .text * setArrowPosAndAngle__9dJntCol_cFPC4cXyzPC4cXyziP4cXyzP5csXyz */ void dJntCol_c::setArrowPosAndAngle(cXyz const* param_0, cXyz const* i_srcPos, int i_anmMtxIdx, - cXyz* param_3, csXyz* i_arrowPosP) { - cXyz dst_pos; - mDoMtx_multVecSR(mModel->i_getAnmMtx(i_anmMtxIdx),i_srcPos,&dst_pos); + cXyz* param_3, csXyz* i_arrowPosP) { + cXyz dst_pos; + mDoMtx_multVecSR(mModel->i_getAnmMtx(i_anmMtxIdx), i_srcPos, &dst_pos); i_arrowPosP->x = dst_pos.atan2sY_XZ(); i_arrowPosP->y = dst_pos.atan2sX_Z(); - mDoMtx_multVec(mModel->i_getAnmMtx(i_anmMtxIdx),param_0,param_3); + mDoMtx_multVec(mModel->i_getAnmMtx(i_anmMtxIdx), param_0, param_3); } diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp index 183e64e5e56..8a3ef899bfe 100644 --- a/src/m_Do/m_Do_machine_exception.cpp +++ b/src/m_Do/m_Do_machine_exception.cpp @@ -121,21 +121,4 @@ void exception_addition(JUTConsole* pConsole) { dispGameInfo(); } -/* ############################################################################################## */ -/* 80450C98-80450C9C -00001 0004+00 0/0 0/0 50/50 .sbss None */ -/* 80450C98 0001+00 data_80450C98 None */ -/* 80450C99 0001+00 data_80450C99 None */ -/* 80450C9A 0001+00 data_80450C9A None */ -/* 80450C9B 0001+00 data_80450C9B None */ -extern u8 struct_80450C98[4]; -u8 struct_80450C98[4]; - -/* 80450C9C-80450CA0 -00001 0004+00 0/0 0/0 6/6 .sbss None */ -/* 80450C9C 0001+00 data_80450C9C None */ -/* 80450C9D 0001+00 data_80450C9D None */ -/* 80450C9E 0001+00 data_80450C9E None */ -/* 80450C9F 0001+00 data_80450C9F None */ -extern u8 struct_80450C9C[4]; -u8 struct_80450C9C[4]; - /* 80374460-80374460 000AC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/tools/tp.py b/tools/tp.py index a62a7ae68c2..89466bb4f59 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -419,7 +419,7 @@ def calculate_rel_progress(build_path: Path, matching: bool, format: str, asm_fi str_file = str(file) if not str_file.startswith("asm/rel/"): continue - rel = str_file.split("/")[-2] + rel = str_file.split("/")[-3] range_dict[rel].append(range[1] - range[0]) end = time.time() @@ -890,7 +890,7 @@ def find_all_asm_files() -> Tuple[Set[Path], Set[Path]]: if path.is_dir(): recursive(path) else: - if path.suffix == ".s" or path.suffix == ".inc": + if path.suffix == ".s": files.add(path) else: errors.add(path) @@ -988,7 +988,7 @@ def find_all_files() -> Set[Path]: return files -def find_includes(lines: List[str], non_matching: bool, ext: Tuple[str, str] = (".s",".inc")) -> Set[Path]: +def find_includes(lines: List[str], non_matching: bool, ext: str = ".s") -> Set[Path]: includes = set() for line in lines: key = '#include "' @@ -1003,8 +1003,6 @@ def find_includes(lines: List[str], non_matching: bool, ext: Tuple[str, str] = ( include_path = line[start:end] if include_path.endswith(ext): - if include_path.endswith(".inc"): - include_path = "src/"+include_path includes.add(Path(include_path)) return includes @@ -1116,6 +1114,7 @@ def check_sha1(game_path: Path, build_path: Path, include_rels: bool): "", "4997D93B9692620C40E90374A0F1DBF0E4889395", ) + if include_rels: with open('sha1sums.json') as f: rel_shas = json.load(f) @@ -1143,7 +1142,7 @@ def check_sha1(game_path: Path, build_path: Path, include_rels: bool): ) if include_rels: - build_rels_path = get_files_with_ext(build_path, ".rel") + build_rels_path = get_files_with_ext(build_path/"rel", ".rel") for rel_filepath in build_rels_path: with rel_filepath.open("rb") as file: data = bytearray(file.read()) From 6e05f7133bed071b28791fa48193d876e02e6ca8 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sun, 15 Jan 2023 21:10:41 +0200 Subject: [PATCH 2/2] chmod 755 decompctx.py (#246) --- tools/decompctx.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools/decompctx.py diff --git a/tools/decompctx.py b/tools/decompctx.py old mode 100644 new mode 100755