From 38eca47ad5a7c35cbc009bc82762f51f3490d6b3 Mon Sep 17 00:00:00 2001 From: lepelog <25211966+lepelog@users.noreply.github.com> Date: Tue, 17 Aug 2021 02:59:00 +0200 Subject: [PATCH] __sinit_d_com_inf_game_cpp OK (#140) * mass mng header * d_cc_d start * c_cc_d ok * tmp commit * almost, reordering of vtable functions * progress * more progress * cleanup, still non matching * mark all of d_cc_d as nonmatching to OK * c_cc_s * c_cc_s OK * d_cc_mass_s OK * cleanup * gameinfo __sinit, not OK * a bit of cleanup * format * remove asm Co-authored-by: lepelog --- .../c_cc_d/__dt__12cCcD_TriAttrFv.s | 44 -- .../SComponent/c_cc_d/__sinit_c_cc_d_cpp.s | 22 - asm/SSystem/SComponent/c_cc_d/func_80264A4C.s | 3 - asm/SSystem/SComponent/c_cc_d/func_80264A54.s | 3 - asm/SSystem/SComponent/c_cc_d/func_80264A5C.s | 3 - asm/SSystem/SComponent/c_cc_d/func_80264A64.s | 3 - .../SComponent/c_cc_s/CalcArea__4cCcSFv.s | 77 --- ...cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts.s | 11 - .../SComponent/c_cc_s/ChkAtTg__4cCcSFv.s | 147 ------ .../SComponent/c_cc_s/ChkCo__4cCcSFv.s | 100 ---- ...ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj.s | 74 --- .../ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj.s | 58 -- .../SComponent/c_cc_s/DrawClear__4cCcSFv.s | 58 -- ...HitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz.s | 141 ----- ..._4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s | 95 ---- ..._4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s | 308 ----------- ...gFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf.s | 289 ---------- .../ClearPointer__15dCcMassS_HitInfFv.s | 8 - .../cc/d_cc_mass_s/Clear__12dCcMassS_MngFv.s | 45 -- .../cc/d_cc_mass_s/Clear__12dCcMassS_ObjFv.s | 18 - asm/d/cc/d_cc_mass_s/Ct__12dCcMassS_MngFv.s | 20 - .../GetCamTopPos__12dCcMassS_MngFP3Vec.s | 8 - .../GetResultCam__12dCcMassS_MngCFv.s | 3 - .../d_cc_mass_s/Prepare__12dCcMassS_MngFv.s | 146 ------ .../SetAttr__12dCcMassS_MngFffUcUc.s | 25 - .../SetCam__12dCcMassS_MngFRC8cM3dGCps.s | 18 - .../Set__12dCcMassS_MngFP8cCcD_ObjUc.s | 59 --- ...bjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v.s | 5 - asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_MngFv.s | 65 --- asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_ObjFv.s | 8 - asm/d/cc/d_cc_mass_s/__dt__12cCcD_CpsAttrFv.s | 39 -- asm/d/cc/d_cc_mass_s/__dt__12cCcD_CylAttrFv.s | 39 -- .../cc/d_cc_mass_s/__dt__14cCcD_ShapeAttrFv.s | 26 - .../com/d_com_inf_game/__ct__10dAttDraw_cFv.s | 90 ---- .../com/d_com_inf_game/__ct__10dSv_zone_cFv.s | 4 - .../d_com_inf_game/__ct__11cBgS_ChkElmFv.s | 16 - .../d_com_inf_game/__ct__12dSv_memory_cFv.s | 13 - .../d_com_inf_game/__ct__13dComIfG_inf_cFv.s | 162 ------ .../d_com_inf_game/__ct__13dSv_memory2_cFv.s | 13 - .../d_com_inf_game/__ct__13mDoExt_bckAnmFv.s | 19 - .../d_com_inf_game/__ct__13mDoExt_bpkAnmFv.s | 19 - .../d_com_inf_game/__ct__13mDoExt_brkAnmFv.s | 19 - .../d_com_inf_game/__ct__13mDoExt_btkAnmFv.s | 19 - .../com/d_com_inf_game/__dt__10dAttDraw_cFv.s | 91 ---- .../com/d_com_inf_game/__dt__10dAttList_cFv.s | 17 - .../d_com_inf_game/__dt__11cBgS_ChkElmFv.s | 20 - .../d_com_inf_game/__dt__11dEvDtBase_cFv.s | 17 - .../d_com_inf_game/__dt__12dCcMassS_MngFv.s | 97 ---- .../d_com_inf_game/__dt__12dCcMassS_ObjFv.s | 27 - .../d_com_inf_game/__dt__12dEvt_order_cFv.s | 17 - .../d_com_inf_game/__dt__13dComIfG_inf_cFv.s | 31 -- .../d_com_inf_game/__dt__13mDoExt_bckAnmFv.s | 24 - .../d_com_inf_game/__dt__13mDoExt_bpkAnmFv.s | 24 - .../d_com_inf_game/__dt__13mDoExt_brkAnmFv.s | 24 - .../d_com_inf_game/__dt__13mDoExt_btkAnmFv.s | 24 - .../d_com_inf_game/__dt__14dComIfG_play_cFv.s | 73 --- .../d_com_inf_game/__dt__14dDlst_window_cFv.s | 17 - .../__dt__15cCcD_DivideAreaFv.s | 26 - .../__dt__15cCcD_DivideInfoFv.s | 20 - .../__dt__25dComIfG_camera_info_classFv.s | 17 - asm/d/com/d_com_inf_game/__dt__4cBgSFv.s | 29 - asm/d/com/d_com_inf_game/__dt__4cCcSFv.s | 32 -- asm/d/com/d_com_inf_game/__dt__4dBgSFv.s | 34 -- asm/d/com/d_com_inf_game/__dt__4dCcSFv.s | 117 ----- asm/d/com/d_com_inf_game/__dt__7cSAngleFv.s | 17 - asm/d/com/d_com_inf_game/__dt__8cM3dGAabFv.s | 20 - asm/d/com/d_com_inf_game/__dt__8cM3dGCylFv.s | 20 - .../__sinit_d_com_inf_game_cpp.s | 24 - asm/d/d_stage/__ct__19dStage_roomStatus_cFv.s | 32 -- asm/d/d_stage/__dt__19dStage_KeepDoorInfoFv.s | 27 - asm/d/d_stage/__sinit_d_stage_cpp.s | 56 -- asm/d/d_stage/func_80028328.s | 15 - .../JSystem/J3DGraphAnimator/J3DAnimation.h | 7 +- include/JSystem/J3DGraphBase/J3DStruct.h | 15 +- include/SSystem/SComponent/c_cc_d.h | 239 ++++++--- include/SSystem/SComponent/c_cc_s.h | 6 +- include/SSystem/SComponent/c_m3d_g_aab.h | 1 - include/SSystem/SComponent/c_m3d_g_cyl.h | 11 +- include/SSystem/SComponent/c_m3d_g_pla.h | 2 +- include/SSystem/SComponent/c_m3d_g_sph.h | 4 +- include/SSystem/SComponent/c_m3d_g_tri.h | 1 + include/SSystem/SComponent/c_xyz.h | 6 - include/d/bg/d_bg_s.h | 50 +- include/d/bg/d_bg_w.h | 2 - include/d/cc/d_cc_d.h | 186 ++++--- include/d/cc/d_cc_mass_s.h | 67 ++- include/d/cc/d_cc_s.h | 11 +- include/d/com/d_com_inf_game.h | 102 ++-- include/d/d_attention.h | 34 +- include/d/d_drawlist.h | 8 +- include/d/d_stage.h | 354 ++++++++----- include/d/d_vibration.h | 2 - include/d/event/d_event.h | 4 +- include/d/event/d_event_data.h | 6 +- include/d/event/d_event_manager.h | 1 + include/d/kankyo/d_kankyo.h | 2 + include/d/save/d_save.h | 16 +- include/dolphin/mtx/vec.h | 5 + include/f_op/f_op_actor_mng.h | 2 +- include/m_Do/m_Do_ext.h | 40 +- libs/SSystem/SComponent/c_cc_d.cpp | 437 +--------------- libs/SSystem/SComponent/c_cc_s.cpp | 469 +++++++++-------- src/d/a/d_a_alink.cpp | 15 +- src/d/cc/d_cc_d.cpp | 453 ++++++++++++---- src/d/cc/d_cc_d_nonmatching.cpp | 475 +++++++++++++++++ src/d/cc/d_cc_mass_s.cpp | 495 +++++++----------- src/d/com/d_com_inf_game.cpp | 463 +--------------- src/d/d_attention.cpp | 12 +- src/d/d_stage.cpp | 375 +------------ src/d/kankyo/d_kankyo.cpp | 1 - src/d/particle/d_particle.cpp | 1 - src/f_op/f_op_actor.cpp | 21 +- src/m_Do/m_Do_ext.cpp | 3 +- tools/tp.py | 30 +- 114 files changed, 2085 insertions(+), 5680 deletions(-) delete mode 100644 asm/SSystem/SComponent/c_cc_d/__dt__12cCcD_TriAttrFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/__sinit_c_cc_d_cpp.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/func_80264A4C.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/func_80264A54.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/func_80264A5C.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/func_80264A64.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/CalcArea__4cCcSFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/ChkAtTg__4cCcSFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/ChkCo__4cCcSFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/DrawClear__4cCcSFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s delete mode 100644 asm/SSystem/SComponent/c_cc_s/SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s delete mode 100644 asm/d/cc/d_cc_mass_s/Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf.s delete mode 100644 asm/d/cc/d_cc_mass_s/ClearPointer__15dCcMassS_HitInfFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_MngFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_ObjFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/Ct__12dCcMassS_MngFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/GetCamTopPos__12dCcMassS_MngFP3Vec.s delete mode 100644 asm/d/cc/d_cc_mass_s/GetResultCam__12dCcMassS_MngCFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/Prepare__12dCcMassS_MngFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/SetAttr__12dCcMassS_MngFffUcUc.s delete mode 100644 asm/d/cc/d_cc_mass_s/SetCam__12dCcMassS_MngFRC8cM3dGCps.s delete mode 100644 asm/d/cc/d_cc_mass_s/Set__12dCcMassS_MngFP8cCcD_ObjUc.s delete mode 100644 asm/d/cc/d_cc_mass_s/Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v.s delete mode 100644 asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_MngFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_ObjFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/__dt__12cCcD_CpsAttrFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/__dt__12cCcD_CylAttrFv.s delete mode 100644 asm/d/cc/d_cc_mass_s/__dt__14cCcD_ShapeAttrFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__10dAttDraw_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__10dSv_zone_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__11cBgS_ChkElmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__12dSv_memory_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__13dComIfG_inf_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__13dSv_memory2_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__13mDoExt_bckAnmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__13mDoExt_bpkAnmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__13mDoExt_brkAnmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__ct__13mDoExt_btkAnmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__10dAttDraw_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__10dAttList_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__11cBgS_ChkElmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__11dEvDtBase_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__12dCcMassS_MngFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__12dCcMassS_ObjFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__12dEvt_order_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__13dComIfG_inf_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__13mDoExt_bckAnmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__13mDoExt_bpkAnmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__13mDoExt_brkAnmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__13mDoExt_btkAnmFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__14dComIfG_play_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__14dDlst_window_cFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__15cCcD_DivideAreaFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__15cCcD_DivideInfoFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__25dComIfG_camera_info_classFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__4cBgSFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__4cCcSFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__4dBgSFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__4dCcSFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__7cSAngleFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__8cM3dGAabFv.s delete mode 100644 asm/d/com/d_com_inf_game/__dt__8cM3dGCylFv.s delete mode 100644 asm/d/com/d_com_inf_game/__sinit_d_com_inf_game_cpp.s delete mode 100644 asm/d/d_stage/__ct__19dStage_roomStatus_cFv.s delete mode 100644 asm/d/d_stage/__dt__19dStage_KeepDoorInfoFv.s delete mode 100644 asm/d/d_stage/__sinit_d_stage_cpp.s delete mode 100644 asm/d/d_stage/func_80028328.s create mode 100644 src/d/cc/d_cc_d_nonmatching.cpp diff --git a/asm/SSystem/SComponent/c_cc_d/__dt__12cCcD_TriAttrFv.s b/asm/SSystem/SComponent/c_cc_d/__dt__12cCcD_TriAttrFv.s deleted file mode 100644 index 1de2102f0b..0000000000 --- a/asm/SSystem/SComponent/c_cc_d/__dt__12cCcD_TriAttrFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80264938: -/* 80264938 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026493C 7C 08 02 A6 */ mflr r0 -/* 80264940 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264944 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80264948 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8026494C 41 82 00 74 */ beq lbl_802649C0 -/* 80264950 3C 60 80 3C */ lis r3, __vt__12cCcD_TriAttr@ha /* 0x803C366C@ha */ -/* 80264954 38 63 36 6C */ addi r3, r3, __vt__12cCcD_TriAttr@l /* 0x803C366C@l */ -/* 80264958 90 7F 00 1C */ stw r3, 0x1c(r31) -/* 8026495C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80264960 90 1F 00 30 */ stw r0, 0x30(r31) -/* 80264964 34 1F 00 20 */ addic. r0, r31, 0x20 -/* 80264968 41 82 00 24 */ beq lbl_8026498C -/* 8026496C 3C 60 80 3B */ lis r3, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 80264970 38 03 BB 84 */ addi r0, r3, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 80264974 90 1F 00 30 */ stw r0, 0x30(r31) -/* 80264978 34 1F 00 20 */ addic. r0, r31, 0x20 -/* 8026497C 41 82 00 10 */ beq lbl_8026498C -/* 80264980 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80264984 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80264988 90 1F 00 30 */ stw r0, 0x30(r31) -lbl_8026498C: -/* 8026498C 28 1F 00 00 */ cmplwi r31, 0 -/* 80264990 41 82 00 20 */ beq lbl_802649B0 -/* 80264994 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80264998 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8026499C 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 802649A0 41 82 00 10 */ beq lbl_802649B0 -/* 802649A4 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 802649A8 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 802649AC 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_802649B0: -/* 802649B0 7C 80 07 35 */ extsh. r0, r4 -/* 802649B4 40 81 00 0C */ ble lbl_802649C0 -/* 802649B8 7F E3 FB 78 */ mr r3, r31 -/* 802649BC 48 06 A3 81 */ bl __dl__FPv -lbl_802649C0: -/* 802649C0 7F E3 FB 78 */ mr r3, r31 -/* 802649C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802649C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802649CC 7C 08 03 A6 */ mtlr r0 -/* 802649D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802649D4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/__sinit_c_cc_d_cpp.s b/asm/SSystem/SComponent/c_cc_d/__sinit_c_cc_d_cpp.s deleted file mode 100644 index c7ebd92830..0000000000 --- a/asm/SSystem/SComponent/c_cc_d/__sinit_c_cc_d_cpp.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_802649F8: -/* 802649F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802649FC 7C 08 02 A6 */ mflr r0 -/* 80264A00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264A04 3C 60 80 43 */ lis r3, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80264A08 38 83 0C F4 */ addi r4, r3, Zero__4cXyz@l /* 0x80430CF4@l */ -/* 80264A0C C0 04 00 00 */ lfs f0, 0(r4) -/* 80264A10 3C 60 80 43 */ lis r3, m_virtual_center__14cCcD_ShapeAttr@ha /* 0x80430CB4@ha */ -/* 80264A14 D4 03 0C B4 */ stfsu f0, m_virtual_center__14cCcD_ShapeAttr@l(r3) /* 0x80430CB4@l */ -/* 80264A18 C0 04 00 04 */ lfs f0, 4(r4) -/* 80264A1C D0 03 00 04 */ stfs f0, 4(r3) -/* 80264A20 C0 04 00 08 */ lfs f0, 8(r4) -/* 80264A24 D0 03 00 08 */ stfs f0, 8(r3) -/* 80264A28 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 80264A2C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 80264A30 3C A0 80 43 */ lis r5, lit_2414@ha /* 0x80430CA8@ha */ -/* 80264A34 38 A5 0C A8 */ addi r5, r5, lit_2414@l /* 0x80430CA8@l */ -/* 80264A38 48 0F D1 ED */ bl __register_global_object -/* 80264A3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80264A40 7C 08 03 A6 */ mtlr r0 -/* 80264A44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264A48 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/func_80264A4C.s b/asm/SSystem/SComponent/c_cc_d/func_80264A4C.s deleted file mode 100644 index bbc306f4c3..0000000000 --- a/asm/SSystem/SComponent/c_cc_d/func_80264A4C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80264A4C: -/* 80264A4C 38 63 FF E0 */ addi r3, r3, -32 -/* 80264A50 4B FF FE E8 */ b __dt__12cCcD_TriAttrFv diff --git a/asm/SSystem/SComponent/c_cc_d/func_80264A54.s b/asm/SSystem/SComponent/c_cc_d/func_80264A54.s deleted file mode 100644 index d25d3d0300..0000000000 --- a/asm/SSystem/SComponent/c_cc_d/func_80264A54.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80264A54: -/* 80264A54 38 63 FF E0 */ addi r3, r3, -32 -/* 80264A58 4B E2 09 F8 */ b __dt__12cCcD_CpsAttrFv diff --git a/asm/SSystem/SComponent/c_cc_d/func_80264A5C.s b/asm/SSystem/SComponent/c_cc_d/func_80264A5C.s deleted file mode 100644 index c875dc0109..0000000000 --- a/asm/SSystem/SComponent/c_cc_d/func_80264A5C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80264A5C: -/* 80264A5C 38 63 FF E0 */ addi r3, r3, -32 -/* 80264A60 4B E2 0A 80 */ b __dt__12cCcD_CylAttrFv diff --git a/asm/SSystem/SComponent/c_cc_d/func_80264A64.s b/asm/SSystem/SComponent/c_cc_d/func_80264A64.s deleted file mode 100644 index 32563c95cb..0000000000 --- a/asm/SSystem/SComponent/c_cc_d/func_80264A64.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80264A64: -/* 80264A64 38 63 FF E0 */ addi r3, r3, -32 -/* 80264A68 4B E2 27 B4 */ b __dt__12cCcD_SphAttrFv diff --git a/asm/SSystem/SComponent/c_cc_s/CalcArea__4cCcSFv.s b/asm/SSystem/SComponent/c_cc_s/CalcArea__4cCcSFv.s deleted file mode 100644 index 4622ea2210..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/CalcArea__4cCcSFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80265BB4: -/* 80265BB4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80265BB8 7C 08 02 A6 */ mflr r0 -/* 80265BBC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80265BC0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80265BC4 48 0F C6 19 */ bl _savegpr_29 -/* 80265BC8 7C 7F 1B 78 */ mr r31, r3 -/* 80265BCC 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80265BD0 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80265BD4 90 01 00 20 */ stw r0, 0x20(r1) -/* 80265BD8 38 61 00 08 */ addi r3, r1, 8 -/* 80265BDC 48 00 91 1D */ bl ClearForMinMax__8cM3dGAabFv -/* 80265BE0 3B DF 14 00 */ addi r30, r31, 0x1400 -/* 80265BE4 48 00 00 44 */ b lbl_80265C28 -lbl_80265BE8: -/* 80265BE8 80 7E 00 00 */ lwz r3, 0(r30) -/* 80265BEC 28 03 00 00 */ cmplwi r3, 0 -/* 80265BF0 41 82 00 34 */ beq lbl_80265C24 -/* 80265BF4 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80265BF8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80265BFC 7D 89 03 A6 */ mtctr r12 -/* 80265C00 4E 80 04 21 */ bctrl -/* 80265C04 7C 7D 1B 78 */ mr r29, r3 -/* 80265C08 81 83 00 1C */ lwz r12, 0x1c(r3) -/* 80265C0C 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80265C10 7D 89 03 A6 */ mtctr r12 -/* 80265C14 4E 80 04 21 */ bctrl -/* 80265C18 38 61 00 08 */ addi r3, r1, 8 -/* 80265C1C 7F A4 EB 78 */ mr r4, r29 -/* 80265C20 48 00 91 41 */ bl SetMinMax__8cM3dGAabFRC8cM3dGAab -lbl_80265C24: -/* 80265C24 3B DE 00 04 */ addi r30, r30, 4 -lbl_80265C28: -/* 80265C28 A0 1F 28 06 */ lhz r0, 0x2806(r31) -/* 80265C2C 54 03 10 3A */ slwi r3, r0, 2 -/* 80265C30 38 03 14 00 */ addi r0, r3, 0x1400 -/* 80265C34 7C 1F 02 14 */ add r0, r31, r0 -/* 80265C38 7C 1E 00 40 */ cmplw r30, r0 -/* 80265C3C 41 80 FF AC */ blt lbl_80265BE8 -/* 80265C40 38 7F 28 08 */ addi r3, r31, 0x2808 -/* 80265C44 38 81 00 08 */ addi r4, r1, 8 -/* 80265C48 4B FF D7 61 */ bl SetArea__15cCcD_DivideAreaFRC8cM3dGAab -/* 80265C4C 3B BF 14 00 */ addi r29, r31, 0x1400 -/* 80265C50 48 00 00 40 */ b lbl_80265C90 -lbl_80265C54: -/* 80265C54 80 7D 00 00 */ lwz r3, 0(r29) -/* 80265C58 28 03 00 00 */ cmplwi r3, 0 -/* 80265C5C 41 82 00 30 */ beq lbl_80265C8C -/* 80265C60 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80265C64 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80265C68 7D 89 03 A6 */ mtctr r12 -/* 80265C6C 4E 80 04 21 */ bctrl -/* 80265C70 7C 65 1B 78 */ mr r5, r3 -/* 80265C74 80 7D 00 00 */ lwz r3, 0(r29) -/* 80265C78 38 83 00 48 */ addi r4, r3, 0x48 -/* 80265C7C 80 03 00 40 */ lwz r0, 0x40(r3) -/* 80265C80 54 06 07 BC */ rlwinm r6, r0, 0, 0x1e, 0x1e -/* 80265C84 38 7F 28 08 */ addi r3, r31, 0x2808 -/* 80265C88 4B FF D8 4D */ bl CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl -lbl_80265C8C: -/* 80265C8C 3B BD 00 04 */ addi r29, r29, 4 -lbl_80265C90: -/* 80265C90 A0 1F 28 06 */ lhz r0, 0x2806(r31) -/* 80265C94 54 03 10 3A */ slwi r3, r0, 2 -/* 80265C98 38 03 14 00 */ addi r0, r3, 0x1400 -/* 80265C9C 7C 1F 02 14 */ add r0, r31, r0 -/* 80265CA0 7C 1D 00 40 */ cmplw r29, r0 -/* 80265CA4 41 80 FF B0 */ blt lbl_80265C54 -/* 80265CA8 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80265CAC 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80265CB0 90 01 00 20 */ stw r0, 0x20(r1) -/* 80265CB4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80265CB8 48 0F C5 71 */ bl _restgpr_29 -/* 80265CBC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80265CC0 7C 08 03 A6 */ mtlr r0 -/* 80265CC4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80265CC8 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_s/CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts.s b/asm/SSystem/SComponent/c_cc_s/CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts.s deleted file mode 100644 index bd87f98249..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_802653A0: -/* 802653A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802653A4 7C 08 02 A6 */ mflr r0 -/* 802653A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802653AC 7C E3 3B 78 */ mr r3, r7 -/* 802653B0 88 84 00 14 */ lbz r4, 0x14(r4) -/* 802653B4 4B FF E5 BD */ bl PlusDmg__9cCcD_SttsFi -/* 802653B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802653BC 7C 08 03 A6 */ mtlr r0 -/* 802653C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802653C4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_s/ChkAtTg__4cCcSFv.s b/asm/SSystem/SComponent/c_cc_s/ChkAtTg__4cCcSFv.s deleted file mode 100644 index fedd29ed5d..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/ChkAtTg__4cCcSFv.s +++ /dev/null @@ -1,147 +0,0 @@ -lbl_80264F40: -/* 80264F40 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80264F44 7C 08 02 A6 */ mflr r0 -/* 80264F48 90 01 00 34 */ stw r0, 0x34(r1) -/* 80264F4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80264F50 48 0F D2 7D */ bl _savegpr_25 -/* 80264F54 7C 7F 1B 78 */ mr r31, r3 -/* 80264F58 A0 03 28 02 */ lhz r0, 0x2802(r3) -/* 80264F5C 54 04 10 3A */ slwi r4, r0, 2 -/* 80264F60 3B A4 04 00 */ addi r29, r4, 0x400 -/* 80264F64 7F BF EA 14 */ add r29, r31, r29 -/* 80264F68 4B FF FE 29 */ bl ClrAtHitInf__4cCcSFv -/* 80264F6C 7F E3 FB 78 */ mr r3, r31 -/* 80264F70 4B FF FD 81 */ bl ClrTgHitInf__4cCcSFv -/* 80264F74 7F FC FB 78 */ mr r28, r31 -/* 80264F78 3C 60 80 43 */ lis r3, cross@ha /* 0x80430CCC@ha */ -/* 80264F7C 3B C3 0C CC */ addi r30, r3, cross@l /* 0x80430CCC@l */ -/* 80264F80 48 00 01 B0 */ b lbl_80265130 -lbl_80264F84: -/* 80264F84 80 7C 00 00 */ lwz r3, 0(r28) -/* 80264F88 28 03 00 00 */ cmplwi r3, 0 -/* 80264F8C 41 82 01 A0 */ beq lbl_8026512C -/* 80264F90 80 03 00 00 */ lwz r0, 0(r3) -/* 80264F94 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80264F98 41 82 01 94 */ beq lbl_8026512C -/* 80264F9C 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80264FA0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80264FA4 7D 89 03 A6 */ mtctr r12 -/* 80264FA8 4E 80 04 21 */ bctrl -/* 80264FAC 7C 7B 1B 78 */ mr r27, r3 -/* 80264FB0 3B 5F 04 00 */ addi r26, r31, 0x400 -/* 80264FB4 48 00 01 70 */ b lbl_80265124 -lbl_80264FB8: -/* 80264FB8 80 7A 00 00 */ lwz r3, 0(r26) -/* 80264FBC 28 03 00 00 */ cmplwi r3, 0 -/* 80264FC0 41 82 01 60 */ beq lbl_80265120 -/* 80264FC4 80 03 00 18 */ lwz r0, 0x18(r3) -/* 80264FC8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80264FCC 41 82 01 54 */ beq lbl_80265120 -/* 80264FD0 38 83 00 48 */ addi r4, r3, 0x48 -/* 80264FD4 80 7C 00 00 */ lwz r3, 0(r28) -/* 80264FD8 38 63 00 48 */ addi r3, r3, 0x48 -/* 80264FDC 4B FF E3 8D */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo -/* 80264FE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80264FE4 41 82 01 3C */ beq lbl_80265120 -/* 80264FE8 7F E3 FB 78 */ mr r3, r31 -/* 80264FEC 80 9C 00 00 */ lwz r4, 0(r28) -/* 80264FF0 80 BA 00 00 */ lwz r5, 0(r26) -/* 80264FF4 4B FF FE 39 */ bl ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj -/* 80264FF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80264FFC 40 82 01 24 */ bne lbl_80265120 -/* 80265000 80 7A 00 00 */ lwz r3, 0(r26) -/* 80265004 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80265008 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8026500C 7D 89 03 A6 */ mtctr r12 -/* 80265010 4E 80 04 21 */ bctrl -/* 80265014 7C 79 1B 78 */ mr r25, r3 -/* 80265018 88 0D 8B D8 */ lbz r0, data_80451158(r13) -/* 8026501C 7C 00 07 75 */ extsb. r0, r0 -/* 80265020 40 82 00 28 */ bne lbl_80265048 -/* 80265024 3C 60 80 43 */ lis r3, cross@ha /* 0x80430CCC@ha */ -/* 80265028 38 63 0C CC */ addi r3, r3, cross@l /* 0x80430CCC@l */ -/* 8026502C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 80265030 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 80265034 3C A0 80 43 */ lis r5, lit_2492@ha /* 0x80430CC0@ha */ -/* 80265038 38 A5 0C C0 */ addi r5, r5, lit_2492@l /* 0x80430CC0@l */ -/* 8026503C 48 0F CB E9 */ bl __register_global_object -/* 80265040 38 00 00 01 */ li r0, 1 -/* 80265044 98 0D 8B D8 */ stb r0, data_80451158(r13) -lbl_80265048: -/* 80265048 7F 63 DB 78 */ mr r3, r27 -/* 8026504C 7F 24 CB 78 */ mr r4, r25 -/* 80265050 3C A0 80 43 */ lis r5, cross@ha /* 0x80430CCC@ha */ -/* 80265054 38 A5 0C CC */ addi r5, r5, cross@l /* 0x80430CCC@l */ -/* 80265058 81 9B 00 1C */ lwz r12, 0x1c(r27) -/* 8026505C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80265060 7D 89 03 A6 */ mtctr r12 -/* 80265064 4E 80 04 21 */ bctrl -/* 80265068 38 C0 00 01 */ li r6, 1 -/* 8026506C 80 9C 00 00 */ lwz r4, 0(r28) -/* 80265070 80 04 00 40 */ lwz r0, 0x40(r4) -/* 80265074 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80265078 40 82 00 18 */ bne lbl_80265090 -/* 8026507C 80 BA 00 00 */ lwz r5, 0(r26) -/* 80265080 80 05 00 40 */ lwz r0, 0x40(r5) -/* 80265084 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80265088 40 82 00 08 */ bne lbl_80265090 -/* 8026508C 38 C0 00 00 */ li r6, 0 -lbl_80265090: -/* 80265090 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 80265094 40 82 00 24 */ bne lbl_802650B8 -/* 80265098 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8026509C 41 82 00 1C */ beq lbl_802650B8 -/* 802650A0 7F E3 FB 78 */ mr r3, r31 -/* 802650A4 80 BA 00 00 */ lwz r5, 0(r26) -/* 802650A8 3C C0 80 43 */ lis r6, cross@ha /* 0x80430CCC@ha */ -/* 802650AC 38 C6 0C CC */ addi r6, r6, cross@l /* 0x80430CCC@l */ -/* 802650B0 48 00 03 19 */ bl SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz -/* 802650B4 48 00 00 6C */ b lbl_80265120 -lbl_802650B8: -/* 802650B8 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 802650BC 41 82 00 64 */ beq lbl_80265120 -/* 802650C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802650C4 40 82 00 5C */ bne lbl_80265120 -/* 802650C8 7C 83 23 78 */ mr r3, r4 -/* 802650CC 81 84 00 3C */ lwz r12, 0x3c(r4) -/* 802650D0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802650D4 7D 89 03 A6 */ mtctr r12 -/* 802650D8 4E 80 04 21 */ bctrl -/* 802650DC 28 03 00 00 */ cmplwi r3, 0 -/* 802650E0 40 82 00 1C */ bne lbl_802650FC -/* 802650E4 C0 02 B6 38 */ lfs f0, lit_2532(r2) -/* 802650E8 3C 60 80 43 */ lis r3, cross@ha /* 0x80430CCC@ha */ -/* 802650EC D0 03 0C CC */ stfs f0, cross@l(r3) /* 0x80430CCC@l */ -/* 802650F0 D0 1E 00 04 */ stfs f0, 4(r30) -/* 802650F4 D0 1E 00 08 */ stfs f0, 8(r30) -/* 802650F8 48 00 00 10 */ b lbl_80265108 -lbl_802650FC: -/* 802650FC 3C 80 80 43 */ lis r4, cross@ha /* 0x80430CCC@ha */ -/* 80265100 38 84 0C CC */ addi r4, r4, cross@l /* 0x80430CCC@l */ -/* 80265104 48 00 9D 21 */ bl CalcCenter__8cM3dGAabCFP4cXyz -lbl_80265108: -/* 80265108 7F E3 FB 78 */ mr r3, r31 -/* 8026510C 80 9C 00 00 */ lwz r4, 0(r28) -/* 80265110 80 BA 00 00 */ lwz r5, 0(r26) -/* 80265114 3C C0 80 43 */ lis r6, cross@ha /* 0x80430CCC@ha */ -/* 80265118 38 C6 0C CC */ addi r6, r6, cross@l /* 0x80430CCC@l */ -/* 8026511C 48 00 02 AD */ bl SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz -lbl_80265120: -/* 80265120 3B 5A 00 04 */ addi r26, r26, 4 -lbl_80265124: -/* 80265124 7C 1A E8 40 */ cmplw r26, r29 -/* 80265128 41 80 FE 90 */ blt lbl_80264FB8 -lbl_8026512C: -/* 8026512C 3B 9C 00 04 */ addi r28, r28, 4 -lbl_80265130: -/* 80265130 A0 1F 28 00 */ lhz r0, 0x2800(r31) -/* 80265134 54 00 10 3A */ slwi r0, r0, 2 -/* 80265138 7C 1F 02 14 */ add r0, r31, r0 -/* 8026513C 7C 1C 00 40 */ cmplw r28, r0 -/* 80265140 41 80 FE 44 */ blt lbl_80264F84 -/* 80265144 39 61 00 30 */ addi r11, r1, 0x30 -/* 80265148 48 0F D0 D1 */ bl _restgpr_25 -/* 8026514C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80265150 7C 08 03 A6 */ mtlr r0 -/* 80265154 38 21 00 30 */ addi r1, r1, 0x30 -/* 80265158 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_s/ChkCo__4cCcSFv.s b/asm/SSystem/SComponent/c_cc_s/ChkCo__4cCcSFv.s deleted file mode 100644 index e7f4620964..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/ChkCo__4cCcSFv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_80265230: -/* 80265230 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80265234 7C 08 02 A6 */ mflr r0 -/* 80265238 90 01 00 34 */ stw r0, 0x34(r1) -/* 8026523C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80265240 48 0F CF 8D */ bl _savegpr_25 -/* 80265244 7C 7B 1B 78 */ mr r27, r3 -/* 80265248 4B FF FA 15 */ bl ClrCoHitInf__4cCcSFv -/* 8026524C A0 1B 28 04 */ lhz r0, 0x2804(r27) -/* 80265250 28 00 00 01 */ cmplwi r0, 1 -/* 80265254 40 81 01 34 */ ble lbl_80265388 -/* 80265258 54 03 13 BA */ rlwinm r3, r0, 2, 0xe, 0x1d -/* 8026525C 3B E3 10 00 */ addi r31, r3, 0x1000 -/* 80265260 7F FB FA 14 */ add r31, r27, r31 -/* 80265264 3B DB 10 00 */ addi r30, r27, 0x1000 -/* 80265268 3B 5F FF FC */ addi r26, r31, -4 -/* 8026526C 48 00 01 14 */ b lbl_80265380 -lbl_80265270: -/* 80265270 80 7E 00 00 */ lwz r3, 0(r30) -/* 80265274 28 03 00 00 */ cmplwi r3, 0 -/* 80265278 41 82 01 04 */ beq lbl_8026537C -/* 8026527C 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80265280 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80265284 41 82 00 F8 */ beq lbl_8026537C -/* 80265288 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 8026528C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80265290 7D 89 03 A6 */ mtctr r12 -/* 80265294 4E 80 04 21 */ bctrl -/* 80265298 7C 7D 1B 78 */ mr r29, r3 -/* 8026529C 3B 9E 00 04 */ addi r28, r30, 4 -/* 802652A0 48 00 00 D4 */ b lbl_80265374 -lbl_802652A4: -/* 802652A4 80 7C 00 00 */ lwz r3, 0(r28) -/* 802652A8 28 03 00 00 */ cmplwi r3, 0 -/* 802652AC 41 82 00 C4 */ beq lbl_80265370 -/* 802652B0 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 802652B4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802652B8 41 82 00 B8 */ beq lbl_80265370 -/* 802652BC 38 83 00 48 */ addi r4, r3, 0x48 -/* 802652C0 80 7E 00 00 */ lwz r3, 0(r30) -/* 802652C4 38 63 00 48 */ addi r3, r3, 0x48 -/* 802652C8 4B FF E0 A1 */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo -/* 802652CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802652D0 41 82 00 A0 */ beq lbl_80265370 -/* 802652D4 7F 63 DB 78 */ mr r3, r27 -/* 802652D8 80 9E 00 00 */ lwz r4, 0(r30) -/* 802652DC 80 BC 00 00 */ lwz r5, 0(r28) -/* 802652E0 4B FF FE 7D */ bl ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj -/* 802652E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802652E8 40 82 00 88 */ bne lbl_80265370 -/* 802652EC 80 7C 00 00 */ lwz r3, 0(r28) -/* 802652F0 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 802652F4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802652F8 7D 89 03 A6 */ mtctr r12 -/* 802652FC 4E 80 04 21 */ bctrl -/* 80265300 7C 79 1B 78 */ mr r25, r3 -/* 80265304 7F A3 EB 78 */ mr r3, r29 -/* 80265308 7F 24 CB 78 */ mr r4, r25 -/* 8026530C 38 A1 00 08 */ addi r5, r1, 8 -/* 80265310 81 9D 00 1C */ lwz r12, 0x1c(r29) -/* 80265314 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 80265318 7D 89 03 A6 */ mtctr r12 -/* 8026531C 4E 80 04 21 */ bctrl -/* 80265320 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80265324 41 82 00 4C */ beq lbl_80265370 -/* 80265328 7F 23 CB 78 */ mr r3, r25 -/* 8026532C 81 99 00 1C */ lwz r12, 0x1c(r25) -/* 80265330 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 80265334 7D 89 03 A6 */ mtctr r12 -/* 80265338 4E 80 04 21 */ bctrl -/* 8026533C 7C 79 1B 78 */ mr r25, r3 -/* 80265340 7F A3 EB 78 */ mr r3, r29 -/* 80265344 81 9D 00 1C */ lwz r12, 0x1c(r29) -/* 80265348 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 8026534C 7D 89 03 A6 */ mtctr r12 -/* 80265350 4E 80 04 21 */ bctrl -/* 80265354 7C 65 1B 78 */ mr r5, r3 -/* 80265358 7F 63 DB 78 */ mr r3, r27 -/* 8026535C 80 9E 00 00 */ lwz r4, 0(r30) -/* 80265360 80 DC 00 00 */ lwz r6, 0(r28) -/* 80265364 7F 27 CB 78 */ mr r7, r25 -/* 80265368 C0 21 00 08 */ lfs f1, 8(r1) -/* 8026536C 48 00 02 79 */ bl SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf -lbl_80265370: -/* 80265370 3B 9C 00 04 */ addi r28, r28, 4 -lbl_80265374: -/* 80265374 7C 1C F8 40 */ cmplw r28, r31 -/* 80265378 41 80 FF 2C */ blt lbl_802652A4 -lbl_8026537C: -/* 8026537C 3B DE 00 04 */ addi r30, r30, 4 -lbl_80265380: -/* 80265380 7C 1E D0 40 */ cmplw r30, r26 -/* 80265384 41 80 FE EC */ blt lbl_80265270 -lbl_80265388: -/* 80265388 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026538C 48 0F CE 8D */ bl _restgpr_25 -/* 80265390 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80265394 7C 08 03 A6 */ mtlr r0 -/* 80265398 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026539C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_s/ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj.s b/asm/SSystem/SComponent/c_cc_s/ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj.s deleted file mode 100644 index 11b236fe48..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80264E2C: -/* 80264E2C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80264E30 7C 08 02 A6 */ mflr r0 -/* 80264E34 90 01 00 24 */ stw r0, 0x24(r1) -/* 80264E38 39 61 00 20 */ addi r11, r1, 0x20 -/* 80264E3C 48 0F D3 99 */ bl _savegpr_27 -/* 80264E40 7C 7B 1B 78 */ mr r27, r3 -/* 80264E44 7C 9C 23 78 */ mr r28, r4 -/* 80264E48 7C BF 2B 78 */ mr r31, r5 -/* 80264E4C 7F 83 E3 78 */ mr r3, r28 -/* 80264E50 4B FF EB F9 */ bl GetAc__8cCcD_ObjFv -/* 80264E54 7C 7D 1B 78 */ mr r29, r3 -/* 80264E58 7F E3 FB 78 */ mr r3, r31 -/* 80264E5C 4B FF EB ED */ bl GetAc__8cCcD_ObjFv -/* 80264E60 28 1D 00 00 */ cmplwi r29, 0 -/* 80264E64 41 82 00 14 */ beq lbl_80264E78 -/* 80264E68 28 03 00 00 */ cmplwi r3, 0 -/* 80264E6C 41 82 00 0C */ beq lbl_80264E78 -/* 80264E70 7C 1D 18 40 */ cmplw r29, r3 -/* 80264E74 41 82 00 28 */ beq lbl_80264E9C -lbl_80264E78: -/* 80264E78 80 1C 00 00 */ lwz r0, 0(r28) -/* 80264E7C 54 03 06 FC */ rlwinm r3, r0, 0, 0x1b, 0x1e -/* 80264E80 80 1F 00 18 */ lwz r0, 0x18(r31) -/* 80264E84 7C 60 00 39 */ and. r0, r3, r0 -/* 80264E88 41 82 00 14 */ beq lbl_80264E9C -/* 80264E8C 80 7C 00 10 */ lwz r3, 0x10(r28) -/* 80264E90 80 1F 00 28 */ lwz r0, 0x28(r31) -/* 80264E94 7C 60 00 39 */ and. r0, r3, r0 -/* 80264E98 40 82 00 0C */ bne lbl_80264EA4 -lbl_80264E9C: -/* 80264E9C 38 60 00 01 */ li r3, 1 -/* 80264EA0 48 00 00 88 */ b lbl_80264F28 -lbl_80264EA4: -/* 80264EA4 83 DC 00 44 */ lwz r30, 0x44(r28) -/* 80264EA8 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 80264EAC 81 83 00 18 */ lwz r12, 0x18(r3) -/* 80264EB0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80264EB4 7D 89 03 A6 */ mtctr r12 -/* 80264EB8 4E 80 04 21 */ bctrl -/* 80264EBC 7C 7D 1B 78 */ mr r29, r3 -/* 80264EC0 7F C3 F3 78 */ mr r3, r30 -/* 80264EC4 81 9E 00 18 */ lwz r12, 0x18(r30) -/* 80264EC8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80264ECC 7D 89 03 A6 */ mtctr r12 -/* 80264ED0 4E 80 04 21 */ bctrl -/* 80264ED4 7C 7E 1B 78 */ mr r30, r3 -/* 80264ED8 7F E3 FB 78 */ mr r3, r31 -/* 80264EDC 81 9F 00 3C */ lwz r12, 0x3c(r31) -/* 80264EE0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80264EE4 7D 89 03 A6 */ mtctr r12 -/* 80264EE8 4E 80 04 21 */ bctrl -/* 80264EEC 7C 7F 1B 78 */ mr r31, r3 -/* 80264EF0 7F 83 E3 78 */ mr r3, r28 -/* 80264EF4 81 9C 00 3C */ lwz r12, 0x3c(r28) -/* 80264EF8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80264EFC 7D 89 03 A6 */ mtctr r12 -/* 80264F00 4E 80 04 21 */ bctrl -/* 80264F04 7C 64 1B 78 */ mr r4, r3 -/* 80264F08 7F 63 DB 78 */ mr r3, r27 -/* 80264F0C 7F E5 FB 78 */ mr r5, r31 -/* 80264F10 7F C6 F3 78 */ mr r6, r30 -/* 80264F14 7F A7 EB 78 */ mr r7, r29 -/* 80264F18 81 9B 28 48 */ lwz r12, 0x2848(r27) -/* 80264F1C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80264F20 7D 89 03 A6 */ mtctr r12 -/* 80264F24 4E 80 04 21 */ bctrl -lbl_80264F28: -/* 80264F28 39 61 00 20 */ addi r11, r1, 0x20 -/* 80264F2C 48 0F D2 F5 */ bl _restgpr_27 -/* 80264F30 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80264F34 7C 08 03 A6 */ mtlr r0 -/* 80264F38 38 21 00 20 */ addi r1, r1, 0x20 -/* 80264F3C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_s/ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj.s b/asm/SSystem/SComponent/c_cc_s/ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj.s deleted file mode 100644 index 7e5353363a..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8026515C: -/* 8026515C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80265160 7C 08 02 A6 */ mflr r0 -/* 80265164 90 01 00 24 */ stw r0, 0x24(r1) -/* 80265168 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026516C 48 0F D0 6D */ bl _savegpr_28 -/* 80265170 7C 7C 1B 78 */ mr r28, r3 -/* 80265174 7C 9D 23 78 */ mr r29, r4 -/* 80265178 7C BE 2B 78 */ mr r30, r5 -/* 8026517C 7F A3 EB 78 */ mr r3, r29 -/* 80265180 4B FF E8 C9 */ bl GetAc__8cCcD_ObjFv -/* 80265184 7C 7F 1B 78 */ mr r31, r3 -/* 80265188 7F C3 F3 78 */ mr r3, r30 -/* 8026518C 4B FF E8 BD */ bl GetAc__8cCcD_ObjFv -/* 80265190 28 1F 00 00 */ cmplwi r31, 0 -/* 80265194 41 82 00 2C */ beq lbl_802651C0 -/* 80265198 28 03 00 00 */ cmplwi r3, 0 -/* 8026519C 41 82 00 24 */ beq lbl_802651C0 -/* 802651A0 7C 1F 18 40 */ cmplw r31, r3 -/* 802651A4 40 82 00 1C */ bne lbl_802651C0 -/* 802651A8 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 802651AC 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 802651B0 40 82 00 10 */ bne lbl_802651C0 -/* 802651B4 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 802651B8 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 802651BC 41 82 00 50 */ beq lbl_8026520C -lbl_802651C0: -/* 802651C0 80 BD 00 2C */ lwz r5, 0x2c(r29) -/* 802651C4 54 A3 07 3C */ rlwinm r3, r5, 0, 0x1c, 0x1e -/* 802651C8 80 9E 00 2C */ lwz r4, 0x2c(r30) -/* 802651CC 54 80 EF 3C */ rlwinm r0, r4, 0x1d, 0x1c, 0x1e -/* 802651D0 7C 60 00 39 */ and. r0, r3, r0 -/* 802651D4 41 82 00 38 */ beq lbl_8026520C -/* 802651D8 54 A3 EF 3C */ rlwinm r3, r5, 0x1d, 0x1c, 0x1e -/* 802651DC 54 80 07 3C */ rlwinm r0, r4, 0, 0x1c, 0x1e -/* 802651E0 7C 60 00 39 */ and. r0, r3, r0 -/* 802651E4 41 82 00 28 */ beq lbl_8026520C -/* 802651E8 7F 83 E3 78 */ mr r3, r28 -/* 802651EC 7F A4 EB 78 */ mr r4, r29 -/* 802651F0 7F C5 F3 78 */ mr r5, r30 -/* 802651F4 81 9C 28 48 */ lwz r12, 0x2848(r28) -/* 802651F8 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802651FC 7D 89 03 A6 */ mtctr r12 -/* 80265200 4E 80 04 21 */ bctrl -/* 80265204 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80265208 41 82 00 0C */ beq lbl_80265214 -lbl_8026520C: -/* 8026520C 38 60 00 01 */ li r3, 1 -/* 80265210 48 00 00 08 */ b lbl_80265218 -lbl_80265214: -/* 80265214 38 60 00 00 */ li r3, 0 -lbl_80265218: -/* 80265218 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026521C 48 0F D0 09 */ bl _restgpr_28 -/* 80265220 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80265224 7C 08 03 A6 */ mtlr r0 -/* 80265228 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026522C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_s/DrawClear__4cCcSFv.s b/asm/SSystem/SComponent/c_cc_s/DrawClear__4cCcSFv.s deleted file mode 100644 index 7807ebc091..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/DrawClear__4cCcSFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80265D30: -/* 80265D30 7C 65 1B 78 */ mr r5, r3 -/* 80265D34 38 80 00 00 */ li r4, 0 -/* 80265D38 48 00 00 0C */ b lbl_80265D44 -lbl_80265D3C: -/* 80265D3C 90 85 00 00 */ stw r4, 0(r5) -/* 80265D40 38 A5 00 04 */ addi r5, r5, 4 -lbl_80265D44: -/* 80265D44 A0 03 28 00 */ lhz r0, 0x2800(r3) -/* 80265D48 54 00 10 3A */ slwi r0, r0, 2 -/* 80265D4C 7C 03 02 14 */ add r0, r3, r0 -/* 80265D50 7C 05 00 40 */ cmplw r5, r0 -/* 80265D54 41 80 FF E8 */ blt lbl_80265D3C -/* 80265D58 38 A0 00 00 */ li r5, 0 -/* 80265D5C B0 A3 28 00 */ sth r5, 0x2800(r3) -/* 80265D60 38 C3 04 00 */ addi r6, r3, 0x400 -/* 80265D64 48 00 00 0C */ b lbl_80265D70 -lbl_80265D68: -/* 80265D68 90 A6 00 00 */ stw r5, 0(r6) -/* 80265D6C 38 C6 00 04 */ addi r6, r6, 4 -lbl_80265D70: -/* 80265D70 A0 03 28 02 */ lhz r0, 0x2802(r3) -/* 80265D74 54 04 10 3A */ slwi r4, r0, 2 -/* 80265D78 38 04 04 00 */ addi r0, r4, 0x400 -/* 80265D7C 7C 03 02 14 */ add r0, r3, r0 -/* 80265D80 7C 06 00 40 */ cmplw r6, r0 -/* 80265D84 41 80 FF E4 */ blt lbl_80265D68 -/* 80265D88 38 A0 00 00 */ li r5, 0 -/* 80265D8C B0 A3 28 02 */ sth r5, 0x2802(r3) -/* 80265D90 38 C3 10 00 */ addi r6, r3, 0x1000 -/* 80265D94 48 00 00 0C */ b lbl_80265DA0 -lbl_80265D98: -/* 80265D98 90 A6 00 00 */ stw r5, 0(r6) -/* 80265D9C 38 C6 00 04 */ addi r6, r6, 4 -lbl_80265DA0: -/* 80265DA0 A0 03 28 04 */ lhz r0, 0x2804(r3) -/* 80265DA4 54 04 10 3A */ slwi r4, r0, 2 -/* 80265DA8 38 04 10 00 */ addi r0, r4, 0x1000 -/* 80265DAC 7C 03 02 14 */ add r0, r3, r0 -/* 80265DB0 7C 06 00 40 */ cmplw r6, r0 -/* 80265DB4 41 80 FF E4 */ blt lbl_80265D98 -/* 80265DB8 38 A0 00 00 */ li r5, 0 -/* 80265DBC B0 A3 28 04 */ sth r5, 0x2804(r3) -/* 80265DC0 38 C3 14 00 */ addi r6, r3, 0x1400 -/* 80265DC4 48 00 00 0C */ b lbl_80265DD0 -lbl_80265DC8: -/* 80265DC8 90 A6 00 00 */ stw r5, 0(r6) -/* 80265DCC 38 C6 00 04 */ addi r6, r6, 4 -lbl_80265DD0: -/* 80265DD0 A0 03 28 06 */ lhz r0, 0x2806(r3) -/* 80265DD4 54 04 10 3A */ slwi r4, r0, 2 -/* 80265DD8 38 04 14 00 */ addi r0, r4, 0x1400 -/* 80265DDC 7C 03 02 14 */ add r0, r3, r0 -/* 80265DE0 7C 06 00 40 */ cmplw r6, r0 -/* 80265DE4 41 80 FF E4 */ blt lbl_80265DC8 -/* 80265DE8 38 00 00 00 */ li r0, 0 -/* 80265DEC B0 03 28 06 */ sth r0, 0x2806(r3) -/* 80265DF0 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_s/SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz.s b/asm/SSystem/SComponent/c_cc_s/SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz.s deleted file mode 100644 index 4ebdeffca2..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz.s +++ /dev/null @@ -1,141 +0,0 @@ -lbl_802653C8: -/* 802653C8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802653CC 7C 08 02 A6 */ mflr r0 -/* 802653D0 90 01 00 54 */ stw r0, 0x54(r1) -/* 802653D4 39 61 00 50 */ addi r11, r1, 0x50 -/* 802653D8 48 0F CD E5 */ bl _savegpr_21 -/* 802653DC 7C 7A 1B 78 */ mr r26, r3 -/* 802653E0 7C 9B 23 78 */ mr r27, r4 -/* 802653E4 7C BC 2B 78 */ mr r28, r5 -/* 802653E8 7C DD 33 78 */ mr r29, r6 -/* 802653EC 83 E4 00 44 */ lwz r31, 0x44(r4) -/* 802653F0 83 C5 00 44 */ lwz r30, 0x44(r5) -/* 802653F4 80 04 00 00 */ lwz r0, 0(r4) -/* 802653F8 54 16 06 B4 */ rlwinm r22, r0, 0, 0x1a, 0x1a -/* 802653FC 80 05 00 18 */ lwz r0, 0x18(r5) -/* 80265400 54 15 06 B4 */ rlwinm r21, r0, 0, 0x1a, 0x1a -/* 80265404 7F C3 F3 78 */ mr r3, r30 -/* 80265408 81 9E 00 18 */ lwz r12, 0x18(r30) -/* 8026540C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80265410 7D 89 03 A6 */ mtctr r12 -/* 80265414 4E 80 04 21 */ bctrl -/* 80265418 7C 79 1B 78 */ mr r25, r3 -/* 8026541C 7F E3 FB 78 */ mr r3, r31 -/* 80265420 81 9F 00 18 */ lwz r12, 0x18(r31) -/* 80265424 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80265428 7D 89 03 A6 */ mtctr r12 -/* 8026542C 4E 80 04 21 */ bctrl -/* 80265430 7C 78 1B 78 */ mr r24, r3 -/* 80265434 7F 83 E3 78 */ mr r3, r28 -/* 80265438 81 9C 00 3C */ lwz r12, 0x3c(r28) -/* 8026543C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80265440 7D 89 03 A6 */ mtctr r12 -/* 80265444 4E 80 04 21 */ bctrl -/* 80265448 7C 77 1B 78 */ mr r23, r3 -/* 8026544C 7F 63 DB 78 */ mr r3, r27 -/* 80265450 81 9B 00 3C */ lwz r12, 0x3c(r27) -/* 80265454 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80265458 7D 89 03 A6 */ mtctr r12 -/* 8026545C 4E 80 04 21 */ bctrl -/* 80265460 7C 66 1B 78 */ mr r6, r3 -/* 80265464 93 21 00 08 */ stw r25, 8(r1) -/* 80265468 7F 43 D3 78 */ mr r3, r26 -/* 8026546C 7E A0 00 34 */ cntlzw r0, r21 -/* 80265470 54 04 D9 7E */ srwi r4, r0, 5 -/* 80265474 7E C0 00 34 */ cntlzw r0, r22 -/* 80265478 54 05 D9 7E */ srwi r5, r0, 5 -/* 8026547C 7E E7 BB 78 */ mr r7, r23 -/* 80265480 7F E8 FB 78 */ mr r8, r31 -/* 80265484 7F C9 F3 78 */ mr r9, r30 -/* 80265488 7F 0A C3 78 */ mr r10, r24 -/* 8026548C 81 9A 28 48 */ lwz r12, 0x2848(r26) -/* 80265490 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80265494 7D 89 03 A6 */ mtctr r12 -/* 80265498 4E 80 04 21 */ bctrl -/* 8026549C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802654A0 40 82 01 2C */ bne lbl_802655CC -/* 802654A4 80 1C 00 18 */ lwz r0, 0x18(r28) -/* 802654A8 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 802654AC 40 82 00 10 */ bne lbl_802654BC -/* 802654B0 7F 63 DB 78 */ mr r3, r27 -/* 802654B4 7F 84 E3 78 */ mr r4, r28 -/* 802654B8 4B FF F3 85 */ bl SetHit__10cCcD_ObjAtFP8cCcD_Obj -lbl_802654BC: -/* 802654BC 38 60 00 00 */ li r3, 0 -/* 802654C0 80 1B 00 00 */ lwz r0, 0(r27) -/* 802654C4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 802654C8 40 82 00 20 */ bne lbl_802654E8 -/* 802654CC 80 1B 00 10 */ lwz r0, 0x10(r27) -/* 802654D0 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802654D4 41 82 00 10 */ beq lbl_802654E4 -/* 802654D8 80 1C 00 18 */ lwz r0, 0x18(r28) -/* 802654DC 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 802654E0 40 82 00 08 */ bne lbl_802654E8 -lbl_802654E4: -/* 802654E4 38 60 00 01 */ li r3, 1 -lbl_802654E8: -/* 802654E8 7C 76 1B 78 */ mr r22, r3 -/* 802654EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802654F0 41 82 00 34 */ beq lbl_80265524 -/* 802654F4 38 7C 00 18 */ addi r3, r28, 0x18 -/* 802654F8 7F 64 DB 78 */ mr r4, r27 -/* 802654FC 4B FF F3 CD */ bl SetHit__10cCcD_ObjTgFP8cCcD_Obj -/* 80265500 7F 43 D3 78 */ mr r3, r26 -/* 80265504 7F 64 DB 78 */ mr r4, r27 -/* 80265508 7F 85 E3 78 */ mr r5, r28 -/* 8026550C 7F E6 FB 78 */ mr r6, r31 -/* 80265510 7F C7 F3 78 */ mr r7, r30 -/* 80265514 81 9A 28 48 */ lwz r12, 0x2848(r26) -/* 80265518 81 8C 00 08 */ lwz r12, 8(r12) -/* 8026551C 7D 89 03 A6 */ mtctr r12 -/* 80265520 4E 80 04 21 */ bctrl -lbl_80265524: -/* 80265524 80 1C 00 18 */ lwz r0, 0x18(r28) -/* 80265528 54 15 06 B4 */ rlwinm r21, r0, 0, 0x1a, 0x1a -/* 8026552C 7F C3 F3 78 */ mr r3, r30 -/* 80265530 81 9E 00 18 */ lwz r12, 0x18(r30) -/* 80265534 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80265538 7D 89 03 A6 */ mtctr r12 -/* 8026553C 4E 80 04 21 */ bctrl -/* 80265540 7C 77 1B 78 */ mr r23, r3 -/* 80265544 7F E3 FB 78 */ mr r3, r31 -/* 80265548 81 9F 00 18 */ lwz r12, 0x18(r31) -/* 8026554C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80265550 7D 89 03 A6 */ mtctr r12 -/* 80265554 4E 80 04 21 */ bctrl -/* 80265558 7C 78 1B 78 */ mr r24, r3 -/* 8026555C 7F 83 E3 78 */ mr r3, r28 -/* 80265560 81 9C 00 3C */ lwz r12, 0x3c(r28) -/* 80265564 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80265568 7D 89 03 A6 */ mtctr r12 -/* 8026556C 4E 80 04 21 */ bctrl -/* 80265570 7C 79 1B 78 */ mr r25, r3 -/* 80265574 7F 63 DB 78 */ mr r3, r27 -/* 80265578 81 9B 00 3C */ lwz r12, 0x3c(r27) -/* 8026557C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80265580 7D 89 03 A6 */ mtctr r12 -/* 80265584 4E 80 04 21 */ bctrl -/* 80265588 7C 68 1B 78 */ mr r8, r3 -/* 8026558C 93 C1 00 08 */ stw r30, 8(r1) -/* 80265590 93 01 00 0C */ stw r24, 0xc(r1) -/* 80265594 92 E1 00 10 */ stw r23, 0x10(r1) -/* 80265598 93 A1 00 14 */ stw r29, 0x14(r1) -/* 8026559C 7F 43 D3 78 */ mr r3, r26 -/* 802655A0 7E A0 00 34 */ cntlzw r0, r21 -/* 802655A4 54 04 D9 7E */ srwi r4, r0, 5 -/* 802655A8 7E C5 B3 78 */ mr r5, r22 -/* 802655AC 7F 66 DB 78 */ mr r6, r27 -/* 802655B0 7F 87 E3 78 */ mr r7, r28 -/* 802655B4 7F 29 CB 78 */ mr r9, r25 -/* 802655B8 7F EA FB 78 */ mr r10, r31 -/* 802655BC 81 9A 28 48 */ lwz r12, 0x2848(r26) -/* 802655C0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802655C4 7D 89 03 A6 */ mtctr r12 -/* 802655C8 4E 80 04 21 */ bctrl -lbl_802655CC: -/* 802655CC 39 61 00 50 */ addi r11, r1, 0x50 -/* 802655D0 48 0F CC 39 */ bl _restgpr_21 -/* 802655D4 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802655D8 7C 08 03 A6 */ mtlr r0 -/* 802655DC 38 21 00 50 */ addi r1, r1, 0x50 -/* 802655E0 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_s/SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s b/asm/SSystem/SComponent/c_cc_s/SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s deleted file mode 100644 index 8a24036023..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_802655E4: -/* 802655E4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802655E8 7C 08 02 A6 */ mflr r0 -/* 802655EC 90 01 00 44 */ stw r0, 0x44(r1) -/* 802655F0 DB E1 00 38 */ stfd f31, 0x38(r1) -/* 802655F4 39 61 00 38 */ addi r11, r1, 0x38 -/* 802655F8 48 0F CB C9 */ bl _savegpr_22 -/* 802655FC 7C 79 1B 78 */ mr r25, r3 -/* 80265600 7C 9A 23 78 */ mr r26, r4 -/* 80265604 7C BB 2B 78 */ mr r27, r5 -/* 80265608 7C DC 33 78 */ mr r28, r6 -/* 8026560C 7C FD 3B 78 */ mr r29, r7 -/* 80265610 FF E0 08 90 */ fmr f31, f1 -/* 80265614 80 06 00 2C */ lwz r0, 0x2c(r6) -/* 80265618 54 00 05 AC */ rlwinm r0, r0, 0, 0x16, 0x16 -/* 8026561C 7C 03 00 34 */ cntlzw r3, r0 -/* 80265620 54 60 D9 7E */ srwi r0, r3, 5 -/* 80265624 7C 1F 03 78 */ mr r31, r0 -/* 80265628 80 04 00 2C */ lwz r0, 0x2c(r4) -/* 8026562C 54 00 05 AC */ rlwinm r0, r0, 0, 0x16, 0x16 -/* 80265630 7C 00 00 34 */ cntlzw r0, r0 -/* 80265634 54 00 D9 7E */ srwi r0, r0, 5 -/* 80265638 7C 1E 03 78 */ mr r30, r0 -/* 8026563C 54 60 DE 3F */ rlwinm. r0, r3, 0x1b, 0x18, 0x1f -/* 80265640 41 82 00 10 */ beq lbl_80265650 -/* 80265644 38 7A 00 2C */ addi r3, r26, 0x2c -/* 80265648 7F 84 E3 78 */ mr r4, r28 -/* 8026564C 4B FF F2 8D */ bl SetHit__10cCcD_ObjCoFP8cCcD_Obj -lbl_80265650: -/* 80265650 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80265654 41 82 00 10 */ beq lbl_80265664 -/* 80265658 38 7C 00 2C */ addi r3, r28, 0x2c -/* 8026565C 7F 44 D3 78 */ mr r4, r26 -/* 80265660 4B FF F2 79 */ bl SetHit__10cCcD_ObjCoFP8cCcD_Obj -lbl_80265664: -/* 80265664 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80265668 41 82 00 34 */ beq lbl_8026569C -/* 8026566C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80265670 41 82 00 2C */ beq lbl_8026569C -/* 80265674 7F 23 CB 78 */ mr r3, r25 -/* 80265678 7F 44 D3 78 */ mr r4, r26 -/* 8026567C 7F 65 DB 78 */ mr r5, r27 -/* 80265680 7F 86 E3 78 */ mr r6, r28 -/* 80265684 7F A7 EB 78 */ mr r7, r29 -/* 80265688 FC 20 F8 90 */ fmr f1, f31 -/* 8026568C 81 99 28 48 */ lwz r12, 0x2848(r25) -/* 80265690 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80265694 7D 89 03 A6 */ mtctr r12 -/* 80265698 4E 80 04 21 */ bctrl -lbl_8026569C: -/* 8026569C 82 FA 00 44 */ lwz r23, 0x44(r26) -/* 802656A0 82 DC 00 44 */ lwz r22, 0x44(r28) -/* 802656A4 7E C3 B3 78 */ mr r3, r22 -/* 802656A8 81 96 00 18 */ lwz r12, 0x18(r22) -/* 802656AC 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802656B0 7D 89 03 A6 */ mtctr r12 -/* 802656B4 4E 80 04 21 */ bctrl -/* 802656B8 7C 78 1B 78 */ mr r24, r3 -/* 802656BC 7E E3 BB 78 */ mr r3, r23 -/* 802656C0 81 97 00 18 */ lwz r12, 0x18(r23) -/* 802656C4 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802656C8 7D 89 03 A6 */ mtctr r12 -/* 802656CC 4E 80 04 21 */ bctrl -/* 802656D0 7C 7D 1B 78 */ mr r29, r3 -/* 802656D4 7F 83 E3 78 */ mr r3, r28 -/* 802656D8 81 9C 00 3C */ lwz r12, 0x3c(r28) -/* 802656DC 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802656E0 7D 89 03 A6 */ mtctr r12 -/* 802656E4 4E 80 04 21 */ bctrl -/* 802656E8 7C 7B 1B 78 */ mr r27, r3 -/* 802656EC 7F 43 D3 78 */ mr r3, r26 -/* 802656F0 81 9A 00 3C */ lwz r12, 0x3c(r26) -/* 802656F4 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802656F8 7D 89 03 A6 */ mtctr r12 -/* 802656FC 4E 80 04 21 */ bctrl -/* 80265700 7C 66 1B 78 */ mr r6, r3 -/* 80265704 93 01 00 08 */ stw r24, 8(r1) -/* 80265708 7F 23 CB 78 */ mr r3, r25 -/* 8026570C 7F E4 FB 78 */ mr r4, r31 -/* 80265710 7F C5 F3 78 */ mr r5, r30 -/* 80265714 7F 67 DB 78 */ mr r7, r27 -/* 80265718 7E E8 BB 78 */ mr r8, r23 -/* 8026571C 7E C9 B3 78 */ mr r9, r22 -/* 80265720 7F AA EB 78 */ mr r10, r29 -/* 80265724 81 99 28 48 */ lwz r12, 0x2848(r25) -/* 80265728 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8026572C 7D 89 03 A6 */ mtctr r12 -/* 80265730 4E 80 04 21 */ bctrl -/* 80265734 CB E1 00 38 */ lfd f31, 0x38(r1) -/* 80265738 39 61 00 38 */ addi r11, r1, 0x38 -/* 8026573C 48 0F CA D1 */ bl _restgpr_22 -/* 80265740 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80265744 7C 08 03 A6 */ mtlr r0 -/* 80265748 38 21 00 40 */ addi r1, r1, 0x40 -/* 8026574C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_s/SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s b/asm/SSystem/SComponent/c_cc_s/SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s deleted file mode 100644 index 0134d14940..0000000000 --- a/asm/SSystem/SComponent/c_cc_s/SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s +++ /dev/null @@ -1,308 +0,0 @@ -lbl_80265750: -/* 80265750 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80265754 7C 08 02 A6 */ mflr r0 -/* 80265758 90 01 00 84 */ stw r0, 0x84(r1) -/* 8026575C DB E1 00 70 */ stfd f31, 0x70(r1) -/* 80265760 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 80265764 DB C1 00 60 */ stfd f30, 0x60(r1) -/* 80265768 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 8026576C DB A1 00 50 */ stfd f29, 0x50(r1) -/* 80265770 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */ -/* 80265774 39 61 00 50 */ addi r11, r1, 0x50 -/* 80265778 48 0F CA 55 */ bl _savegpr_25 -/* 8026577C 7C 7A 1B 78 */ mr r26, r3 -/* 80265780 7C 9B 23 78 */ mr r27, r4 -/* 80265784 7C BC 2B 78 */ mr r28, r5 -/* 80265788 7C DD 33 78 */ mr r29, r6 -/* 8026578C 7C FE 3B 78 */ mr r30, r7 -/* 80265790 FF A0 08 90 */ fmr f29, f1 -/* 80265794 80 04 00 2C */ lwz r0, 0x2c(r4) -/* 80265798 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 8026579C 40 82 03 E8 */ bne lbl_80265B84 -/* 802657A0 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 802657A4 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 802657A8 41 82 00 08 */ beq lbl_802657B0 -/* 802657AC 48 00 03 D8 */ b lbl_80265B84 -lbl_802657B0: -/* 802657B0 80 7B 00 44 */ lwz r3, 0x44(r27) -/* 802657B4 28 03 00 00 */ cmplwi r3, 0 -/* 802657B8 41 82 03 CC */ beq lbl_80265B84 -/* 802657BC 80 9D 00 44 */ lwz r4, 0x44(r29) -/* 802657C0 28 04 00 00 */ cmplwi r4, 0 -/* 802657C4 40 82 00 08 */ bne lbl_802657CC -/* 802657C8 48 00 03 BC */ b lbl_80265B84 -lbl_802657CC: -/* 802657CC 80 03 00 0C */ lwz r0, 0xc(r3) -/* 802657D0 28 00 00 00 */ cmplwi r0, 0 -/* 802657D4 41 82 00 10 */ beq lbl_802657E4 -/* 802657D8 80 64 00 0C */ lwz r3, 0xc(r4) -/* 802657DC 7C 00 18 40 */ cmplw r0, r3 -/* 802657E0 41 82 03 A4 */ beq lbl_80265B84 -lbl_802657E4: -/* 802657E4 FC 00 EA 10 */ fabs f0, f29 -/* 802657E8 FC 20 00 18 */ frsp f1, f0 -/* 802657EC C0 02 B6 3C */ lfs f0, lit_2759(r2) -/* 802657F0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802657F4 41 80 03 90 */ blt lbl_80265B84 -/* 802657F8 7F 43 D3 78 */ mr r3, r26 -/* 802657FC 7F 64 DB 78 */ mr r4, r27 -/* 80265800 7F A5 EB 78 */ mr r5, r29 -/* 80265804 81 9A 28 48 */ lwz r12, 0x2848(r26) -/* 80265808 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8026580C 7D 89 03 A6 */ mtctr r12 -/* 80265810 4E 80 04 21 */ bctrl -/* 80265814 3B E0 00 00 */ li r31, 0 -/* 80265818 80 1B 00 2C */ lwz r0, 0x2c(r27) -/* 8026581C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 80265820 41 82 00 14 */ beq lbl_80265834 -/* 80265824 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 80265828 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 8026582C 41 82 00 08 */ beq lbl_80265834 -/* 80265830 3B E0 00 01 */ li r31, 1 -lbl_80265834: -/* 80265834 80 7B 00 44 */ lwz r3, 0x44(r27) -/* 80265838 88 83 00 14 */ lbz r4, 0x14(r3) -/* 8026583C 7F 43 D3 78 */ mr r3, r26 -/* 80265840 4B FF F3 41 */ bl GetWt__4cCcSCFUc -/* 80265844 7C 79 1B 78 */ mr r25, r3 -/* 80265848 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 8026584C 88 83 00 14 */ lbz r4, 0x14(r3) -/* 80265850 7F 43 D3 78 */ mr r3, r26 -/* 80265854 4B FF F3 2D */ bl GetWt__4cCcSCFUc -/* 80265858 7C 7A 1B 78 */ mr r26, r3 -/* 8026585C 80 7B 00 44 */ lwz r3, 0x44(r27) -/* 80265860 4B FF E1 25 */ bl GetWeightF__9cCcD_SttsCFv -/* 80265864 FF C0 08 90 */ fmr f30, f1 -/* 80265868 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 8026586C 4B FF E1 19 */ bl GetWeightF__9cCcD_SttsCFv -/* 80265870 EC 7E 08 2A */ fadds f3, f30, f1 -/* 80265874 FC 00 1A 10 */ fabs f0, f3 -/* 80265878 FC 40 00 18 */ frsp f2, f0 -/* 8026587C C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 80265880 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80265884 40 80 00 10 */ bge lbl_80265894 -/* 80265888 C3 C2 B6 40 */ lfs f30, lit_2760(r2) -/* 8026588C FC 20 F0 90 */ fmr f1, f30 -/* 80265890 C0 62 B6 44 */ lfs f3, lit_2761(r2) -lbl_80265894: -/* 80265894 C0 02 B6 40 */ lfs f0, lit_2760(r2) -/* 80265898 EC 40 18 24 */ fdivs f2, f0, f3 -/* 8026589C 2C 19 00 00 */ cmpwi r25, 0 -/* 802658A0 40 82 00 18 */ bne lbl_802658B8 -/* 802658A4 2C 1A 00 00 */ cmpwi r26, 0 -/* 802658A8 41 82 02 DC */ beq lbl_80265B84 -/* 802658AC C3 E2 B6 38 */ lfs f31, lit_2532(r2) -/* 802658B0 FF C0 00 90 */ fmr f30, f0 -/* 802658B4 48 00 00 5C */ b lbl_80265910 -lbl_802658B8: -/* 802658B8 2C 19 00 01 */ cmpwi r25, 1 -/* 802658BC 40 82 00 38 */ bne lbl_802658F4 -/* 802658C0 2C 1A 00 00 */ cmpwi r26, 0 -/* 802658C4 40 82 00 10 */ bne lbl_802658D4 -/* 802658C8 FF E0 00 90 */ fmr f31, f0 -/* 802658CC C3 C2 B6 38 */ lfs f30, lit_2532(r2) -/* 802658D0 48 00 00 40 */ b lbl_80265910 -lbl_802658D4: -/* 802658D4 2C 1A 00 01 */ cmpwi r26, 1 -/* 802658D8 40 82 00 10 */ bne lbl_802658E8 -/* 802658DC C3 E2 B6 48 */ lfs f31, lit_2762(r2) -/* 802658E0 FF C0 F8 90 */ fmr f30, f31 -/* 802658E4 48 00 00 2C */ b lbl_80265910 -lbl_802658E8: -/* 802658E8 C3 E2 B6 38 */ lfs f31, lit_2532(r2) -/* 802658EC FF C0 00 90 */ fmr f30, f0 -/* 802658F0 48 00 00 20 */ b lbl_80265910 -lbl_802658F4: -/* 802658F4 2C 1A 00 02 */ cmpwi r26, 2 -/* 802658F8 40 82 00 10 */ bne lbl_80265908 -/* 802658FC EF E1 00 B2 */ fmuls f31, f1, f2 -/* 80265900 EF DE 00 B2 */ fmuls f30, f30, f2 -/* 80265904 48 00 00 0C */ b lbl_80265910 -lbl_80265908: -/* 80265908 FF E0 00 90 */ fmr f31, f0 -/* 8026590C C3 C2 B6 38 */ lfs f30, lit_2532(r2) -lbl_80265910: -/* 80265910 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80265914 41 82 00 20 */ beq lbl_80265934 -/* 80265918 7F C3 F3 78 */ mr r3, r30 -/* 8026591C 7F 84 E3 78 */ mr r4, r28 -/* 80265920 38 A1 00 0C */ addi r5, r1, 0xc -/* 80265924 48 0E 17 91 */ bl PSVECSubtract -/* 80265928 38 61 00 0C */ addi r3, r1, 0xc -/* 8026592C 48 0E 18 25 */ bl PSVECMag -/* 80265930 48 00 01 18 */ b lbl_80265A48 -lbl_80265934: -/* 80265934 C0 3E 00 00 */ lfs f1, 0(r30) -/* 80265938 C0 1C 00 00 */ lfs f0, 0(r28) -/* 8026593C EC 61 00 28 */ fsubs f3, f1, f0 -/* 80265940 D0 61 00 0C */ stfs f3, 0xc(r1) -/* 80265944 C0 42 B6 38 */ lfs f2, lit_2532(r2) -/* 80265948 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 8026594C C0 3E 00 08 */ lfs f1, 8(r30) -/* 80265950 C0 1C 00 08 */ lfs f0, 8(r28) -/* 80265954 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80265958 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8026595C EC 23 00 F2 */ fmuls f1, f3, f3 -/* 80265960 EC 00 00 32 */ fmuls f0, f0, f0 -/* 80265964 EC 21 00 2A */ fadds f1, f1, f0 -/* 80265968 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 8026596C 40 81 00 58 */ ble lbl_802659C4 -/* 80265970 FC 00 08 34 */ frsqrte f0, f1 -/* 80265974 C8 82 B6 50 */ lfd f4, lit_2763(r2) -/* 80265978 FC 44 00 32 */ fmul f2, f4, f0 -/* 8026597C C8 62 B6 58 */ lfd f3, lit_2764(r2) -/* 80265980 FC 00 00 32 */ fmul f0, f0, f0 -/* 80265984 FC 01 00 32 */ fmul f0, f1, f0 -/* 80265988 FC 03 00 28 */ fsub f0, f3, f0 -/* 8026598C FC 02 00 32 */ fmul f0, f2, f0 -/* 80265990 FC 44 00 32 */ fmul f2, f4, f0 -/* 80265994 FC 00 00 32 */ fmul f0, f0, f0 -/* 80265998 FC 01 00 32 */ fmul f0, f1, f0 -/* 8026599C FC 03 00 28 */ fsub f0, f3, f0 -/* 802659A0 FC 02 00 32 */ fmul f0, f2, f0 -/* 802659A4 FC 44 00 32 */ fmul f2, f4, f0 -/* 802659A8 FC 00 00 32 */ fmul f0, f0, f0 -/* 802659AC FC 01 00 32 */ fmul f0, f1, f0 -/* 802659B0 FC 03 00 28 */ fsub f0, f3, f0 -/* 802659B4 FC 02 00 32 */ fmul f0, f2, f0 -/* 802659B8 FC 21 00 32 */ fmul f1, f1, f0 -/* 802659BC FC 20 08 18 */ frsp f1, f1 -/* 802659C0 48 00 00 88 */ b lbl_80265A48 -lbl_802659C4: -/* 802659C4 C8 02 B6 60 */ lfd f0, lit_2765(r2) -/* 802659C8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802659CC 40 80 00 10 */ bge lbl_802659DC -/* 802659D0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 802659D4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 802659D8 48 00 00 70 */ b lbl_80265A48 -lbl_802659DC: -/* 802659DC D0 21 00 08 */ stfs f1, 8(r1) -/* 802659E0 80 81 00 08 */ lwz r4, 8(r1) -/* 802659E4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 802659E8 3C 00 7F 80 */ lis r0, 0x7f80 -/* 802659EC 7C 03 00 00 */ cmpw r3, r0 -/* 802659F0 41 82 00 14 */ beq lbl_80265A04 -/* 802659F4 40 80 00 40 */ bge lbl_80265A34 -/* 802659F8 2C 03 00 00 */ cmpwi r3, 0 -/* 802659FC 41 82 00 20 */ beq lbl_80265A1C -/* 80265A00 48 00 00 34 */ b lbl_80265A34 -lbl_80265A04: -/* 80265A04 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80265A08 41 82 00 0C */ beq lbl_80265A14 -/* 80265A0C 38 00 00 01 */ li r0, 1 -/* 80265A10 48 00 00 28 */ b lbl_80265A38 -lbl_80265A14: -/* 80265A14 38 00 00 02 */ li r0, 2 -/* 80265A18 48 00 00 20 */ b lbl_80265A38 -lbl_80265A1C: -/* 80265A1C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80265A20 41 82 00 0C */ beq lbl_80265A2C -/* 80265A24 38 00 00 05 */ li r0, 5 -/* 80265A28 48 00 00 10 */ b lbl_80265A38 -lbl_80265A2C: -/* 80265A2C 38 00 00 03 */ li r0, 3 -/* 80265A30 48 00 00 08 */ b lbl_80265A38 -lbl_80265A34: -/* 80265A34 38 00 00 04 */ li r0, 4 -lbl_80265A38: -/* 80265A38 2C 00 00 01 */ cmpwi r0, 1 -/* 80265A3C 40 82 00 0C */ bne lbl_80265A48 -/* 80265A40 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80265A44 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80265A48: -/* 80265A48 FC 00 0A 10 */ fabs f0, f1 -/* 80265A4C FC 00 00 18 */ frsp f0, f0 -/* 80265A50 C0 4D 8C 00 */ lfs f2, G_CM3D_F_ABS_MIN(r13) -/* 80265A54 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80265A58 41 80 00 9C */ blt lbl_80265AF4 -/* 80265A5C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80265A60 41 82 00 40 */ beq lbl_80265AA0 -/* 80265A64 38 61 00 0C */ addi r3, r1, 0xc -/* 80265A68 7C 64 1B 78 */ mr r4, r3 -/* 80265A6C EC 3D 08 24 */ fdivs f1, f29, f1 -/* 80265A70 48 0E 16 69 */ bl PSVECScale -/* 80265A74 C0 02 B6 68 */ lfs f0, lit_2766(r2) -/* 80265A78 EF FF 00 32 */ fmuls f31, f31, f0 -/* 80265A7C 38 61 00 0C */ addi r3, r1, 0xc -/* 80265A80 38 81 00 24 */ addi r4, r1, 0x24 -/* 80265A84 FC 20 F8 90 */ fmr f1, f31 -/* 80265A88 48 0E 16 51 */ bl PSVECScale -/* 80265A8C 38 61 00 0C */ addi r3, r1, 0xc -/* 80265A90 38 81 00 18 */ addi r4, r1, 0x18 -/* 80265A94 FC 20 F0 90 */ fmr f1, f30 -/* 80265A98 48 0E 16 41 */ bl PSVECScale -/* 80265A9C 48 00 00 A0 */ b lbl_80265B3C -lbl_80265AA0: -/* 80265AA0 EC 3D 08 24 */ fdivs f1, f29, f1 -/* 80265AA4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80265AA8 EC 60 00 72 */ fmuls f3, f0, f1 -/* 80265AAC D0 61 00 0C */ stfs f3, 0xc(r1) -/* 80265AB0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80265AB4 EC 40 00 72 */ fmuls f2, f0, f1 -/* 80265AB8 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80265ABC FC 00 18 50 */ fneg f0, f3 -/* 80265AC0 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80265AC4 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80265AC8 C0 22 B6 38 */ lfs f1, lit_2532(r2) -/* 80265ACC D0 21 00 28 */ stfs f1, 0x28(r1) -/* 80265AD0 FC 00 10 50 */ fneg f0, f2 -/* 80265AD4 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80265AD8 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80265ADC EC 03 07 B2 */ fmuls f0, f3, f30 -/* 80265AE0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80265AE4 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80265AE8 EC 02 07 B2 */ fmuls f0, f2, f30 -/* 80265AEC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80265AF0 48 00 00 4C */ b lbl_80265B3C -lbl_80265AF4: -/* 80265AF4 C0 02 B6 38 */ lfs f0, lit_2532(r2) -/* 80265AF8 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80265AFC D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80265B00 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80265B04 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80265B08 FC 00 EA 10 */ fabs f0, f29 -/* 80265B0C FC 00 00 18 */ frsp f0, f0 -/* 80265B10 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80265B14 41 80 00 1C */ blt lbl_80265B30 -/* 80265B18 FC 00 E8 50 */ fneg f0, f29 -/* 80265B1C EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80265B20 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80265B24 EC 1D 07 B2 */ fmuls f0, f29, f30 -/* 80265B28 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80265B2C 48 00 00 10 */ b lbl_80265B3C -lbl_80265B30: -/* 80265B30 FC 00 F8 50 */ fneg f0, f31 -/* 80265B34 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80265B38 D3 C1 00 18 */ stfs f30, 0x18(r1) -lbl_80265B3C: -/* 80265B3C 80 7B 00 44 */ lwz r3, 0x44(r27) -/* 80265B40 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80265B44 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 80265B48 C0 61 00 2C */ lfs f3, 0x2c(r1) -/* 80265B4C 4B FF DD E9 */ bl PlusCcMove__9cCcD_SttsFfff -/* 80265B50 80 7D 00 44 */ lwz r3, 0x44(r29) -/* 80265B54 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 80265B58 C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 80265B5C C0 61 00 20 */ lfs f3, 0x20(r1) -/* 80265B60 4B FF DD D5 */ bl PlusCcMove__9cCcD_SttsFfff -/* 80265B64 7F 83 E3 78 */ mr r3, r28 -/* 80265B68 38 81 00 24 */ addi r4, r1, 0x24 -/* 80265B6C 7F 85 E3 78 */ mr r5, r28 -/* 80265B70 48 0E 15 21 */ bl PSVECAdd -/* 80265B74 7F C3 F3 78 */ mr r3, r30 -/* 80265B78 38 81 00 18 */ addi r4, r1, 0x18 -/* 80265B7C 7F C5 F3 78 */ mr r5, r30 -/* 80265B80 48 0E 15 11 */ bl PSVECAdd -lbl_80265B84: -/* 80265B84 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 80265B88 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 80265B8C E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 80265B90 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 80265B94 E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */ -/* 80265B98 CB A1 00 50 */ lfd f29, 0x50(r1) -/* 80265B9C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80265BA0 48 0F C6 79 */ bl _restgpr_25 -/* 80265BA4 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80265BA8 7C 08 03 A6 */ mtlr r0 -/* 80265BAC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80265BB0 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf.s b/asm/d/cc/d_cc_mass_s/Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf.s deleted file mode 100644 index be74ecf2e7..0000000000 --- a/asm/d/cc/d_cc_mass_s/Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf.s +++ /dev/null @@ -1,289 +0,0 @@ -lbl_800858AC: -/* 800858AC 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 800858B0 7C 08 02 A6 */ mflr r0 -/* 800858B4 90 01 00 84 */ stw r0, 0x84(r1) -/* 800858B8 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 800858BC F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 800858C0 39 61 00 70 */ addi r11, r1, 0x70 -/* 800858C4 48 2D C9 01 */ bl _savegpr_23 -/* 800858C8 7C 78 1B 78 */ mr r24, r3 -/* 800858CC 7C 99 23 78 */ mr r25, r4 -/* 800858D0 7C BA 2B 78 */ mr r26, r5 -/* 800858D4 7C DB 33 78 */ mr r27, r6 -/* 800858D8 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 800858DC 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 800858E0 90 01 00 44 */ stw r0, 0x44(r1) -/* 800858E4 3B C0 00 00 */ li r30, 0 -/* 800858E8 38 00 00 00 */ li r0, 0 -/* 800858EC 90 05 00 00 */ stw r0, 0(r5) -/* 800858F0 38 78 01 E8 */ addi r3, r24, 0x1e8 -/* 800858F4 48 1E 98 E9 */ bl SetC__8cM3dGCylFRC4cXyz -/* 800858F8 38 78 01 C8 */ addi r3, r24, 0x1c8 -/* 800858FC 81 98 01 E4 */ lwz r12, 0x1e4(r24) -/* 80085900 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80085904 7D 89 03 A6 */ mtctr r12 -/* 80085908 4E 80 04 21 */ bctrl -/* 8008590C 7F 03 C3 78 */ mr r3, r24 -/* 80085910 38 81 00 38 */ addi r4, r1, 0x38 -/* 80085914 38 B8 01 C8 */ addi r5, r24, 0x1c8 -/* 80085918 48 1D DD 89 */ bl CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab -/* 8008591C 7F 63 DB 78 */ mr r3, r27 -/* 80085920 4B FF FA 15 */ bl ClearPointer__15dCcMassS_HitInfFv -/* 80085924 88 18 02 00 */ lbz r0, 0x200(r24) -/* 80085928 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8008592C 41 82 00 C4 */ beq lbl_800859F0 -/* 80085930 3B F8 01 88 */ addi r31, r24, 0x188 -/* 80085934 48 00 00 A4 */ b lbl_800859D8 -lbl_80085938: -/* 80085938 38 7F 00 0C */ addi r3, r31, 0xc -/* 8008593C 38 81 00 38 */ addi r4, r1, 0x38 -/* 80085940 48 1D DA 29 */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo -/* 80085944 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80085948 41 82 00 8C */ beq lbl_800859D4 -/* 8008594C 82 FF 00 00 */ lwz r23, 0(r31) -/* 80085950 7E E3 BB 78 */ mr r3, r23 -/* 80085954 81 97 00 3C */ lwz r12, 0x3c(r23) -/* 80085958 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8008595C 7D 89 03 A6 */ mtctr r12 -/* 80085960 4E 80 04 21 */ bctrl -/* 80085964 7C 64 1B 78 */ mr r4, r3 -/* 80085968 80 17 00 2C */ lwz r0, 0x2c(r23) -/* 8008596C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80085970 41 82 00 64 */ beq lbl_800859D4 -/* 80085974 38 78 01 C8 */ addi r3, r24, 0x1c8 -/* 80085978 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8008597C 81 98 01 E4 */ lwz r12, 0x1e4(r24) -/* 80085980 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 80085984 7D 89 03 A6 */ mtctr r12 -/* 80085988 4E 80 04 21 */ bctrl -/* 8008598C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80085990 41 82 00 44 */ beq lbl_800859D4 -/* 80085994 63 DE 00 04 */ ori r30, r30, 4 -/* 80085998 80 77 00 44 */ lwz r3, 0x44(r23) -/* 8008599C 80 03 00 0C */ lwz r0, 0xc(r3) -/* 800859A0 90 1A 00 00 */ stw r0, 0(r26) -/* 800859A4 28 1B 00 00 */ cmplwi r27, 0 -/* 800859A8 41 82 00 08 */ beq lbl_800859B0 -/* 800859AC 92 FB 00 00 */ stw r23, 0(r27) -lbl_800859B0: -/* 800859B0 81 9F 00 08 */ lwz r12, 8(r31) -/* 800859B4 28 0C 00 00 */ cmplwi r12, 0 -/* 800859B8 41 82 00 1C */ beq lbl_800859D4 -/* 800859BC 80 77 00 44 */ lwz r3, 0x44(r23) -/* 800859C0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800859C4 7F 24 CB 78 */ mr r4, r25 -/* 800859C8 88 B8 02 01 */ lbz r5, 0x201(r24) -/* 800859CC 7D 89 03 A6 */ mtctr r12 -/* 800859D0 4E 80 04 21 */ bctrl -lbl_800859D4: -/* 800859D4 3B FF 00 20 */ addi r31, r31, 0x20 -lbl_800859D8: -/* 800859D8 80 18 01 84 */ lwz r0, 0x184(r24) -/* 800859DC 54 03 28 34 */ slwi r3, r0, 5 -/* 800859E0 38 03 01 88 */ addi r0, r3, 0x188 -/* 800859E4 7C 18 02 14 */ add r0, r24, r0 -/* 800859E8 7C 1F 00 40 */ cmplw r31, r0 -/* 800859EC 41 80 FF 4C */ blt lbl_80085938 -lbl_800859F0: -/* 800859F0 3B B8 00 44 */ addi r29, r24, 0x44 -/* 800859F4 48 00 01 8C */ b lbl_80085B80 -lbl_800859F8: -/* 800859F8 38 7D 00 0C */ addi r3, r29, 0xc -/* 800859FC 38 81 00 38 */ addi r4, r1, 0x38 -/* 80085A00 48 1D D9 69 */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo -/* 80085A04 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80085A08 41 82 01 74 */ beq lbl_80085B7C -/* 80085A0C 83 FD 00 00 */ lwz r31, 0(r29) -/* 80085A10 7F E3 FB 78 */ mr r3, r31 -/* 80085A14 81 9F 00 3C */ lwz r12, 0x3c(r31) -/* 80085A18 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80085A1C 7D 89 03 A6 */ mtctr r12 -/* 80085A20 4E 80 04 21 */ bctrl -/* 80085A24 7C 77 1B 78 */ mr r23, r3 -/* 80085A28 7F E3 FB 78 */ mr r3, r31 -/* 80085A2C 81 9F 00 3C */ lwz r12, 0x3c(r31) -/* 80085A30 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80085A34 7D 89 03 A6 */ mtctr r12 -/* 80085A38 4E 80 04 21 */ bctrl -/* 80085A3C 7C 7C 1B 78 */ mr r28, r3 -/* 80085A40 80 1F 00 00 */ lwz r0, 0(r31) -/* 80085A44 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80085A48 41 82 00 5C */ beq lbl_80085AA4 -/* 80085A4C 80 17 00 58 */ lwz r0, 0x58(r23) -/* 80085A50 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80085A54 40 82 00 50 */ bne lbl_80085AA4 -/* 80085A58 38 78 01 C8 */ addi r3, r24, 0x1c8 -/* 80085A5C 7F 84 E3 78 */ mr r4, r28 -/* 80085A60 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80085A64 81 98 01 E4 */ lwz r12, 0x1e4(r24) -/* 80085A68 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80085A6C 7D 89 03 A6 */ mtctr r12 -/* 80085A70 4E 80 04 21 */ bctrl -/* 80085A74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80085A78 41 82 00 2C */ beq lbl_80085AA4 -/* 80085A7C 88 18 02 00 */ lbz r0, 0x200(r24) -/* 80085A80 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80085A84 41 82 00 20 */ beq lbl_80085AA4 -/* 80085A88 63 DE 00 01 */ ori r30, r30, 1 -/* 80085A8C 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 80085A90 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80085A94 90 1A 00 00 */ stw r0, 0(r26) -/* 80085A98 28 1B 00 00 */ cmplwi r27, 0 -/* 80085A9C 41 82 00 08 */ beq lbl_80085AA4 -/* 80085AA0 93 FB 00 04 */ stw r31, 4(r27) -lbl_80085AA4: -/* 80085AA4 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 80085AA8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80085AAC 41 82 00 D0 */ beq lbl_80085B7C -/* 80085AB0 38 78 01 C8 */ addi r3, r24, 0x1c8 -/* 80085AB4 7F 84 E3 78 */ mr r4, r28 -/* 80085AB8 38 A1 00 0C */ addi r5, r1, 0xc -/* 80085ABC 81 98 01 E4 */ lwz r12, 0x1e4(r24) -/* 80085AC0 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 80085AC4 7D 89 03 A6 */ mtctr r12 -/* 80085AC8 4E 80 04 21 */ bctrl -/* 80085ACC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80085AD0 41 82 00 AC */ beq lbl_80085B7C -/* 80085AD4 88 18 02 00 */ lbz r0, 0x200(r24) -/* 80085AD8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80085ADC 41 82 00 A0 */ beq lbl_80085B7C -/* 80085AE0 63 DE 00 02 */ ori r30, r30, 2 -/* 80085AE4 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 80085AE8 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80085AEC 90 1A 00 00 */ stw r0, 0(r26) -/* 80085AF0 88 18 02 00 */ lbz r0, 0x200(r24) -/* 80085AF4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80085AF8 41 82 00 70 */ beq lbl_80085B68 -/* 80085AFC 80 7A 00 00 */ lwz r3, 0(r26) -/* 80085B00 38 63 04 D0 */ addi r3, r3, 0x4d0 -/* 80085B04 7F 24 CB 78 */ mr r4, r25 -/* 80085B08 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80085B0C 48 2C 15 A9 */ bl PSVECSubtract -/* 80085B10 C0 02 8D 60 */ lfs f0, lit_3627(r2) -/* 80085B14 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80085B18 38 61 00 20 */ addi r3, r1, 0x20 -/* 80085B1C 48 2C 16 35 */ bl PSVECMag -/* 80085B20 FC 00 0A 10 */ fabs f0, f1 -/* 80085B24 FC 40 00 18 */ frsp f2, f0 -/* 80085B28 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 80085B2C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80085B30 40 80 00 10 */ bge lbl_80085B40 -/* 80085B34 C0 02 8D 6C */ lfs f0, lit_3899(r2) -/* 80085B38 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80085B3C 48 00 00 18 */ b lbl_80085B54 -lbl_80085B40: -/* 80085B40 38 61 00 20 */ addi r3, r1, 0x20 -/* 80085B44 7C 64 1B 78 */ mr r4, r3 -/* 80085B48 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80085B4C EC 20 08 24 */ fdivs f1, f0, f1 -/* 80085B50 48 2C 15 89 */ bl PSVECScale -lbl_80085B54: -/* 80085B54 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 80085B58 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 80085B5C C0 41 00 24 */ lfs f2, 0x24(r1) -/* 80085B60 C0 61 00 28 */ lfs f3, 0x28(r1) -/* 80085B64 48 1D DD D1 */ bl PlusCcMove__9cCcD_SttsFfff -lbl_80085B68: -/* 80085B68 28 1B 00 00 */ cmplwi r27, 0 -/* 80085B6C 41 82 00 10 */ beq lbl_80085B7C -/* 80085B70 93 FB 00 08 */ stw r31, 8(r27) -/* 80085B74 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80085B78 D0 1B 00 0C */ stfs f0, 0xc(r27) -lbl_80085B7C: -/* 80085B7C 3B BD 00 20 */ addi r29, r29, 0x20 -lbl_80085B80: -/* 80085B80 80 18 00 40 */ lwz r0, 0x40(r24) -/* 80085B84 54 03 28 34 */ slwi r3, r0, 5 -/* 80085B88 38 03 00 44 */ addi r0, r3, 0x44 -/* 80085B8C 7C 18 02 14 */ add r0, r24, r0 -/* 80085B90 7C 1D 00 40 */ cmplw r29, r0 -/* 80085B94 41 80 FE 64 */ blt lbl_800859F8 -/* 80085B98 88 18 02 02 */ lbz r0, 0x202(r24) -/* 80085B9C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80085BA0 41 82 01 20 */ beq lbl_80085CC0 -/* 80085BA4 38 78 02 64 */ addi r3, r24, 0x264 -/* 80085BA8 38 81 00 38 */ addi r4, r1, 0x38 -/* 80085BAC 48 1D D7 BD */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo -/* 80085BB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80085BB4 41 82 01 0C */ beq lbl_80085CC0 -/* 80085BB8 38 78 01 C8 */ addi r3, r24, 0x1c8 -/* 80085BBC 38 98 02 24 */ addi r4, r24, 0x224 -/* 80085BC0 38 A1 00 08 */ addi r5, r1, 8 -/* 80085BC4 81 98 01 E4 */ lwz r12, 0x1e4(r24) -/* 80085BC8 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80085BCC 7D 89 03 A6 */ mtctr r12 -/* 80085BD0 4E 80 04 21 */ bctrl -/* 80085BD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80085BD8 41 82 00 E8 */ beq lbl_80085CC0 -/* 80085BDC 88 18 02 03 */ lbz r0, 0x203(r24) -/* 80085BE0 60 00 00 01 */ ori r0, r0, 1 -/* 80085BE4 98 18 02 03 */ stb r0, 0x203(r24) -/* 80085BE8 88 B8 02 03 */ lbz r5, 0x203(r24) -/* 80085BEC 38 80 00 01 */ li r4, 1 -/* 80085BF0 88 78 02 01 */ lbz r3, 0x201(r24) -/* 80085BF4 38 03 00 01 */ addi r0, r3, 1 -/* 80085BF8 7C 80 00 30 */ slw r0, r4, r0 -/* 80085BFC 7C A0 03 78 */ or r0, r5, r0 -/* 80085C00 98 18 02 03 */ stb r0, 0x203(r24) -/* 80085C04 88 78 02 03 */ lbz r3, 0x203(r24) -/* 80085C08 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e -/* 80085C0C 40 82 00 0C */ bne lbl_80085C18 -/* 80085C10 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c -/* 80085C14 41 82 00 AC */ beq lbl_80085CC0 -lbl_80085C18: -/* 80085C18 C0 39 00 04 */ lfs f1, 4(r25) -/* 80085C1C C0 18 01 F8 */ lfs f0, 0x1f8(r24) -/* 80085C20 EC 41 00 2A */ fadds f2, f1, f0 -/* 80085C24 C0 19 00 00 */ lfs f0, 0(r25) -/* 80085C28 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80085C2C D0 41 00 18 */ stfs f2, 0x18(r1) -/* 80085C30 C0 19 00 08 */ lfs f0, 8(r25) -/* 80085C34 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80085C38 C0 38 02 08 */ lfs f1, 0x208(r24) -/* 80085C3C C0 02 8D 70 */ lfs f0, lit_3900(r2) -/* 80085C40 EF E0 10 2A */ fadds f31, f0, f2 -/* 80085C44 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 80085C48 40 80 00 38 */ bge lbl_80085C80 -/* 80085C4C 38 61 00 14 */ addi r3, r1, 0x14 -/* 80085C50 38 98 02 44 */ addi r4, r24, 0x244 -/* 80085C54 48 2C 17 49 */ bl PSVECSquareDistance -/* 80085C58 C0 18 02 10 */ lfs f0, 0x210(r24) -/* 80085C5C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80085C60 40 81 00 20 */ ble lbl_80085C80 -/* 80085C64 D0 38 02 10 */ stfs f1, 0x210(r24) -/* 80085C68 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80085C6C D0 18 02 04 */ stfs f0, 0x204(r24) -/* 80085C70 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80085C74 D0 18 02 08 */ stfs f0, 0x208(r24) -/* 80085C78 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80085C7C D0 18 02 0C */ stfs f0, 0x20c(r24) -lbl_80085C80: -/* 80085C80 C0 18 02 18 */ lfs f0, 0x218(r24) -/* 80085C84 FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 80085C88 40 80 00 38 */ bge lbl_80085CC0 -/* 80085C8C 38 61 00 14 */ addi r3, r1, 0x14 -/* 80085C90 38 98 02 50 */ addi r4, r24, 0x250 -/* 80085C94 48 2C 17 09 */ bl PSVECSquareDistance -/* 80085C98 C0 18 02 20 */ lfs f0, 0x220(r24) -/* 80085C9C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80085CA0 40 81 00 20 */ ble lbl_80085CC0 -/* 80085CA4 D0 38 02 20 */ stfs f1, 0x220(r24) -/* 80085CA8 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80085CAC D0 18 02 14 */ stfs f0, 0x214(r24) -/* 80085CB0 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80085CB4 D0 18 02 18 */ stfs f0, 0x218(r24) -/* 80085CB8 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80085CBC D0 18 02 1C */ stfs f0, 0x21c(r24) -lbl_80085CC0: -/* 80085CC0 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80085CC4 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80085CC8 90 01 00 44 */ stw r0, 0x44(r1) -/* 80085CCC 7F C3 F3 78 */ mr r3, r30 -/* 80085CD0 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 80085CD4 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 80085CD8 39 61 00 70 */ addi r11, r1, 0x70 -/* 80085CDC 48 2D C5 35 */ bl _restgpr_23 -/* 80085CE0 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80085CE4 7C 08 03 A6 */ mtlr r0 -/* 80085CE8 38 21 00 80 */ addi r1, r1, 0x80 -/* 80085CEC 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/ClearPointer__15dCcMassS_HitInfFv.s b/asm/d/cc/d_cc_mass_s/ClearPointer__15dCcMassS_HitInfFv.s deleted file mode 100644 index 2e2fb3d02f..0000000000 --- a/asm/d/cc/d_cc_mass_s/ClearPointer__15dCcMassS_HitInfFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80085334: -/* 80085334 38 00 00 00 */ li r0, 0 -/* 80085338 90 03 00 00 */ stw r0, 0(r3) -/* 8008533C 90 03 00 04 */ stw r0, 4(r3) -/* 80085340 90 03 00 08 */ stw r0, 8(r3) -/* 80085344 C0 02 8D 60 */ lfs f0, lit_3627(r2) -/* 80085348 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8008534C 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_MngFv.s b/asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_MngFv.s deleted file mode 100644 index 082ae084bd..0000000000 --- a/asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_MngFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80085CF0: -/* 80085CF0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80085CF4 7C 08 02 A6 */ mflr r0 -/* 80085CF8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80085CFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80085D00 48 2D C4 DD */ bl _savegpr_29 -/* 80085D04 7C 7D 1B 78 */ mr r29, r3 -/* 80085D08 3B E0 00 00 */ li r31, 0 -/* 80085D0C 93 E3 00 40 */ stw r31, 0x40(r3) -/* 80085D10 93 E3 01 84 */ stw r31, 0x184(r3) -/* 80085D14 3B C0 00 00 */ li r30, 0 -lbl_80085D18: -/* 80085D18 38 7F 00 44 */ addi r3, r31, 0x44 -/* 80085D1C 7C 7D 1A 14 */ add r3, r29, r3 -/* 80085D20 4B FF F5 D1 */ bl Clear__12dCcMassS_ObjFv -/* 80085D24 3B DE 00 01 */ addi r30, r30, 1 -/* 80085D28 2C 1E 00 0A */ cmpwi r30, 0xa -/* 80085D2C 3B FF 00 20 */ addi r31, r31, 0x20 -/* 80085D30 41 80 FF E8 */ blt lbl_80085D18 -/* 80085D34 3B C0 00 00 */ li r30, 0 -/* 80085D38 3B E0 00 00 */ li r31, 0 -lbl_80085D3C: -/* 80085D3C 38 7F 01 88 */ addi r3, r31, 0x188 -/* 80085D40 7C 7D 1A 14 */ add r3, r29, r3 -/* 80085D44 4B FF F5 AD */ bl Clear__12dCcMassS_ObjFv -/* 80085D48 3B DE 00 01 */ addi r30, r30, 1 -/* 80085D4C 2C 1E 00 02 */ cmpwi r30, 2 -/* 80085D50 3B FF 00 20 */ addi r31, r31, 0x20 -/* 80085D54 41 80 FF E8 */ blt lbl_80085D3C -/* 80085D58 38 7D 01 E8 */ addi r3, r29, 0x1e8 -/* 80085D5C C0 22 8D 60 */ lfs f1, lit_3627(r2) -/* 80085D60 48 1E 94 A1 */ bl SetR__8cM3dGCylFf -/* 80085D64 38 7D 01 E8 */ addi r3, r29, 0x1e8 -/* 80085D68 C0 22 8D 60 */ lfs f1, lit_3627(r2) -/* 80085D6C 48 1E 94 8D */ bl SetH__8cM3dGCylFf -/* 80085D70 38 00 00 00 */ li r0, 0 -/* 80085D74 98 1D 02 00 */ stb r0, 0x200(r29) -/* 80085D78 38 00 00 04 */ li r0, 4 -/* 80085D7C 98 1D 02 01 */ stb r0, 0x201(r29) -/* 80085D80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80085D84 48 2D C4 A5 */ bl _restgpr_29 -/* 80085D88 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80085D8C 7C 08 03 A6 */ mtlr r0 -/* 80085D90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80085D94 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_ObjFv.s b/asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_ObjFv.s deleted file mode 100644 index 58efa638a4..0000000000 --- a/asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_ObjFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_800852F0: -/* 800852F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800852F4 7C 08 02 A6 */ mflr r0 -/* 800852F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800852FC 38 80 00 00 */ li r4, 0 -/* 80085300 90 83 00 00 */ stw r4, 0(r3) -/* 80085304 38 00 00 05 */ li r0, 5 -/* 80085308 98 03 00 04 */ stb r0, 4(r3) -/* 8008530C 90 83 00 08 */ stw r4, 8(r3) -/* 80085310 38 80 00 00 */ li r4, 0 -/* 80085314 38 A0 00 00 */ li r5, 0 -/* 80085318 38 C0 00 00 */ li r6, 0 -/* 8008531C 38 63 00 0C */ addi r3, r3, 0xc -/* 80085320 48 1D E0 39 */ bl Set__15cCcD_DivideInfoFUlUlUl -/* 80085324 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80085328 7C 08 03 A6 */ mtlr r0 -/* 8008532C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80085330 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/Ct__12dCcMassS_MngFv.s b/asm/d/cc/d_cc_mass_s/Ct__12dCcMassS_MngFv.s deleted file mode 100644 index 61462b0a50..0000000000 --- a/asm/d/cc/d_cc_mass_s/Ct__12dCcMassS_MngFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800855E4: -/* 800855E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800855E8 7C 08 02 A6 */ mflr r0 -/* 800855EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800855F0 38 00 00 00 */ li r0, 0 -/* 800855F4 98 03 02 02 */ stb r0, 0x202(r3) -/* 800855F8 98 03 02 03 */ stb r0, 0x203(r3) -/* 800855FC C0 22 8D 60 */ lfs f1, lit_3627(r2) -/* 80085600 D0 23 02 04 */ stfs f1, 0x204(r3) -/* 80085604 C0 02 8D 64 */ lfs f0, lit_3724(r2) -/* 80085608 D0 03 02 08 */ stfs f0, 0x208(r3) -/* 8008560C D0 23 02 0C */ stfs f1, 0x20c(r3) -/* 80085610 D0 23 02 14 */ stfs f1, 0x214(r3) -/* 80085614 D0 03 02 18 */ stfs f0, 0x218(r3) -/* 80085618 D0 23 02 1C */ stfs f1, 0x21c(r3) -/* 8008561C 48 00 06 D5 */ bl Clear__12dCcMassS_MngFv -/* 80085620 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80085624 7C 08 03 A6 */ mtlr r0 -/* 80085628 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008562C 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/GetCamTopPos__12dCcMassS_MngFP3Vec.s b/asm/d/cc/d_cc_mass_s/GetCamTopPos__12dCcMassS_MngFP3Vec.s deleted file mode 100644 index 700d0f37e1..0000000000 --- a/asm/d/cc/d_cc_mass_s/GetCamTopPos__12dCcMassS_MngFP3Vec.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80085EB8: -/* 80085EB8 C0 03 02 04 */ lfs f0, 0x204(r3) -/* 80085EBC D0 04 00 00 */ stfs f0, 0(r4) -/* 80085EC0 C0 03 02 08 */ lfs f0, 0x208(r3) -/* 80085EC4 D0 04 00 04 */ stfs f0, 4(r4) -/* 80085EC8 C0 03 02 0C */ lfs f0, 0x20c(r3) -/* 80085ECC D0 04 00 08 */ stfs f0, 8(r4) -/* 80085ED0 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/GetResultCam__12dCcMassS_MngCFv.s b/asm/d/cc/d_cc_mass_s/GetResultCam__12dCcMassS_MngCFv.s deleted file mode 100644 index 27b5dca326..0000000000 --- a/asm/d/cc/d_cc_mass_s/GetResultCam__12dCcMassS_MngCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80085EB0: -/* 80085EB0 88 63 02 03 */ lbz r3, 0x203(r3) -/* 80085EB4 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/Prepare__12dCcMassS_MngFv.s b/asm/d/cc/d_cc_mass_s/Prepare__12dCcMassS_MngFv.s deleted file mode 100644 index ad01d5356f..0000000000 --- a/asm/d/cc/d_cc_mass_s/Prepare__12dCcMassS_MngFv.s +++ /dev/null @@ -1,146 +0,0 @@ -lbl_80085690: -/* 80085690 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80085694 7C 08 02 A6 */ mflr r0 -/* 80085698 90 01 00 44 */ stw r0, 0x44(r1) -/* 8008569C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800856A0 48 2D CB 3D */ bl _savegpr_29 -/* 800856A4 7C 7F 1B 78 */ mr r31, r3 -/* 800856A8 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 800856AC 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 800856B0 90 01 00 20 */ stw r0, 0x20(r1) -/* 800856B4 38 61 00 08 */ addi r3, r1, 8 -/* 800856B8 48 1E 96 41 */ bl ClearForMinMax__8cM3dGAabFv -/* 800856BC 3B DF 00 44 */ addi r30, r31, 0x44 -/* 800856C0 48 00 00 3C */ b lbl_800856FC -lbl_800856C4: -/* 800856C4 80 7E 00 00 */ lwz r3, 0(r30) -/* 800856C8 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 800856CC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 800856D0 7D 89 03 A6 */ mtctr r12 -/* 800856D4 4E 80 04 21 */ bctrl -/* 800856D8 7C 7D 1B 78 */ mr r29, r3 -/* 800856DC 81 83 00 1C */ lwz r12, 0x1c(r3) -/* 800856E0 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 800856E4 7D 89 03 A6 */ mtctr r12 -/* 800856E8 4E 80 04 21 */ bctrl -/* 800856EC 38 61 00 08 */ addi r3, r1, 8 -/* 800856F0 7F A4 EB 78 */ mr r4, r29 -/* 800856F4 48 1E 96 6D */ bl SetMinMax__8cM3dGAabFRC8cM3dGAab -/* 800856F8 3B DE 00 20 */ addi r30, r30, 0x20 -lbl_800856FC: -/* 800856FC 80 1F 00 40 */ lwz r0, 0x40(r31) -/* 80085700 54 03 28 34 */ slwi r3, r0, 5 -/* 80085704 38 03 00 44 */ addi r0, r3, 0x44 -/* 80085708 7C 1F 02 14 */ add r0, r31, r0 -/* 8008570C 7C 1E 00 40 */ cmplw r30, r0 -/* 80085710 41 80 FF B4 */ blt lbl_800856C4 -/* 80085714 3B BF 01 88 */ addi r29, r31, 0x188 -/* 80085718 48 00 00 3C */ b lbl_80085754 -lbl_8008571C: -/* 8008571C 80 7D 00 00 */ lwz r3, 0(r29) -/* 80085720 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80085724 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80085728 7D 89 03 A6 */ mtctr r12 -/* 8008572C 4E 80 04 21 */ bctrl -/* 80085730 7C 7E 1B 78 */ mr r30, r3 -/* 80085734 81 83 00 1C */ lwz r12, 0x1c(r3) -/* 80085738 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 8008573C 7D 89 03 A6 */ mtctr r12 -/* 80085740 4E 80 04 21 */ bctrl -/* 80085744 38 61 00 08 */ addi r3, r1, 8 -/* 80085748 7F C4 F3 78 */ mr r4, r30 -/* 8008574C 48 1E 96 15 */ bl SetMinMax__8cM3dGAabFRC8cM3dGAab -/* 80085750 3B BD 00 20 */ addi r29, r29, 0x20 -lbl_80085754: -/* 80085754 80 1F 01 84 */ lwz r0, 0x184(r31) -/* 80085758 54 03 28 34 */ slwi r3, r0, 5 -/* 8008575C 38 03 01 88 */ addi r0, r3, 0x188 -/* 80085760 7C 1F 02 14 */ add r0, r31, r0 -/* 80085764 7C 1D 00 40 */ cmplw r29, r0 -/* 80085768 41 80 FF B4 */ blt lbl_8008571C -/* 8008576C 88 1F 02 02 */ lbz r0, 0x202(r31) -/* 80085770 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80085774 41 82 00 24 */ beq lbl_80085798 -/* 80085778 38 7F 02 24 */ addi r3, r31, 0x224 -/* 8008577C 81 9F 02 40 */ lwz r12, 0x240(r31) -/* 80085780 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80085784 7D 89 03 A6 */ mtctr r12 -/* 80085788 4E 80 04 21 */ bctrl -/* 8008578C 38 61 00 08 */ addi r3, r1, 8 -/* 80085790 38 9F 02 24 */ addi r4, r31, 0x224 -/* 80085794 48 1E 95 CD */ bl SetMinMax__8cM3dGAabFRC8cM3dGAab -lbl_80085798: -/* 80085798 7F E3 FB 78 */ mr r3, r31 -/* 8008579C 38 81 00 08 */ addi r4, r1, 8 -/* 800857A0 48 1D DC 09 */ bl SetArea__15cCcD_DivideAreaFRC8cM3dGAab -/* 800857A4 3B BF 00 44 */ addi r29, r31, 0x44 -/* 800857A8 48 00 00 30 */ b lbl_800857D8 -lbl_800857AC: -/* 800857AC 80 7D 00 00 */ lwz r3, 0(r29) -/* 800857B0 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 800857B4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 800857B8 7D 89 03 A6 */ mtctr r12 -/* 800857BC 4E 80 04 21 */ bctrl -/* 800857C0 7C 65 1B 78 */ mr r5, r3 -/* 800857C4 38 9D 00 0C */ addi r4, r29, 0xc -/* 800857C8 7F E3 FB 78 */ mr r3, r31 -/* 800857CC 38 C0 00 00 */ li r6, 0 -/* 800857D0 48 1D DD 05 */ bl CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl -/* 800857D4 3B BD 00 20 */ addi r29, r29, 0x20 -lbl_800857D8: -/* 800857D8 80 1F 00 40 */ lwz r0, 0x40(r31) -/* 800857DC 54 03 28 34 */ slwi r3, r0, 5 -/* 800857E0 38 03 00 44 */ addi r0, r3, 0x44 -/* 800857E4 7C 1F 02 14 */ add r0, r31, r0 -/* 800857E8 7C 1D 00 40 */ cmplw r29, r0 -/* 800857EC 41 80 FF C0 */ blt lbl_800857AC -/* 800857F0 3B BF 01 88 */ addi r29, r31, 0x188 -/* 800857F4 48 00 00 30 */ b lbl_80085824 -lbl_800857F8: -/* 800857F8 80 7D 00 00 */ lwz r3, 0(r29) -/* 800857FC 81 83 00 3C */ lwz r12, 0x3c(r3) -/* 80085800 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80085804 7D 89 03 A6 */ mtctr r12 -/* 80085808 4E 80 04 21 */ bctrl -/* 8008580C 7C 65 1B 78 */ mr r5, r3 -/* 80085810 38 9D 00 0C */ addi r4, r29, 0xc -/* 80085814 7F E3 FB 78 */ mr r3, r31 -/* 80085818 38 C0 00 00 */ li r6, 0 -/* 8008581C 48 1D DC B9 */ bl CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl -/* 80085820 3B BD 00 20 */ addi r29, r29, 0x20 -lbl_80085824: -/* 80085824 80 1F 01 84 */ lwz r0, 0x184(r31) -/* 80085828 54 03 28 34 */ slwi r3, r0, 5 -/* 8008582C 38 03 01 88 */ addi r0, r3, 0x188 -/* 80085830 7C 1F 02 14 */ add r0, r31, r0 -/* 80085834 7C 1D 00 40 */ cmplw r29, r0 -/* 80085838 41 80 FF C0 */ blt lbl_800857F8 -/* 8008583C 88 1F 02 02 */ lbz r0, 0x202(r31) -/* 80085840 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80085844 41 82 00 18 */ beq lbl_8008585C -/* 80085848 7F E3 FB 78 */ mr r3, r31 -/* 8008584C 38 9F 02 64 */ addi r4, r31, 0x264 -/* 80085850 38 BF 02 24 */ addi r5, r31, 0x224 -/* 80085854 38 C0 00 00 */ li r6, 0 -/* 80085858 48 1D DC 7D */ bl CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl -lbl_8008585C: -/* 8008585C C0 42 8D 60 */ lfs f2, lit_3627(r2) -/* 80085860 D0 5F 02 04 */ stfs f2, 0x204(r31) -/* 80085864 C0 22 8D 64 */ lfs f1, lit_3724(r2) -/* 80085868 D0 3F 02 08 */ stfs f1, 0x208(r31) -/* 8008586C D0 5F 02 0C */ stfs f2, 0x20c(r31) -/* 80085870 C0 02 8D 68 */ lfs f0, lit_3780(r2) -/* 80085874 D0 1F 02 10 */ stfs f0, 0x210(r31) -/* 80085878 D0 5F 02 14 */ stfs f2, 0x214(r31) -/* 8008587C D0 3F 02 18 */ stfs f1, 0x218(r31) -/* 80085880 D0 5F 02 1C */ stfs f2, 0x21c(r31) -/* 80085884 D0 1F 02 20 */ stfs f0, 0x220(r31) -/* 80085888 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 8008588C 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80085890 90 01 00 20 */ stw r0, 0x20(r1) -/* 80085894 39 61 00 40 */ addi r11, r1, 0x40 -/* 80085898 48 2D C9 91 */ bl _restgpr_29 -/* 8008589C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 800858A0 7C 08 03 A6 */ mtlr r0 -/* 800858A4 38 21 00 40 */ addi r1, r1, 0x40 -/* 800858A8 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/SetAttr__12dCcMassS_MngFffUcUc.s b/asm/d/cc/d_cc_mass_s/SetAttr__12dCcMassS_MngFffUcUc.s deleted file mode 100644 index 4bd78db3f5..0000000000 --- a/asm/d/cc/d_cc_mass_s/SetAttr__12dCcMassS_MngFffUcUc.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80085630: -/* 80085630 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80085634 7C 08 02 A6 */ mflr r0 -/* 80085638 90 01 00 24 */ stw r0, 0x24(r1) -/* 8008563C DB E1 00 18 */ stfd f31, 0x18(r1) -/* 80085640 39 61 00 18 */ addi r11, r1, 0x18 -/* 80085644 48 2D CB 99 */ bl _savegpr_29 -/* 80085648 7C 7D 1B 78 */ mr r29, r3 -/* 8008564C FF E0 10 90 */ fmr f31, f2 -/* 80085650 7C 9E 23 78 */ mr r30, r4 -/* 80085654 7C BF 2B 78 */ mr r31, r5 -/* 80085658 38 7D 01 E8 */ addi r3, r29, 0x1e8 -/* 8008565C 48 1E 9B A5 */ bl SetR__8cM3dGCylFf -/* 80085660 38 7D 01 E8 */ addi r3, r29, 0x1e8 -/* 80085664 FC 20 F8 90 */ fmr f1, f31 -/* 80085668 48 1E 9B 91 */ bl SetH__8cM3dGCylFf -/* 8008566C 9B DD 02 00 */ stb r30, 0x200(r29) -/* 80085670 9B FD 02 01 */ stb r31, 0x201(r29) -/* 80085674 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 80085678 39 61 00 18 */ addi r11, r1, 0x18 -/* 8008567C 48 2D CB AD */ bl _restgpr_29 -/* 80085680 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80085684 7C 08 03 A6 */ mtlr r0 -/* 80085688 38 21 00 20 */ addi r1, r1, 0x20 -/* 8008568C 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/SetCam__12dCcMassS_MngFRC8cM3dGCps.s b/asm/d/cc/d_cc_mass_s/SetCam__12dCcMassS_MngFRC8cM3dGCps.s deleted file mode 100644 index 674a6eaf95..0000000000 --- a/asm/d/cc/d_cc_mass_s/SetCam__12dCcMassS_MngFRC8cM3dGCps.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80085E6C: -/* 80085E6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80085E70 7C 08 02 A6 */ mflr r0 -/* 80085E74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80085E78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80085E7C 7C 7F 1B 78 */ mr r31, r3 -/* 80085E80 38 7F 02 44 */ addi r3, r31, 0x244 -/* 80085E84 48 1E 91 FD */ bl SetCps__8cM3dGCpsFRC8cM3dGCps -/* 80085E88 88 1F 02 02 */ lbz r0, 0x202(r31) -/* 80085E8C 60 00 00 01 */ ori r0, r0, 1 -/* 80085E90 98 1F 02 02 */ stb r0, 0x202(r31) -/* 80085E94 38 00 00 00 */ li r0, 0 -/* 80085E98 98 1F 02 03 */ stb r0, 0x203(r31) -/* 80085E9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80085EA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80085EA4 7C 08 03 A6 */ mtlr r0 -/* 80085EA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80085EAC 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/Set__12dCcMassS_MngFP8cCcD_ObjUc.s b/asm/d/cc/d_cc_mass_s/Set__12dCcMassS_MngFP8cCcD_ObjUc.s deleted file mode 100644 index b93251efe4..0000000000 --- a/asm/d/cc/d_cc_mass_s/Set__12dCcMassS_MngFP8cCcD_ObjUc.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80085D98: -/* 80085D98 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80085D9C 7C 08 02 A6 */ mflr r0 -/* 80085DA0 90 01 00 44 */ stw r0, 0x44(r1) -/* 80085DA4 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80085DA8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80085DAC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80085DB0 48 2D C4 1D */ bl _savegpr_25 -/* 80085DB4 7C 79 1B 78 */ mr r25, r3 -/* 80085DB8 7C 9A 23 78 */ mr r26, r4 -/* 80085DBC 7C BB 2B 78 */ mr r27, r5 -/* 80085DC0 80 03 00 40 */ lwz r0, 0x40(r3) -/* 80085DC4 2C 00 00 0A */ cmpwi r0, 0xa -/* 80085DC8 41 80 00 64 */ blt lbl_80085E2C -/* 80085DCC 3B 80 00 00 */ li r28, 0 -/* 80085DD0 3B E0 00 00 */ li r31, 0 -/* 80085DD4 57 7E 06 3E */ clrlwi r30, r27, 0x18 -/* 80085DD8 C3 E2 8D 74 */ lfs f31, lit_3941(r2) -lbl_80085DDC: -/* 80085DDC 7F B9 FA 14 */ add r29, r25, r31 -/* 80085DE0 88 1D 00 48 */ lbz r0, 0x48(r29) -/* 80085DE4 7C 00 F0 00 */ cmpw r0, r30 -/* 80085DE8 41 81 00 18 */ bgt lbl_80085E00 -/* 80085DEC 40 82 00 2C */ bne lbl_80085E18 -/* 80085DF0 C0 22 8D 6C */ lfs f1, lit_3899(r2) -/* 80085DF4 48 1E 1B 61 */ bl cM_rndF__Ff -/* 80085DF8 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 80085DFC 40 80 00 1C */ bge lbl_80085E18 -lbl_80085E00: -/* 80085E00 38 7D 00 44 */ addi r3, r29, 0x44 -/* 80085E04 7F 44 D3 78 */ mr r4, r26 -/* 80085E08 7F 65 DB 78 */ mr r5, r27 -/* 80085E0C 38 C0 00 00 */ li r6, 0 -/* 80085E10 4B FF F4 D1 */ bl Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v -/* 80085E14 48 00 00 38 */ b lbl_80085E4C -lbl_80085E18: -/* 80085E18 3B 9C 00 01 */ addi r28, r28, 1 -/* 80085E1C 2C 1C 00 0A */ cmpwi r28, 0xa -/* 80085E20 3B FF 00 20 */ addi r31, r31, 0x20 -/* 80085E24 41 80 FF B8 */ blt lbl_80085DDC -/* 80085E28 48 00 00 24 */ b lbl_80085E4C -lbl_80085E2C: -/* 80085E2C 54 03 28 34 */ slwi r3, r0, 5 -/* 80085E30 38 63 00 44 */ addi r3, r3, 0x44 -/* 80085E34 7C 79 1A 14 */ add r3, r25, r3 -/* 80085E38 38 C0 00 00 */ li r6, 0 -/* 80085E3C 4B FF F4 A5 */ bl Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v -/* 80085E40 80 79 00 40 */ lwz r3, 0x40(r25) -/* 80085E44 38 03 00 01 */ addi r0, r3, 1 -/* 80085E48 90 19 00 40 */ stw r0, 0x40(r25) -lbl_80085E4C: -/* 80085E4C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80085E50 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80085E54 39 61 00 30 */ addi r11, r1, 0x30 -/* 80085E58 48 2D C3 C1 */ bl _restgpr_25 -/* 80085E5C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80085E60 7C 08 03 A6 */ mtlr r0 -/* 80085E64 38 21 00 40 */ addi r1, r1, 0x40 -/* 80085E68 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v.s b/asm/d/cc/d_cc_mass_s/Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v.s deleted file mode 100644 index c70433d733..0000000000 --- a/asm/d/cc/d_cc_mass_s/Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800852E0: -/* 800852E0 90 83 00 00 */ stw r4, 0(r3) -/* 800852E4 98 A3 00 04 */ stb r5, 4(r3) -/* 800852E8 90 C3 00 08 */ stw r6, 8(r3) -/* 800852EC 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_MngFv.s b/asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_MngFv.s deleted file mode 100644 index 3145929c2c..0000000000 --- a/asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_MngFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_80085350: -/* 80085350 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80085354 7C 08 02 A6 */ mflr r0 -/* 80085358 90 01 00 14 */ stw r0, 0x14(r1) -/* 8008535C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80085360 7C 7F 1B 78 */ mr r31, r3 -/* 80085364 3C 60 80 3A */ lis r3, __vt__12dCcMassS_Mng@ha /* 0x803A7230@ha */ -/* 80085368 38 03 72 30 */ addi r0, r3, __vt__12dCcMassS_Mng@l /* 0x803A7230@l */ -/* 8008536C 90 1F 02 74 */ stw r0, 0x274(r31) -/* 80085370 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80085374 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80085378 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8008537C 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideArea@ha /* 0x803A7200@ha */ -/* 80085380 38 03 72 00 */ addi r0, r3, __vt__15cCcD_DivideArea@l /* 0x803A7200@l */ -/* 80085384 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80085388 38 7F 00 44 */ addi r3, r31, 0x44 -/* 8008538C 3C 80 80 08 */ lis r4, __ct__12dCcMassS_ObjFv@ha /* 0x800855C8@ha */ -/* 80085390 38 84 55 C8 */ addi r4, r4, __ct__12dCcMassS_ObjFv@l /* 0x800855C8@l */ -/* 80085394 3C A0 80 03 */ lis r5, __dt__12dCcMassS_ObjFv@ha /* 0x800300F4@ha */ -/* 80085398 38 A5 00 F4 */ addi r5, r5, __dt__12dCcMassS_ObjFv@l /* 0x800300F4@l */ -/* 8008539C 38 C0 00 20 */ li r6, 0x20 -/* 800853A0 38 E0 00 0A */ li r7, 0xa -/* 800853A4 48 2D C9 BD */ bl __construct_array -/* 800853A8 38 7F 01 88 */ addi r3, r31, 0x188 -/* 800853AC 3C 80 80 08 */ lis r4, __ct__12dCcMassS_ObjFv@ha /* 0x800855C8@ha */ -/* 800853B0 38 84 55 C8 */ addi r4, r4, __ct__12dCcMassS_ObjFv@l /* 0x800855C8@l */ -/* 800853B4 3C A0 80 03 */ lis r5, __dt__12dCcMassS_ObjFv@ha /* 0x800300F4@ha */ -/* 800853B8 38 A5 00 F4 */ addi r5, r5, __dt__12dCcMassS_ObjFv@l /* 0x800300F4@l */ -/* 800853BC 38 C0 00 20 */ li r6, 0x20 -/* 800853C0 38 E0 00 02 */ li r7, 2 -/* 800853C4 48 2D C9 9D */ bl __construct_array -/* 800853C8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 800853CC 38 A3 36 D0 */ addi r5, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 800853D0 90 BF 01 E4 */ stw r5, 0x1e4(r31) -/* 800853D4 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 800853D8 38 83 72 18 */ addi r4, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 800853DC 90 9F 01 E0 */ stw r4, 0x1e0(r31) -/* 800853E0 3C 60 80 3A */ lis r3, __vt__8cM3dGCyl@ha /* 0x803A720C@ha */ -/* 800853E4 38 03 72 0C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x803A720C@l */ -/* 800853E8 90 1F 01 FC */ stw r0, 0x1fc(r31) -/* 800853EC 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 800853F0 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 800853F4 90 7F 01 E4 */ stw r3, 0x1e4(r31) -/* 800853F8 38 03 00 58 */ addi r0, r3, 0x58 -/* 800853FC 90 1F 01 FC */ stw r0, 0x1fc(r31) -/* 80085400 90 BF 02 40 */ stw r5, 0x240(r31) -/* 80085404 90 9F 02 3C */ stw r4, 0x23c(r31) -/* 80085408 38 7F 02 44 */ addi r3, r31, 0x244 -/* 8008540C 48 1E 9B 7D */ bl __ct__8cM3dGCpsFv -/* 80085410 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80085414 38 63 36 08 */ addi r3, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80085418 90 7F 02 40 */ stw r3, 0x240(r31) -/* 8008541C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80085420 90 1F 02 5C */ stw r0, 0x25c(r31) -/* 80085424 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80085428 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 8008542C 90 1F 02 70 */ stw r0, 0x270(r31) -/* 80085430 7F E3 FB 78 */ mr r3, r31 -/* 80085434 48 00 01 B1 */ bl Ct__12dCcMassS_MngFv -/* 80085438 7F E3 FB 78 */ mr r3, r31 -/* 8008543C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80085440 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80085444 7C 08 03 A6 */ mtlr r0 -/* 80085448 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008544C 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_ObjFv.s b/asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_ObjFv.s deleted file mode 100644 index 650aec2c2f..0000000000 --- a/asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_ObjFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800855C8: -/* 800855C8 3C 80 80 3A */ lis r4, __vt__12dCcMassS_Obj@ha /* 0x803A71F4@ha */ -/* 800855CC 38 04 71 F4 */ addi r0, r4, __vt__12dCcMassS_Obj@l /* 0x803A71F4@l */ -/* 800855D0 90 03 00 1C */ stw r0, 0x1c(r3) -/* 800855D4 3C 80 80 3A */ lis r4, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 800855D8 38 04 72 24 */ addi r0, r4, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 800855DC 90 03 00 18 */ stw r0, 0x18(r3) -/* 800855E0 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/__dt__12cCcD_CpsAttrFv.s b/asm/d/cc/d_cc_mass_s/__dt__12cCcD_CpsAttrFv.s deleted file mode 100644 index cbb4368afa..0000000000 --- a/asm/d/cc/d_cc_mass_s/__dt__12cCcD_CpsAttrFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80085450: -/* 80085450 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80085454 7C 08 02 A6 */ mflr r0 -/* 80085458 90 01 00 14 */ stw r0, 0x14(r1) -/* 8008545C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80085460 93 C1 00 08 */ stw r30, 8(r1) -/* 80085464 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80085468 7C 9F 23 78 */ mr r31, r4 -/* 8008546C 41 82 00 58 */ beq lbl_800854C4 -/* 80085470 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80085474 38 63 36 08 */ addi r3, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80085478 90 7E 00 1C */ stw r3, 0x1c(r30) -/* 8008547C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80085480 90 1E 00 38 */ stw r0, 0x38(r30) -/* 80085484 38 7E 00 20 */ addi r3, r30, 0x20 -/* 80085488 38 80 00 00 */ li r4, 0 -/* 8008548C 48 1E 9B 19 */ bl __dt__8cM3dGCpsFv -/* 80085490 28 1E 00 00 */ cmplwi r30, 0 -/* 80085494 41 82 00 20 */ beq lbl_800854B4 -/* 80085498 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8008549C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 800854A0 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 800854A4 41 82 00 10 */ beq lbl_800854B4 -/* 800854A8 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 800854AC 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 800854B0 90 1E 00 18 */ stw r0, 0x18(r30) -lbl_800854B4: -/* 800854B4 7F E0 07 35 */ extsh. r0, r31 -/* 800854B8 40 81 00 0C */ ble lbl_800854C4 -/* 800854BC 7F C3 F3 78 */ mr r3, r30 -/* 800854C0 48 24 98 7D */ bl __dl__FPv -lbl_800854C4: -/* 800854C4 7F C3 F3 78 */ mr r3, r30 -/* 800854C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800854CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800854D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800854D4 7C 08 03 A6 */ mtlr r0 -/* 800854D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800854DC 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/__dt__12cCcD_CylAttrFv.s b/asm/d/cc/d_cc_mass_s/__dt__12cCcD_CylAttrFv.s deleted file mode 100644 index 3d5f66d0bf..0000000000 --- a/asm/d/cc/d_cc_mass_s/__dt__12cCcD_CylAttrFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_800854E0: -/* 800854E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800854E4 7C 08 02 A6 */ mflr r0 -/* 800854E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800854EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800854F0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800854F4 41 82 00 60 */ beq lbl_80085554 -/* 800854F8 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 800854FC 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80085500 90 7F 00 1C */ stw r3, 0x1c(r31) -/* 80085504 38 03 00 58 */ addi r0, r3, 0x58 -/* 80085508 90 1F 00 34 */ stw r0, 0x34(r31) -/* 8008550C 34 1F 00 20 */ addic. r0, r31, 0x20 -/* 80085510 41 82 00 10 */ beq lbl_80085520 -/* 80085514 3C 60 80 3A */ lis r3, __vt__8cM3dGCyl@ha /* 0x803A720C@ha */ -/* 80085518 38 03 72 0C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x803A720C@l */ -/* 8008551C 90 1F 00 34 */ stw r0, 0x34(r31) -lbl_80085520: -/* 80085520 28 1F 00 00 */ cmplwi r31, 0 -/* 80085524 41 82 00 20 */ beq lbl_80085544 -/* 80085528 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8008552C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80085530 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 80085534 41 82 00 10 */ beq lbl_80085544 -/* 80085538 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 8008553C 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80085540 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_80085544: -/* 80085544 7C 80 07 35 */ extsh. r0, r4 -/* 80085548 40 81 00 0C */ ble lbl_80085554 -/* 8008554C 7F E3 FB 78 */ mr r3, r31 -/* 80085550 48 24 97 ED */ bl __dl__FPv -lbl_80085554: -/* 80085554 7F E3 FB 78 */ mr r3, r31 -/* 80085558 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8008555C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80085560 7C 08 03 A6 */ mtlr r0 -/* 80085564 38 21 00 10 */ addi r1, r1, 0x10 -/* 80085568 4E 80 00 20 */ blr diff --git a/asm/d/cc/d_cc_mass_s/__dt__14cCcD_ShapeAttrFv.s b/asm/d/cc/d_cc_mass_s/__dt__14cCcD_ShapeAttrFv.s deleted file mode 100644 index b80d62cf43..0000000000 --- a/asm/d/cc/d_cc_mass_s/__dt__14cCcD_ShapeAttrFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8008556C: -/* 8008556C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80085570 7C 08 02 A6 */ mflr r0 -/* 80085574 90 01 00 14 */ stw r0, 0x14(r1) -/* 80085578 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8008557C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80085580 41 82 00 30 */ beq lbl_800855B0 -/* 80085584 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80085588 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8008558C 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 80085590 41 82 00 10 */ beq lbl_800855A0 -/* 80085594 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80085598 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 8008559C 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_800855A0: -/* 800855A0 7C 80 07 35 */ extsh. r0, r4 -/* 800855A4 40 81 00 0C */ ble lbl_800855B0 -/* 800855A8 7F E3 FB 78 */ mr r3, r31 -/* 800855AC 48 24 97 91 */ bl __dl__FPv -lbl_800855B0: -/* 800855B0 7F E3 FB 78 */ mr r3, r31 -/* 800855B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800855B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800855BC 7C 08 03 A6 */ mtlr r0 -/* 800855C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800855C4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__10dAttDraw_cFv.s b/asm/d/com/d_com_inf_game/__ct__10dAttDraw_cFv.s deleted file mode 100644 index 7fa839475d..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__10dAttDraw_cFv.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_800307F0: -/* 800307F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800307F4 7C 08 02 A6 */ mflr r0 -/* 800307F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800307FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030800 93 C1 00 08 */ stw r30, 8(r1) -/* 80030804 7C 7F 1B 78 */ mr r31, r3 -/* 80030808 38 7F 00 08 */ addi r3, r31, 8 -/* 8003080C 3C 80 80 03 */ lis r4, __ct__13mDoExt_bckAnmFv@ha /* 0x80030A2C@ha */ -/* 80030810 38 84 0A 2C */ addi r4, r4, __ct__13mDoExt_bckAnmFv@l /* 0x80030A2C@l */ -/* 80030814 3C A0 80 03 */ lis r5, __dt__13mDoExt_bckAnmFv@ha /* 0x800306A0@ha */ -/* 80030818 38 A5 06 A0 */ addi r5, r5, __dt__13mDoExt_bckAnmFv@l /* 0x800306A0@l */ -/* 8003081C 38 C0 00 1C */ li r6, 0x1c -/* 80030820 38 E0 00 02 */ li r7, 2 -/* 80030824 48 33 15 3D */ bl __construct_array -/* 80030828 38 7F 00 40 */ addi r3, r31, 0x40 -/* 8003082C 3C 80 80 03 */ lis r4, __ct__13mDoExt_bpkAnmFv@ha /* 0x800309E4@ha */ -/* 80030830 38 84 09 E4 */ addi r4, r4, __ct__13mDoExt_bpkAnmFv@l /* 0x800309E4@l */ -/* 80030834 3C A0 80 03 */ lis r5, __dt__13mDoExt_bpkAnmFv@ha /* 0x800306F4@ha */ -/* 80030838 38 A5 06 F4 */ addi r5, r5, __dt__13mDoExt_bpkAnmFv@l /* 0x800306F4@l */ -/* 8003083C 38 C0 00 18 */ li r6, 0x18 -/* 80030840 38 E0 00 02 */ li r7, 2 -/* 80030844 48 33 15 1D */ bl __construct_array -/* 80030848 38 7F 00 70 */ addi r3, r31, 0x70 -/* 8003084C 3C 80 80 03 */ lis r4, __ct__13mDoExt_brkAnmFv@ha /* 0x8003099C@ha */ -/* 80030850 38 84 09 9C */ addi r4, r4, __ct__13mDoExt_brkAnmFv@l /* 0x8003099C@l */ -/* 80030854 3C A0 80 03 */ lis r5, __dt__13mDoExt_brkAnmFv@ha /* 0x80030748@ha */ -/* 80030858 38 A5 07 48 */ addi r5, r5, __dt__13mDoExt_brkAnmFv@l /* 0x80030748@l */ -/* 8003085C 38 C0 00 18 */ li r6, 0x18 -/* 80030860 38 E0 00 02 */ li r7, 2 -/* 80030864 48 33 14 FD */ bl __construct_array -/* 80030868 38 7F 00 A0 */ addi r3, r31, 0xa0 -/* 8003086C 3C 80 80 03 */ lis r4, __ct__13mDoExt_brkAnmFv@ha /* 0x8003099C@ha */ -/* 80030870 38 84 09 9C */ addi r4, r4, __ct__13mDoExt_brkAnmFv@l /* 0x8003099C@l */ -/* 80030874 3C A0 80 03 */ lis r5, __dt__13mDoExt_brkAnmFv@ha /* 0x80030748@ha */ -/* 80030878 38 A5 07 48 */ addi r5, r5, __dt__13mDoExt_brkAnmFv@l /* 0x80030748@l */ -/* 8003087C 38 C0 00 18 */ li r6, 0x18 -/* 80030880 38 E0 00 02 */ li r7, 2 -/* 80030884 48 33 14 DD */ bl __construct_array -/* 80030888 38 7F 00 D0 */ addi r3, r31, 0xd0 -/* 8003088C 3C 80 80 03 */ lis r4, __ct__13mDoExt_btkAnmFv@ha /* 0x80030954@ha */ -/* 80030890 38 84 09 54 */ addi r4, r4, __ct__13mDoExt_btkAnmFv@l /* 0x80030954@l */ -/* 80030894 3C A0 80 03 */ lis r5, __dt__13mDoExt_btkAnmFv@ha /* 0x8003079C@ha */ -/* 80030898 38 A5 07 9C */ addi r5, r5, __dt__13mDoExt_btkAnmFv@l /* 0x8003079C@l */ -/* 8003089C 38 C0 00 18 */ li r6, 0x18 -/* 800308A0 38 E0 00 02 */ li r7, 2 -/* 800308A4 48 33 14 BD */ bl __construct_array -/* 800308A8 3B DF 01 00 */ addi r30, r31, 0x100 -/* 800308AC 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800308B0 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 800308B4 90 1F 01 00 */ stw r0, 0x100(r31) -/* 800308B8 7F C3 F3 78 */ mr r3, r30 -/* 800308BC 38 80 00 00 */ li r4, 0 -/* 800308C0 48 2F 7B 3D */ bl init__12J3DFrameCtrlFs -/* 800308C4 38 00 00 00 */ li r0, 0 -/* 800308C8 90 1E 00 18 */ stw r0, 0x18(r30) -/* 800308CC 3B DF 01 1C */ addi r30, r31, 0x11c -/* 800308D0 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800308D4 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 800308D8 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 800308DC 7F C3 F3 78 */ mr r3, r30 -/* 800308E0 38 80 00 00 */ li r4, 0 -/* 800308E4 48 2F 7B 19 */ bl init__12J3DFrameCtrlFs -/* 800308E8 38 00 00 00 */ li r0, 0 -/* 800308EC 90 1E 00 14 */ stw r0, 0x14(r30) -/* 800308F0 3B DF 01 34 */ addi r30, r31, 0x134 -/* 800308F4 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800308F8 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 800308FC 90 1F 01 34 */ stw r0, 0x134(r31) -/* 80030900 7F C3 F3 78 */ mr r3, r30 -/* 80030904 38 80 00 00 */ li r4, 0 -/* 80030908 48 2F 7A F5 */ bl init__12J3DFrameCtrlFs -/* 8003090C 38 00 00 00 */ li r0, 0 -/* 80030910 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80030914 3B DF 01 4C */ addi r30, r31, 0x14c -/* 80030918 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 8003091C 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80030920 90 1F 01 4C */ stw r0, 0x14c(r31) -/* 80030924 7F C3 F3 78 */ mr r3, r30 -/* 80030928 38 80 00 00 */ li r4, 0 -/* 8003092C 48 2F 7A D1 */ bl init__12J3DFrameCtrlFs -/* 80030930 38 00 00 00 */ li r0, 0 -/* 80030934 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80030938 7F E3 FB 78 */ mr r3, r31 -/* 8003093C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030940 83 C1 00 08 */ lwz r30, 8(r1) -/* 80030944 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030948 7C 08 03 A6 */ mtlr r0 -/* 8003094C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030950 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__10dSv_zone_cFv.s b/asm/d/com/d_com_inf_game/__ct__10dSv_zone_cFv.s deleted file mode 100644 index e20a4e998b..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__10dSv_zone_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80030D74: -/* 80030D74 38 00 FF FF */ li r0, -1 -/* 80030D78 98 03 00 00 */ stb r0, 0(r3) -/* 80030D7C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__11cBgS_ChkElmFv.s b/asm/d/com/d_com_inf_game/__ct__11cBgS_ChkElmFv.s deleted file mode 100644 index 18fa73e3ff..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__11cBgS_ChkElmFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80030D38: -/* 80030D38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030D3C 7C 08 02 A6 */ mflr r0 -/* 80030D40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030D44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030D48 7C 7F 1B 78 */ mr r31, r3 -/* 80030D4C 3C 80 80 3B */ lis r4, __vt__11cBgS_ChkElm@ha /* 0x803AB630@ha */ -/* 80030D50 38 04 B6 30 */ addi r0, r4, __vt__11cBgS_ChkElm@l /* 0x803AB630@l */ -/* 80030D54 90 03 00 10 */ stw r0, 0x10(r3) -/* 80030D58 48 04 33 9D */ bl Init__11cBgS_ChkElmFv -/* 80030D5C 7F E3 FB 78 */ mr r3, r31 -/* 80030D60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030D64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030D68 7C 08 03 A6 */ mtlr r0 -/* 80030D6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030D70 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__12dSv_memory_cFv.s b/asm/d/com/d_com_inf_game/__ct__12dSv_memory_cFv.s deleted file mode 100644 index 15ab5e2ba4..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__12dSv_memory_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80030DB0: -/* 80030DB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030DB4 7C 08 02 A6 */ mflr r0 -/* 80030DB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030DBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030DC0 7C 7F 1B 78 */ mr r31, r3 -/* 80030DC4 48 00 3C A1 */ bl init__12dSv_memory_cFv -/* 80030DC8 7F E3 FB 78 */ mr r3, r31 -/* 80030DCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030DD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030DD4 7C 08 03 A6 */ mtlr r0 -/* 80030DD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030DDC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__13dComIfG_inf_cFv.s b/asm/d/com/d_com_inf_game/__ct__13dComIfG_inf_cFv.s deleted file mode 100644 index 3373927885..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__13dComIfG_inf_cFv.s +++ /dev/null @@ -1,162 +0,0 @@ -lbl_80030244: -/* 80030244 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80030248 7C 08 02 A6 */ mflr r0 -/* 8003024C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80030250 39 61 00 20 */ addi r11, r1, 0x20 -/* 80030254 48 33 1F 89 */ bl _savegpr_29 -/* 80030258 7C 7F 1B 78 */ mr r31, r3 -/* 8003025C 7C 7D 1B 78 */ mr r29, r3 -/* 80030260 7C 7E 1B 78 */ mr r30, r3 -/* 80030264 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 80030268 3C 80 80 03 */ lis r4, __ct__12dSv_memory_cFv@ha /* 0x80030DB0@ha */ -/* 8003026C 38 84 0D B0 */ addi r4, r4, __ct__12dSv_memory_cFv@l /* 0x80030DB0@l */ -/* 80030270 38 A0 00 00 */ li r5, 0 -/* 80030274 38 C0 00 20 */ li r6, 0x20 -/* 80030278 38 E0 00 20 */ li r7, 0x20 -/* 8003027C 48 33 1A E5 */ bl __construct_array -/* 80030280 38 7E 05 F0 */ addi r3, r30, 0x5f0 -/* 80030284 3C 80 80 03 */ lis r4, __ct__13dSv_memory2_cFv@ha /* 0x80030D80@ha */ -/* 80030288 38 84 0D 80 */ addi r4, r4, __ct__13dSv_memory2_cFv@l /* 0x80030D80@l */ -/* 8003028C 38 A0 00 00 */ li r5, 0 -/* 80030290 38 C0 00 08 */ li r6, 8 -/* 80030294 38 E0 00 40 */ li r7, 0x40 -/* 80030298 48 33 1A C9 */ bl __construct_array -/* 8003029C 38 7D 09 58 */ addi r3, r29, 0x958 -/* 800302A0 48 00 47 C5 */ bl init__12dSv_memory_cFv -/* 800302A4 38 7D 09 B4 */ addi r3, r29, 0x9b4 -/* 800302A8 3C 80 80 03 */ lis r4, __ct__10dSv_zone_cFv@ha /* 0x80030D74@ha */ -/* 800302AC 38 84 0D 74 */ addi r4, r4, __ct__10dSv_zone_cFv@l /* 0x80030D74@l */ -/* 800302B0 38 A0 00 00 */ li r5, 0 -/* 800302B4 38 C0 00 20 */ li r6, 0x20 -/* 800302B8 38 E0 00 20 */ li r7, 0x20 -/* 800302BC 48 33 1A A5 */ bl __construct_array -/* 800302C0 3B DF 0F 38 */ addi r30, r31, 0xf38 -/* 800302C4 7F DD F3 78 */ mr r29, r30 -/* 800302C8 3C 60 80 3B */ lis r3, __vt__4cBgS@ha /* 0x803AB61C@ha */ -/* 800302CC 38 03 B6 1C */ addi r0, r3, __vt__4cBgS@l /* 0x803AB61C@l */ -/* 800302D0 90 1F 23 38 */ stw r0, 0x2338(r31) -/* 800302D4 7F C3 F3 78 */ mr r3, r30 -/* 800302D8 3C 80 80 03 */ lis r4, __ct__11cBgS_ChkElmFv@ha /* 0x80030D38@ha */ -/* 800302DC 38 84 0D 38 */ addi r4, r4, __ct__11cBgS_ChkElmFv@l /* 0x80030D38@l */ -/* 800302E0 3C A0 80 03 */ lis r5, __dt__11cBgS_ChkElmFv@ha /* 0x8002FEF8@ha */ -/* 800302E4 38 A5 FE F8 */ addi r5, r5, __dt__11cBgS_ChkElmFv@l /* 0x8002FEF8@l */ -/* 800302E8 38 C0 00 14 */ li r6, 0x14 -/* 800302EC 38 E0 01 00 */ li r7, 0x100 -/* 800302F0 48 33 1A 71 */ bl __construct_array -/* 800302F4 3C 60 80 3B */ lis r3, __vt__4dBgS@ha /* 0x803AB608@ha */ -/* 800302F8 38 03 B6 08 */ addi r0, r3, __vt__4dBgS@l /* 0x803AB608@l */ -/* 800302FC 90 1D 14 00 */ stw r0, 0x1400(r29) -/* 80030300 3B BE 14 04 */ addi r29, r30, 0x1404 -/* 80030304 7F A3 EB 78 */ mr r3, r29 -/* 80030308 48 23 47 65 */ bl __ct__4cCcSFv -/* 8003030C 3C 60 80 3B */ lis r3, __vt__4dCcS@ha /* 0x803AC3E4@ha */ -/* 80030310 38 03 C3 E4 */ addi r0, r3, __vt__4dCcS@l /* 0x803AC3E4@l */ -/* 80030314 90 1D 28 48 */ stw r0, 0x2848(r29) -/* 80030318 38 7D 28 4C */ addi r3, r29, 0x284c -/* 8003031C 48 05 50 35 */ bl __ct__12dCcMassS_MngFv -/* 80030320 38 00 00 00 */ li r0, 0 -/* 80030324 98 1E 3E E4 */ stb r0, 0x3ee4(r30) -/* 80030328 3C 60 80 3A */ lis r3, __vt__11dStage_dt_c@ha /* 0x803A6D94@ha */ -/* 8003032C 38 03 6D 94 */ addi r0, r3, __vt__11dStage_dt_c@l /* 0x803A6D94@l */ -/* 80030330 90 1E 3E E8 */ stw r0, 0x3ee8(r30) -/* 80030334 3C 60 80 3A */ lis r3, __vt__16dStage_stageDt_c@ha /* 0x803A6C20@ha */ -/* 80030338 38 03 6C 20 */ addi r0, r3, __vt__16dStage_stageDt_c@l /* 0x803A6C20@l */ -/* 8003033C 90 1E 3E E8 */ stw r0, 0x3ee8(r30) -/* 80030340 38 7E 3F 90 */ addi r3, r30, 0x3f90 -/* 80030344 48 01 12 3D */ bl __ct__14dEvt_control_cFv -/* 80030348 38 7E 40 C0 */ addi r3, r30, 0x40c0 -/* 8003034C 48 01 63 3D */ bl __ct__16dEvent_manager_cFv -/* 80030350 3C 60 80 3A */ lis r3, __vt__25mDoExt_McaMorfCallBack1_c@ha /* 0x803A71E8@ha */ -/* 80030354 38 03 71 E8 */ addi r0, r3, __vt__25mDoExt_McaMorfCallBack1_c@l /* 0x803A71E8@l */ -/* 80030358 90 1E 47 88 */ stw r0, 0x4788(r30) -/* 8003035C 3C 60 80 3B */ lis r3, __vt__19dAttDraw_CallBack_c@ha /* 0x803A9C48@ha */ -/* 80030360 38 03 9C 48 */ addi r0, r3, __vt__19dAttDraw_CallBack_c@l /* 0x803A9C48@l */ -/* 80030364 90 1E 47 88 */ stw r0, 0x4788(r30) -/* 80030368 38 7E 47 A8 */ addi r3, r30, 0x47a8 -/* 8003036C 3C 80 80 03 */ lis r4, __ct__10dAttDraw_cFv@ha /* 0x800307F0@ha */ -/* 80030370 38 84 07 F0 */ addi r4, r4, __ct__10dAttDraw_cFv@l /* 0x800307F0@l */ -/* 80030374 3C A0 80 03 */ lis r5, __dt__10dAttDraw_cFv@ha /* 0x8003054C@ha */ -/* 80030378 38 A5 05 4C */ addi r5, r5, __dt__10dAttDraw_cFv@l /* 0x8003054C@l */ -/* 8003037C 38 C0 01 78 */ li r6, 0x178 -/* 80030380 38 E0 00 02 */ li r7, 2 -/* 80030384 48 33 19 DD */ bl __construct_array -/* 80030388 38 7E 4A B8 */ addi r3, r30, 0x4ab8 -/* 8003038C 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha /* 0x8003050C@ha */ -/* 80030390 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l /* 0x8003050C@l */ -/* 80030394 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha /* 0x800304D0@ha */ -/* 80030398 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l /* 0x800304D0@l */ -/* 8003039C 38 C0 00 14 */ li r6, 0x14 -/* 800303A0 38 E0 00 08 */ li r7, 8 -/* 800303A4 48 33 19 BD */ bl __construct_array -/* 800303A8 38 7E 4B 60 */ addi r3, r30, 0x4b60 -/* 800303AC 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha /* 0x8003050C@ha */ -/* 800303B0 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l /* 0x8003050C@l */ -/* 800303B4 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha /* 0x800304D0@ha */ -/* 800303B8 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l /* 0x800304D0@l */ -/* 800303BC 38 C0 00 14 */ li r6, 0x14 -/* 800303C0 38 E0 00 04 */ li r7, 4 -/* 800303C4 48 33 19 9D */ bl __construct_array -/* 800303C8 38 7E 4B B8 */ addi r3, r30, 0x4bb8 -/* 800303CC 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha /* 0x8003050C@ha */ -/* 800303D0 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l /* 0x8003050C@l */ -/* 800303D4 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha /* 0x800304D0@ha */ -/* 800303D8 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l /* 0x800304D0@l */ -/* 800303DC 38 C0 00 14 */ li r6, 0x14 -/* 800303E0 38 E0 00 04 */ li r7, 4 -/* 800303E4 48 33 19 7D */ bl __construct_array -/* 800303E8 3C 60 80 3B */ lis r3, __vt__11dAttParam_c@ha /* 0x803A9C60@ha */ -/* 800303EC 38 03 9C 60 */ addi r0, r3, __vt__11dAttParam_c@l /* 0x803A9C60@l */ -/* 800303F0 90 1E 4C 88 */ stw r0, 0x4c88(r30) -/* 800303F4 38 7E 4E 10 */ addi r3, r30, 0x4e10 -/* 800303F8 3C 80 80 03 */ lis r4, __ct__14dDlst_window_cFv@ha /* 0x800304CC@ha */ -/* 800303FC 38 84 04 CC */ addi r4, r4, __ct__14dDlst_window_cFv@l /* 0x800304CC@l */ -/* 80030400 3C A0 80 03 */ lis r5, __dt__14dDlst_window_cFv@ha /* 0x800301CC@ha */ -/* 80030404 38 A5 01 CC */ addi r5, r5, __dt__14dDlst_window_cFv@l /* 0x800301CC@l */ -/* 80030408 38 C0 00 2C */ li r6, 0x2c -/* 8003040C 38 E0 00 01 */ li r7, 1 -/* 80030410 48 33 19 51 */ bl __construct_array -/* 80030414 38 7E 4E 3C */ addi r3, r30, 0x4e3c -/* 80030418 3C 80 80 03 */ lis r4, __ct__25dComIfG_camera_info_classFv@ha /* 0x800304C8@ha */ -/* 8003041C 38 84 04 C8 */ addi r4, r4, __ct__25dComIfG_camera_info_classFv@l /* 0x800304C8@l */ -/* 80030420 3C A0 80 03 */ lis r5, __dt__25dComIfG_camera_info_classFv@ha /* 0x80030208@ha */ -/* 80030424 38 A5 02 08 */ addi r5, r5, __dt__25dComIfG_camera_info_classFv@l /* 0x80030208@l */ -/* 80030428 38 C0 00 38 */ li r6, 0x38 -/* 8003042C 38 E0 00 01 */ li r7, 1 -/* 80030430 48 33 19 31 */ bl __construct_array -/* 80030434 38 00 FF FF */ li r0, -1 -/* 80030438 90 1E 50 04 */ stw r0, 0x5004(r30) -/* 8003043C 38 00 00 00 */ li r0, 0 -/* 80030440 90 1E 50 00 */ stw r0, 0x5000(r30) -/* 80030444 90 1E 4F FC */ stw r0, 0x4ffc(r30) -/* 80030448 90 1E 4F F8 */ stw r0, 0x4ff8(r30) -/* 8003044C 7F C3 F3 78 */ mr r3, r30 -/* 80030450 4B FF AD 8D */ bl ct__14dComIfG_play_cFv -/* 80030454 38 7F 5F 64 */ addi r3, r31, 0x5f64 -/* 80030458 48 02 5C 99 */ bl __ct__12dDlst_list_cFv -/* 8003045C 3F BF 00 02 */ addis r29, r31, 2 -/* 80030460 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80030464 7F A3 EB 78 */ mr r3, r29 -/* 80030468 3C 80 80 04 */ lis r4, __ct__11dRes_info_cFv@ha /* 0x8003A260@ha */ -/* 8003046C 38 84 A2 60 */ addi r4, r4, __ct__11dRes_info_cFv@l /* 0x8003A260@l */ -/* 80030470 3C A0 80 04 */ lis r5, __dt__11dRes_info_cFv@ha /* 0x8003A280@ha */ -/* 80030474 38 A5 A2 80 */ addi r5, r5, __dt__11dRes_info_cFv@l /* 0x8003A280@l */ -/* 80030478 38 C0 00 24 */ li r6, 0x24 -/* 8003047C 38 E0 00 80 */ li r7, 0x80 -/* 80030480 48 33 18 E1 */ bl __construct_array -/* 80030484 38 7D 12 00 */ addi r3, r29, 0x1200 -/* 80030488 3C 80 80 04 */ lis r4, __ct__11dRes_info_cFv@ha /* 0x8003A260@ha */ -/* 8003048C 38 84 A2 60 */ addi r4, r4, __ct__11dRes_info_cFv@l /* 0x8003A260@l */ -/* 80030490 3C A0 80 04 */ lis r5, __dt__11dRes_info_cFv@ha /* 0x8003A280@ha */ -/* 80030494 38 A5 A2 80 */ addi r5, r5, __dt__11dRes_info_cFv@l /* 0x8003A280@l */ -/* 80030498 38 C0 00 24 */ li r6, 0x24 -/* 8003049C 38 E0 00 40 */ li r7, 0x40 -/* 800304A0 48 33 18 C1 */ bl __construct_array -/* 800304A4 7F E3 FB 78 */ mr r3, r31 -/* 800304A8 4B FF C7 3D */ bl ct__13dComIfG_inf_cFv -/* 800304AC 7F E3 FB 78 */ mr r3, r31 -/* 800304B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800304B4 48 33 1D 75 */ bl _restgpr_29 -/* 800304B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800304BC 7C 08 03 A6 */ mtlr r0 -/* 800304C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800304C4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__13dSv_memory2_cFv.s b/asm/d/com/d_com_inf_game/__ct__13dSv_memory2_cFv.s deleted file mode 100644 index b26aef102c..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__13dSv_memory2_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80030D80: -/* 80030D80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030D84 7C 08 02 A6 */ mflr r0 -/* 80030D88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030D8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030D90 7C 7F 1B 78 */ mr r31, r3 -/* 80030D94 48 00 3C F1 */ bl init__13dSv_memory2_cFv -/* 80030D98 7F E3 FB 78 */ mr r3, r31 -/* 80030D9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030DA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030DA4 7C 08 03 A6 */ mtlr r0 -/* 80030DA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030DAC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__13mDoExt_bckAnmFv.s b/asm/d/com/d_com_inf_game/__ct__13mDoExt_bckAnmFv.s deleted file mode 100644 index 58bbe5d13b..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__13mDoExt_bckAnmFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80030A2C: -/* 80030A2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030A30 7C 08 02 A6 */ mflr r0 -/* 80030A34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030A38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030A3C 7C 7F 1B 78 */ mr r31, r3 -/* 80030A40 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80030A44 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80030A48 90 03 00 00 */ stw r0, 0(r3) -/* 80030A4C 38 80 00 00 */ li r4, 0 -/* 80030A50 48 2F 79 AD */ bl init__12J3DFrameCtrlFs -/* 80030A54 38 00 00 00 */ li r0, 0 -/* 80030A58 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80030A5C 7F E3 FB 78 */ mr r3, r31 -/* 80030A60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030A64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030A68 7C 08 03 A6 */ mtlr r0 -/* 80030A6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030A70 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__13mDoExt_bpkAnmFv.s b/asm/d/com/d_com_inf_game/__ct__13mDoExt_bpkAnmFv.s deleted file mode 100644 index db74d59541..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__13mDoExt_bpkAnmFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800309E4: -/* 800309E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800309E8 7C 08 02 A6 */ mflr r0 -/* 800309EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800309F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800309F4 7C 7F 1B 78 */ mr r31, r3 -/* 800309F8 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800309FC 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80030A00 90 03 00 00 */ stw r0, 0(r3) -/* 80030A04 38 80 00 00 */ li r4, 0 -/* 80030A08 48 2F 79 F5 */ bl init__12J3DFrameCtrlFs -/* 80030A0C 38 00 00 00 */ li r0, 0 -/* 80030A10 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80030A14 7F E3 FB 78 */ mr r3, r31 -/* 80030A18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030A1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030A20 7C 08 03 A6 */ mtlr r0 -/* 80030A24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030A28 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__13mDoExt_brkAnmFv.s b/asm/d/com/d_com_inf_game/__ct__13mDoExt_brkAnmFv.s deleted file mode 100644 index e4749a8161..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__13mDoExt_brkAnmFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8003099C: -/* 8003099C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800309A0 7C 08 02 A6 */ mflr r0 -/* 800309A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800309A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800309AC 7C 7F 1B 78 */ mr r31, r3 -/* 800309B0 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800309B4 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 800309B8 90 03 00 00 */ stw r0, 0(r3) -/* 800309BC 38 80 00 00 */ li r4, 0 -/* 800309C0 48 2F 7A 3D */ bl init__12J3DFrameCtrlFs -/* 800309C4 38 00 00 00 */ li r0, 0 -/* 800309C8 90 1F 00 14 */ stw r0, 0x14(r31) -/* 800309CC 7F E3 FB 78 */ mr r3, r31 -/* 800309D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800309D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800309D8 7C 08 03 A6 */ mtlr r0 -/* 800309DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800309E0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__ct__13mDoExt_btkAnmFv.s b/asm/d/com/d_com_inf_game/__ct__13mDoExt_btkAnmFv.s deleted file mode 100644 index 1714bdb2e0..0000000000 --- a/asm/d/com/d_com_inf_game/__ct__13mDoExt_btkAnmFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80030954: -/* 80030954 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030958 7C 08 02 A6 */ mflr r0 -/* 8003095C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030960 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030964 7C 7F 1B 78 */ mr r31, r3 -/* 80030968 3C 80 80 3A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 8003096C 38 04 33 54 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80030970 90 03 00 00 */ stw r0, 0(r3) -/* 80030974 38 80 00 00 */ li r4, 0 -/* 80030978 48 2F 7A 85 */ bl init__12J3DFrameCtrlFs -/* 8003097C 38 00 00 00 */ li r0, 0 -/* 80030980 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80030984 7F E3 FB 78 */ mr r3, r31 -/* 80030988 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003098C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030990 7C 08 03 A6 */ mtlr r0 -/* 80030994 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030998 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__10dAttDraw_cFv.s b/asm/d/com/d_com_inf_game/__dt__10dAttDraw_cFv.s deleted file mode 100644 index 557f5bbfb6..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__10dAttDraw_cFv.s +++ /dev/null @@ -1,91 +0,0 @@ -lbl_8003054C: -/* 8003054C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030550 7C 08 02 A6 */ mflr r0 -/* 80030554 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030558 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003055C 93 C1 00 08 */ stw r30, 8(r1) -/* 80030560 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80030564 7C 9F 23 78 */ mr r31, r4 -/* 80030568 41 82 01 1C */ beq lbl_80030684 -/* 8003056C 34 1E 01 4C */ addic. r0, r30, 0x14c -/* 80030570 41 82 00 20 */ beq lbl_80030590 -/* 80030574 34 1E 01 4C */ addic. r0, r30, 0x14c -/* 80030578 41 82 00 18 */ beq lbl_80030590 -/* 8003057C 34 1E 01 4C */ addic. r0, r30, 0x14c -/* 80030580 41 82 00 10 */ beq lbl_80030590 -/* 80030584 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80030588 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 8003058C 90 1E 01 4C */ stw r0, 0x14c(r30) -lbl_80030590: -/* 80030590 34 1E 01 34 */ addic. r0, r30, 0x134 -/* 80030594 41 82 00 20 */ beq lbl_800305B4 -/* 80030598 34 1E 01 34 */ addic. r0, r30, 0x134 -/* 8003059C 41 82 00 18 */ beq lbl_800305B4 -/* 800305A0 34 1E 01 34 */ addic. r0, r30, 0x134 -/* 800305A4 41 82 00 10 */ beq lbl_800305B4 -/* 800305A8 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800305AC 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 800305B0 90 1E 01 34 */ stw r0, 0x134(r30) -lbl_800305B4: -/* 800305B4 34 1E 01 1C */ addic. r0, r30, 0x11c -/* 800305B8 41 82 00 20 */ beq lbl_800305D8 -/* 800305BC 34 1E 01 1C */ addic. r0, r30, 0x11c -/* 800305C0 41 82 00 18 */ beq lbl_800305D8 -/* 800305C4 34 1E 01 1C */ addic. r0, r30, 0x11c -/* 800305C8 41 82 00 10 */ beq lbl_800305D8 -/* 800305CC 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800305D0 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 800305D4 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_800305D8: -/* 800305D8 34 1E 01 00 */ addic. r0, r30, 0x100 -/* 800305DC 41 82 00 20 */ beq lbl_800305FC -/* 800305E0 34 1E 01 00 */ addic. r0, r30, 0x100 -/* 800305E4 41 82 00 18 */ beq lbl_800305FC -/* 800305E8 34 1E 01 00 */ addic. r0, r30, 0x100 -/* 800305EC 41 82 00 10 */ beq lbl_800305FC -/* 800305F0 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800305F4 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 800305F8 90 1E 01 00 */ stw r0, 0x100(r30) -lbl_800305FC: -/* 800305FC 38 7E 00 D0 */ addi r3, r30, 0xd0 -/* 80030600 3C 80 80 03 */ lis r4, __dt__13mDoExt_btkAnmFv@ha /* 0x8003079C@ha */ -/* 80030604 38 84 07 9C */ addi r4, r4, __dt__13mDoExt_btkAnmFv@l /* 0x8003079C@l */ -/* 80030608 38 A0 00 18 */ li r5, 0x18 -/* 8003060C 38 C0 00 02 */ li r6, 2 -/* 80030610 48 33 16 D9 */ bl __destroy_arr -/* 80030614 38 7E 00 A0 */ addi r3, r30, 0xa0 -/* 80030618 3C 80 80 03 */ lis r4, __dt__13mDoExt_brkAnmFv@ha /* 0x80030748@ha */ -/* 8003061C 38 84 07 48 */ addi r4, r4, __dt__13mDoExt_brkAnmFv@l /* 0x80030748@l */ -/* 80030620 38 A0 00 18 */ li r5, 0x18 -/* 80030624 38 C0 00 02 */ li r6, 2 -/* 80030628 48 33 16 C1 */ bl __destroy_arr -/* 8003062C 38 7E 00 70 */ addi r3, r30, 0x70 -/* 80030630 3C 80 80 03 */ lis r4, __dt__13mDoExt_brkAnmFv@ha /* 0x80030748@ha */ -/* 80030634 38 84 07 48 */ addi r4, r4, __dt__13mDoExt_brkAnmFv@l /* 0x80030748@l */ -/* 80030638 38 A0 00 18 */ li r5, 0x18 -/* 8003063C 38 C0 00 02 */ li r6, 2 -/* 80030640 48 33 16 A9 */ bl __destroy_arr -/* 80030644 38 7E 00 40 */ addi r3, r30, 0x40 -/* 80030648 3C 80 80 03 */ lis r4, __dt__13mDoExt_bpkAnmFv@ha /* 0x800306F4@ha */ -/* 8003064C 38 84 06 F4 */ addi r4, r4, __dt__13mDoExt_bpkAnmFv@l /* 0x800306F4@l */ -/* 80030650 38 A0 00 18 */ li r5, 0x18 -/* 80030654 38 C0 00 02 */ li r6, 2 -/* 80030658 48 33 16 91 */ bl __destroy_arr -/* 8003065C 38 7E 00 08 */ addi r3, r30, 8 -/* 80030660 3C 80 80 03 */ lis r4, __dt__13mDoExt_bckAnmFv@ha /* 0x800306A0@ha */ -/* 80030664 38 84 06 A0 */ addi r4, r4, __dt__13mDoExt_bckAnmFv@l /* 0x800306A0@l */ -/* 80030668 38 A0 00 1C */ li r5, 0x1c -/* 8003066C 38 C0 00 02 */ li r6, 2 -/* 80030670 48 33 16 79 */ bl __destroy_arr -/* 80030674 7F E0 07 35 */ extsh. r0, r31 -/* 80030678 40 81 00 0C */ ble lbl_80030684 -/* 8003067C 7F C3 F3 78 */ mr r3, r30 -/* 80030680 48 29 E6 BD */ bl __dl__FPv -lbl_80030684: -/* 80030684 7F C3 F3 78 */ mr r3, r30 -/* 80030688 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003068C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80030690 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030694 7C 08 03 A6 */ mtlr r0 -/* 80030698 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003069C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__10dAttList_cFv.s b/asm/d/com/d_com_inf_game/__dt__10dAttList_cFv.s deleted file mode 100644 index 5bfc7b8891..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__10dAttList_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800304D0: -/* 800304D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800304D4 7C 08 02 A6 */ mflr r0 -/* 800304D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800304DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800304E0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800304E4 41 82 00 10 */ beq lbl_800304F4 -/* 800304E8 7C 80 07 35 */ extsh. r0, r4 -/* 800304EC 40 81 00 08 */ ble lbl_800304F4 -/* 800304F0 48 29 E8 4D */ bl __dl__FPv -lbl_800304F4: -/* 800304F4 7F E3 FB 78 */ mr r3, r31 -/* 800304F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800304FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030500 7C 08 03 A6 */ mtlr r0 -/* 80030504 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030508 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__11cBgS_ChkElmFv.s b/asm/d/com/d_com_inf_game/__dt__11cBgS_ChkElmFv.s deleted file mode 100644 index 35691c0513..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__11cBgS_ChkElmFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8002FEF8: -/* 8002FEF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002FEFC 7C 08 02 A6 */ mflr r0 -/* 8002FF00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002FF04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002FF08 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002FF0C 41 82 00 1C */ beq lbl_8002FF28 -/* 8002FF10 3C A0 80 3B */ lis r5, __vt__11cBgS_ChkElm@ha /* 0x803AB630@ha */ -/* 8002FF14 38 05 B6 30 */ addi r0, r5, __vt__11cBgS_ChkElm@l /* 0x803AB630@l */ -/* 8002FF18 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8002FF1C 7C 80 07 35 */ extsh. r0, r4 -/* 8002FF20 40 81 00 08 */ ble lbl_8002FF28 -/* 8002FF24 48 29 EE 19 */ bl __dl__FPv -lbl_8002FF28: -/* 8002FF28 7F E3 FB 78 */ mr r3, r31 -/* 8002FF2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002FF30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002FF34 7C 08 03 A6 */ mtlr r0 -/* 8002FF38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002FF3C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__11dEvDtBase_cFv.s b/asm/d/com/d_com_inf_game/__dt__11dEvDtBase_cFv.s deleted file mode 100644 index b7e251804a..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__11dEvDtBase_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80030190: -/* 80030190 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030194 7C 08 02 A6 */ mflr r0 -/* 80030198 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003019C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800301A0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800301A4 41 82 00 10 */ beq lbl_800301B4 -/* 800301A8 7C 80 07 35 */ extsh. r0, r4 -/* 800301AC 40 81 00 08 */ ble lbl_800301B4 -/* 800301B0 48 29 EB 8D */ bl __dl__FPv -lbl_800301B4: -/* 800301B4 7F E3 FB 78 */ mr r3, r31 -/* 800301B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800301BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800301C0 7C 08 03 A6 */ mtlr r0 -/* 800301C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800301C8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__12dCcMassS_MngFv.s b/asm/d/com/d_com_inf_game/__dt__12dCcMassS_MngFv.s deleted file mode 100644 index 34ec3b997e..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__12dCcMassS_MngFv.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_80030A74: -/* 80030A74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030A78 7C 08 02 A6 */ mflr r0 -/* 80030A7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030A80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030A84 93 C1 00 08 */ stw r30, 8(r1) -/* 80030A88 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80030A8C 7C 9F 23 78 */ mr r31, r4 -/* 80030A90 41 82 01 30 */ beq lbl_80030BC0 -/* 80030A94 3C 60 80 3A */ lis r3, __vt__12dCcMassS_Mng@ha /* 0x803A7230@ha */ -/* 80030A98 38 03 72 30 */ addi r0, r3, __vt__12dCcMassS_Mng@l /* 0x803A7230@l */ -/* 80030A9C 90 1E 02 74 */ stw r0, 0x274(r30) -/* 80030AA0 34 1E 02 64 */ addic. r0, r30, 0x264 -/* 80030AA4 41 82 00 10 */ beq lbl_80030AB4 -/* 80030AA8 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80030AAC 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80030AB0 90 1E 02 70 */ stw r0, 0x270(r30) -lbl_80030AB4: -/* 80030AB4 34 1E 02 24 */ addic. r0, r30, 0x224 -/* 80030AB8 41 82 00 4C */ beq lbl_80030B04 -/* 80030ABC 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80030AC0 38 63 36 08 */ addi r3, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80030AC4 90 7E 02 40 */ stw r3, 0x240(r30) -/* 80030AC8 38 03 00 58 */ addi r0, r3, 0x58 -/* 80030ACC 90 1E 02 5C */ stw r0, 0x25c(r30) -/* 80030AD0 38 7E 02 44 */ addi r3, r30, 0x244 -/* 80030AD4 38 80 00 00 */ li r4, 0 -/* 80030AD8 48 23 E4 CD */ bl __dt__8cM3dGCpsFv -/* 80030ADC 34 1E 02 24 */ addic. r0, r30, 0x224 -/* 80030AE0 41 82 00 24 */ beq lbl_80030B04 -/* 80030AE4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80030AE8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80030AEC 90 1E 02 40 */ stw r0, 0x240(r30) -/* 80030AF0 34 1E 02 24 */ addic. r0, r30, 0x224 -/* 80030AF4 41 82 00 10 */ beq lbl_80030B04 -/* 80030AF8 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80030AFC 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80030B00 90 1E 02 3C */ stw r0, 0x23c(r30) -lbl_80030B04: -/* 80030B04 34 1E 01 C8 */ addic. r0, r30, 0x1c8 -/* 80030B08 41 82 00 54 */ beq lbl_80030B5C -/* 80030B0C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80030B10 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80030B14 90 7E 01 E4 */ stw r3, 0x1e4(r30) -/* 80030B18 38 03 00 58 */ addi r0, r3, 0x58 -/* 80030B1C 90 1E 01 FC */ stw r0, 0x1fc(r30) -/* 80030B20 34 1E 01 E8 */ addic. r0, r30, 0x1e8 -/* 80030B24 41 82 00 10 */ beq lbl_80030B34 -/* 80030B28 3C 60 80 3A */ lis r3, __vt__8cM3dGCyl@ha /* 0x803A720C@ha */ -/* 80030B2C 38 03 72 0C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x803A720C@l */ -/* 80030B30 90 1E 01 FC */ stw r0, 0x1fc(r30) -lbl_80030B34: -/* 80030B34 34 1E 01 C8 */ addic. r0, r30, 0x1c8 -/* 80030B38 41 82 00 24 */ beq lbl_80030B5C -/* 80030B3C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80030B40 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80030B44 90 1E 01 E4 */ stw r0, 0x1e4(r30) -/* 80030B48 34 1E 01 C8 */ addic. r0, r30, 0x1c8 -/* 80030B4C 41 82 00 10 */ beq lbl_80030B5C -/* 80030B50 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80030B54 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80030B58 90 1E 01 E0 */ stw r0, 0x1e0(r30) -lbl_80030B5C: -/* 80030B5C 38 7E 01 88 */ addi r3, r30, 0x188 -/* 80030B60 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha /* 0x800300F4@ha */ -/* 80030B64 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l /* 0x800300F4@l */ -/* 80030B68 38 A0 00 20 */ li r5, 0x20 -/* 80030B6C 38 C0 00 02 */ li r6, 2 -/* 80030B70 48 33 11 79 */ bl __destroy_arr -/* 80030B74 38 7E 00 44 */ addi r3, r30, 0x44 -/* 80030B78 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha /* 0x800300F4@ha */ -/* 80030B7C 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l /* 0x800300F4@l */ -/* 80030B80 38 A0 00 20 */ li r5, 0x20 -/* 80030B84 38 C0 00 0A */ li r6, 0xa -/* 80030B88 48 33 11 61 */ bl __destroy_arr -/* 80030B8C 28 1E 00 00 */ cmplwi r30, 0 -/* 80030B90 41 82 00 20 */ beq lbl_80030BB0 -/* 80030B94 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideArea@ha /* 0x803A7200@ha */ -/* 80030B98 38 03 72 00 */ addi r0, r3, __vt__15cCcD_DivideArea@l /* 0x803A7200@l */ -/* 80030B9C 90 1E 00 18 */ stw r0, 0x18(r30) -/* 80030BA0 41 82 00 10 */ beq lbl_80030BB0 -/* 80030BA4 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80030BA8 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80030BAC 90 1E 00 18 */ stw r0, 0x18(r30) -lbl_80030BB0: -/* 80030BB0 7F E0 07 35 */ extsh. r0, r31 -/* 80030BB4 40 81 00 0C */ ble lbl_80030BC0 -/* 80030BB8 7F C3 F3 78 */ mr r3, r30 -/* 80030BBC 48 29 E1 81 */ bl __dl__FPv -lbl_80030BC0: -/* 80030BC0 7F C3 F3 78 */ mr r3, r30 -/* 80030BC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030BC8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80030BCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030BD0 7C 08 03 A6 */ mtlr r0 -/* 80030BD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030BD8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__12dCcMassS_ObjFv.s b/asm/d/com/d_com_inf_game/__dt__12dCcMassS_ObjFv.s deleted file mode 100644 index ebefbd67fe..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__12dCcMassS_ObjFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800300F4: -/* 800300F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800300F8 7C 08 02 A6 */ mflr r0 -/* 800300FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030100 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030104 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80030108 41 82 00 34 */ beq lbl_8003013C -/* 8003010C 3C 60 80 3A */ lis r3, __vt__12dCcMassS_Obj@ha /* 0x803A71F4@ha */ -/* 80030110 38 03 71 F4 */ addi r0, r3, __vt__12dCcMassS_Obj@l /* 0x803A71F4@l */ -/* 80030114 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 80030118 34 1F 00 0C */ addic. r0, r31, 0xc -/* 8003011C 41 82 00 10 */ beq lbl_8003012C -/* 80030120 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80030124 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80030128 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_8003012C: -/* 8003012C 7C 80 07 35 */ extsh. r0, r4 -/* 80030130 40 81 00 0C */ ble lbl_8003013C -/* 80030134 7F E3 FB 78 */ mr r3, r31 -/* 80030138 48 29 EC 05 */ bl __dl__FPv -lbl_8003013C: -/* 8003013C 7F E3 FB 78 */ mr r3, r31 -/* 80030140 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030144 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030148 7C 08 03 A6 */ mtlr r0 -/* 8003014C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030150 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__12dEvt_order_cFv.s b/asm/d/com/d_com_inf_game/__dt__12dEvt_order_cFv.s deleted file mode 100644 index d38ea0220d..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__12dEvt_order_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80030154: -/* 80030154 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030158 7C 08 02 A6 */ mflr r0 -/* 8003015C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030160 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030164 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80030168 41 82 00 10 */ beq lbl_80030178 -/* 8003016C 7C 80 07 35 */ extsh. r0, r4 -/* 80030170 40 81 00 08 */ ble lbl_80030178 -/* 80030174 48 29 EB C9 */ bl __dl__FPv -lbl_80030178: -/* 80030178 7F E3 FB 78 */ mr r3, r31 -/* 8003017C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030180 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030184 7C 08 03 A6 */ mtlr r0 -/* 80030188 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003018C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__13dComIfG_inf_cFv.s b/asm/d/com/d_com_inf_game/__dt__13dComIfG_inf_cFv.s deleted file mode 100644 index 1ee9b2096b..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__13dComIfG_inf_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8002FD74: -/* 8002FD74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002FD78 7C 08 02 A6 */ mflr r0 -/* 8002FD7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002FD80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002FD84 93 C1 00 08 */ stw r30, 8(r1) -/* 8002FD88 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8002FD8C 7C 9F 23 78 */ mr r31, r4 -/* 8002FD90 41 82 00 3C */ beq lbl_8002FDCC -/* 8002FD94 3C 7E 00 02 */ addis r3, r30, 2 -/* 8002FD98 38 80 FF FF */ li r4, -1 -/* 8002FD9C 38 63 C2 F8 */ addi r3, r3, -15624 -/* 8002FDA0 48 00 C2 11 */ bl __dt__14dRes_control_cFv -/* 8002FDA4 38 7E 5F 64 */ addi r3, r30, 0x5f64 -/* 8002FDA8 38 80 FF FF */ li r4, -1 -/* 8002FDAC 48 02 66 E1 */ bl __dt__12dDlst_list_cFv -/* 8002FDB0 38 7E 0F 38 */ addi r3, r30, 0xf38 -/* 8002FDB4 38 80 FF FF */ li r4, -1 -/* 8002FDB8 48 00 00 31 */ bl __dt__14dComIfG_play_cFv -/* 8002FDBC 7F E0 07 35 */ extsh. r0, r31 -/* 8002FDC0 40 81 00 0C */ ble lbl_8002FDCC -/* 8002FDC4 7F C3 F3 78 */ mr r3, r30 -/* 8002FDC8 48 29 EF 75 */ bl __dl__FPv -lbl_8002FDCC: -/* 8002FDCC 7F C3 F3 78 */ mr r3, r30 -/* 8002FDD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002FDD4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002FDD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002FDDC 7C 08 03 A6 */ mtlr r0 -/* 8002FDE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002FDE4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__13mDoExt_bckAnmFv.s b/asm/d/com/d_com_inf_game/__dt__13mDoExt_bckAnmFv.s deleted file mode 100644 index 5988d90058..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__13mDoExt_bckAnmFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800306A0: -/* 800306A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800306A4 7C 08 02 A6 */ mflr r0 -/* 800306A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800306AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800306B0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800306B4 41 82 00 28 */ beq lbl_800306DC -/* 800306B8 41 82 00 14 */ beq lbl_800306CC -/* 800306BC 41 82 00 10 */ beq lbl_800306CC -/* 800306C0 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800306C4 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 800306C8 90 1F 00 00 */ stw r0, 0(r31) -lbl_800306CC: -/* 800306CC 7C 80 07 35 */ extsh. r0, r4 -/* 800306D0 40 81 00 0C */ ble lbl_800306DC -/* 800306D4 7F E3 FB 78 */ mr r3, r31 -/* 800306D8 48 29 E6 65 */ bl __dl__FPv -lbl_800306DC: -/* 800306DC 7F E3 FB 78 */ mr r3, r31 -/* 800306E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800306E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800306E8 7C 08 03 A6 */ mtlr r0 -/* 800306EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800306F0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__13mDoExt_bpkAnmFv.s b/asm/d/com/d_com_inf_game/__dt__13mDoExt_bpkAnmFv.s deleted file mode 100644 index cf33752980..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__13mDoExt_bpkAnmFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800306F4: -/* 800306F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800306F8 7C 08 02 A6 */ mflr r0 -/* 800306FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030700 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030704 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80030708 41 82 00 28 */ beq lbl_80030730 -/* 8003070C 41 82 00 14 */ beq lbl_80030720 -/* 80030710 41 82 00 10 */ beq lbl_80030720 -/* 80030714 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80030718 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 8003071C 90 1F 00 00 */ stw r0, 0(r31) -lbl_80030720: -/* 80030720 7C 80 07 35 */ extsh. r0, r4 -/* 80030724 40 81 00 0C */ ble lbl_80030730 -/* 80030728 7F E3 FB 78 */ mr r3, r31 -/* 8003072C 48 29 E6 11 */ bl __dl__FPv -lbl_80030730: -/* 80030730 7F E3 FB 78 */ mr r3, r31 -/* 80030734 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030738 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003073C 7C 08 03 A6 */ mtlr r0 -/* 80030740 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030744 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__13mDoExt_brkAnmFv.s b/asm/d/com/d_com_inf_game/__dt__13mDoExt_brkAnmFv.s deleted file mode 100644 index 8f94321160..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__13mDoExt_brkAnmFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80030748: -/* 80030748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003074C 7C 08 02 A6 */ mflr r0 -/* 80030750 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030754 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030758 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8003075C 41 82 00 28 */ beq lbl_80030784 -/* 80030760 41 82 00 14 */ beq lbl_80030774 -/* 80030764 41 82 00 10 */ beq lbl_80030774 -/* 80030768 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 8003076C 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80030770 90 1F 00 00 */ stw r0, 0(r31) -lbl_80030774: -/* 80030774 7C 80 07 35 */ extsh. r0, r4 -/* 80030778 40 81 00 0C */ ble lbl_80030784 -/* 8003077C 7F E3 FB 78 */ mr r3, r31 -/* 80030780 48 29 E5 BD */ bl __dl__FPv -lbl_80030784: -/* 80030784 7F E3 FB 78 */ mr r3, r31 -/* 80030788 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003078C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030790 7C 08 03 A6 */ mtlr r0 -/* 80030794 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030798 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__13mDoExt_btkAnmFv.s b/asm/d/com/d_com_inf_game/__dt__13mDoExt_btkAnmFv.s deleted file mode 100644 index 115f321ffc..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__13mDoExt_btkAnmFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8003079C: -/* 8003079C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800307A0 7C 08 02 A6 */ mflr r0 -/* 800307A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800307A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800307AC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800307B0 41 82 00 28 */ beq lbl_800307D8 -/* 800307B4 41 82 00 14 */ beq lbl_800307C8 -/* 800307B8 41 82 00 10 */ beq lbl_800307C8 -/* 800307BC 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 800307C0 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 800307C4 90 1F 00 00 */ stw r0, 0(r31) -lbl_800307C8: -/* 800307C8 7C 80 07 35 */ extsh. r0, r4 -/* 800307CC 40 81 00 0C */ ble lbl_800307D8 -/* 800307D0 7F E3 FB 78 */ mr r3, r31 -/* 800307D4 48 29 E5 69 */ bl __dl__FPv -lbl_800307D8: -/* 800307D8 7F E3 FB 78 */ mr r3, r31 -/* 800307DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800307E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800307E4 7C 08 03 A6 */ mtlr r0 -/* 800307E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800307EC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__14dComIfG_play_cFv.s b/asm/d/com/d_com_inf_game/__dt__14dComIfG_play_cFv.s deleted file mode 100644 index 30ce7ad4fe..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__14dComIfG_play_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_8002FDE8: -/* 8002FDE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002FDEC 7C 08 02 A6 */ mflr r0 -/* 8002FDF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002FDF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002FDF8 93 C1 00 08 */ stw r30, 8(r1) -/* 8002FDFC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002FE00 7C 9E 23 78 */ mr r30, r4 -/* 8002FE04 41 82 00 D8 */ beq lbl_8002FEDC -/* 8002FE08 38 7F 4E 3C */ addi r3, r31, 0x4e3c -/* 8002FE0C 3C 80 80 03 */ lis r4, __dt__25dComIfG_camera_info_classFv@ha /* 0x80030208@ha */ -/* 8002FE10 38 84 02 08 */ addi r4, r4, __dt__25dComIfG_camera_info_classFv@l /* 0x80030208@l */ -/* 8002FE14 38 A0 00 38 */ li r5, 0x38 -/* 8002FE18 38 C0 00 01 */ li r6, 1 -/* 8002FE1C 48 33 1E CD */ bl __destroy_arr -/* 8002FE20 38 7F 4E 10 */ addi r3, r31, 0x4e10 -/* 8002FE24 3C 80 80 03 */ lis r4, __dt__14dDlst_window_cFv@ha /* 0x800301CC@ha */ -/* 8002FE28 38 84 01 CC */ addi r4, r4, __dt__14dDlst_window_cFv@l /* 0x800301CC@l */ -/* 8002FE2C 38 A0 00 2C */ li r5, 0x2c -/* 8002FE30 38 C0 00 01 */ li r6, 1 -/* 8002FE34 48 33 1E B5 */ bl __destroy_arr -/* 8002FE38 38 7F 47 80 */ addi r3, r31, 0x4780 -/* 8002FE3C 38 80 FF FF */ li r4, -1 -/* 8002FE40 48 04 09 35 */ bl __dt__12dAttention_cFv -/* 8002FE44 34 1F 40 C0 */ addic. r0, r31, 0x40c0 -/* 8002FE48 41 82 00 1C */ beq lbl_8002FE64 -/* 8002FE4C 38 7F 40 C0 */ addi r3, r31, 0x40c0 -/* 8002FE50 3C 80 80 03 */ lis r4, __dt__11dEvDtBase_cFv@ha /* 0x80030190@ha */ -/* 8002FE54 38 84 01 90 */ addi r4, r4, __dt__11dEvDtBase_cFv@l /* 0x80030190@l */ -/* 8002FE58 38 A0 00 24 */ li r5, 0x24 -/* 8002FE5C 38 C0 00 0B */ li r6, 0xb -/* 8002FE60 48 33 1E 89 */ bl __destroy_arr -lbl_8002FE64: -/* 8002FE64 34 1F 3F 90 */ addic. r0, r31, 0x3f90 -/* 8002FE68 41 82 00 1C */ beq lbl_8002FE84 -/* 8002FE6C 38 7F 3F 94 */ addi r3, r31, 0x3f94 -/* 8002FE70 3C 80 80 03 */ lis r4, __dt__12dEvt_order_cFv@ha /* 0x80030154@ha */ -/* 8002FE74 38 84 01 54 */ addi r4, r4, __dt__12dEvt_order_cFv@l /* 0x80030154@l */ -/* 8002FE78 38 A0 00 18 */ li r5, 0x18 -/* 8002FE7C 38 C0 00 08 */ li r6, 8 -/* 8002FE80 48 33 1E 69 */ bl __destroy_arr -lbl_8002FE84: -/* 8002FE84 38 7F 14 04 */ addi r3, r31, 0x1404 -/* 8002FE88 38 80 FF FF */ li r4, -1 -/* 8002FE8C 48 00 00 B5 */ bl __dt__4dCcSFv -/* 8002FE90 28 1F 00 00 */ cmplwi r31, 0 -/* 8002FE94 41 82 00 38 */ beq lbl_8002FECC -/* 8002FE98 3C 60 80 3B */ lis r3, __vt__4dBgS@ha /* 0x803AB608@ha */ -/* 8002FE9C 38 03 B6 08 */ addi r0, r3, __vt__4dBgS@l /* 0x803AB608@l */ -/* 8002FEA0 90 1F 14 00 */ stw r0, 0x1400(r31) -/* 8002FEA4 41 82 00 28 */ beq lbl_8002FECC -/* 8002FEA8 3C 60 80 3B */ lis r3, __vt__4cBgS@ha /* 0x803AB61C@ha */ -/* 8002FEAC 38 03 B6 1C */ addi r0, r3, __vt__4cBgS@l /* 0x803AB61C@l */ -/* 8002FEB0 90 1F 14 00 */ stw r0, 0x1400(r31) -/* 8002FEB4 7F E3 FB 78 */ mr r3, r31 -/* 8002FEB8 3C 80 80 03 */ lis r4, __dt__11cBgS_ChkElmFv@ha /* 0x8002FEF8@ha */ -/* 8002FEBC 38 84 FE F8 */ addi r4, r4, __dt__11cBgS_ChkElmFv@l /* 0x8002FEF8@l */ -/* 8002FEC0 38 A0 00 14 */ li r5, 0x14 -/* 8002FEC4 38 C0 01 00 */ li r6, 0x100 -/* 8002FEC8 48 33 1E 21 */ bl __destroy_arr -lbl_8002FECC: -/* 8002FECC 7F C0 07 35 */ extsh. r0, r30 -/* 8002FED0 40 81 00 0C */ ble lbl_8002FEDC -/* 8002FED4 7F E3 FB 78 */ mr r3, r31 -/* 8002FED8 48 29 EE 65 */ bl __dl__FPv -lbl_8002FEDC: -/* 8002FEDC 7F E3 FB 78 */ mr r3, r31 -/* 8002FEE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002FEE4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002FEE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002FEEC 7C 08 03 A6 */ mtlr r0 -/* 8002FEF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002FEF4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__14dDlst_window_cFv.s b/asm/d/com/d_com_inf_game/__dt__14dDlst_window_cFv.s deleted file mode 100644 index 70c09cce16..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__14dDlst_window_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800301CC: -/* 800301CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800301D0 7C 08 02 A6 */ mflr r0 -/* 800301D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800301D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800301DC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800301E0 41 82 00 10 */ beq lbl_800301F0 -/* 800301E4 7C 80 07 35 */ extsh. r0, r4 -/* 800301E8 40 81 00 08 */ ble lbl_800301F0 -/* 800301EC 48 29 EB 51 */ bl __dl__FPv -lbl_800301F0: -/* 800301F0 7F E3 FB 78 */ mr r3, r31 -/* 800301F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800301F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800301FC 7C 08 03 A6 */ mtlr r0 -/* 80030200 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030204 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__15cCcD_DivideAreaFv.s b/asm/d/com/d_com_inf_game/__dt__15cCcD_DivideAreaFv.s deleted file mode 100644 index ebc3088698..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__15cCcD_DivideAreaFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80030DE0: -/* 80030DE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030DE4 7C 08 02 A6 */ mflr r0 -/* 80030DE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030DEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030DF0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80030DF4 41 82 00 30 */ beq lbl_80030E24 -/* 80030DF8 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideArea@ha /* 0x803A7200@ha */ -/* 80030DFC 38 03 72 00 */ addi r0, r3, __vt__15cCcD_DivideArea@l /* 0x803A7200@l */ -/* 80030E00 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80030E04 41 82 00 10 */ beq lbl_80030E14 -/* 80030E08 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80030E0C 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80030E10 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_80030E14: -/* 80030E14 7C 80 07 35 */ extsh. r0, r4 -/* 80030E18 40 81 00 0C */ ble lbl_80030E24 -/* 80030E1C 7F E3 FB 78 */ mr r3, r31 -/* 80030E20 48 29 DF 1D */ bl __dl__FPv -lbl_80030E24: -/* 80030E24 7F E3 FB 78 */ mr r3, r31 -/* 80030E28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030E2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030E30 7C 08 03 A6 */ mtlr r0 -/* 80030E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030E38 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__15cCcD_DivideInfoFv.s b/asm/d/com/d_com_inf_game/__dt__15cCcD_DivideInfoFv.s deleted file mode 100644 index ab904fa212..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__15cCcD_DivideInfoFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80030ECC: -/* 80030ECC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030ED0 7C 08 02 A6 */ mflr r0 -/* 80030ED4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030ED8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030EDC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80030EE0 41 82 00 1C */ beq lbl_80030EFC -/* 80030EE4 3C A0 80 3A */ lis r5, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 80030EE8 38 05 72 24 */ addi r0, r5, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 80030EEC 90 1F 00 0C */ stw r0, 0xc(r31) -/* 80030EF0 7C 80 07 35 */ extsh. r0, r4 -/* 80030EF4 40 81 00 08 */ ble lbl_80030EFC -/* 80030EF8 48 29 DE 45 */ bl __dl__FPv -lbl_80030EFC: -/* 80030EFC 7F E3 FB 78 */ mr r3, r31 -/* 80030F00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030F04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030F08 7C 08 03 A6 */ mtlr r0 -/* 80030F0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030F10 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__25dComIfG_camera_info_classFv.s b/asm/d/com/d_com_inf_game/__dt__25dComIfG_camera_info_classFv.s deleted file mode 100644 index 4df775d1e6..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__25dComIfG_camera_info_classFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80030208: -/* 80030208 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003020C 7C 08 02 A6 */ mflr r0 -/* 80030210 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030214 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030218 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8003021C 41 82 00 10 */ beq lbl_8003022C -/* 80030220 7C 80 07 35 */ extsh. r0, r4 -/* 80030224 40 81 00 08 */ ble lbl_8003022C -/* 80030228 48 29 EB 15 */ bl __dl__FPv -lbl_8003022C: -/* 8003022C 7F E3 FB 78 */ mr r3, r31 -/* 80030230 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030234 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030238 7C 08 03 A6 */ mtlr r0 -/* 8003023C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030240 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__4cBgSFv.s b/asm/d/com/d_com_inf_game/__dt__4cBgSFv.s deleted file mode 100644 index 65eeb96afb..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__4cBgSFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80030CCC: -/* 80030CCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030CD0 7C 08 02 A6 */ mflr r0 -/* 80030CD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030CD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030CDC 93 C1 00 08 */ stw r30, 8(r1) -/* 80030CE0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80030CE4 7C 9F 23 78 */ mr r31, r4 -/* 80030CE8 41 82 00 34 */ beq lbl_80030D1C -/* 80030CEC 3C 80 80 3B */ lis r4, __vt__4cBgS@ha /* 0x803AB61C@ha */ -/* 80030CF0 38 04 B6 1C */ addi r0, r4, __vt__4cBgS@l /* 0x803AB61C@l */ -/* 80030CF4 90 1E 14 00 */ stw r0, 0x1400(r30) -/* 80030CF8 3C 80 80 03 */ lis r4, __dt__11cBgS_ChkElmFv@ha /* 0x8002FEF8@ha */ -/* 80030CFC 38 84 FE F8 */ addi r4, r4, __dt__11cBgS_ChkElmFv@l /* 0x8002FEF8@l */ -/* 80030D00 38 A0 00 14 */ li r5, 0x14 -/* 80030D04 38 C0 01 00 */ li r6, 0x100 -/* 80030D08 48 33 0F E1 */ bl __destroy_arr -/* 80030D0C 7F E0 07 35 */ extsh. r0, r31 -/* 80030D10 40 81 00 0C */ ble lbl_80030D1C -/* 80030D14 7F C3 F3 78 */ mr r3, r30 -/* 80030D18 48 29 E0 25 */ bl __dl__FPv -lbl_80030D1C: -/* 80030D1C 7F C3 F3 78 */ mr r3, r30 -/* 80030D20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030D24 83 C1 00 08 */ lwz r30, 8(r1) -/* 80030D28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030D2C 7C 08 03 A6 */ mtlr r0 -/* 80030D30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030D34 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__4cCcSFv.s b/asm/d/com/d_com_inf_game/__dt__4cCcSFv.s deleted file mode 100644 index e2f4703e18..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__4cCcSFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80030BDC: -/* 80030BDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030BE0 7C 08 02 A6 */ mflr r0 -/* 80030BE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030BE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030BEC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80030BF0 41 82 00 48 */ beq lbl_80030C38 -/* 80030BF4 3C 60 80 3C */ lis r3, __vt__4cCcS@ha /* 0x803C3748@ha */ -/* 80030BF8 38 03 37 48 */ addi r0, r3, __vt__4cCcS@l /* 0x803C3748@l */ -/* 80030BFC 90 1F 28 48 */ stw r0, 0x2848(r31) -/* 80030C00 34 1F 28 08 */ addic. r0, r31, 0x2808 -/* 80030C04 41 82 00 24 */ beq lbl_80030C28 -/* 80030C08 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideArea@ha /* 0x803A7200@ha */ -/* 80030C0C 38 03 72 00 */ addi r0, r3, __vt__15cCcD_DivideArea@l /* 0x803A7200@l */ -/* 80030C10 90 1F 28 20 */ stw r0, 0x2820(r31) -/* 80030C14 34 1F 28 08 */ addic. r0, r31, 0x2808 -/* 80030C18 41 82 00 10 */ beq lbl_80030C28 -/* 80030C1C 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80030C20 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80030C24 90 1F 28 20 */ stw r0, 0x2820(r31) -lbl_80030C28: -/* 80030C28 7C 80 07 35 */ extsh. r0, r4 -/* 80030C2C 40 81 00 0C */ ble lbl_80030C38 -/* 80030C30 7F E3 FB 78 */ mr r3, r31 -/* 80030C34 48 29 E1 09 */ bl __dl__FPv -lbl_80030C38: -/* 80030C38 7F E3 FB 78 */ mr r3, r31 -/* 80030C3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030C40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030C44 7C 08 03 A6 */ mtlr r0 -/* 80030C48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030C4C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__4dBgSFv.s b/asm/d/com/d_com_inf_game/__dt__4dBgSFv.s deleted file mode 100644 index 6c52c2d7d0..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__4dBgSFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80030C50: -/* 80030C50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030C54 7C 08 02 A6 */ mflr r0 -/* 80030C58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030C5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030C60 93 C1 00 08 */ stw r30, 8(r1) -/* 80030C64 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80030C68 7C 9F 23 78 */ mr r31, r4 -/* 80030C6C 41 82 00 44 */ beq lbl_80030CB0 -/* 80030C70 3C 80 80 3B */ lis r4, __vt__4dBgS@ha /* 0x803AB608@ha */ -/* 80030C74 38 04 B6 08 */ addi r0, r4, __vt__4dBgS@l /* 0x803AB608@l */ -/* 80030C78 90 1E 14 00 */ stw r0, 0x1400(r30) -/* 80030C7C 41 82 00 24 */ beq lbl_80030CA0 -/* 80030C80 3C 80 80 3B */ lis r4, __vt__4cBgS@ha /* 0x803AB61C@ha */ -/* 80030C84 38 04 B6 1C */ addi r0, r4, __vt__4cBgS@l /* 0x803AB61C@l */ -/* 80030C88 90 1E 14 00 */ stw r0, 0x1400(r30) -/* 80030C8C 3C 80 80 03 */ lis r4, __dt__11cBgS_ChkElmFv@ha /* 0x8002FEF8@ha */ -/* 80030C90 38 84 FE F8 */ addi r4, r4, __dt__11cBgS_ChkElmFv@l /* 0x8002FEF8@l */ -/* 80030C94 38 A0 00 14 */ li r5, 0x14 -/* 80030C98 38 C0 01 00 */ li r6, 0x100 -/* 80030C9C 48 33 10 4D */ bl __destroy_arr -lbl_80030CA0: -/* 80030CA0 7F E0 07 35 */ extsh. r0, r31 -/* 80030CA4 40 81 00 0C */ ble lbl_80030CB0 -/* 80030CA8 7F C3 F3 78 */ mr r3, r30 -/* 80030CAC 48 29 E0 91 */ bl __dl__FPv -lbl_80030CB0: -/* 80030CB0 7F C3 F3 78 */ mr r3, r30 -/* 80030CB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030CB8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80030CBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030CC0 7C 08 03 A6 */ mtlr r0 -/* 80030CC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030CC8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__4dCcSFv.s b/asm/d/com/d_com_inf_game/__dt__4dCcSFv.s deleted file mode 100644 index e658c6660c..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__4dCcSFv.s +++ /dev/null @@ -1,117 +0,0 @@ -lbl_8002FF40: -/* 8002FF40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002FF44 7C 08 02 A6 */ mflr r0 -/* 8002FF48 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002FF4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002FF50 48 33 22 8D */ bl _savegpr_29 -/* 8002FF54 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8002FF58 7C 9F 23 78 */ mr r31, r4 -/* 8002FF5C 41 82 01 7C */ beq lbl_800300D8 -/* 8002FF60 3C 60 80 3B */ lis r3, __vt__4dCcS@ha /* 0x803AC3E4@ha */ -/* 8002FF64 38 03 C3 E4 */ addi r0, r3, __vt__4dCcS@l /* 0x803AC3E4@l */ -/* 8002FF68 90 1E 28 48 */ stw r0, 0x2848(r30) -/* 8002FF6C 34 1E 28 4C */ addic. r0, r30, 0x284c -/* 8002FF70 41 82 01 1C */ beq lbl_8003008C -/* 8002FF74 3C 60 80 3A */ lis r3, __vt__12dCcMassS_Mng@ha /* 0x803A7230@ha */ -/* 8002FF78 38 03 72 30 */ addi r0, r3, __vt__12dCcMassS_Mng@l /* 0x803A7230@l */ -/* 8002FF7C 90 1E 2A C0 */ stw r0, 0x2ac0(r30) -/* 8002FF80 34 1E 2A B0 */ addic. r0, r30, 0x2ab0 -/* 8002FF84 41 82 00 10 */ beq lbl_8002FF94 -/* 8002FF88 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideInfo@ha /* 0x803A7224@ha */ -/* 8002FF8C 38 03 72 24 */ addi r0, r3, __vt__15cCcD_DivideInfo@l /* 0x803A7224@l */ -/* 8002FF90 90 1E 2A BC */ stw r0, 0x2abc(r30) -lbl_8002FF94: -/* 8002FF94 37 BE 2A 70 */ addic. r29, r30, 0x2a70 -/* 8002FF98 41 82 00 48 */ beq lbl_8002FFE0 -/* 8002FF9C 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 8002FFA0 38 63 36 08 */ addi r3, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 8002FFA4 90 7E 2A 8C */ stw r3, 0x2a8c(r30) -/* 8002FFA8 38 03 00 58 */ addi r0, r3, 0x58 -/* 8002FFAC 90 1E 2A A8 */ stw r0, 0x2aa8(r30) -/* 8002FFB0 38 7E 2A 90 */ addi r3, r30, 0x2a90 -/* 8002FFB4 38 80 00 00 */ li r4, 0 -/* 8002FFB8 48 23 EF ED */ bl __dt__8cM3dGCpsFv -/* 8002FFBC 28 1D 00 00 */ cmplwi r29, 0 -/* 8002FFC0 41 82 00 20 */ beq lbl_8002FFE0 -/* 8002FFC4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8002FFC8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8002FFCC 90 1E 2A 8C */ stw r0, 0x2a8c(r30) -/* 8002FFD0 41 82 00 10 */ beq lbl_8002FFE0 -/* 8002FFD4 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 8002FFD8 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 8002FFDC 90 1E 2A 88 */ stw r0, 0x2a88(r30) -lbl_8002FFE0: -/* 8002FFE0 34 9E 2A 14 */ addic. r4, r30, 0x2a14 -/* 8002FFE4 41 82 00 50 */ beq lbl_80030034 -/* 8002FFE8 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 8002FFEC 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 8002FFF0 90 7E 2A 30 */ stw r3, 0x2a30(r30) -/* 8002FFF4 38 03 00 58 */ addi r0, r3, 0x58 -/* 8002FFF8 90 1E 2A 48 */ stw r0, 0x2a48(r30) -/* 8002FFFC 34 1E 2A 34 */ addic. r0, r30, 0x2a34 -/* 80030000 41 82 00 10 */ beq lbl_80030010 -/* 80030004 3C 60 80 3A */ lis r3, __vt__8cM3dGCyl@ha /* 0x803A720C@ha */ -/* 80030008 38 03 72 0C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x803A720C@l */ -/* 8003000C 90 1E 2A 48 */ stw r0, 0x2a48(r30) -lbl_80030010: -/* 80030010 28 04 00 00 */ cmplwi r4, 0 -/* 80030014 41 82 00 20 */ beq lbl_80030034 -/* 80030018 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8003001C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80030020 90 1E 2A 30 */ stw r0, 0x2a30(r30) -/* 80030024 41 82 00 10 */ beq lbl_80030034 -/* 80030028 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 8003002C 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80030030 90 1E 2A 2C */ stw r0, 0x2a2c(r30) -lbl_80030034: -/* 80030034 38 7E 29 D4 */ addi r3, r30, 0x29d4 -/* 80030038 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha /* 0x800300F4@ha */ -/* 8003003C 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l /* 0x800300F4@l */ -/* 80030040 38 A0 00 20 */ li r5, 0x20 -/* 80030044 38 C0 00 02 */ li r6, 2 -/* 80030048 48 33 1C A1 */ bl __destroy_arr -/* 8003004C 38 7E 28 90 */ addi r3, r30, 0x2890 -/* 80030050 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha /* 0x800300F4@ha */ -/* 80030054 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l /* 0x800300F4@l */ -/* 80030058 38 A0 00 20 */ li r5, 0x20 -/* 8003005C 38 C0 00 0A */ li r6, 0xa -/* 80030060 48 33 1C 89 */ bl __destroy_arr -/* 80030064 34 1E 28 4C */ addic. r0, r30, 0x284c -/* 80030068 41 82 00 24 */ beq lbl_8003008C -/* 8003006C 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideArea@ha /* 0x803A7200@ha */ -/* 80030070 38 03 72 00 */ addi r0, r3, __vt__15cCcD_DivideArea@l /* 0x803A7200@l */ -/* 80030074 90 1E 28 64 */ stw r0, 0x2864(r30) -/* 80030078 34 1E 28 4C */ addic. r0, r30, 0x284c -/* 8003007C 41 82 00 10 */ beq lbl_8003008C -/* 80030080 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80030084 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80030088 90 1E 28 64 */ stw r0, 0x2864(r30) -lbl_8003008C: -/* 8003008C 28 1E 00 00 */ cmplwi r30, 0 -/* 80030090 41 82 00 38 */ beq lbl_800300C8 -/* 80030094 3C 60 80 3C */ lis r3, __vt__4cCcS@ha /* 0x803C3748@ha */ -/* 80030098 38 03 37 48 */ addi r0, r3, __vt__4cCcS@l /* 0x803C3748@l */ -/* 8003009C 90 1E 28 48 */ stw r0, 0x2848(r30) -/* 800300A0 34 1E 28 08 */ addic. r0, r30, 0x2808 -/* 800300A4 41 82 00 24 */ beq lbl_800300C8 -/* 800300A8 3C 60 80 3A */ lis r3, __vt__15cCcD_DivideArea@ha /* 0x803A7200@ha */ -/* 800300AC 38 03 72 00 */ addi r0, r3, __vt__15cCcD_DivideArea@l /* 0x803A7200@l */ -/* 800300B0 90 1E 28 20 */ stw r0, 0x2820(r30) -/* 800300B4 34 1E 28 08 */ addic. r0, r30, 0x2808 -/* 800300B8 41 82 00 10 */ beq lbl_800300C8 -/* 800300BC 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 800300C0 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 800300C4 90 1E 28 20 */ stw r0, 0x2820(r30) -lbl_800300C8: -/* 800300C8 7F E0 07 35 */ extsh. r0, r31 -/* 800300CC 40 81 00 0C */ ble lbl_800300D8 -/* 800300D0 7F C3 F3 78 */ mr r3, r30 -/* 800300D4 48 29 EC 69 */ bl __dl__FPv -lbl_800300D8: -/* 800300D8 7F C3 F3 78 */ mr r3, r30 -/* 800300DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800300E0 48 33 21 49 */ bl _restgpr_29 -/* 800300E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800300E8 7C 08 03 A6 */ mtlr r0 -/* 800300EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800300F0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__7cSAngleFv.s b/asm/d/com/d_com_inf_game/__dt__7cSAngleFv.s deleted file mode 100644 index eda79d9717..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__7cSAngleFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80030510: -/* 80030510 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030514 7C 08 02 A6 */ mflr r0 -/* 80030518 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003051C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030520 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80030524 41 82 00 10 */ beq lbl_80030534 -/* 80030528 7C 80 07 35 */ extsh. r0, r4 -/* 8003052C 40 81 00 08 */ ble lbl_80030534 -/* 80030530 48 29 E8 0D */ bl __dl__FPv -lbl_80030534: -/* 80030534 7F E3 FB 78 */ mr r3, r31 -/* 80030538 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003053C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030540 7C 08 03 A6 */ mtlr r0 -/* 80030544 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030548 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__8cM3dGAabFv.s b/asm/d/com/d_com_inf_game/__dt__8cM3dGAabFv.s deleted file mode 100644 index fa5e852c94..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80030E84: -/* 80030E84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030E88 7C 08 02 A6 */ mflr r0 -/* 80030E8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030E90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030E94 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80030E98 41 82 00 1C */ beq lbl_80030EB4 -/* 80030E9C 3C A0 80 3A */ lis r5, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80030EA0 38 05 72 18 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80030EA4 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80030EA8 7C 80 07 35 */ extsh. r0, r4 -/* 80030EAC 40 81 00 08 */ ble lbl_80030EB4 -/* 80030EB0 48 29 DE 8D */ bl __dl__FPv -lbl_80030EB4: -/* 80030EB4 7F E3 FB 78 */ mr r3, r31 -/* 80030EB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030EBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030EC0 7C 08 03 A6 */ mtlr r0 -/* 80030EC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030EC8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__dt__8cM3dGCylFv.s b/asm/d/com/d_com_inf_game/__dt__8cM3dGCylFv.s deleted file mode 100644 index 40e452a27e..0000000000 --- a/asm/d/com/d_com_inf_game/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80030E3C: -/* 80030E3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80030E40 7C 08 02 A6 */ mflr r0 -/* 80030E44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80030E48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80030E4C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80030E50 41 82 00 1C */ beq lbl_80030E6C -/* 80030E54 3C A0 80 3A */ lis r5, __vt__8cM3dGCyl@ha /* 0x803A720C@ha */ -/* 80030E58 38 05 72 0C */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x803A720C@l */ -/* 80030E5C 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80030E60 7C 80 07 35 */ extsh. r0, r4 -/* 80030E64 40 81 00 08 */ ble lbl_80030E6C -/* 80030E68 48 29 DE D5 */ bl __dl__FPv -lbl_80030E6C: -/* 80030E6C 7F E3 FB 78 */ mr r3, r31 -/* 80030E70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80030E74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80030E78 7C 08 03 A6 */ mtlr r0 -/* 80030E7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030E80 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/__sinit_d_com_inf_game_cpp.s b/asm/d/com/d_com_inf_game/__sinit_d_com_inf_game_cpp.s deleted file mode 100644 index f9bafd0ab4..0000000000 --- a/asm/d/com/d_com_inf_game/__sinit_d_com_inf_game_cpp.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8002FD18: -/* 8002FD18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002FD1C 7C 08 02 A6 */ mflr r0 -/* 8002FD20 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002FD24 38 00 FF FF */ li r0, -1 -/* 8002FD28 3C 60 80 40 */ lis r3, dComIfG_mTimerInfo@ha /* 0x804061A0@ha */ -/* 8002FD2C 38 63 61 A0 */ addi r3, r3, dComIfG_mTimerInfo@l /* 0x804061A0@l */ -/* 8002FD30 90 03 00 0C */ stw r0, 0xc(r3) -/* 8002FD34 38 00 00 00 */ li r0, 0 -/* 8002FD38 90 03 00 08 */ stw r0, 8(r3) -/* 8002FD3C 90 03 00 04 */ stw r0, 4(r3) -/* 8002FD40 90 03 00 00 */ stw r0, 0(r3) -/* 8002FD44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FD48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FD4C 48 00 04 F9 */ bl __ct__13dComIfG_inf_cFv -/* 8002FD50 3C 80 80 03 */ lis r4, __dt__13dComIfG_inf_cFv@ha /* 0x8002FD74@ha */ -/* 8002FD54 38 84 FD 74 */ addi r4, r4, __dt__13dComIfG_inf_cFv@l /* 0x8002FD74@l */ -/* 8002FD58 3C A0 80 40 */ lis r5, lit_5065@ha /* 0x804061B4@ha */ -/* 8002FD5C 38 A5 61 B4 */ addi r5, r5, lit_5065@l /* 0x804061B4@l */ -/* 8002FD60 48 33 1E C5 */ bl __register_global_object -/* 8002FD64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002FD68 7C 08 03 A6 */ mtlr r0 -/* 8002FD6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002FD70 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/__ct__19dStage_roomStatus_cFv.s b/asm/d/d_stage/__ct__19dStage_roomStatus_cFv.s deleted file mode 100644 index 0248805007..0000000000 --- a/asm/d/d_stage/__ct__19dStage_roomStatus_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8002839C: -/* 8002839C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800283A0 7C 08 02 A6 */ mflr r0 -/* 800283A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800283A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800283AC 93 C1 00 08 */ stw r30, 8(r1) -/* 800283B0 7C 7E 1B 78 */ mr r30, r3 -/* 800283B4 3C 60 80 3A */ lis r3, __vt__11dStage_dt_c@ha /* 0x803A6D94@ha */ -/* 800283B8 38 03 6D 94 */ addi r0, r3, __vt__11dStage_dt_c@l /* 0x803A6D94@l */ -/* 800283BC 90 1E 00 00 */ stw r0, 0(r30) -/* 800283C0 3C 60 80 3A */ lis r3, __vt__15dStage_roomDt_c@ha /* 0x803A6AAC@ha */ -/* 800283C4 38 03 6A AC */ addi r0, r3, __vt__15dStage_roomDt_c@l /* 0x803A6AAC@l */ -/* 800283C8 90 1E 00 00 */ stw r0, 0(r30) -/* 800283CC 3B FE 00 6C */ addi r31, r30, 0x6c -/* 800283D0 7F E3 FB 78 */ mr r3, r31 -/* 800283D4 3C 80 80 3A */ lis r4, j3dDefaultLightInfo@ha /* 0x803A1EC8@ha */ -/* 800283D8 38 84 1E C8 */ addi r4, r4, j3dDefaultLightInfo@l /* 0x803A1EC8@l */ -/* 800283DC 48 2F D2 E9 */ bl __as__12J3DLightInfoFRC12J3DLightInfo -/* 800283E0 38 7F 00 74 */ addi r3, r31, 0x74 -/* 800283E4 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha /* 0x80018C0C@ha */ -/* 800283E8 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 0x80018C0C@l */ -/* 800283EC 38 A0 00 00 */ li r5, 0 -/* 800283F0 38 C0 00 74 */ li r6, 0x74 -/* 800283F4 38 E0 00 06 */ li r7, 6 -/* 800283F8 48 33 99 69 */ bl __construct_array -/* 800283FC 7F C3 F3 78 */ mr r3, r30 -/* 80028400 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028404 83 C1 00 08 */ lwz r30, 8(r1) -/* 80028408 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002840C 7C 08 03 A6 */ mtlr r0 -/* 80028410 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028414 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/__dt__19dStage_KeepDoorInfoFv.s b/asm/d/d_stage/__dt__19dStage_KeepDoorInfoFv.s deleted file mode 100644 index f89d6650b6..0000000000 --- a/asm/d/d_stage/__dt__19dStage_KeepDoorInfoFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80028418: -/* 80028418 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002841C 7C 08 02 A6 */ mflr r0 -/* 80028420 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028424 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80028428 93 C1 00 08 */ stw r30, 8(r1) -/* 8002842C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80028430 7C 9F 23 78 */ mr r31, r4 -/* 80028434 41 82 00 2C */ beq lbl_80028460 -/* 80028438 38 7E 00 04 */ addi r3, r30, 4 -/* 8002843C 3C 80 80 03 */ lis r4, __dt__21stage_tgsc_data_classFv@ha /* 0x8002847C@ha */ -/* 80028440 38 84 84 7C */ addi r4, r4, __dt__21stage_tgsc_data_classFv@l /* 0x8002847C@l */ -/* 80028444 38 A0 00 24 */ li r5, 0x24 -/* 80028448 38 C0 00 40 */ li r6, 0x40 -/* 8002844C 48 33 98 9D */ bl __destroy_arr -/* 80028450 7F E0 07 35 */ extsh. r0, r31 -/* 80028454 40 81 00 0C */ ble lbl_80028460 -/* 80028458 7F C3 F3 78 */ mr r3, r30 -/* 8002845C 48 2A 68 E1 */ bl __dl__FPv -lbl_80028460: -/* 80028460 7F C3 F3 78 */ mr r3, r30 -/* 80028464 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028468 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002846C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028470 7C 08 03 A6 */ mtlr r0 -/* 80028474 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028478 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/__sinit_d_stage_cpp.s b/asm/d/d_stage/__sinit_d_stage_cpp.s deleted file mode 100644 index 4719c204d7..0000000000 --- a/asm/d/d_stage/__sinit_d_stage_cpp.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_8002824C: -/* 8002824C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028250 7C 08 02 A6 */ mflr r0 -/* 80028254 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028258 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002825C 3C 60 80 3F */ lis r3, lit_3926@ha /* 0x803F4E68@ha */ -/* 80028260 3B E3 4E 68 */ addi r31, r3, lit_3926@l /* 0x803F4E68@l */ -/* 80028264 38 7F 00 0C */ addi r3, r31, 0xc -/* 80028268 3C 80 80 03 */ lis r4, __ct__21stage_tgsc_data_classFv@ha /* 0x800284B8@ha */ -/* 8002826C 38 84 84 B8 */ addi r4, r4, __ct__21stage_tgsc_data_classFv@l /* 0x800284B8@l */ -/* 80028270 3C A0 80 03 */ lis r5, __dt__21stage_tgsc_data_classFv@ha /* 0x8002847C@ha */ -/* 80028274 38 A5 84 7C */ addi r5, r5, __dt__21stage_tgsc_data_classFv@l /* 0x8002847C@l */ -/* 80028278 38 C0 00 24 */ li r6, 0x24 -/* 8002827C 38 E0 00 40 */ li r7, 0x40 -/* 80028280 38 63 00 04 */ addi r3, r3, 4 -/* 80028284 48 33 9A DD */ bl __construct_array -/* 80028288 38 7F 00 0C */ addi r3, r31, 0xc -/* 8002828C 3C 80 80 03 */ lis r4, __dt__19dStage_KeepDoorInfoFv@ha /* 0x80028418@ha */ -/* 80028290 38 84 84 18 */ addi r4, r4, __dt__19dStage_KeepDoorInfoFv@l /* 0x80028418@l */ -/* 80028294 38 BF 00 00 */ addi r5, r31, 0 -/* 80028298 48 33 99 8D */ bl __register_global_object -/* 8002829C 38 7F 09 1C */ addi r3, r31, 0x91c -/* 800282A0 3C 80 80 03 */ lis r4, __ct__21stage_tgsc_data_classFv@ha /* 0x800284B8@ha */ -/* 800282A4 38 84 84 B8 */ addi r4, r4, __ct__21stage_tgsc_data_classFv@l /* 0x800284B8@l */ -/* 800282A8 3C A0 80 03 */ lis r5, __dt__21stage_tgsc_data_classFv@ha /* 0x8002847C@ha */ -/* 800282AC 38 A5 84 7C */ addi r5, r5, __dt__21stage_tgsc_data_classFv@l /* 0x8002847C@l */ -/* 800282B0 38 C0 00 24 */ li r6, 0x24 -/* 800282B4 38 E0 00 40 */ li r7, 0x40 -/* 800282B8 38 63 00 04 */ addi r3, r3, 4 -/* 800282BC 48 33 9A A5 */ bl __construct_array -/* 800282C0 38 7F 09 1C */ addi r3, r31, 0x91c -/* 800282C4 3C 80 80 03 */ lis r4, __dt__19dStage_KeepDoorInfoFv@ha /* 0x80028418@ha */ -/* 800282C8 38 84 84 18 */ addi r4, r4, __dt__19dStage_KeepDoorInfoFv@l /* 0x80028418@l */ -/* 800282CC 38 BF 09 10 */ addi r5, r31, 0x910 -/* 800282D0 48 33 99 55 */ bl __register_global_object -/* 800282D4 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 800282D8 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 800282DC 3C 80 80 03 */ lis r4, __ct__19dStage_roomStatus_cFv@ha /* 0x8002839C@ha */ -/* 800282E0 38 84 83 9C */ addi r4, r4, __ct__19dStage_roomStatus_cFv@l /* 0x8002839C@l */ -/* 800282E4 3C A0 80 03 */ lis r5, __dt__19dStage_roomStatus_cFv@ha /* 0x80028360@ha */ -/* 800282E8 38 A5 83 60 */ addi r5, r5, __dt__19dStage_roomStatus_cFv@l /* 0x80028360@l */ -/* 800282EC 38 C0 04 04 */ li r6, 0x404 -/* 800282F0 38 E0 00 40 */ li r7, 0x40 -/* 800282F4 48 33 9A 6D */ bl __construct_array -/* 800282F8 38 60 00 00 */ li r3, 0 -/* 800282FC 3C 80 80 03 */ lis r4, func_80028328@ha /* 0x80028328@ha */ -/* 80028300 38 84 83 28 */ addi r4, r4, func_80028328@l /* 0x80028328@l */ -/* 80028304 38 BF 12 20 */ addi r5, r31, 0x1220 -/* 80028308 48 33 99 1D */ bl __register_global_object -/* 8002830C 38 00 00 00 */ li r0, 0 -/* 80028310 98 0D 87 F4 */ stb r0, m_roomDzs__20dStage_roomControl_c(r13) -/* 80028314 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028318 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002831C 7C 08 03 A6 */ mtlr r0 -/* 80028320 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028324 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/func_80028328.s b/asm/d/d_stage/func_80028328.s deleted file mode 100644 index 0fd1e4fdf9..0000000000 --- a/asm/d/d_stage/func_80028328.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80028328: -/* 80028328 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002832C 7C 08 02 A6 */ mflr r0 -/* 80028330 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028334 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 80028338 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 8002833C 3C 80 80 03 */ lis r4, __dt__19dStage_roomStatus_cFv@ha /* 0x80028360@ha */ -/* 80028340 38 84 83 60 */ addi r4, r4, __dt__19dStage_roomStatus_cFv@l /* 0x80028360@l */ -/* 80028344 38 A0 04 04 */ li r5, 0x404 -/* 80028348 38 C0 00 40 */ li r6, 0x40 -/* 8002834C 48 33 99 9D */ bl __destroy_arr -/* 80028350 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028354 7C 08 03 A6 */ mtlr r0 -/* 80028358 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002835C 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 183b45b14a..b11537f09f 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -3,13 +3,13 @@ #include "dolphin/types.h" -#pragma pack(push, 1) class J3DFrameCtrl { public: + J3DFrameCtrl() { this->init(0); } void init(s16); BOOL checkPass(f32); void update(); - ~J3DFrameCtrl(); + virtual ~J3DFrameCtrl() {} float getRate() const { return mRate; } void setAttribute(u8 pAttr) { mAttribute = pAttr; } @@ -23,7 +23,7 @@ public: void setLoop(s16 pLoop) { mLoop = pLoop; } private: - void* vtable; + /* vtable */; u8 mAttribute; bool mState; s16 mStart; @@ -32,6 +32,5 @@ private: float mRate; float mFrame; }; -#pragma pack(pop) #endif /* J3DANIMATION_H */ diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index 45121ca98a..a9ba9f82f4 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -5,11 +5,13 @@ #include "dolphin/gx/GXTexture.h" #include "dolphin/types.h" -struct J3DLightInfo { +class J3DLightInfo { +public: + J3DLightInfo(J3DLightInfo const& other) { *this = other; } /* 803256C4 */ void operator=(J3DLightInfo const&); - /* 0x00 */ cXyz mLightPosition; - /* 0x0C */ cXyz mLightDirection; + /* 0x00 */ Vec mLightPosition; + /* 0x0C */ Vec mLightDirection; /* 0x18 */ _GXColor mColor; /* 0x1C */ f32 mA0; /* 0x20 */ f32 mA1; @@ -19,8 +21,11 @@ struct J3DLightInfo { /* 0x30 */ f32 mK2; }; // Size = 0x34 -struct J3DLightObj { - /* 80018C0C */ J3DLightObj(); +extern "C" extern J3DLightInfo const j3dDefaultLightInfo; + +class J3DLightObj { +public: + /* 80018C0C */ J3DLightObj() : mInfo(j3dDefaultLightInfo) {} /* 0x00 */ J3DLightInfo mInfo; /* 0x34 */ u8 field_0x34[64]; diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 9acffbdcd1..0065c46df8 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -31,71 +31,86 @@ public: /* 0x10 */ f32 _10; /* 0x14 */ f32 _14; }; - + cCcD_ShapeAttr() {} /* 8008556C vt[2] */ virtual ~cCcD_ShapeAttr() {} - /* 802649D8 vt[3] */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 802649D8 vt[3] */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const { + return false; + } /* vt[4] */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const = 0; /* vt[5] */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const = 0; /* vt[6] */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const = 0; /* vt[7] */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const = 0; /* vt[8] */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const = 0; /* vt[9] */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const = 0; - /* 802649E0 vt[10]*/ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 802649E0 vt[10]*/ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const { return false; } /* vt[11]*/ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const = 0; /* vt[12]*/ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const = 0; /* vt[13]*/ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const = 0; /* vt[14]*/ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const = 0; /* vt[15]*/ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const = 0; /* vt[16]*/ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const = 0; - /* 80084E38 vt[17]*/ virtual const cXyz& GetCoCP() const; - /* 80084E2C vt[18]*/ virtual cXyz& GetCoCP(); + /* 80084E38 vt[17]*/ virtual const cXyz& GetCoCP() const { return m_virtual_center; } + /* 80084E2C vt[18]*/ virtual cXyz& GetCoCP() { return m_virtual_center; } /* vt[19]*/ virtual void CalcAabBox() = 0; /* vt[20]*/ virtual bool GetNVec(cXyz const&, cXyz*) const = 0; /* 80263A64 vt[21]*/ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; - static f32 m_virtual_center[3]; + cM3dGAab& GetWorkAab() { return mAab; } + cM3dGAab const& GetWorkAab() const { return mAab; } + + static cXyz m_virtual_center; }; STATIC_ASSERT(0x20 == sizeof(cCcD_ShapeAttr)); class cCcD_TriAttr : public cCcD_ShapeAttr, public cM3dGTri { public: - /* 80084E44 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; - /* 80263A88 */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; - /* 80263BCC */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80084E4C */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; - /* 80263B90 */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const; - /* 80084E54 */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; - /* 80263B58 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const; - /* 80084E9C */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const; - /* 80084EBC */ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const; - /* 80084EA4 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const; - /* 80084E8C */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const; - /* 80084EAC */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const; - /* 80084E94 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const; - /* 80084EB4 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const; /* 80263C04 */ virtual void CalcAabBox(); /* 80263C9C */ virtual bool GetNVec(cXyz const&, cXyz*) const; - /* 80264938 */ virtual ~cCcD_TriAttr(); + /* 80263A88 */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; + /* 80263BCC */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80263B90 */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const; + /* 80084E54 */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const { + return shape.CrossAtTg(*this, xyz); + } + /* 80084E4C */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; } + /* 80084E44 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; } + /* 80263B58 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 80084EBC */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const { + return shape.CrossCo(*this, f); + } + /* 80084EB4 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; } + /* 80084EAC */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const { return false; } + /* 80084EA4 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; } + /* 80084E9C */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; } + /* 80084E94 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const { return false; } + /* 80084E8C */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const { return false; } + /* 80264938 */ virtual ~cCcD_TriAttr() {} + cCcD_TriAttr() {} }; class cCcD_CpsAttr : public cCcD_ShapeAttr, public cM3dGCps { public: - /* 80085450 */ virtual ~cCcD_CpsAttr(); + cCcD_CpsAttr() {} + /* 80085450 */ virtual ~cCcD_CpsAttr() {} /* 80263DC0 */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const; /* 80263E04 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80084FE4 */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; - /* 80084FDC */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; - /* 80084FD4 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; + /* 80084FE4 */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const { + return shape.CrossAtTg(*this, xyz); + } + /* 80084FDC */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; } + /* 80084FD4 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; } /* 80263D38 */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; /* 80263D7C */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const; /* 80263F24 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const; - /* 80085024 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const; - /* 8008502C */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const; - /* 8008501C */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const; /* 80263ED4 */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const; /* 80263F74 */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const; - /* 80085034 */ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 80085034 */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const { + return shape.CrossCo(*this, f); + } + /* 8008502C */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; } + /* 80085024 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; } + /* 8008501C */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; } /* 80263FC4 */ virtual void CalcAabBox(); /* 80264014 */ virtual bool GetNVec(cXyz const&, cXyz*) const; }; @@ -104,23 +119,28 @@ STATIC_ASSERT(0x40 == sizeof(cCcD_CpsAttr)); class cCcD_SphAttr : public cCcD_ShapeAttr, public cM3dGSph { public: - /* 8008721C */ virtual ~cCcD_SphAttr(); + cCcD_SphAttr() {} + /* 8008721C */ virtual ~cCcD_SphAttr() {} + /* 80084B44 */ virtual const cXyz& GetCoCP() const { return mCenter; } + /* 80037A54 */ virtual cXyz& GetCoCP() { return mCenter; } + /* 80084B5C */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const { + return shape.CrossAtTg(*this, xyz); + } + /* 80084B54 */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; } + /* 80084B4C */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; } + /* 80084BAC */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const { + return shape.CrossCo(*this, f); + } + /* 80084BA4 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; } + /* 80084B9C */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; } + /* 80084B94 */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; } /* 80264538 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const; /* 802645C0 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80084B4C */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; - /* 80084B54 */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; - /* 80084B5C */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; /* 802644EC */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; /* 8026457C */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const; /* 80264688 */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const; - /* 80084B94 */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const; - /* 80084B9C */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const; - /* 80084BA4 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const; - /* 80084BAC */ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const; /* 80264644 */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const; /* 802645F8 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const; - /* 80084B44 */ virtual const cXyz& GetCoCP() const; - /* 80037A54 */ virtual cXyz& GetCoCP(); /* 802646E0 */ virtual void CalcAabBox(); /* 8026476C */ virtual bool GetNVec(cXyz const&, cXyz*) const; /* 80264808 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; @@ -131,23 +151,28 @@ STATIC_ASSERT(0x34 == sizeof(cCcD_SphAttr)); class cCcD_CylAttr : public cCcD_ShapeAttr, public cM3dGCyl { public: - /* 800854E0 */ virtual ~cCcD_CylAttr(); + cCcD_CylAttr() {} + /* 800854E0 */ virtual ~cCcD_CylAttr() {} + /* 80084CC0 */ virtual const cXyz& GetCoCP() const { return mCenter; } /* 8026420C */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const; /* 802641C8 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const; - /* 80084CC8 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; /* 80264250 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80084CD0 */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; - /* 80084CD8 */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 80084CD8 */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const { + return shape.CrossAtTg(*this, xyz); + } + /* 80084CD0 */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; } + /* 80084CC8 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; } /* 8026417C */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; /* 80264288 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const; /* 80264310 */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const; - /* 80084D10 */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const; - /* 80084D18 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const; - /* 80084D20 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const; - /* 80084D28 */ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 80084D28 */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const { + return shape.CrossCo(*this, f); + } + /* 80084D20 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; } + /* 80084D18 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; } + /* 80084D10 */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; } /* 802642CC */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const; - /* 80084CC0 */ virtual const cXyz& GetCoCP() const; - /* 80037A4C */ virtual cXyz& GetCoCP(); + /* 80037A4C */ virtual cXyz& GetCoCP() { return mCenter; } /* 80264368 */ virtual void CalcAabBox(); /* 802643D0 */ virtual bool GetNVec(cXyz const&, cXyz*) const; /* 802644B8 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; @@ -158,13 +183,13 @@ STATIC_ASSERT(0x38 == sizeof(cCcD_CylAttr)); class cCcD_DivideInfo { private: - /* 0x00 */ u32 field_0x0; - /* 0x04 */ u32 field_0x4; - /* 0x08 */ u32 field_0x8; + /* 0x00 */ u32 mXDivInfo; + /* 0x04 */ u32 mYDivInfo; + /* 0x08 */ u32 mZDivInfo; /* 0x0C vtable */ public: - virtual void test(); // temp to build OK, remove later - virtual ~cCcD_DivideInfo(); + cCcD_DivideInfo() {} + virtual ~cCcD_DivideInfo() {} /* 80263358 */ void Set(u32, u32, u32); /* 80263368 */ bool Chk(cCcD_DivideInfo const&) const; }; // Size = 0x10 @@ -184,8 +209,8 @@ private: /* 0x3C */ f32 mInvScaledZDiff; public: - virtual void test(); // temp to build OK, remove later - virtual ~cCcD_DivideArea(); + cCcD_DivideArea() {} + virtual ~cCcD_DivideArea() {} /* 802633A8 */ void SetArea(cM3dGAab const&); /* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32); /* 802636A0 */ void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&); @@ -217,10 +242,10 @@ struct cCcD_SrcObj { class cCcD_GStts { public: - /* 800837B0 */ ~cCcD_GStts(); + /* 800837B0 */ virtual ~cCcD_GStts() {} private: - /* 0x00 */ void* vtable; + /* 0x00 vtable */ }; // Size = 0x4 class cCcD_Stts { @@ -233,6 +258,7 @@ private: /* 0x16 */ u8 mTg; public: + cCcD_Stts() {} /* 801410A4 vt[3] */ virtual ~cCcD_Stts() {} /* 80263894 vt[4] */ virtual const cCcD_GStts* GetGStts() const; /* 8026389C vt[5] */ virtual cCcD_GStts* GetGStts(); @@ -242,8 +268,8 @@ public: /* 8026395C */ void ClrCcMove(); /* 80263970 */ void PlusDmg(int); /* 80263984 */ f32 GetWeightF() const; - /* 802649E8 vt[7] */ virtual void ClrAt(); - /* 802649EC vt[8] */ virtual void ClrTg(); + /* 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; } @@ -254,30 +280,39 @@ STATIC_ASSERT(0x1C == sizeof(cCcD_Stts)); class cCcD_Obj; // placeholder class cCcD_ObjCommonBase { -public: - /* 8008409C */ ~cCcD_ObjCommonBase(); - /* 802639B0 */ void ct(); - void setSPrm(s32 sprm) { mSPrm = sprm; } - s32 getSPrm() { return mSPrm; } - protected: /* 0x00 */ int mSPrm; /* 0x04 */ int mRPrm; /* 0x08 */ cCcD_Obj* mHitObj; - /* 0x0C */ void* vtable; + /* 0x0C vtable */ +public: + cCcD_ObjCommonBase() { ct(); } + /* 8008409C */ virtual ~cCcD_ObjCommonBase() {} + /* 802639B0 */ void ct(); + void setSPrm(s32 sprm) { mSPrm = sprm; } + s32 getSPrm() const { return mSPrm; } + void setRPrm(s32 rprm) { mRPrm = rprm; } + s32 getRPrm() const { return mRPrm; } + cCcD_Obj* getHitObj() { return mHitObj; } + u32 MskSPrm(u32 mask) const { return mSPrm & mask; } }; STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase)); class cCcD_ObjAt : public cCcD_ObjCommonBase { public: - /* 80084040 */ ~cCcD_ObjAt(); + cCcD_ObjAt() { mType = 0; } + /* 80084040 */ virtual ~cCcD_ObjAt() {} /* 8026483C */ void SetHit(cCcD_Obj*); /* 8026484C */ void Set(cCcD_SrcObjAt const&); /* 80264868 */ void ClrHit(); int GetType() const { return mType; } + u32 GetGrp() const { return MskSPrm(0x1E); } + bool ChkSet() const { return MskSPrm(1); } + u8 GetAtp() const { return mAtp; } + u32 MskType(u32 msk) const { return mType & msk; } -private: +protected: /* 0x10 */ int mType; /* 0x14 */ u8 mAtp; }; @@ -286,12 +321,15 @@ STATIC_ASSERT(0x18 == sizeof(cCcD_ObjAt)); class cCcD_ObjTg : public cCcD_ObjCommonBase { public: - /* 80083FE4 */ ~cCcD_ObjTg(); + cCcD_ObjTg() { ct(); } + /* 80083FE4 */ virtual ~cCcD_ObjTg() {} /* 80264880 */ void Set(cCcD_SrcObjTg const&); /* 80264894 */ void SetGrp(u32); /* 802648B0 */ void ClrHit(); /* 802648C8 */ void SetHit(cCcD_Obj*); int GetType() const { return mType; } + u32 GetGrp() const { return MskSPrm(0x1E); } + bool ChkSet() const { return MskSPrm(1); } private: /* 0x10 */ int mType; @@ -301,27 +339,55 @@ STATIC_ASSERT(0x14 == sizeof(cCcD_ObjTg)); class cCcD_ObjCo : public cCcD_ObjCommonBase { public: - /* 80083F88 */ ~cCcD_ObjCo(); + /* 80083F88 */ virtual ~cCcD_ObjCo() {} /* 802648D8 */ void SetHit(cCcD_Obj*); /* 802648E8 */ void ClrHit(); /* 80264900 */ void SetIGrp(u32); /* 8026491C */ void SetVsGrp(u32); + u32 GetGrp() const { return MskSPrm(0x1E); } + bool ChkSet() const { return MskSPrm(1); } + u32 GetVsGrp() const { return MskSPrm(0x70); } + u32 GetIGrp() const { return MskSPrm(0xE); } + u32 ChkNoCrr() const { return MskSPrm(0x100); } + u32 ChkSph3DCrr() const { return MskSPrm(0x80); } }; STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCo)); class cCcD_ObjHitInf { -private: +protected: /* 0x000 */ cCcD_ObjAt mObjAt; /* 0x018 */ cCcD_ObjTg mObjTg; /* 0x02C */ cCcD_ObjCo mObjCo; /* 0x03C vtable */ public: - /* 80083EC8 */ virtual ~cCcD_ObjHitInf(); + /* 80083EC8 */ virtual ~cCcD_ObjHitInf() {} /* 802639C4 */ void Set(cCcD_SrcObjHitInf const&); cCcD_ObjAt& GetObjAt() { return mObjAt; } cCcD_ObjTg& GetObjTg() { return mObjTg; } cCcD_ObjCo& GetObjCo() { return mObjCo; } + u32 GetTgGrp() const { return mObjTg.GetGrp(); } + u32 GetAtGrp() const { return mObjAt.GetGrp(); } + u32 GetCoGrp() const { return mObjCo.GetGrp(); } + int GetTgType() const { return mObjTg.GetType(); } + int GetAtType() const { return mObjAt.GetType(); } + bool ChkTgSet() const { return mObjTg.ChkSet(); } + bool ChkAtSet() const { return mObjAt.ChkSet(); } + bool ChkCoSet() const { return mObjCo.ChkSet(); } + u32 ChkCoSameActorHit() const { return mObjCo.MskSPrm(0x400); } + u32 GetCoVsGrp() const { return mObjCo.GetVsGrp(); } + u32 GetCoIGrp() const { return mObjCo.GetIGrp(); } + u8 GetAtAtp() const { return mObjAt.GetAtp(); } + u32 ChkAtNoTgHitInfSet() const { return mObjAt.MskSPrm(0x20); } + u32 ChkTgNoAtHitInfSet() const { return mObjTg.MskSPrm(0x20); } + u32 ChkCoNoCoHitInfSet() const { return mObjCo.MskSPrm(0x200); } + bool ChkTgNoSlingHitInfSet() const { return mObjTg.MskSPrm(0x40); } + void SetAtHit(cCcD_Obj* obj) { mObjAt.SetHit(obj); } + void SetTgHit(cCcD_Obj* obj) { mObjTg.SetHit(obj); } + void SetCoHit(cCcD_Obj* obj) { mObjCo.SetHit(obj); } + bool ChkAtType(u32 type) const { return mObjAt.MskType(type); } + u32 ChkCoNoCrr() const { return mObjCo.ChkNoCrr(); } + u32 ChkCoSph3DCrr() const { return mObjCo.ChkSph3DCrr(); } }; // Size = 0x40 @@ -331,18 +397,20 @@ class cCcD_GObjInf; class cCcD_Obj : public cCcD_ObjHitInf { public: - /* 80083DE0 */ virtual ~cCcD_Obj(); - /* 800851A4 */ virtual cCcD_GObjInf const* GetGObjInf() const; - /* 800847C8 */ virtual cCcD_GObjInf* GetGObjInf(); - /* 80084BE8 */ virtual cCcD_ShapeAttr const* GetShapeAttr() const; - /* 80085130 */ virtual cCcD_ShapeAttr* GetShapeAttr(); - /* 80084BF0 */ virtual void Draw(_GXColor const&); + cCcD_Obj() { ct(); } + /* 80083DE0 */ virtual ~cCcD_Obj() {} + /* 800851A4 */ virtual cCcD_GObjInf const* GetGObjInf() const { return NULL; } + /* 800847C8 */ virtual cCcD_GObjInf* GetGObjInf() { return NULL; } + /* 80084BE8 */ virtual cCcD_ShapeAttr const* GetShapeAttr() const { return NULL; } + /* 80085130 */ virtual cCcD_ShapeAttr* GetShapeAttr() { return NULL; } + /* 80084BF0 */ virtual void Draw(_GXColor const&) {} /* 80263A10 */ void ct(); /* 80263A1C */ void Set(cCcD_SrcObj const&); fopAc_ac_c* GetAc(); cCcD_Stts* GetStts() { return mStts; } cCcD_DivideInfo& GetDivideInfo() { return mDivideInfo; } + int ChkBsRevHit() const { return field_0x40 & 2; } private: /* 0x040 */ int field_0x40; @@ -354,12 +422,13 @@ STATIC_ASSERT(0x58 == sizeof(cCcD_Obj)); class cCcD_GObjInf : public cCcD_Obj { public: - /* 80083CE8 */ virtual ~cCcD_GObjInf(); - /* 800851A0 */ virtual cCcD_GObjInf* GetGObjInf(); - /* 80084BE4 */ virtual cCcD_GObjInf const* GetGObjInf() const; - /* 80085138 */ virtual void ClrAtHit(); - /* 80085158 */ virtual void ClrTgHit(); - /* 8008517C */ virtual void ClrCoHit(); + cCcD_GObjInf() {} + /* 80083CE8 */ virtual ~cCcD_GObjInf() {} + /* 80085138 */ virtual void ClrAtHit() { mObjAt.ClrHit(); } + /* 80085158 */ virtual void ClrTgHit() { mObjTg.ClrHit(); } + /* 8008517C */ virtual void ClrCoHit() { mObjCo.ClrHit(); } + /* 80084BE4 */ virtual cCcD_GObjInf const* GetGObjInf() const { return this; } + /* 800851A0 */ virtual cCcD_GObjInf* GetGObjInf() { return this; } }; STATIC_ASSERT(0x58 == sizeof(cCcD_GObjInf)); diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index a2f2517163..7f65a3a121 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -32,9 +32,9 @@ public: /* 80264C5C */ void ClrCoHitInf(); /* 80264CF0 */ void ClrTgHitInf(); /* 80264D90 */ void ClrAtHitInf(); - /* 80264E2C */ int ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*); + /* 80264E2C */ bool ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*); /* 80264F40 */ void ChkAtTg(); - /* 8026515C */ void ChkNoHitCo(cCcD_Obj*, cCcD_Obj*); + /* 8026515C */ bool ChkNoHitCo(cCcD_Obj*, cCcD_Obj*); /* 80265230 */ void ChkCo(); /* 802653A0 vt[2] */ virtual void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*); /* 802653C8 */ void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*); @@ -55,7 +55,7 @@ public: cCcD_GObjInf const*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*); /* 80265E10 vt[8] */ virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*); - /* 80030BDC vt[9] */ virtual ~cCcS(); + /* 80030BDC vt[9] */ virtual ~cCcS() {} /* 80265E18 vt[10] */ virtual void MoveAfterCheck(); /* 80265DF4 vt[11] */ virtual void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*); }; // Size = 0x284C diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h index b8a0b25020..d5c534a581 100644 --- a/include/SSystem/SComponent/c_m3d_g_aab.h +++ b/include/SSystem/SComponent/c_m3d_g_aab.h @@ -12,7 +12,6 @@ public: /* 0x0C */ cXyz mMax; /* 0x18 vtable */ - virtual void test(); // temp to build OK, remove later virtual ~cM3dGAab() {} void Set(const cXyz*, const cXyz*); bool CrossY(const cXyz*) const; diff --git a/include/SSystem/SComponent/c_m3d_g_cyl.h b/include/SSystem/SComponent/c_m3d_g_cyl.h index 3aeff46bcd..7d123f6fa6 100644 --- a/include/SSystem/SComponent/c_m3d_g_cyl.h +++ b/include/SSystem/SComponent/c_m3d_g_cyl.h @@ -13,12 +13,15 @@ struct cM3dGCylS { }; // Size = 0x14 class cM3dGSph; -class cM3dGCyl : public cM3dGCylS { - /* 0x14 vtable */ +class cM3dGCyl { public: + /* 0x00 */ cXyz mCenter; + /* 0x0C */ f32 mRadius; + /* 0x10 */ f32 mHeight; + /* 0x14 vtable */ + cM3dGCyl() {} cM3dGCyl(const cXyz*, f32, f32); - virtual void test(); // temp to build OK, remove later - virtual ~cM3dGCyl(); + virtual ~cM3dGCyl() {} void Set(const cM3dGCylS&); void Set(const cXyz&, f32, f32); void SetC(const cXyz&); diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h index 71d5fd4532..178f57ba7b 100644 --- a/include/SSystem/SComponent/c_m3d_g_pla.h +++ b/include/SSystem/SComponent/c_m3d_g_pla.h @@ -9,7 +9,7 @@ class cM3dGPla { public: cXyz mNormal; f32 mD; - cM3dGPla(); + cM3dGPla() {} cM3dGPla(const cXyz*, f32); virtual ~cM3dGPla() {} bool crossInfLin(const cXyz&, const cXyz&, cXyz&) const; diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h index 1956468a22..4d028ddcc4 100644 --- a/include/SSystem/SComponent/c_m3d_g_sph.h +++ b/include/SSystem/SComponent/c_m3d_g_sph.h @@ -18,8 +18,8 @@ public: /* 0x0C */ f32 mRadius; /* 0x10 vtable */ - virtual void test(); // temp to build OK, remove later - virtual ~cM3dGSph(); + cM3dGSph() {} + virtual ~cM3dGSph() {} void SetC(const cXyz&); void Set(const cXyz&, f32); void Set(const cM3dGSphS&); diff --git a/include/SSystem/SComponent/c_m3d_g_tri.h b/include/SSystem/SComponent/c_m3d_g_tri.h index 072bb48dd2..d2a009ca64 100644 --- a/include/SSystem/SComponent/c_m3d_g_tri.h +++ b/include/SSystem/SComponent/c_m3d_g_tri.h @@ -15,6 +15,7 @@ public: Vec mB; Vec mC; + cM3dGTri() {} virtual ~cM3dGTri() {} bool cross(const cM3dGCyl*, Vec*) const; void setPos(const Vec*, const Vec*, const Vec*); diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 704b43ab7c..a60742f190 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -75,12 +75,6 @@ struct cXyz : Vec { x = f; } - void set(f32 pX, f32 pY, f32 pZ) { - x = pX; - y = pY; - z = pZ; - } - void setMin(const cXyz& other) { if (x > other.x) { x = other.x; diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index fc4b04d1ef..0b759c8198 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -13,30 +13,35 @@ struct cBgW_BgId { /* 802681D4 */ void ChkUsed() const; }; -#pragma pack(push, 1) class cBgS_ChkElm { - cBgS_ChkElm(void); - ~cBgS_ChkElm(); - void Init(); - void Regist2(dBgW_Base*, unsigned int, void*); - void Release(); - +private: /* 0x00 */ dBgW_Base* bgw_base_pointer; /* 0x04 */ u8 used; /* 0x05 */ u8 padding[3]; /* 0x08 */ u32 field_0x8; /* 0x0C */ void* actor_pointer; - /* 0x10 */ u32 field_0x10; -}; -#pragma pack(pop) + /* 0x10 vtable */ +public: + cBgS_ChkElm(void) { this->Init(); } + virtual ~cBgS_ChkElm() {} + void Init(); + virtual void Regist2(dBgW_Base*, unsigned int, void*); + void Release(); +}; // Size = 0x14 + +STATIC_ASSERT(sizeof(cBgS_ChkElm) == 0x14); -#pragma pack(push, 1) class cBgS { - ~cBgS(); +private: + /* 0x0000 */ cBgS_ChkElm cbgs_elements[256]; + /* 0x1400 vtable */ +public: + cBgS() {} + virtual ~cBgS() {} void Regist(dBgW_Base*, unsigned int, void*); void Release(dBgW_Base*); - void Ct(); - void Dt(); + virtual void Ct(); + virtual void Dt(); void LineCross(cBgS_LinChk*); void GroundCross(cBgS_GndChk*); void ConvDzb(void*); @@ -48,10 +53,7 @@ class cBgS { void GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; void ShdwDraw(cBgS_ShdwDraw*); void GetGrpInf(cBgS_PolyInfo const&) const; - - /* 0x0000 */ cBgS_ChkElm cbgs_elements[256]; -}; -#pragma pack(pop) +}; // Size = 0x1404 class dBgS_HIO { /* 0x00 */ u8 vtable[4]; @@ -66,10 +68,11 @@ class dBgS_HIO { }; class dBgS_Acch; -#pragma pack(push, 1) -class dBgS { + +class dBgS : public cBgS { public: - ~dBgS(); + dBgS() {} + ~dBgS() {} void Ct(); void Dt(); void ClrMoveFlag(); @@ -110,9 +113,8 @@ public: void PushPullCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); private: - /* 0x0000 */ cBgS cbgs; - /* 0x1400 */ void* vtable; + // /* 0x0000 */ cBgS cbgs; + // /* 0x1400 */ void* vtable; }; -#pragma pack(pop) #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 ecb8557088..8580ef0f94 100644 --- a/include/d/bg/d_bg_w.h +++ b/include/d/bg/d_bg_w.h @@ -95,7 +95,6 @@ struct cBgW { /* 8007B964 */ void ChkMoveBg() const; }; -#pragma pack(push, 1) class dBgW_Base { public: enum PushPullLabel {}; @@ -118,7 +117,6 @@ private: s16 field_0xc; s16 field_0xe; }; -#pragma pack(pop) class dBgW { public: diff --git a/include/d/cc/d_cc_d.h b/include/d/cc/d_cc_d.h index 9442005e86..0c86f48f73 100644 --- a/include/d/cc/d_cc_d.h +++ b/include/d/cc/d_cc_d.h @@ -4,30 +4,61 @@ #include "SSystem/SComponent/c_cc_d.h" #include "dolphin/types.h" -struct dCcD_SrcTri {}; +struct dCcD_SrcGAtTgCoCommonBase { + /* 0x00 */ u32 mGFlag; +}; -struct dCcD_SrcSph {}; +struct dCcD_SrcGObjAt { + u8 mSe; + u8 mHitMark; + u8 mSpl; + u8 mMtrl; + dCcD_SrcGAtTgCoCommonBase mBase; +}; -struct dCcD_SrcGObjTg {}; +struct dCcD_SrcGObjTg { + u8 mSe; + u8 mHitMark; + u8 mSpl; + u8 mMtrl; + dCcD_SrcGAtTgCoCommonBase mBase; +}; -struct dCcD_SrcGObjInf {}; +struct dCcD_SrcGObjInf { + cCcD_SrcObj mObj; + dCcD_SrcGObjAt mGObjAt; + dCcD_SrcGObjTg mGObjTg; + dCcD_SrcGAtTgCoCommonBase mGObjCo; +}; -struct dCcD_SrcGObjAt {}; +struct dCcD_SrcSph { + dCcD_SrcGObjInf mObjInf; + cM3dGSphS mSph; +}; -struct dCcD_SrcGAtTgCoCommonBase {}; +struct dCcD_SrcTri { + dCcD_SrcGObjInf mObjInf; +}; -struct dCcD_SrcCyl {}; +struct dCcD_SrcCyl { + dCcD_SrcGObjInf mObjInf; + cM3dGCylS mCyl; +}; -struct dCcD_SrcCps {}; +struct dCcD_SrcCps { + dCcD_SrcGObjInf mObjInf; + cM3dGCpsS mCps; +}; -class dCcD_GStts : cCcD_GStts { +class dCcD_GStts : public cCcD_GStts { public: /* 80083760 */ dCcD_GStts(); /* 800837F8 */ void Ct(); /* 80083830 */ void Move(); - /* 8008523C */ ~dCcD_GStts(); + /* 8008523C */ virtual ~dCcD_GStts() {} + void ClrTg() { mTg = 0; } -private: + // private: /* 0x04 */ u8 mAt; /* 0x05 */ u8 mTg; /* 0x06 */ u8 mRoomId; @@ -39,50 +70,55 @@ private: /* 0x1C */ int field_0x1C; }; // Size = 0x20 -// class dCcD_Stts : cCcD_Stts { -class dCcD_Stts { // TODO: vtables get messed up :( +class dCcD_Stts : public cCcD_Stts, public dCcD_GStts { public: + dCcD_Stts() {} /* 80083850 */ cCcD_GStts* GetGStts(); /* 80083860 */ void Init(int, int, fopAc_ac_c*); /* 800838F4 */ void Ct(); /* 80083928 */ void ClrAt(); /* 80083934 */ void ClrTg(); - /* 800851AC */ ~dCcD_Stts(); + /* 800851AC */ virtual ~dCcD_Stts() {} -private: - /* 0x00 */ u8 _0[0x1C]; // TODO, should be covered by inheritance - /* 0x1C */ dCcD_GStts mGStts; }; // Size = 0x3C class dCcD_GAtTgCoCommonBase { public: - /* 8008364C */ void ClrActorInfo(); - /* 80083660 */ void ct(); - /* 80083678 */ void SetHitApid(unsigned int); - /* 80083688 */ void GetAc(); - /* 80083704 */ void Set(dCcD_SrcGAtTgCoCommonBase const&); - /* 80083718 */ void SetEffCounterTimer(); - /* 80083724 */ void SubtractEffCounter(); - /* 80083748 */ void ChkEffCounter(); - /* 80083CA0 */ ~dCcD_GAtTgCoCommonBase(); - -private: - /* 0x00 */ void* mBase; // type dCcD_SrcGAtTgCoCommonBase* + /* 0x00 */ u32 mGFlag; /* 0x04 */ u32 mRPrm; /* 0x08 */ u32 field_0x08; - /* 0x0C */ u32 field_0x0C; + /* 0x0C */ u32 mApid; /* 0x10 */ fopAc_ac_c* mAc; /* 0x14 */ s8 mEffCounter; /* 0x15 */ u8 field_0x15[3]; - /* 0x18 */ void* vtable; + /* 0x18 vtable */ + +public: + dCcD_GAtTgCoCommonBase() { ct(); } + /* 8008364C */ void ClrActorInfo(); + /* 80083660 */ void ct(); + /* 80083678 */ void SetHitApid(unsigned int); + /* 80083688 */ fopAc_ac_c* GetAc(); + /* 80083704 */ void Set(dCcD_SrcGAtTgCoCommonBase const&); + /* 80083718 */ void SetEffCounterTimer(); + /* 80083724 */ void SubtractEffCounter(); + /* 80083748 */ bool ChkEffCounter(); + /* 80083CA0 */ virtual ~dCcD_GAtTgCoCommonBase() {} + void ResetEffCounter() { mEffCounter = 0; } + u32 GetGFlag() const { return mGFlag; } + u32 GetRPrm() const { return mRPrm; } + u32 MskSPrm(u32 mask) const { return mGFlag & mask; } + bool ChkSPrm(u32 mask) const { return MskSPrm(mask); } }; // Size = 0x1C -class dCcD_GObjAt : dCcD_GAtTgCoCommonBase { +class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase { public: /* 80083944 */ void Set(dCcD_SrcGObjAt const&); - /* 80083C44 */ ~dCcD_GObjAt(); + /* 80083C44 */ virtual ~dCcD_GObjAt() {} + void SetVec(cXyz& vec) { mVec = vec; } + cXyz& GetVec() { return mVec; } -private: + // private: /* 0x1C */ u8 mSe; /* 0x1D */ u8 mMtrl; /* 0x1E */ u8 mHitMark; @@ -91,10 +127,12 @@ private: /* 0x2C */ cXyz mVec; /* 0x38 */ cXyz mRVec; }; // Size = 0x44 -class dCcD_GObjTg : dCcD_GAtTgCoCommonBase { +class dCcD_GObjTg : public dCcD_GAtTgCoCommonBase { public: /* 800839A0 */ void Set(dCcD_SrcGObjTg const&); - /* 80083BE8 */ ~dCcD_GObjTg(); + /* 80083BE8 */ virtual ~dCcD_GObjTg() {} + void SetVec(cXyz& vec) { mVec = vec; } + cXyz& GetVec() { return mVec; } private: /* 0x1C */ u8 mSe; @@ -107,89 +145,85 @@ private: /* 0x44 */ s16* mShieldFrontRangeYAngle; /* 0x48 */ s16 mShieldRange; }; // Size = 0x4A ? -class dCcD_GObjCo : dCcD_GAtTgCoCommonBase { +class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase { public: - /* 80083B8C */ ~dCcD_GObjCo(); - -private: + /* 80083B8C */ virtual ~dCcD_GObjCo() {} }; // Size = 0x1C ? -class dCcD_GObjInf : cCcD_GObjInf { +class dCcD_GObjInf : public cCcD_GObjInf { public: /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); + /* 800840E4 */ virtual ~dCcD_GObjInf(); /* 80084268 */ cCcD_GObjInf* GetGObjInf(); - /* 8008426C */ void ClrAtHit(); - /* 800842C0 */ void ChkAtHit(); + /* 8008426C */ virtual void ClrAtHit(); + /* 800842C0 */ s32 ChkAtHit(); /* 80084318 */ void ResetAtHit(); - /* 80084358 */ void GetAtHitObj(); - /* 800843A8 */ void GetAtHitGObj(); - /* 800843DC */ void ChkAtNoGuard(); + /* 80084358 */ cCcD_Obj* GetAtHitObj(); + /* 800843A8 */ cCcD_GObjInf* GetAtHitGObj(); + /* 800843DC */ bool ChkAtNoGuard(); /* 800843FC */ void ClrTgHit(); - /* 80084460 */ void ChkTgHit(); + /* 80084460 */ bool ChkTgHit(); /* 800844B8 */ void ResetTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); + /* 800844F8 */ cCcD_Obj* GetTgHitObj(); + /* 80084548 */ dCcD_GObjInf* GetTgHitGObj(); + /* 8008457C */ u8 GetTgHitObjSe(); + /* 800845B0 */ static u32 getHitSeID(u8, int); /* 8008460C */ void ClrCoHit(); - /* 80084658 */ void ChkCoHit(); + /* 80084658 */ bool ChkCoHit(); /* 800846B0 */ void ResetCoHit(); - /* 800846F0 */ void GetCoHitObj(); + /* 800846F0 */ cCcD_Obj* GetCoHitObj(); /* 80084740 */ void Set(dCcD_SrcGObjInf const&); - static u8 const m_hitSeID[96]; + void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); } + bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); } -private: + static u32 const m_hitSeID[24]; + +protected: /* 0x058 */ dCcD_GObjAt mGObjAt; /* 0x09C */ dCcD_GObjTg mGObjTg; /* 0x0E8 */ dCcD_GObjCo mGObjCo; }; // Size = 0x104 -class dCcD_Cyl : dCcD_GObjInf { +class dCcD_Cyl : public dCcD_GObjInf, public cCcD_CylAttr { public: /* 800848B4 */ void Set(dCcD_SrcCyl const&); /* 800848F8 */ cCcD_ShapeAttr* GetShapeAttr(); /* 80084908 */ void StartCAt(cXyz&); /* 80084954 */ void MoveCAt(cXyz&); /* 800849C4 */ void MoveCTg(cXyz&); - /* 80084D60 */ ~dCcD_Cyl(); - dCcD_Cyl(); - -private: - /* 0x104 */ cCcD_CylAttr mCylAttr; + /* 80084D60 */ virtual ~dCcD_Cyl() {} + dCcD_Cyl() {} }; // Size = 0x13C -class dCcD_Sph : dCcD_GObjInf { +class dCcD_Sph : public dCcD_GObjInf, public cCcD_SphAttr { public: + dCcD_Sph() {} /* 80084A34 */ void Set(dCcD_SrcSph const&); /* 80084A78 */ void StartCAt(cXyz&); /* 80084AC4 */ void MoveCAt(cXyz&); - /* 80084B34 */ cCcD_ShapeAttr* GetShapeAttr(); - /* 80084BF4 */ ~dCcD_Sph(); - -private: - /* 0x104 */ cCcD_SphAttr mSphAttr; + /* 80084B34 */ virtual cCcD_ShapeAttr* GetShapeAttr(); + /* 80084BF4 */ virtual ~dCcD_Sph() {} }; // Size = 0x138 -class dCcD_Cps : dCcD_GObjInf { +class dCcD_Cps : public dCcD_GObjInf, public cCcD_CpsAttr { public: /* 800847D0 */ void Set(dCcD_SrcCps const&); /* 80084814 */ cCcD_ShapeAttr* GetShapeAttr(); /* 80084824 */ void CalcAtVec(); /* 80084854 */ void CalcTgVec(); - /* 8008506C */ ~dCcD_Cps(); - dCcD_Cps(); - -private: - /* 0x104 */ cCcD_CpsAttr mCpsAttr; + /* 8008506C */ virtual ~dCcD_Cps() {} + dCcD_Cps() {} }; // Size = 0x144 -class dCcD_Tri { +class dCcD_Tri : public dCcD_GObjInf, public cCcD_TriAttr { public: /* 80084884 */ void Set(dCcD_SrcTri const&); /* 800848A4 */ cCcD_ShapeAttr* GetShapeAttr(); - /* 80084EF4 */ ~dCcD_Tri(); + /* 80084EF4 */ virtual ~dCcD_Tri() {} + dCcD_Tri() {} }; +dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* param_0); + #endif /* D_CC_D_CC_D_H */ diff --git a/include/d/cc/d_cc_mass_s.h b/include/d/cc/d_cc_mass_s.h index ab12012a32..a4c0a53478 100644 --- a/include/d/cc/d_cc_mass_s.h +++ b/include/d/cc/d_cc_mass_s.h @@ -4,24 +4,44 @@ #include "SSystem/SComponent/c_cc_d.h" #include "dolphin/types.h" +typedef void (*dCcMassS_ObjCallback)(fopAc_ac_c*, cXyz*, u32); + class dCcMassS_Obj { +private: + /* 0x00 */ cCcD_Obj* mpObj; + /* 0x04 */ u8 mPriority; + /* 0x08 */ dCcMassS_ObjCallback mpCallback; + /* 0x0C */ cCcD_DivideInfo mDivideInfo; + /* 0x1C vtable */ public: dCcMassS_Obj(); - ~dCcMassS_Obj(); - -private: - u8 field_0x0[12]; - cCcD_DivideInfo cccd_divideinfo; - void* vtable; + virtual ~dCcMassS_Obj() {} + /* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32)); + /* 800852F0 */ void Clear(); + cCcD_Obj* GetObj() { return mpObj; } + u8 GetPriority() const { return mPriority; } + dCcMassS_ObjCallback GetCallback() const { return mpCallback; } + cCcD_DivideInfo& GetDivideInfo() { return mDivideInfo; } }; // Size = 0x20 STATIC_ASSERT(0x20 == sizeof(dCcMassS_Obj)); -class dCcMassS_Mng { -public: - dCcMassS_Mng(void); - ~dCcMassS_Mng(); +class dCcMassS_HitInf { +private: + /* 0x00 */ cCcD_Obj* mpArea; + /* 0x04 */ cCcD_Obj* mpAtObj; + /* 0x08 */ cCcD_Obj* mpCoObj; + /* 0x0C */ f32 mCoHitLen; +public: + /* 80085334 */ void ClearPointer(); + void SetAreaHitObj(cCcD_Obj* obj) { mpArea = obj; } + void SetCoHitObj(cCcD_Obj* obj) { mpCoObj = obj; } + void SetAtHitObj(cCcD_Obj* obj) { mpAtObj = obj; } + void SetCoHitLen(f32 len) { mCoHitLen = len; } +}; + +class dCcMassS_Mng { public: /* 0x0000 */ cCcD_DivideArea mDivideArea; /* 0x0040 */ s32 mMassObjCount; @@ -29,16 +49,29 @@ public: /* 0x0184 */ s32 mMassAreaCount; /* 0x0188 */ dCcMassS_Obj mMassAreas[2]; /* 0x01C8 */ cCcD_CylAttr mCylAttr; - /* 0x0200 */ u8 field_0x200[2]; + /* 0x0200 */ u8 field_0x200; + /* 0x0200 */ u8 field_0x201; /* 0x0202 */ u8 field_0x202; - /* 0x0203 */ u8 field_0x203; - /* 0x0204 */ cXyz mCamTopPos; + /* 0x0203 */ u8 mResultCam; + /* 0x0204 */ Vec mCamTopPos; /* 0x0210 */ f32 mCamTopDist; - /* 0x0214 */ cXyz mCamBottomPos; + /* 0x0214 */ Vec mCamBottomPos; /* 0x0220 */ f32 mCamBottomDist; - /* 0x0224 */ cCcD_CpsAttr cccd_cpsattr; - /* 0x0264 */ cCcD_DivideInfo cccd_divideinfo; - /* 0x0274 */ void* vtable; + /* 0x0224 */ cCcD_CpsAttr mCpsAttr; + /* 0x0264 */ cCcD_DivideInfo mDivideInfo; + /* 0x0274 vtable */ +public: + dCcMassS_Mng(void); + virtual ~dCcMassS_Mng() {} + /* 800855E4 */ void Ct(); + /* 80085630 */ void SetAttr(f32, f32, u8, u8); + /* 80085690 */ void Prepare(); + /* 800858AC */ u32 Chk(cXyz*, fopAc_ac_c**, dCcMassS_HitInf*); + /* 80085CF0 */ void Clear(); + /* 80085D98 */ void Set(cCcD_Obj*, u8); + /* 80085E6C */ void SetCam(cM3dGCps const&); + /* 80085EB0 */ u8 GetResultCam() const; + /* 80085EB8 */ void GetCamTopPos(Vec*); }; STATIC_ASSERT(sizeof(dCcMassS_Mng) == 0x278); diff --git a/include/d/cc/d_cc_s.h b/include/d/cc/d_cc_s.h index 1d471d4d99..d2d97b3a67 100644 --- a/include/d/cc/d_cc_s.h +++ b/include/d/cc/d_cc_s.h @@ -6,15 +6,15 @@ #include "d/cc/d_cc_mass_s.h" #include "dolphin/types.h" -class dCcS { +class dCcS : public cCcS { public: - /* 8002FF40 */ ~dCcS(); + 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*); /* 800861B0 */ void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*); - /* 800861B4 */ void ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*, cCcD_GObjInf const*, + /* 800861B4 */ bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*); /* 80086240 */ void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*); @@ -37,13 +37,14 @@ public: /* 800872D0 */ void Draw(); /* 8008730C */ void MassClear(); /* 80087330 */ void ChkAtTgMtrlHit(u8, u8); - /* 8008734C */ void ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*, + /* 8008734C */ bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*, cCcD_GStts*); + /* 8002FF40 */ virtual ~dCcS() {} static u8 m_mtrl_hit_tbl[64]; private: - /* 0x0000 */ cCcS mCCcS; + // /* 0x0000 */ cCcS mCCcS; /* 0x284C */ dCcMassS_Mng mMass_Mng; }; // Size = 0x2AC4 diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index df531283ce..fb3aa7e4b6 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -24,22 +24,37 @@ struct dTimer_c { /* 8025D9E0 */ void deleteRequest(); }; -#pragma pack(push, 1) +class __d_timer_info_c { +public: + __d_timer_info_c() { + mTimerMode = -1; + mTimerLimitTimeMs = 0; + mTimerNowTimeMs = 0; + mTimerPtr = NULL; + } + dTimer_c* mTimerPtr; + s32 mTimerNowTimeMs; + s32 mTimerLimitTimeMs; + s32 mTimerMode; + u8 mTimerType; +}; + class dComIfG_camera_info_class { public: - dComIfG_camera_info_class(void); - /* 80030208 */ ~dComIfG_camera_info_class(); + dComIfG_camera_info_class(void) {} + /* 80030208 */ ~dComIfG_camera_info_class() {} private: u8 field_0x0[12]; cXyz field_0xc; cXyz field_0x18; + u8 field_0x24[0x14]; }; -#pragma pack(pop) +STATIC_ASSERT(sizeof(dComIfG_camera_info_class) == 0x38); -#pragma pack(push, 1) class dComIfG_play_c { public: + dComIfG_play_c() { this->ct(); } void ct(void); void init(void); void itemInit(void); @@ -72,12 +87,12 @@ public: void setWarpItemData(const char*, cXyz, s16, s8, u8, u8); void setSelectItem(int, u8); void setSelectItemTest(int, u8); - ~dComIfG_play_c(); + ~dComIfG_play_c() {} // inlines bool& isPauseFlag() { return mPauseFlag; } void* getMsgObjectClass() { return mMsgObjectClass; } - dStage_roomControl_c* getRoomControl() { return mRoomControl; } + dStage_roomControl_c* getRoomControl() { return &mRoomControl; } dEvt_control_c getEvent() { return mEvent; } daHorse_c* getHorseActor() { return mHorseActor; } u8& getItemLifeCountType() { return mItemLifeCountType; } @@ -134,7 +149,7 @@ public: /* 0x03ED6 */ dStage_nextStage_c mNextStage; /* 0x03EE7 */ u8 field_0x3ee7; // probably padding /* 0x03EE8 */ dStage_stageDt_c mStageData; - /* 0x03F8C */ dStage_roomControl_c* mRoomControl; + /* 0x03F8C */ dStage_roomControl_c mRoomControl; /* 0x03F90 */ dEvt_control_c mEvent; /* 0x040C0 */ dEvent_manager_c mEvtManager; /* 0x04780 */ dAttention_c mAttention; @@ -171,21 +186,8 @@ public: /* 0x04E0C */ u8 mWindowNum; /* 0x04E0D */ u8 mLayerOld; /* 0x04E0E */ u16 mStatus; - /* 0x04E10 */ dDlst_window_c mWindow; - /* 0x04E3C */ dComIfG_camera_info_class* mCameraInfo; - /* 0x04E40 */ s8 mCameraWinID; - /* 0x04E41 */ s8 mCameraPlayer1ID; - /* 0x04E42 */ s8 mCameraPlayer2ID; - /* 0x04E43 */ u8 field_0x4e43; - /* 0x04E44 */ int mCameraAttentionStatus; - /* 0x04E48 */ float mCameraZoomScale; - /* 0x04E4C */ float mCameraZoomForcus; - /* 0x04E50 */ void* mCameraParamFileName; - /* 0x04E54 */ cXyz mCameraPos; - /* 0x04E60 */ cXyz mCameraTarget; - /* 0x04E6C */ float mCameraUnk1; - /* 0x04E70 */ s16 mCameraUnk2; - /* 0x04E72 */ s16 field_0x4e72; + /* 0x04E10 */ dDlst_window_c mWindow[1]; + /* 0x04E3C */ dComIfG_camera_info_class mCameraInfo[1]; /* 0x04E74 */ daAlink_c* mPlayer; /* 0x04E78 */ s8 mPlayerCameraID[4]; /* 0x04E7C */ daAlink_c* mPlayerPtr; @@ -351,26 +353,35 @@ public: /* 0x04FDC */ fopAc_ac_c* mMesgCamInfoActor10; /* 0x04FE0 */ int mPlayerStatus; /* 0x04FE4 */ u8 field_0x4fe4[0x14]; - /* 0x04FF8 */ dTimer_c* mTimerPtr; - /* 0x04FFC */ int mTimerNowTimeMs; - /* 0x05000 */ int mTimerLimitTimeMs; - /* 0x05004 */ int mTimerMode; - /* 0x05008 */ u8 mTimerType; + /* 0x04FF8 */ __d_timer_info_c mTimerInfo; /* 0x0500C */ dDlst_window_c* mCurrentWindow; /* 0x05010 */ void* mCurrentView; /* 0x05014 */ void* mCurrentViewport; /* 0x05018 */ void* mCurrentGrafPort; /* 0x0501C */ void* mItemTable; - /* 0x0501D */ u8 field_0x501d[7]; + /* 0x0501D */ u8 field_0x501d[4]; /* 0x05024 */ char mLastPlayStageName[8]; }; -#pragma pack(pop) + +class dRes_control_c { +public: + dRes_control_c() {} + /* 8003BFB0 */ ~dRes_control_c(); + /* 8003C078 */ void setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*); + /* 8003C160 */ void syncRes(char const*, dRes_info_c*, int); + /* 8003C194 */ void deleteRes(char const*, dRes_info_c*, int); + /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); + +private: + /* 0x0000 */ dRes_info_c mResInfos1[0x80]; + /* 0x1200 */ dRes_info_c mResInfos2[0x40]; +}; // Size: 0x1B00 #pragma pack(push, 1) class dComIfG_inf_c { public: - dComIfG_inf_c(void); - ~dComIfG_inf_c(); + dComIfG_inf_c(void) { this->ct(); } + ~dComIfG_inf_c() {} void ct(void); // temp for setWarashibeItem @@ -393,11 +404,8 @@ private: /* 0x00000 */ dSv_info_c info; /* 0x00F38 */ dComIfG_play_c play; /* 0x05F64 */ dDlst_list_c draw_list_list; - /* 0x1C110 */ u8 field_0x1C114[0x1E8]; - /* 0x1C2F8 */ dRes_info_c resource_info1; - /* 0x1C31C */ u8 unk19[0x11DC]; - /* 0x1D4F8 */ dRes_info_c resource_info2; - /* 0x1D51C */ u8 unk20[0x8DA]; + /* 0x1C110 */ u8 field_0x1C114[0x1E8 - 0xA]; + /* 0x1C2F8 */ dRes_control_c mResControl; /* 0x1DDF8 */ u8 field_0x1ddf8; /* 0x1DDF9 */ u8 mWorldDark; /* 0x1DDFA */ u8 field_0x1ddfa; @@ -408,29 +416,15 @@ private: /* 0x1DE08 */ u8 field_0x1de08; /* 0x1DE09 */ u8 field_0x1de09; /* 0x1DE0A */ u8 field_0x1de0a; + u8 _pad[8]; - static u8 dComIfG_mTimerInfo[20]; + static __d_timer_info_c dComIfG_mTimerInfo; }; #pragma pack(pop) -class __d_timer_info_c { -public: - __d_timer_info_c() { - field_0xc = -1; - field_0x8 = 0; - field_0x4 = 0; - field_0x0 = 0; - } - u32 field_0x0; - u32 field_0x4; - u32 field_0x8; - u32 field_0xc; - u32 field_0x10; -}; - STATIC_ASSERT(122384 == sizeof(dComIfG_inf_c)); -// extern dComIfG_inf_c g_dComIfG_gameInfo; +extern dComIfG_inf_c g_dComIfG_gameInfo; /* void dComIfGp_setItemLifeCount(float, u8); void dComIfGp_setItemRupeeCount(long); diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 3cc89e0a45..a2b2147b88 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -11,6 +11,7 @@ struct J3DTransformInfo {}; class dAttHint_c { public: + dAttHint_c() {} /* 800738B4 */ void getPId(void*); /* 800738CC */ void convPId(unsigned int); /* 800738FC */ void request(fopAc_ac_c*, int); @@ -25,6 +26,7 @@ private: class dAttCatch_c { public: + dAttCatch_c() {} void convPId(unsigned int); void init(); void proc(); @@ -43,12 +45,8 @@ private: }; // Size = 0x14 class dAttParam_c { -public: - /* 80070038 */ dAttParam_c(s32); - /* 80070110 */ ~dAttParam_c(); - private: - /* 0x00 */ void* vtable; + /* 0x00 vtable */ /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 field_0x5; /* 0x06 */ u16 mFlag; @@ -66,6 +64,13 @@ private: /* 0x34 */ float field_0x34; /* 0x38 */ u8 field_0x38; /* 0x39 */ u8 field_0x39; + +public: + dAttParam_c() {} + /* 80070038 */ dAttParam_c(s32); + /* 80070110 */ virtual ~dAttParam_c(); + +private: /* 0x3C */ float field_0x3c; /* 0x40 */ float field_0x40; /* 0x44 */ u32 field_0x44; @@ -89,8 +94,8 @@ private: #pragma pack(push, 1) class dAttList_c { public: - /* 800304D0 */ ~dAttList_c(); - /* 8003050C */ dAttList_c(); + /* 800304D0 */ ~dAttList_c() {} + /* 8003050C */ dAttList_c() {} /* 80073864 */ void getActor(); /* 80073898 */ void setActor(fopAc_ac_c*); @@ -98,13 +103,13 @@ private: u8 field_0x0[8]; cSAngle angle; u8 field_0xa[10]; -}; +}; // Size = 0x14 #pragma pack(pop) class dAttDraw_c { public: - /* 8003054C */ ~dAttDraw_c(); - /* 800307F0 */ dAttDraw_c(); + /* 8003054C */ ~dAttDraw_c() {} + /* 800307F0 */ dAttDraw_c() {} /* 80072DD8 */ void setAnm(u8, f32); /* 80072FE8 */ void setAlphaAnm(u8, u8); /* 80073004 */ void alphaAnm(); @@ -136,15 +141,16 @@ public: /* 0x175 */ u8 field_0x175; }; -class dAttDraw_CallBack_c { -public: - /* 80070178 */ void execute(u16, J3DTransformInfo*); +STATIC_ASSERT(sizeof(dAttDraw_c) == 0x178); - mDoExt_McaMorfCallBack1_c mDoExt_McaMorfCallback; +class dAttDraw_CallBack_c : public mDoExt_McaMorfCallBack1_c { +public: + /* 80070178 */ virtual void execute(u16, J3DTransformInfo*); }; class dAttention_c { public: + dAttention_c() {} /* 80070198 */ dAttention_c(fopAc_ac_c*, u32); /* 80070774 */ ~dAttention_c(); /* 80070844 */ void GetLockonList(s32); diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 86faafac33..3690083519 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -26,11 +26,10 @@ public: }; // actual size unknown!!! #pragma pack(pop) -#pragma pack(push, 1) class dDlst_window_c { public: - dDlst_window_c(void); - ~dDlst_window_c(); + dDlst_window_c(void) {} + ~dDlst_window_c() {} /* 80051AC0 */ void setViewPort(f32, f32, f32, f32, f32, f32); /* 80051ADC */ void setScissor(f32, f32, f32, f32); @@ -47,7 +46,8 @@ private: float scissor4; int camera_id; }; -#pragma pack(pop) + +STATIC_ASSERT(sizeof(dDlst_window_c) == 0x2C); class dDlst_base_c { public: diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 84d3d799e9..06909c5f0f 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -2,6 +2,7 @@ #define D_D_STAGE_H #include "JSystem/JKernel/JKRExpHeap.h" +#include "d/kankyo/d_kankyo.h" #include "d/save/d_save.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" @@ -13,19 +14,14 @@ struct stage_vrbox_info_class {}; struct stage_tresure_class {}; -class stage_tgsc_data_class { -public: - /* 8002847C */ ~stage_tgsc_data_class(); - /* 800284B8 */ stage_tgsc_data_class(); - -private: - /* 0x00 */ u32 field_0x00; - /* 0x04 */ u32 field_0x04; - /* 0x08 */ u8 field_0x08[0x18]; // fopAcM_prmBase_class - /* 0x20 */ u16 field_0x20; - /* 0x22 */ u8 field_0x22; +struct stage_tgsc_data_class { + /* 8002847C */ ~stage_tgsc_data_class() {} + /* 800284B8 */ stage_tgsc_data_class() {} + u8 unk_0[0x24]; }; // Size = 0x24 +STATIC_ASSERT(sizeof(stage_tgsc_data_class) == 0x24); + struct stage_tgsc_class {}; struct stage_stag_info_class {}; @@ -52,9 +48,7 @@ struct stage_camera2_data_class {}; struct stage_arrow_class {}; -struct stage_actor_data_class { - /* 0x00 */ const char* mName; -}; +struct stage_actor_data_class {}; struct stage_actor_class {}; @@ -88,112 +82,205 @@ struct dStage_MapEventInfo_c {}; class dStage_dt_c { public: + dStage_dt_c() {} void setRoomNo(s8 roomNo) { mRoomNo = roomNo; } s8 getRoomNo() { return mRoomNo; } + /* vt[ 2] */ virtual void init(void) = 0; + /* vt[ 3] */ virtual void setCamera(stage_camera_class*) = 0; + /* vt[ 4] */ virtual stage_camera_class* getCamera(void) const = 0; + /* vt[ 5] */ virtual void setArrow(stage_arrow_class*) = 0; + /* vt[ 6] */ virtual stage_arrow_class* getArrow(void) const = 0; + /* vt[ 7] */ virtual void setPlayer(stage_actor_class*) = 0; + /* vt[ 8] */ virtual stage_actor_class* getPlayer(void) const = 0; + /* vt[ 9] */ virtual void setPlayerNum(u16) = 0; + /* vt[10] */ virtual u16 getPlayerNum(void) const = 0; + /* vt[11] */ virtual void setRoom(roomRead_class*) = 0; + /* vt[12] */ virtual roomRead_class* getRoom(void) const = 0; + /* vt[13] */ virtual void setMapInfo(stage_map_info_class*) = 0; + /* vt[14] */ virtual stage_map_info_class* getMapInfo(void) const = 0; + /* vt[15] */ virtual int getMapInfo2(int) const = 0; + /* vt[16] */ virtual void setMapInfoBase(stage_map_info_dummy_class*) = 0; + /* vt[17] */ virtual stage_map_info_dummy_class* getMapInfoBase(void) const = 0; + /* vt[18] */ virtual void setPaletteInfo(stage_palette_info_class*) = 0; + /* vt[19] */ virtual stage_palette_info_class* getPaletteInfo(void) const = 0; + /* vt[20] */ virtual void setPselectInfo(stage_pselect_info_class*) = 0; + /* vt[21] */ virtual stage_pselect_info_class* getPselectInfo(void) const = 0; + /* vt[22] */ virtual void setEnvrInfo(stage_envr_info_class*) = 0; + /* vt[23] */ virtual stage_envr_info_class* getEnvrInfo(void) const = 0; + /* vt[24] */ virtual void setVrboxInfo(stage_vrbox_info_class*) = 0; + /* vt[25] */ virtual stage_vrbox_info_class* getVrboxInfo(void) const = 0; + /* vt[26] */ virtual void setVrboxcolInfo(stage_vrboxcol_info_class*) = 0; + /* vt[27] */ virtual stage_vrboxcol_info_class* getVrboxcolInfo(void) const = 0; + /* vt[28] */ virtual void setPlightInfo(stage_plight_info_class*) = 0; + /* vt[29] */ virtual stage_plight_info_class* getPlightInfo(void) const = 0; + /* vt[30] */ virtual void setPaletteNumInfo(int) = 0; + /* vt[31] */ virtual int getPaletteNumInfo(void) const = 0; + /* vt[32] */ virtual void setPselectNumInfo(int) = 0; + /* vt[33] */ virtual int getPselectNumInfo(void) const = 0; + /* vt[34] */ virtual void setEnvrNumInfo(int) = 0; + /* vt[35] */ virtual int getEnvrNumInfo(void) const = 0; + /* vt[36] */ virtual void setVrboxNumInfo(int) = 0; + /* vt[37] */ virtual int getVrboxNumInfo(void) const = 0; + /* vt[38] */ virtual void setVrboxcolNumInfo(int) = 0; + /* vt[39] */ virtual int getVrboxcolNumInfo(void) const = 0; + /* vt[40] */ virtual void setPlightNumInfo(int) = 0; + /* vt[41] */ virtual int getPlightNumInfo(void) const = 0; + /* vt[42] */ virtual void setLightVecInfo(stage_pure_lightvec_info_class*) = 0; + /* vt[43] */ virtual stage_pure_lightvec_info_class* getLightVecInfo(void) const = 0; + /* vt[44] */ virtual void setLightVecInfoNum(int) = 0; + /* vt[45] */ virtual int getLightVecInfoNum(void) const = 0; + /* vt[46] */ virtual void setStagInfo(stage_stag_info_class*) = 0; + /* vt[47] */ virtual stage_stag_info_class* getStagInfo(void) const = 0; + /* vt[48] */ virtual void setSclsInfo(stage_scls_info_dummy_class*) = 0; + /* vt[49] */ virtual stage_scls_info_dummy_class* getSclsInfo(void) const = 0; + /* vt[50] */ virtual void setPntInfo(dStage_dPnt_c*) = 0; + /* vt[51] */ virtual dStage_dPnt_c* getPntInf(void) const = 0; + /* vt[52] */ virtual void setPathInfo(dStage_dPath_c*) = 0; + /* vt[53] */ virtual dStage_dPath_c* getPathInf(void) const = 0; + /* vt[54] */ virtual void setPnt2Info(dStage_dPnt_c*) = 0; + /* vt[55] */ virtual dStage_dPnt_c* getPnt2Inf(void) const = 0; + /* vt[56] */ virtual void setPath2Info(dStage_dPath_c*) = 0; + /* vt[57] */ virtual dStage_dPath_c* getPath2Inf(void) const = 0; + /* vt[58] */ virtual void setSoundInf(dStage_SoundInfo_c*) = 0; + /* vt[59] */ virtual dStage_SoundInfo_c* getSoundInf(void) const = 0; + /* vt[60] */ virtual void setSoundInfCL(dStage_SoundInfo_c*) = 0; + /* vt[61] */ virtual dStage_SoundInfo_c* getSoundInfCL(void) const = 0; + /* vt[62] */ virtual void setMapEventInfo(dStage_MapEventInfo_c*) = 0; + /* vt[63] */ virtual dStage_MapEventInfo_c* getMapEventInfo(void) const = 0; + /* vt[64] */ virtual void setFileList2Info(dStage_FileList2_dt_c*) = 0; + /* vt[65] */ virtual dStage_FileList2_dt_c* getFileList2Info(void) const = 0; + /* vt[66] */ virtual void setFileListInfo(dStage_FileList_dt_c*) = 0; + /* vt[67] */ virtual dStage_FileList_dt_c* getFileListInfo(void) const = 0; + /* vt[68] */ virtual void setFloorInfo(dStage_FloorInfo_c*) = 0; + /* vt[69] */ virtual dStage_FloorInfo_c* getFloorInfo(void) const = 0; + /* vt[70] */ virtual void setMemoryConfig(dStage_MemoryConfig_c*) = 0; + /* vt[71] */ virtual dStage_MemoryConfig_c* getMemoryConfig(void) const = 0; + /* vt[72] */ virtual void setMemoryMap(dStage_MemoryMap_c*) = 0; + /* vt[73] */ virtual dStage_MemoryMap_c* getMemoryMap(void) const = 0; + /* vt[74] */ virtual void setMulti(dStage_Multi_c*) = 0; + /* vt[75] */ virtual dStage_Multi_c* getMulti(void) const = 0; + /* vt[76] */ virtual void setOldMulti(void) = 0; + /* vt[77] */ virtual void resetOldMulti(void) = 0; + /* vt[78] */ virtual dStage_Multi_c* getOldMulti(void) const = 0; + /* vt[79] */ virtual void setLbnk(dStage_Lbnk_c*) = 0; + /* vt[80] */ virtual dStage_Lbnk_c* getLbnk(void) const = 0; + /* vt[81] */ virtual void setTresure(stage_tresure_class*) = 0; + /* vt[82] */ virtual stage_tresure_class* getTresure(void) const = 0; + /* vt[83] */ virtual void setDMap(dStage_DMap_c*) = 0; + /* vt[84] */ virtual dStage_DMap_c* getDMap(void) const = 0; + /* vt[85] */ virtual void setDrTg(stage_tgsc_class*) = 0; + /* vt[86] */ virtual stage_tgsc_class* getDrTg(void) const = 0; + /* vt[87] */ virtual void setDoor(stage_tgsc_class*) = 0; + /* vt[88] */ virtual stage_tgsc_class* getDoor(void) const = 0; + /* vt[89] */ virtual void setMapPath(void*) = 0; + /* vt[90] */ virtual int getMapPath(void) = 0; + /* vt[91] */ virtual void setElst(dStage_Elst_c*) = 0; + /* vt[92] */ virtual dStage_Elst_c* getElst(void) = 0; + private: /* 0x04 */ s8 mRoomNo; }; -class dStage_stageDt_c { +class dStage_stageDt_c : public dStage_dt_c { public: - stage_camera_class* getCamera(void) const; - stage_arrow_class* getArrow(void) const; - stage_actor_class* getPlayer(void) const; - roomRead_class* getRoom(void) const; - stage_map_info_class* getMapInfo(void) const; - stage_map_info_dummy_class* getMapInfoBase(void) const; - stage_palette_info_class* getPaletteInfo(void) const; - stage_pselect_info_class* getPselectInfo(void) const; - stage_envr_info_class* getEnvrInfo(void) const; - stage_vrbox_info_class* getVrboxInfo(void) const; - stage_vrboxcol_info_class* getVrboxcolInfo(void) const; - dStage_FileList2_dt_c* getFileList2Info(void) const; - dStage_FileList_dt_c* getFileListInfo(void) const; - stage_plight_info_class* getPlightInfo(void) const; - dStage_MapEventInfo_c* getMapEventInfo(void) const; - int getPaletteNumInfo(void) const; - int getPselectNumInfo(void) const; - int getEnvrNumInfo(void) const; - int getVrboxNumInfo(void) const; - int getVrboxcolNumInfo(void) const; - int getPlightNumInfo(void) const; - u16 getPlayerNum(void) const; - int getMapInfo2(int) const; - stage_stag_info_class* getStagInfo(void) const; - stage_scls_info_dummy_class* getSclsInfo(void) const; - dStage_Lbnk_c* getLbnk(void) const; - dStage_dPnt_c* getPntInf(void) const; - dStage_dPath_c* getPathInf(void) const; - dStage_dPnt_c* getPnt2Inf(void) const; - dStage_dPath_c* getPath2Inf(void) const; - dStage_SoundInfo_c* getSoundInf(void) const; - dStage_SoundInfo_c* getSoundInfCL(void) const; - dStage_FloorInfo_c* getFloorInfo(void) const; - dStage_MemoryConfig_c* getMemoryConfig(void) const; - dStage_MemoryMap_c* getMemoryMap(void) const; - dStage_Multi_c* getMulti(void) const; - dStage_Multi_c* getOldMulti(void) const; - stage_tresure_class* getTresure(void) const; - dStage_DMap_c* getDMap(void) const; - stage_tgsc_class* getDrTg(void) const; - stage_tgsc_class* getDoor(void) const; - dStage_Elst_c* getElst(void); - stage_pure_lightvec_info_class* getLightVecInfo(void) const; - int getLightVecInfoNum(void) const; - int getMapPath(void); + dStage_stageDt_c() {} - void init(void); - void resetOldMulti(void); + /* vt[ 2] */ virtual void init(void); + /* vt[ 3] */ virtual void setCamera(stage_camera_class*); + /* vt[ 4] */ virtual stage_camera_class* getCamera(void) const; + /* vt[ 5] */ virtual void setArrow(stage_arrow_class*); + /* vt[ 6] */ virtual stage_arrow_class* getArrow(void) const; + /* vt[ 7] */ virtual void setPlayer(stage_actor_class*); + /* vt[ 8] */ virtual stage_actor_class* getPlayer(void) const; + /* vt[ 9] */ virtual void setPlayerNum(u16); + /* vt[10] */ virtual u16 getPlayerNum(void) const; + /* vt[11] */ virtual void setRoom(roomRead_class*); + /* vt[12] */ virtual roomRead_class* getRoom(void) const; + /* vt[13] */ virtual void setMapInfo(stage_map_info_class*); + /* vt[14] */ virtual stage_map_info_class* getMapInfo(void) const; + /* vt[15] */ virtual int getMapInfo2(int) const; + /* vt[16] */ virtual void setMapInfoBase(stage_map_info_dummy_class*); + /* vt[17] */ virtual stage_map_info_dummy_class* getMapInfoBase(void) const; + /* vt[18] */ virtual void setPaletteInfo(stage_palette_info_class*); + /* vt[19] */ virtual stage_palette_info_class* getPaletteInfo(void) const; + /* vt[20] */ virtual void setPselectInfo(stage_pselect_info_class*); + /* vt[21] */ virtual stage_pselect_info_class* getPselectInfo(void) const; + /* vt[22] */ virtual void setEnvrInfo(stage_envr_info_class*); + /* vt[23] */ virtual stage_envr_info_class* getEnvrInfo(void) const; + /* vt[24] */ virtual void setVrboxInfo(stage_vrbox_info_class*); + /* vt[25] */ virtual stage_vrbox_info_class* getVrboxInfo(void) const; + /* vt[26] */ virtual void setVrboxcolInfo(stage_vrboxcol_info_class*); + /* vt[27] */ virtual stage_vrboxcol_info_class* getVrboxcolInfo(void) const; + /* vt[28] */ virtual void setPlightInfo(stage_plight_info_class*); + /* vt[29] */ virtual stage_plight_info_class* getPlightInfo(void) const; + /* vt[30] */ virtual void setPaletteNumInfo(int); + /* vt[31] */ virtual int getPaletteNumInfo(void) const; + /* vt[32] */ virtual void setPselectNumInfo(int); + /* vt[33] */ virtual int getPselectNumInfo(void) const; + /* vt[34] */ virtual void setEnvrNumInfo(int); + /* vt[35] */ virtual int getEnvrNumInfo(void) const; + /* vt[36] */ virtual void setVrboxNumInfo(int); + /* vt[37] */ virtual int getVrboxNumInfo(void) const; + /* vt[38] */ virtual void setVrboxcolNumInfo(int); + /* vt[39] */ virtual int getVrboxcolNumInfo(void) const; + /* vt[40] */ virtual void setPlightNumInfo(int); + /* vt[41] */ virtual int getPlightNumInfo(void) const; + /* vt[42] */ virtual void setLightVecInfo(stage_pure_lightvec_info_class*); + /* vt[43] */ virtual stage_pure_lightvec_info_class* getLightVecInfo(void) const; + /* vt[44] */ virtual void setLightVecInfoNum(int); + /* vt[45] */ virtual int getLightVecInfoNum(void) const; + /* vt[46] */ virtual void setStagInfo(stage_stag_info_class*); + /* vt[47] */ virtual stage_stag_info_class* getStagInfo(void) const; + /* vt[48] */ virtual void setSclsInfo(stage_scls_info_dummy_class*); + /* vt[49] */ virtual stage_scls_info_dummy_class* getSclsInfo(void) const; + /* vt[50] */ virtual void setPntInfo(dStage_dPnt_c*); + /* vt[51] */ virtual dStage_dPnt_c* getPntInf(void) const; + /* vt[52] */ virtual void setPathInfo(dStage_dPath_c*); + /* vt[53] */ virtual dStage_dPath_c* getPathInf(void) const; + /* vt[54] */ virtual void setPnt2Info(dStage_dPnt_c*); + /* vt[55] */ virtual dStage_dPnt_c* getPnt2Inf(void) const; + /* vt[56] */ virtual void setPath2Info(dStage_dPath_c*); + /* vt[57] */ virtual dStage_dPath_c* getPath2Inf(void) const; + /* vt[58] */ virtual void setSoundInf(dStage_SoundInfo_c*); + /* vt[59] */ virtual dStage_SoundInfo_c* getSoundInf(void) const; + /* vt[60] */ virtual void setSoundInfCL(dStage_SoundInfo_c*); + /* vt[61] */ virtual dStage_SoundInfo_c* getSoundInfCL(void) const; + /* vt[62] */ virtual void setMapEventInfo(dStage_MapEventInfo_c*); + /* vt[63] */ virtual dStage_MapEventInfo_c* getMapEventInfo(void) const; + /* vt[64] */ virtual void setFileList2Info(dStage_FileList2_dt_c*); + /* vt[65] */ virtual dStage_FileList2_dt_c* getFileList2Info(void) const; + /* vt[66] */ virtual void setFileListInfo(dStage_FileList_dt_c*); + /* vt[67] */ virtual dStage_FileList_dt_c* getFileListInfo(void) const; + /* vt[68] */ virtual void setFloorInfo(dStage_FloorInfo_c*); + /* vt[69] */ virtual dStage_FloorInfo_c* getFloorInfo(void) const; + /* vt[70] */ virtual void setMemoryConfig(dStage_MemoryConfig_c*); + /* vt[71] */ virtual dStage_MemoryConfig_c* getMemoryConfig(void) const; + /* vt[72] */ virtual void setMemoryMap(dStage_MemoryMap_c*); + /* vt[73] */ virtual dStage_MemoryMap_c* getMemoryMap(void) const; + /* vt[74] */ virtual void setMulti(dStage_Multi_c*); + /* vt[75] */ virtual dStage_Multi_c* getMulti(void) const; + /* vt[76] */ virtual void setOldMulti(void); + /* vt[77] */ virtual void resetOldMulti(void); + /* vt[78] */ virtual dStage_Multi_c* getOldMulti(void) const; + /* vt[79] */ virtual void setLbnk(dStage_Lbnk_c*); + /* vt[80] */ virtual dStage_Lbnk_c* getLbnk(void) const; + /* vt[81] */ virtual void setTresure(stage_tresure_class*); + /* vt[82] */ virtual stage_tresure_class* getTresure(void) const; + /* vt[83] */ virtual void setDMap(dStage_DMap_c*); + /* vt[84] */ virtual dStage_DMap_c* getDMap(void) const; + /* vt[85] */ virtual void setDrTg(stage_tgsc_class*); + /* vt[86] */ virtual stage_tgsc_class* getDrTg(void) const; + /* vt[87] */ virtual void setDoor(stage_tgsc_class*); + /* vt[88] */ virtual stage_tgsc_class* getDoor(void) const; + /* vt[89] */ virtual void setMapPath(void*); + /* vt[90] */ virtual int getMapPath(void); + /* vt[91] */ virtual void setElst(dStage_Elst_c*); + /* vt[92] */ virtual dStage_Elst_c* getElst(void); - void setCamera(stage_camera_class*); - void setArrow(stage_arrow_class*); - void setPlayer(stage_actor_class*); - void setRoom(roomRead_class*); - void setMapInfo(stage_map_info_class*); - void setMapInfoBase(stage_map_info_dummy_class*); - void setPaletteInfo(stage_palette_info_class*); - void setPselectInfo(stage_pselect_info_class*); - void setEnvrInfo(stage_envr_info_class*); - void setVrboxInfo(stage_vrbox_info_class*); - void setVrboxcolInfo(stage_vrboxcol_info_class*); - void setFileList2Info(dStage_FileList2_dt_c*); - void setFileListInfo(dStage_FileList_dt_c*); - void setPlightInfo(stage_plight_info_class*); - void setMapEventInfo(dStage_MapEventInfo_c*); - void setPaletteNumInfo(int); - void setPselectNumInfo(int); - void setEnvrNumInfo(int); - void setVrboxNumInfo(int); - void setVrboxcolNumInfo(int); - void setPlightNumInfo(int); - void setPlayerNum(u16); - void setStagInfo(stage_stag_info_class*); - void setSclsInfo(stage_scls_info_dummy_class*); - void setLbnk(dStage_Lbnk_c*); - void setPntInfo(dStage_dPnt_c*); - void setPathInfo(dStage_dPath_c*); - void setPnt2Info(dStage_dPnt_c*); - void setPath2Info(dStage_dPath_c*); - void setSoundInf(dStage_SoundInfo_c*); - void setSoundInfCL(dStage_SoundInfo_c*); - void setFloorInfo(dStage_FloorInfo_c*); - void setMemoryConfig(dStage_MemoryConfig_c*); - void setMemoryMap(dStage_MemoryMap_c*); - void setMulti(dStage_Multi_c*); - void setOldMulti(void); void setTreasure(stage_tresure_class*); - void setDMap(dStage_DMap_c*); - void setDrTg(stage_tgsc_class*); - void setDoor(stage_tgsc_class*); - void setElst(dStage_Elst_c*); - void setLightVecInfo(stage_pure_lightvec_info_class*); - void setLightVecInfoNum(int); - void setTresure(stage_tresure_class*); - void setMapPath(void*); private: - u8 field_0x0[0x8]; stage_camera_class* mCamera; stage_arrow_class* mArrow; stage_actor_class* mPlayer; @@ -237,8 +324,9 @@ private: dStage_Elst_c* mElst; }; -class dStage_roomDt_c { +class dStage_roomDt_c : public dStage_dt_c { public: + dStage_roomDt_c() {} stage_pure_lightvec_info_class* getLightVecInfo(void) const; int getLightVecInfoNum(void) const; stage_map_info_class* getMapInfo(void) const; @@ -337,7 +425,6 @@ public: void setEnvrNumInfo(int); private: - u8 field_0x0[0x8]; stage_pure_lightvec_info_class* mLightVecInfo; int mLightVecInfoNum; stage_map_info_class* mMapInfo; @@ -366,10 +453,27 @@ private: int mVrboxcolNumInfo; }; // Size: 0x6C +class dStage_roomStatus_c { +private: + /* 0x000 */ dStage_roomDt_c mRoomDt; + /* 0x06C */ dKy_tevstr_c mKyTevStr; + /* 0x3F4 */ u8 unk_0x3F4[3]; + /* 0x3F7 */ s8 mZoneNo; + /* 0x3F8 */ u8 unk_3F8[0x404 - 0x3F8]; + +public: + int getZoneNo() const { return mZoneNo; } + /* 80028360 */ ~dStage_roomStatus_c() {} + /* 8002839C */ dStage_roomStatus_c() {} +}; // Size: 0x404 + +STATIC_ASSERT(sizeof(dStage_roomStatus_c) == 0x404); + class dStage_roomControl_c { public: class roomDzs_c { public: + roomDzs_c() { m_num = 0; } /* 80024A34 */ void create(u8); /* 80024ABC */ void remove(); /* 80024B44 */ void add(u8, u8); @@ -378,6 +482,7 @@ public: /* 0x04 */ JKRHeap* m_dzs; }; + dStage_roomControl_c() {} void init(void); static int getZoneNo(int room); /* 80024338 */ void initZone(); @@ -397,19 +502,23 @@ public: static JKRExpHeap* mMemoryBlock[19]; static u8 mArcBank[320]; - static u8 mStatus[65792]; + static dStage_roomStatus_c mStatus[0x40]; static u8 mDemoArcName[10 + 2 /* padding */]; static u32 mProcID; static u8 mArcBankName[4]; static u8 mArcBankData[4]; static roomDzs_c m_roomDzs; - u8 field_0x0[164]; +private: + u8 field_0x0[4]; }; #pragma pack(push, 1) class dStage_nextStage_c { public: + dStage_nextStage_c() { + enabled = 0; // TODO: maybe wrong + } void set(const char*, s8, s16, s8, s8, u8); private: @@ -418,14 +527,12 @@ private: u8 mRoomNo; u8 mLayer; u8 field_0xc; - u8 field_0xd; s8 enabled; u8 wipe; u8 wipe_speed; }; #pragma pack(pop) -#pragma pack(push, 1) class dStage_startStage_c { public: void set(const char*, s8, s16, s8); @@ -446,20 +553,6 @@ private: /* 0xB */ s8 mLayer; /* 0xC */ s8 mDarkArea; }; -#pragma pack(pop) - -class dStage_roomStatus_c : dStage_roomDt_c { -private: - /* 0x06C */ u8 mJ3DLightInfo[0xA0 - 0x6C]; - /* 0x0A0 */ u8 unk_A0[0x3F7 - 0xA0]; - /* 0x3F7 */ s8 mZoneNo; - /* 0x3F8 */ u8 unk_3F8[0x404 - 0x3F8]; - -public: - int getZoneNo() const { return mZoneNo; } - /* 80028360 */ ~dStage_roomStatus_c(); - /* 8002839C */ dStage_roomStatus_c(); -}; // Size: 0x404 // unknown name struct dStage_objectNameInf { @@ -468,6 +561,13 @@ struct dStage_objectNameInf { s8 mSubtype; }; // Size: 0xC +class dStage_KeepDoorInfo { +public: + /* 80028418 */ ~dStage_KeepDoorInfo() {} + /* 0x000 */ u8 unk_0x0[4]; + /* 0x004 */ stage_tgsc_data_class unk_0x4[0x40]; +}; // Size = 0x904 + typedef void (*dStage_Func)(dStage_dt_c*, void*, int, void*); struct FuncTable { diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index 6c03cc8b0a..a80e4ff543 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -4,7 +4,6 @@ #include "d/save/d_save.h" #include "dolphin/types.h" -#pragma pack(push, 1) class dVibration_c { public: /* 8006F268 */ void Run(); @@ -62,6 +61,5 @@ private: u32 field_0x88; u32 field_0x8c; }; -#pragma pack(pop) #endif /* D_D_VIBRATION_H */ diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index c02ed580c3..b7cf2df3c4 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -10,7 +10,7 @@ class dEvt_order_c { public: - ~dEvt_order_c(); + ~dEvt_order_c() {} dEvt_order_c(); /* 0x00 */ u16 mEventType; @@ -24,6 +24,8 @@ public: /* 0x15 */ u8 mEventInfoIdx; }; // Size = 0x18 +STATIC_ASSERT(sizeof(dEvt_order_c) == 0x18); + typedef int (*SkipFunc)(void*, int); class dEvt_control_c { diff --git a/include/d/event/d_event_data.h b/include/d/event/d_event_data.h index f09499c826..f7f6f82ee9 100644 --- a/include/d/event/d_event_data.h +++ b/include/d/event/d_event_data.h @@ -85,11 +85,10 @@ private: u32 mFlags[320]; }; // Size = 0x500 -#pragma pack(push, 1) class dEvDtBase_c { public: dEvDtBase_c(); - ~dEvDtBase_c(); + ~dEvDtBase_c() {} void init(); void init(char*, int); void advanceCut(dEvDtEvent_c*); @@ -110,6 +109,7 @@ private: /* 0x1C */ char* mSDataP; /* 0x20 */ s32 mRoomNo; }; // Size = 0x24 -#pragma pack(pop) + +STATIC_ASSERT(sizeof(dEvDtBase_c) == 0x24); #endif /* D_EVENT_D_EVENT_DATA_H */ diff --git a/include/d/event/d_event_manager.h b/include/d/event/d_event_manager.h index c941d17183..02f8e4233d 100644 --- a/include/d/event/d_event_manager.h +++ b/include/d/event/d_event_manager.h @@ -24,6 +24,7 @@ class dEvent_manager_c { public: void getSubstance(dEvDtData_c*, int); dEvent_manager_c(); + ~dEvent_manager_c() {} void create(); void setObjectArchive(char*); void demoInit(); diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index d92ecebccd..63208f2691 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -61,4 +61,6 @@ private: /* 0x385 */ u8 field_0x385; }; // Size = 0x388? +STATIC_ASSERT(sizeof(dKy_tevstr_c) == 0x388); + #endif /* D_KANKYO_D_KANKYO_H */ diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index a220eb1065..7a690fdcd7 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -757,7 +757,7 @@ private: class dSv_memory_c { public: - dSv_memory_c(void); + dSv_memory_c(void) { this->init(); } void init(void); dSv_memBit_c& getMemBit() { return mMemBit; } const dSv_memBit_c& getMemBitConst() const { return mMemBit; } @@ -767,9 +767,11 @@ private: u8 padding30[2]; }; +STATIC_ASSERT(sizeof(dSv_memory_c) == 0x20); + class dSv_memory2_c { public: - dSv_memory2_c(void); + dSv_memory2_c(void) { this->init(); } void init(void); void onVisitedRoom(int); void offVisitedRoom(int); @@ -779,6 +781,8 @@ private: u32 mVisitedRoom[2]; }; +STATIC_ASSERT(sizeof(dSv_memory2_c) == 8); + class dSv_danBit_c { public: bool init(s8); @@ -839,7 +843,7 @@ private: class dSv_zone_c { public: - dSv_zone_c(void); // the assembly for this is in d_com_inf_game.s + dSv_zone_c(void) { mRoomNo = -1; } // the assembly for this is in d_com_inf_game.s void init(int); dSv_zoneBit_c& getZoneBit() { return mBit; } const dSv_zoneBit_c& getZoneBitConst() const { return mBit; } @@ -855,6 +859,8 @@ private: dSv_zoneActor_c mActor; }; +STATIC_ASSERT(sizeof(dSv_zone_c) == 0x20); + class dSv_restart_c { public: void setRoom(const cXyz&, s16, s8); @@ -914,7 +920,7 @@ public: static const int STAGE_MAX = 32; static const int STAGE2_MAX = 64; -private: + // private: dSv_player_c mPlayer; dSv_memory_c mSave[STAGE_MAX]; dSv_memory2_c mSave2[STAGE2_MAX]; @@ -925,6 +931,8 @@ private: #pragma pack(push, 1) class dSv_info_c { public: + dSv_info_c() {} + ~dSv_info_c() {} void init(void); void getSave(int); void putSave(int); diff --git a/include/dolphin/mtx/vec.h b/include/dolphin/mtx/vec.h index 5e7a2e4541..05af4f6838 100644 --- a/include/dolphin/mtx/vec.h +++ b/include/dolphin/mtx/vec.h @@ -11,6 +11,11 @@ struct Vec { float getXDiff(const Vec* other) const { return x - other->x; } float getYDiff(const Vec* other) const { return y - other->y; } float getZDiff(const Vec* other) const { return z - other->z; } + void set(f32 pX, f32 pY, f32 pZ) { + x = pX; + y = pY; + z = pZ; + } }; extern "C" { diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index bd50209523..70816080dd 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -72,7 +72,7 @@ struct DOUBLE_POS { }; inline s32 fopAcM_GetRoomNo(const fopAc_ac_c* pActor) { - return pActor->mCurrent.mRoomNo; + return (s8)pActor->mCurrent.mRoomNo; } inline u32 fopAcM_GetID(const void* pActor) { diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index a3abb886cb..6b5ead7c7c 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -6,7 +6,7 @@ #include "JSystem/JKernel/JKRAssertHeap.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include "dolphin/types.h" +#include "global.h" struct J3DMaterialTable; struct J3DAnmTextureSRTKey { @@ -41,22 +41,19 @@ struct J3DAnmTransform { /* 80328E40 */ J3DAnmTransform(s16, f32*, s16*, f32*); }; -#pragma pack(push, 1) class mDoExt_baseAnm { public: + mDoExt_baseAnm() {} /* 8000D320 */ void initPlay(s16, int, f32, s16, s16); /* 8000D428 */ void play(); private: J3DFrameCtrl frame_control; }; -#pragma pack(pop) -#pragma pack(push, 1) class mDoExt_btkAnm { public: - mDoExt_btkAnm(void); - ~mDoExt_btkAnm(); + mDoExt_btkAnm(void) { field_0x14 = 0; } /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); @@ -64,13 +61,12 @@ private: mDoExt_baseAnm base_anm; u32 field_0x14; }; -#pragma pack(pop) -#pragma pack(push, 1) +STATIC_ASSERT(sizeof(mDoExt_btkAnm) == 0x18); + class mDoExt_brkAnm { public: - mDoExt_brkAnm(void); - ~mDoExt_brkAnm(); + mDoExt_brkAnm(void) { field_0x14 = 0; } /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -78,13 +74,12 @@ private: mDoExt_baseAnm mDoExt_baseAnm; u32 field_0x14; }; -#pragma pack(pop) -#pragma pack(push, 1) +STATIC_ASSERT(sizeof(mDoExt_brkAnm) == 0x18); + class mDoExt_bpkAnm { public: - mDoExt_bpkAnm(void); - ~mDoExt_bpkAnm(); + mDoExt_bpkAnm(void) { field_0x14 = 0; } /* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16); /* 8000D518 */ void entry(J3DMaterialTable*, f32); @@ -92,13 +87,12 @@ private: mDoExt_baseAnm mDoExt_baseAnm; u32 field_0x14; }; -#pragma pack(pop) -#pragma pack(push, 1) +STATIC_ASSERT(sizeof(mDoExt_bpkAnm) == 0x18); + class mDoExt_bckAnm { public: - mDoExt_bckAnm(void); - ~mDoExt_bckAnm(); + mDoExt_bckAnm(void) { field_0x18 = 0; } /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); /* 8000D9CC */ void entry(J3DModelData*, f32); @@ -109,15 +103,17 @@ private: u8 field_0x14[4]; u32 field_0x18; }; // Size = 0x1C -#pragma pack(pop) -#pragma pack(push, 1) +STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x1C); + +class J3DTransformInfo; + class mDoExt_McaMorfCallBack1_c { public: private: - void* vtable; + /*void* vtable;*/ + virtual void execute(u16, J3DTransformInfo*) = 0; }; -#pragma pack(pop) class mDoExt_AnmRatioPack { public: diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index 96d6732019..2c9bf52474 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -8,181 +8,26 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void Set__15cCcD_DivideInfoFUlUlUl(); -extern "C" void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo(); -extern "C" void SetArea__15cCcD_DivideAreaFRC8cM3dGAab(); -extern "C" void CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl(); -extern "C" void CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab(); -extern "C" bool GetGStts__9cCcD_SttsCFv(); -extern "C" bool GetGStts__9cCcD_SttsFv(); -extern "C" void Init__9cCcD_SttsFiiPvUi(); -extern "C" void Ct__9cCcD_SttsFv(); -extern "C" void PlusCcMove__9cCcD_SttsFfff(); -extern "C" void ClrCcMove__9cCcD_SttsFv(); -extern "C" void PlusDmg__9cCcD_SttsFi(); -extern "C" void GetWeightF__9cCcD_SttsCFv(); -extern "C" void ct__18cCcD_ObjCommonBaseFv(); -extern "C" void Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf(); -extern "C" void ct__8cCcD_ObjFv(); -extern "C" void Set__8cCcD_ObjFRC11cCcD_SrcObj(); -extern "C" void GetAc__8cCcD_ObjFv(); -extern "C" void getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape(); -extern "C" void CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz(); -extern "C" void CalcAabBox__12cCcD_TriAttrFv(); -extern "C" void GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz(); -extern "C" void CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf(); -extern "C" void CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf(); -extern "C" void CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf(); -extern "C" void CalcAabBox__12cCcD_CpsAttrFv(); -extern "C" void GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz(); -extern "C" void CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf(); -extern "C" void CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf(); -extern "C" void CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf(); -extern "C" void CalcAabBox__12cCcD_CylAttrFv(); -extern "C" void GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz(); -extern "C" void getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape(); -extern "C" void CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz(); -extern "C" void CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf(); -extern "C" void CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf(); -extern "C" void CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf(); -extern "C" void CalcAabBox__12cCcD_SphAttrFv(); -extern "C" void GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz(); -extern "C" void getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape(); -extern "C" void SetHit__10cCcD_ObjAtFP8cCcD_Obj(); -extern "C" void Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt(); -extern "C" void ClrHit__10cCcD_ObjAtFv(); -extern "C" void Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg(); -extern "C" void SetGrp__10cCcD_ObjTgFUl(); -extern "C" void ClrHit__10cCcD_ObjTgFv(); -extern "C" void SetHit__10cCcD_ObjTgFP8cCcD_Obj(); -extern "C" void SetHit__10cCcD_ObjCoFP8cCcD_Obj(); -extern "C" void ClrHit__10cCcD_ObjCoFv(); -extern "C" void SetIGrp__10cCcD_ObjCoFUl(); -extern "C" void SetVsGrp__10cCcD_ObjCoFUl(); -extern "C" void __dt__12cCcD_TriAttrFv(); -extern "C" bool CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz(); -extern "C" bool CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf(); -extern "C" void ClrAt__9cCcD_SttsFv(); -extern "C" void ClrTg__9cCcD_SttsFv(); -extern "C" void __sinit_c_cc_d_cpp(); -extern "C" static void func_80264A4C(); -extern "C" static void func_80264A54(); -extern "C" static void func_80264A5C(); -extern "C" static void func_80264A64(); -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" f32 m_virtual_center__14cCcD_ShapeAttr[3]; - -// -// External References: -// - -extern "C" void __dt__4cXyzFv(); -extern "C" void GetCoCP__12cCcD_CylAttrFv(); -extern "C" void GetCoCP__12cCcD_SphAttrFv(); -extern "C" void GetCoCP__12cCcD_SphAttrCFv(); -extern "C" bool CrossAtTg__12cCcD_SphAttrCFRC12cCcD_AabAttrP4cXyz(); -extern "C" bool CrossAtTg__12cCcD_SphAttrCFRC12cCcD_PntAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_SphAttrCFRC14cCcD_ShapeAttrP4cXyz(); -extern "C" bool CrossCo__12cCcD_SphAttrCFRC12cCcD_AabAttrPf(); -extern "C" bool CrossCo__12cCcD_SphAttrCFRC12cCcD_TriAttrPf(); -extern "C" bool CrossCo__12cCcD_SphAttrCFRC12cCcD_PntAttrPf(); -extern "C" void CrossCo__12cCcD_SphAttrCFRC14cCcD_ShapeAttrPf(); -extern "C" void GetCoCP__12cCcD_CylAttrCFv(); -extern "C" bool CrossAtTg__12cCcD_CylAttrCFRC12cCcD_AabAttrP4cXyz(); -extern "C" bool CrossAtTg__12cCcD_CylAttrCFRC12cCcD_PntAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CylAttrCFRC14cCcD_ShapeAttrP4cXyz(); -extern "C" bool CrossCo__12cCcD_CylAttrCFRC12cCcD_AabAttrPf(); -extern "C" bool CrossCo__12cCcD_CylAttrCFRC12cCcD_TriAttrPf(); -extern "C" bool CrossCo__12cCcD_CylAttrCFRC12cCcD_PntAttrPf(); -extern "C" void CrossCo__12cCcD_CylAttrCFRC14cCcD_ShapeAttrPf(); -extern "C" void GetCoCP__14cCcD_ShapeAttrFv(); -extern "C" void GetCoCP__14cCcD_ShapeAttrCFv(); -extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_AabAttrP4cXyz(); -extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_PntAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_TriAttrCFRC14cCcD_ShapeAttrP4cXyz(); -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_SphAttrPf(); -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_CylAttrPf(); -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_AabAttrPf(); -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_TriAttrPf(); -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_CpsAttrPf(); -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_PntAttrPf(); -extern "C" void CrossCo__12cCcD_TriAttrCFRC14cCcD_ShapeAttrPf(); -extern "C" bool CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_AabAttrP4cXyz(); -extern "C" bool CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_PntAttrP4cXyz(); -extern "C" void CrossAtTg__12cCcD_CpsAttrCFRC14cCcD_ShapeAttrP4cXyz(); -extern "C" bool CrossCo__12cCcD_CpsAttrCFRC12cCcD_AabAttrPf(); -extern "C" bool CrossCo__12cCcD_CpsAttrCFRC12cCcD_TriAttrPf(); -extern "C" bool CrossCo__12cCcD_CpsAttrCFRC12cCcD_PntAttrPf(); -extern "C" void CrossCo__12cCcD_CpsAttrCFRC14cCcD_ShapeAttrPf(); -extern "C" void __dt__12cCcD_CpsAttrFv(); -extern "C" void __dt__12cCcD_CylAttrFv(); -extern "C" void __dt__14cCcD_ShapeAttrFv(); -extern "C" void __dt__12cCcD_SphAttrFv(); -extern "C" void __dt__9cCcD_SttsFv(); -extern "C" void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf(); -extern "C" void cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf(); -extern "C" void cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec(); -extern "C" void cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf(); -extern "C" void cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec(); -extern "C" void cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec(); -extern "C" void cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec(); -extern "C" void cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec(); -extern "C" void cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec(); -extern "C" void cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec(); -extern "C" void Set__8cM3dGAabFPC4cXyzPC4cXyz(); -extern "C" void ClearForMinMax__8cM3dGAabFv(); -extern "C" void SetMinMax__8cM3dGAabFRC4cXyz(); -extern "C" void PlusR__8cM3dGAabFf(); -extern "C" void cross__8cM3dGCylCFPC8cM3dGSphP4cXyz(); -extern "C" void cross__8cM3dGCylCFPC8cM3dGCylP4cXyz(); -extern "C" void cross__8cM3dGSphCFPC8cM3dGSphP4cXyz(); -extern "C" void cross__8cM3dGSphCFPC8cM3dGCylP4cXyz(); -extern "C" void cross__8cM3dGTriCFPC8cM3dGCylP3Vec(); -extern "C" void __dl__FPv(); -extern "C" void __register_global_object(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__8cM3dGTri[3]; -extern "C" f32 Zero__4cXyz[3]; - // // Declarations: // +/* 80430CB4-80430CC0 05D9D4 000C+00 1/1 2/2 0/0 .bss m_virtual_center__14cCcD_ShapeAttr + */ +cXyz cCcD_ShapeAttr::m_virtual_center = cXyz::Zero; + /* 80263358-80263368 25DC98 0010+00 2/2 1/1 0/0 .text Set__15cCcD_DivideInfoFUlUlUl */ -void cCcD_DivideInfo::Set(u32 param_0, u32 param_1, u32 param_2) { - field_0x0 = param_0; - field_0x4 = param_1; - field_0x8 = param_2; +void cCcD_DivideInfo::Set(u32 xDivInfo, u32 yDivInfo, u32 zDivInfo) { + mXDivInfo = xDivInfo; + mYDivInfo = yDivInfo; + mZDivInfo = zDivInfo; } /* 80263368-802633A8 25DCA8 0040+00 0/0 5/5 0/0 .text Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo */ bool cCcD_DivideInfo::Chk(cCcD_DivideInfo const& param_0) const { - if ((field_0x0 & param_0.field_0x0) == 0 || (field_0x8 & param_0.field_0x8) == 0 || - (field_0x4 & param_0.field_0x4) == 0) { + if ((mXDivInfo & param_0.mXDivInfo) == 0 || (mZDivInfo & param_0.mZDivInfo) == 0 || + (mYDivInfo & param_0.mYDivInfo) == 0) { return false; } else { return true; @@ -345,12 +190,12 @@ cCcD_GStts* cCcD_Stts::GetGStts() { } /* 802638A4-80263904 25E1E4 0060+00 0/0 1/1 0/0 .text Init__9cCcD_SttsFiiPvUi */ -void cCcD_Stts::Init(int param_0, int param_1, void* param_2, unsigned int param_3) { +void cCcD_Stts::Init(int weight, int param_1, void* pActor, unsigned int apid) { this->Ct(); - mWeight = param_0; + mWeight = weight; field_0x15 = param_1; - mActor = static_cast(param_2); - mApid = param_3; + mActor = static_cast(pActor); + mApid = apid; } /* 80263904-80263934 25E244 0030+00 1/0 1/1 0/0 .text Ct__9cCcD_SttsFv */ @@ -927,256 +772,4 @@ void cCcD_ObjCo::SetIGrp(u32 grp) { void cCcD_ObjCo::SetVsGrp(u32 grp) { mSPrm &= ~0x70; mSPrm |= grp; -} - -/* ############################################################################################## */ -/* 803C3540-803C35A4 020660 0064+00 0/0 5/5 332/332 .data __vt__12cCcD_SphAttr */ -SECTION_DATA extern void* __vt__12cCcD_SphAttr[25] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12cCcD_SphAttrFv, - (void*)CrossAtTg__12cCcD_SphAttrCFRC14cCcD_ShapeAttrP4cXyz, - (void*)CrossAtTg__12cCcD_SphAttrCFRC12cCcD_PntAttrP4cXyz, - (void*)CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz, - (void*)CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz, - (void*)CrossAtTg__12cCcD_SphAttrCFRC12cCcD_AabAttrP4cXyz, - (void*)CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz, - (void*)CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz, - (void*)CrossCo__12cCcD_SphAttrCFRC14cCcD_ShapeAttrPf, - (void*)CrossCo__12cCcD_SphAttrCFRC12cCcD_PntAttrPf, - (void*)CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf, - (void*)CrossCo__12cCcD_SphAttrCFRC12cCcD_TriAttrPf, - (void*)CrossCo__12cCcD_SphAttrCFRC12cCcD_AabAttrPf, - (void*)CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf, - (void*)CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf, - (void*)GetCoCP__12cCcD_SphAttrCFv, - (void*)GetCoCP__12cCcD_SphAttrFv, - (void*)CalcAabBox__12cCcD_SphAttrFv, - (void*)GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz, - (void*)getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape, - (void*)NULL, - (void*)NULL, - (void*)func_80264A64, -}; - -/* 803C35A4-803C3608 0206C4 0064+00 0/0 9/9 448/448 .data __vt__12cCcD_CylAttr */ -SECTION_DATA extern void* __vt__12cCcD_CylAttr[25] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12cCcD_CylAttrFv, - (void*)CrossAtTg__12cCcD_CylAttrCFRC14cCcD_ShapeAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CylAttrCFRC12cCcD_PntAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CylAttrCFRC12cCcD_AabAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz, - (void*)CrossCo__12cCcD_CylAttrCFRC14cCcD_ShapeAttrPf, - (void*)CrossCo__12cCcD_CylAttrCFRC12cCcD_PntAttrPf, - (void*)CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf, - (void*)CrossCo__12cCcD_CylAttrCFRC12cCcD_TriAttrPf, - (void*)CrossCo__12cCcD_CylAttrCFRC12cCcD_AabAttrPf, - (void*)CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf, - (void*)CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf, - (void*)GetCoCP__12cCcD_CylAttrCFv, - (void*)GetCoCP__12cCcD_CylAttrFv, - (void*)CalcAabBox__12cCcD_CylAttrFv, - (void*)GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz, - (void*)getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape, - (void*)NULL, - (void*)NULL, - (void*)func_80264A5C, -}; - -/* 803C3608-803C366C 020728 0064+00 0/0 9/9 26/26 .data __vt__12cCcD_CpsAttr */ -SECTION_DATA extern void* __vt__12cCcD_CpsAttr[25] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12cCcD_CpsAttrFv, - (void*)CrossAtTg__12cCcD_CpsAttrCFRC14cCcD_ShapeAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_PntAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_AabAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz, - (void*)CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz, - (void*)CrossCo__12cCcD_CpsAttrCFRC14cCcD_ShapeAttrPf, - (void*)CrossCo__12cCcD_CpsAttrCFRC12cCcD_PntAttrPf, - (void*)CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf, - (void*)CrossCo__12cCcD_CpsAttrCFRC12cCcD_TriAttrPf, - (void*)CrossCo__12cCcD_CpsAttrCFRC12cCcD_AabAttrPf, - (void*)CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf, - (void*)CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf, - (void*)GetCoCP__14cCcD_ShapeAttrCFv, - (void*)GetCoCP__14cCcD_ShapeAttrFv, - (void*)CalcAabBox__12cCcD_CpsAttrFv, - (void*)GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz, - (void*)getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape, - (void*)NULL, - (void*)NULL, - (void*)func_80264A54, -}; - -/* 803C366C-803C36D0 02078C 0064+00 1/1 1/1 5/5 .data __vt__12cCcD_TriAttr */ -SECTION_DATA extern void* __vt__12cCcD_TriAttr[25] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12cCcD_TriAttrFv, - (void*)CrossAtTg__12cCcD_TriAttrCFRC14cCcD_ShapeAttrP4cXyz, - (void*)CrossAtTg__12cCcD_TriAttrCFRC12cCcD_PntAttrP4cXyz, - (void*)CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz, - (void*)CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz, - (void*)CrossAtTg__12cCcD_TriAttrCFRC12cCcD_AabAttrP4cXyz, - (void*)CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz, - (void*)CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz, - (void*)CrossCo__12cCcD_TriAttrCFRC14cCcD_ShapeAttrPf, - (void*)CrossCo__12cCcD_TriAttrCFRC12cCcD_PntAttrPf, - (void*)CrossCo__12cCcD_TriAttrCFRC12cCcD_CpsAttrPf, - (void*)CrossCo__12cCcD_TriAttrCFRC12cCcD_TriAttrPf, - (void*)CrossCo__12cCcD_TriAttrCFRC12cCcD_AabAttrPf, - (void*)CrossCo__12cCcD_TriAttrCFRC12cCcD_CylAttrPf, - (void*)CrossCo__12cCcD_TriAttrCFRC12cCcD_SphAttrPf, - (void*)GetCoCP__14cCcD_ShapeAttrCFv, - (void*)GetCoCP__14cCcD_ShapeAttrFv, - (void*)CalcAabBox__12cCcD_TriAttrFv, - (void*)GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz, - (void*)getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape, - (void*)NULL, - (void*)NULL, - (void*)func_80264A4C, -}; - -/* 803C36D0-803C3728 0207F0 0058+00 1/1 18/18 761/761 .data __vt__14cCcD_ShapeAttr */ -SECTION_DATA extern void* __vt__14cCcD_ShapeAttr[22] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14cCcD_ShapeAttrFv, - (void*)CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)GetCoCP__14cCcD_ShapeAttrCFv, - (void*)GetCoCP__14cCcD_ShapeAttrFv, - (void*)NULL, - (void*)NULL, - (void*)getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape, -}; - -/* 80264938-802649D8 25F278 00A0+00 2/1 0/0 0/0 .text __dt__12cCcD_TriAttrFv */ -#ifndef NM -cCcD_TriAttr::~cCcD_TriAttr() {} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_TriAttr::~cCcD_TriAttr() { - // extern "C" asm void __dt__12cCcD_TriAttrFv() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/__dt__12cCcD_TriAttrFv.s" -} -#pragma pop -#endif - -/* 802649D8-802649E0 25F318 0008+00 1/0 0/0 0/0 .text - * CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz */ -bool cCcD_ShapeAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { - return false; -} - -/* 802649E0-802649E8 25F320 0008+00 1/0 0/0 0/0 .text - * CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf */ -bool cCcD_ShapeAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { - return false; -} - -/* 802649E8-802649EC 25F328 0004+00 1/0 0/0 0/0 .text ClrAt__9cCcD_SttsFv */ -void cCcD_Stts::ClrAt() { - /* empty function */ -} - -/* 802649EC-802649F8 25F32C 000C+00 1/0 0/0 0/0 .text ClrTg__9cCcD_SttsFv */ -void cCcD_Stts::ClrTg() { - mTg = 0; -} - -/* ############################################################################################## */ -/* 80430CA8-80430CB4 05D9C8 000C+00 1/1 0/0 0/0 .bss @2414 */ -static u8 lit_2414[12]; - -/* 80430CB4-80430CC0 05D9D4 000C+00 1/1 2/2 0/0 .bss m_virtual_center__14cCcD_ShapeAttr - */ -f32 cCcD_ShapeAttr::m_virtual_center[3]; - -/* 802649F8-80264A4C 25F338 0054+00 0/0 1/0 0/0 .text __sinit_c_cc_d_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_c_cc_d_cpp() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/__sinit_c_cc_d_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x802649F8, __sinit_c_cc_d_cpp); -#pragma pop - -/* 80264A4C-80264A54 25F38C 0008+00 1/0 0/0 0/0 .text @32@__dt__12cCcD_TriAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80264A4C() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/func_80264A4C.s" -} -#pragma pop - -/* 80264A54-80264A5C 25F394 0008+00 1/0 0/0 0/0 .text @32@__dt__12cCcD_CpsAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80264A54() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/func_80264A54.s" -} -#pragma pop - -/* 80264A5C-80264A64 25F39C 0008+00 1/0 0/0 0/0 .text @32@__dt__12cCcD_CylAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80264A5C() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/func_80264A5C.s" -} -#pragma pop - -/* 80264A64-80264A6C 25F3A4 0008+00 1/0 0/0 0/0 .text @32@__dt__12cCcD_SphAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80264A64() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/func_80264A64.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803C3728-803C3748 020848 0020+00 0/0 9/9 611/611 .data __vt__9cCcD_Stts */ -SECTION_DATA extern void* __vt__9cCcD_Stts[8] = { - (void*)NULL /* RTTI */, (void*)NULL, - (void*)__dt__9cCcD_SttsFv, (void*)GetGStts__9cCcD_SttsCFv, - (void*)GetGStts__9cCcD_SttsFv, (void*)Ct__9cCcD_SttsFv, - (void*)ClrAt__9cCcD_SttsFv, (void*)ClrTg__9cCcD_SttsFv, -}; +} \ No newline at end of file diff --git a/libs/SSystem/SComponent/c_cc_s.cpp b/libs/SSystem/SComponent/c_cc_s.cpp index b95549e2b5..30a36b666c 100644 --- a/libs/SSystem/SComponent/c_cc_s.cpp +++ b/libs/SSystem/SComponent/c_cc_s.cpp @@ -7,106 +7,31 @@ #include "dol2asm.h" #include "global.h" -// -// Forward References: -// - -extern "C" void __ct__4cCcSFv(); -extern "C" void Ct__4cCcSFv(); -extern "C" void Dt__4cCcSFv(); -extern "C" void GetWt__4cCcSCFUc(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void ClrCoHitInf__4cCcSFv(); -extern "C" void ClrTgHitInf__4cCcSFv(); -extern "C" void ClrAtHitInf__4cCcSFv(); -extern "C" void ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj(); -extern "C" void ChkAtTg__4cCcSFv(); -extern "C" void ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj(); -extern "C" void ChkCo__4cCcSFv(); -extern "C" void CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts(); -extern "C" void SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz(); -extern "C" void SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf(); -extern "C" void SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf(); -extern "C" void CalcArea__4cCcSFv(); -extern "C" void Move__4cCcSFv(); -extern "C" void DrawClear__4cCcSFv(); -extern "C" void SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj(); -extern "C" void -SetCoGObjInf__4cCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts(); -extern "C" void -SetAtTgGObjInf__4cCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz(); -extern "C" bool ChkNoHitGAtTg__4cCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts(); -extern "C" bool -ChkAtTgHitAfterCross__4cCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts(); -extern "C" bool ChkNoHitGCo__4cCcSFP8cCcD_ObjP8cCcD_Obj(); -extern "C" void MoveAfterCheck__4cCcSFv(); - -// -// External References: -// - -extern "C" void __dt__4cXyzFv(); -extern "C" void __dt__4cCcSFv(); -extern "C" void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo(); -extern "C" void SetArea__15cCcD_DivideAreaFRC8cM3dGAab(); -extern "C" void CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl(); -extern "C" void PlusCcMove__9cCcD_SttsFfff(); -extern "C" void ClrCcMove__9cCcD_SttsFv(); -extern "C" void PlusDmg__9cCcD_SttsFi(); -extern "C" void GetWeightF__9cCcD_SttsCFv(); -extern "C" void GetAc__8cCcD_ObjFv(); -extern "C" void SetHit__10cCcD_ObjAtFP8cCcD_Obj(); -extern "C" void SetHit__10cCcD_ObjTgFP8cCcD_Obj(); -extern "C" void SetHit__10cCcD_ObjCoFP8cCcD_Obj(); -extern "C" void ClearForMinMax__8cM3dGAabFv(); -extern "C" void SetMinMax__8cM3dGAabFRC8cM3dGAab(); -extern "C" void CalcCenter__8cM3dGAabCFP4cXyz(); -extern "C" void __register_global_object(); -extern "C" void _savegpr_21(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_21(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__15cCcD_DivideArea[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern u8 data_80451158[8]; - // // Declarations: // -/* ############################################################################################## */ -/* 80451158-80451160 0008+00 s=0 e=1 z=0 None .sbss None */ -u8 data_80451158[8]; - /* 80264A6C-80264A94 25F3AC 0028+00 0/0 1/1 0/0 .text __ct__4cCcSFv */ cCcS::cCcS() {} /* 80264A94-80264B60 25F3D4 00CC+00 1/1 1/1 0/0 .text Ct__4cCcSFv */ void cCcS::Ct() { - for (cCcD_Obj** obj = this->mpObjAt; obj < this->mpObjAt + ARRAY_SIZE(this->mpObjAt); ++obj) { + for (cCcD_Obj** obj = mpObjAt; obj < mpObjAt + ARRAY_SIZE(mpObjAt); ++obj) { *obj = NULL; } - this->mObjAtCount = 0; - for (cCcD_Obj** obj = this->mpObjTg; obj < this->mpObjTg + ARRAY_SIZE(this->mpObjTg); ++obj) { + mObjAtCount = 0; + for (cCcD_Obj** obj = mpObjTg; obj < mpObjTg + ARRAY_SIZE(mpObjTg); ++obj) { *obj = NULL; } - this->mObjTgCount = 0; - for (cCcD_Obj** obj = this->mpObjCo; obj < this->mpObjCo + ARRAY_SIZE(this->mpObjCo); ++obj) { + mObjTgCount = 0; + for (cCcD_Obj** obj = mpObjCo; obj < mpObjCo + ARRAY_SIZE(mpObjCo); ++obj) { *obj = NULL; } - this->mObjCoCount = 0; - for (cCcD_Obj** obj = this->mpObj; obj < this->mpObj + ARRAY_SIZE(this->mpObj); ++obj) { + mObjCoCount = 0; + for (cCcD_Obj** obj = mpObj; obj < mpObj + ARRAY_SIZE(mpObj); ++obj) { *obj = NULL; } - this->mObjCount = 0; + mObjCount = 0; } /* 80264B60-80264B80 25F4A0 0020+00 0/0 1/1 0/0 .text Dt__4cCcSFv */ @@ -127,19 +52,19 @@ WeightType cCcS::GetWt(u8 param_0) const { /* 80264BA8-80264C5C 25F4E8 00B4+00 0/0 7/7 454/454 .text Set__4cCcSFP8cCcD_Obj */ void cCcS::Set(cCcD_Obj* obj) { - if (obj->GetObjAt().getSPrm() & 1) { + if (obj->ChkAtSet()) { if (mObjAtCount < ARRAY_SIZE(mpObjAt)) { mpObjAt[mObjAtCount] = obj; mObjAtCount++; } } - if (obj->GetObjTg().getSPrm() & 1) { + if (obj->ChkTgSet()) { if (mObjTgCount < ARRAY_SIZE(mpObjTg)) { mpObjTg[mObjTgCount] = obj; mObjTgCount++; } } - if (obj->GetObjCo().getSPrm() & 1) { + if (obj->ChkCoSet()) { if (mObjCoCount < ARRAY_SIZE(mpObjCo)) { mpObjCo[mObjCoCount] = obj; mObjCoCount++; @@ -191,166 +116,266 @@ void cCcS::ClrAtHitInf() { } /* 80264E2C-80264F40 25F76C 0114+00 1/1 0/0 0/0 .text ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj */ -#ifdef NON_MATCHING -int cCcS::ChkNoHitAtTg(cCcD_Obj* obj1, cCcD_Obj* obj2) { +bool cCcS::ChkNoHitAtTg(cCcD_Obj* obj1, cCcD_Obj* obj2) { fopAc_ac_c* ac1 = obj1->GetAc(); fopAc_ac_c* ac2 = obj2->GetAc(); - if (((ac1 != NULL && ac2 != NULL) && ac1 == ac2) || - (obj1->GetObjAt().getSPrm() & 0x1E & obj2->GetObjTg().getSPrm() & 0x1E) == 0 || - (obj1->GetObjAt().GetType() & obj2->GetObjTg().GetType()) == 0) { + if ((ac1 != NULL && ac2 != NULL && ac1 == ac2) || (obj1->GetAtGrp() & obj2->GetTgGrp()) == 0 || + (obj1->GetAtType() & obj2->GetTgType()) == 0) { return 1; } else { return this->ChkNoHitGAtTg(obj1->GetGObjInf(), obj2->GetGObjInf(), obj1->GetStts()->GetGStts(), obj2->GetStts()->GetGStts()); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int cCcS::ChkNoHitAtTg(cCcD_Obj* param_0, cCcD_Obj* param_1) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80430CC0-80430CCC 05D9E0 000C+00 1/1 0/0 0/0 .bss @2492 */ -static u8 lit_2492[12]; - -/* 80430CCC-80430CD8 05D9EC 000C+00 1/1 0/0 0/0 .bss cross$2491 */ -static u8 cross[12]; - -/* 80455038-8045503C 003638 0004+00 2/2 0/0 0/0 .sdata2 @2532 */ -SECTION_SDATA2 static u8 lit_2532[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; /* 80264F40-8026515C 25F880 021C+00 1/1 0/0 0/0 .text ChkAtTg__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::ChkAtTg() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/ChkAtTg__4cCcSFv.s" +void cCcS::ChkAtTg() { + cCcD_Obj** objTgEnd = mpObjTg + mObjTgCount; + this->ClrAtHitInf(); + this->ClrTgHitInf(); + for (cCcD_Obj** pObjAt = mpObjAt; pObjAt < mpObjAt + mObjAtCount; ++pObjAt) { + if (*pObjAt == NULL || !(*pObjAt)->ChkAtSet()) + continue; + cCcD_ShapeAttr* atShapeAttr = (*pObjAt)->GetShapeAttr(); + for (cCcD_Obj** pObjTg = mpObjTg; pObjTg < objTgEnd; ++pObjTg) { + if (*pObjTg == NULL || !(*pObjTg)->ChkTgSet()) + continue; + if (!(*pObjAt)->GetDivideInfo().Chk((*pObjTg)->GetDivideInfo())) + continue; + if (this->ChkNoHitAtTg(*pObjAt, *pObjTg)) + continue; + cCcD_ShapeAttr* tgShapeAttr = (*pObjTg)->GetShapeAttr(); + static cXyz cross; + bool didCross = atShapeAttr->CrossAtTg(*tgShapeAttr, &cross); + bool anyBsRevHit = (*pObjAt)->ChkBsRevHit() || (*pObjTg)->ChkBsRevHit(); + if (!anyBsRevHit && didCross) { + this->SetAtTgCommonHitInf(*pObjAt, *pObjTg, &cross); + } else if (anyBsRevHit && !didCross) { + cCcD_ShapeAttr* atShape2 = (*pObjAt)->GetShapeAttr(); + if (atShape2 == NULL) { + cross.set(0.0f, 0.0f, 0.0f); + } else { + atShape2->GetWorkAab().CalcCenter(&cross); + } + this->SetAtTgCommonHitInf(*pObjAt, *pObjTg, &cross); + } + } + } } -#pragma pop /* 8026515C-80265230 25FA9C 00D4+00 1/1 0/0 0/0 .text ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::ChkNoHitCo(cCcD_Obj* param_0, cCcD_Obj* param_1) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj.s" +bool cCcS::ChkNoHitCo(cCcD_Obj* obj1, cCcD_Obj* obj2) { + fopAc_ac_c* ac1 = obj1->GetAc(); + fopAc_ac_c* ac2 = obj2->GetAc(); + if (!(((ac1 == NULL || ac2 == NULL) || ac1 != ac2 || obj1->ChkCoSameActorHit() || + obj2->ChkCoSameActorHit()) && + (obj1->GetCoIGrp() & (obj2->GetCoVsGrp() >> 3)) && + ((obj1->GetCoVsGrp() >> 3) & obj2->GetCoIGrp() && !this->ChkNoHitGCo(obj1, obj2)))) { + return true; + } else { + return false; + } } -#pragma pop /* 80265230-802653A0 25FB70 0170+00 1/1 0/0 0/0 .text ChkCo__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::ChkCo() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/ChkCo__4cCcSFv.s" +void cCcS::ChkCo() { + this->ClrCoHitInf(); + if (mObjCoCount <= 1) + return; + cCcD_Obj** objCoEnd = this->mpObjCo + this->mObjCoCount; + for (cCcD_Obj** objCo1 = this->mpObjCo; objCo1 < objCoEnd - 1; ++objCo1) { + if (*objCo1 == NULL || !(*objCo1)->ChkCoSet()) + continue; + cCcD_ShapeAttr* co1ShapeAttr = (*objCo1)->GetShapeAttr(); + for (cCcD_Obj** objCo2 = objCo1 + 1; objCo2 < objCoEnd; ++objCo2) { + if (*objCo2 == NULL || !(*objCo2)->ChkCoSet()) + continue; + if (!(*objCo1)->GetDivideInfo().Chk((*objCo2)->GetDivideInfo())) + continue; + if (this->ChkNoHitCo(*objCo1, *objCo2)) + continue; + cCcD_ShapeAttr* co2ShapeAttr = (*objCo2)->GetShapeAttr(); + f32 crossLen; + if (co1ShapeAttr->CrossCo(*co2ShapeAttr, &crossLen)) { + cXyz& obj2CoCP = co2ShapeAttr->GetCoCP(); + cXyz& obj1CoCP = co1ShapeAttr->GetCoCP(); + this->SetCoCommonHitInf(*objCo1, &obj1CoCP, *objCo2, &obj2CoCP, crossLen); + } + } + } } -#pragma pop /* 802653A0-802653C8 25FCE0 0028+00 1/0 0/0 0/0 .text * CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::CalcTgPlusDmg(cCcD_Obj* param_0, cCcD_Obj* param_1, cCcD_Stts* param_2, - cCcD_Stts* param_3) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts.s" +void cCcS::CalcTgPlusDmg(cCcD_Obj* obj1, cCcD_Obj* obj2, cCcD_Stts* stts1, cCcD_Stts* stts2) { + stts2->PlusDmg(obj1->GetAtAtp()); } -#pragma pop /* 802653C8-802655E4 25FD08 021C+00 1/1 0/0 0/0 .text * SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::SetAtTgCommonHitInf(cCcD_Obj* param_0, cCcD_Obj* param_1, cXyz* param_2) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz.s" +void cCcS::SetAtTgCommonHitInf(cCcD_Obj* obj1, cCcD_Obj* obj2, cXyz* pXyz) { + cCcD_Stts* obj1Stts = obj1->GetStts(); + cCcD_Stts* obj2Stts = obj2->GetStts(); + if (!this->ChkAtTgHitAfterCross(!obj2->ChkTgNoAtHitInfSet(), !obj1->ChkAtNoTgHitInfSet(), + obj1->GetGObjInf(), obj2->GetGObjInf(), obj1Stts, obj2Stts, + obj1Stts->GetGStts(), obj2Stts->GetGStts())) { + if (!obj2->ChkTgNoAtHitInfSet()) { + obj1->SetAtHit(obj2); + } + bool tmp = !(obj1->ChkAtNoTgHitInfSet() || + (obj1->ChkAtType(0x80) && obj2->ChkTgNoSlingHitInfSet())); + if (tmp) { + obj2->SetTgHit(obj1); + this->CalcTgPlusDmg(obj1, obj2, obj1Stts, obj2Stts); + } + this->SetAtTgGObjInf(!obj2->ChkTgNoAtHitInfSet(), tmp, obj1, obj2, obj1->GetGObjInf(), + obj2->GetGObjInf(), obj1Stts, obj2Stts, obj1Stts->GetGStts(), + obj2Stts->GetGStts(), pXyz); + } } -#pragma pop /* 802655E4-80265750 25FF24 016C+00 1/1 0/0 0/0 .text * SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::SetCoCommonHitInf(cCcD_Obj* param_0, cXyz* param_1, cCcD_Obj* param_2, cXyz* param_3, - f32 param_4) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s" +void cCcS::SetCoCommonHitInf(cCcD_Obj* obj1, cXyz* xyz1, cCcD_Obj* obj2, cXyz* xyz2, f32 crossLen) { + bool obj2CoHitInfSet = !obj2->ChkCoNoCoHitInfSet(); + bool obj1CoHitInfSet = !obj1->ChkCoNoCoHitInfSet(); + if (obj2CoHitInfSet) { + obj1->SetCoHit(obj2); + } + if (obj1CoHitInfSet) { + obj2->SetCoHit(obj1); + } + if (obj2CoHitInfSet && obj1CoHitInfSet) { + this->SetPosCorrect(obj1, xyz1, obj2, xyz2, crossLen); + } + cCcD_Stts* obj1Stts = obj1->GetStts(); + cCcD_Stts* obj2Stts = obj2->GetStts(); + this->SetCoGObjInf(obj2CoHitInfSet, obj1CoHitInfSet, obj1->GetGObjInf(), obj2->GetGObjInf(), + obj1Stts, obj2Stts, obj1Stts->GetGStts(), obj2Stts->GetGStts()); } -#pragma pop - -/* ############################################################################################## */ -/* 8045503C-80455040 00363C 0004+00 1/1 0/0 0/0 .sdata2 @2759 */ -SECTION_SDATA2 static f32 lit_2759 = 1.0f / 125.0f; - -/* 80455040-80455044 003640 0004+00 1/1 0/0 0/0 .sdata2 @2760 */ -SECTION_SDATA2 static f32 lit_2760 = 1.0f; - -/* 80455044-80455048 003644 0004+00 1/1 0/0 0/0 .sdata2 @2761 */ -SECTION_SDATA2 static f32 lit_2761 = 2.0f; - -/* 80455048-80455050 003648 0004+04 1/1 0/1 0/0 .sdata2 @2762 */ -SECTION_SDATA2 static f32 lit_2762[1 + 1 /* padding */] = { - 0.5f, - /* padding */ - 0.0f, -}; - -/* 80455050-80455058 003650 0008+00 1/1 0/0 0/0 .sdata2 @2763 */ -SECTION_SDATA2 static f64 lit_2763 = 0.5; - -/* 80455058-80455060 003658 0008+00 1/1 0/0 0/0 .sdata2 @2764 */ -SECTION_SDATA2 static f64 lit_2764 = 3.0; - -/* 80455060-80455068 003660 0008+00 1/1 0/0 0/0 .sdata2 @2765 */ -SECTION_SDATA2 static u8 lit_2765[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80455068-80455070 003668 0004+04 1/1 0/0 0/0 .sdata2 @2766 */ -SECTION_SDATA2 static f32 lit_2766[1 + 1 /* padding */] = { - -1.0f, - /* padding */ - 0.0f, -}; /* 80265750-80265BB4 260090 0464+00 1/0 0/0 0/0 .text * SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::SetPosCorrect(cCcD_Obj* param_0, cXyz* param_1, cCcD_Obj* param_2, cXyz* param_3, - f32 param_4) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf.s" +void cCcS::SetPosCorrect(cCcD_Obj* obj1, cXyz* xyz1, cCcD_Obj* obj2, cXyz* xyz2, f32 crossLen) { + if (obj1->ChkCoNoCrr() || obj2->ChkCoNoCrr()) + return; + if (obj1->GetStts() == NULL || obj2->GetStts() == NULL) + return; + if (obj1->GetStts()->GetAc() != NULL && obj1->GetStts()->GetAc() == obj2->GetStts()->GetAc()) + return; + if (!(fabsf(crossLen) < (1.0f / 125.0f))) { + this->SetCoGCorrectProc(obj1, obj2); + bool bothCoSph3DCrr = obj1->ChkCoSph3DCrr() && obj2->ChkCoSph3DCrr(); + WeightType obj1WeightType = this->GetWt(obj1->GetStts()->GetWeightUc()); + WeightType obj2WeightType = this->GetWt(obj2->GetStts()->GetWeightUc()); + f32 obj1SrcWeight = obj1->GetStts()->GetWeightF(); + f32 obj2SrcWeight = obj2->GetStts()->GetWeightF(); + f32 combinedWeight = obj1SrcWeight + obj2SrcWeight; + + f32 obj2Weight, obj1Weight; + if (cM3d_IsZero(combinedWeight)) { + obj1SrcWeight = 1; + obj2SrcWeight = 1; + combinedWeight = 2; + } + f32 invCombinedWeight = 1 / combinedWeight; + if (obj1WeightType == WeightType_0) { + if (obj2WeightType == WeightType_0) { + return; + } else { + obj2Weight = 0; + obj1Weight = 1; + } + } else if (obj1WeightType == WeightType_1) { + if (obj2WeightType == WeightType_0) { + obj2Weight = 1; + obj1Weight = 0; + } else if (obj2WeightType == WeightType_1) { + obj2Weight = 0.5; + obj1Weight = 0.5; + } else { + obj2Weight = 0; + obj1Weight = 1; + } + } else { + if (obj2WeightType == WeightType_2) { + obj2Weight = obj2SrcWeight * invCombinedWeight; + obj1Weight = obj1SrcWeight * invCombinedWeight; + } else { + obj2Weight = 1; + obj1Weight = 0; + } + } + f32 objDistLen; + Vec obj1Move; + Vec obj2Move; + Vec objsDist; + if (bothCoSph3DCrr) { + PSVECSubtract(xyz2, xyz1, &objsDist); + objDistLen = PSVECMag(&objsDist); + } else { + objsDist.x = xyz2->x - xyz1->x; + objsDist.y = 0; + objsDist.z = xyz2->z - xyz1->z; + objDistLen = sqrtf(objsDist.x * objsDist.x + objsDist.z * objsDist.z); + } + if (!cM3d_IsZero(objDistLen)) { + if (bothCoSph3DCrr) { + PSVECScale(&objsDist, &objsDist, crossLen / objDistLen); + obj2Weight *= -1; + PSVECScale(&objsDist, &obj1Move, obj2Weight); + PSVECScale(&objsDist, &obj2Move, obj1Weight); + } else { + f32 pushFactor = crossLen / objDistLen; + objsDist.x *= pushFactor; + objsDist.z *= pushFactor; + obj1Move.x = -objsDist.x * obj2Weight; + obj1Move.y = 0; + obj1Move.z = -objsDist.z * obj2Weight; + obj2Move.x = objsDist.x * obj1Weight; + obj2Move.y = 0; + obj2Move.z = objsDist.z * obj1Weight; + } + } else { + obj1Move.y = 0; + obj1Move.z = 0; + obj2Move.y = 0; + obj2Move.z = 0; + if (!cM3d_IsZero(crossLen)) { + obj1Move.x = -crossLen * obj2Weight; + obj2Move.x = crossLen * obj1Weight; + } else { + obj1Move.x = -obj2Weight; + obj2Move.x = obj1Weight; + } + } + obj1->GetStts()->PlusCcMove(obj1Move.x, obj1Move.y, obj1Move.z); + obj2->GetStts()->PlusCcMove(obj2Move.x, obj2Move.y, obj2Move.z); + PSVECAdd(xyz1, &obj1Move, xyz1); + PSVECAdd(xyz2, &obj2Move, xyz2); + } } -#pragma pop /* 80265BB4-80265CCC 2604F4 0118+00 1/1 0/0 0/0 .text CalcArea__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::CalcArea() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/CalcArea__4cCcSFv.s" +void cCcS::CalcArea() { + cM3dGAab aab; + aab.ClearForMinMax(); + for (cCcD_Obj** pObj = mpObj; pObj < mpObj + mObjCount; ++pObj) { + if (*pObj != NULL) { + cCcD_ShapeAttr* objShape = (*pObj)->GetShapeAttr(); + objShape->CalcAabBox(); + aab.SetMinMax(objShape->GetWorkAab()); + } + } + mDivideArea.SetArea(aab); + for (cCcD_Obj** pObj = mpObj; pObj < mpObj + mObjCount; ++pObj) { + if (*pObj != NULL) { + const cCcD_ShapeAttr* objShape = (*pObj)->GetShapeAttr(); + cCcD_DivideInfo* divideInfo = &(*pObj)->GetDivideInfo(); + mDivideArea.CalcDivideInfo(divideInfo, objShape->GetWorkAab(), (*pObj)->ChkBsRevHit()); + } + } } -#pragma pop /* 80265CCC-80265D30 26060C 0064+00 0/0 1/1 0/0 .text Move__4cCcSFv */ void cCcS::Move() { @@ -365,14 +390,24 @@ void cCcS::Move() { } /* 80265D30-80265DF4 260670 00C4+00 0/0 1/1 0/0 .text DrawClear__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::DrawClear() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/DrawClear__4cCcSFv.s" +void cCcS::DrawClear() { + for (cCcD_Obj** obj = this->mpObjAt; obj < this->mpObjAt + this->mObjAtCount; ++obj) { + *obj = NULL; + } + this->mObjAtCount = 0; + for (cCcD_Obj** obj = this->mpObjTg; obj < this->mpObjTg + this->mObjTgCount; ++obj) { + *obj = NULL; + } + this->mObjTgCount = 0; + for (cCcD_Obj** obj = this->mpObjCo; obj < this->mpObjCo + this->mObjCoCount; ++obj) { + *obj = NULL; + } + this->mObjCoCount = 0; + for (cCcD_Obj** obj = this->mpObj; obj < this->mpObj + this->mObjCount; ++obj) { + *obj = NULL; + } + this->mObjCount = 0; } -#pragma pop /* 80265DF4-80265DF8 260734 0004+00 1/0 1/0 0/0 .text * SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj */ diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index bbb91d187d..b29bffa711 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -34787,7 +34787,8 @@ asm daPy_sightPacket_c::~daPy_sightPacket_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daPy_frameCtrl_c::~daPy_frameCtrl_c() { +// asm daPy_frameCtrl_c::~daPy_frameCtrl_c() { +extern "C" asm void __dt__16daPy_frameCtrl_cFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__16daPy_frameCtrl_cFv.s" } @@ -34797,7 +34798,8 @@ asm daPy_frameCtrl_c::~daPy_frameCtrl_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daPy_frameCtrl_c::daPy_frameCtrl_c() { +// asm daPy_frameCtrl_c::daPy_frameCtrl_c() { +extern "C" asm void __ct__16daPy_frameCtrl_cFv() { nofralloc #include "asm/d/a/d_a_alink/__ct__16daPy_frameCtrl_cFv.s" } @@ -34867,7 +34869,8 @@ asm dBgS_LinkAcch::~dBgS_LinkAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cps::dCcD_Cps() { +// asm dCcD_Cps::dCcD_Cps() { +extern "C" asm void __ct__8dCcD_CpsFv() { nofralloc #include "asm/d/a/d_a_alink/__ct__8dCcD_CpsFv.s" } @@ -34877,7 +34880,8 @@ asm dCcD_Cps::dCcD_Cps() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/d/a/d_a_alink/__ct__8dCcD_CylFv.s" } @@ -34975,7 +34979,8 @@ asm void dEvt_info_c::onCondition(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::cM3dGPla() { +// asm cM3dGPla::cM3dGPla() { +extern "C" asm void __ct__8cM3dGPlaFv() { nofralloc #include "asm/d/a/d_a_alink/__ct__8cM3dGPlaFv.s" } diff --git a/src/d/cc/d_cc_d.cpp b/src/d/cc/d_cc_d.cpp index e2857618e5..b270b5dad5 100644 --- a/src/d/cc/d_cc_d.cpp +++ b/src/d/cc/d_cc_d.cpp @@ -3,10 +3,317 @@ // Translation Unit: d/cc/d_cc_d // -#include "d/cc/d_cc_d.h" +// #include "d/cc/d_cc_d.h" #include "dol2asm.h" #include "dolphin/types.h" +// +// Types: +// + +struct fopAc_ac_c {}; + +struct dCcD_SrcTri {}; + +struct dCcD_Tri { + /* 80084884 */ void Set(dCcD_SrcTri const&); + /* 800848A4 */ void GetShapeAttr(); + /* 80084EF4 */ ~dCcD_Tri(); +}; + +struct dCcD_Stts { + /* 80083850 */ void GetGStts(); + /* 80083860 */ void Init(int, int, fopAc_ac_c*); + /* 800838F4 */ void Ct(); + /* 80083928 */ void ClrAt(); + /* 80083934 */ void ClrTg(); + /* 800851AC */ ~dCcD_Stts(); +}; + +struct dCcD_SrcSph {}; + +struct dCcD_SrcGObjTg {}; + +struct dCcD_SrcGObjInf {}; + +struct dCcD_SrcGObjAt {}; + +struct dCcD_SrcGAtTgCoCommonBase {}; + +struct dCcD_SrcCyl {}; + +struct dCcD_SrcCps {}; + +struct Vec {}; + +struct cXyz { + /* 80266B34 */ void operator-(Vec const&) const; + + static f32 Zero[3]; +}; + +struct dCcD_Sph { + /* 80084A34 */ void Set(dCcD_SrcSph const&); + /* 80084A78 */ void StartCAt(cXyz&); + /* 80084AC4 */ void MoveCAt(cXyz&); + /* 80084B34 */ void GetShapeAttr(); + /* 80084BF4 */ ~dCcD_Sph(); +}; + +struct dCcD_GStts { + /* 80083760 */ dCcD_GStts(); + /* 800837F8 */ void Ct(); + /* 80083830 */ void Move(); + /* 8008523C */ ~dCcD_GStts(); +}; + +struct dCcD_GObjTg { + /* 800839A0 */ void Set(dCcD_SrcGObjTg const&); + /* 80083BE8 */ ~dCcD_GObjTg(); +}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); + /* 80084268 */ void GetGObjInf(); + /* 8008426C */ void ClrAtHit(); + /* 800842C0 */ void ChkAtHit(); + /* 80084318 */ void ResetAtHit(); + /* 80084358 */ void GetAtHitObj(); + /* 800843A8 */ void GetAtHitGObj(); + /* 800843DC */ void ChkAtNoGuard(); + /* 800843FC */ void ClrTgHit(); + /* 80084460 */ void ChkTgHit(); + /* 800844B8 */ void ResetTgHit(); + /* 800844F8 */ void GetTgHitObj(); + /* 80084548 */ void GetTgHitGObj(); + /* 8008457C */ void GetTgHitObjSe(); + /* 800845B0 */ void getHitSeID(u8, int); + /* 8008460C */ void ClrCoHit(); + /* 80084658 */ void ChkCoHit(); + /* 800846B0 */ void ResetCoHit(); + /* 800846F0 */ void GetCoHitObj(); + /* 80084740 */ void Set(dCcD_SrcGObjInf const&); + + static u8 const m_hitSeID[96]; +}; + +struct dCcD_GObjCo { + /* 80083B8C */ ~dCcD_GObjCo(); +}; + +struct dCcD_GObjAt { + /* 80083944 */ void Set(dCcD_SrcGObjAt const&); + /* 80083C44 */ ~dCcD_GObjAt(); +}; + +struct dCcD_GAtTgCoCommonBase { + /* 8008364C */ void ClrActorInfo(); + /* 80083660 */ void ct(); + /* 80083678 */ void SetHitApid(unsigned int); + /* 80083688 */ void GetAc(); + /* 80083704 */ void Set(dCcD_SrcGAtTgCoCommonBase const&); + /* 80083718 */ void SetEffCounterTimer(); + /* 80083724 */ void SubtractEffCounter(); + /* 80083748 */ void ChkEffCounter(); + /* 80083CA0 */ ~dCcD_GAtTgCoCommonBase(); +}; + +struct dCcD_Cyl { + /* 800848B4 */ void Set(dCcD_SrcCyl const&); + /* 800848F8 */ void GetShapeAttr(); + /* 80084908 */ void StartCAt(cXyz&); + /* 80084954 */ void MoveCAt(cXyz&); + /* 800849C4 */ void MoveCTg(cXyz&); + /* 80084D60 */ ~dCcD_Cyl(); +}; + +struct dCcD_Cps { + /* 800847D0 */ void Set(dCcD_SrcCps const&); + /* 80084814 */ void GetShapeAttr(); + /* 80084824 */ void CalcAtVec(); + /* 80084854 */ void CalcTgVec(); + /* 8008506C */ ~dCcD_Cps(); +}; + +struct cM3dGSphS {}; + +struct cM3dGSph { + /* 8026F648 */ void SetC(cXyz const&); + /* 8026F6A8 */ void Set(cM3dGSphS const&); +}; + +struct cM3dGCylS {}; + +struct cM3dGCyl { + /* 8026F114 */ void Set(cM3dGCylS const&); + /* 8026F1DC */ void SetC(cXyz const&); +}; + +struct cM3dGCpsS {}; + +struct cM3dGCps { + /* 8026EFA4 */ ~cM3dGCps(); + /* 8026F03C */ void Set(cM3dGCpsS const&); +}; + +struct cCcD_ShapeAttr { + struct Shape {}; + + /* 80084E38 */ void GetCoCP() const; + /* 80084E2C */ void GetCoCP(); + /* 80263A64 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; + + static f32 m_virtual_center[3]; +}; + +struct cCcD_TriAttr; +struct cCcD_PntAttr {}; + +struct cCcD_AabAttr {}; + +struct cCcD_SphAttr; +struct cCcD_CpsAttr; +struct cCcD_CylAttr { + /* 80084CC0 */ void GetCoCP() const; + /* 80037A4C */ void GetCoCP(); + /* 8026420C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; + /* 80084CC8 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; + /* 802641C8 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 80084CD0 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; + /* 80264250 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80084CD8 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 8026417C */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; + /* 80264288 */ void CrossCo(cCcD_CylAttr const&, f32*) const; + /* 80084D10 */ bool CrossCo(cCcD_AabAttr const&, f32*) const; + /* 80264310 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; + /* 80084D18 */ bool CrossCo(cCcD_TriAttr const&, f32*) const; + /* 80084D20 */ bool CrossCo(cCcD_PntAttr const&, f32*) const; + /* 80084D28 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 802642CC */ void CrossCo(cCcD_SphAttr const&, f32*) const; + /* 80264368 */ void CalcAabBox(); + /* 802643D0 */ void GetNVec(cXyz const&, cXyz*) const; + /* 802644B8 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; +}; + +struct cCcD_CpsAttr { + /* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; + /* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; + /* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; + /* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; + /* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const; + /* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const; + /* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const; + /* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const; + /* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; + /* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const; + /* 80263FC4 */ void CalcAabBox(); + /* 80264014 */ void GetNVec(cXyz const&, cXyz*) const; +}; + +struct cCcD_SphAttr { + /* 80084B44 */ void GetCoCP() const; + /* 80037A54 */ void GetCoCP(); + /* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; + /* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; + /* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; + /* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; + /* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; + /* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const; + /* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const; + /* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const; + /* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const; + /* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const; + /* 802646E0 */ void CalcAabBox(); + /* 8026476C */ void GetNVec(cXyz const&, cXyz*) const; + /* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; +}; + +struct cCcD_TriAttr { + /* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; + /* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; + /* 80084E4C */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; + /* 80263BCC */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80263B90 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; + /* 80084E54 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 80263B58 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 80084EBC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 80084EA4 */ bool CrossCo(cCcD_TriAttr const&, f32*) const; + /* 80084E8C */ bool CrossCo(cCcD_SphAttr const&, f32*) const; + /* 80084EAC */ bool CrossCo(cCcD_CpsAttr const&, f32*) const; + /* 80084E94 */ bool CrossCo(cCcD_CylAttr const&, f32*) const; + /* 80084EB4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const; + /* 80084E9C */ bool CrossCo(cCcD_AabAttr const&, f32*) const; + /* 80263C04 */ void CalcAabBox(); + /* 80263C9C */ void GetNVec(cXyz const&, cXyz*) const; +}; + +struct cCcD_Stts { + /* 80263894 */ bool GetGStts() const; + /* 802638A4 */ void Init(int, int, void*, unsigned int); + /* 80263904 */ void Ct(); +}; + +struct cCcD_SrcObj {}; + +struct cCcD_ObjTg { + /* 80083FE4 */ ~cCcD_ObjTg(); + /* 802648B0 */ void ClrHit(); +}; + +struct cCcD_ObjHitInf { + /* 80083EC8 */ ~cCcD_ObjHitInf(); +}; + +struct cCcD_ObjCommonBase { + /* 8008409C */ ~cCcD_ObjCommonBase(); + /* 802639B0 */ void ct(); +}; + +struct cCcD_ObjCo { + /* 80083F88 */ ~cCcD_ObjCo(); + /* 802648E8 */ void ClrHit(); +}; + +struct cCcD_ObjAt { + /* 80084040 */ ~cCcD_ObjAt(); + /* 80264868 */ void ClrHit(); +}; + +struct _GXColor {}; + +struct cCcD_Obj { + /* 80083DE0 */ ~cCcD_Obj(); + /* 800851A4 */ bool GetGObjInf() const; + /* 800847C8 */ bool GetGObjInf(); + /* 80084BE8 */ bool GetShapeAttr() const; + /* 80085130 */ bool GetShapeAttr(); + /* 80084BF0 */ void Draw(_GXColor const&); + /* 80263A10 */ void ct(); + /* 80263A1C */ void Set(cCcD_SrcObj const&); +}; + +struct cCcD_GStts { + /* 800837B0 */ ~cCcD_GStts(); +}; + +struct cCcD_GObjInf { + /* 80083CE8 */ ~cCcD_GObjInf(); + /* 800851A0 */ void GetGObjInf(); + /* 80084BE4 */ void GetGObjInf() const; + /* 80085138 */ void ClrAtHit(); + /* 80085158 */ void ClrTgHit(); + /* 8008517C */ void ClrCoHit(); +}; + // // Forward References: // @@ -201,6 +508,7 @@ extern "C" void SetC__8cM3dGCylFRC4cXyz(); extern "C" void SetC__8cM3dGSphFRC4cXyz(); extern "C" void Set__8cM3dGSphFRC9cM3dGSphS(); extern "C" void __dl__FPv(); +extern "C" void PSVECSubtract(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__8cM3dGPla[3]; @@ -640,7 +948,7 @@ asm void dCcD_GStts::Move() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts* dCcD_Stts::GetGStts() { +asm void dCcD_Stts::GetGStts() { nofralloc #include "asm/d/cc/d_cc_d/GetGStts__9dCcD_SttsFv.s" } @@ -710,8 +1018,7 @@ asm void dCcD_GObjTg::Set(dCcD_SrcGObjTg const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_GObjInf::dCcD_GObjInf() { -extern "C" asm void __ct__12dCcD_GObjInfFv() { +asm dCcD_GObjInf::dCcD_GObjInf() { nofralloc #include "asm/d/cc/d_cc_d/__ct__12dCcD_GObjInfFv.s" } @@ -721,8 +1028,7 @@ extern "C" asm void __ct__12dCcD_GObjInfFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_GObjCo::~dCcD_GObjCo() { -extern "C" asm void __dt__11dCcD_GObjCoFv() { +asm dCcD_GObjCo::~dCcD_GObjCo() { nofralloc #include "asm/d/cc/d_cc_d/__dt__11dCcD_GObjCoFv.s" } @@ -732,8 +1038,7 @@ extern "C" asm void __dt__11dCcD_GObjCoFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_GObjTg::~dCcD_GObjTg() { -extern "C" asm void __dt__11dCcD_GObjTgFv() { +asm dCcD_GObjTg::~dCcD_GObjTg() { nofralloc #include "asm/d/cc/d_cc_d/__dt__11dCcD_GObjTgFv.s" } @@ -743,8 +1048,7 @@ extern "C" asm void __dt__11dCcD_GObjTgFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_GObjAt::~dCcD_GObjAt() { -extern "C" asm void __dt__11dCcD_GObjAtFv() { +asm dCcD_GObjAt::~dCcD_GObjAt() { nofralloc #include "asm/d/cc/d_cc_d/__dt__11dCcD_GObjAtFv.s" } @@ -754,8 +1058,7 @@ extern "C" asm void __dt__11dCcD_GObjAtFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_GAtTgCoCommonBase::~dCcD_GAtTgCoCommonBase() { -extern "C" asm void __dt__22dCcD_GAtTgCoCommonBaseFv() { +asm dCcD_GAtTgCoCommonBase::~dCcD_GAtTgCoCommonBase() { nofralloc #include "asm/d/cc/d_cc_d/__dt__22dCcD_GAtTgCoCommonBaseFv.s" } @@ -765,8 +1068,7 @@ extern "C" asm void __dt__22dCcD_GAtTgCoCommonBaseFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_GObjInf::~cCcD_GObjInf() { -extern "C" asm void __dt__12cCcD_GObjInfFv() { +asm cCcD_GObjInf::~cCcD_GObjInf() { nofralloc #include "asm/d/cc/d_cc_d/__dt__12cCcD_GObjInfFv.s" } @@ -776,8 +1078,7 @@ extern "C" asm void __dt__12cCcD_GObjInfFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_Obj::~cCcD_Obj() { -extern "C" asm void __dt__8cCcD_ObjFv() { +asm cCcD_Obj::~cCcD_Obj() { nofralloc #include "asm/d/cc/d_cc_d/__dt__8cCcD_ObjFv.s" } @@ -787,8 +1088,7 @@ extern "C" asm void __dt__8cCcD_ObjFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_ObjHitInf::~cCcD_ObjHitInf() { -extern "C" asm void __dt__14cCcD_ObjHitInfFv() { +asm cCcD_ObjHitInf::~cCcD_ObjHitInf() { nofralloc #include "asm/d/cc/d_cc_d/__dt__14cCcD_ObjHitInfFv.s" } @@ -798,8 +1098,7 @@ extern "C" asm void __dt__14cCcD_ObjHitInfFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_ObjCo::~cCcD_ObjCo() { -extern "C" asm void __dt__10cCcD_ObjCoFv() { +asm cCcD_ObjCo::~cCcD_ObjCo() { nofralloc #include "asm/d/cc/d_cc_d/__dt__10cCcD_ObjCoFv.s" } @@ -809,8 +1108,7 @@ extern "C" asm void __dt__10cCcD_ObjCoFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_ObjTg::~cCcD_ObjTg() { -extern "C" asm void __dt__10cCcD_ObjTgFv() { +asm cCcD_ObjTg::~cCcD_ObjTg() { nofralloc #include "asm/d/cc/d_cc_d/__dt__10cCcD_ObjTgFv.s" } @@ -820,8 +1118,7 @@ extern "C" asm void __dt__10cCcD_ObjTgFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_ObjAt::~cCcD_ObjAt() { -extern "C" asm void __dt__10cCcD_ObjAtFv() { +asm cCcD_ObjAt::~cCcD_ObjAt() { nofralloc #include "asm/d/cc/d_cc_d/__dt__10cCcD_ObjAtFv.s" } @@ -831,8 +1128,7 @@ extern "C" asm void __dt__10cCcD_ObjAtFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_ObjCommonBase::~cCcD_ObjCommonBase() { -extern "C" asm void __dt__18cCcD_ObjCommonBaseFv() { +asm cCcD_ObjCommonBase::~cCcD_ObjCommonBase() { nofralloc #include "asm/d/cc/d_cc_d/__dt__18cCcD_ObjCommonBaseFv.s" } @@ -842,16 +1138,15 @@ extern "C" asm void __dt__18cCcD_ObjCommonBaseFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_GObjInf::~dCcD_GObjInf() { -extern "C" asm void __dt__12dCcD_GObjInfFv() { +asm dCcD_GObjInf::~dCcD_GObjInf() { nofralloc #include "asm/d/cc/d_cc_d/__dt__12dCcD_GObjInfFv.s" } #pragma pop /* 80084268-8008426C 07EBA8 0004+00 5/0 0/0 0/0 .text GetGObjInf__12dCcD_GObjInfFv */ -cCcD_GObjInf* dCcD_GObjInf::GetGObjInf() { - return this; +void dCcD_GObjInf::GetGObjInf() { + /* empty function */ } /* 8008426C-800842C0 07EBAC 0054+00 5/0 0/0 0/0 .text ClrAtHit__12dCcD_GObjInfFv */ @@ -1059,8 +1354,8 @@ asm void dCcD_GetGObjInf(cCcD_Obj* param_0) { #pragma pop /* 800847C8-800847D0 07F108 0008+00 1/0 0/0 0/0 .text GetGObjInf__8cCcD_ObjFv */ -cCcD_GObjInf* cCcD_Obj::GetGObjInf() { - return NULL; +bool cCcD_Obj::GetGObjInf() { + return false; } /* 800847D0-80084814 07F110 0044+00 0/0 1/1 20/20 .text Set__8dCcD_CpsFRC11dCcD_SrcCps */ @@ -1077,8 +1372,7 @@ asm void dCcD_Cps::Set(dCcD_SrcCps const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_ShapeAttr *dCcD_Cps::GetShapeAttr() { -extern "C" asm void GetShapeAttr__8dCcD_CpsFv() { +asm void dCcD_Cps::GetShapeAttr() { nofralloc #include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_CpsFv.s" } @@ -1118,8 +1412,7 @@ asm void dCcD_Tri::Set(dCcD_SrcTri const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_ShapeAttr *dCcD_Tri::GetShapeAttr() { -extern "C" asm void GetShapeAttr__8dCcD_TriFv() { +asm void dCcD_Tri::GetShapeAttr() { nofralloc #include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_TriFv.s" } @@ -1140,8 +1433,7 @@ asm void dCcD_Cyl::Set(dCcD_SrcCyl const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_ShapeAttr *dCcD_Cyl::GetShapeAttr() { -extern "C" asm void GetShapeAttr__8dCcD_CylFv() { +asm void dCcD_Cyl::GetShapeAttr() { nofralloc #include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_CylFv.s" } @@ -1212,8 +1504,7 @@ asm void dCcD_Sph::MoveCAt(cXyz& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm cCcD_ShapeAttr* dCcD_Sph::GetShapeAttr() { -extern "C" asm void GetShapeAttr__8dCcD_SphFv() { +asm void dCcD_Sph::GetShapeAttr() { nofralloc #include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_SphFv.s" } @@ -1223,7 +1514,7 @@ extern "C" asm void GetShapeAttr__8dCcD_SphFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm const cXyz& cCcD_SphAttr::GetCoCP() const { +asm void cCcD_SphAttr::GetCoCP() const { nofralloc #include "asm/d/cc/d_cc_d/GetCoCP__12cCcD_SphAttrCFv.s" } @@ -1246,7 +1537,7 @@ bool cCcD_SphAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cCcD_SphAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { +asm void cCcD_SphAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { nofralloc #include "asm/d/cc/d_cc_d/CrossAtTg__12cCcD_SphAttrCFRC14cCcD_ShapeAttrP4cXyz.s" } @@ -1275,20 +1566,20 @@ bool cCcD_SphAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cCcD_SphAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { +asm void cCcD_SphAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { nofralloc #include "asm/d/cc/d_cc_d/CrossCo__12cCcD_SphAttrCFRC14cCcD_ShapeAttrPf.s" } #pragma pop /* 80084BE4-80084BE8 07F524 0004+00 6/0 0/0 0/0 .text GetGObjInf__12cCcD_GObjInfCFv */ -cCcD_GObjInf const* cCcD_GObjInf::GetGObjInf() const { - return this; +void cCcD_GObjInf::GetGObjInf() const { + /* empty function */ } /* 80084BE8-80084BF0 07F528 0008+00 7/0 0/0 0/0 .text GetShapeAttr__8cCcD_ObjCFv */ -cCcD_ShapeAttr const* cCcD_Obj::GetShapeAttr() const { - return NULL; +bool cCcD_Obj::GetShapeAttr() const { + return false; } /* 80084BF0-80084BF4 07F530 0004+00 7/0 0/0 0/0 .text Draw__8cCcD_ObjFRC8_GXColor */ @@ -1300,8 +1591,7 @@ void cCcD_Obj::Draw(_GXColor const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_Sph::~dCcD_Sph() { -extern "C" asm void __dt__8dCcD_SphFv() { +asm dCcD_Sph::~dCcD_Sph() { nofralloc #include "asm/d/cc/d_cc_d/__dt__8dCcD_SphFv.s" } @@ -1311,7 +1601,7 @@ extern "C" asm void __dt__8dCcD_SphFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm const cXyz& cCcD_CylAttr::GetCoCP() const { +asm void cCcD_CylAttr::GetCoCP() const { nofralloc #include "asm/d/cc/d_cc_d/GetCoCP__12cCcD_CylAttrCFv.s" } @@ -1334,7 +1624,7 @@ bool cCcD_CylAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cCcD_CylAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { +asm void cCcD_CylAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { nofralloc #include "asm/d/cc/d_cc_d/CrossAtTg__12cCcD_CylAttrCFRC14cCcD_ShapeAttrP4cXyz.s" } @@ -1363,7 +1653,7 @@ bool cCcD_CylAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cCcD_CylAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { +asm void cCcD_CylAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { nofralloc #include "asm/d/cc/d_cc_d/CrossCo__12cCcD_CylAttrCFRC14cCcD_ShapeAttrPf.s" } @@ -1373,8 +1663,7 @@ asm bool cCcD_CylAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) cons #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_Cyl::~dCcD_Cyl() { -extern "C" asm void __dt__8dCcD_CylFv() { +asm dCcD_Cyl::~dCcD_Cyl() { nofralloc #include "asm/d/cc/d_cc_d/__dt__8dCcD_CylFv.s" } @@ -1384,7 +1673,7 @@ extern "C" asm void __dt__8dCcD_CylFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz& cCcD_ShapeAttr::GetCoCP() { +asm void cCcD_ShapeAttr::GetCoCP() { nofralloc #include "asm/d/cc/d_cc_d/GetCoCP__14cCcD_ShapeAttrFv.s" } @@ -1394,7 +1683,7 @@ asm cXyz& cCcD_ShapeAttr::GetCoCP() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm const cXyz& cCcD_ShapeAttr::GetCoCP() const { +asm void cCcD_ShapeAttr::GetCoCP() const { nofralloc #include "asm/d/cc/d_cc_d/GetCoCP__14cCcD_ShapeAttrCFv.s" } @@ -1402,15 +1691,13 @@ asm const cXyz& cCcD_ShapeAttr::GetCoCP() const { /* 80084E44-80084E4C 07F784 0008+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_AabAttrP4cXyz */ -// bool cCcD_TriAttr::CrossAtTg(cCcD_AabAttr const& param_0, cXyz* param_1) const { -extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_AabAttrP4cXyz() { +bool cCcD_TriAttr::CrossAtTg(cCcD_AabAttr const& param_0, cXyz* param_1) const { return false; } /* 80084E4C-80084E54 07F78C 0008+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_PntAttrP4cXyz */ -// bool cCcD_TriAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { -extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_PntAttrP4cXyz() { +bool cCcD_TriAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { return false; } @@ -1419,7 +1706,7 @@ extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_PntAttrP4cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cCcD_TriAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { +asm void cCcD_TriAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { nofralloc #include "asm/d/cc/d_cc_d/CrossAtTg__12cCcD_TriAttrCFRC14cCcD_ShapeAttrP4cXyz.s" } @@ -1427,43 +1714,37 @@ asm bool cCcD_TriAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) c /* 80084E8C-80084E94 07F7CC 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_SphAttrPf */ -// bool cCcD_TriAttr::CrossCo(cCcD_SphAttr const& param_0, f32* param_1) const { -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_SphAttrPf() { +bool cCcD_TriAttr::CrossCo(cCcD_SphAttr const& param_0, f32* param_1) const { return false; } /* 80084E94-80084E9C 07F7D4 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_CylAttrPf */ -// bool cCcD_TriAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const { -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_CylAttrPf() { +bool cCcD_TriAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const { return false; } /* 80084E9C-80084EA4 07F7DC 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_AabAttrPf */ -// bool cCcD_TriAttr::CrossCo(cCcD_AabAttr const& param_0, f32* param_1) const { -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_AabAttrPf() { +bool cCcD_TriAttr::CrossCo(cCcD_AabAttr const& param_0, f32* param_1) const { return false; } /* 80084EA4-80084EAC 07F7E4 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_TriAttrPf */ -// bool cCcD_TriAttr::CrossCo(cCcD_TriAttr const& param_0, f32* param_1) const { -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_TriAttrPf() { +bool cCcD_TriAttr::CrossCo(cCcD_TriAttr const& param_0, f32* param_1) const { return false; } /* 80084EAC-80084EB4 07F7EC 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_CpsAttrPf */ -// bool cCcD_TriAttr::CrossCo(cCcD_CpsAttr const& param_0, f32* param_1) const { -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_CpsAttrPf() { +bool cCcD_TriAttr::CrossCo(cCcD_CpsAttr const& param_0, f32* param_1) const { return false; } /* 80084EB4-80084EBC 07F7F4 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_PntAttrPf */ -// bool cCcD_TriAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { -extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_PntAttrPf() { +bool cCcD_TriAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { return false; } @@ -1472,7 +1753,7 @@ extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_PntAttrPf() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cCcD_TriAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { +asm void cCcD_TriAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { nofralloc #include "asm/d/cc/d_cc_d/CrossCo__12cCcD_TriAttrCFRC14cCcD_ShapeAttrPf.s" } @@ -1482,8 +1763,7 @@ asm bool cCcD_TriAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) cons #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_Tri::~dCcD_Tri() { -extern "C" asm void __dt__8dCcD_TriFv() { +asm dCcD_Tri::~dCcD_Tri() { nofralloc #include "asm/d/cc/d_cc_d/__dt__8dCcD_TriFv.s" } @@ -1506,7 +1786,7 @@ bool cCcD_CpsAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cCcD_CpsAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { +asm void cCcD_CpsAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { nofralloc #include "asm/d/cc/d_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC14cCcD_ShapeAttrP4cXyz.s" } @@ -1535,7 +1815,7 @@ bool cCcD_CpsAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cCcD_CpsAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { +asm void cCcD_CpsAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { nofralloc #include "asm/d/cc/d_cc_d/CrossCo__12cCcD_CpsAttrCFRC14cCcD_ShapeAttrPf.s" } @@ -1545,16 +1825,14 @@ asm bool cCcD_CpsAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) cons #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_Cps::~dCcD_Cps() { -extern "C" asm void __dt__8dCcD_CpsFv() { +asm dCcD_Cps::~dCcD_Cps() { nofralloc #include "asm/d/cc/d_cc_d/__dt__8dCcD_CpsFv.s" } #pragma pop /* 80085130-80085138 07FA70 0008+00 3/0 0/0 0/0 .text GetShapeAttr__8cCcD_ObjFv */ -// cCcD_ShapeAttr *cCcD_Obj::GetShapeAttr() { -extern "C" bool GetShapeAttr__8cCcD_ObjFv() { +bool cCcD_Obj::GetShapeAttr() { return false; } @@ -1589,21 +1867,20 @@ asm void cCcD_GObjInf::ClrCoHit() { #pragma pop /* 800851A0-800851A4 07FAE0 0004+00 1/0 0/0 0/0 .text GetGObjInf__12cCcD_GObjInfFv */ -cCcD_GObjInf* cCcD_GObjInf::GetGObjInf() { - return this; +void cCcD_GObjInf::GetGObjInf() { + /* empty function */ } /* 800851A4-800851AC 07FAE4 0008+00 1/0 0/0 0/0 .text GetGObjInf__8cCcD_ObjCFv */ -cCcD_GObjInf const* cCcD_Obj::GetGObjInf() const { - return NULL; +bool cCcD_Obj::GetGObjInf() const { + return false; } /* 800851AC-8008523C 07FAEC 0090+00 2/1 0/0 0/0 .text __dt__9dCcD_SttsFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm dCcD_Stts::~dCcD_Stts() { -extern "C" asm void __dt__9dCcD_SttsFv(void) { // should get autogenerated eventually +asm dCcD_Stts::~dCcD_Stts() { nofralloc #include "asm/d/cc/d_cc_d/__dt__9dCcD_SttsFv.s" } diff --git a/src/d/cc/d_cc_d_nonmatching.cpp b/src/d/cc/d_cc_d_nonmatching.cpp new file mode 100644 index 0000000000..4ae98ba807 --- /dev/null +++ b/src/d/cc/d_cc_d_nonmatching.cpp @@ -0,0 +1,475 @@ +// +// Generated By: dol2asm +// Translation Unit: d/cc/d_cc_d +// + +#include "d/cc/d_cc_d.h" +#include "dol2asm.h" +#include "dolphin/types.h" +#include "f_op/f_op_actor_iter.h" +#include "f_op/f_op_actor_mng.h" +#include "f_pc/f_pc_searcher.h" + +// +// Declarations: +// + +/* 8008364C-80083660 07DF8C 0014+00 3/3 0/0 0/0 .text ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv */ +void dCcD_GAtTgCoCommonBase::ClrActorInfo() { + mApid = 0xFFFFFFFF; + mAc = NULL; +} + +/* 80083660-80083678 07DFA0 0018+00 1/1 0/0 0/0 .text ct__22dCcD_GAtTgCoCommonBaseFv */ +void dCcD_GAtTgCoCommonBase::ct() { + mGFlag = NULL; + mRPrm = 0; + field_0x08 = 0; + mEffCounter = 0; +} + +/* 80083678-80083688 07DFB8 0010+00 0/0 2/2 0/0 .text SetHitApid__22dCcD_GAtTgCoCommonBaseFUi */ +void dCcD_GAtTgCoCommonBase::SetHitApid(unsigned int hitApid) { + mApid = hitApid; + mAc = NULL; +} + +/* 80083688-80083704 07DFC8 007C+00 6/6 17/17 43/43 .text GetAc__22dCcD_GAtTgCoCommonBaseFv */ +fopAc_ac_c* dCcD_GAtTgCoCommonBase::GetAc() { + if (mApid == 0xFFFFFFFF) { + return NULL; + } else { + if (mAc == NULL) { + u32 apid = mApid; + mAc = static_cast(fopAcIt_Judge(fpcSch_JudgeByID, &apid)); + if (mAc == NULL) { + mApid = 0xFFFFFFFF; + } + } + return mAc; + } +} + +/* 80083704-80083718 07E044 0014+00 3/3 0/0 0/0 .text + * Set__22dCcD_GAtTgCoCommonBaseFRC25dCcD_SrcGAtTgCoCommonBase */ +void dCcD_GAtTgCoCommonBase::Set(dCcD_SrcGAtTgCoCommonBase const& src) { + mGFlag = src.mGFlag; + mEffCounter = 0; +} + +/* 80083718-80083724 07E058 000C+00 0/0 1/1 0/0 .text + * SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv */ +void dCcD_GAtTgCoCommonBase::SetEffCounterTimer() { + mEffCounter = 5; +} + +/* 80083724-80083748 07E064 0024+00 3/3 0/0 0/0 .text + * SubtractEffCounter__22dCcD_GAtTgCoCommonBaseFv */ +void dCcD_GAtTgCoCommonBase::SubtractEffCounter() { + mEffCounter--; + if (mEffCounter < 0) { + mEffCounter = 0; + } +} + +/* 80083748-80083760 07E088 0018+00 0/0 1/1 0/0 .text ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv */ +bool dCcD_GAtTgCoCommonBase::ChkEffCounter() { + return mEffCounter > 0; +} + +/* 80083760-800837B0 07E0A0 0050+00 0/0 3/3 446/446 .text __ct__10dCcD_GSttsFv */ +dCcD_GStts::dCcD_GStts() { + mAt = 0; + mTg = 0; + mRoomId = 0; + field_0x08 = 0xFFFF; + mAtApid = 0xFFFFFFFF; + mAtOldApid = 0xFFFFFFFF; + mTgApid = 0xFFFFFFFF; + mTgOldApid = 0xFFFFFFFF; + field_0x1C = 0; +} + +/* 800837F8-80083830 07E138 0038+00 1/1 0/0 0/0 .text Ct__10dCcD_GSttsFv */ +void dCcD_GStts::Ct() { + mAt = 0; + mTg = 0; + mRoomId = 0; + field_0x08 = 0xFFFF; + mAtApid = 0xFFFFFFFF; + mAtOldApid = 0xFFFFFFFF; + mTgApid = 0xFFFFFFFF; + mTgOldApid = 0xFFFFFFFF; + field_0x1C = 0; +} + +/* 80083830-80083850 07E170 0020+00 0/0 3/3 160/160 .text Move__10dCcD_GSttsFv */ +void dCcD_GStts::Move() { + mAtOldApid = mAtApid; + mAtApid = 0; + mTgOldApid = mTgApid; + mTgApid = 0; +} + +/* 80083850-80083860 07E190 0010+00 1/0 0/0 0/0 .text GetGStts__9dCcD_SttsFv */ +cCcD_GStts* dCcD_Stts::GetGStts() { + return this; +} + +/* 80083860-800838F4 07E1A0 0094+00 0/0 3/3 416/416 .text Init__9dCcD_SttsFiiP10fopAc_ac_c */ +void dCcD_Stts::Init(int param_0, int param_1, fopAc_ac_c* pActor) { + u32 actorPid; + if (pActor != NULL) { + actorPid = fopAcM_GetID(pActor); + } else { + actorPid = 0xFFFFFFFF; + } + this->cCcD_Stts::Init(param_0, param_1, pActor, actorPid); + s32 roomNo; + if (pActor != NULL) { + roomNo = fopAcM_GetRoomNo(pActor); + } else { + roomNo = 0; + field_0x1C |= 1; + } + if (roomNo != -1) { + mRoomId = roomNo; + } else { + mRoomId = 0; + } +} + +/* 800838F4-80083928 07E234 0034+00 1/0 0/0 0/0 .text Ct__9dCcD_SttsFv */ +void dCcD_Stts::Ct() { + this->cCcD_Stts::Ct(); + this->dCcD_GStts::Ct(); +} + +/* 80083928-80083934 07E268 000C+00 1/0 0/0 0/0 .text ClrAt__9dCcD_SttsFv */ +void dCcD_Stts::ClrAt() { + mAt = 0; +} + +/* 80083934-80083944 07E274 0010+00 1/0 0/0 0/0 .text ClrTg__9dCcD_SttsFv */ +void dCcD_Stts::ClrTg() { + this->cCcD_Stts::ClrTg(); + this->dCcD_GStts::ClrTg(); +} + +/* 80083944-800839A0 07E284 005C+00 1/1 0/0 0/0 .text Set__11dCcD_GObjAtFRC14dCcD_SrcGObjAt */ +void dCcD_GObjAt::Set(dCcD_SrcGObjAt const& src) { + this->dCcD_GAtTgCoCommonBase::Set(src.mBase); + this->mSe = src.mSe; + this->mMtrl = src.mMtrl; + this->mHitMark = src.mHitMark; + this->mSpl = src.mSpl; +} + +/* 800839A0-80083A28 07E2E0 0088+00 1/1 0/0 0/0 .text Set__11dCcD_GObjTgFRC14dCcD_SrcGObjTg */ +void dCcD_GObjTg::Set(dCcD_SrcGObjTg const& src) { + this->dCcD_GAtTgCoCommonBase::Set(src.mBase); + this->mSe = src.mSe; + this->mMtrl = src.mMtrl; + this->mHitMark = src.mHitMark; + this->mSpl = src.mSpl; + this->mHitPos = cXyz::Zero; + this->mShieldFrontRangeYAngle = NULL; + this->mShieldRange = 0x4000; +} + +/* 80083A28-80083B8C 07E368 0164+00 0/0 4/4 496/496 .text __ct__12dCcD_GObjInfFv */ +dCcD_GObjInf::dCcD_GObjInf() {} + +dCcD_GObjInf::~dCcD_GObjInf() {} + +cCcD_GObjInf* dCcD_GObjInf::GetGObjInf() { + return this; +} + +/* 8008426C-800842C0 07EBAC 0054+00 5/0 0/0 0/0 .text ClrAtHit__12dCcD_GObjInfFv */ +void dCcD_GObjInf::ClrAtHit() { + mObjAt.ClrHit(); + mGObjAt.ClrActorInfo(); + mGObjAt.mRPrm &= ~1; + mGObjAt.mRPrm &= ~2; + mGObjAt.SubtractEffCounter(); +} + +/* 800842C0-80084318 07EC00 0058+00 0/0 12/12 78/78 .text ChkAtHit__12dCcD_GObjInfFv */ +s32 dCcD_GObjInf::ChkAtHit() { + if ((mObjAt.getRPrm() & 1) == 0) { + return 0; + } else if ((mGObjAt.mRPrm & 2) == 0 && mGObjAt.GetAc() == NULL) { + return 0; + } else { + return 1; + } +} + +/* 80084318-80084358 07EC58 0040+00 0/0 10/10 7/7 .text ResetAtHit__12dCcD_GObjInfFv */ +void dCcD_GObjInf::ResetAtHit() { + this->ClrAtHit(); + mGObjAt.mEffCounter = 0; +} + +/* 80084358-800843A8 07EC98 0050+00 1/1 0/0 31/31 .text GetAtHitObj__12dCcD_GObjInfFv */ +cCcD_Obj* dCcD_GObjInf::GetAtHitObj() { + if ((mGObjAt.mRPrm & 2) == 0 && mGObjAt.GetAc() == NULL) { + return NULL; + } else { + return mObjAt.getHitObj(); + } +} + +/* 800843A8-800843DC 07ECE8 0034+00 0/0 2/2 3/3 .text GetAtHitGObj__12dCcD_GObjInfFv */ +cCcD_GObjInf* dCcD_GObjInf::GetAtHitGObj() { + cCcD_Obj* obj = this->GetAtHitObj(); + if (obj == NULL) { + return NULL; + } else { + return dCcD_GetGObjInf(obj); + } +} + +/* 800843DC-800843FC 07ED1C 0020+00 0/0 1/1 0/0 .text ChkAtNoGuard__12dCcD_GObjInfFv */ +#ifdef NON_MATCHING +bool dCcD_GObjInf::ChkAtNoGuard() { + return 12 < mGObjAt.mSpl; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool dCcD_GObjInf::ChkAtNoGuard() { + nofralloc +#include "asm/d/cc/d_cc_d/ChkAtNoGuard__12dCcD_GObjInfFv.s" +} +#pragma pop +#endif + +/* 800843FC-80084460 07ED3C 0064+00 5/0 0/0 0/0 .text ClrTgHit__12dCcD_GObjInfFv */ +void dCcD_GObjInf::ClrTgHit() { + mObjTg.ClrHit(); + mGObjTg.ClrActorInfo(); + mGObjTg.mRPrm &= ~1; + mGObjTg.mRPrm &= ~2; + mGObjTg.mRPrm &= ~4; + mGObjTg.SubtractEffCounter(); +} + +/* 80084460-800844B8 07EDA0 0058+00 0/0 6/6 305/305 .text ChkTgHit__12dCcD_GObjInfFv */ +bool dCcD_GObjInf::ChkTgHit() { + if ((mObjTg.getRPrm() & 1) == 0) { + return false; + } else if ((mGObjTg.mRPrm & 1) == 0 && mGObjTg.GetAc() == NULL) { + return false; + } else { + return true; + } +} + +/* 800844B8-800844F8 07EDF8 0040+00 0/0 1/1 5/5 .text ResetTgHit__12dCcD_GObjInfFv */ +void dCcD_GObjInf::ResetTgHit() { + this->ClrTgHit(); + mGObjTg.mEffCounter = 0; +} + +/* 800844F8-80084548 07EE38 0050+00 1/1 3/3 228/228 .text GetTgHitObj__12dCcD_GObjInfFv + */ +cCcD_Obj* dCcD_GObjInf::GetTgHitObj() { + if ((mGObjTg.mRPrm & 1) == 0 && mGObjTg.GetAc() == NULL) { + return NULL; + } else { + return mObjTg.getHitObj(); + } +} + +/* 80084548-8008457C 07EE88 0034+00 1/1 5/5 63/63 .text GetTgHitGObj__12dCcD_GObjInfFv */ +dCcD_GObjInf* dCcD_GObjInf::GetTgHitGObj() { + cCcD_Obj* obj = this->GetTgHitObj(); + if (obj == NULL) { + return NULL; + } else { + return dCcD_GetGObjInf(obj); + } +} + +/* 8008457C-800845B0 07EEBC 0034+00 0/0 2/2 18/18 .text GetTgHitObjSe__12dCcD_GObjInfFv + */ +u8 dCcD_GObjInf::GetTgHitObjSe() { + dCcD_GObjInf* objInf = this->GetTgHitGObj(); + if (objInf == NULL) { + return NULL; + } else { + return objInf->mGObjAt.mSe; + } +} + +/* ############################################################################################## */ +/* 8037A780-8037A7E0 006DE0 0060+00 1/1 0/0 0/0 .rodata m_hitSeID__12dCcD_GObjInf */ +u32 const dCcD_GObjInf::m_hitSeID[24] = { + 0x0004000F, 0x00040000, 0x00040002, 0x00040004, 0x00040009, 0x0004000B, 0x0004000C, 0x0004000D, + 0x0004000E, 0x0004000F, 0x00040001, 0x00040004, 0x00040010, 0x00040011, 0x00040012, 0x00040013, + 0x00040014, 0x00040015, 0x00040018, 0x00040016, 0x00040003, 0x00040005, 0x00040006, 0x00040007, +}; + +/* 800845B0-8008460C 07EEF0 005C+00 0/0 3/3 32/32 .text getHitSeID__12dCcD_GObjInfFUci */ +u32 dCcD_GObjInf::getHitSeID(u8 param_0, int param_1) { + if (param_1 != 0) { + if (param_0 == 0x17) { + return 0x40017; + } + if (param_0 == 7) { + return 0x40008; + } + if (param_0 == 8) { + return 0x4000A; + } + } + return m_hitSeID[param_0]; +} + +/* 8008460C-80084658 07EF4C 004C+00 5/0 0/0 0/0 .text ClrCoHit__12dCcD_GObjInfFv */ +void dCcD_GObjInf::ClrCoHit() { + mObjCo.ClrHit(); + mGObjCo.ClrActorInfo(); + mGObjCo.mRPrm &= ~1; + mGObjCo.SubtractEffCounter(); +} + +/* 80084658-800846B0 07EF98 0058+00 0/0 5/5 74/74 .text ChkCoHit__12dCcD_GObjInfFv */ +bool dCcD_GObjInf::ChkCoHit() { + if ((mObjCo.getRPrm() & 1) == 0) { + return false; + } else if ((mGObjCo.mRPrm & 1) == 0 && mGObjCo.GetAc() == NULL) { + return false; + } else { + return true; + } +} + +/* 800846B0-800846F0 07EFF0 0040+00 0/0 1/1 2/2 .text ResetCoHit__12dCcD_GObjInfFv */ +void dCcD_GObjInf::ResetCoHit() { + ClrCoHit(); + mGObjCo.ResetEffCounter(); +} + +/* 800846F0-80084740 07F030 0050+00 0/0 0/0 36/36 .text GetCoHitObj__12dCcD_GObjInfFv */ +cCcD_Obj* dCcD_GObjInf::GetCoHitObj() { + if ((mGObjCo.mRPrm & 1) == 0 && mGObjCo.GetAc() == NULL) { + return NULL; + } else { + return mObjCo.getHitObj(); + } +} + +/* 80084740-8008479C 07F080 005C+00 4/4 0/0 0/0 .text Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf */ +void dCcD_GObjInf::Set(dCcD_SrcGObjInf const& param_0) { + this->cCcD_Obj::Set(param_0.mObj); + mGObjAt.Set(param_0.mGObjAt); + mGObjTg.Set(param_0.mGObjTg); + mGObjCo.Set(param_0.mGObjCo); +} + +/* 8008479C-800847C8 07F0DC 002C+00 2/2 1/1 3/3 .text dCcD_GetGObjInf__FP8cCcD_Obj */ +dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* obj) { + return (dCcD_GObjInf*)obj->GetGObjInf(); +} + +/* 800847D0-80084814 07F110 0044+00 0/0 1/1 20/20 .text Set__8dCcD_CpsFRC11dCcD_SrcCps */ +void dCcD_Cps::Set(dCcD_SrcCps const& param_0) { + this->dCcD_GObjInf::Set(param_0.mObjInf); + this->cCcD_CpsAttr::Set(param_0.mCps); +} + +/* 80084814-80084824 07F154 0010+00 1/0 0/0 0/0 .text GetShapeAttr__8dCcD_CpsFv */ +cCcD_ShapeAttr* dCcD_Cps::GetShapeAttr() { + return this; +} + +/* 80084824-80084854 07F164 0030+00 0/0 0/0 6/6 .text CalcAtVec__8dCcD_CpsFv */ +void dCcD_Cps::CalcAtVec() { + cXyz& dest = mGObjAt.GetVec(); + PSVECSubtract(&this->GetEndP(), &this->GetStartP(), &dest); +} + +/* 80084854-80084884 07F194 0030+00 0/0 0/0 2/2 .text CalcTgVec__8dCcD_CpsFv */ +void dCcD_Cps::CalcTgVec() { + cXyz& dest = mGObjTg.GetVec(); + PSVECSubtract(&this->GetEndP(), &this->GetStartP(), &dest); +} + +/* 80084884-800848A4 07F1C4 0020+00 0/0 0/0 5/5 .text Set__8dCcD_TriFRC11dCcD_SrcTri */ +void dCcD_Tri::Set(dCcD_SrcTri const& param_0) { + this->dCcD_GObjInf::Set(param_0.mObjInf); +} + +/* 800848A4-800848B4 07F1E4 0010+00 1/0 0/0 0/0 .text GetShapeAttr__8dCcD_TriFv */ +cCcD_ShapeAttr* dCcD_Tri::GetShapeAttr() { + return this; +} + +/* 800848B4-800848F8 07F1F4 0044+00 0/0 2/2 245/245 .text Set__8dCcD_CylFRC11dCcD_SrcCyl + */ +void dCcD_Cyl::Set(dCcD_SrcCyl const& param_0) { + this->dCcD_GObjInf::Set(param_0.mObjInf); + this->cCcD_CylAttr::Set(param_0.mCyl); +} + +/* 800848F8-80084908 07F238 0010+00 1/0 0/0 0/0 .text GetShapeAttr__8dCcD_CylFv */ +cCcD_ShapeAttr* dCcD_Cyl::GetShapeAttr() { + return this; +} + +/* 80084908-80084954 07F248 004C+00 0/0 3/3 3/3 .text StartCAt__8dCcD_CylFR4cXyz */ +void dCcD_Cyl::StartCAt(cXyz& param_0) { + cXyz zero = cXyz::Zero; + mGObjAt.SetVec(zero); + this->SetC(param_0); +} + +inline void vecDiff(cXyz& out, const cXyz& a, const cXyz& b) { + out = a - b; +} + +/* 80084954-800849C4 07F294 0070+00 0/0 3/3 4/4 .text MoveCAt__8dCcD_CylFR4cXyz */ +void dCcD_Cyl::MoveCAt(cXyz& param_0) { + cXyz diff; + vecDiff(diff, param_0, this->GetCP()); + mGObjAt.SetVec(diff); + this->SetC(param_0); +} + +/* 800849C4-80084A34 07F304 0070+00 0/0 0/0 1/1 .text MoveCTg__8dCcD_CylFR4cXyz */ +void dCcD_Cyl::MoveCTg(cXyz& param_0) { + cXyz diff; + vecDiff(diff, param_0, this->GetCP()); + mGObjTg.SetVec(diff); + this->SetC(param_0); +} + +/* 80084A34-80084A78 07F374 0044+00 0/0 2/2 196/196 .text Set__8dCcD_SphFRC11dCcD_SrcSph + */ +void dCcD_Sph::Set(dCcD_SrcSph const& param_0) { + this->dCcD_GObjInf::Set(param_0.mObjInf); + this->cCcD_SphAttr::Set(param_0.mSph); +} + +/* 80084A78-80084AC4 07F3B8 004C+00 0/0 3/3 25/25 .text StartCAt__8dCcD_SphFR4cXyz */ +void dCcD_Sph::StartCAt(cXyz& xyz) { + cXyz zero(cXyz::Zero); + SetAtVec(zero); + this->cM3dGSph::SetC(xyz); +} + +/* 80084AC4-80084B34 07F404 0070+00 0/0 2/2 23/23 .text MoveCAt__8dCcD_SphFR4cXyz */ +void dCcD_Sph::MoveCAt(cXyz& param_0) { + cXyz diff; + vecDiff(diff, param_0, GetC()); + mGObjAt.SetVec(diff); + this->SetC(param_0); +} + +cCcD_ShapeAttr* dCcD_Sph::GetShapeAttr() { + return this; +} \ No newline at end of file diff --git a/src/d/cc/d_cc_mass_s.cpp b/src/d/cc/d_cc_mass_s.cpp index 5521a4e2d7..d5a9612d87 100644 --- a/src/d/cc/d_cc_mass_s.cpp +++ b/src/d/cc/d_cc_mass_s.cpp @@ -3,359 +3,246 @@ // Translation Unit: d/cc/d_cc_mass_s // -//#include "d/cc/d_cc_mass_s.h" +#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" -// -// Types: -// - -struct fopAc_ac_c {}; - -struct cXyz {}; - -struct cCcD_Obj {}; - -struct dCcMassS_Obj { - /* 800300F4 */ ~dCcMassS_Obj(); - /* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32)); - /* 800852F0 */ void Clear(); - /* 800855C8 */ dCcMassS_Obj(); -}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026EFA4 */ ~cM3dGCps(); - /* 8026F080 */ void SetCps(cM3dGCps const&); -}; - -struct Vec {}; - -struct dCcMassS_HitInf { - /* 80085334 */ void ClearPointer(); -}; - -struct dCcMassS_Mng { - /* 80085350 */ dCcMassS_Mng(); - /* 800855E4 */ void Ct(); - /* 80085630 */ void SetAttr(f32, f32, u8, u8); - /* 80085690 */ void Prepare(); - /* 800858AC */ void Chk(cXyz*, fopAc_ac_c**, dCcMassS_HitInf*); - /* 80085CF0 */ void Clear(); - /* 80085D98 */ void Set(cCcD_Obj*, u8); - /* 80085E6C */ void SetCam(cM3dGCps const&); - /* 80085EB0 */ void GetResultCam() const; - /* 80085EB8 */ void GetCamTopPos(Vec*); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); -}; - -struct cM3dGAab { - /* 8026ECF8 */ void ClearForMinMax(); - /* 8026ED60 */ void SetMinMax(cM3dGAab const&); -}; - -struct cCcD_Stts { - /* 80263934 */ void PlusCcMove(f32, f32, f32); -}; - -struct cCcD_ShapeAttr { - /* 8008556C */ ~cCcD_ShapeAttr(); -}; - -struct cCcD_DivideInfo { - /* 80263358 */ void Set(u32, u32, u32); - /* 80263368 */ void Chk(cCcD_DivideInfo const&) const; -}; - -struct cCcD_DivideArea { - /* 802633A8 */ void SetArea(cM3dGAab const&); - /* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32); - /* 802636A0 */ void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&); -}; - -struct cCcD_CylAttr { - /* 800854E0 */ ~cCcD_CylAttr(); -}; - -struct cCcD_CpsAttr { - /* 80085450 */ ~cCcD_CpsAttr(); -}; - -// -// Forward References: -// - -extern "C" void Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v(); -extern "C" void Clear__12dCcMassS_ObjFv(); -extern "C" void ClearPointer__15dCcMassS_HitInfFv(); -extern "C" void __ct__12dCcMassS_MngFv(); -extern "C" void __dt__12cCcD_CpsAttrFv(); -extern "C" void __dt__12cCcD_CylAttrFv(); -extern "C" void __dt__14cCcD_ShapeAttrFv(); -extern "C" void __ct__12dCcMassS_ObjFv(); -extern "C" void Ct__12dCcMassS_MngFv(); -extern "C" void SetAttr__12dCcMassS_MngFffUcUc(); -extern "C" void Prepare__12dCcMassS_MngFv(); -extern "C" void Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf(); -extern "C" void Clear__12dCcMassS_MngFv(); -extern "C" void Set__12dCcMassS_MngFP8cCcD_ObjUc(); -extern "C" void SetCam__12dCcMassS_MngFRC8cM3dGCps(); -extern "C" void GetResultCam__12dCcMassS_MngCFv(); -extern "C" void GetCamTopPos__12dCcMassS_MngFP3Vec(); - -// -// External References: -// - -extern "C" void __dt__12dCcMassS_ObjFv(); -extern "C" void Set__15cCcD_DivideInfoFUlUlUl(); -extern "C" void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo(); -extern "C" void SetArea__15cCcD_DivideAreaFRC8cM3dGAab(); -extern "C" void CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl(); -extern "C" void CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab(); -extern "C" void PlusCcMove__9cCcD_SttsFfff(); -extern "C" void cM_rndF__Ff(); -extern "C" void ClearForMinMax__8cM3dGAabFv(); -extern "C" void SetMinMax__8cM3dGAabFRC8cM3dGAab(); -extern "C" void __ct__8cM3dGCpsFv(); -extern "C" void __dt__8cM3dGCpsFv(); -extern "C" void SetCps__8cM3dGCpsFRC8cM3dGCps(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void __dl__FPv(); -extern "C" void PSVECSubtract(); -extern "C" void PSVECScale(); -extern "C" void PSVECMag(); -extern "C" void PSVECSquareDistance(); -extern "C" void __construct_array(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__12dCcMassS_Obj[3]; -extern "C" extern void* __vt__15cCcD_DivideArea[3]; -extern "C" extern void* __vt__8cM3dGCyl[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__15cCcD_DivideInfo[3]; -extern "C" extern void* __vt__12dCcMassS_Mng[3 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; - // // Declarations: // /* 800852E0-800852F0 07FC20 0010+00 1/1 0/0 0/0 .text * Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Obj::Set(cCcD_Obj* param_0, u8 param_1, - void (*param_2)(fopAc_ac_c*, cXyz*, u32)) { - nofralloc -#include "asm/d/cc/d_cc_mass_s/Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v.s" +void dCcMassS_Obj::Set(cCcD_Obj* obj, u8 priority, dCcMassS_ObjCallback callback) { + mpObj = obj; + mPriority = priority; + mpCallback = callback; } -#pragma pop /* 800852F0-80085334 07FC30 0044+00 1/1 0/0 0/0 .text Clear__12dCcMassS_ObjFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Obj::Clear() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_ObjFv.s" +void dCcMassS_Obj::Clear() { + mpObj = NULL; + mPriority = 5; + mpCallback = NULL; + mDivideInfo.Set(0, 0, 0); } -#pragma pop - -/* ############################################################################################## */ -/* 80452760-80452764 000D60 0004+00 5/5 0/0 0/0 .sdata2 @3627 */ -SECTION_SDATA2 static u8 lit_3627[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; /* 80085334-80085350 07FC74 001C+00 1/1 0/0 0/0 .text ClearPointer__15dCcMassS_HitInfFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_HitInf::ClearPointer() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/ClearPointer__15dCcMassS_HitInfFv.s" +void dCcMassS_HitInf::ClearPointer() { + mpArea = NULL; + mpAtObj = NULL; + mpCoObj = NULL; + mCoHitLen = 0.0f; } -#pragma pop /* 80085350-80085450 07FC90 0100+00 0/0 1/1 0/0 .text __ct__12dCcMassS_MngFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcMassS_Mng::dCcMassS_Mng() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_MngFv.s" +dCcMassS_Mng::dCcMassS_Mng() { + this->Ct(); } -#pragma pop - -/* 80085450-800854E0 07FD90 0090+00 0/0 2/1 0/0 .text __dt__12cCcD_CpsAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_CpsAttr::~cCcD_CpsAttr() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/__dt__12cCcD_CpsAttrFv.s" -} -#pragma pop - -/* 800854E0-8008556C 07FE20 008C+00 0/0 2/1 0/0 .text __dt__12cCcD_CylAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_CylAttr::~cCcD_CylAttr() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/__dt__12cCcD_CylAttrFv.s" -} -#pragma pop - -/* 8008556C-800855C8 07FEAC 005C+00 0/0 1/0 0/0 .text __dt__14cCcD_ShapeAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_ShapeAttr::~cCcD_ShapeAttr() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/__dt__14cCcD_ShapeAttrFv.s" -} -#pragma pop /* 800855C8-800855E4 07FF08 001C+00 1/1 0/0 0/0 .text __ct__12dCcMassS_ObjFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcMassS_Obj::dCcMassS_Obj() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_ObjFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80452764-80452768 000D64 0004+00 2/2 0/0 0/0 .sdata2 @3724 */ -SECTION_SDATA2 static f32 lit_3724 = -1000000000.0f; +dCcMassS_Obj::dCcMassS_Obj() {} /* 800855E4-80085630 07FF24 004C+00 1/1 1/1 0/0 .text Ct__12dCcMassS_MngFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Mng::Ct() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/Ct__12dCcMassS_MngFv.s" +void dCcMassS_Mng::Ct() { + field_0x202 = 0; + mResultCam = 0; + mCamTopPos.set(0, -1000000000.0f, 0); + mCamBottomPos.set(0, -1000000000.0f, 0); + this->Clear(); } -#pragma pop /* 80085630-80085690 07FF70 0060+00 0/0 0/0 2/2 .text SetAttr__12dCcMassS_MngFffUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Mng::SetAttr(f32 param_0, f32 param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/d/cc/d_cc_mass_s/SetAttr__12dCcMassS_MngFffUcUc.s" +void dCcMassS_Mng::SetAttr(f32 param_0, f32 param_1, u8 param_2, u8 param_3) { + mCylAttr.SetR(param_0); + mCylAttr.SetH(param_1); + field_0x200 = param_2; + field_0x201 = param_3; } -#pragma pop - -/* ############################################################################################## */ -/* 80452768-8045276C 000D68 0004+00 1/1 0/0 0/0 .sdata2 @3780 */ -SECTION_SDATA2 static f32 lit_3780 = 1000000000.0f; /* 80085690-800858AC 07FFD0 021C+00 0/0 1/1 1/1 .text Prepare__12dCcMassS_MngFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Mng::Prepare() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/Prepare__12dCcMassS_MngFv.s" +void dCcMassS_Mng::Prepare() { + cM3dGAab aab; + aab.ClearForMinMax(); + for (dCcMassS_Obj* pObj = mMassObjs; pObj < mMassObjs + mMassObjCount; ++pObj) { + cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr(); + objShape->CalcAabBox(); + aab.SetMinMax(objShape->GetWorkAab()); + } + for (dCcMassS_Obj* pObj = mMassAreas; pObj < mMassAreas + mMassAreaCount; ++pObj) { + cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr(); + objShape->CalcAabBox(); + aab.SetMinMax(objShape->GetWorkAab()); + } + if (field_0x202 & 1) { + mCpsAttr.CalcAabBox(); + aab.SetMinMax(mCpsAttr.GetWorkAab()); + } + mDivideArea.SetArea(aab); + for (dCcMassS_Obj* pObj = mMassObjs; pObj < mMassObjs + mMassObjCount; ++pObj) { + cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr(); + cCcD_DivideInfo* divideInfo = &pObj->GetDivideInfo(); + mDivideArea.CalcDivideInfo(divideInfo, objShape->GetWorkAab(), 0); + } + for (dCcMassS_Obj* pObj = mMassAreas; pObj < mMassAreas + mMassAreaCount; ++pObj) { + cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr(); + cCcD_DivideInfo* divideInfo = &pObj->GetDivideInfo(); + mDivideArea.CalcDivideInfo(divideInfo, objShape->GetWorkAab(), 0); + } + if (field_0x202 & 1) { + mDivideArea.CalcDivideInfo(&mDivideInfo, mCpsAttr.GetWorkAab(), 0); + } + mCamTopPos.set(0, -1000000000.0f, 0); + mCamTopDist = 1000000000.0f; + mCamBottomPos.set(0, -1000000000.0f, 0); + mCamBottomDist = 1000000000.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 8045276C-80452770 000D6C 0004+00 2/2 0/0 0/0 .sdata2 @3899 */ -SECTION_SDATA2 static f32 lit_3899 = 1.0f; - -/* 80452770-80452774 000D70 0004+00 1/1 0/0 0/0 .sdata2 @3900 */ -SECTION_SDATA2 static f32 lit_3900 = 20.0f; /* 800858AC-80085CF0 0801EC 0444+00 0/0 0/0 2/2 .text * Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Mng::Chk(cXyz* param_0, fopAc_ac_c** param_1, dCcMassS_HitInf* param_2) { - nofralloc -#include "asm/d/cc/d_cc_mass_s/Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf.s" +u32 dCcMassS_Mng::Chk(cXyz* xyz, fopAc_ac_c** pActor, dCcMassS_HitInf* hitInf) { + cCcD_DivideInfo divideInfo; + u32 flagsMaybe = 0; + *pActor = NULL; + mCylAttr.SetC(*xyz); + mCylAttr.CalcAabBox(); + mDivideArea.CalcDivideInfoOverArea(÷Info, mCylAttr.GetWorkAab()); + hitInf->ClearPointer(); + if (field_0x200 & 8) { + for (dCcMassS_Obj* massObj = mMassAreas; massObj < mMassAreas + mMassAreaCount; ++massObj) { + if (massObj->GetDivideInfo().Chk(divideInfo)) { + cCcD_Obj* obj = massObj->GetObj(); + cCcD_ShapeAttr* objShape = obj->GetShapeAttr(); + f32 f; + if (obj->ChkCoSet() && mCylAttr.CrossCo(*objShape, &f)) { + flagsMaybe |= 4; + *pActor = obj->GetStts()->GetAc(); + if (hitInf != NULL) { + hitInf->SetAreaHitObj(obj); + } + if (massObj->GetCallback() != NULL) { + massObj->GetCallback()(obj->GetStts()->GetAc(), xyz, field_0x201); + } + } + } + } + } + for (dCcMassS_Obj* massObj = mMassObjs; massObj < mMassObjs + mMassObjCount; ++massObj) { + if (massObj->GetDivideInfo().Chk(divideInfo)) { + cCcD_Obj* obj = massObj->GetObj(); + dCcD_GObjInf* gobjInf = (dCcD_GObjInf*)obj->GetGObjInf(); + cCcD_ShapeAttr* objShape = obj->GetShapeAttr(); + cXyz unusedVec; + if (obj->ChkAtSet() && !gobjInf->ChkAtNoMass() && + mCylAttr.CrossAtTg(*objShape, &unusedVec) && (field_0x200 & 1)) { + flagsMaybe |= 1; + *pActor = obj->GetStts()->GetAc(); + if (hitInf != NULL) { + hitInf->SetAtHitObj(obj); + } + } + f32 f; + if (obj->ChkCoSet() && mCylAttr.CrossCo(*objShape, &f) && (field_0x200 & 2)) { + flagsMaybe |= 2; + *pActor = obj->GetStts()->GetAc(); + if (field_0x200 & 0x10) { + Vec vec; + PSVECSubtract(&(*pActor)->mCurrent.mPosition, xyz, &vec); + vec.y = 0; + f32 vecMag = PSVECMag(&vec); + if (cM3d_IsZero(vecMag)) { + vec.x = 1; + } else { + PSVECScale(&vec, &vec, f / vecMag); + } + obj->GetStts()->PlusCcMove(vec.x, vec.y, vec.z); + } + if (hitInf != NULL) { + hitInf->SetCoHitObj(obj); + hitInf->SetCoHitLen(f); + } + } + } + } + f32 f; + if ((field_0x202 & 1) && mDivideInfo.Chk(divideInfo) && mCylAttr.CrossCo(mCpsAttr, &f)) { + mResultCam |= 1; + mResultCam |= 1 << (field_0x201 + 1); + if ((mResultCam & 2) || (mResultCam & 8)) { + cXyz tmpVec; + f32 plusH = xyz->y + mCylAttr.GetH(); + tmpVec.x = xyz->x; + tmpVec.y = plusH; + tmpVec.z = xyz->z; + if (mCamTopPos.y < (20.0f + plusH)) { + f32 newCamTopDist = PSVECSquareDistance(&tmpVec, &mCpsAttr.GetStartP()); + if (mCamTopDist > newCamTopDist) { + mCamTopDist = newCamTopDist; + mCamTopPos = tmpVec; + } + } + if (mCamBottomPos.y < (20.0f + plusH)) { + f32 newCamBottomDist = PSVECSquareDistance(&tmpVec, &mCpsAttr.GetEndP()); + if (mCamBottomDist > newCamBottomDist) { + mCamBottomDist = newCamBottomDist; + mCamBottomPos = tmpVec; + } + } + } + } + return flagsMaybe; } -#pragma pop /* 80085CF0-80085D98 080630 00A8+00 1/1 2/2 0/0 .text Clear__12dCcMassS_MngFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Mng::Clear() { - nofralloc -#include "asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_MngFv.s" +void dCcMassS_Mng::Clear() { + mMassObjCount = 0; + mMassAreaCount = 0; + for (int i = 0; i < (s32)ARRAY_SIZE(mMassObjs); ++i) { + mMassObjs[i].Clear(); + } + for (int i = 0; i < (s32)ARRAY_SIZE(mMassAreas); ++i) { + mMassAreas[i].Clear(); + } + mCylAttr.SetR(0.0f); + mCylAttr.SetH(0.0f); + field_0x200 = 0; + field_0x201 = 4; } -#pragma pop - -/* ############################################################################################## */ -/* 80452774-80452778 000D74 0004+00 1/1 0/0 0/0 .sdata2 @3941 */ -SECTION_SDATA2 static f32 lit_3941 = 0.5f; /* 80085D98-80085E6C 0806D8 00D4+00 0/0 4/4 7/7 .text Set__12dCcMassS_MngFP8cCcD_ObjUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Mng::Set(cCcD_Obj* param_0, u8 param_1) { - nofralloc -#include "asm/d/cc/d_cc_mass_s/Set__12dCcMassS_MngFP8cCcD_ObjUc.s" +void dCcMassS_Mng::Set(cCcD_Obj* obj, u8 priority) { + if (mMassObjCount >= (s32)ARRAY_SIZE(mMassObjs)) { + for (int i = 0; i < (s32)ARRAY_SIZE(mMassObjs); ++i) { + int prevPrio = mMassObjs[i].GetPriority(); + if (prevPrio > priority || (prevPrio == priority && cM_rndF(1.0f) < 0.5f)) { + mMassObjs[i].Set(obj, priority, NULL); + break; + } + } + } else { + mMassObjs[mMassObjCount].Set(obj, priority, NULL); + mMassObjCount++; + } } -#pragma pop /* 80085E6C-80085EB0 0807AC 0044+00 0/0 1/1 0/0 .text SetCam__12dCcMassS_MngFRC8cM3dGCps */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Mng::SetCam(cM3dGCps const& param_0) { - nofralloc -#include "asm/d/cc/d_cc_mass_s/SetCam__12dCcMassS_MngFRC8cM3dGCps.s" +void dCcMassS_Mng::SetCam(cM3dGCps const& cps) { + mCpsAttr.SetCps(cps); + field_0x202 |= 1; + mResultCam = 0; } -#pragma pop /* 80085EB0-80085EB8 0807F0 0008+00 0/0 1/1 0/0 .text GetResultCam__12dCcMassS_MngCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Mng::GetResultCam() const { - nofralloc -#include "asm/d/cc/d_cc_mass_s/GetResultCam__12dCcMassS_MngCFv.s" +u8 dCcMassS_Mng::GetResultCam() const { + return mResultCam; } -#pragma pop /* 80085EB8-80085ED4 0807F8 001C+00 0/0 1/1 0/0 .text GetCamTopPos__12dCcMassS_MngFP3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCcMassS_Mng::GetCamTopPos(Vec* param_0) { - nofralloc -#include "asm/d/cc/d_cc_mass_s/GetCamTopPos__12dCcMassS_MngFP3Vec.s" +void dCcMassS_Mng::GetCamTopPos(Vec* out) { + *out = mCamTopPos; } -#pragma pop diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 2e835f4056..7fbdc252f3 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -35,14 +35,6 @@ struct dSmplMdl_draw_c { /* 80049058 */ void removeModel(J3DModelData*, int); }; -struct dRes_control_c { - /* 8003BFB0 */ ~dRes_control_c(); - /* 8003C078 */ void setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*); - /* 8003C160 */ void syncRes(char const*, dRes_info_c*, int); - /* 8003C194 */ void deleteRes(char const*, dRes_info_c*, int); - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - struct dPa_control_c { /* 8004BACC */ dPa_control_c(); }; @@ -431,15 +423,15 @@ void dComIfG_play_c::ct(void) { /* ############################################################################################## */ /* 804061A0-804061B4 032EC0 0014+00 1/1 0/0 0/0 .bss dComIfG_mTimerInfo */ -static u8 dComIfG_mTimerInfo[20]; +static __d_timer_info_c dComIfG_mTimerInfo; /* 804061B4-804061C0 032ED4 000C+00 1/1 0/0 0/0 .bss @5065 */ -static u8 lit_5065[12]; +// static u8 lit_5065[12]; /* 804061C0-80423FD0 032EE0 1DE10+00 99/99 2264/2264 7115/7115 .bss g_dComIfG_gameInfo */ -extern u8 g_dComIfG_gameInfo[122384]; -u8 g_dComIfG_gameInfo[122384]; +// extern u8 g_dComIfG_gameInfo[122384]; +dComIfG_inf_c g_dComIfG_gameInfo; /* 8002B22C-8002B2A8 025B6C 007C+00 1/1 1/1 0/0 .text init__14dComIfG_play_cFv */ #ifdef NONMATCHING @@ -705,46 +697,46 @@ asm u32 dComIfG_play_c::entrySimpleModel(J3DModel* param_0, int param_1) { #pragma pop void dComIfG_play_c::setTimerNowTimeMs(int time) { - mTimerNowTimeMs = time; + mTimerInfo.mTimerNowTimeMs = time; } int dComIfG_play_c::getTimerNowTimeMs() { - return mTimerNowTimeMs; + return mTimerInfo.mTimerNowTimeMs; } void dComIfG_play_c::setTimerLimitTimeMs(int time) { - mTimerLimitTimeMs = time; + mTimerInfo.mTimerLimitTimeMs = time; } int dComIfG_play_c::getTimerLimitTimeMs() { - return mTimerLimitTimeMs; + return mTimerInfo.mTimerLimitTimeMs; } void dComIfG_play_c::setTimerMode(int mode) { - mTimerMode = mode; + mTimerInfo.mTimerMode = mode; } int dComIfG_play_c::getTimerMode(void) { - return mTimerMode; + return mTimerInfo.mTimerMode; } void dComIfG_play_c::setTimerType(u8 type) { - mTimerType = type; + mTimerInfo.mTimerType = type; } u8 dComIfG_play_c::getTimerType(void) { - return mTimerType; + return mTimerInfo.mTimerType; } /* 8002CBD4-8002CBDC -00001 0008+00 0/0 0/0 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */ void dComIfG_play_c::setTimerPtr(dTimer_c* pTimerPtr) { - mTimerPtr = pTimerPtr; + mTimerInfo.mTimerPtr = pTimerPtr; } /* 8002CBDC-8002CBE4 02751C 0008+00 6/6 7/7 15/15 .text getTimerPtr__14dComIfG_play_cFv */ dTimer_c* dComIfG_play_c::getTimerPtr() { - return mTimerPtr; + return mTimerInfo.mTimerPtr; } /* 8002CBE4-8002CC54 027524 0070+00 1/1 1/1 0/0 .text ct__13dComIfG_inf_cFv */ @@ -2045,433 +2037,6 @@ asm void dComIfGs_staffroll_next_go_check() { } #pragma pop -/* 8002FD18-8002FD74 02A658 005C+00 0/0 1/0 0/0 .text __sinit_d_com_inf_game_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_com_inf_game_cpp() { - nofralloc -#include "asm/d/com/d_com_inf_game/__sinit_d_com_inf_game_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8002FD18, __sinit_d_com_inf_game_cpp); -#pragma pop - -/* 8002FD74-8002FDE8 02A6B4 0074+00 1/1 0/0 0/0 .text __dt__13dComIfG_inf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dComIfG_inf_c::~dComIfG_inf_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__13dComIfG_inf_cFv.s" -} -#pragma pop - -/* 8002FDE8-8002FEF8 02A728 0110+00 1/1 0/0 0/0 .text __dt__14dComIfG_play_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dComIfG_play_c::~dComIfG_play_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__14dComIfG_play_cFv.s" -} -#pragma pop - -/* 8002FEF8-8002FF40 02A838 0048+00 4/4 1/0 0/0 .text __dt__11cBgS_ChkElmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS_ChkElm::~cBgS_ChkElm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__11cBgS_ChkElmFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803A71E8-803A71F4 004308 000C+00 1/1 1/1 0/0 .data __vt__25mDoExt_McaMorfCallBack1_c - */ -SECTION_DATA extern void* __vt__25mDoExt_McaMorfCallBack1_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)NULL, -}; - -/* 803A71F4-803A7200 004314 000C+00 1/1 1/1 0/0 .data __vt__12dCcMassS_Obj */ -SECTION_DATA extern void* __vt__12dCcMassS_Obj[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dCcMassS_ObjFv, -}; - -/* 803A7200-803A720C 004320 000C+00 4/4 2/2 0/0 .data __vt__15cCcD_DivideArea */ -SECTION_DATA extern void* __vt__15cCcD_DivideArea[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15cCcD_DivideAreaFv, -}; - -/* 803A720C-803A7218 00432C 000C+00 3/3 11/11 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 803A7218-803A7224 004338 000C+00 5/5 28/28 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 803A7224-803A7230 004344 000C+00 4/4 9/9 0/0 .data __vt__15cCcD_DivideInfo */ -SECTION_DATA extern void* __vt__15cCcD_DivideInfo[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15cCcD_DivideInfoFv, -}; - -/* 803A7230-803A7240 004350 000C+04 2/2 1/1 0/0 .data __vt__12dCcMassS_Mng */ -SECTION_DATA extern void* __vt__12dCcMassS_Mng[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dCcMassS_MngFv, - /* padding */ - NULL, -}; - -/* 8002FF40-800300F4 02A880 01B4+00 1/1 1/0 0/0 .text __dt__4dCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcS::~dCcS() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__4dCcSFv.s" -} -#pragma pop - -/* 800300F4-80030154 02AA34 0060+00 3/2 1/1 0/0 .text __dt__12dCcMassS_ObjFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcMassS_Obj::~dCcMassS_Obj() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__12dCcMassS_ObjFv.s" -} -#pragma pop - -/* 80030154-80030190 02AA94 003C+00 1/1 1/1 0/0 .text __dt__12dEvt_order_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dEvt_order_c::~dEvt_order_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__12dEvt_order_cFv.s" -} -#pragma pop - -/* 80030190-800301CC 02AAD0 003C+00 1/1 1/1 0/0 .text __dt__11dEvDtBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dEvDtBase_c::~dEvDtBase_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__11dEvDtBase_cFv.s" -} -#pragma pop - -/* 800301CC-80030208 02AB0C 003C+00 2/2 0/0 0/0 .text __dt__14dDlst_window_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDlst_window_c::~dDlst_window_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__14dDlst_window_cFv.s" -} -#pragma pop - -/* 80030208-80030244 02AB48 003C+00 2/2 0/0 0/0 .text __dt__25dComIfG_camera_info_classFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dComIfG_camera_info_class::~dComIfG_camera_info_class() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__25dComIfG_camera_info_classFv.s" -} -#pragma pop - -/* 80030244-800304C8 02AB84 0284+00 1/1 0/0 0/0 .text __ct__13dComIfG_inf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dComIfG_inf_c::dComIfG_inf_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__13dComIfG_inf_cFv.s" -} -#pragma pop - -/* 800304C8-800304CC 02AE08 0004+00 1/1 0/0 0/0 .text __ct__25dComIfG_camera_info_classFv - */ -dComIfG_camera_info_class::dComIfG_camera_info_class() { - /* empty function */ -} - -/* 800304CC-800304D0 02AE0C 0004+00 1/1 0/0 0/0 .text __ct__14dDlst_window_cFv */ -dDlst_window_c::dDlst_window_c() { - /* empty function */ -} - -/* 800304D0-8003050C 02AE10 003C+00 1/1 2/2 0/0 .text __dt__10dAttList_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dAttList_c::~dAttList_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__10dAttList_cFv.s" -} -#pragma pop - -/* 8003050C-80030510 02AE4C 0004+00 1/1 1/1 0/0 .text __ct__10dAttList_cFv */ -dAttList_c::dAttList_c() { - /* empty function */ -} - -/* 80030510-8003054C 02AE50 003C+00 0/0 9/9 0/0 .text __dt__7cSAngleFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" void asm __dt__7cSAngleFv() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__7cSAngleFv.s" -} -#pragma pop - -/* 8003054C-800306A0 02AE8C 0154+00 1/1 2/2 0/0 .text __dt__10dAttDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dAttDraw_c::~dAttDraw_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__10dAttDraw_cFv.s" -} -#pragma pop - -/* 800306A0-800306F4 02AFE0 0054+00 2/2 0/0 0/0 .text __dt__13mDoExt_bckAnmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoExt_bckAnm::~mDoExt_bckAnm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__13mDoExt_bckAnmFv.s" -} -#pragma pop - -/* 800306F4-80030748 02B034 0054+00 2/2 0/0 0/0 .text __dt__13mDoExt_bpkAnmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoExt_bpkAnm::~mDoExt_bpkAnm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__13mDoExt_bpkAnmFv.s" -} -#pragma pop - -/* 80030748-8003079C 02B088 0054+00 2/2 0/0 0/0 .text __dt__13mDoExt_brkAnmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoExt_brkAnm::~mDoExt_brkAnm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__13mDoExt_brkAnmFv.s" -} -#pragma pop - -/* 8003079C-800307F0 02B0DC 0054+00 2/2 0/0 0/0 .text __dt__13mDoExt_btkAnmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoExt_btkAnm::~mDoExt_btkAnm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__13mDoExt_btkAnmFv.s" -} -#pragma pop - -/* 800307F0-80030954 02B130 0164+00 1/1 1/1 0/0 .text __ct__10dAttDraw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dAttDraw_c::dAttDraw_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__10dAttDraw_cFv.s" -} -#pragma pop - -/* 80030954-8003099C 02B294 0048+00 1/1 0/0 0/0 .text __ct__13mDoExt_btkAnmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoExt_btkAnm::mDoExt_btkAnm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__13mDoExt_btkAnmFv.s" -} -#pragma pop - -/* 8003099C-800309E4 02B2DC 0048+00 1/1 0/0 0/0 .text __ct__13mDoExt_brkAnmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoExt_brkAnm::mDoExt_brkAnm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__13mDoExt_brkAnmFv.s" -} -#pragma pop - -/* 800309E4-80030A2C 02B324 0048+00 1/1 0/0 0/0 .text __ct__13mDoExt_bpkAnmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoExt_bpkAnm::mDoExt_bpkAnm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__13mDoExt_bpkAnmFv.s" -} -#pragma pop - -/* 80030A2C-80030A74 02B36C 0048+00 1/1 0/0 0/0 .text __ct__13mDoExt_bckAnmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoExt_bckAnm::mDoExt_bckAnm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__13mDoExt_bckAnmFv.s" -} -#pragma pop - -/* 80030A74-80030BDC 02B3B4 0168+00 1/0 0/0 0/0 .text __dt__12dCcMassS_MngFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcMassS_Mng::~dCcMassS_Mng() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__12dCcMassS_MngFv.s" -} -#pragma pop - -/* 80030BDC-80030C50 02B51C 0074+00 0/0 1/0 0/0 .text __dt__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcS::~cCcS() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__4cCcSFv.s" -} -#pragma pop - -/* 80030C50-80030CCC 02B590 007C+00 0/0 1/0 0/0 .text __dt__4dBgSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS::~dBgS() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__4dBgSFv.s" -} -#pragma pop - -/* 80030CCC-80030D38 02B60C 006C+00 0/0 1/0 0/0 .text __dt__4cBgSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS::~cBgS() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__4cBgSFv.s" -} -#pragma pop - -/* 80030D38-80030D74 02B678 003C+00 1/1 0/0 0/0 .text __ct__11cBgS_ChkElmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS_ChkElm::cBgS_ChkElm() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__11cBgS_ChkElmFv.s" -} -#pragma pop - -/* 80030D74-80030D80 02B6B4 000C+00 1/1 0/0 0/0 .text __ct__10dSv_zone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSv_zone_c::dSv_zone_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__10dSv_zone_cFv.s" -} -#pragma pop - -/* 80030D80-80030DB0 02B6C0 0030+00 1/1 1/1 0/0 .text __ct__13dSv_memory2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSv_memory2_c::dSv_memory2_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__13dSv_memory2_cFv.s" -} -#pragma pop - -/* 80030DB0-80030DE0 02B6F0 0030+00 1/1 1/1 0/0 .text __ct__12dSv_memory_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSv_memory_c::dSv_memory_c() { - nofralloc -#include "asm/d/com/d_com_inf_game/__ct__12dSv_memory_cFv.s" -} -#pragma pop - -/* 80030DE0-80030E3C 02B720 005C+00 1/0 0/0 0/0 .text __dt__15cCcD_DivideAreaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_DivideArea::~cCcD_DivideArea() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__15cCcD_DivideAreaFv.s" -} -#pragma pop - -/* 80030E3C-80030E84 02B77C 0048+00 1/0 1/1 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv(void) { // should be autogenerated eventually - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80030E84-80030ECC 02B7C4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv(void) { // should be autogenerated eventually - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80030ECC-80030F14 02B80C 0048+00 1/0 0/0 0/0 .text __dt__15cCcD_DivideInfoFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_DivideInfo::~cCcD_DivideInfo() { - nofralloc -#include "asm/d/com/d_com_inf_game/__dt__15cCcD_DivideInfoFv.s" -} -#pragma pop - /* ############################################################################################## */ /* 80450608-8045060C 000088 0004+00 0/0 6/6 11/11 .sdata g_whiteColor */ SECTION_SDATA extern u32 g_whiteColor = 0xFFFFFFFF; diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index dddf783c51..eced61deb4 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -315,7 +315,8 @@ SECTION_SDATA2 static f32 lit_4073 = 1.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dAttParam_c::dAttParam_c(s32 param_0) { +// asm dAttParam_c::dAttParam_c(s32 param_0) { +extern "C" asm void __ct__11dAttParam_cFl() { nofralloc #include "asm/d/d_attention/__ct__11dAttParam_cFl.s" } @@ -325,7 +326,8 @@ asm dAttParam_c::dAttParam_c(s32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dAttParam_c::~dAttParam_c() { +// asm dAttParam_c::~dAttParam_c() { +extern "C" asm void __dt__11dAttParam_cFv() { nofralloc #include "asm/d/d_attention/__dt__11dAttParam_cFv.s" } @@ -342,7 +344,8 @@ SECTION_SDATA2 static f32 lit_4085 = 2.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dAttDrawParam_c::dAttDrawParam_c() { +// asm dAttDrawParam_c::dAttDrawParam_c() { +extern "C" asm void __ct__15dAttDrawParam_cFv() { nofralloc #include "asm/d/d_attention/__ct__15dAttDrawParam_cFv.s" } @@ -357,7 +360,8 @@ SECTION_SDATA2 static f32 lit_4092 = 3.0f / 5.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* param_1) { +// asm void dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* param_1) { +extern "C" asm void execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo() { nofralloc #include "asm/d/d_attention/execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo.s" } diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 879723a74a..1a904b2f98 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -33,10 +33,6 @@ struct dSvBit_HIO_c { /* 8025C1F8 */ void init(); }; -struct dStage_KeepDoorInfo { - /* 80028418 */ ~dStage_KeepDoorInfo(); -}; - struct dRes_info_c {}; struct dRes_control_c { @@ -460,7 +456,7 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void sprintf(); extern "C" void snprintf(char*, u32, char*, ...); -extern "C" extern u8 const j3dDefaultLightInfo[52]; +extern "C" extern J3DLightInfo const j3dDefaultLightInfo; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_save_bit_HIO[1184 + 4 /* padding */]; extern "C" extern u8 data_804505F0[8]; @@ -500,10 +496,10 @@ static void dStage_SetErrorStage() { /* ############################################################################################## */ /* 803F4E68-803F4E74 021B88 000C+00 1/1 0/0 0/0 .bss @3926 */ -static u8 lit_3926[12]; +// static u8 lit_3926[12]; /* 803F4E74-803F5778 021B94 0904+00 3/4 0/0 0/0 .bss DoorInfo */ -static u8 DoorInfo[2308]; +static dStage_KeepDoorInfo DoorInfo; /* 80023EF4-80023F00 01E834 000C+00 0/0 1/1 0/0 .text dStage_GetKeepDoorInfo__Fv */ #pragma push @@ -549,13 +545,13 @@ static asm void dStage_KeepDoorInfoProc(dStage_dt_c* param_0, stage_tgsc_class* /* ############################################################################################## */ /* 803F5778-803F5784 022498 000C+00 0/1 0/0 0/0 .bss @3981 */ -#pragma push -#pragma force_active on -static u8 lit_3981[12]; -#pragma pop +// #pragma push +// #pragma force_active on +// static u8 lit_3981[12]; +// #pragma pop /* 803F5784-803F6088 0224A4 0904+00 3/4 0/0 0/0 .bss l_RoomKeepDoorInfo */ -static u8 l_RoomKeepDoorInfo[2308]; +static dStage_KeepDoorInfo l_RoomKeepDoorInfo; /* 8002405C-80024068 01E99C 000C+00 0/0 1/1 0/0 .text dStage_GetRoomKeepDoorInfo__Fv */ #pragma push @@ -615,14 +611,14 @@ SECTION_DEAD static char const* const stringBase_80378ADD = "name.bin"; SECTION_DEAD static char const* const stringBase_80378AE6 = "bank.bin"; #pragma pop -/* 803F6088-803F6094 022DA8 000C+00 0/1 0/0 0/0 .bss @5376 */ -#pragma push -#pragma force_active on -static u8 lit_5376[12]; -#pragma pop +// /* 803F6088-803F6094 022DA8 000C+00 0/1 0/0 0/0 .bss @5376 */ +// #pragma push +// #pragma force_active on +// static u8 lit_5376[12]; +// #pragma pop /* 803F6094-80406194 022DB4 10100+00 12/12 31/31 16/16 .bss mStatus__20dStage_roomControl_c */ -u8 dStage_roomControl_c::mStatus[65792]; +dStage_roomStatus_c dStage_roomControl_c::mStatus[0x40]; /* 80450D58-80450D60 000258 0008+00 1/1 0/0 0/0 .sbss tmp_name$4456 */ static char tmp_name[8]; @@ -3131,349 +3127,6 @@ void dStage_stageDt_c::setElst(dStage_Elst_c* i_Elst) { mElst = i_Elst; } -/* 8002824C-80028328 022B8C 00DC+00 0/0 1/0 0/0 .text __sinit_d_stage_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_stage_cpp() { - nofralloc -#include "asm/d/d_stage/__sinit_d_stage_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8002824C, __sinit_d_stage_cpp); -#pragma pop - -/* 80028328-80028360 022C68 0038+00 1/1 0/0 0/0 .text __arraydtor$5375 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void func_80028328() { - nofralloc -#include "asm/d/d_stage/func_80028328.s" -} -#pragma pop - -dStage_roomStatus_c::~dStage_roomStatus_c() {} - -/* ############################################################################################## */ -/* 803A6AAC-803A6C20 003BCC 0174+00 1/1 0/0 0/0 .data __vt__15dStage_roomDt_c */ -SECTION_DATA extern void* __vt__15dStage_roomDt_c[93] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)init__15dStage_roomDt_cFv, - (void*)setCamera__15dStage_roomDt_cFP18stage_camera_class, - (void*)getCamera__15dStage_roomDt_cCFv, - (void*)setArrow__15dStage_roomDt_cFP17stage_arrow_class, - (void*)getArrow__15dStage_roomDt_cCFv, - (void*)setPlayer__15dStage_roomDt_cFP17stage_actor_class, - (void*)getPlayer__15dStage_roomDt_cCFv, - (void*)setPlayerNum__15dStage_roomDt_cFUs, - (void*)getPlayerNum__15dStage_roomDt_cCFv, - (void*)setRoom__15dStage_roomDt_cFP14roomRead_class, - (void*)getRoom__15dStage_roomDt_cCFv, - (void*)setMapInfo__15dStage_roomDt_cFP20stage_map_info_class, - (void*)getMapInfo__15dStage_roomDt_cCFv, - (void*)getMapInfo2__15dStage_roomDt_cCFi, - (void*)setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class, - (void*)getMapInfoBase__15dStage_roomDt_cCFv, - (void*)setPaletteInfo__15dStage_roomDt_cFP24stage_palette_info_class, - (void*)getPaletteInfo__15dStage_roomDt_cCFv, - (void*)setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class, - (void*)getPselectInfo__15dStage_roomDt_cCFv, - (void*)setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class, - (void*)getEnvrInfo__15dStage_roomDt_cCFv, - (void*)setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class, - (void*)getVrboxInfo__15dStage_roomDt_cCFv, - (void*)setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class, - (void*)getVrboxcolInfo__15dStage_roomDt_cCFv, - (void*)setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class, - (void*)getPlightInfo__15dStage_roomDt_cCFv, - (void*)setPaletteNumInfo__15dStage_roomDt_cFi, - (void*)getPaletteNumInfo__15dStage_roomDt_cCFv, - (void*)setPselectNumInfo__15dStage_roomDt_cFi, - (void*)getPselectNumInfo__15dStage_roomDt_cCFv, - (void*)setEnvrNumInfo__15dStage_roomDt_cFi, - (void*)getEnvrNumInfo__15dStage_roomDt_cCFv, - (void*)setVrboxNumInfo__15dStage_roomDt_cFi, - (void*)getVrboxNumInfo__15dStage_roomDt_cCFv, - (void*)setVrboxcolNumInfo__15dStage_roomDt_cFi, - (void*)getVrboxcolNumInfo__15dStage_roomDt_cCFv, - (void*)setPlightNumInfo__15dStage_roomDt_cFi, - (void*)getPlightNumInfo__15dStage_roomDt_cCFv, - (void*)setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class, - (void*)getLightVecInfo__15dStage_roomDt_cCFv, - (void*)setLightVecInfoNum__15dStage_roomDt_cFi, - (void*)getLightVecInfoNum__15dStage_roomDt_cCFv, - (void*)setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class, - (void*)getStagInfo__15dStage_roomDt_cCFv, - (void*)setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class, - (void*)getSclsInfo__15dStage_roomDt_cCFv, - (void*)setPntInfo__15dStage_roomDt_cFP13dStage_dPnt_c, - (void*)getPntInf__15dStage_roomDt_cCFv, - (void*)setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c, - (void*)getPathInf__15dStage_roomDt_cCFv, - (void*)setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c, - (void*)getPnt2Inf__15dStage_roomDt_cCFv, - (void*)setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c, - (void*)getPath2Inf__15dStage_roomDt_cCFv, - (void*)setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c, - (void*)getSoundInf__15dStage_roomDt_cCFv, - (void*)setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c, - (void*)getSoundInfCL__15dStage_roomDt_cCFv, - (void*)setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c, - (void*)getMapEventInfo__15dStage_roomDt_cCFv, - (void*)setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c, - (void*)getFileList2Info__15dStage_roomDt_cCFv, - (void*)setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c, - (void*)getFileListInfo__15dStage_roomDt_cCFv, - (void*)setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c, - (void*)getFloorInfo__15dStage_roomDt_cCFv, - (void*)setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c, - (void*)getMemoryConfig__15dStage_roomDt_cCFv, - (void*)setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c, - (void*)getMemoryMap__15dStage_roomDt_cCFv, - (void*)setMulti__15dStage_roomDt_cFP14dStage_Multi_c, - (void*)getMulti__15dStage_roomDt_cCFv, - (void*)setOldMulti__15dStage_roomDt_cFv, - (void*)resetOldMulti__15dStage_roomDt_cFv, - (void*)getOldMulti__15dStage_roomDt_cCFv, - (void*)setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c, - (void*)getLbnk__15dStage_roomDt_cCFv, - (void*)setTresure__15dStage_roomDt_cFP19stage_tresure_class, - (void*)getTresure__15dStage_roomDt_cCFv, - (void*)setDMap__15dStage_roomDt_cFP13dStage_DMap_c, - (void*)getDMap__15dStage_roomDt_cCFv, - (void*)setDrTg__15dStage_roomDt_cFP16stage_tgsc_class, - (void*)getDrTg__15dStage_roomDt_cCFv, - (void*)setDoor__15dStage_roomDt_cFP16stage_tgsc_class, - (void*)getDoor__15dStage_roomDt_cCFv, - (void*)setMapPath__15dStage_roomDt_cFPv, - (void*)getMapPath__15dStage_roomDt_cFv, - (void*)setElst__15dStage_roomDt_cFP13dStage_Elst_c, - (void*)getElst__15dStage_roomDt_cFv, -}; - -/* 803A6C20-803A6D94 003D40 0174+00 0/0 1/1 0/0 .data __vt__16dStage_stageDt_c */ -SECTION_DATA extern void* __vt__16dStage_stageDt_c[93] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)init__16dStage_stageDt_cFv, - (void*)setCamera__16dStage_stageDt_cFP18stage_camera_class, - (void*)getCamera__16dStage_stageDt_cCFv, - (void*)setArrow__16dStage_stageDt_cFP17stage_arrow_class, - (void*)getArrow__16dStage_stageDt_cCFv, - (void*)setPlayer__16dStage_stageDt_cFP17stage_actor_class, - (void*)getPlayer__16dStage_stageDt_cCFv, - (void*)setPlayerNum__16dStage_stageDt_cFUs, - (void*)getPlayerNum__16dStage_stageDt_cCFv, - (void*)setRoom__16dStage_stageDt_cFP14roomRead_class, - (void*)getRoom__16dStage_stageDt_cCFv, - (void*)setMapInfo__16dStage_stageDt_cFP20stage_map_info_class, - (void*)getMapInfo__16dStage_stageDt_cCFv, - (void*)getMapInfo2__16dStage_stageDt_cCFi, - (void*)setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class, - (void*)getMapInfoBase__16dStage_stageDt_cCFv, - (void*)setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class, - (void*)getPaletteInfo__16dStage_stageDt_cCFv, - (void*)setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class, - (void*)getPselectInfo__16dStage_stageDt_cCFv, - (void*)setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class, - (void*)getEnvrInfo__16dStage_stageDt_cCFv, - (void*)setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class, - (void*)getVrboxInfo__16dStage_stageDt_cCFv, - (void*)setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class, - (void*)getVrboxcolInfo__16dStage_stageDt_cCFv, - (void*)setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class, - (void*)getPlightInfo__16dStage_stageDt_cCFv, - (void*)setPaletteNumInfo__16dStage_stageDt_cFi, - (void*)getPaletteNumInfo__16dStage_stageDt_cCFv, - (void*)setPselectNumInfo__16dStage_stageDt_cFi, - (void*)getPselectNumInfo__16dStage_stageDt_cCFv, - (void*)setEnvrNumInfo__16dStage_stageDt_cFi, - (void*)getEnvrNumInfo__16dStage_stageDt_cCFv, - (void*)setVrboxNumInfo__16dStage_stageDt_cFi, - (void*)getVrboxNumInfo__16dStage_stageDt_cCFv, - (void*)setVrboxcolNumInfo__16dStage_stageDt_cFi, - (void*)getVrboxcolNumInfo__16dStage_stageDt_cCFv, - (void*)setPlightNumInfo__16dStage_stageDt_cFi, - (void*)getPlightNumInfo__16dStage_stageDt_cCFv, - (void*)setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class, - (void*)getLightVecInfo__16dStage_stageDt_cCFv, - (void*)setLightVecInfoNum__16dStage_stageDt_cFi, - (void*)getLightVecInfoNum__16dStage_stageDt_cCFv, - (void*)setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class, - (void*)getStagInfo__16dStage_stageDt_cCFv, - (void*)setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class, - (void*)getSclsInfo__16dStage_stageDt_cCFv, - (void*)setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c, - (void*)getPntInf__16dStage_stageDt_cCFv, - (void*)setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c, - (void*)getPathInf__16dStage_stageDt_cCFv, - (void*)setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c, - (void*)getPnt2Inf__16dStage_stageDt_cCFv, - (void*)setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c, - (void*)getPath2Inf__16dStage_stageDt_cCFv, - (void*)setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c, - (void*)getSoundInf__16dStage_stageDt_cCFv, - (void*)setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c, - (void*)getSoundInfCL__16dStage_stageDt_cCFv, - (void*)setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c, - (void*)getMapEventInfo__16dStage_stageDt_cCFv, - (void*)setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c, - (void*)getFileList2Info__16dStage_stageDt_cCFv, - (void*)setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c, - (void*)getFileListInfo__16dStage_stageDt_cCFv, - (void*)setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c, - (void*)getFloorInfo__16dStage_stageDt_cCFv, - (void*)setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c, - (void*)getMemoryConfig__16dStage_stageDt_cCFv, - (void*)setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c, - (void*)getMemoryMap__16dStage_stageDt_cCFv, - (void*)setMulti__16dStage_stageDt_cFP14dStage_Multi_c, - (void*)getMulti__16dStage_stageDt_cCFv, - (void*)setOldMulti__16dStage_stageDt_cFv, - (void*)resetOldMulti__16dStage_stageDt_cFv, - (void*)getOldMulti__16dStage_stageDt_cCFv, - (void*)setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c, - (void*)getLbnk__16dStage_stageDt_cCFv, - (void*)setTresure__16dStage_stageDt_cFP19stage_tresure_class, - (void*)getTresure__16dStage_stageDt_cCFv, - (void*)setDMap__16dStage_stageDt_cFP13dStage_DMap_c, - (void*)getDMap__16dStage_stageDt_cCFv, - (void*)setDrTg__16dStage_stageDt_cFP16stage_tgsc_class, - (void*)getDrTg__16dStage_stageDt_cCFv, - (void*)setDoor__16dStage_stageDt_cFP16stage_tgsc_class, - (void*)getDoor__16dStage_stageDt_cCFv, - (void*)setMapPath__16dStage_stageDt_cFPv, - (void*)getMapPath__16dStage_stageDt_cFv, - (void*)setElst__16dStage_stageDt_cFP13dStage_Elst_c, - (void*)getElst__16dStage_stageDt_cFv, -}; - -/* 803A6D94-803A6F08 003EB4 0174+00 1/1 1/1 0/0 .data __vt__11dStage_dt_c */ -SECTION_DATA extern void* __vt__11dStage_dt_c[93] = { - (void*)NULL /* RTTI */, - (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*)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*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8002839C-80028418 022CDC 007C+00 1/1 0/0 0/0 .text __ct__19dStage_roomStatus_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dStage_roomStatus_c::dStage_roomStatus_c() { - nofralloc -#include "asm/d/d_stage/__ct__19dStage_roomStatus_cFv.s" -} -#pragma pop - -/* 80028418-8002847C 022D58 0064+00 1/1 0/0 0/0 .text __dt__19dStage_KeepDoorInfoFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dStage_KeepDoorInfo::~dStage_KeepDoorInfo() { - nofralloc -#include "asm/d/d_stage/__dt__19dStage_KeepDoorInfoFv.s" -} -#pragma pop - -stage_tgsc_data_class::~stage_tgsc_data_class() {} - -stage_tgsc_data_class::stage_tgsc_data_class() {} - /* ############################################################################################## */ /* 80450D7C-80450D80 -00001 0004+00 0/0 0/0 0/0 .sbss None */ #pragma push diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 2e6a8c5826..d20b83328a 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -568,7 +568,6 @@ extern "C" void cos(); extern "C" void sin(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern u8 const j3dDefaultLightInfo[52]; extern "C" extern void* __vt__12J3DFrameCtrl[3]; extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index f3db6a9726..a1aaf05966 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -670,7 +670,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void sprintf(); -extern "C" extern u8 const j3dDefaultLightInfo[52]; extern "C" extern void* __vt__19JPAParticleCallBack[5]; extern "C" extern void* __vt__8cM3dGPla[3]; extern "C" u8 j_o_id__8dPa_name[10 + 2 /* padding */]; diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 5e6b86549e..5002fdeffa 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -4,6 +4,7 @@ // #include "f_op/f_op_actor.h" +#include "d/d_stage.h" #include "dol2asm.h" #include "dolphin/mtx/mtx.h" #include "dolphin/types.h" @@ -23,18 +24,6 @@ struct daSus_c { /* 800314D4 */ void check(fopAc_ac_c*); }; -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dStage_roomDt_c { - /* 800193FC */ void getFileListInfo() const; -}; - -struct dStage_roomControl_c { - /* 80024384 */ void getStatusRoomDt(int); -}; - struct J3DModelData {}; struct dScnKy_env_light_c { @@ -157,7 +146,6 @@ extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); extern "C" void __construct_array(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern u8 const j3dDefaultLightInfo[52]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; @@ -195,7 +183,8 @@ extern "C" asm void __dt__5csXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DLightObj::J3DLightObj() { +// asm J3DLightObj::J3DLightObj() { +extern "C" asm void __ct__11J3DLightObjFv() { nofralloc #include "asm/f_op/f_op_actor/__ct__11J3DLightObjFv.s" } @@ -330,9 +319,11 @@ static asm void fopAc_Create(void* param_0) { /* 800193FC-80019404 013D3C 0008+00 0/0 1/0 0/0 .text getFileListInfo__15dStage_roomDt_cCFv */ #pragma push +#pragma force_active on #pragma optimization_level 0 #pragma optimizewithasm off -asm void dStage_roomDt_c::getFileListInfo() const { +// asm void dStage_roomDt_c::getFileListInfo() const { +extern "C" asm void getFileListInfo__15dStage_roomDt_cCFv() { nofralloc #include "asm/f_op/f_op_actor/getFileListInfo__15dStage_roomDt_cCFv.s" } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index fb8a3cf2f7..67c226a006 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -2714,7 +2714,8 @@ asm mDoExt_morf_c::mDoExt_morf_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/m_Do/m_Do_ext/__dt__12J3DFrameCtrlFv.s" } diff --git a/tools/tp.py b/tools/tp.py index f769ecddbf..d23c9a3f6d 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -324,6 +324,21 @@ def find_function_ranges(asm_files): return function_ranges +@tp.command(name="remove-unused-asm", help="remove all of the asm that is decompiled and not used anymore") +def remove_unused_asm_cmd(): + remove_unused_asm() + +def remove_unused_asm(): + unused_files, error_files = find_unused_asm_files(False) + + for unused_file in unused_files: + unused_file.unlink() + CONSOLE.print(f"removed '{unused_file}'") + + text = Text(" OK") + text.stylize("bold green") + CONSOLE.print(text) + @tp.command(name="pull-request") @click.option('--debug/--no-debug') @click.option('--thread-count', '-j', 'thread_count', help="This option is passed forward to all 'make' commands.", default=4) @@ -339,20 +354,7 @@ def pull_request(debug, thread_count, game_path, build_path): text.stylize("bold") CONSOLE.print(text) - # - text = Text("--- Removing Unused '.s' Files") - text.stylize("bold magenta") - CONSOLE.print(text) - - unused_files, error_files = find_unused_asm_files(False) - - for unused_file in unused_files: - unused_file.unlink() - CONSOLE.print(f"removed '{unused_file}'") - - text = Text(" OK") - text.stylize("bold green") - CONSOLE.print(text) + remove_unused_asm() # text = Text("--- Full Rebuild")