From 5be309a186d35e952080d73cc9584a8345d9e029 Mon Sep 17 00:00:00 2001 From: lepelog Date: Sun, 13 Jun 2021 00:20:45 +0200 Subject: [PATCH] c_cc_d (#132) * gnd check * more c_bg_s * start adding static asserts for size * Add more size checks * c_cc * c_cc progress * failed implementing cCcD_*Attr * progress * format * try destructor * data * remove unused asm * remove inlineCross * remove functions that didn't belong there * naming fix * match cCcD_SphAttr::CalcAabBox * cCcD_Stts::ClrTg * c_cc_s and mass fixes --- .../PreCheck__11cBgS_GndChkFv.s | 5 - .../SetPos__11cBgS_GndChkFPC3Vec.s | 8 - .../SetPos__11cBgS_GndChkFPC4cXyz.s | 8 - .../c_bg_s_gnd_chk/__ct__11cBgS_GndChkFv.s | 31 - .../c_bg_s_gnd_chk/__dt__11cBgS_GndChkFv.s | 32 - .../SComponent/c_bg_s_gnd_chk/func_80267D54.s | 3 - .../c_bg_s_lin_chk/PreCalc__11cBgS_LinChkFv.s | 17 - .../Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi.s | 29 - .../c_bg_s_lin_chk/__ct__11cBgS_LinChkFv.s | 25 - .../c_bg_s_lin_chk/__dt__11cBgS_LinChkFv.s | 38 - .../c_bg_s_lin_chk/ct__11cBgS_LinChkFv.s | 35 - .../SComponent/c_bg_s_lin_chk/func_80267F80.s | 3 - .../Set__13cBgS_ShdwDrawFR4cXyzR4cXyz.s | 10 - .../__ct__13cBgS_ShdwDrawFv.s | 19 - .../__dt__13cBgS_ShdwDrawFv.s | 33 - .../c_cc_d/CalcAabBox__12cCcD_CpsAttrFv.s | 21 - .../c_cc_d/CalcAabBox__12cCcD_CylAttrFv.s | 27 - .../c_cc_d/CalcAabBox__12cCcD_SphAttrFv.s | 36 - .../c_cc_d/CalcAabBox__12cCcD_TriAttrFv.s | 39 - ...DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab.s | 141 --- ...videAreaFP15cCcD_DivideInfoRC8cM3dGAabUl.s | 127 -- ...__15cCcD_DivideInfoCFRC15cCcD_DivideInfo.s | 19 - .../c_cc_d/ClrCcMove__9cCcD_SttsFv.s | 6 - .../c_cc_d/ClrHit__10cCcD_ObjAtFv.s | 7 - .../c_cc_d/ClrHit__10cCcD_ObjCoFv.s | 7 - .../c_cc_d/ClrHit__10cCcD_ObjTgFv.s | 7 - .../SComponent/c_cc_d/ClrTg__9cCcD_SttsFv.s | 4 - ...__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz.s | 21 - ...__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz.s | 21 - ...__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz.s | 21 - ...__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz.s | 53 - ...__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz.s | 23 - ...__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz.s | 21 - ...__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz.s | 21 - ...__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz.s | 15 - ...__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz.s | 23 - ...__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz.s | 21 - ...__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz.s | 21 - ...__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz.s | 15 - ...__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz.s | 53 - ...__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz.s | 15 - ...__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz.s | 16 - ...__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz.s | 15 - ...ssCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf.s | 24 - ...ssCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf.s | 24 - ...ssCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf.s | 24 - ...ssCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf.s | 26 - ...ssCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf.s | 21 - ...ssCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf.s | 21 - ...ssCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf.s | 26 - ...ssCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf.s | 23 - ...ssCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf.s | 21 - .../SComponent/c_cc_d/Ct__9cCcD_SttsFv.s | 13 - .../SComponent/c_cc_d/GetAc__8cCcD_ObjFv.s | 9 - .../GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz.s | 97 -- .../GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz.s | 64 - .../GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz.s | 42 - .../GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz.s | 42 - .../c_cc_d/GetWeightF__9cCcD_SttsCFv.s | 12 - .../c_cc_d/Init__9cCcD_SttsFiiPvUi.s | 25 - .../c_cc_d/PlusCcMove__9cCcD_SttsFfff.s | 11 - .../SComponent/c_cc_d/PlusDmg__9cCcD_SttsFi.s | 6 - .../SetArea__15cCcD_DivideAreaFRC8cM3dGAab.s | 79 -- .../c_cc_d/SetGrp__10cCcD_ObjTgFUl.s | 8 - .../c_cc_d/SetHit__10cCcD_ObjAtFP8cCcD_Obj.s | 5 - .../c_cc_d/SetHit__10cCcD_ObjCoFP8cCcD_Obj.s | 5 - .../c_cc_d/SetHit__10cCcD_ObjTgFP8cCcD_Obj.s | 5 - .../c_cc_d/SetIGrp__10cCcD_ObjCoFUl.s | 8 - .../c_cc_d/SetVsGrp__10cCcD_ObjCoFUl.s | 8 - .../Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt.s | 8 - .../Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg.s | 6 - ...__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf.s | 20 - .../c_cc_d/Set__15cCcD_DivideInfoFUlUlUl.s | 5 - .../c_cc_d/Set__8cCcD_ObjFRC11cCcD_SrcObj.s | 12 - .../c_cc_d/ct__18cCcD_ObjCommonBaseFv.s | 6 - .../SComponent/c_cc_d/ct__8cCcD_ObjFv.s | 4 - ...2cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape.s | 14 - ...2cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape.s | 14 - ...CcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape.s | 10 - include/SSystem/SComponent/c_bg_s_chk.h | 3 +- include/SSystem/SComponent/c_bg_s_gnd_chk.h | 24 +- include/SSystem/SComponent/c_bg_s_lin_chk.h | 12 +- include/SSystem/SComponent/c_bg_s_shdw_draw.h | 10 +- include/SSystem/SComponent/c_cc_d.h | 349 +++--- include/SSystem/SComponent/c_cc_s.h | 60 +- include/SSystem/SComponent/c_m3d.h | 5 + include/SSystem/SComponent/c_m3d_g_aab.h | 11 +- include/SSystem/SComponent/c_m3d_g_cps.h | 18 +- include/SSystem/SComponent/c_m3d_g_cyl.h | 19 +- include/SSystem/SComponent/c_m3d_g_lin.h | 11 +- include/SSystem/SComponent/c_m3d_g_pla.h | 2 +- include/SSystem/SComponent/c_m3d_g_sph.h | 14 +- include/SSystem/SComponent/c_m3d_g_tri.h | 19 +- include/d/cc/d_cc_d.h | 16 +- include/d/cc/d_cc_mass_s.h | 35 +- include/d/cc/d_cc_s.h | 5 +- include/d/com/d_com_inf_game.h | 3 +- include/global.h | 4 + libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp | 113 +- libs/SSystem/SComponent/c_bg_s_lin_chk.cpp | 101 +- libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp | 61 +- libs/SSystem/SComponent/c_cc_d.cpp | 1025 +++++++++-------- libs/SSystem/SComponent/c_cc_s.cpp | 195 ++-- libs/SSystem/SComponent/c_m3d.cpp | 4 - libs/SSystem/SComponent/c_m3d_g_cps.cpp | 6 +- libs/SSystem/SComponent/c_m3d_g_tri.cpp | 6 +- src/d/a/d_a_alink.cpp | 6 +- src/d/bg/d_bg_s_acch.cpp | 1 - src/d/bg/d_bg_w.cpp | 4 +- src/d/cc/d_cc_d.cpp | 143 ++- src/d/com/d_com_inf_game.cpp | 6 +- 111 files changed, 1167 insertions(+), 2984 deletions(-) delete mode 100644 asm/SSystem/SComponent/c_bg_s_gnd_chk/PreCheck__11cBgS_GndChkFv.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC3Vec.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_gnd_chk/__ct__11cBgS_GndChkFv.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_gnd_chk/__dt__11cBgS_GndChkFv.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_gnd_chk/func_80267D54.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_lin_chk/PreCalc__11cBgS_LinChkFv.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_lin_chk/Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_lin_chk/__ct__11cBgS_LinChkFv.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_lin_chk/__dt__11cBgS_LinChkFv.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_lin_chk/ct__11cBgS_LinChkFv.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_lin_chk/func_80267F80.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_shdw_draw/Set__13cBgS_ShdwDrawFR4cXyzR4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_shdw_draw/__ct__13cBgS_ShdwDrawFv.s delete mode 100644 asm/SSystem/SComponent/c_bg_s_shdw_draw/__dt__13cBgS_ShdwDrawFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CpsAttrFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CylAttrFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_SphAttrFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_TriAttrFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/ClrCcMove__9cCcD_SttsFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjAtFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjCoFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjTgFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/ClrTg__9cCcD_SttsFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/Ct__9cCcD_SttsFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/GetAc__8cCcD_ObjFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/GetWeightF__9cCcD_SttsCFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/Init__9cCcD_SttsFiiPvUi.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/PlusCcMove__9cCcD_SttsFfff.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/PlusDmg__9cCcD_SttsFi.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/SetArea__15cCcD_DivideAreaFRC8cM3dGAab.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/SetGrp__10cCcD_ObjTgFUl.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjAtFP8cCcD_Obj.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjCoFP8cCcD_Obj.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjTgFP8cCcD_Obj.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/SetIGrp__10cCcD_ObjCoFUl.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/SetVsGrp__10cCcD_ObjCoFUl.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/Set__15cCcD_DivideInfoFUlUlUl.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/Set__8cCcD_ObjFRC11cCcD_SrcObj.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/ct__18cCcD_ObjCommonBaseFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/ct__8cCcD_ObjFv.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape.s delete mode 100644 asm/SSystem/SComponent/c_cc_d/getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape.s diff --git a/asm/SSystem/SComponent/c_bg_s_gnd_chk/PreCheck__11cBgS_GndChkFv.s b/asm/SSystem/SComponent/c_bg_s_gnd_chk/PreCheck__11cBgS_GndChkFv.s deleted file mode 100644 index 5e2d197af23..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_gnd_chk/PreCheck__11cBgS_GndChkFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80267D44: -/* 80267D44 80 03 00 30 */ lwz r0, 0x30(r3) -/* 80267D48 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 80267D4C 90 03 00 38 */ stw r0, 0x38(r3) -/* 80267D50 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC3Vec.s b/asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC3Vec.s deleted file mode 100644 index f2cba9eb306..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC3Vec.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80267D0C: -/* 80267D0C C0 04 00 00 */ lfs f0, 0(r4) -/* 80267D10 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 80267D14 C0 04 00 04 */ lfs f0, 4(r4) -/* 80267D18 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80267D1C C0 04 00 08 */ lfs f0, 8(r4) -/* 80267D20 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 80267D24 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC4cXyz.s b/asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC4cXyz.s deleted file mode 100644 index 34bc7351950..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC4cXyz.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80267D28: -/* 80267D28 C0 04 00 00 */ lfs f0, 0(r4) -/* 80267D2C D0 03 00 24 */ stfs f0, 0x24(r3) -/* 80267D30 C0 04 00 04 */ lfs f0, 4(r4) -/* 80267D34 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80267D38 C0 04 00 08 */ lfs f0, 8(r4) -/* 80267D3C D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 80267D40 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_gnd_chk/__ct__11cBgS_GndChkFv.s b/asm/SSystem/SComponent/c_bg_s_gnd_chk/__ct__11cBgS_GndChkFv.s deleted file mode 100644 index c3e3645ed66..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_gnd_chk/__ct__11cBgS_GndChkFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80267C1C: -/* 80267C1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80267C20 7C 08 02 A6 */ mflr r0 -/* 80267C24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80267C28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80267C2C 7C 7F 1B 78 */ mr r31, r3 -/* 80267C30 4B FF FF 1D */ bl __ct__8cBgS_ChkFv -/* 80267C34 38 7F 00 14 */ addi r3, r31, 0x14 -/* 80267C38 48 00 04 3D */ bl __ct__13cBgS_PolyInfoFv -/* 80267C3C 3C 60 80 3C */ lis r3, __vt__11cBgS_GndChk@ha /* 0x803C3F90@ha */ -/* 80267C40 38 63 3F 90 */ addi r3, r3, __vt__11cBgS_GndChk@l /* 0x803C3F90@l */ -/* 80267C44 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80267C48 38 03 00 0C */ addi r0, r3, 0xc -/* 80267C4C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80267C50 3C 60 80 43 */ lis r3, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80267C54 C4 03 0C F4 */ lfsu f0, Zero__4cXyz@l(r3) /* 0x80430CF4@l */ -/* 80267C58 D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 80267C5C C0 03 00 04 */ lfs f0, 4(r3) -/* 80267C60 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 80267C64 C0 03 00 08 */ lfs f0, 8(r3) -/* 80267C68 D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 80267C6C 38 00 FF FF */ li r0, -1 -/* 80267C70 90 1F 00 08 */ stw r0, 8(r31) -/* 80267C74 38 00 00 02 */ li r0, 2 -/* 80267C78 90 1F 00 30 */ stw r0, 0x30(r31) -/* 80267C7C 7F E3 FB 78 */ mr r3, r31 -/* 80267C80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80267C84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80267C88 7C 08 03 A6 */ mtlr r0 -/* 80267C8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267C90 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_gnd_chk/__dt__11cBgS_GndChkFv.s b/asm/SSystem/SComponent/c_bg_s_gnd_chk/__dt__11cBgS_GndChkFv.s deleted file mode 100644 index 915e6b469c8..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_gnd_chk/__dt__11cBgS_GndChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80267C94: -/* 80267C94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80267C98 7C 08 02 A6 */ mflr r0 -/* 80267C9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80267CA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80267CA4 93 C1 00 08 */ stw r30, 8(r1) -/* 80267CA8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80267CAC 7C 9F 23 78 */ mr r31, r4 -/* 80267CB0 41 82 00 40 */ beq lbl_80267CF0 -/* 80267CB4 3C 60 80 3C */ lis r3, __vt__11cBgS_GndChk@ha /* 0x803C3F90@ha */ -/* 80267CB8 38 63 3F 90 */ addi r3, r3, __vt__11cBgS_GndChk@l /* 0x803C3F90@l */ -/* 80267CBC 90 7E 00 10 */ stw r3, 0x10(r30) -/* 80267CC0 38 03 00 0C */ addi r0, r3, 0xc -/* 80267CC4 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80267CC8 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80267CCC 38 80 00 00 */ li r4, 0 -/* 80267CD0 48 00 03 E1 */ bl __dt__13cBgS_PolyInfoFv -/* 80267CD4 7F C3 F3 78 */ mr r3, r30 -/* 80267CD8 38 80 00 00 */ li r4, 0 -/* 80267CDC 4B FF FE 95 */ bl __dt__8cBgS_ChkFv -/* 80267CE0 7F E0 07 35 */ extsh. r0, r31 -/* 80267CE4 40 81 00 0C */ ble lbl_80267CF0 -/* 80267CE8 7F C3 F3 78 */ mr r3, r30 -/* 80267CEC 48 06 70 51 */ bl __dl__FPv -lbl_80267CF0: -/* 80267CF0 7F C3 F3 78 */ mr r3, r30 -/* 80267CF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80267CF8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80267CFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80267D00 7C 08 03 A6 */ mtlr r0 -/* 80267D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267D08 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_gnd_chk/func_80267D54.s b/asm/SSystem/SComponent/c_bg_s_gnd_chk/func_80267D54.s deleted file mode 100644 index a8a6779ec73..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_gnd_chk/func_80267D54.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80267D54: -/* 80267D54 38 63 FF EC */ addi r3, r3, -20 -/* 80267D58 4B FF FF 3C */ b __dt__11cBgS_GndChkFv diff --git a/asm/SSystem/SComponent/c_bg_s_lin_chk/PreCalc__11cBgS_LinChkFv.s b/asm/SSystem/SComponent/c_bg_s_lin_chk/PreCalc__11cBgS_LinChkFv.s deleted file mode 100644 index a9d28df70a5..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_lin_chk/PreCalc__11cBgS_LinChkFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80267F40: -/* 80267F40 80 03 00 4C */ lwz r0, 0x4c(r3) -/* 80267F44 54 00 00 42 */ rlwinm r0, r0, 0, 1, 1 -/* 80267F48 7C 00 00 34 */ cntlzw r0, r0 -/* 80267F4C 54 00 D9 7E */ srwi r0, r0, 5 -/* 80267F50 98 03 00 50 */ stb r0, 0x50(r3) -/* 80267F54 80 03 00 4C */ lwz r0, 0x4c(r3) -/* 80267F58 54 00 00 00 */ rlwinm r0, r0, 0, 0, 0 -/* 80267F5C 7C 00 00 34 */ cntlzw r0, r0 -/* 80267F60 54 00 D9 7E */ srwi r0, r0, 5 -/* 80267F64 98 03 00 51 */ stb r0, 0x51(r3) -/* 80267F68 80 03 00 4C */ lwz r0, 0x4c(r3) -/* 80267F6C 54 00 00 84 */ rlwinm r0, r0, 0, 2, 2 -/* 80267F70 7C 00 00 34 */ cntlzw r0, r0 -/* 80267F74 54 00 D9 7E */ srwi r0, r0, 5 -/* 80267F78 98 03 00 52 */ stb r0, 0x52(r3) -/* 80267F7C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_lin_chk/Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi.s b/asm/SSystem/SComponent/c_bg_s_lin_chk/Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi.s deleted file mode 100644 index 2894f896d6c..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_lin_chk/Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80267ED0: -/* 80267ED0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80267ED4 7C 08 02 A6 */ mflr r0 -/* 80267ED8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80267EDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80267EE0 48 0F A2 FD */ bl _savegpr_29 -/* 80267EE4 7C 7D 1B 78 */ mr r29, r3 -/* 80267EE8 7C BE 2B 78 */ mr r30, r5 -/* 80267EEC 7C DF 33 78 */ mr r31, r6 -/* 80267EF0 38 7D 00 24 */ addi r3, r29, 0x24 -/* 80267EF4 48 00 73 F5 */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz -/* 80267EF8 C0 1E 00 00 */ lfs f0, 0(r30) -/* 80267EFC D0 1D 00 40 */ stfs f0, 0x40(r29) -/* 80267F00 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80267F04 D0 1D 00 44 */ stfs f0, 0x44(r29) -/* 80267F08 C0 1E 00 08 */ lfs f0, 8(r30) -/* 80267F0C D0 1D 00 48 */ stfs f0, 0x48(r29) -/* 80267F10 93 FD 00 08 */ stw r31, 8(r29) -/* 80267F14 80 1D 00 4C */ lwz r0, 0x4c(r29) -/* 80267F18 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80267F1C 90 1D 00 4C */ stw r0, 0x4c(r29) -/* 80267F20 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80267F24 48 00 01 FD */ bl ClearPi__13cBgS_PolyInfoFv -/* 80267F28 39 61 00 20 */ addi r11, r1, 0x20 -/* 80267F2C 48 0F A2 FD */ bl _restgpr_29 -/* 80267F30 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80267F34 7C 08 03 A6 */ mtlr r0 -/* 80267F38 38 21 00 20 */ addi r1, r1, 0x20 -/* 80267F3C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_lin_chk/__ct__11cBgS_LinChkFv.s b/asm/SSystem/SComponent/c_bg_s_lin_chk/__ct__11cBgS_LinChkFv.s deleted file mode 100644 index 377b8af09b9..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_lin_chk/__ct__11cBgS_LinChkFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80267D5C: -/* 80267D5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80267D60 7C 08 02 A6 */ mflr r0 -/* 80267D64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80267D68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80267D6C 7C 7F 1B 78 */ mr r31, r3 -/* 80267D70 4B FF FD DD */ bl __ct__8cBgS_ChkFv -/* 80267D74 38 7F 00 14 */ addi r3, r31, 0x14 -/* 80267D78 48 00 02 FD */ bl __ct__13cBgS_PolyInfoFv -/* 80267D7C 3C 60 80 3C */ lis r3, __vt__11cBgS_LinChk@ha /* 0x803C3FA8@ha */ -/* 80267D80 38 63 3F A8 */ addi r3, r3, __vt__11cBgS_LinChk@l /* 0x803C3FA8@l */ -/* 80267D84 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80267D88 38 03 00 0C */ addi r0, r3, 0xc -/* 80267D8C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80267D90 3C 60 80 3A */ lis r3, __vt__8cM3dGLin@ha /* 0x803A78F8@ha */ -/* 80267D94 38 03 78 F8 */ addi r0, r3, __vt__8cM3dGLin@l /* 0x803A78F8@l */ -/* 80267D98 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 80267D9C 7F E3 FB 78 */ mr r3, r31 -/* 80267DA0 48 00 00 A9 */ bl ct__11cBgS_LinChkFv -/* 80267DA4 7F E3 FB 78 */ mr r3, r31 -/* 80267DA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80267DAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80267DB0 7C 08 03 A6 */ mtlr r0 -/* 80267DB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267DB8 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_lin_chk/__dt__11cBgS_LinChkFv.s b/asm/SSystem/SComponent/c_bg_s_lin_chk/__dt__11cBgS_LinChkFv.s deleted file mode 100644 index a8aa5ae822d..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_lin_chk/__dt__11cBgS_LinChkFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80267DBC: -/* 80267DBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80267DC0 7C 08 02 A6 */ mflr r0 -/* 80267DC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80267DC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80267DCC 93 C1 00 08 */ stw r30, 8(r1) -/* 80267DD0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80267DD4 7C 9F 23 78 */ mr r31, r4 -/* 80267DD8 41 82 00 54 */ beq lbl_80267E2C -/* 80267DDC 3C 60 80 3C */ lis r3, __vt__11cBgS_LinChk@ha /* 0x803C3FA8@ha */ -/* 80267DE0 38 63 3F A8 */ addi r3, r3, __vt__11cBgS_LinChk@l /* 0x803C3FA8@l */ -/* 80267DE4 90 7E 00 10 */ stw r3, 0x10(r30) -/* 80267DE8 38 03 00 0C */ addi r0, r3, 0xc -/* 80267DEC 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80267DF0 34 1E 00 24 */ addic. r0, r30, 0x24 -/* 80267DF4 41 82 00 10 */ beq lbl_80267E04 -/* 80267DF8 3C 60 80 3A */ lis r3, __vt__8cM3dGLin@ha /* 0x803A78F8@ha */ -/* 80267DFC 38 03 78 F8 */ addi r0, r3, __vt__8cM3dGLin@l /* 0x803A78F8@l */ -/* 80267E00 90 1E 00 3C */ stw r0, 0x3c(r30) -lbl_80267E04: -/* 80267E04 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80267E08 38 80 00 00 */ li r4, 0 -/* 80267E0C 48 00 02 A5 */ bl __dt__13cBgS_PolyInfoFv -/* 80267E10 7F C3 F3 78 */ mr r3, r30 -/* 80267E14 38 80 00 00 */ li r4, 0 -/* 80267E18 4B FF FD 59 */ bl __dt__8cBgS_ChkFv -/* 80267E1C 7F E0 07 35 */ extsh. r0, r31 -/* 80267E20 40 81 00 0C */ ble lbl_80267E2C -/* 80267E24 7F C3 F3 78 */ mr r3, r30 -/* 80267E28 48 06 6F 15 */ bl __dl__FPv -lbl_80267E2C: -/* 80267E2C 7F C3 F3 78 */ mr r3, r30 -/* 80267E30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80267E34 83 C1 00 08 */ lwz r30, 8(r1) -/* 80267E38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80267E3C 7C 08 03 A6 */ mtlr r0 -/* 80267E40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267E44 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_lin_chk/ct__11cBgS_LinChkFv.s b/asm/SSystem/SComponent/c_bg_s_lin_chk/ct__11cBgS_LinChkFv.s deleted file mode 100644 index 5b0741eaa66..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_lin_chk/ct__11cBgS_LinChkFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80267E48: -/* 80267E48 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80267E4C 7C 08 02 A6 */ mflr r0 -/* 80267E50 90 01 00 24 */ stw r0, 0x24(r1) -/* 80267E54 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80267E58 7C 7F 1B 78 */ mr r31, r3 -/* 80267E5C 3C 60 80 43 */ lis r3, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80267E60 C4 03 0C F4 */ lfsu f0, Zero__4cXyz@l(r3) /* 0x80430CF4@l */ -/* 80267E64 D0 01 00 08 */ stfs f0, 8(r1) -/* 80267E68 C0 03 00 04 */ lfs f0, 4(r3) -/* 80267E6C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80267E70 C0 03 00 08 */ lfs f0, 8(r3) -/* 80267E74 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80267E78 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80267E7C 38 81 00 08 */ addi r4, r1, 8 -/* 80267E80 7C 85 23 78 */ mr r5, r4 -/* 80267E84 48 00 74 65 */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz -/* 80267E88 C0 01 00 08 */ lfs f0, 8(r1) -/* 80267E8C D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 80267E90 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80267E94 D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 80267E98 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80267E9C D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 80267EA0 38 00 FF FF */ li r0, -1 -/* 80267EA4 90 1F 00 08 */ stw r0, 8(r31) -/* 80267EA8 38 60 00 00 */ li r3, 0 -/* 80267EAC 90 7F 00 4C */ stw r3, 0x4c(r31) -/* 80267EB0 38 00 00 01 */ li r0, 1 -/* 80267EB4 98 1F 00 53 */ stb r0, 0x53(r31) -/* 80267EB8 98 7F 00 54 */ stb r3, 0x54(r31) -/* 80267EBC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80267EC0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80267EC4 7C 08 03 A6 */ mtlr r0 -/* 80267EC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80267ECC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_lin_chk/func_80267F80.s b/asm/SSystem/SComponent/c_bg_s_lin_chk/func_80267F80.s deleted file mode 100644 index 478e08532c2..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_lin_chk/func_80267F80.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80267F80: -/* 80267F80 38 63 FF EC */ addi r3, r3, -20 -/* 80267F84 4B FF FE 38 */ b __dt__11cBgS_LinChkFv diff --git a/asm/SSystem/SComponent/c_bg_s_shdw_draw/Set__13cBgS_ShdwDrawFR4cXyzR4cXyz.s b/asm/SSystem/SComponent/c_bg_s_shdw_draw/Set__13cBgS_ShdwDrawFR4cXyzR4cXyz.s deleted file mode 100644 index 65714bf124b..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_shdw_draw/Set__13cBgS_ShdwDrawFR4cXyzR4cXyz.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80268048: -/* 80268048 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026804C 7C 08 02 A6 */ mflr r0 -/* 80268050 90 01 00 14 */ stw r0, 0x14(r1) -/* 80268054 38 63 00 14 */ addi r3, r3, 0x14 -/* 80268058 48 00 6B FD */ bl Set__8cM3dGAabFPC4cXyzPC4cXyz -/* 8026805C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80268060 7C 08 03 A6 */ mtlr r0 -/* 80268064 38 21 00 10 */ addi r1, r1, 0x10 -/* 80268068 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_shdw_draw/__ct__13cBgS_ShdwDrawFv.s b/asm/SSystem/SComponent/c_bg_s_shdw_draw/__ct__13cBgS_ShdwDrawFv.s deleted file mode 100644 index be52b957cb5..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_shdw_draw/__ct__13cBgS_ShdwDrawFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80267F88: -/* 80267F88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80267F8C 7C 08 02 A6 */ mflr r0 -/* 80267F90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80267F94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80267F98 7C 7F 1B 78 */ mr r31, r3 -/* 80267F9C 4B FF FB B1 */ bl __ct__8cBgS_ChkFv -/* 80267FA0 3C 60 80 3C */ lis r3, __vt__13cBgS_ShdwDraw@ha /* 0x803C3FC0@ha */ -/* 80267FA4 38 03 3F C0 */ addi r0, r3, __vt__13cBgS_ShdwDraw@l /* 0x803C3FC0@l */ -/* 80267FA8 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80267FAC 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80267FB0 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80267FB4 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 80267FB8 7F E3 FB 78 */ mr r3, r31 -/* 80267FBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80267FC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80267FC4 7C 08 03 A6 */ mtlr r0 -/* 80267FC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267FCC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_shdw_draw/__dt__13cBgS_ShdwDrawFv.s b/asm/SSystem/SComponent/c_bg_s_shdw_draw/__dt__13cBgS_ShdwDrawFv.s deleted file mode 100644 index fbdd4ce23c8..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_shdw_draw/__dt__13cBgS_ShdwDrawFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80267FD0: -/* 80267FD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80267FD4 7C 08 02 A6 */ mflr r0 -/* 80267FD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80267FDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80267FE0 93 C1 00 08 */ stw r30, 8(r1) -/* 80267FE4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80267FE8 7C 9F 23 78 */ mr r31, r4 -/* 80267FEC 41 82 00 40 */ beq lbl_8026802C -/* 80267FF0 3C 60 80 3C */ lis r3, __vt__13cBgS_ShdwDraw@ha /* 0x803C3FC0@ha */ -/* 80267FF4 38 03 3F C0 */ addi r0, r3, __vt__13cBgS_ShdwDraw@l /* 0x803C3FC0@l */ -/* 80267FF8 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80267FFC 34 1E 00 14 */ addic. r0, r30, 0x14 -/* 80268000 41 82 00 10 */ beq lbl_80268010 -/* 80268004 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80268008 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 8026800C 90 1E 00 2C */ stw r0, 0x2c(r30) -lbl_80268010: -/* 80268010 7F C3 F3 78 */ mr r3, r30 -/* 80268014 38 80 00 00 */ li r4, 0 -/* 80268018 4B FF FB 59 */ bl __dt__8cBgS_ChkFv -/* 8026801C 7F E0 07 35 */ extsh. r0, r31 -/* 80268020 40 81 00 0C */ ble lbl_8026802C -/* 80268024 7F C3 F3 78 */ mr r3, r30 -/* 80268028 48 06 6D 15 */ bl __dl__FPv -lbl_8026802C: -/* 8026802C 7F C3 F3 78 */ mr r3, r30 -/* 80268030 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80268034 83 C1 00 08 */ lwz r30, 8(r1) -/* 80268038 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026803C 7C 08 03 A6 */ mtlr r0 -/* 80268040 38 21 00 10 */ addi r1, r1, 0x10 -/* 80268044 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CpsAttrFv.s b/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CpsAttrFv.s deleted file mode 100644 index 3ddd8136465..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CpsAttrFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80263FC4: -/* 80263FC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263FC8 7C 08 02 A6 */ mflr r0 -/* 80263FCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263FD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80263FD4 7C 7F 1B 78 */ mr r31, r3 -/* 80263FD8 48 00 AD 21 */ bl ClearForMinMax__8cM3dGAabFv -/* 80263FDC 7F E3 FB 78 */ mr r3, r31 -/* 80263FE0 38 9F 00 20 */ addi r4, r31, 0x20 -/* 80263FE4 48 00 AD 39 */ bl SetMinMax__8cM3dGAabFRC4cXyz -/* 80263FE8 7F E3 FB 78 */ mr r3, r31 -/* 80263FEC 38 9F 00 2C */ addi r4, r31, 0x2c -/* 80263FF0 48 00 AD 2D */ bl SetMinMax__8cM3dGAabFRC4cXyz -/* 80263FF4 7F E3 FB 78 */ mr r3, r31 -/* 80263FF8 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80263FFC 48 00 AE 6D */ bl PlusR__8cM3dGAabFf -/* 80264000 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80264004 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80264008 7C 08 03 A6 */ mtlr r0 -/* 8026400C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264010 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CylAttrFv.s b/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CylAttrFv.s deleted file mode 100644 index d5821edcfae..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CylAttrFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80264368: -/* 80264368 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026436C 7C 08 02 A6 */ mflr r0 -/* 80264370 90 01 00 24 */ stw r0, 0x24(r1) -/* 80264374 C0 83 00 20 */ lfs f4, 0x20(r3) -/* 80264378 C0 63 00 2C */ lfs f3, 0x2c(r3) -/* 8026437C EC 04 18 28 */ fsubs f0, f4, f3 -/* 80264380 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80264384 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 80264388 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 8026438C C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80264390 EC 01 18 28 */ fsubs f0, f1, f3 -/* 80264394 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80264398 EC 04 18 2A */ fadds f0, f4, f3 -/* 8026439C D0 01 00 08 */ stfs f0, 8(r1) -/* 802643A0 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 802643A4 EC 02 00 2A */ fadds f0, f2, f0 -/* 802643A8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802643AC EC 01 18 2A */ fadds f0, f1, f3 -/* 802643B0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802643B4 38 81 00 14 */ addi r4, r1, 0x14 -/* 802643B8 38 A1 00 08 */ addi r5, r1, 8 -/* 802643BC 48 00 A8 99 */ bl Set__8cM3dGAabFPC4cXyzPC4cXyz -/* 802643C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802643C4 7C 08 03 A6 */ mtlr r0 -/* 802643C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802643CC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_SphAttrFv.s b/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_SphAttrFv.s deleted file mode 100644 index 2f4b2c76049..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_SphAttrFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_802646E0: -/* 802646E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802646E4 7C 08 02 A6 */ mflr r0 -/* 802646E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802646EC C0 83 00 20 */ lfs f4, 0x20(r3) -/* 802646F0 D0 81 00 08 */ stfs f4, 8(r1) -/* 802646F4 C0 63 00 24 */ lfs f3, 0x24(r3) -/* 802646F8 D0 61 00 0C */ stfs f3, 0xc(r1) -/* 802646FC C0 43 00 28 */ lfs f2, 0x28(r3) -/* 80264700 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80264704 D0 81 00 14 */ stfs f4, 0x14(r1) -/* 80264708 D0 61 00 18 */ stfs f3, 0x18(r1) -/* 8026470C D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80264710 FC 00 20 18 */ frsp f0, f4 -/* 80264714 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80264718 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8026471C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80264720 FC 00 18 18 */ frsp f0, f3 -/* 80264724 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80264728 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8026472C FC 00 10 18 */ frsp f0, f2 -/* 80264730 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80264734 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80264738 EC 04 08 2A */ fadds f0, f4, f1 -/* 8026473C D0 01 00 08 */ stfs f0, 8(r1) -/* 80264740 EC 03 08 2A */ fadds f0, f3, f1 -/* 80264744 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80264748 EC 02 08 2A */ fadds f0, f2, f1 -/* 8026474C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80264750 38 81 00 14 */ addi r4, r1, 0x14 -/* 80264754 38 A1 00 08 */ addi r5, r1, 8 -/* 80264758 48 00 A4 FD */ bl Set__8cM3dGAabFPC4cXyzPC4cXyz -/* 8026475C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80264760 7C 08 03 A6 */ mtlr r0 -/* 80264764 38 21 00 20 */ addi r1, r1, 0x20 -/* 80264768 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_TriAttrFv.s b/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_TriAttrFv.s deleted file mode 100644 index 27d700d51fa..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_TriAttrFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80263C04: -/* 80263C04 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80263C08 7C 08 02 A6 */ mflr r0 -/* 80263C0C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80263C10 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80263C14 7C 7F 1B 78 */ mr r31, r3 -/* 80263C18 48 00 B0 E1 */ bl ClearForMinMax__8cM3dGAabFv -/* 80263C1C C0 1F 00 34 */ lfs f0, 0x34(r31) -/* 80263C20 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80263C24 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80263C28 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80263C2C C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80263C30 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80263C34 7F E3 FB 78 */ mr r3, r31 -/* 80263C38 38 81 00 20 */ addi r4, r1, 0x20 -/* 80263C3C 48 00 B0 E1 */ bl SetMinMax__8cM3dGAabFRC4cXyz -/* 80263C40 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80263C44 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80263C48 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80263C4C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80263C50 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 80263C54 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80263C58 7F E3 FB 78 */ mr r3, r31 -/* 80263C5C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80263C60 48 00 B0 BD */ bl SetMinMax__8cM3dGAabFRC4cXyz -/* 80263C64 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80263C68 D0 01 00 08 */ stfs f0, 8(r1) -/* 80263C6C C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80263C70 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80263C74 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80263C78 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80263C7C 7F E3 FB 78 */ mr r3, r31 -/* 80263C80 38 81 00 08 */ addi r4, r1, 8 -/* 80263C84 48 00 B0 99 */ bl SetMinMax__8cM3dGAabFRC4cXyz -/* 80263C88 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80263C8C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80263C90 7C 08 03 A6 */ mtlr r0 -/* 80263C94 38 21 00 40 */ addi r1, r1, 0x40 -/* 80263C98 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab.s b/asm/SSystem/SComponent/c_cc_d/CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab.s deleted file mode 100644 index 1c6d957c557..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab.s +++ /dev/null @@ -1,141 +0,0 @@ -lbl_802636A0: -/* 802636A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802636A4 7C 08 02 A6 */ mflr r0 -/* 802636A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802636AC 88 03 00 1C */ lbz r0, 0x1c(r3) -/* 802636B0 28 00 00 00 */ cmplwi r0, 0 -/* 802636B4 40 82 00 8C */ bne lbl_80263740 -/* 802636B8 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 802636BC C0 05 00 00 */ lfs f0, 0(r5) -/* 802636C0 C0 23 00 00 */ lfs f1, 0(r3) -/* 802636C4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802636C8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802636CC FC 00 00 1E */ fctiwz f0, f0 -/* 802636D0 D8 01 00 08 */ stfd f0, 8(r1) -/* 802636D4 81 01 00 0C */ lwz r8, 0xc(r1) -/* 802636D8 C0 05 00 0C */ lfs f0, 0xc(r5) -/* 802636DC EC 00 08 28 */ fsubs f0, f0, f1 -/* 802636E0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802636E4 FC 00 00 1E */ fctiwz f0, f0 -/* 802636E8 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 802636EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802636F0 2C 00 00 00 */ cmpwi r0, 0 -/* 802636F4 41 80 00 0C */ blt lbl_80263700 -/* 802636F8 2C 08 00 1F */ cmpwi r8, 0x1f -/* 802636FC 40 81 00 0C */ ble lbl_80263708 -lbl_80263700: -/* 80263700 38 E0 00 00 */ li r7, 0 -/* 80263704 48 00 00 40 */ b lbl_80263744 -lbl_80263708: -/* 80263708 2C 00 00 1F */ cmpwi r0, 0x1f -/* 8026370C 40 81 00 08 */ ble lbl_80263714 -/* 80263710 38 00 00 1F */ li r0, 0x1f -lbl_80263714: -/* 80263714 54 00 10 3A */ slwi r0, r0, 2 -/* 80263718 3C C0 80 3A */ lis r6, l_base@ha /* 0x8039A7E8@ha */ -/* 8026371C 38 C6 A7 E8 */ addi r6, r6, l_base@l /* 0x8039A7E8@l */ -/* 80263720 7C E6 00 2E */ lwzx r7, r6, r0 -/* 80263724 2C 08 00 00 */ cmpwi r8, 0 -/* 80263728 40 81 00 1C */ ble lbl_80263744 -/* 8026372C 38 08 FF FF */ addi r0, r8, -1 -/* 80263730 54 00 10 3A */ slwi r0, r0, 2 -/* 80263734 7C 06 00 2E */ lwzx r0, r6, r0 -/* 80263738 7C E7 00 78 */ andc r7, r7, r0 -/* 8026373C 48 00 00 08 */ b lbl_80263744 -lbl_80263740: -/* 80263740 38 E0 FF FF */ li r7, -1 -lbl_80263744: -/* 80263744 88 03 00 28 */ lbz r0, 0x28(r3) -/* 80263748 28 00 00 00 */ cmplwi r0, 0 -/* 8026374C 40 82 00 8C */ bne lbl_802637D8 -/* 80263750 C0 43 00 30 */ lfs f2, 0x30(r3) -/* 80263754 C0 05 00 04 */ lfs f0, 4(r5) -/* 80263758 C0 23 00 04 */ lfs f1, 4(r3) -/* 8026375C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80263760 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80263764 FC 00 00 1E */ fctiwz f0, f0 -/* 80263768 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8026376C 81 21 00 14 */ lwz r9, 0x14(r1) -/* 80263770 C0 05 00 10 */ lfs f0, 0x10(r5) -/* 80263774 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80263778 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8026377C FC 00 00 1E */ fctiwz f0, f0 -/* 80263780 D8 01 00 08 */ stfd f0, 8(r1) -/* 80263784 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80263788 2C 00 00 00 */ cmpwi r0, 0 -/* 8026378C 41 80 00 0C */ blt lbl_80263798 -/* 80263790 2C 09 00 1F */ cmpwi r9, 0x1f -/* 80263794 40 81 00 0C */ ble lbl_802637A0 -lbl_80263798: -/* 80263798 39 00 00 00 */ li r8, 0 -/* 8026379C 48 00 00 40 */ b lbl_802637DC -lbl_802637A0: -/* 802637A0 2C 00 00 1F */ cmpwi r0, 0x1f -/* 802637A4 40 81 00 08 */ ble lbl_802637AC -/* 802637A8 38 00 00 1F */ li r0, 0x1f -lbl_802637AC: -/* 802637AC 54 00 10 3A */ slwi r0, r0, 2 -/* 802637B0 3C C0 80 3A */ lis r6, l_base@ha /* 0x8039A7E8@ha */ -/* 802637B4 38 C6 A7 E8 */ addi r6, r6, l_base@l /* 0x8039A7E8@l */ -/* 802637B8 7D 06 00 2E */ lwzx r8, r6, r0 -/* 802637BC 2C 09 00 00 */ cmpwi r9, 0 -/* 802637C0 40 81 00 1C */ ble lbl_802637DC -/* 802637C4 38 09 FF FF */ addi r0, r9, -1 -/* 802637C8 54 00 10 3A */ slwi r0, r0, 2 -/* 802637CC 7C 06 00 2E */ lwzx r0, r6, r0 -/* 802637D0 7D 08 00 78 */ andc r8, r8, r0 -/* 802637D4 48 00 00 08 */ b lbl_802637DC -lbl_802637D8: -/* 802637D8 39 00 FF FF */ li r8, -1 -lbl_802637DC: -/* 802637DC 88 03 00 34 */ lbz r0, 0x34(r3) -/* 802637E0 28 00 00 00 */ cmplwi r0, 0 -/* 802637E4 40 82 00 8C */ bne lbl_80263870 -/* 802637E8 C0 43 00 3C */ lfs f2, 0x3c(r3) -/* 802637EC C0 05 00 08 */ lfs f0, 8(r5) -/* 802637F0 C0 23 00 08 */ lfs f1, 8(r3) -/* 802637F4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802637F8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802637FC FC 00 00 1E */ fctiwz f0, f0 -/* 80263800 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80263804 81 21 00 14 */ lwz r9, 0x14(r1) -/* 80263808 C0 05 00 14 */ lfs f0, 0x14(r5) -/* 8026380C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80263810 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80263814 FC 00 00 1E */ fctiwz f0, f0 -/* 80263818 D8 01 00 08 */ stfd f0, 8(r1) -/* 8026381C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80263820 2C 00 00 00 */ cmpwi r0, 0 -/* 80263824 41 80 00 0C */ blt lbl_80263830 -/* 80263828 2C 09 00 1F */ cmpwi r9, 0x1f -/* 8026382C 40 81 00 0C */ ble lbl_80263838 -lbl_80263830: -/* 80263830 38 C0 00 00 */ li r6, 0 -/* 80263834 48 00 00 40 */ b lbl_80263874 -lbl_80263838: -/* 80263838 2C 00 00 1F */ cmpwi r0, 0x1f -/* 8026383C 40 81 00 08 */ ble lbl_80263844 -/* 80263840 38 00 00 1F */ li r0, 0x1f -lbl_80263844: -/* 80263844 54 00 10 3A */ slwi r0, r0, 2 -/* 80263848 3C 60 80 3A */ lis r3, l_base@ha /* 0x8039A7E8@ha */ -/* 8026384C 38 63 A7 E8 */ addi r3, r3, l_base@l /* 0x8039A7E8@l */ -/* 80263850 7C C3 00 2E */ lwzx r6, r3, r0 -/* 80263854 2C 09 00 00 */ cmpwi r9, 0 -/* 80263858 40 81 00 1C */ ble lbl_80263874 -/* 8026385C 38 09 FF FF */ addi r0, r9, -1 -/* 80263860 54 00 10 3A */ slwi r0, r0, 2 -/* 80263864 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80263868 7C C6 00 78 */ andc r6, r6, r0 -/* 8026386C 48 00 00 08 */ b lbl_80263874 -lbl_80263870: -/* 80263870 38 C0 FF FF */ li r6, -1 -lbl_80263874: -/* 80263874 7C 83 23 78 */ mr r3, r4 -/* 80263878 7C E4 3B 78 */ mr r4, r7 -/* 8026387C 7D 05 43 78 */ mr r5, r8 -/* 80263880 4B FF FA D9 */ bl Set__15cCcD_DivideInfoFUlUlUl -/* 80263884 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80263888 7C 08 03 A6 */ mtlr r0 -/* 8026388C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80263890 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl.s b/asm/SSystem/SComponent/c_cc_d/CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl.s deleted file mode 100644 index def1bb8be32..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_802634D4: -/* 802634D4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802634D8 7C 08 02 A6 */ mflr r0 -/* 802634DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802634E0 28 06 00 00 */ cmplwi r6, 0 -/* 802634E4 41 82 00 1C */ beq lbl_80263500 -/* 802634E8 7C 83 23 78 */ mr r3, r4 -/* 802634EC 38 80 FF FF */ li r4, -1 -/* 802634F0 38 A0 FF FF */ li r5, -1 -/* 802634F4 38 C0 FF FF */ li r6, -1 -/* 802634F8 4B FF FE 61 */ bl Set__15cCcD_DivideInfoFUlUlUl -/* 802634FC 48 00 01 94 */ b lbl_80263690 -lbl_80263500: -/* 80263500 88 03 00 1C */ lbz r0, 0x1c(r3) -/* 80263504 28 00 00 00 */ cmplwi r0, 0 -/* 80263508 40 82 00 74 */ bne lbl_8026357C -/* 8026350C C0 43 00 24 */ lfs f2, 0x24(r3) -/* 80263510 C0 05 00 00 */ lfs f0, 0(r5) -/* 80263514 C0 23 00 00 */ lfs f1, 0(r3) -/* 80263518 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8026351C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80263520 FC 00 00 1E */ fctiwz f0, f0 -/* 80263524 D8 01 00 08 */ stfd f0, 8(r1) -/* 80263528 81 01 00 0C */ lwz r8, 0xc(r1) -/* 8026352C C0 05 00 0C */ lfs f0, 0xc(r5) -/* 80263530 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80263534 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80263538 FC 00 00 1E */ fctiwz f0, f0 -/* 8026353C D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80263540 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263544 2C 00 00 1F */ cmpwi r0, 0x1f -/* 80263548 40 81 00 08 */ ble lbl_80263550 -/* 8026354C 38 00 00 1F */ li r0, 0x1f -lbl_80263550: -/* 80263550 54 00 10 3A */ slwi r0, r0, 2 -/* 80263554 3C C0 80 3A */ lis r6, l_base@ha /* 0x8039A7E8@ha */ -/* 80263558 38 C6 A7 E8 */ addi r6, r6, l_base@l /* 0x8039A7E8@l */ -/* 8026355C 7C E6 00 2E */ lwzx r7, r6, r0 -/* 80263560 2C 08 00 00 */ cmpwi r8, 0 -/* 80263564 40 81 00 1C */ ble lbl_80263580 -/* 80263568 38 08 FF FF */ addi r0, r8, -1 -/* 8026356C 54 00 10 3A */ slwi r0, r0, 2 -/* 80263570 7C 06 00 2E */ lwzx r0, r6, r0 -/* 80263574 7C E7 00 78 */ andc r7, r7, r0 -/* 80263578 48 00 00 08 */ b lbl_80263580 -lbl_8026357C: -/* 8026357C 38 E0 FF FF */ li r7, -1 -lbl_80263580: -/* 80263580 88 03 00 28 */ lbz r0, 0x28(r3) -/* 80263584 28 00 00 00 */ cmplwi r0, 0 -/* 80263588 40 82 00 74 */ bne lbl_802635FC -/* 8026358C C0 43 00 30 */ lfs f2, 0x30(r3) -/* 80263590 C0 05 00 04 */ lfs f0, 4(r5) -/* 80263594 C0 23 00 04 */ lfs f1, 4(r3) -/* 80263598 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8026359C EC 02 00 32 */ fmuls f0, f2, f0 -/* 802635A0 FC 00 00 1E */ fctiwz f0, f0 -/* 802635A4 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 802635A8 81 21 00 14 */ lwz r9, 0x14(r1) -/* 802635AC C0 05 00 10 */ lfs f0, 0x10(r5) -/* 802635B0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802635B4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802635B8 FC 00 00 1E */ fctiwz f0, f0 -/* 802635BC D8 01 00 08 */ stfd f0, 8(r1) -/* 802635C0 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802635C4 2C 00 00 1F */ cmpwi r0, 0x1f -/* 802635C8 40 81 00 08 */ ble lbl_802635D0 -/* 802635CC 38 00 00 1F */ li r0, 0x1f -lbl_802635D0: -/* 802635D0 54 00 10 3A */ slwi r0, r0, 2 -/* 802635D4 3C C0 80 3A */ lis r6, l_base@ha /* 0x8039A7E8@ha */ -/* 802635D8 38 C6 A7 E8 */ addi r6, r6, l_base@l /* 0x8039A7E8@l */ -/* 802635DC 7D 06 00 2E */ lwzx r8, r6, r0 -/* 802635E0 2C 09 00 00 */ cmpwi r9, 0 -/* 802635E4 40 81 00 1C */ ble lbl_80263600 -/* 802635E8 38 09 FF FF */ addi r0, r9, -1 -/* 802635EC 54 00 10 3A */ slwi r0, r0, 2 -/* 802635F0 7C 06 00 2E */ lwzx r0, r6, r0 -/* 802635F4 7D 08 00 78 */ andc r8, r8, r0 -/* 802635F8 48 00 00 08 */ b lbl_80263600 -lbl_802635FC: -/* 802635FC 39 00 FF FF */ li r8, -1 -lbl_80263600: -/* 80263600 88 03 00 34 */ lbz r0, 0x34(r3) -/* 80263604 28 00 00 00 */ cmplwi r0, 0 -/* 80263608 40 82 00 74 */ bne lbl_8026367C -/* 8026360C C0 43 00 3C */ lfs f2, 0x3c(r3) -/* 80263610 C0 05 00 08 */ lfs f0, 8(r5) -/* 80263614 C0 23 00 08 */ lfs f1, 8(r3) -/* 80263618 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8026361C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80263620 FC 00 00 1E */ fctiwz f0, f0 -/* 80263624 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80263628 81 21 00 14 */ lwz r9, 0x14(r1) -/* 8026362C C0 05 00 14 */ lfs f0, 0x14(r5) -/* 80263630 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80263634 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80263638 FC 00 00 1E */ fctiwz f0, f0 -/* 8026363C D8 01 00 08 */ stfd f0, 8(r1) -/* 80263640 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80263644 2C 00 00 1F */ cmpwi r0, 0x1f -/* 80263648 40 81 00 08 */ ble lbl_80263650 -/* 8026364C 38 00 00 1F */ li r0, 0x1f -lbl_80263650: -/* 80263650 54 00 10 3A */ slwi r0, r0, 2 -/* 80263654 3C 60 80 3A */ lis r3, l_base@ha /* 0x8039A7E8@ha */ -/* 80263658 38 63 A7 E8 */ addi r3, r3, l_base@l /* 0x8039A7E8@l */ -/* 8026365C 7C C3 00 2E */ lwzx r6, r3, r0 -/* 80263660 2C 09 00 00 */ cmpwi r9, 0 -/* 80263664 40 81 00 1C */ ble lbl_80263680 -/* 80263668 38 09 FF FF */ addi r0, r9, -1 -/* 8026366C 54 00 10 3A */ slwi r0, r0, 2 -/* 80263670 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80263674 7C C6 00 78 */ andc r6, r6, r0 -/* 80263678 48 00 00 08 */ b lbl_80263680 -lbl_8026367C: -/* 8026367C 38 C0 FF FF */ li r6, -1 -lbl_80263680: -/* 80263680 7C 83 23 78 */ mr r3, r4 -/* 80263684 7C E4 3B 78 */ mr r4, r7 -/* 80263688 7D 05 43 78 */ mr r5, r8 -/* 8026368C 4B FF FC CD */ bl Set__15cCcD_DivideInfoFUlUlUl -lbl_80263690: -/* 80263690 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80263694 7C 08 03 A6 */ mtlr r0 -/* 80263698 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026369C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo.s b/asm/SSystem/SComponent/c_cc_d/Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo.s deleted file mode 100644 index be40d56d599..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80263368: -/* 80263368 80 A3 00 00 */ lwz r5, 0(r3) -/* 8026336C 80 04 00 00 */ lwz r0, 0(r4) -/* 80263370 7C A0 00 39 */ and. r0, r5, r0 -/* 80263374 41 82 00 24 */ beq lbl_80263398 -/* 80263378 80 A3 00 08 */ lwz r5, 8(r3) -/* 8026337C 80 04 00 08 */ lwz r0, 8(r4) -/* 80263380 7C A0 00 39 */ and. r0, r5, r0 -/* 80263384 41 82 00 14 */ beq lbl_80263398 -/* 80263388 80 63 00 04 */ lwz r3, 4(r3) -/* 8026338C 80 04 00 04 */ lwz r0, 4(r4) -/* 80263390 7C 60 00 39 */ and. r0, r3, r0 -/* 80263394 40 82 00 0C */ bne lbl_802633A0 -lbl_80263398: -/* 80263398 38 60 00 00 */ li r3, 0 -/* 8026339C 4E 80 00 20 */ blr -lbl_802633A0: -/* 802633A0 38 60 00 01 */ li r3, 1 -/* 802633A4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/ClrCcMove__9cCcD_SttsFv.s b/asm/SSystem/SComponent/c_cc_d/ClrCcMove__9cCcD_SttsFv.s deleted file mode 100644 index b84347a5359..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/ClrCcMove__9cCcD_SttsFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8026395C: -/* 8026395C C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80263960 D0 03 00 08 */ stfs f0, 8(r3) -/* 80263964 D0 03 00 04 */ stfs f0, 4(r3) -/* 80263968 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026396C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjAtFv.s b/asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjAtFv.s deleted file mode 100644 index 67b58e9ddea..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjAtFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80264868: -/* 80264868 80 03 00 04 */ lwz r0, 4(r3) -/* 8026486C 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80264870 90 03 00 04 */ stw r0, 4(r3) -/* 80264874 38 00 00 00 */ li r0, 0 -/* 80264878 90 03 00 08 */ stw r0, 8(r3) -/* 8026487C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjCoFv.s b/asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjCoFv.s deleted file mode 100644 index bd2dc2b75f3..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjCoFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_802648E8: -/* 802648E8 80 03 00 04 */ lwz r0, 4(r3) -/* 802648EC 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 802648F0 90 03 00 04 */ stw r0, 4(r3) -/* 802648F4 38 00 00 00 */ li r0, 0 -/* 802648F8 90 03 00 08 */ stw r0, 8(r3) -/* 802648FC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjTgFv.s b/asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjTgFv.s deleted file mode 100644 index 9f3817d8530..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjTgFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_802648B0: -/* 802648B0 80 03 00 04 */ lwz r0, 4(r3) -/* 802648B4 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 802648B8 90 03 00 04 */ stw r0, 4(r3) -/* 802648BC 38 00 00 00 */ li r0, 0 -/* 802648C0 90 03 00 08 */ stw r0, 8(r3) -/* 802648C4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/ClrTg__9cCcD_SttsFv.s b/asm/SSystem/SComponent/c_cc_d/ClrTg__9cCcD_SttsFv.s deleted file mode 100644 index 3cb5e3a2fdb..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/ClrTg__9cCcD_SttsFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802649EC: -/* 802649EC 38 00 00 00 */ li r0, 0 -/* 802649F0 98 03 00 16 */ stb r0, 0x16(r3) -/* 802649F4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz.s deleted file mode 100644 index 4d3d359097a..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80263D38: -/* 80263D38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263D3C 7C 08 02 A6 */ mflr r0 -/* 80263D40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263D44 28 04 00 00 */ cmplwi r4, 0 -/* 80263D48 41 82 00 08 */ beq lbl_80263D50 -/* 80263D4C 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80263D50: -/* 80263D50 38 63 00 20 */ addi r3, r3, 0x20 -/* 80263D54 48 00 93 C1 */ bl cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec -/* 80263D58 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80263D5C 41 82 00 0C */ beq lbl_80263D68 -/* 80263D60 38 60 00 01 */ li r3, 1 -/* 80263D64 48 00 00 08 */ b lbl_80263D6C -lbl_80263D68: -/* 80263D68 38 60 00 00 */ li r3, 0 -lbl_80263D6C: -/* 80263D6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263D70 7C 08 03 A6 */ mtlr r0 -/* 80263D74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263D78 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz.s deleted file mode 100644 index 90063a4a3e6..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80263D7C: -/* 80263D7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263D80 7C 08 02 A6 */ mflr r0 -/* 80263D84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263D88 28 04 00 00 */ cmplwi r4, 0 -/* 80263D8C 41 82 00 08 */ beq lbl_80263D94 -/* 80263D90 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80263D94: -/* 80263D94 38 63 00 20 */ addi r3, r3, 0x20 -/* 80263D98 48 00 96 3D */ bl cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec -/* 80263D9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80263DA0 41 82 00 0C */ beq lbl_80263DAC -/* 80263DA4 38 60 00 01 */ li r3, 1 -/* 80263DA8 48 00 00 08 */ b lbl_80263DB0 -lbl_80263DAC: -/* 80263DAC 38 60 00 00 */ li r3, 0 -lbl_80263DB0: -/* 80263DB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263DB4 7C 08 03 A6 */ mtlr r0 -/* 80263DB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263DBC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz.s deleted file mode 100644 index c8296860ae9..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80263DC0: -/* 80263DC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263DC4 7C 08 02 A6 */ mflr r0 -/* 80263DC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263DCC 28 04 00 00 */ cmplwi r4, 0 -/* 80263DD0 41 82 00 08 */ beq lbl_80263DD8 -/* 80263DD4 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80263DD8: -/* 80263DD8 38 63 00 20 */ addi r3, r3, 0x20 -/* 80263DDC 48 00 9E 61 */ bl cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec -/* 80263DE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80263DE4 41 82 00 0C */ beq lbl_80263DF0 -/* 80263DE8 38 60 00 01 */ li r3, 1 -/* 80263DEC 48 00 00 08 */ b lbl_80263DF4 -lbl_80263DF0: -/* 80263DF0 38 60 00 00 */ li r3, 0 -lbl_80263DF4: -/* 80263DF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263DF8 7C 08 03 A6 */ mtlr r0 -/* 80263DFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263E00 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz.s deleted file mode 100644 index 17ea1205f0c..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80263E04: -/* 80263E04 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80263E08 7C 08 02 A6 */ mflr r0 -/* 80263E0C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80263E10 3C C0 80 3A */ lis r6, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80263E14 38 06 37 C0 */ addi r0, r6, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80263E18 90 01 00 18 */ stw r0, 0x18(r1) -/* 80263E1C C0 04 00 20 */ lfs f0, 0x20(r4) -/* 80263E20 D0 01 00 08 */ stfs f0, 8(r1) -/* 80263E24 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 80263E28 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80263E2C C0 04 00 28 */ lfs f0, 0x28(r4) -/* 80263E30 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80263E34 C0 04 00 2C */ lfs f0, 0x2c(r4) -/* 80263E38 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80263E3C 3C C0 80 3B */ lis r6, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 80263E40 38 06 BB 84 */ addi r0, r6, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 80263E44 90 01 00 18 */ stw r0, 0x18(r1) -/* 80263E48 80 C4 00 34 */ lwz r6, 0x34(r4) -/* 80263E4C 80 04 00 38 */ lwz r0, 0x38(r4) -/* 80263E50 90 C1 00 1C */ stw r6, 0x1c(r1) -/* 80263E54 90 01 00 20 */ stw r0, 0x20(r1) -/* 80263E58 80 04 00 3C */ lwz r0, 0x3c(r4) -/* 80263E5C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80263E60 80 C4 00 40 */ lwz r6, 0x40(r4) -/* 80263E64 80 04 00 44 */ lwz r0, 0x44(r4) -/* 80263E68 90 C1 00 28 */ stw r6, 0x28(r1) -/* 80263E6C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80263E70 80 04 00 48 */ lwz r0, 0x48(r4) -/* 80263E74 90 01 00 30 */ stw r0, 0x30(r1) -/* 80263E78 80 C4 00 4C */ lwz r6, 0x4c(r4) -/* 80263E7C 80 04 00 50 */ lwz r0, 0x50(r4) -/* 80263E80 90 C1 00 34 */ stw r6, 0x34(r1) -/* 80263E84 90 01 00 38 */ stw r0, 0x38(r1) -/* 80263E88 80 04 00 54 */ lwz r0, 0x54(r4) -/* 80263E8C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80263E90 38 63 00 20 */ addi r3, r3, 0x20 -/* 80263E94 38 81 00 08 */ addi r4, r1, 8 -/* 80263E98 48 00 A2 95 */ bl cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec -/* 80263E9C 3C 80 80 3B */ lis r4, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 80263EA0 38 04 BB 84 */ addi r0, r4, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 80263EA4 90 01 00 18 */ stw r0, 0x18(r1) -/* 80263EA8 3C 80 80 3A */ lis r4, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80263EAC 38 04 37 C0 */ addi r0, r4, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80263EB0 90 01 00 18 */ stw r0, 0x18(r1) -/* 80263EB4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 80263EB8 30 03 FF FF */ addic r0, r3, -1 -/* 80263EBC 7C 00 19 10 */ subfe r0, r0, r3 -/* 80263EC0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80263EC4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80263EC8 7C 08 03 A6 */ mtlr r0 -/* 80263ECC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80263ED0 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz.s deleted file mode 100644 index dfd4de143e8..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8026417C: -/* 8026417C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80264180 7C 08 02 A6 */ mflr r0 -/* 80264184 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264188 7C 66 1B 78 */ mr r6, r3 -/* 8026418C 28 04 00 00 */ cmplwi r4, 0 -/* 80264190 41 82 00 08 */ beq lbl_80264198 -/* 80264194 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80264198: -/* 80264198 7C 83 23 78 */ mr r3, r4 -/* 8026419C 38 86 00 20 */ addi r4, r6, 0x20 -/* 802641A0 48 00 92 35 */ bl cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec -/* 802641A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802641A8 41 82 00 0C */ beq lbl_802641B4 -/* 802641AC 38 60 00 01 */ li r3, 1 -/* 802641B0 48 00 00 08 */ b lbl_802641B8 -lbl_802641B4: -/* 802641B4 38 60 00 00 */ li r3, 0 -lbl_802641B8: -/* 802641B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802641BC 7C 08 03 A6 */ mtlr r0 -/* 802641C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802641C4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz.s deleted file mode 100644 index b16f1fdcafb..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_802641C8: -/* 802641C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802641CC 7C 08 02 A6 */ mflr r0 -/* 802641D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802641D4 28 04 00 00 */ cmplwi r4, 0 -/* 802641D8 41 82 00 08 */ beq lbl_802641E0 -/* 802641DC 38 84 00 20 */ addi r4, r4, 0x20 -lbl_802641E0: -/* 802641E0 38 63 00 20 */ addi r3, r3, 0x20 -/* 802641E4 48 00 B0 49 */ bl cross__8cM3dGCylCFPC8cM3dGCylP4cXyz -/* 802641E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802641EC 41 82 00 0C */ beq lbl_802641F8 -/* 802641F0 38 60 00 01 */ li r3, 1 -/* 802641F4 48 00 00 08 */ b lbl_802641FC -lbl_802641F8: -/* 802641F8 38 60 00 00 */ li r3, 0 -lbl_802641FC: -/* 802641FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80264200 7C 08 03 A6 */ mtlr r0 -/* 80264204 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264208 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz.s deleted file mode 100644 index 108c6fdf356..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8026420C: -/* 8026420C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80264210 7C 08 02 A6 */ mflr r0 -/* 80264214 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264218 28 04 00 00 */ cmplwi r4, 0 -/* 8026421C 41 82 00 08 */ beq lbl_80264224 -/* 80264220 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80264224: -/* 80264224 38 63 00 20 */ addi r3, r3, 0x20 -/* 80264228 48 00 AF E1 */ bl cross__8cM3dGCylCFPC8cM3dGSphP4cXyz -/* 8026422C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80264230 41 82 00 0C */ beq lbl_8026423C -/* 80264234 38 60 00 01 */ li r3, 1 -/* 80264238 48 00 00 08 */ b lbl_80264240 -lbl_8026423C: -/* 8026423C 38 60 00 00 */ li r3, 0 -lbl_80264240: -/* 80264240 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80264244 7C 08 03 A6 */ mtlr r0 -/* 80264248 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026424C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz.s deleted file mode 100644 index 8550d883087..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80264250: -/* 80264250 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80264254 7C 08 02 A6 */ mflr r0 -/* 80264258 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026425C 38 63 00 20 */ addi r3, r3, 0x20 -/* 80264260 38 84 00 20 */ addi r4, r4, 0x20 -/* 80264264 48 00 83 6D */ bl cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec -/* 80264268 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8026426C 30 03 FF FF */ addic r0, r3, -1 -/* 80264270 7C 00 19 10 */ subfe r0, r0, r3 -/* 80264274 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80264278 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026427C 7C 08 03 A6 */ mtlr r0 -/* 80264280 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264284 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz.s deleted file mode 100644 index 9dc352c9539..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802644EC: -/* 802644EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802644F0 7C 08 02 A6 */ mflr r0 -/* 802644F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802644F8 7C 66 1B 78 */ mr r6, r3 -/* 802644FC 28 04 00 00 */ cmplwi r4, 0 -/* 80264500 41 82 00 08 */ beq lbl_80264508 -/* 80264504 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80264508: -/* 80264508 7C 83 23 78 */ mr r3, r4 -/* 8026450C 38 86 00 20 */ addi r4, r6, 0x20 -/* 80264510 48 00 97 2D */ bl cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec -/* 80264514 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80264518 41 82 00 0C */ beq lbl_80264524 -/* 8026451C 38 60 00 01 */ li r3, 1 -/* 80264520 48 00 00 08 */ b lbl_80264528 -lbl_80264524: -/* 80264524 38 60 00 00 */ li r3, 0 -lbl_80264528: -/* 80264528 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026452C 7C 08 03 A6 */ mtlr r0 -/* 80264530 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264534 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz.s deleted file mode 100644 index a83c5630bf5..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80264538: -/* 80264538 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026453C 7C 08 02 A6 */ mflr r0 -/* 80264540 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264544 28 04 00 00 */ cmplwi r4, 0 -/* 80264548 41 82 00 08 */ beq lbl_80264550 -/* 8026454C 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80264550: -/* 80264550 38 63 00 20 */ addi r3, r3, 0x20 -/* 80264554 48 00 B1 E9 */ bl cross__8cM3dGSphCFPC8cM3dGCylP4cXyz -/* 80264558 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8026455C 41 82 00 0C */ beq lbl_80264568 -/* 80264560 38 60 00 01 */ li r3, 1 -/* 80264564 48 00 00 08 */ b lbl_8026456C -lbl_80264568: -/* 80264568 38 60 00 00 */ li r3, 0 -lbl_8026456C: -/* 8026456C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80264570 7C 08 03 A6 */ mtlr r0 -/* 80264574 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264578 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz.s deleted file mode 100644 index 62ec59dcdfa..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8026457C: -/* 8026457C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80264580 7C 08 02 A6 */ mflr r0 -/* 80264584 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264588 28 04 00 00 */ cmplwi r4, 0 -/* 8026458C 41 82 00 08 */ beq lbl_80264594 -/* 80264590 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80264594: -/* 80264594 38 63 00 20 */ addi r3, r3, 0x20 -/* 80264598 48 00 B1 79 */ bl cross__8cM3dGSphCFPC8cM3dGSphP4cXyz -/* 8026459C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802645A0 41 82 00 0C */ beq lbl_802645AC -/* 802645A4 38 60 00 01 */ li r3, 1 -/* 802645A8 48 00 00 08 */ b lbl_802645B0 -lbl_802645AC: -/* 802645AC 38 60 00 00 */ li r3, 0 -lbl_802645B0: -/* 802645B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802645B4 7C 08 03 A6 */ mtlr r0 -/* 802645B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802645BC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz.s deleted file mode 100644 index e086bafc525..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802645C0: -/* 802645C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802645C4 7C 08 02 A6 */ mflr r0 -/* 802645C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802645CC 38 63 00 20 */ addi r3, r3, 0x20 -/* 802645D0 38 84 00 20 */ addi r4, r4, 0x20 -/* 802645D4 48 00 79 31 */ bl cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec -/* 802645D8 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 802645DC 30 03 FF FF */ addic r0, r3, -1 -/* 802645E0 7C 00 19 10 */ subfe r0, r0, r3 -/* 802645E4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 802645E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802645EC 7C 08 03 A6 */ mtlr r0 -/* 802645F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802645F4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz.s deleted file mode 100644 index 1dd126f0dfd..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80263A88: -/* 80263A88 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80263A8C 7C 08 02 A6 */ mflr r0 -/* 80263A90 90 01 00 44 */ stw r0, 0x44(r1) -/* 80263A94 3C C0 80 3A */ lis r6, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80263A98 38 06 37 C0 */ addi r0, r6, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80263A9C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80263AA0 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80263AA4 D0 01 00 08 */ stfs f0, 8(r1) -/* 80263AA8 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80263AAC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80263AB0 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 80263AB4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80263AB8 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 80263ABC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80263AC0 3C C0 80 3B */ lis r6, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 80263AC4 38 06 BB 84 */ addi r0, r6, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 80263AC8 90 01 00 18 */ stw r0, 0x18(r1) -/* 80263ACC 80 C3 00 34 */ lwz r6, 0x34(r3) -/* 80263AD0 80 03 00 38 */ lwz r0, 0x38(r3) -/* 80263AD4 90 C1 00 1C */ stw r6, 0x1c(r1) -/* 80263AD8 90 01 00 20 */ stw r0, 0x20(r1) -/* 80263ADC 80 03 00 3C */ lwz r0, 0x3c(r3) -/* 80263AE0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80263AE4 80 C3 00 40 */ lwz r6, 0x40(r3) -/* 80263AE8 80 03 00 44 */ lwz r0, 0x44(r3) -/* 80263AEC 90 C1 00 28 */ stw r6, 0x28(r1) -/* 80263AF0 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80263AF4 80 03 00 48 */ lwz r0, 0x48(r3) -/* 80263AF8 90 01 00 30 */ stw r0, 0x30(r1) -/* 80263AFC 80 C3 00 4C */ lwz r6, 0x4c(r3) -/* 80263B00 80 03 00 50 */ lwz r0, 0x50(r3) -/* 80263B04 90 C1 00 34 */ stw r6, 0x34(r1) -/* 80263B08 90 01 00 38 */ stw r0, 0x38(r1) -/* 80263B0C 80 03 00 54 */ lwz r0, 0x54(r3) -/* 80263B10 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80263B14 38 64 00 20 */ addi r3, r4, 0x20 -/* 80263B18 38 81 00 08 */ addi r4, r1, 8 -/* 80263B1C 48 00 A6 11 */ bl cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec -/* 80263B20 3C 80 80 3B */ lis r4, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 80263B24 38 04 BB 84 */ addi r0, r4, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 80263B28 90 01 00 18 */ stw r0, 0x18(r1) -/* 80263B2C 3C 80 80 3A */ lis r4, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80263B30 38 04 37 C0 */ addi r0, r4, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80263B34 90 01 00 18 */ stw r0, 0x18(r1) -/* 80263B38 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 80263B3C 30 03 FF FF */ addic r0, r3, -1 -/* 80263B40 7C 00 19 10 */ subfe r0, r0, r3 -/* 80263B44 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80263B48 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80263B4C 7C 08 03 A6 */ mtlr r0 -/* 80263B50 38 21 00 40 */ addi r1, r1, 0x40 -/* 80263B54 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz.s deleted file mode 100644 index af199e29947..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80263B58: -/* 80263B58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263B5C 7C 08 02 A6 */ mflr r0 -/* 80263B60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263B64 38 63 00 20 */ addi r3, r3, 0x20 -/* 80263B68 38 84 00 20 */ addi r4, r4, 0x20 -/* 80263B6C 48 00 BC 45 */ bl cross__8cM3dGTriCFPC8cM3dGCylP3Vec -/* 80263B70 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 80263B74 30 03 FF FF */ addic r0, r3, -1 -/* 80263B78 7C 00 19 10 */ subfe r0, r0, r3 -/* 80263B7C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80263B80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263B84 7C 08 03 A6 */ mtlr r0 -/* 80263B88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263B8C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz.s deleted file mode 100644 index c2d04f1c680..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80263B90: -/* 80263B90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263B94 7C 08 02 A6 */ mflr r0 -/* 80263B98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263B9C 7C 66 1B 78 */ mr r6, r3 -/* 80263BA0 38 64 00 20 */ addi r3, r4, 0x20 -/* 80263BA4 38 86 00 20 */ addi r4, r6, 0x20 -/* 80263BA8 48 00 83 5D */ bl cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec -/* 80263BAC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 80263BB0 30 03 FF FF */ addic r0, r3, -1 -/* 80263BB4 7C 00 19 10 */ subfe r0, r0, r3 -/* 80263BB8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80263BBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263BC0 7C 08 03 A6 */ mtlr r0 -/* 80263BC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263BC8 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz.s deleted file mode 100644 index 0fe7d39e396..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80263BCC: -/* 80263BCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263BD0 7C 08 02 A6 */ mflr r0 -/* 80263BD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263BD8 38 63 00 20 */ addi r3, r3, 0x20 -/* 80263BDC 38 84 00 20 */ addi r4, r4, 0x20 -/* 80263BE0 48 00 A2 4D */ bl cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec -/* 80263BE4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 80263BE8 30 03 FF FF */ addic r0, r3, -1 -/* 80263BEC 7C 00 19 10 */ subfe r0, r0, r3 -/* 80263BF0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80263BF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263BF8 7C 08 03 A6 */ mtlr r0 -/* 80263BFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263C00 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf.s b/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf.s deleted file mode 100644 index 6bd8c47fcef..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80263ED4: -/* 80263ED4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80263ED8 7C 08 02 A6 */ mflr r0 -/* 80263EDC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80263EE0 C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80263EE4 D0 05 00 00 */ stfs f0, 0(r5) -/* 80263EE8 28 04 00 00 */ cmplwi r4, 0 -/* 80263EEC 41 82 00 08 */ beq lbl_80263EF4 -/* 80263EF0 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80263EF4: -/* 80263EF4 38 63 00 20 */ addi r3, r3, 0x20 -/* 80263EF8 38 A1 00 08 */ addi r5, r1, 8 -/* 80263EFC 48 00 92 19 */ bl cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec -/* 80263F00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80263F04 41 82 00 0C */ beq lbl_80263F10 -/* 80263F08 38 60 00 01 */ li r3, 1 -/* 80263F0C 48 00 00 08 */ b lbl_80263F14 -lbl_80263F10: -/* 80263F10 38 60 00 00 */ li r3, 0 -lbl_80263F14: -/* 80263F14 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80263F18 7C 08 03 A6 */ mtlr r0 -/* 80263F1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80263F20 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf.s b/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf.s deleted file mode 100644 index ca149425981..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80263F24: -/* 80263F24 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80263F28 7C 08 02 A6 */ mflr r0 -/* 80263F2C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80263F30 C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80263F34 D0 05 00 00 */ stfs f0, 0(r5) -/* 80263F38 28 04 00 00 */ cmplwi r4, 0 -/* 80263F3C 41 82 00 08 */ beq lbl_80263F44 -/* 80263F40 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80263F44: -/* 80263F44 38 63 00 20 */ addi r3, r3, 0x20 -/* 80263F48 38 A1 00 08 */ addi r5, r1, 8 -/* 80263F4C 48 00 94 89 */ bl cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec -/* 80263F50 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80263F54 41 82 00 0C */ beq lbl_80263F60 -/* 80263F58 38 60 00 01 */ li r3, 1 -/* 80263F5C 48 00 00 08 */ b lbl_80263F64 -lbl_80263F60: -/* 80263F60 38 60 00 00 */ li r3, 0 -lbl_80263F64: -/* 80263F64 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80263F68 7C 08 03 A6 */ mtlr r0 -/* 80263F6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80263F70 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf.s b/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf.s deleted file mode 100644 index 41600c9157f..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80263F74: -/* 80263F74 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80263F78 7C 08 02 A6 */ mflr r0 -/* 80263F7C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80263F80 C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80263F84 D0 05 00 00 */ stfs f0, 0(r5) -/* 80263F88 28 04 00 00 */ cmplwi r4, 0 -/* 80263F8C 41 82 00 08 */ beq lbl_80263F94 -/* 80263F90 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80263F94: -/* 80263F94 38 63 00 20 */ addi r3, r3, 0x20 -/* 80263F98 38 A1 00 08 */ addi r5, r1, 8 -/* 80263F9C 48 00 9C A1 */ bl cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec -/* 80263FA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80263FA4 41 82 00 0C */ beq lbl_80263FB0 -/* 80263FA8 38 60 00 01 */ li r3, 1 -/* 80263FAC 48 00 00 08 */ b lbl_80263FB4 -lbl_80263FB0: -/* 80263FB0 38 60 00 00 */ li r3, 0 -lbl_80263FB4: -/* 80263FB4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80263FB8 7C 08 03 A6 */ mtlr r0 -/* 80263FBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80263FC0 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf.s b/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf.s deleted file mode 100644 index d8694bb7419..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80264310: -/* 80264310 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80264314 7C 08 02 A6 */ mflr r0 -/* 80264318 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026431C 7C 66 1B 78 */ mr r6, r3 -/* 80264320 C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80264324 D0 05 00 00 */ stfs f0, 0(r5) -/* 80264328 28 04 00 00 */ cmplwi r4, 0 -/* 8026432C 41 82 00 08 */ beq lbl_80264334 -/* 80264330 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80264334: -/* 80264334 7C 83 23 78 */ mr r3, r4 -/* 80264338 38 86 00 20 */ addi r4, r6, 0x20 -/* 8026433C 38 A1 00 08 */ addi r5, r1, 8 -/* 80264340 48 00 90 95 */ bl cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec -/* 80264344 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80264348 41 82 00 0C */ beq lbl_80264354 -/* 8026434C 38 60 00 01 */ li r3, 1 -/* 80264350 48 00 00 08 */ b lbl_80264358 -lbl_80264354: -/* 80264354 38 60 00 00 */ li r3, 0 -lbl_80264358: -/* 80264358 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026435C 7C 08 03 A6 */ mtlr r0 -/* 80264360 38 21 00 20 */ addi r1, r1, 0x20 -/* 80264364 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf.s b/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf.s deleted file mode 100644 index c797d7805b5..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80264288: -/* 80264288 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026428C 7C 08 02 A6 */ mflr r0 -/* 80264290 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264294 28 04 00 00 */ cmplwi r4, 0 -/* 80264298 41 82 00 08 */ beq lbl_802642A0 -/* 8026429C 38 84 00 20 */ addi r4, r4, 0x20 -lbl_802642A0: -/* 802642A0 38 63 00 20 */ addi r3, r3, 0x20 -/* 802642A4 48 00 7F 89 */ bl cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf -/* 802642A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802642AC 41 82 00 0C */ beq lbl_802642B8 -/* 802642B0 38 60 00 01 */ li r3, 1 -/* 802642B4 48 00 00 08 */ b lbl_802642BC -lbl_802642B8: -/* 802642B8 38 60 00 00 */ li r3, 0 -lbl_802642BC: -/* 802642BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802642C0 7C 08 03 A6 */ mtlr r0 -/* 802642C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802642C8 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf.s b/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf.s deleted file mode 100644 index 366447a9b9a..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_802642CC: -/* 802642CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802642D0 7C 08 02 A6 */ mflr r0 -/* 802642D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802642D8 28 04 00 00 */ cmplwi r4, 0 -/* 802642DC 41 82 00 08 */ beq lbl_802642E4 -/* 802642E0 38 84 00 20 */ addi r4, r4, 0x20 -lbl_802642E4: -/* 802642E4 38 63 00 20 */ addi r3, r3, 0x20 -/* 802642E8 48 00 75 BD */ bl cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf -/* 802642EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802642F0 41 82 00 0C */ beq lbl_802642FC -/* 802642F4 38 60 00 01 */ li r3, 1 -/* 802642F8 48 00 00 08 */ b lbl_80264300 -lbl_802642FC: -/* 802642FC 38 60 00 00 */ li r3, 0 -lbl_80264300: -/* 80264300 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80264304 7C 08 03 A6 */ mtlr r0 -/* 80264308 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026430C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf.s b/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf.s deleted file mode 100644 index 03d4021982e..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80264688: -/* 80264688 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026468C 7C 08 02 A6 */ mflr r0 -/* 80264690 90 01 00 24 */ stw r0, 0x24(r1) -/* 80264694 7C 66 1B 78 */ mr r6, r3 -/* 80264698 C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 8026469C D0 05 00 00 */ stfs f0, 0(r5) -/* 802646A0 28 04 00 00 */ cmplwi r4, 0 -/* 802646A4 41 82 00 08 */ beq lbl_802646AC -/* 802646A8 38 84 00 20 */ addi r4, r4, 0x20 -lbl_802646AC: -/* 802646AC 7C 83 23 78 */ mr r3, r4 -/* 802646B0 38 86 00 20 */ addi r4, r6, 0x20 -/* 802646B4 38 A1 00 08 */ addi r5, r1, 8 -/* 802646B8 48 00 95 85 */ bl cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec -/* 802646BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802646C0 41 82 00 0C */ beq lbl_802646CC -/* 802646C4 38 60 00 01 */ li r3, 1 -/* 802646C8 48 00 00 08 */ b lbl_802646D0 -lbl_802646CC: -/* 802646CC 38 60 00 00 */ li r3, 0 -lbl_802646D0: -/* 802646D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802646D4 7C 08 03 A6 */ mtlr r0 -/* 802646D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802646DC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf.s b/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf.s deleted file mode 100644 index f76db72c242..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802645F8: -/* 802645F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802645FC 7C 08 02 A6 */ mflr r0 -/* 80264600 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264604 7C 66 1B 78 */ mr r6, r3 -/* 80264608 28 04 00 00 */ cmplwi r4, 0 -/* 8026460C 41 82 00 08 */ beq lbl_80264614 -/* 80264610 38 84 00 20 */ addi r4, r4, 0x20 -lbl_80264614: -/* 80264614 7C 83 23 78 */ mr r3, r4 -/* 80264618 38 86 00 20 */ addi r4, r6, 0x20 -/* 8026461C 48 00 72 89 */ bl cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf -/* 80264620 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80264624 41 82 00 0C */ beq lbl_80264630 -/* 80264628 38 60 00 01 */ li r3, 1 -/* 8026462C 48 00 00 08 */ b lbl_80264634 -lbl_80264630: -/* 80264630 38 60 00 00 */ li r3, 0 -lbl_80264634: -/* 80264634 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80264638 7C 08 03 A6 */ mtlr r0 -/* 8026463C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264640 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf.s b/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf.s deleted file mode 100644 index 5c53d901122..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80264644: -/* 80264644 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80264648 7C 08 02 A6 */ mflr r0 -/* 8026464C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264650 28 04 00 00 */ cmplwi r4, 0 -/* 80264654 41 82 00 08 */ beq lbl_8026465C -/* 80264658 38 84 00 20 */ addi r4, r4, 0x20 -lbl_8026465C: -/* 8026465C 38 63 00 20 */ addi r3, r3, 0x20 -/* 80264660 48 00 76 1D */ bl cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf -/* 80264664 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80264668 41 82 00 0C */ beq lbl_80264674 -/* 8026466C 38 60 00 01 */ li r3, 1 -/* 80264670 48 00 00 08 */ b lbl_80264678 -lbl_80264674: -/* 80264674 38 60 00 00 */ li r3, 0 -lbl_80264678: -/* 80264678 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026467C 7C 08 03 A6 */ mtlr r0 -/* 80264680 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264684 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/Ct__9cCcD_SttsFv.s b/asm/SSystem/SComponent/c_cc_d/Ct__9cCcD_SttsFv.s deleted file mode 100644 index 65e12bdb77e..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/Ct__9cCcD_SttsFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80263904: -/* 80263904 C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80263908 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026390C D0 03 00 04 */ stfs f0, 4(r3) -/* 80263910 D0 03 00 08 */ stfs f0, 8(r3) -/* 80263914 38 80 00 00 */ li r4, 0 -/* 80263918 90 83 00 0C */ stw r4, 0xc(r3) -/* 8026391C 38 00 FF FF */ li r0, -1 -/* 80263920 90 03 00 10 */ stw r0, 0x10(r3) -/* 80263924 98 83 00 14 */ stb r4, 0x14(r3) -/* 80263928 98 83 00 15 */ stb r4, 0x15(r3) -/* 8026392C 98 83 00 16 */ stb r4, 0x16(r3) -/* 80263930 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/GetAc__8cCcD_ObjFv.s b/asm/SSystem/SComponent/c_cc_d/GetAc__8cCcD_ObjFv.s deleted file mode 100644 index 3b3f4a38ac5..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/GetAc__8cCcD_ObjFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80263A48: -/* 80263A48 80 63 00 44 */ lwz r3, 0x44(r3) -/* 80263A4C 28 03 00 00 */ cmplwi r3, 0 -/* 80263A50 40 82 00 0C */ bne lbl_80263A5C -/* 80263A54 38 60 00 00 */ li r3, 0 -/* 80263A58 4E 80 00 20 */ blr -lbl_80263A5C: -/* 80263A5C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80263A60 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz.s deleted file mode 100644 index dbaffb4a887..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_80264014: -/* 80264014 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80264018 7C 08 02 A6 */ mflr r0 -/* 8026401C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80264020 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80264024 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80264028 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026402C 48 0F E1 AD */ bl _savegpr_28 -/* 80264030 7C 7C 1B 78 */ mr r28, r3 -/* 80264034 7C 9D 23 78 */ mr r29, r4 -/* 80264038 7C BE 2B 78 */ mr r30, r5 -/* 8026403C 3B FC 00 2C */ addi r31, r28, 0x2c -/* 80264040 7F E3 FB 78 */ mr r3, r31 -/* 80264044 38 9C 00 20 */ addi r4, r28, 0x20 -/* 80264048 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8026404C 48 0E 30 69 */ bl PSVECSubtract -/* 80264050 38 61 00 20 */ addi r3, r1, 0x20 -/* 80264054 7C 64 1B 78 */ mr r4, r3 -/* 80264058 48 0E 31 3D */ bl PSVECDotProduct -/* 8026405C FF E0 08 90 */ fmr f31, f1 -/* 80264060 FC 00 FA 10 */ fabs f0, f31 -/* 80264064 FC 20 00 18 */ frsp f1, f0 -/* 80264068 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 8026406C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80264070 40 80 00 0C */ bge lbl_8026407C -/* 80264074 38 60 00 00 */ li r3, 0 -/* 80264078 48 00 00 E4 */ b lbl_8026415C -lbl_8026407C: -/* 8026407C 7F A3 EB 78 */ mr r3, r29 -/* 80264080 38 9C 00 20 */ addi r4, r28, 0x20 -/* 80264084 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80264088 48 0E 30 2D */ bl PSVECSubtract -/* 8026408C 38 61 00 14 */ addi r3, r1, 0x14 -/* 80264090 38 81 00 20 */ addi r4, r1, 0x20 -/* 80264094 48 0E 31 01 */ bl PSVECDotProduct -/* 80264098 EC 21 F8 24 */ fdivs f1, f1, f31 -/* 8026409C C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 802640A0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802640A4 40 80 00 20 */ bge lbl_802640C4 -/* 802640A8 C0 1C 00 20 */ lfs f0, 0x20(r28) -/* 802640AC D0 01 00 08 */ stfs f0, 8(r1) -/* 802640B0 C0 1C 00 24 */ lfs f0, 0x24(r28) -/* 802640B4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802640B8 C0 1C 00 28 */ lfs f0, 0x28(r28) -/* 802640BC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802640C0 48 00 00 48 */ b lbl_80264108 -lbl_802640C4: -/* 802640C4 C0 02 B6 1C */ lfs f0, lit_2306(r2) -/* 802640C8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802640CC 40 81 00 20 */ ble lbl_802640EC -/* 802640D0 C0 1F 00 00 */ lfs f0, 0(r31) -/* 802640D4 D0 01 00 08 */ stfs f0, 8(r1) -/* 802640D8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 802640DC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802640E0 C0 1F 00 08 */ lfs f0, 8(r31) -/* 802640E4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802640E8 48 00 00 20 */ b lbl_80264108 -lbl_802640EC: -/* 802640EC 38 61 00 20 */ addi r3, r1, 0x20 -/* 802640F0 7C 64 1B 78 */ mr r4, r3 -/* 802640F4 48 0E 2F E5 */ bl PSVECScale -/* 802640F8 38 61 00 20 */ addi r3, r1, 0x20 -/* 802640FC 38 9C 00 20 */ addi r4, r28, 0x20 -/* 80264100 38 A1 00 08 */ addi r5, r1, 8 -/* 80264104 48 0E 2F 8D */ bl PSVECAdd -lbl_80264108: -/* 80264108 7F A3 EB 78 */ mr r3, r29 -/* 8026410C 38 81 00 08 */ addi r4, r1, 8 -/* 80264110 7F C5 F3 78 */ mr r5, r30 -/* 80264114 48 0E 2F A1 */ bl PSVECSubtract -/* 80264118 7F C3 F3 78 */ mr r3, r30 -/* 8026411C 48 0E 30 35 */ bl PSVECMag -/* 80264120 FC 00 0A 10 */ fabs f0, f1 -/* 80264124 FC 20 00 18 */ frsp f1, f0 -/* 80264128 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 8026412C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80264130 40 80 00 1C */ bge lbl_8026414C -/* 80264134 C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80264138 D0 1E 00 00 */ stfs f0, 0(r30) -/* 8026413C D0 1E 00 04 */ stfs f0, 4(r30) -/* 80264140 D0 1E 00 08 */ stfs f0, 8(r30) -/* 80264144 38 60 00 00 */ li r3, 0 -/* 80264148 48 00 00 14 */ b lbl_8026415C -lbl_8026414C: -/* 8026414C 7F C3 F3 78 */ mr r3, r30 -/* 80264150 7F C4 F3 78 */ mr r4, r30 -/* 80264154 48 0E 2F A1 */ bl PSVECNormalize -/* 80264158 38 60 00 01 */ li r3, 1 -lbl_8026415C: -/* 8026415C E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80264160 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80264164 39 61 00 40 */ addi r11, r1, 0x40 -/* 80264168 48 0F E0 BD */ bl _restgpr_28 -/* 8026416C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80264170 7C 08 03 A6 */ mtlr r0 -/* 80264174 38 21 00 50 */ addi r1, r1, 0x50 -/* 80264178 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz.s deleted file mode 100644 index 14d2d2f5ce7..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_802643D0: -/* 802643D0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802643D4 7C 08 02 A6 */ mflr r0 -/* 802643D8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802643DC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802643E0 7C BF 2B 78 */ mr r31, r5 -/* 802643E4 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 802643E8 C0 64 00 04 */ lfs f3, 4(r4) -/* 802643EC FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 802643F0 40 81 00 1C */ ble lbl_8026440C -/* 802643F4 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802643F8 D0 01 00 08 */ stfs f0, 8(r1) -/* 802643FC D0 41 00 0C */ stfs f2, 0xc(r1) -/* 80264400 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 80264404 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80264408 48 00 00 48 */ b lbl_80264450 -lbl_8026440C: -/* 8026440C C0 03 00 30 */ lfs f0, 0x30(r3) -/* 80264410 EC 22 00 2A */ fadds f1, f2, f0 -/* 80264414 FC 01 18 40 */ fcmpo cr0, f1, f3 -/* 80264418 40 80 00 20 */ bge lbl_80264438 -/* 8026441C C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80264420 D0 01 00 08 */ stfs f0, 8(r1) -/* 80264424 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 80264428 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 8026442C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80264430 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80264434 48 00 00 1C */ b lbl_80264450 -lbl_80264438: -/* 80264438 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 8026443C D0 01 00 08 */ stfs f0, 8(r1) -/* 80264440 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 80264444 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 80264448 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8026444C D0 61 00 0C */ stfs f3, 0xc(r1) -lbl_80264450: -/* 80264450 7C 83 23 78 */ mr r3, r4 -/* 80264454 38 81 00 08 */ addi r4, r1, 8 -/* 80264458 7F E5 FB 78 */ mr r5, r31 -/* 8026445C 48 0E 2C 59 */ bl PSVECSubtract -/* 80264460 7F E3 FB 78 */ mr r3, r31 -/* 80264464 48 0E 2C ED */ bl PSVECMag -/* 80264468 FC 00 0A 10 */ fabs f0, f1 -/* 8026446C FC 20 00 18 */ frsp f1, f0 -/* 80264470 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 80264474 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80264478 40 80 00 1C */ bge lbl_80264494 -/* 8026447C C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80264480 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80264484 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80264488 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8026448C 38 60 00 00 */ li r3, 0 -/* 80264490 48 00 00 14 */ b lbl_802644A4 -lbl_80264494: -/* 80264494 7F E3 FB 78 */ mr r3, r31 -/* 80264498 7F E4 FB 78 */ mr r4, r31 -/* 8026449C 48 0E 2C 59 */ bl PSVECNormalize -/* 802644A0 38 60 00 01 */ li r3, 1 -lbl_802644A4: -/* 802644A4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802644A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802644AC 7C 08 03 A6 */ mtlr r0 -/* 802644B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802644B4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz.s deleted file mode 100644 index e4cb37f798e..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8026476C: -/* 8026476C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80264770 7C 08 02 A6 */ mflr r0 -/* 80264774 90 01 00 14 */ stw r0, 0x14(r1) -/* 80264778 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026477C 7C BF 2B 78 */ mr r31, r5 -/* 80264780 C0 24 00 00 */ lfs f1, 0(r4) -/* 80264784 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80264788 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8026478C D0 05 00 00 */ stfs f0, 0(r5) -/* 80264790 C0 24 00 04 */ lfs f1, 4(r4) -/* 80264794 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80264798 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8026479C D0 05 00 04 */ stfs f0, 4(r5) -/* 802647A0 C0 24 00 08 */ lfs f1, 8(r4) -/* 802647A4 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 802647A8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802647AC D0 05 00 08 */ stfs f0, 8(r5) -/* 802647B0 7F E3 FB 78 */ mr r3, r31 -/* 802647B4 48 0E 29 9D */ bl PSVECMag -/* 802647B8 FC 00 0A 10 */ fabs f0, f1 -/* 802647BC FC 20 00 18 */ frsp f1, f0 -/* 802647C0 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 802647C4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802647C8 40 80 00 1C */ bge lbl_802647E4 -/* 802647CC C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 802647D0 D0 1F 00 00 */ stfs f0, 0(r31) -/* 802647D4 D0 1F 00 04 */ stfs f0, 4(r31) -/* 802647D8 D0 1F 00 08 */ stfs f0, 8(r31) -/* 802647DC 38 60 00 00 */ li r3, 0 -/* 802647E0 48 00 00 14 */ b lbl_802647F4 -lbl_802647E4: -/* 802647E4 7F E3 FB 78 */ mr r3, r31 -/* 802647E8 7F E4 FB 78 */ mr r4, r31 -/* 802647EC 48 0E 29 09 */ bl PSVECNormalize -/* 802647F0 38 60 00 01 */ li r3, 1 -lbl_802647F4: -/* 802647F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802647F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802647FC 7C 08 03 A6 */ mtlr r0 -/* 80264800 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264804 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz.s b/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz.s deleted file mode 100644 index 112d6395e5a..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80263C9C: -/* 80263C9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263CA0 7C 08 02 A6 */ mflr r0 -/* 80263CA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263CA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80263CAC 93 C1 00 08 */ stw r30, 8(r1) -/* 80263CB0 7C 7E 1B 78 */ mr r30, r3 -/* 80263CB4 7C BF 2B 78 */ mr r31, r5 -/* 80263CB8 38 7E 00 20 */ addi r3, r30, 0x20 -/* 80263CBC 48 0E 34 D9 */ bl PSVECDotProduct -/* 80263CC0 C0 1E 00 2C */ lfs f0, 0x2c(r30) -/* 80263CC4 EC 20 08 2A */ fadds f1, f0, f1 -/* 80263CC8 C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80263CCC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80263CD0 4C 41 13 82 */ cror 2, 1, 2 -/* 80263CD4 40 82 00 20 */ bne lbl_80263CF4 -/* 80263CD8 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80263CDC D0 1F 00 00 */ stfs f0, 0(r31) -/* 80263CE0 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 80263CE4 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80263CE8 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80263CEC D0 1F 00 08 */ stfs f0, 8(r31) -/* 80263CF0 48 00 00 2C */ b lbl_80263D1C -lbl_80263CF4: -/* 80263CF4 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80263CF8 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80263CFC C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 80263D00 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80263D04 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80263D08 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80263D0C 7F E3 FB 78 */ mr r3, r31 -/* 80263D10 7F E4 FB 78 */ mr r4, r31 -/* 80263D14 C0 22 B6 30 */ lfs f1, lit_2632(r2) -/* 80263D18 48 0E 33 C1 */ bl PSVECScale -lbl_80263D1C: -/* 80263D1C 38 60 00 01 */ li r3, 1 -/* 80263D20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80263D24 83 C1 00 08 */ lwz r30, 8(r1) -/* 80263D28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263D2C 7C 08 03 A6 */ mtlr r0 -/* 80263D30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263D34 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/GetWeightF__9cCcD_SttsCFv.s b/asm/SSystem/SComponent/c_cc_d/GetWeightF__9cCcD_SttsCFv.s deleted file mode 100644 index 69d294981e3..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/GetWeightF__9cCcD_SttsCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80263984: -/* 80263984 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263988 88 03 00 14 */ lbz r0, 0x14(r3) -/* 8026398C C8 22 B6 28 */ lfd f1, lit_2472(r2) -/* 80263990 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80263994 90 01 00 0C */ stw r0, 0xc(r1) -/* 80263998 3C 00 43 30 */ lis r0, 0x4330 -/* 8026399C 90 01 00 08 */ stw r0, 8(r1) -/* 802639A0 C8 01 00 08 */ lfd f0, 8(r1) -/* 802639A4 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802639A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802639AC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/Init__9cCcD_SttsFiiPvUi.s b/asm/SSystem/SComponent/c_cc_d/Init__9cCcD_SttsFiiPvUi.s deleted file mode 100644 index 4464f7b0126..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/Init__9cCcD_SttsFiiPvUi.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_802638A4: -/* 802638A4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802638A8 7C 08 02 A6 */ mflr r0 -/* 802638AC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802638B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802638B4 48 0F E9 21 */ bl _savegpr_27 -/* 802638B8 7C 7B 1B 78 */ mr r27, r3 -/* 802638BC 7C 9C 23 78 */ mr r28, r4 -/* 802638C0 7C BD 2B 78 */ mr r29, r5 -/* 802638C4 7C DE 33 78 */ mr r30, r6 -/* 802638C8 7C FF 3B 78 */ mr r31, r7 -/* 802638CC 81 83 00 18 */ lwz r12, 0x18(r3) -/* 802638D0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802638D4 7D 89 03 A6 */ mtctr r12 -/* 802638D8 4E 80 04 21 */ bctrl -/* 802638DC 9B 9B 00 14 */ stb r28, 0x14(r27) -/* 802638E0 9B BB 00 15 */ stb r29, 0x15(r27) -/* 802638E4 93 DB 00 0C */ stw r30, 0xc(r27) -/* 802638E8 93 FB 00 10 */ stw r31, 0x10(r27) -/* 802638EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802638F0 48 0F E9 31 */ bl _restgpr_27 -/* 802638F4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802638F8 7C 08 03 A6 */ mtlr r0 -/* 802638FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80263900 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/PlusCcMove__9cCcD_SttsFfff.s b/asm/SSystem/SComponent/c_cc_d/PlusCcMove__9cCcD_SttsFfff.s deleted file mode 100644 index a7949f35efa..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/PlusCcMove__9cCcD_SttsFfff.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80263934: -/* 80263934 C0 03 00 00 */ lfs f0, 0(r3) -/* 80263938 EC 00 08 2A */ fadds f0, f0, f1 -/* 8026393C D0 03 00 00 */ stfs f0, 0(r3) -/* 80263940 C0 03 00 04 */ lfs f0, 4(r3) -/* 80263944 EC 00 10 2A */ fadds f0, f0, f2 -/* 80263948 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026394C C0 03 00 08 */ lfs f0, 8(r3) -/* 80263950 EC 00 18 2A */ fadds f0, f0, f3 -/* 80263954 D0 03 00 08 */ stfs f0, 8(r3) -/* 80263958 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/PlusDmg__9cCcD_SttsFi.s b/asm/SSystem/SComponent/c_cc_d/PlusDmg__9cCcD_SttsFi.s deleted file mode 100644 index 1264b7f3c94..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/PlusDmg__9cCcD_SttsFi.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80263970: -/* 80263970 88 03 00 16 */ lbz r0, 0x16(r3) -/* 80263974 7C 00 20 00 */ cmpw r0, r4 -/* 80263978 4C 80 00 20 */ bgelr -/* 8026397C 98 83 00 16 */ stb r4, 0x16(r3) -/* 80263980 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/SetArea__15cCcD_DivideAreaFRC8cM3dGAab.s b/asm/SSystem/SComponent/c_cc_d/SetArea__15cCcD_DivideAreaFRC8cM3dGAab.s deleted file mode 100644 index cda3825751a..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/SetArea__15cCcD_DivideAreaFRC8cM3dGAab.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_802633A8: -/* 802633A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802633AC 7C 08 02 A6 */ mflr r0 -/* 802633B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802633B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802633B8 7C 7F 1B 78 */ mr r31, r3 -/* 802633BC 38 A4 00 0C */ addi r5, r4, 0xc -/* 802633C0 48 00 B8 95 */ bl Set__8cM3dGAabFPC4cXyzPC4cXyz -/* 802633C4 C0 42 B6 18 */ lfs f2, lit_2305(r2) -/* 802633C8 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 802633CC C0 1F 00 00 */ lfs f0, 0(r31) -/* 802633D0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802633D4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802633D8 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 802633DC C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 802633E0 FC 00 02 10 */ fabs f0, f0 -/* 802633E4 FC 20 00 18 */ frsp f1, f0 -/* 802633E8 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 802633EC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802633F0 7C 00 00 26 */ mfcr r0 -/* 802633F4 54 00 0F FE */ srwi r0, r0, 0x1f -/* 802633F8 98 1F 00 1C */ stb r0, 0x1c(r31) -/* 802633FC 88 1F 00 1C */ lbz r0, 0x1c(r31) -/* 80263400 28 00 00 00 */ cmplwi r0, 0 -/* 80263404 40 82 00 14 */ bne lbl_80263418 -/* 80263408 C0 22 B6 1C */ lfs f1, lit_2306(r2) -/* 8026340C C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80263410 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80263414 D0 1F 00 24 */ stfs f0, 0x24(r31) -lbl_80263418: -/* 80263418 C0 42 B6 18 */ lfs f2, lit_2305(r2) -/* 8026341C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80263420 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80263424 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80263428 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8026342C D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 80263430 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 80263434 FC 00 02 10 */ fabs f0, f0 -/* 80263438 FC 20 00 18 */ frsp f1, f0 -/* 8026343C C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 80263440 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80263444 7C 00 00 26 */ mfcr r0 -/* 80263448 54 00 0F FE */ srwi r0, r0, 0x1f -/* 8026344C 98 1F 00 28 */ stb r0, 0x28(r31) -/* 80263450 88 1F 00 28 */ lbz r0, 0x28(r31) -/* 80263454 28 00 00 00 */ cmplwi r0, 0 -/* 80263458 40 82 00 14 */ bne lbl_8026346C -/* 8026345C C0 22 B6 1C */ lfs f1, lit_2306(r2) -/* 80263460 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 80263464 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80263468 D0 1F 00 30 */ stfs f0, 0x30(r31) -lbl_8026346C: -/* 8026346C C0 42 B6 18 */ lfs f2, lit_2305(r2) -/* 80263470 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80263474 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80263478 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8026347C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80263480 D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 80263484 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80263488 FC 00 02 10 */ fabs f0, f0 -/* 8026348C FC 20 00 18 */ frsp f1, f0 -/* 80263490 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13) -/* 80263494 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80263498 7C 00 00 26 */ mfcr r0 -/* 8026349C 54 00 0F FE */ srwi r0, r0, 0x1f -/* 802634A0 98 1F 00 34 */ stb r0, 0x34(r31) -/* 802634A4 88 1F 00 34 */ lbz r0, 0x34(r31) -/* 802634A8 28 00 00 00 */ cmplwi r0, 0 -/* 802634AC 40 82 00 14 */ bne lbl_802634C0 -/* 802634B0 C0 22 B6 1C */ lfs f1, lit_2306(r2) -/* 802634B4 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 802634B8 EC 01 00 24 */ fdivs f0, f1, f0 -/* 802634BC D0 1F 00 3C */ stfs f0, 0x3c(r31) -lbl_802634C0: -/* 802634C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802634C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802634C8 7C 08 03 A6 */ mtlr r0 -/* 802634CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802634D0 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/SetGrp__10cCcD_ObjTgFUl.s b/asm/SSystem/SComponent/c_cc_d/SetGrp__10cCcD_ObjTgFUl.s deleted file mode 100644 index 2ca08044e44..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/SetGrp__10cCcD_ObjTgFUl.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80264894: -/* 80264894 80 03 00 00 */ lwz r0, 0(r3) -/* 80264898 54 00 07 F4 */ rlwinm r0, r0, 0, 0x1f, 0x1a -/* 8026489C 90 03 00 00 */ stw r0, 0(r3) -/* 802648A0 80 03 00 00 */ lwz r0, 0(r3) -/* 802648A4 7C 00 23 78 */ or r0, r0, r4 -/* 802648A8 90 03 00 00 */ stw r0, 0(r3) -/* 802648AC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjAtFP8cCcD_Obj.s b/asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjAtFP8cCcD_Obj.s deleted file mode 100644 index 5ba7272e3d5..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjAtFP8cCcD_Obj.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8026483C: -/* 8026483C 38 00 00 01 */ li r0, 1 -/* 80264840 90 03 00 04 */ stw r0, 4(r3) -/* 80264844 90 83 00 08 */ stw r4, 8(r3) -/* 80264848 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjCoFP8cCcD_Obj.s b/asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjCoFP8cCcD_Obj.s deleted file mode 100644 index 548ffd53926..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjCoFP8cCcD_Obj.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802648D8: -/* 802648D8 38 00 00 01 */ li r0, 1 -/* 802648DC 90 03 00 04 */ stw r0, 4(r3) -/* 802648E0 90 83 00 08 */ stw r4, 8(r3) -/* 802648E4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjTgFP8cCcD_Obj.s b/asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjTgFP8cCcD_Obj.s deleted file mode 100644 index f186f7936cb..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjTgFP8cCcD_Obj.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802648C8: -/* 802648C8 38 00 00 01 */ li r0, 1 -/* 802648CC 90 03 00 04 */ stw r0, 4(r3) -/* 802648D0 90 83 00 08 */ stw r4, 8(r3) -/* 802648D4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/SetIGrp__10cCcD_ObjCoFUl.s b/asm/SSystem/SComponent/c_cc_d/SetIGrp__10cCcD_ObjCoFUl.s deleted file mode 100644 index c6261c5aca1..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/SetIGrp__10cCcD_ObjCoFUl.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80264900: -/* 80264900 80 03 00 00 */ lwz r0, 0(r3) -/* 80264904 54 00 07 F6 */ rlwinm r0, r0, 0, 0x1f, 0x1b -/* 80264908 90 03 00 00 */ stw r0, 0(r3) -/* 8026490C 80 03 00 00 */ lwz r0, 0(r3) -/* 80264910 7C 00 23 78 */ or r0, r0, r4 -/* 80264914 90 03 00 00 */ stw r0, 0(r3) -/* 80264918 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/SetVsGrp__10cCcD_ObjCoFUl.s b/asm/SSystem/SComponent/c_cc_d/SetVsGrp__10cCcD_ObjCoFUl.s deleted file mode 100644 index f38154d937c..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/SetVsGrp__10cCcD_ObjCoFUl.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8026491C: -/* 8026491C 80 03 00 00 */ lwz r0, 0(r3) -/* 80264920 54 00 07 30 */ rlwinm r0, r0, 0, 0x1c, 0x18 -/* 80264924 90 03 00 00 */ stw r0, 0(r3) -/* 80264928 80 03 00 00 */ lwz r0, 0(r3) -/* 8026492C 7C 00 23 78 */ or r0, r0, r4 -/* 80264930 90 03 00 00 */ stw r0, 0(r3) -/* 80264934 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt.s b/asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt.s deleted file mode 100644 index 517281c9f14..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8026484C: -/* 8026484C 80 04 00 08 */ lwz r0, 8(r4) -/* 80264850 90 03 00 00 */ stw r0, 0(r3) -/* 80264854 80 04 00 00 */ lwz r0, 0(r4) -/* 80264858 90 03 00 10 */ stw r0, 0x10(r3) -/* 8026485C 88 04 00 04 */ lbz r0, 4(r4) -/* 80264860 98 03 00 14 */ stb r0, 0x14(r3) -/* 80264864 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg.s b/asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg.s deleted file mode 100644 index 35e2eb732f0..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80264880: -/* 80264880 80 04 00 04 */ lwz r0, 4(r4) -/* 80264884 90 03 00 00 */ stw r0, 0(r3) -/* 80264888 80 04 00 00 */ lwz r0, 0(r4) -/* 8026488C 90 03 00 10 */ stw r0, 0x10(r3) -/* 80264890 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf.s b/asm/SSystem/SComponent/c_cc_d/Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf.s deleted file mode 100644 index 2a8d6f2b81d..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802639C4: -/* 802639C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802639C8 7C 08 02 A6 */ mflr r0 -/* 802639CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802639D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802639D4 93 C1 00 08 */ stw r30, 8(r1) -/* 802639D8 7C 7E 1B 78 */ mr r30, r3 -/* 802639DC 7C 9F 23 78 */ mr r31, r4 -/* 802639E0 48 00 0E 6D */ bl Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt -/* 802639E4 38 7E 00 18 */ addi r3, r30, 0x18 -/* 802639E8 38 9F 00 0C */ addi r4, r31, 0xc -/* 802639EC 48 00 0E 95 */ bl Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg -/* 802639F0 80 1F 00 14 */ lwz r0, 0x14(r31) -/* 802639F4 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 802639F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802639FC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80263A00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263A04 7C 08 03 A6 */ mtlr r0 -/* 80263A08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263A0C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/Set__15cCcD_DivideInfoFUlUlUl.s b/asm/SSystem/SComponent/c_cc_d/Set__15cCcD_DivideInfoFUlUlUl.s deleted file mode 100644 index 3b86bc404a8..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/Set__15cCcD_DivideInfoFUlUlUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80263358: -/* 80263358 90 83 00 00 */ stw r4, 0(r3) -/* 8026335C 90 A3 00 04 */ stw r5, 4(r3) -/* 80263360 90 C3 00 08 */ stw r6, 8(r3) -/* 80263364 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/Set__8cCcD_ObjFRC11cCcD_SrcObj.s b/asm/SSystem/SComponent/c_cc_d/Set__8cCcD_ObjFRC11cCcD_SrcObj.s deleted file mode 100644 index c387d2c8f8d..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/Set__8cCcD_ObjFRC11cCcD_SrcObj.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80263A1C: -/* 80263A1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263A20 7C 08 02 A6 */ mflr r0 -/* 80263A24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263A28 80 04 00 00 */ lwz r0, 0(r4) -/* 80263A2C 90 03 00 40 */ stw r0, 0x40(r3) -/* 80263A30 38 84 00 04 */ addi r4, r4, 4 -/* 80263A34 4B FF FF 91 */ bl Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf -/* 80263A38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80263A3C 7C 08 03 A6 */ mtlr r0 -/* 80263A40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263A44 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/ct__18cCcD_ObjCommonBaseFv.s b/asm/SSystem/SComponent/c_cc_d/ct__18cCcD_ObjCommonBaseFv.s deleted file mode 100644 index ff3136ea4e3..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/ct__18cCcD_ObjCommonBaseFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802639B0: -/* 802639B0 38 00 00 00 */ li r0, 0 -/* 802639B4 90 03 00 00 */ stw r0, 0(r3) -/* 802639B8 90 03 00 04 */ stw r0, 4(r3) -/* 802639BC 90 03 00 08 */ stw r0, 8(r3) -/* 802639C0 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/ct__8cCcD_ObjFv.s b/asm/SSystem/SComponent/c_cc_d/ct__8cCcD_ObjFv.s deleted file mode 100644 index 038c0a46205..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/ct__8cCcD_ObjFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80263A10: -/* 80263A10 38 00 00 00 */ li r0, 0 -/* 80263A14 90 03 00 40 */ stw r0, 0x40(r3) -/* 80263A18 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape.s b/asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape.s deleted file mode 100644 index aa5516d6eae..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_802644B8: -/* 802644B8 38 00 00 01 */ li r0, 1 -/* 802644BC 90 04 00 00 */ stw r0, 0(r4) -/* 802644C0 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802644C4 D0 04 00 04 */ stfs f0, 4(r4) -/* 802644C8 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802644CC D0 04 00 08 */ stfs f0, 8(r4) -/* 802644D0 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 802644D4 D0 04 00 0C */ stfs f0, 0xc(r4) -/* 802644D8 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 802644DC D0 04 00 10 */ stfs f0, 0x10(r4) -/* 802644E0 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 802644E4 D0 04 00 14 */ stfs f0, 0x14(r4) -/* 802644E8 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape.s b/asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape.s deleted file mode 100644 index fc730ae5d6f..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80264808: -/* 80264808 38 00 00 00 */ li r0, 0 -/* 8026480C 90 04 00 00 */ stw r0, 0(r4) -/* 80264810 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80264814 D0 04 00 04 */ stfs f0, 4(r4) -/* 80264818 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8026481C D0 04 00 08 */ stfs f0, 8(r4) -/* 80264820 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 80264824 D0 04 00 0C */ stfs f0, 0xc(r4) -/* 80264828 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 8026482C D0 04 00 10 */ stfs f0, 0x10(r4) -/* 80264830 C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80264834 D0 04 00 14 */ stfs f0, 0x14(r4) -/* 80264838 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_cc_d/getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape.s b/asm/SSystem/SComponent/c_cc_d/getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape.s deleted file mode 100644 index 8914add3730..00000000000 --- a/asm/SSystem/SComponent/c_cc_d/getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80263A64: -/* 80263A64 38 00 00 02 */ li r0, 2 -/* 80263A68 90 04 00 00 */ stw r0, 0(r4) -/* 80263A6C C0 02 B6 20 */ lfs f0, lit_2431(r2) -/* 80263A70 D0 04 00 14 */ stfs f0, 0x14(r4) -/* 80263A74 D0 04 00 10 */ stfs f0, 0x10(r4) -/* 80263A78 D0 04 00 0C */ stfs f0, 0xc(r4) -/* 80263A7C D0 04 00 08 */ stfs f0, 8(r4) -/* 80263A80 D0 04 00 04 */ stfs f0, 4(r4) -/* 80263A84 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index e544c3be4c8..3000479fa7c 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -15,6 +15,7 @@ public: virtual ~cBgS_Chk(void); void SetExtChk(cBgS_Chk&); bool ChkSameActorPid(unsigned int) const; -}; + void setActorPid(u32 pid) { mActorPid = pid; } +}; // Size = 0x14 #endif /* C_BG_S_CHK_H */ diff --git a/include/SSystem/SComponent/c_bg_s_gnd_chk.h b/include/SSystem/SComponent/c_bg_s_gnd_chk.h index 8b03e38b5e2..7c63a99c6a8 100644 --- a/include/SSystem/SComponent/c_bg_s_gnd_chk.h +++ b/include/SSystem/SComponent/c_bg_s_gnd_chk.h @@ -6,20 +6,18 @@ #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" -class cBgS_GndChk : public cBgS_Chk { -private: - /* 0x14 */ cBgS_PolyInfo mPolyInfo; - /* 0x24 */ cXyz m_pos; - /* 0x30 */ int field_0x30; - /* 0x34 */ float mNowY; - /* 0x38 */ void* mWallPrecheck; +class cBgS_GndChk : public cBgS_Chk, public cBgS_PolyInfo { + /* 80267C1C */ cBgS_GndChk(); + /* 80267C94 */ virtual ~cBgS_GndChk(); + /* 80267D28 */ void SetPos(cXyz const*); + /* 80267D0C */ void SetPos(Vec const*); + /* 80267D44 */ void PreCheck(); -public: - cBgS_GndChk(void); - virtual ~cBgS_GndChk(void); - void SetPos(const Vec*); - void SetPos(const cXyz*); - void PreCheck(void); +private: + /* 0x24 */ cXyz mPosition; + /* 0x30 */ s32 _30; + /* 0x34 */ f32 mNowY; + /* 0x38 */ u32 mWallPrecheck; }; #endif /* C_BG_S_GND_CHK_H */ diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h index 60944d6b620..8e42c128763 100644 --- a/include/SSystem/SComponent/c_bg_s_lin_chk.h +++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h @@ -7,22 +7,20 @@ #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" -class cBgS_LinChk { +class cBgS_LinChk : public cBgS_Chk, public cBgS_PolyInfo { private: - /* 0x000 */ cBgS_Chk mChk; - /* 0x014 */ cBgS_PolyInfo mPolyInfo; /* 0x024 */ cM3dGLin mLin; /* 0x040 */ cXyz field_0x40; /* 0x04C */ int field_0x4c; - /* 0x050 */ u8 mPreWallChk; - /* 0x051 */ u8 mPreGroundChk; - /* 0x052 */ u8 mPreRoofChk; + /* 0x050 */ bool mPreWallChk; + /* 0x051 */ bool mPreGroundChk; + /* 0x052 */ bool mPreRoofChk; /* 0x053 */ u8 mFrontFlag; /* 0x054 */ u8 mBackFlag; public: cBgS_LinChk(void); - ~cBgS_LinChk(void); + virtual ~cBgS_LinChk(void); void ct(void); void Set2(const cXyz*, const cXyz*, unsigned int); void PreCalc(void); diff --git a/include/SSystem/SComponent/c_bg_s_shdw_draw.h b/include/SSystem/SComponent/c_bg_s_shdw_draw.h index 21177adf6d8..ceb4a5e6bd9 100644 --- a/include/SSystem/SComponent/c_bg_s_shdw_draw.h +++ b/include/SSystem/SComponent/c_bg_s_shdw_draw.h @@ -1,6 +1,8 @@ #ifndef C_BG_S_SHDW_DRAW_H #define C_BG_S_SHDW_DRAW_H +#include "SSystem/SComponent/c_bg_s_chk.h" +#include "SSystem/SComponent/c_m3d_g_aab.h" #include "SSystem/SComponent/c_m3d_g_pla.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" @@ -9,12 +11,16 @@ struct cBgD_Vtx_t; typedef int (*cBgS_ShdwDraw_Callback)(class cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, cM3dGPla*); -class cBgS_ShdwDraw { +class cBgS_ShdwDraw : cBgS_Chk { public: cBgS_ShdwDraw(void); - ~cBgS_ShdwDraw(void); + virtual ~cBgS_ShdwDraw(void); void Set(cXyz&, cXyz&); void SetCallback(cBgS_ShdwDraw_Callback); + +private: + /* 0x14 */ cM3dGAab mM3dGAab; + /* 0x30 */ cBgS_ShdwDraw_Callback mCallbackFun; }; #endif /* C_BG_S_SHDW_DRAW_H */ diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index fafdc7a5153..9acffbdcd14 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -1,152 +1,187 @@ #ifndef C_CC_D_H #define C_CC_D_H +#include "SSystem/SComponent/c_m3d.h" #include "SSystem/SComponent/c_m3d_g_aab.h" #include "SSystem/SComponent/c_m3d_g_cps.h" #include "SSystem/SComponent/c_m3d_g_cyl.h" #include "SSystem/SComponent/c_m3d_g_sph.h" #include "SSystem/SComponent/c_m3d_g_tri.h" #include "dolphin/gx/GXTexture.h" -#include "dolphin/types.h" #include "f_op/f_op_actor.h" +#include "global.h" + +class cCcD_PntAttr; +class cCcD_CpsAttr; +class cCcD_TriAttr; +class cCcD_AabAttr; +class cCcD_CylAttr; +class cCcD_SphAttr; class cCcD_ShapeAttr { -private: - /* 0x00 */ cM3dGAab mAab; - public: - struct Shape {}; + /* 0x00 */ cM3dGAab mAab; + /* 0x1C vtable */ - /* 8008556C */ virtual ~cCcD_ShapeAttr(); - /* 802649D8 */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; - /* 802649E0 */ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const; - /* 80084E38 */ virtual void GetCoCP() const; - /* 80084E2C */ virtual void GetCoCP(); - /* 80263A64 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; + struct Shape { + /* 0x00 */ u32 _0; + /* 0x04 */ f32 _4; + /* 0x08 */ f32 _8; + /* 0x0C */ f32 _C; + /* 0x10 */ f32 _10; + /* 0x14 */ f32 _14; + }; + + /* 8008556C vt[2] */ virtual ~cCcD_ShapeAttr() {} + /* 802649D8 vt[3] */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 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; + /* 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(); + /* 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]; }; -class cCcD_SphAttr; -class cCcD_CylAttr; -class cCcD_TriAttr; -class cCcD_PntAttr; -class cCcD_AabAttr; +STATIC_ASSERT(0x20 == sizeof(cCcD_ShapeAttr)); -class cCcD_CpsAttr : public 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(); +}; + +class cCcD_CpsAttr : public cCcD_ShapeAttr, public cM3dGCps { public: /* 80085450 */ virtual ~cCcD_CpsAttr(); - /* 80263DC0 */ virtual void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; - /* 80263E04 */ virtual void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80084FE4 */ virtual void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 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; - /* 80263D38 */ virtual void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; - /* 80263D7C */ virtual void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; - /* 80263F24 */ virtual void CrossCo(cCcD_CylAttr const&, f32*) const; + /* 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 void CrossCo(cCcD_CpsAttr const&, f32*) const; - /* 80263F74 */ virtual void CrossCo(cCcD_SphAttr const&, f32*) const; - /* 80085034 */ virtual void CrossCo(cCcD_ShapeAttr 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; /* 80263FC4 */ virtual void CalcAabBox(); - /* 80264014 */ virtual void GetNVec(cXyz const&, cXyz*) const; - -private: - /* 0x20 */ cM3dGCps mCps; + /* 80264014 */ virtual bool GetNVec(cXyz const&, cXyz*) const; }; -class cCcD_SphAttr : public cCcD_ShapeAttr { +STATIC_ASSERT(0x40 == sizeof(cCcD_CpsAttr)); + +class cCcD_SphAttr : public cCcD_ShapeAttr, public cM3dGSph { public: /* 8008721C */ virtual ~cCcD_SphAttr(); - /* 80264538 */ virtual void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; - /* 802645C0 */ virtual void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 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 void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; - /* 802644EC */ virtual void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; - /* 8026457C */ virtual void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; - /* 80264688 */ virtual void CrossCo(cCcD_CpsAttr const&, f32*) 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 void CrossCo(cCcD_ShapeAttr const&, f32*) const; - /* 80264644 */ virtual void CrossCo(cCcD_SphAttr const&, f32*) const; - /* 802645F8 */ virtual void CrossCo(cCcD_CylAttr const&, f32*) const; - /* 80084B44 */ virtual void GetCoCP() const; - /* 80037A54 */ virtual void GetCoCP(); + /* 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 void GetNVec(cXyz const&, cXyz*) const; + /* 8026476C */ virtual bool GetNVec(cXyz const&, cXyz*) const; /* 80264808 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; -private: - /* 0x20 */ cM3dGSph mSph; -}; // Size = 0x30 +}; // Size = 0x34 -class cCcD_CylAttr : public cCcD_ShapeAttr { +STATIC_ASSERT(0x34 == sizeof(cCcD_SphAttr)); + +class cCcD_CylAttr : public cCcD_ShapeAttr, public cM3dGCyl { public: /* 800854E0 */ virtual ~cCcD_CylAttr(); - /* 8026420C */ virtual void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; - /* 802641C8 */ virtual void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 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 void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80264250 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const; /* 80084CD0 */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; - /* 80084CD8 */ virtual void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; - /* 8026417C */ virtual void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; - /* 80264288 */ virtual void CrossCo(cCcD_CylAttr const&, f32*) const; - /* 80264310 */ virtual void CrossCo(cCcD_CpsAttr const&, f32*) const; + /* 80084CD8 */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 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 void CrossCo(cCcD_ShapeAttr const&, f32*) const; - /* 802642CC */ virtual void CrossCo(cCcD_SphAttr const&, f32*) const; - /* 80084CC0 */ virtual void GetCoCP() const; - /* 80037A4C */ virtual void GetCoCP(); + /* 80084D28 */ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 802642CC */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const; + /* 80084CC0 */ virtual const cXyz& GetCoCP() const; + /* 80037A4C */ virtual cXyz& GetCoCP(); /* 80264368 */ virtual void CalcAabBox(); - /* 802643D0 */ virtual void GetNVec(cXyz const&, cXyz*) const; + /* 802643D0 */ virtual bool GetNVec(cXyz const&, cXyz*) const; /* 802644B8 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; -private: - /* 0x20 */ cM3dGCyl mCyl; -}; // Size = 0x34 +}; // Size = 0x38 -class cCcD_TriAttr { - /* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; - /* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; - /* 80263BCC */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80084E4C */ bool CrossAtTg(cCcD_PntAttr 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; - /* 80084E9C */ bool CrossCo(cCcD_AabAttr const&, f32*) 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; - /* 80263C04 */ void CalcAabBox(); - /* 80263C9C */ void GetNVec(cXyz const&, cXyz*) const; - /* 80264938 */ ~cCcD_TriAttr(); -}; +STATIC_ASSERT(0x38 == sizeof(cCcD_CylAttr)); class cCcD_DivideInfo { private: /* 0x00 */ u32 field_0x0; /* 0x04 */ u32 field_0x4; /* 0x08 */ u32 field_0x8; - + /* 0x0C vtable */ public: virtual void test(); // temp to build OK, remove later virtual ~cCcD_DivideInfo(); /* 80263358 */ void Set(u32, u32, u32); - /* 80263368 */ void Chk(cCcD_DivideInfo const&) const; -}; + /* 80263368 */ bool Chk(cCcD_DivideInfo const&) const; +}; // Size = 0x10 -class cCcD_DivideArea { +STATIC_ASSERT(0x10 == sizeof(cCcD_DivideInfo)); + +class cCcD_DivideArea : public cM3dGAab { private: - cM3dGAab mAab; + /* 0x1C */ bool mXDiffIsZero; + /* 0x20 */ f32 mScaledXDiff; + /* 0x24 */ f32 mInvScaledXDiff; + /* 0x28 */ bool mYDiffIsZero; + /* 0x2C */ f32 mScaledYDiff; + /* 0x30 */ f32 mInvScaledYDiff; + /* 0x34 */ bool mZDiffIsZero; + /* 0x38 */ f32 mScaledZDiff; + /* 0x3C */ f32 mInvScaledZDiff; public: virtual void test(); // temp to build OK, remove later @@ -154,15 +189,31 @@ public: /* 802633A8 */ void SetArea(cM3dGAab const&); /* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32); /* 802636A0 */ void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&); +}; // Size = 0x40 + +STATIC_ASSERT(0x40 == sizeof(cCcD_DivideArea)); + +struct cCcD_SrcObjTg { + s32 mType; + s32 mSPrm; }; -struct cCcD_SrcObjTg {}; +struct cCcD_SrcObjAt { + s32 mType; + u8 mAtp; + s32 mSPrm; +}; -struct cCcD_SrcObjHitInf {}; +struct cCcD_SrcObjHitInf { + cCcD_SrcObjAt mObjAt; + cCcD_SrcObjTg mObjTg; + s32 mSPrm; +}; -struct cCcD_SrcObjAt {}; - -struct cCcD_SrcObj {}; +struct cCcD_SrcObj { + int field_0x0; + cCcD_SrcObjHitInf mSrcObjHitInf; +}; class cCcD_GStts { public: @@ -173,69 +224,82 @@ private: }; // Size = 0x4 class cCcD_Stts { -public: - /* 801410A4 */ ~cCcD_Stts(); - /* 80263894 */ bool GetGStts() const; - /* 8026389C */ bool GetGStts(); - /* 802638A4 */ void Init(int, int, void*, unsigned int); - /* 80263904 */ void Ct(); - /* 80263934 */ void PlusCcMove(f32, f32, f32); - /* 8026395C */ void ClrCcMove(); - /* 80263970 */ void PlusDmg(int); - /* 80263984 */ void GetWeightF() const; - /* 802649E8 */ void ClrAt(); - /* 802649EC */ void ClrTg(); - private: - /* 0x00 */ cXyz field_0x00; + /* 0x00 */ cXyz mXyz; /* 0x0C */ fopAc_ac_c* mActor; /* 0x10 */ int mApid; /* 0x14 */ u8 mWeight; /* 0x15 */ u8 field_0x15; /* 0x16 */ u8 mTg; - /* 0x18 */ void* vtable; + +public: + /* 801410A4 vt[3] */ virtual ~cCcD_Stts() {} + /* 80263894 vt[4] */ virtual const cCcD_GStts* GetGStts() const; + /* 8026389C vt[5] */ virtual cCcD_GStts* GetGStts(); + /* 802638A4 */ void Init(int, int, void*, unsigned int); + /* 80263904 vt[6] */ virtual void Ct(); + /* 80263934 */ void PlusCcMove(f32, f32, f32); + /* 8026395C */ void ClrCcMove(); + /* 80263970 */ void PlusDmg(int); + /* 80263984 */ f32 GetWeightF() const; + /* 802649E8 vt[7] */ virtual void ClrAt(); + /* 802649EC vt[8] */ virtual void ClrTg(); + u8 GetWeightUc() const { return mWeight; } + void SetWeight(u8 weight) { mWeight = weight; } + fopAc_ac_c* GetAc() { return mActor; } }; // Size = 0x1C +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; } -private: +protected: /* 0x00 */ int mSPrm; /* 0x04 */ int mRPrm; - /* 0x08 */ void* mHitObj; // cCcD_Obj* type + /* 0x08 */ cCcD_Obj* mHitObj; /* 0x0C */ void* vtable; }; -class cCcD_Obj; -#pragma pack(push, 1) -class cCcD_ObjAt : cCcD_ObjCommonBase { +STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase)); + +class cCcD_ObjAt : public cCcD_ObjCommonBase { public: /* 80084040 */ ~cCcD_ObjAt(); /* 8026483C */ void SetHit(cCcD_Obj*); /* 8026484C */ void Set(cCcD_SrcObjAt const&); /* 80264868 */ void ClrHit(); + int GetType() const { return mType; } private: /* 0x10 */ int mType; /* 0x14 */ u8 mAtp; }; -#pragma pack(pop) -class cCcD_ObjTg : cCcD_ObjCommonBase { +STATIC_ASSERT(0x18 == sizeof(cCcD_ObjAt)); + +class cCcD_ObjTg : public cCcD_ObjCommonBase { public: /* 80083FE4 */ ~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; } private: /* 0x10 */ int mType; }; -class cCcD_ObjCo : cCcD_ObjCommonBase { +STATIC_ASSERT(0x14 == sizeof(cCcD_ObjTg)); + +class cCcD_ObjCo : public cCcD_ObjCommonBase { public: /* 80083F88 */ ~cCcD_ObjCo(); /* 802648D8 */ void SetHit(cCcD_Obj*); @@ -244,30 +308,41 @@ public: /* 8026491C */ void SetVsGrp(u32); }; -class cCcD_ObjHitInf { -public: - /* 80083EC8 */ ~cCcD_ObjHitInf(); - /* 802639C4 */ void Set(cCcD_SrcObjHitInf const&); +STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCo)); +class cCcD_ObjHitInf { private: /* 0x000 */ cCcD_ObjAt mObjAt; - /* 0x015 */ u8 field_0x15[3]; // padding? /* 0x018 */ cCcD_ObjTg mObjTg; /* 0x02C */ cCcD_ObjCo mObjCo; - /* 0x03C */ void* vtable; + /* 0x03C vtable */ +public: + /* 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; } + }; // Size = 0x40 -class cCcD_Obj : cCcD_ObjHitInf { +STATIC_ASSERT(0x40 == sizeof(cCcD_ObjHitInf)); + +class cCcD_GObjInf; + +class cCcD_Obj : public cCcD_ObjHitInf { public: - /* 80083DE0 */ ~cCcD_Obj(); - /* 800851A4 */ bool GetGObjInf() const; - /* 800847C8 */ bool GetGObjInf(); - /* 80084BE8 */ bool GetShapeAttr() const; - /* 80085130 */ bool GetShapeAttr(); - /* 80084BF0 */ void Draw(_GXColor const&); + /* 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&); /* 80263A10 */ void ct(); /* 80263A1C */ void Set(cCcD_SrcObj const&); - void GetAc(); + fopAc_ac_c* GetAc(); + + cCcD_Stts* GetStts() { return mStts; } + cCcD_DivideInfo& GetDivideInfo() { return mDivideInfo; } private: /* 0x040 */ int field_0x40; @@ -275,14 +350,18 @@ private: /* 0x048 */ cCcD_DivideInfo mDivideInfo; }; // Size = 0x58 -class cCcD_GObjInf : cCcD_Obj { +STATIC_ASSERT(0x58 == sizeof(cCcD_Obj)); + +class cCcD_GObjInf : public cCcD_Obj { public: - /* 80083CE8 */ ~cCcD_GObjInf(); - /* 800851A0 */ void GetGObjInf(); - /* 80084BE4 */ void GetGObjInf() const; - /* 80085138 */ void ClrAtHit(); - /* 80085158 */ void ClrTgHit(); - /* 8008517C */ void ClrCoHit(); + /* 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(); }; +STATIC_ASSERT(0x58 == sizeof(cCcD_GObjInf)); + #endif /* C_CC_D_H */ diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index 6e8acc2b79d..a2f25171633 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -4,44 +4,62 @@ #include "SSystem/SComponent/c_cc_d.h" #include "dolphin/types.h" +enum WeightType { + WeightType_0 = 0, + WeightType_1 = 1, + WeightType_2 = 2, +}; + class cCcS { +private: + /* 0x0000 */ cCcD_Obj* mpObjAt[0x100]; + /* 0x0400 */ cCcD_Obj* mpObjTg[0x300]; + /* 0x1000 */ cCcD_Obj* mpObjCo[0x100]; + /* 0x1400 */ cCcD_Obj* mpObj[0x500]; + /* 0x2800 */ u16 mObjAtCount; + /* 0x2802 */ u16 mObjTgCount; + /* 0x2804 */ u16 mObjCoCount; + /* 0x2806 */ u16 mObjCount; + /* 0x2808 */ cCcD_DivideArea mDivideArea; + /* 0x2848 vtable */ + public: - /* 80030BDC */ ~cCcS(); /* 80264A6C */ cCcS(); /* 80264A94 */ void Ct(); /* 80264B60 */ void Dt(); - /* 80264B80 */ void GetWt(u8) const; + /* 80264B80 */ WeightType GetWt(u8) const; /* 80264BA8 */ void Set(cCcD_Obj*); /* 80264C5C */ void ClrCoHitInf(); /* 80264CF0 */ void ClrTgHitInf(); /* 80264D90 */ void ClrAtHitInf(); - /* 80264E2C */ void ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*); + /* 80264E2C */ int ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*); /* 80264F40 */ void ChkAtTg(); /* 8026515C */ void ChkNoHitCo(cCcD_Obj*, cCcD_Obj*); /* 80265230 */ void ChkCo(); - /* 802653A0 */ void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*); + /* 802653A0 vt[2] */ virtual void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*); /* 802653C8 */ void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*); /* 802655E4 */ void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); - /* 80265750 */ void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); + /* 80265750 vt[3]*/ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); /* 80265BB4 */ void CalcArea(); /* 80265CCC */ void Move(); /* 80265D30 */ void DrawClear(); - /* 80265DF4 */ void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*); - /* 80265DF8 */ void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*, - cCcD_Stts*, cCcD_GStts*, cCcD_GStts*); - /* 80265DFC */ void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*, - cCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, - cCcD_GStts*, cXyz*); - /* 80265E00 */ bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*, - cCcD_GStts*); - /* 80265E08 */ bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*, cCcD_GObjInf const*, - cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*); - /* 80265E10 */ bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*); - /* 80265E18 */ void MoveAfterCheck(); + /* 80265DF8 vt[4] */ virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, + cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, + cCcD_GStts*); + /* 80265DFC vt[5] */ virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, + cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*, + cCcD_Stts*, cCcD_GStts*, cCcD_GStts*, cXyz*); + /* 80265E00 vt[6] */ virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, + cCcD_GStts*, cCcD_GStts*); + /* 80265E08 vt[7] */ virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*, + 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(); + /* 80265E18 vt[10] */ virtual void MoveAfterCheck(); + /* 80265DF4 vt[11] */ virtual void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*); +}; // Size = 0x284C -private: - u8 field_0x0[10260]; - cCcD_DivideArea mDivideArea; -}; +STATIC_ASSERT(sizeof(cCcS) == 0x284C); #endif /* C_CC_S_H */ diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 81d18507cbf..7f3113dd41f 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -2,6 +2,7 @@ #define C_M3D_H_ #include "dolphin/types.h" +#include "msl_c/math.h" class cM3dGAab; class cM3dGCps; @@ -83,4 +84,8 @@ f32 cM3d_lineVsPosSuisenCross(const Vec&, const Vec&, const Vec&, Vec*); int cM3d_2PlaneLinePosNearPos(const cM3dGPla&, const cM3dGPla&, const Vec*, Vec*); void cM3d_CrawVec(const Vec&, const Vec&, Vec*); +inline bool cM3d_IsZero(f32 f) { + return fabsf(f) < G_CM3D_F_ABS_MIN; +} + #endif \ No newline at end of file diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h index a246c70d0e8..b8a0b250201 100644 --- a/include/SSystem/SComponent/c_m3d_g_aab.h +++ b/include/SSystem/SComponent/c_m3d_g_aab.h @@ -8,11 +8,12 @@ class cM3dGAab { private: public: - cXyz mMin; - cXyz mMax; + /* 0x00 */ cXyz mMin; + /* 0x0C */ cXyz mMax; + /* 0x18 vtable */ virtual void test(); // temp to build OK, remove later - virtual ~cM3dGAab(); + virtual ~cM3dGAab() {} void Set(const cXyz*, const cXyz*); bool CrossY(const cXyz*) const; bool UnderPlaneYUnder(f32) const; @@ -32,6 +33,8 @@ public: const f32 GetMinX(void) const { return mMin.GetX(); } const f32 GetMinY(void) const { return mMin.GetY(); } const f32 GetMinZ(void) const { return mMin.GetZ(); } -}; +}; // Size = 0x1C + +STATIC_ASSERT(0x1C == sizeof(cM3dGAab)); #endif /* C_M3D_G_AAB_H */ diff --git a/include/SSystem/SComponent/c_m3d_g_cps.h b/include/SSystem/SComponent/c_m3d_g_cps.h index 7bf6132c936..47acd885af9 100644 --- a/include/SSystem/SComponent/c_m3d_g_cps.h +++ b/include/SSystem/SComponent/c_m3d_g_cps.h @@ -1,6 +1,7 @@ #ifndef C_M3D_G_CPS_H #define C_M3D_G_CPS_H +#include "SSystem/SComponent/c_m3d.h" #include "SSystem/SComponent/c_m3d_g_lin.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" @@ -8,19 +9,26 @@ struct cM3dGCpsS { Vec mStart; Vec mEnd; - f32 unk_0x1c; + f32 mRadius; }; class cM3dGCps : public cM3dGLin { -private: - f32 unk_0x1c; - public: + /* 0x1C */ f32 mRadius; + cM3dGCps(void); virtual ~cM3dGCps(void); void Set(const cXyz&, const cXyz&, f32); void Set(const cM3dGCpsS&); void SetCps(const cM3dGCps&); -}; + bool Cross(cM3dGCps const* other, cXyz* xyz) const { + return cM3d_Cross_CpsCps(*this, *other, xyz); + } + bool Cross(cM3dGCyl const* cyl, cXyz* xyz) const { return cM3d_Cross_CpsCyl(*this, *cyl, xyz); } + bool Cross(cM3dGSph const* sph, cXyz* xyz) const { return cM3d_Cross_CpsSph(*this, *sph, xyz); } + +}; // Size = 0x20 + +STATIC_ASSERT(0x20 == sizeof(cM3dGCps)); #endif /* C_M3D_G_CPS_H */ diff --git a/include/SSystem/SComponent/c_m3d_g_cyl.h b/include/SSystem/SComponent/c_m3d_g_cyl.h index f3bc618b33d..3aeff46bcda 100644 --- a/include/SSystem/SComponent/c_m3d_g_cyl.h +++ b/include/SSystem/SComponent/c_m3d_g_cyl.h @@ -1,18 +1,20 @@ #ifndef C_M3D_G_CYL_H #define C_M3D_G_CYL_H +#include "SSystem/SComponent/c_m3d.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" // Cylinder struct cM3dGCylS { - cXyz mCenter; - f32 mRadius; - f32 mHeight; -}; + /* 0x00 */ cXyz mCenter; + /* 0x0C */ f32 mRadius; + /* 0x10 */ f32 mHeight; +}; // Size = 0x14 class cM3dGSph; class cM3dGCyl : public cM3dGCylS { + /* 0x14 vtable */ public: cM3dGCyl(const cXyz*, f32, f32); virtual void test(); // temp to build OK, remove later @@ -28,6 +30,13 @@ public: const cXyz& GetCP(void) const { return mCenter; } f32 GetR(void) const { return mRadius; } f32 GetH(void) const { return mHeight; } -}; + + bool Cross(const cM3dGCps* cps, cXyz* xyz) const { return cM3d_Cross_CpsCyl(*cps, *this, xyz); } + bool Cross(const cM3dGTri& tri, cXyz* xyz) const { return cM3d_Cross_CylTri(this, &tri, xyz); } + bool Cross(const cM3dGCyl* other, f32* f) const { return cM3d_Cross_CylCyl(this, other, f); } + bool Cross(const cM3dGSph* sph, f32* f) const { return cM3d_Cross_CylSph(this, sph, f); } +}; // Size = 0x18 + +STATIC_ASSERT(0x18 == sizeof(cM3dGCyl)); #endif /* C_M3D_G_CYL_H */ diff --git a/include/SSystem/SComponent/c_m3d_g_lin.h b/include/SSystem/SComponent/c_m3d_g_lin.h index b858765a9cb..92f4342c139 100644 --- a/include/SSystem/SComponent/c_m3d_g_lin.h +++ b/include/SSystem/SComponent/c_m3d_g_lin.h @@ -3,14 +3,15 @@ #include "SSystem/SComponent/c_xyz.h" #include "dolphin/mtx/vec.h" -#include "dolphin/types.h" +#include "global.h" // Line class cM3dGLin { // private: public: - cXyz mStart; - cXyz mEnd; + /* 0x00 */ cXyz mStart; + /* 0x0C */ cXyz mEnd; + /* 0x18 vtable */ cM3dGLin() {} cM3dGLin(const cXyz&, const cXyz&); @@ -24,6 +25,8 @@ public: cXyz& GetStartP(void) { return mStart; } const cXyz& GetEndP(void) const { return mEnd; } cXyz& GetEndP(void) { return mEnd; } -}; +}; // Size = 0x1C + +STATIC_ASSERT(0x1C == sizeof(cM3dGLin)); #endif /* C_M3D_G_LIN_H */ diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h index 25f7cf8978c..71d5fd45321 100644 --- a/include/SSystem/SComponent/c_m3d_g_pla.h +++ b/include/SSystem/SComponent/c_m3d_g_pla.h @@ -11,7 +11,7 @@ public: f32 mD; cM3dGPla(); cM3dGPla(const cXyz*, f32); - virtual ~cM3dGPla(); + virtual ~cM3dGPla() {} bool crossInfLin(const cXyz&, const cXyz&, cXyz&) const; void SetupNP0(const Vec&, const Vec&); void SetupNP(const Vec&, const Vec&); diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h index e03e026fa48..1956468a221 100644 --- a/include/SSystem/SComponent/c_m3d_g_sph.h +++ b/include/SSystem/SComponent/c_m3d_g_sph.h @@ -1,6 +1,7 @@ #ifndef C_M3D_G_SPH_H_ #define C_M3D_G_SPH_H_ +#include "SSystem/SComponent/c_m3d.h" #include "SSystem/SComponent/c_m3d_g_cyl.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" @@ -13,8 +14,9 @@ struct cM3dGSphS { class cM3dGSph { private: public: - cXyz mCenter; - f32 mRadius; + /* 0x00 */ cXyz mCenter; + /* 0x0C */ f32 mRadius; + /* 0x10 vtable */ virtual void test(); // temp to build OK, remove later virtual ~cM3dGSph(); @@ -30,7 +32,13 @@ public: f32 GetCX(void) const { return mCenter.GetX(); } f32 GetCY(void) const { return mCenter.GetY(); } f32 GetCZ(void) const { return mCenter.GetZ(); } -}; + + bool Cross(const cM3dGSph* other, f32* f) const { return cM3d_Cross_SphSph(this, other, f); } + bool Cross(const cM3dGCps* cps, cXyz* xyz) const { return cM3d_Cross_CpsSph(*cps, *this, xyz); } + bool Cross(const cM3dGCyl* cyl, f32* f) const { return cM3d_Cross_CylSph(cyl, this, f); } +}; // Size = 0x14 + +STATIC_ASSERT(0x14 == sizeof(cM3dGSph)); // additional symbols needed for cM3dGSph extern "C" { diff --git a/include/SSystem/SComponent/c_m3d_g_tri.h b/include/SSystem/SComponent/c_m3d_g_tri.h index 04cb82d449d..072bb48dd26 100644 --- a/include/SSystem/SComponent/c_m3d_g_tri.h +++ b/include/SSystem/SComponent/c_m3d_g_tri.h @@ -1,24 +1,31 @@ #ifndef C_M3D_G_TRI_H_ #define C_M3D_G_TRI_H_ +#include "SSystem/SComponent/c_m3d.h" #include "SSystem/SComponent/c_m3d_g_cyl.h" #include "SSystem/SComponent/c_m3d_g_pla.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" -class cM3dGTri { +class cM3dGTri : public cM3dGPla { // private: public: - ~cM3dGTri(); - cM3dGPla mPlane; - cXyz mA; - cXyz mB; - cXyz mC; + // cM3dGPla mPlane; + Vec mA; + Vec mB; + Vec mC; + virtual ~cM3dGTri() {} bool cross(const cM3dGCyl*, Vec*) const; void setPos(const Vec*, const Vec*, const Vec*); void setBg(const Vec*, const Vec*, const Vec*, const cM3dGPla*); void set(const Vec*, const Vec*, const Vec*, const Vec*); + bool Cross(cM3dGCps const& cps, cXyz* xyz) const { return cM3d_Cross_CpsTri(cps, *this, xyz); } + bool Cross(cM3dGCyl const& cyl, cXyz* xyz) const { return this->cross(&cyl, xyz); } + bool Cross(cM3dGSph const& sph, cXyz* xyz) const { return cM3d_Cross_SphTri(&sph, this, xyz); } + bool Cross(cM3dGTri const& other, cXyz* xyz) const { + return cM3d_Cross_TriTri(*this, other, xyz); + } }; #endif \ No newline at end of file diff --git a/include/d/cc/d_cc_d.h b/include/d/cc/d_cc_d.h index 37a574ed2c9..9442005e865 100644 --- a/include/d/cc/d_cc_d.h +++ b/include/d/cc/d_cc_d.h @@ -39,9 +39,10 @@ private: /* 0x1C */ int field_0x1C; }; // Size = 0x20 -class dCcD_Stts : cCcD_Stts { +// class dCcD_Stts : cCcD_Stts { +class dCcD_Stts { // TODO: vtables get messed up :( public: - /* 80083850 */ void GetGStts(); + /* 80083850 */ cCcD_GStts* GetGStts(); /* 80083860 */ void Init(int, int, fopAc_ac_c*); /* 800838F4 */ void Ct(); /* 80083928 */ void ClrAt(); @@ -49,6 +50,7 @@ public: /* 800851AC */ ~dCcD_Stts(); private: + /* 0x00 */ u8 _0[0x1C]; // TODO, should be covered by inheritance /* 0x1C */ dCcD_GStts mGStts; }; // Size = 0x3C @@ -116,7 +118,7 @@ class dCcD_GObjInf : cCcD_GObjInf { public: /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084268 */ void GetGObjInf(); + /* 80084268 */ cCcD_GObjInf* GetGObjInf(); /* 8008426C */ void ClrAtHit(); /* 800842C0 */ void ChkAtHit(); /* 80084318 */ void ResetAtHit(); @@ -147,7 +149,7 @@ private: class dCcD_Cyl : dCcD_GObjInf { public: /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 800848F8 */ void GetShapeAttr(); + /* 800848F8 */ cCcD_ShapeAttr* GetShapeAttr(); /* 80084908 */ void StartCAt(cXyz&); /* 80084954 */ void MoveCAt(cXyz&); /* 800849C4 */ void MoveCTg(cXyz&); @@ -163,7 +165,7 @@ public: /* 80084A34 */ void Set(dCcD_SrcSph const&); /* 80084A78 */ void StartCAt(cXyz&); /* 80084AC4 */ void MoveCAt(cXyz&); - /* 80084B34 */ void GetShapeAttr(); + /* 80084B34 */ cCcD_ShapeAttr* GetShapeAttr(); /* 80084BF4 */ ~dCcD_Sph(); private: @@ -173,7 +175,7 @@ private: class dCcD_Cps : dCcD_GObjInf { public: /* 800847D0 */ void Set(dCcD_SrcCps const&); - /* 80084814 */ void GetShapeAttr(); + /* 80084814 */ cCcD_ShapeAttr* GetShapeAttr(); /* 80084824 */ void CalcAtVec(); /* 80084854 */ void CalcTgVec(); /* 8008506C */ ~dCcD_Cps(); @@ -186,7 +188,7 @@ private: class dCcD_Tri { public: /* 80084884 */ void Set(dCcD_SrcTri const&); - /* 800848A4 */ void GetShapeAttr(); + /* 800848A4 */ cCcD_ShapeAttr* GetShapeAttr(); /* 80084EF4 */ ~dCcD_Tri(); }; diff --git a/include/d/cc/d_cc_mass_s.h b/include/d/cc/d_cc_mass_s.h index 0f2ac837eee..ab12012a321 100644 --- a/include/d/cc/d_cc_mass_s.h +++ b/include/d/cc/d_cc_mass_s.h @@ -13,33 +13,34 @@ private: u8 field_0x0[12]; cCcD_DivideInfo cccd_divideinfo; void* vtable; -}; +}; // Size = 0x20 + +STATIC_ASSERT(0x20 == sizeof(dCcMassS_Obj)); class dCcMassS_Mng { public: dCcMassS_Mng(void); ~dCcMassS_Mng(); -private: - /* 0x0000 */ cCcD_DivideArea cccd_dividearea; - /* 0x0020 */ u8 field_0x20[36]; - /* 0x0044 */ dCcMassS_Obj dccmasss_obj; - /* 0x0064 */ u8 field_0x64[292]; - /* 0x0188 */ dCcMassS_Obj dccmasss_obj2; - /* 0x01A8 */ u8 field_0x1a8[32]; - /* 0x01C8 */ cCcD_CylAttr cccd_cylattr; +public: + /* 0x0000 */ cCcD_DivideArea mDivideArea; + /* 0x0040 */ s32 mMassObjCount; + /* 0x0044 */ dCcMassS_Obj mMassObjs[10]; + /* 0x0184 */ s32 mMassAreaCount; + /* 0x0188 */ dCcMassS_Obj mMassAreas[2]; + /* 0x01C8 */ cCcD_CylAttr mCylAttr; /* 0x0200 */ u8 field_0x200[2]; /* 0x0202 */ u8 field_0x202; /* 0x0203 */ u8 field_0x203; - /* 0x0204 */ float cam_x_pos; - /* 0x0208 */ float cam_y_pos; - /* 0x020C */ float cam_z_pos; - /* 0x0210 */ float field_0x210; - /* 0x0214 */ float field_0x214; - /* 0x0218 */ float field_0x218; - /* 0x021C */ u8 field_0x21c[8]; + /* 0x0204 */ cXyz mCamTopPos; + /* 0x0210 */ f32 mCamTopDist; + /* 0x0214 */ cXyz mCamBottomPos; + /* 0x0220 */ f32 mCamBottomDist; /* 0x0224 */ cCcD_CpsAttr cccd_cpsattr; - /* 0x0288 */ cCcD_DivideInfo cccd_divideinfo; + /* 0x0264 */ cCcD_DivideInfo cccd_divideinfo; + /* 0x0274 */ void* vtable; }; +STATIC_ASSERT(sizeof(dCcMassS_Mng) == 0x278); + #endif /* D_CC_D_CC_MASS_S_H */ diff --git a/include/d/cc/d_cc_s.h b/include/d/cc/d_cc_s.h index ebfe05a1226..1d471d4d993 100644 --- a/include/d/cc/d_cc_s.h +++ b/include/d/cc/d_cc_s.h @@ -44,8 +44,9 @@ public: private: /* 0x0000 */ cCcS mCCcS; - /* 0x2834 */ u8 field_0x2834[0x18]; /* 0x284C */ dCcMassS_Mng mMass_Mng; -}; +}; // Size = 0x2AC4 + +STATIC_ASSERT(sizeof(dCcS) == 0x2AC4); #endif /* D_CC_D_CC_S_H */ diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index d0024195092..ea562093b8e 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -129,7 +129,6 @@ public: public: /* 0x00000 */ dBgS mDBgS; /* 0x01404 */ dCcS mDCcS; - /* 0x03EC4 */ u8 field_0x3ec4[4]; // might be part of dCcS /* 0x03EC8 */ dStage_startStage_c mStartStage; /* 0x03ED5 */ u8 field_0x3ed5; // probably padding /* 0x03ED6 */ dStage_nextStage_c mNextStage; @@ -431,6 +430,8 @@ public: u32 field_0x10; }; +STATIC_ASSERT(122384 == sizeof(dComIfG_inf_c)); + // extern dComIfG_inf_c g_dComIfG_gameInfo; /* void dComIfGp_setItemLifeCount(float, u8); diff --git a/include/global.h b/include/global.h index d784706ab79..d74d43a6877 100644 --- a/include/global.h +++ b/include/global.h @@ -24,6 +24,10 @@ #define _SDA_BASE_(dummy) 0 #define _SDA2_BASE_(dummy) 0 +#define GLUE(a, b) a##b +#define GLUE2(a, b) GLUE(a, b) +#define STATIC_ASSERT(cond) typedef char GLUE2(static_assertion_failed, __LINE__)[(cond) ? 1 : -1] + struct JUTWarn { JUTWarn& operator<<(const char*) { return *this; } JUTWarn& operator<<(long) { return *this; } diff --git a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp index 82ea016b374..55fb8308235 100644 --- a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp @@ -3,7 +3,8 @@ // Translation Unit: c_bg_s_gnd_chk // -// #include "SSystem/SComponent/c_bg_s_gnd_chk.h" +#include "SSystem/SComponent/c_bg_s_gnd_chk.h" +#include "SSystem/SComponent/c_xyz.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,120 +12,32 @@ // Types: // -struct cXyz { - static f32 Zero[3]; -}; - -struct cBgS_PolyInfo { - /* 80268074 */ cBgS_PolyInfo(); - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct Vec {}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); - /* 80267D28 */ void SetPos(cXyz const*); - /* 80267D0C */ void SetPos(Vec const*); - /* 80267D44 */ void PreCheck(); -}; - -struct cBgS_Chk { - /* 80267B4C */ cBgS_Chk(); - /* 80267B70 */ ~cBgS_Chk(); -}; - -// -// Forward References: -// - -extern "C" void __ct__11cBgS_GndChkFv(); -extern "C" void __dt__11cBgS_GndChkFv(); -extern "C" void SetPos__11cBgS_GndChkFPC3Vec(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void PreCheck__11cBgS_GndChkFv(); -extern "C" void func_80267D54(); - -// -// External References: -// - -extern "C" void __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dl__FPv(); -extern "C" f32 Zero__4cXyz[3]; - // // Declarations: // -/* ############################################################################################## */ -/* 803C3F90-803C3FA8 0210B0 0018+00 2/2 0/0 0/0 .data __vt__11cBgS_GndChk */ -SECTION_DATA extern void* __vt__11cBgS_GndChk[6] = { - (void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__11cBgS_GndChkFv, (void*)NULL, (void*)NULL, - (void*)func_80267D54, -}; - /* 80267C1C-80267C94 26255C 0078+00 0/0 2/2 123/123 .text __ct__11cBgS_GndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS_GndChk::cBgS_GndChk() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/__ct__11cBgS_GndChkFv.s" +cBgS_GndChk::cBgS_GndChk() { + mPosition = cXyz::Zero; + setActorPid(0xFFFFFFFF); + _30 = 2; } -#pragma pop /* 80267C94-80267D0C 2625D4 0078+00 2/1 4/4 110/110 .text __dt__11cBgS_GndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS_GndChk::~cBgS_GndChk() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/__dt__11cBgS_GndChkFv.s" -} -#pragma pop +cBgS_GndChk::~cBgS_GndChk() {} /* 80267D0C-80267D28 26264C 001C+00 0/0 0/0 62/62 .text SetPos__11cBgS_GndChkFPC3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_GndChk::SetPos(Vec const* param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC3Vec.s" +void cBgS_GndChk::SetPos(Vec const* pVec) { + mPosition = *pVec; } -#pragma pop /* 80267D28-80267D44 262668 001C+00 0/0 51/51 185/185 .text SetPos__11cBgS_GndChkFPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_GndChk::SetPos(cXyz const* param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC4cXyz.s" +void cBgS_GndChk::SetPos(cXyz const* pVec) { + mPosition = *pVec; } -#pragma pop /* 80267D44-80267D54 262684 0010+00 0/0 1/1 0/0 .text PreCheck__11cBgS_GndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_GndChk::PreCheck() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/PreCheck__11cBgS_GndChkFv.s" +void cBgS_GndChk::PreCheck() { + mWallPrecheck = _30 & 2; } -#pragma pop - -/* 80267D54-80267D5C 262694 0008+00 1/0 0/0 0/0 .text @20@__dt__11cBgS_GndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void func_80267D54() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/func_80267D54.s" -} -#pragma pop diff --git a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp index 2fe4074e6fa..94b906a520c 100644 --- a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp @@ -9,100 +9,41 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void __ct__11cBgS_LinChkFv(); -extern "C" void __dt__11cBgS_LinChkFv(); -extern "C" void ct__11cBgS_LinChkFv(); -extern "C" void Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi(); -extern "C" void PreCalc__11cBgS_LinChkFv(); -extern "C" static void func_80267F80(); - -// -// External References: -// - -extern "C" void __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ClearPi__13cBgS_PolyInfoFv(); -extern "C" void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8cM3dGLin[3]; -extern "C" f32 Zero__4cXyz[3]; - // // Declarations: // -/* ############################################################################################## */ -/* 803C3FA8-803C3FC0 0210C8 0018+00 2/2 0/0 0/0 .data __vt__11cBgS_LinChk */ -SECTION_DATA extern void* __vt__11cBgS_LinChk[6] = { - (void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__11cBgS_LinChkFv, (void*)NULL, (void*)NULL, - (void*)func_80267F80, -}; - /* 80267D5C-80267DBC 26269C 0060+00 0/0 2/2 0/0 .text __ct__11cBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS_LinChk::cBgS_LinChk() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_lin_chk/__ct__11cBgS_LinChkFv.s" +cBgS_LinChk::cBgS_LinChk() { + this->ct(); } -#pragma pop /* 80267DBC-80267E48 2626FC 008C+00 2/1 2/2 0/0 .text __dt__11cBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS_LinChk::~cBgS_LinChk() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_lin_chk/__dt__11cBgS_LinChkFv.s" -} -#pragma pop +cBgS_LinChk::~cBgS_LinChk() {} /* 80267E48-80267ED0 262788 0088+00 1/1 0/0 0/0 .text ct__11cBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_LinChk::ct() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_lin_chk/ct__11cBgS_LinChkFv.s" +void cBgS_LinChk::ct() { + cXyz xyz(cXyz::Zero); + mLin.SetStartEnd(xyz, xyz); + field_0x40 = xyz; + setActorPid(0xFFFFFFFF); + field_0x4c = 0; + mFrontFlag = 1; + mBackFlag = 0; } -#pragma pop /* 80267ED0-80267F40 262810 0070+00 0/0 2/2 0/0 .text Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_LinChk::Set2(cXyz const* param_0, cXyz const* param_1, unsigned int param_2) { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_lin_chk/Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi.s" +void cBgS_LinChk::Set2(cXyz const* pStart, cXyz const* pEnd, unsigned int actorPid) { + mLin.SetStartEnd(*pStart, *pEnd); + field_0x40 = *pEnd; + setActorPid(actorPid); + field_0x4c &= ~0x10; + ClearPi(); } -#pragma pop /* 80267F40-80267F80 262880 0040+00 0/0 1/1 0/0 .text PreCalc__11cBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_LinChk::PreCalc() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_lin_chk/PreCalc__11cBgS_LinChkFv.s" +void cBgS_LinChk::PreCalc() { + mPreWallChk = !(field_0x4c & 0x40000000); + mPreGroundChk = !(field_0x4c & 0x80000000); + mPreRoofChk = !(field_0x4c & 0x20000000); } -#pragma pop - -/* 80267F80-80267F88 2628C0 0008+00 1/0 0/0 0/0 .text @20@__dt__11cBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80267F80() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_lin_chk/func_80267F80.s" -} -#pragma pop diff --git a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp index df54be66d0b..7fde466061a 100644 --- a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp +++ b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp @@ -10,73 +10,24 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void __ct__13cBgS_ShdwDrawFv(); -extern "C" void __dt__13cBgS_ShdwDrawFv(); -extern "C" void Set__13cBgS_ShdwDrawFR4cXyzR4cXyz(); -extern "C" void SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i(); - -// -// External References: -// - -extern "C" void __ct__8cBgS_ChkFv(); -extern "C" void __dt__8cBgS_ChkFv(); -extern "C" void Set__8cM3dGAabFPC4cXyzPC4cXyz(); -extern "C" void __dl__FPv(); -extern "C" extern void* __vt__8cM3dGAab[3]; - // // Declarations: // -/* ############################################################################################## */ -/* 803C3FC0-803C3FD0 0210E0 000C+04 2/2 0/0 0/0 .data __vt__13cBgS_ShdwDraw */ -SECTION_DATA extern void* __vt__13cBgS_ShdwDraw[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__13cBgS_ShdwDrawFv, - /* padding */ - NULL, -}; - /* 80267F88-80267FD0 2628C8 0048+00 0/0 1/1 0/0 .text __ct__13cBgS_ShdwDrawFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS_ShdwDraw::cBgS_ShdwDraw() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_shdw_draw/__ct__13cBgS_ShdwDrawFv.s" -} -#pragma pop +cBgS_ShdwDraw::cBgS_ShdwDraw() {} /* 80267FD0-80268048 262910 0078+00 1/0 2/2 0/0 .text __dt__13cBgS_ShdwDrawFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS_ShdwDraw::~cBgS_ShdwDraw() { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_shdw_draw/__dt__13cBgS_ShdwDrawFv.s" -} -#pragma pop +cBgS_ShdwDraw::~cBgS_ShdwDraw() {} /* 80268048-8026806C 262988 0024+00 0/0 1/1 0/0 .text Set__13cBgS_ShdwDrawFR4cXyzR4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_ShdwDraw::Set(cXyz& param_0, cXyz& param_1) { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_shdw_draw/Set__13cBgS_ShdwDrawFR4cXyzR4cXyz.s" +void cBgS_ShdwDraw::Set(cXyz& param_0, cXyz& param_1) { + mM3dGAab.Set(¶m_0, ¶m_1); } -#pragma pop /* 8026806C-80268074 -00001 0008+00 0/0 0/0 0/0 .text * SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i */ -void cBgS_ShdwDraw::SetCallback(int (*param_0)(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, - cM3dGPla*)) { - *(u32*)(((u8*)this) + 48) /* this->field_0x30 */ = (u32)(param_0); +void cBgS_ShdwDraw::SetCallback(cBgS_ShdwDraw_Callback pCallback) { + mCallbackFun = pCallback; } diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index 9543bb2bd3c..96d67320198 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -4,6 +4,7 @@ // #include "SSystem/SComponent/c_cc_d.h" +#include "SSystem/SComponent/c_m3d.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -165,728 +166,768 @@ 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]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; // // Declarations: // /* 80263358-80263368 25DC98 0010+00 2/2 1/1 0/0 .text Set__15cCcD_DivideInfoFUlUlUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_DivideInfo::Set(u32 param_0, u32 param_1, u32 param_2) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/Set__15cCcD_DivideInfoFUlUlUl.s" +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; } -#pragma pop /* 80263368-802633A8 25DCA8 0040+00 0/0 5/5 0/0 .text Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_DivideInfo::Chk(cCcD_DivideInfo const& param_0) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo.s" +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) { + return false; + } else { + return true; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80455018-8045501C 003618 0004+00 1/1 0/0 0/0 .sdata2 @2305 */ -SECTION_SDATA2 static f32 lit_2305 = 0.03125f; - -/* 8045501C-80455020 00361C 0004+00 2/2 0/0 0/0 .sdata2 @2306 */ -SECTION_SDATA2 static f32 lit_2306 = 1.0f; /* 802633A8-802634D4 25DCE8 012C+00 0/0 2/2 0/0 .text SetArea__15cCcD_DivideAreaFRC8cM3dGAab */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_DivideArea::SetArea(cM3dGAab const& param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/SetArea__15cCcD_DivideAreaFRC8cM3dGAab.s" +void cCcD_DivideArea::SetArea(cM3dGAab const& pM3dGAab) { + Set(&pM3dGAab.mMin, &pM3dGAab.mMax); + mScaledXDiff = 1.0f / 32.0f * (mMax.x - mMin.x); + mXDiffIsZero = cM3d_IsZero(mScaledXDiff); + if (!mXDiffIsZero) { + mInvScaledXDiff = 1.0f / mScaledXDiff; + } + mScaledYDiff = 1.0f / 32.0f * (mMax.y - mMin.y); + mYDiffIsZero = cM3d_IsZero(mScaledYDiff); + if (!mYDiffIsZero) { + mInvScaledYDiff = 1.0f / mScaledYDiff; + } + mScaledZDiff = 1.0f / 32.0f * (mMax.z - mMin.z); + mZDiffIsZero = cM3d_IsZero(mScaledZDiff); + if (!mZDiffIsZero) { + mInvScaledZDiff = 1.0f / mScaledZDiff; + } } -#pragma pop /* ############################################################################################## */ /* 8039A7E8-8039A868 026E48 0080+00 2/2 0/0 0/0 .rodata l_base */ -SECTION_RODATA static u8 const l_base[128] = { - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0F, - 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0xFF, - 0x00, 0x00, 0x01, 0xFF, 0x00, 0x00, 0x03, 0xFF, 0x00, 0x00, 0x07, 0xFF, 0x00, 0x00, 0x0F, 0xFF, - 0x00, 0x00, 0x1F, 0xFF, 0x00, 0x00, 0x3F, 0xFF, 0x00, 0x00, 0x7F, 0xFF, 0x00, 0x00, 0xFF, 0xFF, - 0x00, 0x01, 0xFF, 0xFF, 0x00, 0x03, 0xFF, 0xFF, 0x00, 0x07, 0xFF, 0xFF, 0x00, 0x0F, 0xFF, 0xFF, - 0x00, 0x1F, 0xFF, 0xFF, 0x00, 0x3F, 0xFF, 0xFF, 0x00, 0x7F, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, - 0x01, 0xFF, 0xFF, 0xFF, 0x03, 0xFF, 0xFF, 0xFF, 0x07, 0xFF, 0xFF, 0xFF, 0x0F, 0xFF, 0xFF, 0xFF, - 0x1F, 0xFF, 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +static u32 const l_base[32] = { + 0x00000001, 0x00000003, 0x00000007, 0x0000000F, 0x0000001F, 0x0000003F, 0x0000007F, 0x000000FF, + 0x000001FF, 0x000003FF, 0x000007FF, 0x00000FFF, 0x00001FFF, 0x00003FFF, 0x00007FFF, 0x0000FFFF, + 0x0001FFFF, 0x0003FFFF, 0x0007FFFF, 0x000FFFFF, 0x001FFFFF, 0x003FFFFF, 0x007FFFFF, 0x00FFFFFF, + 0x01FFFFFF, 0x03FFFFFF, 0x07FFFFFF, 0x0FFFFFFF, 0x1FFFFFFF, 0x3FFFFFFF, 0x7FFFFFFF, 0xFFFFFFFF, }; -COMPILER_STRIP_GATE(0x8039A7E8, &l_base); /* 802634D4-802636A0 25DE14 01CC+00 0/0 2/2 0/0 .text * CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* param_0, cM3dGAab const& param_1, - u32 param_2) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl.s" +void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, cM3dGAab const& pM3dGAab, + u32 param_2) { + if (param_2 != 0) { + pDivideInfo->Set(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF); + } else { + u32 xDivInfo, yDivInfo, zDivInfo; + if (!mXDiffIsZero) { + s32 var1 = mInvScaledXDiff * (pM3dGAab.mMin.x - mMin.x); + s32 var3 = mInvScaledXDiff * (pM3dGAab.mMax.x - mMin.x); + if (0x1F < var3) { + var3 = 0x1F; + } + xDivInfo = l_base[var3]; + if (0 < var1) { + var1--; + xDivInfo &= ~l_base[var1]; + } + } else { + xDivInfo = 0xFFFFFFFF; + } + if (!mYDiffIsZero) { + s32 var1 = mInvScaledYDiff * (pM3dGAab.mMin.y - mMin.y); + s32 var3 = mInvScaledYDiff * (pM3dGAab.mMax.y - mMin.y); + if (0x1F < var3) { + var3 = 0x1F; + } + yDivInfo = l_base[var3]; + if (0 < var1) { + var1--; + yDivInfo &= ~l_base[var1]; + } + } else { + yDivInfo = 0xFFFFFFFF; + } + if (!mZDiffIsZero) { + s32 var1 = mInvScaledZDiff * (pM3dGAab.mMin.z - mMin.z); + s32 var3 = mInvScaledZDiff * (pM3dGAab.mMax.z - mMin.z); + if (0x1F < var3) { + var3 = 0x1F; + } + zDivInfo = l_base[var3]; + if (0 < var1) { + var1--; + zDivInfo &= ~l_base[var1]; + } + } else { + zDivInfo = 0xFFFFFFFF; + } + pDivideInfo->Set(xDivInfo, yDivInfo, zDivInfo); + } } -#pragma pop /* 802636A0-80263894 25DFE0 01F4+00 0/0 3/3 0/0 .text * CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* param_0, - cM3dGAab const& param_1) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab.s" +void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* pDivideInfo, + cM3dGAab const& pM3dGAab) { + u32 xDivInfo, yDivInfo, zDivInfo; + if (!mXDiffIsZero) { + s32 var1 = mInvScaledXDiff * (pM3dGAab.mMin.x - mMin.x); + s32 var3 = mInvScaledXDiff * (pM3dGAab.mMax.x - mMin.x); + if (var3 < 0 || 0x1F < var1) { + xDivInfo = 0; + } else { + if (0x1F < var3) { + var3 = 0x1F; + } + xDivInfo = l_base[var3]; + if (0 < var1) { + var1--; + xDivInfo &= ~l_base[var1]; + } + } + } else { + xDivInfo = 0xFFFFFFFF; + } + if (!mYDiffIsZero) { + s32 var1 = mInvScaledYDiff * (pM3dGAab.mMin.y - mMin.y); + s32 var3 = mInvScaledYDiff * (pM3dGAab.mMax.y - mMin.y); + if (var3 < 0 || 0x1F < var1) { + yDivInfo = 0; + } else { + if (0x1F < var3) { + var3 = 0x1F; + } + yDivInfo = l_base[var3]; + if (0 < var1) { + var1--; + yDivInfo &= ~l_base[var1]; + } + } + } else { + yDivInfo = 0xFFFFFFFF; + } + if (!mZDiffIsZero) { + s32 var1 = mInvScaledZDiff * (pM3dGAab.mMin.z - mMin.z); + s32 var3 = mInvScaledZDiff * (pM3dGAab.mMax.z - mMin.z); + if (var3 < 0 || 0x1F < var1) { + zDivInfo = 0; + } else { + if (0x1F < var3) { + var3 = 0x1F; + } + zDivInfo = l_base[var3]; + if (0 < var1) { + var1--; + zDivInfo &= ~l_base[var1]; + } + } + } else { + zDivInfo = 0xFFFFFFFF; + } + pDivideInfo->Set(xDivInfo, yDivInfo, zDivInfo); } -#pragma pop /* 80263894-8026389C 25E1D4 0008+00 1/0 1/0 0/0 .text GetGStts__9cCcD_SttsCFv */ -bool cCcD_Stts::GetGStts() const { - return false; +const cCcD_GStts* cCcD_Stts::GetGStts() const { + return NULL; } /* 8026389C-802638A4 25E1DC 0008+00 1/0 0/0 0/0 .text GetGStts__9cCcD_SttsFv */ -bool cCcD_Stts::GetGStts() { - return false; +cCcD_GStts* cCcD_Stts::GetGStts() { + return NULL; } /* 802638A4-80263904 25E1E4 0060+00 0/0 1/1 0/0 .text Init__9cCcD_SttsFiiPvUi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Stts::Init(int param_0, int param_1, void* param_2, unsigned int param_3) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/Init__9cCcD_SttsFiiPvUi.s" +void cCcD_Stts::Init(int param_0, int param_1, void* param_2, unsigned int param_3) { + this->Ct(); + mWeight = param_0; + field_0x15 = param_1; + mActor = static_cast(param_2); + mApid = param_3; } -#pragma pop - -/* ############################################################################################## */ -/* 80455020-80455028 003620 0004+04 13/13 0/0 0/0 .sdata2 @2431 */ -SECTION_SDATA2 static f32 lit_2431[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; /* 80263904-80263934 25E244 0030+00 1/0 1/1 0/0 .text Ct__9cCcD_SttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Stts::Ct() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/Ct__9cCcD_SttsFv.s" +void cCcD_Stts::Ct() { + mXyz.x = 0.0f; + mXyz.y = 0.0f; + mXyz.z = 0.0f; + mActor = 0; + mApid = 0xFFFFFFFF; + mWeight = 0; + field_0x15 = 0; + mTg = 0; } -#pragma pop /* 80263934-8026395C 25E274 0028+00 0/0 3/3 0/0 .text PlusCcMove__9cCcD_SttsFfff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Stts::PlusCcMove(f32 param_0, f32 param_1, f32 param_2) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/PlusCcMove__9cCcD_SttsFfff.s" +void cCcD_Stts::PlusCcMove(f32 x, f32 y, f32 z) { + mXyz.x += x; + mXyz.y += y; + mXyz.z += z; } -#pragma pop /* 8026395C-80263970 25E29C 0014+00 0/0 10/10 23/23 .text ClrCcMove__9cCcD_SttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Stts::ClrCcMove() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/ClrCcMove__9cCcD_SttsFv.s" +void cCcD_Stts::ClrCcMove() { + mXyz.z = 0.0f; + mXyz.y = 0.0f; + mXyz.x = 0.0f; } -#pragma pop /* 80263970-80263984 25E2B0 0014+00 0/0 2/2 0/0 .text PlusDmg__9cCcD_SttsFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Stts::PlusDmg(int param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/PlusDmg__9cCcD_SttsFi.s" +void cCcD_Stts::PlusDmg(int dmg) { + if (mTg >= dmg) { + return; + } + mTg = dmg; } -#pragma pop - -/* ############################################################################################## */ -/* 80455028-80455030 003628 0008+00 1/1 0/0 0/0 .sdata2 @2472 */ -SECTION_SDATA2 static f64 lit_2472 = 4503601774854144.0 /* cast s32 to float */; /* 80263984-802639B0 25E2C4 002C+00 0/0 1/1 0/0 .text GetWeightF__9cCcD_SttsCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Stts::GetWeightF() const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/GetWeightF__9cCcD_SttsCFv.s" +f32 cCcD_Stts::GetWeightF() const { + return (s32)mWeight; } -#pragma pop /* 802639B0-802639C4 25E2F0 0014+00 0/0 1/1 0/0 .text ct__18cCcD_ObjCommonBaseFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjCommonBase::ct() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/ct__18cCcD_ObjCommonBaseFv.s" +void cCcD_ObjCommonBase::ct() { + mSPrm = 0; + mRPrm = 0; + mHitObj = NULL; } -#pragma pop /* 802639C4-80263A10 25E304 004C+00 1/1 0/0 0/0 .text Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjHitInf::Set(cCcD_SrcObjHitInf const& param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf.s" +void cCcD_ObjHitInf::Set(cCcD_SrcObjHitInf const& pSrc) { + mObjAt.Set(pSrc.mObjAt); + mObjTg.Set(pSrc.mObjTg); + mObjCo.setSPrm(pSrc.mSPrm); } -#pragma pop /* 80263A10-80263A1C 25E350 000C+00 0/0 1/1 0/0 .text ct__8cCcD_ObjFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Obj::ct() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/ct__8cCcD_ObjFv.s" +void cCcD_Obj::ct() { + field_0x40 = 0; } -#pragma pop /* 80263A1C-80263A48 25E35C 002C+00 0/0 1/1 0/0 .text Set__8cCcD_ObjFRC11cCcD_SrcObj */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Obj::Set(cCcD_SrcObj const& param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/Set__8cCcD_ObjFRC11cCcD_SrcObj.s" +void cCcD_Obj::Set(cCcD_SrcObj const& param_0) { + field_0x40 = param_0.field_0x0; + this->cCcD_ObjHitInf::Set(param_0.mSrcObjHitInf); } -#pragma pop /* 80263A48-80263A64 25E388 001C+00 0/0 9/9 87/87 .text GetAc__8cCcD_ObjFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Obj::GetAc() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/GetAc__8cCcD_ObjFv.s" +fopAc_ac_c* cCcD_Obj::GetAc() { + if (this->mStts == NULL) { + return NULL; + } else { + return this->mStts->GetAc(); + } } -#pragma pop /* 80263A64-80263A88 25E3A4 0024+00 3/0 2/0 0/0 .text * getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ShapeAttr::getShapeAccess(cCcD_ShapeAttr::Shape* param_0) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape.s" +void cCcD_ShapeAttr::getShapeAccess(cCcD_ShapeAttr::Shape* shape) const { + shape->_0 = 2; + shape->_14 = 0.0f; + shape->_10 = 0.0f; + shape->_C = 0.0f; + shape->_8 = 0.0f; + shape->_4 = 0.0f; } -#pragma pop /* 80263A88-80263B58 25E3C8 00D0+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_TriAttr::CrossAtTg(cCcD_CpsAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz.s" +bool cCcD_TriAttr::CrossAtTg(cCcD_CpsAttr const& cpsAttr, cXyz* xyz) const { + if (this->cM3dGTri::Cross(cpsAttr, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263B58-80263B90 25E498 0038+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_TriAttr::CrossAtTg(cCcD_CylAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz.s" +bool cCcD_TriAttr::CrossAtTg(cCcD_CylAttr const& cylAttr, cXyz* xyz) const { + if (this->cM3dGTri::Cross(cylAttr, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263B90-80263BCC 25E4D0 003C+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_TriAttr::CrossAtTg(cCcD_SphAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz.s" +bool cCcD_TriAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { + if (this->cM3dGTri::Cross(sph, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263BCC-80263C04 25E50C 0038+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_TriAttr::CrossAtTg(cCcD_TriAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz.s" +bool cCcD_TriAttr::CrossAtTg(cCcD_TriAttr const& other, cXyz* xyz) const { + if (this->cM3dGTri::Cross(other, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263C04-80263C9C 25E544 0098+00 1/0 1/0 0/0 .text CalcAabBox__12cCcD_TriAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_TriAttr::CalcAabBox() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_TriAttrFv.s" +void cCcD_TriAttr::CalcAabBox() { + mAab.ClearForMinMax(); + mAab.SetMinMax(mA); + mAab.SetMinMax(mB); + mAab.SetMinMax(mC); } -#pragma pop - -/* ############################################################################################## */ -/* 80455030-80455038 003630 0004+04 1/1 0/0 0/0 .sdata2 @2632 */ -SECTION_SDATA2 static f32 lit_2632[1 + 1 /* padding */] = { - -1.0f, - /* padding */ - 0.0f, -}; /* 80263C9C-80263D38 25E5DC 009C+00 1/0 1/0 0/0 .text GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_TriAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz.s" +bool cCcD_TriAttr::GetNVec(cXyz const& param_0, cXyz* pOut) const { + if (this->getPlaneFunc(¶m_0) >= 0.0f) { + *pOut = mNormal; + } else { + *pOut = mNormal; + PSVECScale(pOut, pOut, -1.0f); + } + return true; } -#pragma pop /* 80263D38-80263D7C 25E678 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CpsAttr::CrossAtTg(cCcD_CpsAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz.s" +bool cCcD_CpsAttr::CrossAtTg(cCcD_CpsAttr const& other, cXyz* xyz) const { + if (this->cM3dGCps::Cross(&other, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263D7C-80263DC0 25E6BC 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CpsAttr::CrossAtTg(cCcD_CylAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz.s" +bool cCcD_CpsAttr::CrossAtTg(cCcD_CylAttr const& cyl, cXyz* xyz) const { + if (this->cM3dGCps::Cross(&cyl, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263DC0-80263E04 25E700 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CpsAttr::CrossAtTg(cCcD_SphAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz.s" +bool cCcD_CpsAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { + if (this->cM3dGCps::Cross(&sph, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263E04-80263ED4 25E744 00D0+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CpsAttr::CrossAtTg(cCcD_TriAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz.s" +bool cCcD_CpsAttr::CrossAtTg(cCcD_TriAttr const& triAttr, cXyz* xyz) const { + if (triAttr.cM3dGTri::Cross(*this, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263ED4-80263F24 25E814 0050+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CpsAttr::CrossCo(cCcD_CpsAttr const& param_0, f32* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf.s" +bool cCcD_CpsAttr::CrossCo(cCcD_CpsAttr const& other, f32* param_1) const { + *param_1 = 0.0f; + cXyz xyz; + if (this->cM3dGCps::Cross(&other, &xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263F24-80263F74 25E864 0050+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CpsAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf.s" +bool cCcD_CpsAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const { + *param_1 = 0.0f; + cXyz xyz; + if (this->cM3dGCps::Cross(¶m_0, &xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263F74-80263FC4 25E8B4 0050+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CpsAttr::CrossCo(cCcD_SphAttr const& param_0, f32* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf.s" +bool cCcD_CpsAttr::CrossCo(cCcD_SphAttr const& sph, f32* param_1) const { + *param_1 = 0.0f; + cXyz xyz; + if (this->cM3dGCps::Cross(&sph, &xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80263FC4-80264014 25E904 0050+00 1/0 2/1 0/0 .text CalcAabBox__12cCcD_CpsAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CpsAttr::CalcAabBox() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CpsAttrFv.s" +void cCcD_CpsAttr::CalcAabBox() { + mAab.ClearForMinMax(); + mAab.SetMinMax(mStart); + mAab.SetMinMax(mEnd); + mAab.PlusR(mRadius); } -#pragma pop /* 80264014-8026417C 25E954 0168+00 1/0 1/0 0/0 .text GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CpsAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz.s" +bool cCcD_CpsAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { + Vec diff; + const cXyz& endP = GetEndP(); + PSVECSubtract(&endP, &mStart, &diff); + f32 diffLen = PSVECDotProduct(&diff, &diff); + if (cM3d_IsZero(diffLen)) { + return false; + } else { + Vec vec1, vec2; + PSVECSubtract(¶m_0, &mStart, &vec1); + f32 vec1Len = PSVECDotProduct(&vec1, &diff) / diffLen; + if (vec1Len < 0.0f) { + vec2 = mStart; + } else { + if (vec1Len > 1.0f) { + vec2 = endP; + } else { + PSVECScale(&diff, &diff, vec1Len); + PSVECAdd(&diff, &mStart, &vec2); + } + } + PSVECSubtract(¶m_0, &vec2, param_1); + if (cM3d_IsZero(PSVECMag(param_1))) { + param_1->set(0.0f, 0.0f, 0.0f); + return false; + } else { + PSVECNormalize(param_1, param_1); + return true; + } + } } -#pragma pop /* 8026417C-802641C8 25EABC 004C+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::CrossAtTg(cCcD_CpsAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz.s" +bool cCcD_CylAttr::CrossAtTg(cCcD_CpsAttr const& cps, cXyz* xyz) const { + if (this->cM3dGCyl::Cross(&cps, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 802641C8-8026420C 25EB08 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::CrossAtTg(cCcD_CylAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz.s" +bool cCcD_CylAttr::CrossAtTg(cCcD_CylAttr const& other, cXyz* xyz) const { + if (this->cross(&other, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 8026420C-80264250 25EB4C 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::CrossAtTg(cCcD_SphAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz.s" +bool cCcD_CylAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { + if (this->cross(&sph, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80264250-80264288 25EB90 0038+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::CrossAtTg(cCcD_TriAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz.s" +bool cCcD_CylAttr::CrossAtTg(cCcD_TriAttr const& tri, cXyz* xyz) const { + if (this->cM3dGCyl::Cross(tri, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80264288-802642CC 25EBC8 0044+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf.s" +bool cCcD_CylAttr::CrossCo(cCcD_CylAttr const& other, f32* f) const { + if (this->cM3dGCyl::Cross(&other, f)) { + return true; + } else { + return false; + } } -#pragma pop /* 802642CC-80264310 25EC0C 0044+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::CrossCo(cCcD_SphAttr const& param_0, f32* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf.s" +bool cCcD_CylAttr::CrossCo(cCcD_SphAttr const& sph, f32* f) const { + if (this->cM3dGCyl::Cross(&sph, f)) { + return true; + } else { + return false; + } } -#pragma pop /* 80264310-80264368 25EC50 0058+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::CrossCo(cCcD_CpsAttr const& param_0, f32* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf.s" +bool cCcD_CylAttr::CrossCo(cCcD_CpsAttr const& cps, f32* f) const { + *f = 0.0f; + cXyz xyz; + if (this->cM3dGCyl::Cross(&cps, &xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80264368-802643D0 25ECA8 0068+00 1/0 1/0 0/0 .text CalcAabBox__12cCcD_CylAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::CalcAabBox() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_CylAttrFv.s" +void cCcD_CylAttr::CalcAabBox() { + cXyz min; + cXyz max; + min.x = mCenter.x - mRadius; + min.y = mCenter.y; + min.z = mCenter.z - mRadius; + max.x = mCenter.x + mRadius; + max.y = mCenter.y + mHeight; + max.z = mCenter.z + mRadius; + mAab.Set(&min, &max); } -#pragma pop /* 802643D0-802644B8 25ED10 00E8+00 1/0 1/0 0/0 .text GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz.s" +bool cCcD_CylAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { + Vec vec; + if (mCenter.y > param_0.y) { + vec = mCenter; + } else { + if (mCenter.y + mHeight < param_0.y) { + vec.x = mCenter.x; + vec.y = mCenter.y; + vec.z = mCenter.z; + vec.y = mCenter.y + mHeight; + } else { + vec = mCenter; + vec.y = param_0.y; + } + } + PSVECSubtract(¶m_0, &vec, param_1); + if (cM3d_IsZero(PSVECMag(param_1))) { + param_1->set(0.0f, 0.0f, 0.0f); + return false; + } else { + PSVECNormalize(param_1, param_1); + return true; + } + return false; } -#pragma pop /* 802644B8-802644EC 25EDF8 0034+00 1/0 1/0 0/0 .text * getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_CylAttr::getShapeAccess(cCcD_ShapeAttr::Shape* param_0) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape.s" +void cCcD_CylAttr::getShapeAccess(cCcD_ShapeAttr::Shape* shape) const { + shape->_0 = 1; + shape->_4 = mCenter.x; + shape->_8 = mCenter.y; + shape->_C = mCenter.z; + shape->_10 = mRadius; + shape->_14 = mHeight; +} + +inline bool inlineCross(cM3dGSph const& sph, cM3dGCps const* cps, cXyz* xyz) { + return cM3d_Cross_CpsSph(*cps, sph, xyz); } -#pragma pop /* 802644EC-80264538 25EE2C 004C+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::CrossAtTg(cCcD_CpsAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz.s" +bool cCcD_SphAttr::CrossAtTg(cCcD_CpsAttr const& cps, cXyz* xyz) const { + if (inlineCross(*this, &cps, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 80264538-8026457C 25EE78 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::CrossAtTg(cCcD_CylAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz.s" +bool cCcD_SphAttr::CrossAtTg(cCcD_CylAttr const& cyl, cXyz* xyz) const { + if (this->cross(&cyl, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 8026457C-802645C0 25EEBC 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::CrossAtTg(cCcD_SphAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz.s" +bool cCcD_SphAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { + if (this->cross(&sph, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 802645C0-802645F8 25EF00 0038+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::CrossAtTg(cCcD_TriAttr const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz.s" +bool cCcD_SphAttr::CrossAtTg(cCcD_TriAttr const& tri, cXyz* xyz) const { + if (tri.cM3dGTri::Cross(*this, xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 802645F8-80264644 25EF38 004C+00 1/0 1/0 0/0 .text CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf.s" +bool cCcD_SphAttr::CrossCo(cCcD_CylAttr const& cyl, f32* f) const { + if (this->cM3dGSph::Cross(&cyl, f)) { + return true; + } else { + return false; + } } -#pragma pop /* 80264644-80264688 25EF84 0044+00 1/0 1/0 0/0 .text CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::CrossCo(cCcD_SphAttr const& param_0, f32* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf.s" +bool cCcD_SphAttr::CrossCo(cCcD_SphAttr const& sph, f32* f) const { + if (this->cM3dGSph::Cross(&sph, f)) { + return true; + } else { + return false; + } } -#pragma pop /* 80264688-802646E0 25EFC8 0058+00 1/0 1/0 0/0 .text CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::CrossCo(cCcD_CpsAttr const& param_0, f32* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf.s" +bool cCcD_SphAttr::CrossCo(cCcD_CpsAttr const& cps, f32* f) const { + *f = 0.0f; + cXyz xyz; + if (this->cM3dGSph::Cross(&cps, &xyz)) { + return true; + } else { + return false; + } } -#pragma pop /* 802646E0-8026476C 25F020 008C+00 1/0 2/1 0/0 .text CalcAabBox__12cCcD_SphAttrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::CalcAabBox() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/CalcAabBox__12cCcD_SphAttrFv.s" +void cCcD_SphAttr::CalcAabBox() { + cXyz min; + cXyz max; + + min = max = mCenter; + + // min -= mRadius; doesn't work :( + min.x -= mRadius; + min.y -= mRadius; + min.z -= mRadius; + + max.x += mRadius; + max.y += mRadius; + max.z += mRadius; + + mAab.Set(&min, &max); } -#pragma pop /* 8026476C-80264808 25F0AC 009C+00 1/0 1/0 0/0 .text GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz.s" +bool cCcD_SphAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { + param_1->x = param_0.x - mCenter.x; + param_1->y = param_0.y - mCenter.y; + param_1->z = param_0.z - mCenter.z; + + if (cM3d_IsZero(PSVECMag(param_1))) { + param_1->x = 0.0f; + param_1->y = 0.0f; + param_1->z = 0.0f; + return false; + } else { + PSVECNormalize(param_1, param_1); + return true; + } } -#pragma pop /* 80264808-8026483C 25F148 0034+00 1/0 1/0 0/0 .text * getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_SphAttr::getShapeAccess(cCcD_ShapeAttr::Shape* param_0) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape.s" +void cCcD_SphAttr::getShapeAccess(cCcD_ShapeAttr::Shape* shape) const { + shape->_0 = 0; + shape->_4 = mCenter.x; + shape->_8 = mCenter.y; + shape->_C = mCenter.z; + shape->_10 = mRadius; + shape->_14 = 0.0f; } -#pragma pop /* 8026483C-8026484C 25F17C 0010+00 0/0 1/1 0/0 .text SetHit__10cCcD_ObjAtFP8cCcD_Obj */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjAt::SetHit(cCcD_Obj* param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjAtFP8cCcD_Obj.s" +void cCcD_ObjAt::SetHit(cCcD_Obj* pObj) { + mRPrm = 1; + mHitObj = pObj; } -#pragma pop /* 8026484C-80264868 25F18C 001C+00 1/1 0/0 0/0 .text Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjAt::Set(cCcD_SrcObjAt const& param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt.s" +void cCcD_ObjAt::Set(cCcD_SrcObjAt const& pSrc) { + mSPrm = pSrc.mSPrm; + mType = pSrc.mType; + mAtp = pSrc.mAtp; } -#pragma pop /* 80264868-80264880 25F1A8 0018+00 0/0 2/2 0/0 .text ClrHit__10cCcD_ObjAtFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjAt::ClrHit() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjAtFv.s" +void cCcD_ObjAt::ClrHit() { + mRPrm &= ~1; + mHitObj = NULL; } -#pragma pop /* 80264880-80264894 25F1C0 0014+00 1/1 0/0 0/0 .text Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjTg::Set(cCcD_SrcObjTg const& param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg.s" +void cCcD_ObjTg::Set(cCcD_SrcObjTg const& pSrc) { + mSPrm = pSrc.mSPrm; + mType = pSrc.mType; } -#pragma pop /* 80264894-802648B0 25F1D4 001C+00 0/0 0/0 2/2 .text SetGrp__10cCcD_ObjTgFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjTg::SetGrp(u32 param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/SetGrp__10cCcD_ObjTgFUl.s" +void cCcD_ObjTg::SetGrp(u32 grp) { + mSPrm &= ~0x1E; + mSPrm |= grp; } -#pragma pop /* 802648B0-802648C8 25F1F0 0018+00 0/0 2/2 0/0 .text ClrHit__10cCcD_ObjTgFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjTg::ClrHit() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjTgFv.s" +void cCcD_ObjTg::ClrHit() { + mRPrm &= ~1; + mHitObj = NULL; } -#pragma pop /* 802648C8-802648D8 25F208 0010+00 0/0 1/1 0/0 .text SetHit__10cCcD_ObjTgFP8cCcD_Obj */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjTg::SetHit(cCcD_Obj* param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjTgFP8cCcD_Obj.s" +void cCcD_ObjTg::SetHit(cCcD_Obj* pObj) { + mRPrm = 1; + mHitObj = pObj; } -#pragma pop /* 802648D8-802648E8 25F218 0010+00 0/0 1/1 0/0 .text SetHit__10cCcD_ObjCoFP8cCcD_Obj */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjCo::SetHit(cCcD_Obj* param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/SetHit__10cCcD_ObjCoFP8cCcD_Obj.s" +void cCcD_ObjCo::SetHit(cCcD_Obj* pObj) { + mRPrm = 1; + mHitObj = pObj; } -#pragma pop /* 802648E8-80264900 25F228 0018+00 0/0 2/2 0/0 .text ClrHit__10cCcD_ObjCoFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjCo::ClrHit() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/ClrHit__10cCcD_ObjCoFv.s" +void cCcD_ObjCo::ClrHit() { + mRPrm &= ~1; + mHitObj = NULL; } -#pragma pop /* 80264900-8026491C 25F240 001C+00 0/0 1/1 1/1 .text SetIGrp__10cCcD_ObjCoFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjCo::SetIGrp(u32 param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/SetIGrp__10cCcD_ObjCoFUl.s" +void cCcD_ObjCo::SetIGrp(u32 grp) { + mSPrm &= ~0xE; + mSPrm |= grp; } -#pragma pop /* 8026491C-80264938 25F25C 001C+00 0/0 1/1 7/7 .text SetVsGrp__10cCcD_ObjCoFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_ObjCo::SetVsGrp(u32 param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/SetVsGrp__10cCcD_ObjCoFUl.s" +void cCcD_ObjCo::SetVsGrp(u32 grp) { + mSPrm &= ~0x70; + mSPrm |= grp; } -#pragma pop /* ############################################################################################## */ /* 803C3540-803C35A4 020660 0064+00 0/0 5/5 332/332 .data __vt__12cCcD_SphAttr */ @@ -1032,14 +1073,19 @@ SECTION_DATA extern void* __vt__14cCcD_ShapeAttr[22] = { }; /* 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 */ @@ -1059,14 +1105,9 @@ void cCcD_Stts::ClrAt() { } /* 802649EC-802649F8 25F32C 000C+00 1/0 0/0 0/0 .text ClrTg__9cCcD_SttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcD_Stts::ClrTg() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_d/ClrTg__9cCcD_SttsFv.s" +void cCcD_Stts::ClrTg() { + mTg = 0; } -#pragma pop /* ############################################################################################## */ /* 80430CA8-80430CB4 05D9C8 000C+00 1/1 0/0 0/0 .bss @2414 */ diff --git a/libs/SSystem/SComponent/c_cc_s.cpp b/libs/SSystem/SComponent/c_cc_s.cpp index 3189247eb2e..b95549e2b5b 100644 --- a/libs/SSystem/SComponent/c_cc_s.cpp +++ b/libs/SSystem/SComponent/c_cc_s.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_cc_s.h" #include "dol2asm.h" -#include "dolphin/types.h" +#include "global.h" // // Forward References: @@ -76,9 +76,7 @@ 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 u32 __float_nan; extern "C" extern u8 data_80451158[8]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; // // Declarations: @@ -88,115 +86,134 @@ extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; /* 80451158-80451160 0008+00 s=0 e=1 z=0 None .sbss None */ u8 data_80451158[8]; -/* ############################################################################################## */ -/* 803C3748-803C3778 020868 0030+00 1/1 2/2 0/0 .data __vt__4cCcS */ -SECTION_DATA extern void* __vt__4cCcS[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts, - (void*)SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf, - (void*) - SetCoGObjInf__4cCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts, - (void*) - SetAtTgGObjInf__4cCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz, - (void*)ChkNoHitGAtTg__4cCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts, - (void*) - ChkAtTgHitAfterCross__4cCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts, - (void*)ChkNoHitGCo__4cCcSFP8cCcD_ObjP8cCcD_Obj, - (void*)__dt__4cCcSFv, - (void*)MoveAfterCheck__4cCcSFv, - (void*)SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj, -}; - /* 80264A6C-80264A94 25F3AC 0028+00 0/0 1/1 0/0 .text __ct__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcS::cCcS() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/__ct__4cCcSFv.s" -} -#pragma pop +cCcS::cCcS() {} /* 80264A94-80264B60 25F3D4 00CC+00 1/1 1/1 0/0 .text Ct__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::Ct() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/Ct__4cCcSFv.s" +void cCcS::Ct() { + for (cCcD_Obj** obj = this->mpObjAt; obj < this->mpObjAt + ARRAY_SIZE(this->mpObjAt); ++obj) { + *obj = NULL; + } + this->mObjAtCount = 0; + for (cCcD_Obj** obj = this->mpObjTg; obj < this->mpObjTg + ARRAY_SIZE(this->mpObjTg); ++obj) { + *obj = NULL; + } + this->mObjTgCount = 0; + for (cCcD_Obj** obj = this->mpObjCo; obj < this->mpObjCo + ARRAY_SIZE(this->mpObjCo); ++obj) { + *obj = NULL; + } + this->mObjCoCount = 0; + for (cCcD_Obj** obj = this->mpObj; obj < this->mpObj + ARRAY_SIZE(this->mpObj); ++obj) { + *obj = NULL; + } + this->mObjCount = 0; } -#pragma pop /* 80264B60-80264B80 25F4A0 0020+00 0/0 1/1 0/0 .text Dt__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::Dt() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/Dt__4cCcSFv.s" +void cCcS::Dt() { + this->Ct(); } -#pragma pop /* 80264B80-80264BA8 25F4C0 0028+00 1/1 0/0 0/0 .text GetWt__4cCcSCFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::GetWt(u8 param_0) const { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/GetWt__4cCcSCFUc.s" +WeightType cCcS::GetWt(u8 param_0) const { + if (param_0 == 0xFF) { + return WeightType_0; + } + if (param_0 == 0xFE) { + return WeightType_1; + } + return WeightType_2; } -#pragma pop /* 80264BA8-80264C5C 25F4E8 00B4+00 0/0 7/7 454/454 .text Set__4cCcSFP8cCcD_Obj */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::Set(cCcD_Obj* param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/Set__4cCcSFP8cCcD_Obj.s" +void cCcS::Set(cCcD_Obj* obj) { + if (obj->GetObjAt().getSPrm() & 1) { + if (mObjAtCount < ARRAY_SIZE(mpObjAt)) { + mpObjAt[mObjAtCount] = obj; + mObjAtCount++; + } + } + if (obj->GetObjTg().getSPrm() & 1) { + if (mObjTgCount < ARRAY_SIZE(mpObjTg)) { + mpObjTg[mObjTgCount] = obj; + mObjTgCount++; + } + } + if (obj->GetObjCo().getSPrm() & 1) { + if (mObjCoCount < ARRAY_SIZE(mpObjCo)) { + mpObjCo[mObjCoCount] = obj; + mObjCoCount++; + } + } + if (mObjCount < ARRAY_SIZE(mpObj)) { + mpObj[mObjCount] = obj; + mObjCount++; + } } -#pragma pop /* 80264C5C-80264CF0 25F59C 0094+00 1/1 0/0 0/0 .text ClrCoHitInf__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::ClrCoHitInf() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/ClrCoHitInf__4cCcSFv.s" +void cCcS::ClrCoHitInf() { + for (cCcD_Obj** obj = this->mpObjCo; obj < this->mpObjCo + this->mObjCoCount; ++obj) { + if (*obj != NULL) { + (*obj)->GetGObjInf()->ClrCoHit(); + cCcD_Stts* stts = (*obj)->GetStts(); + if (stts != NULL) { + stts->ClrCcMove(); + } + } + } } -#pragma pop /* 80264CF0-80264D90 25F630 00A0+00 1/1 0/0 0/0 .text ClrTgHitInf__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::ClrTgHitInf() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/ClrTgHitInf__4cCcSFv.s" +void cCcS::ClrTgHitInf() { + for (cCcD_Obj** obj = this->mpObjTg; obj < this->mpObjTg + this->mObjTgCount; ++obj) { + if (*obj != NULL) { + (*obj)->GetGObjInf()->ClrTgHit(); + cCcD_Stts* stts = (*obj)->GetStts(); + if (stts != NULL) { + stts->ClrTg(); + } + } + } } -#pragma pop /* 80264D90-80264E2C 25F6D0 009C+00 1/1 0/0 0/0 .text ClrAtHitInf__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::ClrAtHitInf() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/ClrAtHitInf__4cCcSFv.s" +void cCcS::ClrAtHitInf() { + for (cCcD_Obj** obj = this->mpObjAt; obj < this->mpObjAt + this->mObjAtCount; ++obj) { + if (*obj != NULL) { + (*obj)->GetGObjInf()->ClrAtHit(); + cCcD_Stts* stts = (*obj)->GetStts(); + if (stts != NULL) { + stts->ClrAt(); + } + } + } } -#pragma pop /* 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) { + 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) { + 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 void cCcS::ChkNoHitAtTg(cCcD_Obj* param_0, cCcD_Obj* param_1) { +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 */ @@ -336,14 +353,16 @@ asm void cCcS::CalcArea() { #pragma pop /* 80265CCC-80265D30 26060C 0064+00 0/0 1/1 0/0 .text Move__4cCcSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cCcS::Move() { - nofralloc -#include "asm/SSystem/SComponent/c_cc_s/Move__4cCcSFv.s" +void cCcS::Move() { + this->CalcArea(); + this->ChkAtTg(); + this->ChkCo(); + this->MoveAfterCheck(); + mObjAtCount = 0; + mObjTgCount = 0; + mObjCoCount = 0; + mObjCount = 0; } -#pragma pop /* 80265D30-80265DF4 260670 00C4+00 0/0 1/1 0/0 .text DrawClear__4cCcSFv */ #pragma push diff --git a/libs/SSystem/SComponent/c_m3d.cpp b/libs/SSystem/SComponent/c_m3d.cpp index 5e60d92988a..de18cfa2447 100644 --- a/libs/SSystem/SComponent/c_m3d.cpp +++ b/libs/SSystem/SComponent/c_m3d.cpp @@ -142,10 +142,6 @@ f32 cM3d_Len2dSq(f32 pX1, f32 pY1, f32 pX2, f32 pY2) { /* 80451180-80451188 000680 0004+04 29/29 44/44 65/65 .sbss G_CM3D_F_ABS_MIN */ extern f32 G_CM3D_F_ABS_MIN; -inline bool cM3d_IsZero(f32 pF) { - return fabsf(pF) < G_CM3D_F_ABS_MIN; -} - /* 80455118-80455120 003718 0004+04 28/28 0/0 0/0 .sdata2 @2256 */ SECTION_SDATA2 static f32 lit_2256[1 + 1 /* padding */] = { 0.0f, diff --git a/libs/SSystem/SComponent/c_m3d_g_cps.cpp b/libs/SSystem/SComponent/c_m3d_g_cps.cpp index aa4fd6cebdb..8242b921e5b 100644 --- a/libs/SSystem/SComponent/c_m3d_g_cps.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_cps.cpp @@ -20,16 +20,16 @@ cM3dGCps::~cM3dGCps(void) {} /* 8026F000-8026F03C 269940 003C+00 1/1 2/2 10/10 .text Set__8cM3dGCpsFRC4cXyzRC4cXyzf */ void cM3dGCps::Set(const cXyz& pStart, const cXyz& pEnd, f32 pUnkF) { this->SetStartEnd(pStart, pEnd); - unk_0x1c = pUnkF; + mRadius = pUnkF; } /* 8026F03C-8026F080 26997C 0044+00 0/0 1/1 10/10 .text Set__8cM3dGCpsFRC9cM3dGCpsS */ void cM3dGCps::Set(const cM3dGCpsS& other) { this->SetStartEnd(other.mStart, other.mEnd); - unk_0x1c = other.unk_0x1c; + mRadius = other.mRadius; } /* 8026F080-8026F0A8 2699C0 0028+00 0/0 1/1 0/0 .text SetCps__8cM3dGCpsFRC8cM3dGCps */ void cM3dGCps::SetCps(const cM3dGCps& other) { - this->Set(other.GetStartP(), other.GetEndP(), other.unk_0x1c); + this->Set(other.GetStartP(), other.GetEndP(), other.mRadius); } diff --git a/libs/SSystem/SComponent/c_m3d_g_tri.cpp b/libs/SSystem/SComponent/c_m3d_g_tri.cpp index 500528c5b3c..5f00592968e 100644 --- a/libs/SSystem/SComponent/c_m3d_g_tri.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_tri.cpp @@ -23,7 +23,7 @@ void cM3dGTri::setPos(const Vec* pA, const Vec* pB, const Vec* pC) { mA = *pA; mB = *pB; mC = *pC; - cM3d_CalcPla(&mA, &mB, &mC, &mPlane.mNormal, &mPlane.mD); + cM3d_CalcPla(&mA, &mB, &mC, &mNormal, &mD); } /* 8026F85C-8026F8C8 26A19C 006C+00 0/0 2/2 0/0 .text @@ -32,7 +32,7 @@ void cM3dGTri::setBg(const Vec* pA, const Vec* pB, const Vec* pC, const cM3dGPla mA = *pA; mB = *pB; mC = *pC; - mPlane.Set(pPlane); + Set(pPlane); } /* 8026F8C8-8026F93C 26A208 0074+00 0/0 1/1 0/0 .text set__8cM3dGTriFPC3VecPC3VecPC3VecPC3Vec */ @@ -40,5 +40,5 @@ void cM3dGTri::set(const Vec* pA, const Vec* pB, const Vec* pC, const Vec* pNorm mA = *pA; mB = *pB; mC = *pC; - mPlane.SetupNP(*pNormal, *pA); + SetupNP(*pNormal, *pA); } diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 38eb17bcfee..ef1ee16fbdc 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -3793,7 +3793,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; extern "C" extern void* __vt__12J3DFrameCtrl[3]; @@ -3848,7 +3847,6 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 g_whiteColor; extern "C" u16 m_branchId__7dDemo_c[1 + 3 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" extern u32 __float_max; extern "C" extern u8 data_80450B38[4]; extern "C" f32 mGroundY__11fopAcM_gc_c; @@ -3863,7 +3861,6 @@ extern "C" extern u8 struct_80450FBC[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" extern u8 struct_8045101C[4]; extern "C" u8 Zero__5csXyz[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; @@ -34894,7 +34891,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_Stts::~cCcD_Stts() { +// asm cCcD_Stts::~cCcD_Stts() { +extern "C" asm void __dt__9cCcD_SttsFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__9cCcD_SttsFv.s" } diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 87ca3f2bdb9..add8b58ff12 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -109,7 +109,6 @@ extern "C" extern void* __vt__8cM3dGCyl[3]; extern "C" extern void* __vt__8cM3dGLin[3]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 data_80450F68[8]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; // // // Declarations: diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index 581a6392a35..de0ca35dfdd 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -219,7 +219,6 @@ extern "C" extern void* __vt__8cM3dGPla[3]; extern "C" extern void* __vt__8cM3dGAab[3]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; // // Declarations: @@ -689,7 +688,8 @@ asm void cBgW::RwgLineCheck(u16 param_0, cBgS_LinChk* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGTri::~cM3dGTri() { +// asm cM3dGTri::~cM3dGTri() { +extern "C" asm void __dt__8cM3dGTriFv() { nofralloc #include "asm/d/bg/d_bg_w/__dt__8cM3dGTriFv.s" } diff --git a/src/d/cc/d_cc_d.cpp b/src/d/cc/d_cc_d.cpp index 2abe026d1ec..e2857618e5e 100644 --- a/src/d/cc/d_cc_d.cpp +++ b/src/d/cc/d_cc_d.cpp @@ -640,7 +640,7 @@ asm void dCcD_GStts::Move() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCcD_Stts::GetGStts() { +asm cCcD_GStts* dCcD_Stts::GetGStts() { nofralloc #include "asm/d/cc/d_cc_d/GetGStts__9dCcD_SttsFv.s" } @@ -710,7 +710,8 @@ asm void dCcD_GObjTg::Set(dCcD_SrcGObjTg const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GObjInf::dCcD_GObjInf() { +// asm dCcD_GObjInf::dCcD_GObjInf() { +extern "C" asm void __ct__12dCcD_GObjInfFv() { nofralloc #include "asm/d/cc/d_cc_d/__ct__12dCcD_GObjInfFv.s" } @@ -720,7 +721,8 @@ asm dCcD_GObjInf::dCcD_GObjInf() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GObjCo::~dCcD_GObjCo() { +// asm dCcD_GObjCo::~dCcD_GObjCo() { +extern "C" asm void __dt__11dCcD_GObjCoFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__11dCcD_GObjCoFv.s" } @@ -730,7 +732,8 @@ asm dCcD_GObjCo::~dCcD_GObjCo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GObjTg::~dCcD_GObjTg() { +// asm dCcD_GObjTg::~dCcD_GObjTg() { +extern "C" asm void __dt__11dCcD_GObjTgFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__11dCcD_GObjTgFv.s" } @@ -740,7 +743,8 @@ asm dCcD_GObjTg::~dCcD_GObjTg() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GObjAt::~dCcD_GObjAt() { +// asm dCcD_GObjAt::~dCcD_GObjAt() { +extern "C" asm void __dt__11dCcD_GObjAtFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__11dCcD_GObjAtFv.s" } @@ -750,7 +754,8 @@ asm dCcD_GObjAt::~dCcD_GObjAt() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GAtTgCoCommonBase::~dCcD_GAtTgCoCommonBase() { +// asm dCcD_GAtTgCoCommonBase::~dCcD_GAtTgCoCommonBase() { +extern "C" asm void __dt__22dCcD_GAtTgCoCommonBaseFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__22dCcD_GAtTgCoCommonBaseFv.s" } @@ -760,7 +765,8 @@ asm dCcD_GAtTgCoCommonBase::~dCcD_GAtTgCoCommonBase() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GObjInf::~cCcD_GObjInf() { +// asm cCcD_GObjInf::~cCcD_GObjInf() { +extern "C" asm void __dt__12cCcD_GObjInfFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__12cCcD_GObjInfFv.s" } @@ -770,7 +776,8 @@ asm cCcD_GObjInf::~cCcD_GObjInf() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_Obj::~cCcD_Obj() { +// asm cCcD_Obj::~cCcD_Obj() { +extern "C" asm void __dt__8cCcD_ObjFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__8cCcD_ObjFv.s" } @@ -780,7 +787,8 @@ asm cCcD_Obj::~cCcD_Obj() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_ObjHitInf::~cCcD_ObjHitInf() { +// asm cCcD_ObjHitInf::~cCcD_ObjHitInf() { +extern "C" asm void __dt__14cCcD_ObjHitInfFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__14cCcD_ObjHitInfFv.s" } @@ -790,7 +798,8 @@ asm cCcD_ObjHitInf::~cCcD_ObjHitInf() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_ObjCo::~cCcD_ObjCo() { +// asm cCcD_ObjCo::~cCcD_ObjCo() { +extern "C" asm void __dt__10cCcD_ObjCoFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__10cCcD_ObjCoFv.s" } @@ -800,7 +809,8 @@ asm cCcD_ObjCo::~cCcD_ObjCo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_ObjTg::~cCcD_ObjTg() { +// asm cCcD_ObjTg::~cCcD_ObjTg() { +extern "C" asm void __dt__10cCcD_ObjTgFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__10cCcD_ObjTgFv.s" } @@ -810,7 +820,8 @@ asm cCcD_ObjTg::~cCcD_ObjTg() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_ObjAt::~cCcD_ObjAt() { +// asm cCcD_ObjAt::~cCcD_ObjAt() { +extern "C" asm void __dt__10cCcD_ObjAtFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__10cCcD_ObjAtFv.s" } @@ -820,7 +831,8 @@ asm cCcD_ObjAt::~cCcD_ObjAt() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_ObjCommonBase::~cCcD_ObjCommonBase() { +// asm cCcD_ObjCommonBase::~cCcD_ObjCommonBase() { +extern "C" asm void __dt__18cCcD_ObjCommonBaseFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__18cCcD_ObjCommonBaseFv.s" } @@ -830,15 +842,16 @@ asm cCcD_ObjCommonBase::~cCcD_ObjCommonBase() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GObjInf::~dCcD_GObjInf() { +// asm dCcD_GObjInf::~dCcD_GObjInf() { +extern "C" asm void __dt__12dCcD_GObjInfFv() { 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 */ -void dCcD_GObjInf::GetGObjInf() { - /* empty function */ +cCcD_GObjInf* dCcD_GObjInf::GetGObjInf() { + return this; } /* 8008426C-800842C0 07EBAC 0054+00 5/0 0/0 0/0 .text ClrAtHit__12dCcD_GObjInfFv */ @@ -1046,8 +1059,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 */ -bool cCcD_Obj::GetGObjInf() { - return false; +cCcD_GObjInf* cCcD_Obj::GetGObjInf() { + return NULL; } /* 800847D0-80084814 07F110 0044+00 0/0 1/1 20/20 .text Set__8dCcD_CpsFRC11dCcD_SrcCps */ @@ -1064,7 +1077,8 @@ asm void dCcD_Cps::Set(dCcD_SrcCps const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCcD_Cps::GetShapeAttr() { +// asm cCcD_ShapeAttr *dCcD_Cps::GetShapeAttr() { +extern "C" asm void GetShapeAttr__8dCcD_CpsFv() { nofralloc #include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_CpsFv.s" } @@ -1104,7 +1118,8 @@ asm void dCcD_Tri::Set(dCcD_SrcTri const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCcD_Tri::GetShapeAttr() { +// asm cCcD_ShapeAttr *dCcD_Tri::GetShapeAttr() { +extern "C" asm void GetShapeAttr__8dCcD_TriFv() { nofralloc #include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_TriFv.s" } @@ -1125,7 +1140,8 @@ asm void dCcD_Cyl::Set(dCcD_SrcCyl const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCcD_Cyl::GetShapeAttr() { +// asm cCcD_ShapeAttr *dCcD_Cyl::GetShapeAttr() { +extern "C" asm void GetShapeAttr__8dCcD_CylFv() { nofralloc #include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_CylFv.s" } @@ -1196,7 +1212,8 @@ asm void dCcD_Sph::MoveCAt(cXyz& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCcD_Sph::GetShapeAttr() { +// asm cCcD_ShapeAttr* dCcD_Sph::GetShapeAttr() { +extern "C" asm void GetShapeAttr__8dCcD_SphFv() { nofralloc #include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_SphFv.s" } @@ -1206,7 +1223,7 @@ asm void dCcD_Sph::GetShapeAttr() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_SphAttr::GetCoCP() const { +asm const cXyz& cCcD_SphAttr::GetCoCP() const { nofralloc #include "asm/d/cc/d_cc_d/GetCoCP__12cCcD_SphAttrCFv.s" } @@ -1229,7 +1246,7 @@ bool cCcD_SphAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_SphAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { +asm bool 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" } @@ -1258,20 +1275,20 @@ bool cCcD_SphAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_SphAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { +asm bool 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 */ -void cCcD_GObjInf::GetGObjInf() const { - /* empty function */ +cCcD_GObjInf const* cCcD_GObjInf::GetGObjInf() const { + return this; } /* 80084BE8-80084BF0 07F528 0008+00 7/0 0/0 0/0 .text GetShapeAttr__8cCcD_ObjCFv */ -bool cCcD_Obj::GetShapeAttr() const { - return false; +cCcD_ShapeAttr const* cCcD_Obj::GetShapeAttr() const { + return NULL; } /* 80084BF0-80084BF4 07F530 0004+00 7/0 0/0 0/0 .text Draw__8cCcD_ObjFRC8_GXColor */ @@ -1283,7 +1300,8 @@ void cCcD_Obj::Draw(_GXColor const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::~dCcD_Sph() { +// asm dCcD_Sph::~dCcD_Sph() { +extern "C" asm void __dt__8dCcD_SphFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__8dCcD_SphFv.s" } @@ -1293,7 +1311,7 @@ asm dCcD_Sph::~dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_CylAttr::GetCoCP() const { +asm const cXyz& cCcD_CylAttr::GetCoCP() const { nofralloc #include "asm/d/cc/d_cc_d/GetCoCP__12cCcD_CylAttrCFv.s" } @@ -1316,7 +1334,7 @@ bool cCcD_CylAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_CylAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { +asm bool 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" } @@ -1345,7 +1363,7 @@ bool cCcD_CylAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_CylAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { +asm bool 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" } @@ -1355,7 +1373,8 @@ asm void 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() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__8dCcD_CylFv.s" } @@ -1365,7 +1384,7 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_ShapeAttr::GetCoCP() { +asm cXyz& cCcD_ShapeAttr::GetCoCP() { nofralloc #include "asm/d/cc/d_cc_d/GetCoCP__14cCcD_ShapeAttrFv.s" } @@ -1375,7 +1394,7 @@ asm void cCcD_ShapeAttr::GetCoCP() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_ShapeAttr::GetCoCP() const { +asm const cXyz& cCcD_ShapeAttr::GetCoCP() const { nofralloc #include "asm/d/cc/d_cc_d/GetCoCP__14cCcD_ShapeAttrCFv.s" } @@ -1383,13 +1402,15 @@ asm void 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 { +// bool cCcD_TriAttr::CrossAtTg(cCcD_AabAttr const& param_0, cXyz* param_1) const { +extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_AabAttrP4cXyz() { 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 { +// bool cCcD_TriAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { +extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_PntAttrP4cXyz() { return false; } @@ -1398,7 +1419,7 @@ bool cCcD_TriAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_TriAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { +asm bool 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" } @@ -1406,37 +1427,43 @@ asm void 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 { +// bool cCcD_TriAttr::CrossCo(cCcD_SphAttr const& param_0, f32* param_1) const { +extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_SphAttrPf() { 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 { +// bool cCcD_TriAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const { +extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_CylAttrPf() { 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 { +// bool cCcD_TriAttr::CrossCo(cCcD_AabAttr const& param_0, f32* param_1) const { +extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_AabAttrPf() { 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 { +// bool cCcD_TriAttr::CrossCo(cCcD_TriAttr const& param_0, f32* param_1) const { +extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_TriAttrPf() { 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 { +// bool cCcD_TriAttr::CrossCo(cCcD_CpsAttr const& param_0, f32* param_1) const { +extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_CpsAttrPf() { 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 { +// bool cCcD_TriAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { +extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_PntAttrPf() { return false; } @@ -1445,7 +1472,7 @@ bool cCcD_TriAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_TriAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { +asm bool 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" } @@ -1455,7 +1482,8 @@ asm void 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() { +// asm dCcD_Tri::~dCcD_Tri() { +extern "C" asm void __dt__8dCcD_TriFv() { nofralloc #include "asm/d/cc/d_cc_d/__dt__8dCcD_TriFv.s" } @@ -1478,7 +1506,7 @@ bool cCcD_CpsAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_CpsAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const { +asm bool 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" } @@ -1507,7 +1535,7 @@ bool cCcD_CpsAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cCcD_CpsAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const { +asm bool 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" } @@ -1517,14 +1545,16 @@ asm void 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() { +// asm dCcD_Cps::~dCcD_Cps() { +extern "C" asm void __dt__8dCcD_CpsFv() { 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 */ -bool cCcD_Obj::GetShapeAttr() { +// cCcD_ShapeAttr *cCcD_Obj::GetShapeAttr() { +extern "C" bool GetShapeAttr__8cCcD_ObjFv() { return false; } @@ -1559,20 +1589,21 @@ asm void cCcD_GObjInf::ClrCoHit() { #pragma pop /* 800851A0-800851A4 07FAE0 0004+00 1/0 0/0 0/0 .text GetGObjInf__12cCcD_GObjInfFv */ -void cCcD_GObjInf::GetGObjInf() { - /* empty function */ +cCcD_GObjInf* cCcD_GObjInf::GetGObjInf() { + return this; } /* 800851A4-800851AC 07FAE4 0008+00 1/0 0/0 0/0 .text GetGObjInf__8cCcD_ObjCFv */ -bool cCcD_Obj::GetGObjInf() const { - return false; +cCcD_GObjInf const* cCcD_Obj::GetGObjInf() const { + return NULL; } /* 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() { +// asm dCcD_Stts::~dCcD_Stts() { +extern "C" asm void __dt__9dCcD_SttsFv(void) { // should get autogenerated eventually nofralloc #include "asm/d/cc/d_cc_d/__dt__9dCcD_SttsFv.s" } diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 2373150ef85..faeae6a980b 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -2448,7 +2448,8 @@ asm cCcD_DivideArea::~cCcD_DivideArea() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// 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" } @@ -2458,7 +2459,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// 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" }