From 74ed2da8bc93804373cddf64c0c878603150b699 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:56:51 -0800 Subject: [PATCH] d_bg_s (#159) * wip * d_bg_s * most of d_bg_s * small cleanup * clang * fixes --- .../a/d_a_alink/ChkGroundHit__9dBgS_AcchCFv.s | 4 - asm/d/a/d_a_alink/ChkRoofHit__9dBgS_AcchCFv.s | 4 - .../a/d_a_alink/ClrGroundHit__9dBgS_AcchFv.s | 5 - .../SetPos__12dBgS_RoofChkFRC4cXyz.s | 8 - asm/d/bg/d_bg_pc/setCode__5dBgPcFR5sBgPc.s | 12 - asm/d/bg/d_bg_plc/__ct__6dBgPlcFv.s | 4 - asm/d/bg/d_bg_plc/__dt__6dBgPlcFv.s | 17 - ...BgSFRC13cBgS_PolyInfoP10fopAc_ac_cR4cXyz.s | 32 - .../ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl.s | 13 - ...hkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo.s | 25 - .../ChkMoveBG__4dBgSFRC13cBgS_PolyInfo.s | 37 - .../ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo.s | 24 - .../ChkPolySafe__4cBgSFRC13cBgS_PolyInfo.s | 43 - asm/d/bg/d_bg_s/ClrMoveFlag__4dBgSFv.s | 30 - asm/d/bg/d_bg_s/Ct__4cBgSFv.s | 23 - asm/d/bg/d_bg_s/Ct__4dBgSFv.s | 9 - asm/d/bg/d_bg_s/Dt__4cBgSFv.s | 35 - asm/d/bg/d_bg_s/Dt__4dBgSFv.s | 9 - asm/d/bg/d_bg_s/GetActorPointer__4cBgSCFi.s | 5 - ...BgWBasePointer__4cBgSCFRC13cBgS_PolyInfo.s | 17 - .../GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo.s | 23 - .../GetExitId__4dBgSFRC13cBgS_PolyInfo.s | 23 - .../GetGroundCode__4dBgSFRC13cBgS_PolyInfo.s | 23 - .../GetGrpInf__4cBgSCFRC13cBgS_PolyInfo.s | 23 - .../GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo.s | 23 - .../GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo.s | 23 - ...GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo.s | 23 - .../GetMagnetCode__4dBgSFRC13cBgS_PolyInfo.s | 23 - ...tMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo.s | 23 - .../GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo.s | 23 - .../GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo.s | 23 - ...lyAttackThrough__4dBgSFRC13cBgS_PolyInfo.s | 26 - .../GetPolyColor__4dBgSFRC13cBgS_PolyInfo.s | 37 - .../GetRoomCamId__4dBgSFRC13cBgS_PolyInfo.s | 23 - .../GetRoomPathId__4dBgSFRC13cBgS_PolyInfo.s | 23 - ...etRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo.s | 23 - .../GetSpecialCode__4dBgSFRC13cBgS_PolyInfo.s | 23 - ...BgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz.s | 23 - ...erwaterRoofCode__4dBgSFRC13cBgS_PolyInfo.s | 24 - .../GetWallCode__4dBgSFRC13cBgS_PolyInfo.s | 23 - asm/d/bg/d_bg_s/Init__11cBgS_ChkElmFv.s | 8 - ...RC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb.s | 72 -- ...SFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s | 53 -- ...SFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s | 58 -- .../Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv.s | 7 - asm/d/bg/d_bg_s/Release__11cBgS_ChkElmFv.s | 8 - ...ck__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c.s | 30 - ...BgS_CheckBGroundPoly__FRC13cBgS_PolyInfo.s | 31 - .../dBgS_CheckBRoofPoly__FRC13cBgS_PolyInfo.s | 31 - .../dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo.s | 31 - .../d_bg_s/dBgS_GetNY__FRC13cBgS_PolyInfo.s | 21 - ...PvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s | 15 - ...PvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s | 17 - ...PvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s | 28 - ...PvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s | 34 - .../CalcMovePosWork__9dBgS_AcchFv.s | 18 - .../CalcWallRR__12dBgS_AcchCirFv.s | 5 - .../bg/d_bg_s_acch/CalcWallRR__9dBgS_AcchFv.s | 26 - .../ChkGndThinCellingOff__9dBgS_AcchFv.s | 4 - .../d_bg_s_acch/ChkLineDown__9dBgS_AcchFv.s | 4 - .../d_bg_s_acch/ChkWallSort__9dBgS_AcchFv.s | 4 - .../ClrGndThinCellingOff__9dBgS_AcchFv.s | 5 - .../d_bg_s_acch/ClrMoveBGOnly__9dBgS_AcchFv.s | 8 - .../ClrWallHit__12dBgS_AcchCirFv.s | 12 - .../bg/d_bg_s_acch/GetSpeedY__9dBgS_AcchFv.s | 9 - .../GetWallAllLowH_R__9dBgS_AcchFv.s | 32 - .../GetWallAllLowH__9dBgS_AcchFv.s | 24 - .../d_bg_s_acch/GetWallAllR__9dBgS_AcchFv.s | 18 - .../GroundCheckInit__9dBgS_AcchFR4dBgS.s | 32 - .../GroundRoofProc__9dBgS_AcchFR4dBgS.s | 57 -- asm/d/bg/d_bg_s_acch/Init__9dBgS_AcchFv.s | 34 - .../bg/d_bg_s_acch/OnWallSort__9dBgS_AcchFv.s | 5 - .../SetGndThinCellingOff__9dBgS_AcchFv.s | 5 - .../d_bg_s_acch/SetGroundUpY__9dBgS_AcchFf.s | 6 - .../d_bg_s_acch/SetMoveBGOnly__9dBgS_AcchFv.s | 8 - .../SetNowActorInfo__9dBgS_AcchFiPvUi.s | 5 - .../bg/d_bg_s_acch/SetWallCir__9dBgS_AcchFv.s | 34 - .../SetWallHDirect__12dBgS_AcchCirFf.s | 6 - .../SetWallPolyIndex__9dBgS_AcchFii.s | 25 - .../d_bg_s_acch/SetWallR__12dBgS_AcchCirFf.s | 3 - .../d_bg_s_acch/SetWall__12dBgS_AcchCirFff.s | 11 - ...9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir.s | 23 - ...ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz.s | 19 - asm/d/bg/d_bg_s_acch/__ct__12dBgS_AcchCirFv.s | 27 - .../GetGrpPassChkInfo__8dBgS_ChkFv.s | 5 - asm/d/bg/d_bg_s_chk/__ct__8dBgS_ChkFv.s | 20 - .../bg/d_bg_s_gnd_chk/__ct__11dBgS_GndChkFv.s | 30 - .../__ct__18dBgS_CamGndChk_WtrFv.s | 39 - .../__ct__18dBgS_ObjGndChk_SplFv.s | 39 - .../__ct__18dBgS_ObjGndChk_WtrFv.s | 39 - .../__ct__15dBgS_GrpPassChkFv.s | 10 - .../__dt__15cBgS_GrpPassChkFv.s | 20 - ...dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c.s | 20 - .../bg/d_bg_s_lin_chk/__ct__11dBgS_LinChkFv.s | 30 - .../d_bg_s_lin_chk/__ct__14dBgS_CamLinChkFv.s | 24 - .../d_bg_s_lin_chk/__ct__14dBgS_ObjLinChkFv.s | 24 - .../__ct__15dBgS_BombLinChkFv.s | 24 - .../__ct__15dBgS_LinkLinChkFv.s | 24 - .../__ct__15dBgS_RopeLinChkFv.s | 24 - .../__ct__16dBgS_ArrowLinChkFv.s | 27 - .../__ct__16dBgS_HorseLinChkFv.s | 24 - .../__ct__20dBgS_BoomerangLinChkFv.s | 24 - .../__ct__21dBgS_CamLinChk_NorWtrFv.s | 28 - .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../MoveBGCreateHeap__16dBgS_MoveBgActorFv.s | 68 -- .../MoveBGDelete__16dBgS_MoveBgActorFv.s | 31 - .../MoveBGExecute__16dBgS_MoveBgActorFv.s | 53 -- .../__ct__16dBgS_MoveBgActorFv.s | 18 - .../d_bg_s_roof_chk/Init__12dBgS_RoofChkFv.s | 11 - .../d_bg_s_roof_chk/__ct__12dBgS_RoofChkFv.s | 40 - .../bg/d_bg_s_sph_chk/__ct__11dBgS_SphChkFv.s | 44 - .../bg/d_bg_s_sph_chk/__dt__11dBgS_SphChkFv.s | 47 - .../Init__14dBgS_SplGrpChkFv.s | 17 - .../Set__14dBgS_SplGrpChkFR4cXyzf.s | 9 - .../__ct__14dBgS_SplGrpChkFv.s | 51 -- .../__dt__14dBgS_SplGrpChkFv.s | 39 - .../bg/d_bg_s_wtr_chk/__ct__11dBgS_WtrChkFv.s | 25 - asm/d/bg/d_bg_w/FreeArea__4cBgWFv.s | 9 - asm/d/bg/d_bg_w/__ct__11cBgW_RwgElmFv.s | 5 - asm/d/bg/d_bg_w/__ct__13cBgW_NodeTreeFv.s | 8 - asm/d/bg/d_bg_w/__ct__4cBgWFv.s | 43 - asm/d/bg/d_bg_w/__dt__11cBgW_RwgElmFv.s | 20 - asm/d/bg/d_bg_w/__dt__13cBgW_NodeTreeFv.s | 26 - .../CalcDiffShapeAngleY__9dBgW_BaseFs.s | 6 - .../d_bg_w_base/ClrDBgWBase__9dBgW_BaseFv.s | 14 - asm/d/bg/d_bg_w_base/__ct__9dBgW_BaseFv.s | 21 - asm/d/bg/d_bg_w_base/__dt__9cBgW_BgIdFv.s | 20 - include/JSystem/J3DGraphBase/J3DVertex.h | 5 +- include/SSystem/SComponent/c_bg_s_chk.h | 23 +- include/SSystem/SComponent/c_bg_s_gnd_chk.h | 8 +- include/SSystem/SComponent/c_bg_s_lin_chk.h | 17 +- include/SSystem/SComponent/c_bg_s_poly_info.h | 18 +- include/SSystem/SComponent/c_bg_w.h | 19 +- include/SSystem/SComponent/c_xyz.h | 7 + include/d/bg/d_bg_pc.h | 16 + include/d/bg/d_bg_plc.h | 24 + include/d/bg/d_bg_s.h | 137 ++- include/d/bg/d_bg_s_acch.h | 181 ++-- include/d/bg/d_bg_s_chk.h | 13 +- include/d/bg/d_bg_s_gnd_chk.h | 52 +- include/d/bg/d_bg_s_grp_pass_chk.h | 23 +- include/d/bg/d_bg_s_lin_chk.h | 66 +- include/d/bg/d_bg_s_movebg_actor.h | 32 + include/d/bg/d_bg_s_poly_pass_chk.h | 1 - include/d/bg/d_bg_s_roof_chk.h | 17 +- include/d/bg/d_bg_s_sph_chk.h | 19 + include/d/bg/d_bg_s_spl_grp_chk.h | 30 +- include/d/bg/d_bg_s_wtr_chk.h | 7 +- include/d/bg/d_bg_w.h | 275 +++--- include/d/bg/d_bg_w_base.h | 97 ++ include/d/bg/d_bg_w_kcol.h | 83 ++ include/d/com/d_com_inf_game.h | 8 + include/d/d_resorce.h | 4 + include/f_op/f_op_actor_mng.h | 23 +- include/m_Do/m_Do_mtx.h | 4 +- libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp | 10 +- libs/SSystem/SComponent/c_bg_s_lin_chk.cpp | 4 +- libs/SSystem/SComponent/c_bg_s_poly_info.cpp | 20 +- libs/SSystem/SComponent/c_bg_w.cpp | 8 +- src/d/a/d_a_alink.cpp | 116 +-- src/d/bg/d_bg_pc.cpp | 39 +- src/d/bg/d_bg_plc.cpp | 36 +- src/d/bg/d_bg_s.cpp | 831 ++++++++++-------- src/d/bg/d_bg_s_acch.cpp | 647 +++++++++----- src/d/bg/d_bg_s_chk.cpp | 25 +- src/d/bg/d_bg_s_gnd_chk.cpp | 85 +- src/d/bg/d_bg_s_grp_pass_chk.cpp | 21 +- src/d/bg/d_bg_s_lin_chk.cpp | 159 ++-- src/d/bg/d_bg_s_movebg_actor.cpp | 214 ++--- src/d/bg/d_bg_s_poly_pass_chk.cpp | 3 +- src/d/bg/d_bg_s_roof_chk.cpp | 40 +- src/d/bg/d_bg_s_sph_chk.cpp | 49 +- src/d/bg/d_bg_s_spl_grp_chk.cpp | 63 +- src/d/bg/d_bg_s_wtr_chk.cpp | 32 +- src/d/bg/d_bg_w.cpp | 151 ++-- src/d/bg/d_bg_w_base.cpp | 69 +- src/d/bg/d_bg_w_kcol.cpp | 155 +--- src/d/kankyo/d_kankyo.cpp | 5 - 178 files changed, 2148 insertions(+), 4699 deletions(-) delete mode 100644 asm/d/a/d_a_alink/ChkGroundHit__9dBgS_AcchCFv.s delete mode 100644 asm/d/a/d_a_alink/ChkRoofHit__9dBgS_AcchCFv.s delete mode 100644 asm/d/a/d_a_alink/ClrGroundHit__9dBgS_AcchFv.s delete mode 100644 asm/d/a/d_a_alink/SetPos__12dBgS_RoofChkFRC4cXyz.s delete mode 100644 asm/d/bg/d_bg_pc/setCode__5dBgPcFR5sBgPc.s delete mode 100644 asm/d/bg/d_bg_plc/__ct__6dBgPlcFv.s delete mode 100644 asm/d/bg/d_bg_plc/__dt__6dBgPlcFv.s delete mode 100644 asm/d/bg/d_bg_s/ArrowStickCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_cR4cXyz.s delete mode 100644 asm/d/bg/d_bg_s/ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl.s delete mode 100644 asm/d/bg/d_bg_s/ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/ChkMoveBG__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/ChkPolySafe__4cBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/ClrMoveFlag__4dBgSFv.s delete mode 100644 asm/d/bg/d_bg_s/Ct__4cBgSFv.s delete mode 100644 asm/d/bg/d_bg_s/Ct__4dBgSFv.s delete mode 100644 asm/d/bg/d_bg_s/Dt__4cBgSFv.s delete mode 100644 asm/d/bg/d_bg_s/Dt__4dBgSFv.s delete mode 100644 asm/d/bg/d_bg_s/GetActorPointer__4cBgSCFi.s delete mode 100644 asm/d/bg/d_bg_s/GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetExitId__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetGroundCode__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetGrpInf__4cBgSCFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetMagnetCode__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetPolyColor__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetRoomCamId__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetRoomPathId__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetSpecialCode__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz.s delete mode 100644 asm/d/bg/d_bg_s/GetUnderwaterRoofCode__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/GetWallCode__4dBgSFRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/Init__11cBgS_ChkElmFv.s delete mode 100644 asm/d/bg/d_bg_s/MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb.s delete mode 100644 asm/d/bg/d_bg_s/MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s delete mode 100644 asm/d/bg/d_bg_s/MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s delete mode 100644 asm/d/bg/d_bg_s/Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv.s delete mode 100644 asm/d/bg/d_bg_s/Release__11cBgS_ChkElmFv.s delete mode 100644 asm/d/bg/d_bg_s/RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c.s delete mode 100644 asm/d/bg/d_bg_s/dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/dBgS_CheckBRoofPoly__FRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/dBgS_GetNY__FRC13cBgS_PolyInfo.s delete mode 100644 asm/d/bg/d_bg_s/dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s delete mode 100644 asm/d/bg/d_bg_s/dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s delete mode 100644 asm/d/bg/d_bg_s/dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s delete mode 100644 asm/d/bg/d_bg_s/dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s delete mode 100644 asm/d/bg/d_bg_s_acch/CalcMovePosWork__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/CalcWallRR__12dBgS_AcchCirFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/CalcWallRR__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/ChkGndThinCellingOff__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/ChkLineDown__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/ChkWallSort__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/ClrGndThinCellingOff__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/ClrMoveBGOnly__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/ClrWallHit__12dBgS_AcchCirFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/GetSpeedY__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/GetWallAllLowH_R__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/GetWallAllLowH__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/GetWallAllR__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/GroundCheckInit__9dBgS_AcchFR4dBgS.s delete mode 100644 asm/d/bg/d_bg_s_acch/GroundRoofProc__9dBgS_AcchFR4dBgS.s delete mode 100644 asm/d/bg/d_bg_s_acch/Init__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/OnWallSort__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/SetGndThinCellingOff__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/SetGroundUpY__9dBgS_AcchFf.s delete mode 100644 asm/d/bg/d_bg_s_acch/SetMoveBGOnly__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/SetNowActorInfo__9dBgS_AcchFiPvUi.s delete mode 100644 asm/d/bg/d_bg_s_acch/SetWallCir__9dBgS_AcchFv.s delete mode 100644 asm/d/bg/d_bg_s_acch/SetWallHDirect__12dBgS_AcchCirFf.s delete mode 100644 asm/d/bg/d_bg_s_acch/SetWallPolyIndex__9dBgS_AcchFii.s delete mode 100644 asm/d/bg/d_bg_s_acch/SetWallR__12dBgS_AcchCirFf.s delete mode 100644 asm/d/bg/d_bg_s_acch/SetWall__12dBgS_AcchCirFff.s delete mode 100644 asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir.s delete mode 100644 asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz.s delete mode 100644 asm/d/bg/d_bg_s_acch/__ct__12dBgS_AcchCirFv.s delete mode 100644 asm/d/bg/d_bg_s_chk/GetGrpPassChkInfo__8dBgS_ChkFv.s delete mode 100644 asm/d/bg/d_bg_s_chk/__ct__8dBgS_ChkFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__ct__11dBgS_GndChkFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_CamGndChk_WtrFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_SplFv.s delete mode 100644 asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_WtrFv.s delete mode 100644 asm/d/bg/d_bg_s_grp_pass_chk/__ct__15dBgS_GrpPassChkFv.s delete mode 100644 asm/d/bg/d_bg_s_grp_pass_chk/__dt__15cBgS_GrpPassChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__11dBgS_LinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_CamLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_ObjLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_BombLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_LinkLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_RopeLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_ArrowLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_HorseLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__20dBgS_BoomerangLinChkFv.s delete mode 100644 asm/d/bg/d_bg_s_lin_chk/__ct__21dBgS_CamLinChk_NorWtrFv.s delete mode 100644 asm/d/bg/d_bg_s_movebg_actor/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/d/bg/d_bg_s_movebg_actor/MoveBGCreateHeap__16dBgS_MoveBgActorFv.s delete mode 100644 asm/d/bg/d_bg_s_movebg_actor/MoveBGDelete__16dBgS_MoveBgActorFv.s delete mode 100644 asm/d/bg/d_bg_s_movebg_actor/MoveBGExecute__16dBgS_MoveBgActorFv.s delete mode 100644 asm/d/bg/d_bg_s_movebg_actor/__ct__16dBgS_MoveBgActorFv.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/Init__12dBgS_RoofChkFv.s delete mode 100644 asm/d/bg/d_bg_s_roof_chk/__ct__12dBgS_RoofChkFv.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/__ct__11dBgS_SphChkFv.s delete mode 100644 asm/d/bg/d_bg_s_sph_chk/__dt__11dBgS_SphChkFv.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/Init__14dBgS_SplGrpChkFv.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/Set__14dBgS_SplGrpChkFR4cXyzf.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/__ct__14dBgS_SplGrpChkFv.s delete mode 100644 asm/d/bg/d_bg_s_spl_grp_chk/__dt__14dBgS_SplGrpChkFv.s delete mode 100644 asm/d/bg/d_bg_s_wtr_chk/__ct__11dBgS_WtrChkFv.s delete mode 100644 asm/d/bg/d_bg_w/FreeArea__4cBgWFv.s delete mode 100644 asm/d/bg/d_bg_w/__ct__11cBgW_RwgElmFv.s delete mode 100644 asm/d/bg/d_bg_w/__ct__13cBgW_NodeTreeFv.s delete mode 100644 asm/d/bg/d_bg_w/__ct__4cBgWFv.s delete mode 100644 asm/d/bg/d_bg_w/__dt__11cBgW_RwgElmFv.s delete mode 100644 asm/d/bg/d_bg_w/__dt__13cBgW_NodeTreeFv.s delete mode 100644 asm/d/bg/d_bg_w_base/CalcDiffShapeAngleY__9dBgW_BaseFs.s delete mode 100644 asm/d/bg/d_bg_w_base/ClrDBgWBase__9dBgW_BaseFv.s delete mode 100644 asm/d/bg/d_bg_w_base/__ct__9dBgW_BaseFv.s delete mode 100644 asm/d/bg/d_bg_w_base/__dt__9cBgW_BgIdFv.s diff --git a/asm/d/a/d_a_alink/ChkGroundHit__9dBgS_AcchCFv.s b/asm/d/a/d_a_alink/ChkGroundHit__9dBgS_AcchCFv.s deleted file mode 100644 index 2f8c1578af0..00000000000 --- a/asm/d/a/d_a_alink/ChkGroundHit__9dBgS_AcchCFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80141404: -/* 80141404 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80141408 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 8014140C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/ChkRoofHit__9dBgS_AcchCFv.s b/asm/d/a/d_a_alink/ChkRoofHit__9dBgS_AcchCFv.s deleted file mode 100644 index d9131a020cc..00000000000 --- a/asm/d/a/d_a_alink/ChkRoofHit__9dBgS_AcchCFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800D00D0: -/* 800D00D0 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800D00D4 54 03 BF FE */ rlwinm r3, r0, 0x17, 0x1f, 0x1f -/* 800D00D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/ClrGroundHit__9dBgS_AcchFv.s b/asm/d/a/d_a_alink/ClrGroundHit__9dBgS_AcchFv.s deleted file mode 100644 index 65bf45c7a8f..00000000000 --- a/asm/d/a/d_a_alink/ClrGroundHit__9dBgS_AcchFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800D00DC: -/* 800D00DC 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800D00E0 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 -/* 800D00E4 90 03 00 2C */ stw r0, 0x2c(r3) -/* 800D00E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/SetPos__12dBgS_RoofChkFRC4cXyz.s b/asm/d/a/d_a_alink/SetPos__12dBgS_RoofChkFRC4cXyz.s deleted file mode 100644 index 261651c75aa..00000000000 --- a/asm/d/a/d_a_alink/SetPos__12dBgS_RoofChkFRC4cXyz.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800B146C: -/* 800B146C C0 04 00 00 */ lfs f0, 0(r4) -/* 800B1470 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 800B1474 C0 04 00 04 */ lfs f0, 4(r4) -/* 800B1478 D0 03 00 40 */ stfs f0, 0x40(r3) -/* 800B147C C0 04 00 08 */ lfs f0, 8(r4) -/* 800B1480 D0 03 00 44 */ stfs f0, 0x44(r3) -/* 800B1484 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_pc/setCode__5dBgPcFR5sBgPc.s b/asm/d/bg/d_bg_pc/setCode__5dBgPcFR5sBgPc.s deleted file mode 100644 index 449bc853378..00000000000 --- a/asm/d/bg/d_bg_pc/setCode__5dBgPcFR5sBgPc.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80074048: -/* 80074048 80 04 00 00 */ lwz r0, 0(r4) -/* 8007404C 90 03 00 00 */ stw r0, 0(r3) -/* 80074050 80 04 00 04 */ lwz r0, 4(r4) -/* 80074054 90 03 00 04 */ stw r0, 4(r3) -/* 80074058 80 04 00 08 */ lwz r0, 8(r4) -/* 8007405C 90 03 00 08 */ stw r0, 8(r3) -/* 80074060 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80074064 90 03 00 0C */ stw r0, 0xc(r3) -/* 80074068 80 04 00 10 */ lwz r0, 0x10(r4) -/* 8007406C 90 03 00 10 */ stw r0, 0x10(r3) -/* 80074070 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_plc/__ct__6dBgPlcFv.s b/asm/d/bg/d_bg_plc/__ct__6dBgPlcFv.s deleted file mode 100644 index 7f139a2330e..00000000000 --- a/asm/d/bg/d_bg_plc/__ct__6dBgPlcFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80074074: -/* 80074074 38 00 00 00 */ li r0, 0 -/* 80074078 90 03 00 00 */ stw r0, 0(r3) -/* 8007407C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_plc/__dt__6dBgPlcFv.s b/asm/d/bg/d_bg_plc/__dt__6dBgPlcFv.s deleted file mode 100644 index ea0aeff889d..00000000000 --- a/asm/d/bg/d_bg_plc/__dt__6dBgPlcFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80074080: -/* 80074080 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074084 7C 08 02 A6 */ mflr r0 -/* 80074088 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007408C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80074090 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80074094 41 82 00 10 */ beq lbl_800740A4 -/* 80074098 7C 80 07 35 */ extsh. r0, r4 -/* 8007409C 40 81 00 08 */ ble lbl_800740A4 -/* 800740A0 48 25 AC 9D */ bl __dl__FPv -lbl_800740A4: -/* 800740A4 7F E3 FB 78 */ mr r3, r31 -/* 800740A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800740AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800740B0 7C 08 03 A6 */ mtlr r0 -/* 800740B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800740B8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/ArrowStickCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_cR4cXyz.s b/asm/d/bg/d_bg_s/ArrowStickCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_cR4cXyz.s deleted file mode 100644 index 4ec3352f085..00000000000 --- a/asm/d/bg/d_bg_s/ArrowStickCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_cR4cXyz.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80075BF4: -/* 80075BF4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075BF8 7C 08 02 A6 */ mflr r0 -/* 80075BFC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075C00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075C04 48 2E C5 D1 */ bl _savegpr_27 -/* 80075C08 7C 7B 1B 78 */ mr r27, r3 -/* 80075C0C 7C BC 2B 78 */ mr r28, r5 -/* 80075C10 7C DD 33 78 */ mr r29, r6 -/* 80075C14 A0 04 00 02 */ lhz r0, 2(r4) -/* 80075C18 1F E0 00 14 */ mulli r31, r0, 0x14 -/* 80075C1C 7F DB F8 2E */ lwzx r30, r27, r31 -/* 80075C20 7F C3 F3 78 */ mr r3, r30 -/* 80075C24 48 1F 25 B1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80075C28 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075C2C 41 82 00 28 */ beq lbl_80075C54 -/* 80075C30 7F C3 F3 78 */ mr r3, r30 -/* 80075C34 7C 9B FA 14 */ add r4, r27, r31 -/* 80075C38 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80075C3C 7F 85 E3 78 */ mr r5, r28 -/* 80075C40 7F A6 EB 78 */ mr r6, r29 -/* 80075C44 81 9E 00 04 */ lwz r12, 4(r30) -/* 80075C48 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 80075C4C 7D 89 03 A6 */ mtctr r12 -/* 80075C50 4E 80 04 21 */ bctrl -lbl_80075C54: -/* 80075C54 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075C58 48 2E C5 C9 */ bl _restgpr_27 -/* 80075C5C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075C60 7C 08 03 A6 */ mtlr r0 -/* 80075C64 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075C68 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl.s b/asm/d/bg/d_bg_s/ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl.s deleted file mode 100644 index bd14e4c8286..00000000000 --- a/asm/d/bg/d_bg_s/ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800750D0: -/* 800750D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800750D4 7C 08 02 A6 */ mflr r0 -/* 800750D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800750DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800750E0 7C BF 2B 78 */ mr r31, r5 -/* 800750E4 4B FF F7 C9 */ bl GetGrpInf__4cBgSCFRC13cBgS_PolyInfo -/* 800750E8 7C 63 F8 38 */ and r3, r3, r31 -/* 800750EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800750F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800750F4 7C 08 03 A6 */ mtlr r0 -/* 800750F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800750FC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 21553c03cb8..00000000000 --- a/asm/d/bg/d_bg_s/ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80074B40: -/* 80074B40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074B44 7C 08 02 A6 */ mflr r0 -/* 80074B48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074B4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80074B50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80074B54 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80074B58 4B FF FA D1 */ bl GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo -/* 80074B5C 28 03 00 00 */ cmplwi r3, 0 -/* 80074B60 41 82 00 24 */ beq lbl_80074B84 -/* 80074B64 81 83 00 04 */ lwz r12, 4(r3) -/* 80074B68 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80074B6C 7D 89 03 A6 */ mtctr r12 -/* 80074B70 4E 80 04 21 */ bctrl -/* 80074B74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074B78 41 82 00 0C */ beq lbl_80074B84 -/* 80074B7C 38 60 00 01 */ li r3, 1 -/* 80074B80 48 00 00 08 */ b lbl_80074B88 -lbl_80074B84: -/* 80074B84 38 60 00 00 */ li r3, 0 -lbl_80074B88: -/* 80074B88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074B8C 7C 08 03 A6 */ mtlr r0 -/* 80074B90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074B94 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/ChkMoveBG__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/ChkMoveBG__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 0901363cf5f..00000000000 --- a/asm/d/bg/d_bg_s/ChkMoveBG__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80074ABC: -/* 80074ABC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074AC0 7C 08 02 A6 */ mflr r0 -/* 80074AC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074AC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80074ACC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80074AD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80074AD4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80074AD8 4B FF FB 51 */ bl GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo -/* 80074ADC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80074AE0 41 82 00 48 */ beq lbl_80074B28 -/* 80074AE4 81 83 00 04 */ lwz r12, 4(r3) -/* 80074AE8 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80074AEC 7D 89 03 A6 */ mtctr r12 -/* 80074AF0 4E 80 04 21 */ bctrl -/* 80074AF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074AF8 41 82 00 0C */ beq lbl_80074B04 -/* 80074AFC 38 60 00 00 */ li r3, 0 -/* 80074B00 48 00 00 2C */ b lbl_80074B2C -lbl_80074B04: -/* 80074B04 7F E3 FB 78 */ mr r3, r31 -/* 80074B08 81 9F 00 04 */ lwz r12, 4(r31) -/* 80074B0C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80074B10 7D 89 03 A6 */ mtctr r12 -/* 80074B14 4E 80 04 21 */ bctrl -/* 80074B18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074B1C 41 82 00 0C */ beq lbl_80074B28 -/* 80074B20 38 60 00 01 */ li r3, 1 -/* 80074B24 48 00 00 08 */ b lbl_80074B2C -lbl_80074B28: -/* 80074B28 38 60 00 00 */ li r3, 0 -lbl_80074B2C: -/* 80074B2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80074B30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074B34 7C 08 03 A6 */ mtlr r0 -/* 80074B38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074B3C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index eed907e6332..00000000000 --- a/asm/d/bg/d_bg_s/ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800751F8: -/* 800751F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800751FC 7C 08 02 A6 */ mflr r0 -/* 80075200 90 01 00 14 */ stw r0, 0x14(r1) -/* 80075204 A0 04 00 02 */ lhz r0, 2(r4) -/* 80075208 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 8007520C 7C A3 32 14 */ add r5, r3, r6 -/* 80075210 88 05 00 04 */ lbz r0, 4(r5) -/* 80075214 28 00 00 00 */ cmplwi r0, 0 -/* 80075218 41 82 00 20 */ beq lbl_80075238 -/* 8007521C 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80075220 A0 84 00 00 */ lhz r4, 0(r4) -/* 80075224 81 83 00 04 */ lwz r12, 4(r3) -/* 80075228 81 8C 00 8C */ lwz r12, 0x8c(r12) -/* 8007522C 7D 89 03 A6 */ mtctr r12 -/* 80075230 4E 80 04 21 */ bctrl -/* 80075234 48 00 00 08 */ b lbl_8007523C -lbl_80075238: -/* 80075238 38 60 00 00 */ li r3, 0 -lbl_8007523C: -/* 8007523C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80075240 7C 08 03 A6 */ mtlr r0 -/* 80075244 38 21 00 10 */ addi r1, r1, 0x10 -/* 80075248 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/ChkPolySafe__4cBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/ChkPolySafe__4cBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index cecf6d01149..00000000000 --- a/asm/d/bg/d_bg_s/ChkPolySafe__4cBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80074660: -/* 80074660 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074664 7C 08 02 A6 */ mflr r0 -/* 80074668 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007466C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80074670 93 C1 00 08 */ stw r30, 8(r1) -/* 80074674 7C 7E 1B 78 */ mr r30, r3 -/* 80074678 7C 9F 23 78 */ mr r31, r4 -/* 8007467C 7F E3 FB 78 */ mr r3, r31 -/* 80074680 48 1F 3A 79 */ bl ChkSetInfo__13cBgS_PolyInfoCFv -/* 80074684 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074688 40 82 00 0C */ bne lbl_80074694 -/* 8007468C 38 60 00 00 */ li r3, 0 -/* 80074690 48 00 00 4C */ b lbl_800746DC -lbl_80074694: -/* 80074694 A0 1F 00 02 */ lhz r0, 2(r31) -/* 80074698 2C 00 00 00 */ cmpwi r0, 0 -/* 8007469C 41 80 00 0C */ blt lbl_800746A8 -/* 800746A0 2C 00 01 00 */ cmpwi r0, 0x100 -/* 800746A4 41 80 00 0C */ blt lbl_800746B0 -lbl_800746A8: -/* 800746A8 38 60 00 00 */ li r3, 0 -/* 800746AC 48 00 00 30 */ b lbl_800746DC -lbl_800746B0: -/* 800746B0 1C 80 00 14 */ mulli r4, r0, 0x14 -/* 800746B4 7C BE 22 14 */ add r5, r30, r4 -/* 800746B8 88 05 00 04 */ lbz r0, 4(r5) -/* 800746BC 28 00 00 00 */ cmplwi r0, 0 -/* 800746C0 41 82 00 18 */ beq lbl_800746D8 -/* 800746C4 7F E3 FB 78 */ mr r3, r31 -/* 800746C8 7C 9E 20 2E */ lwzx r4, r30, r4 -/* 800746CC 80 A5 00 08 */ lwz r5, 8(r5) -/* 800746D0 48 1F 3A AD */ bl ChkSafe__13cBgS_PolyInfoCFPCvUi -/* 800746D4 48 00 00 08 */ b lbl_800746DC -lbl_800746D8: -/* 800746D8 38 60 00 00 */ li r3, 0 -lbl_800746DC: -/* 800746DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800746E0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800746E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800746E8 7C 08 03 A6 */ mtlr r0 -/* 800746EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800746F0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/ClrMoveFlag__4dBgSFv.s b/asm/d/bg/d_bg_s/ClrMoveFlag__4dBgSFv.s deleted file mode 100644 index d76718318c8..00000000000 --- a/asm/d/bg/d_bg_s/ClrMoveFlag__4dBgSFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8007493C: -/* 8007493C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80074940 7C 08 02 A6 */ mflr r0 -/* 80074944 90 01 00 24 */ stw r0, 0x24(r1) -/* 80074948 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007494C 48 2E D8 91 */ bl _savegpr_29 -/* 80074950 7C 7D 1B 78 */ mr r29, r3 -/* 80074954 3B C0 00 00 */ li r30, 0 -/* 80074958 3B E0 00 00 */ li r31, 0 -lbl_8007495C: -/* 8007495C 7C 7D FA 14 */ add r3, r29, r31 -/* 80074960 88 03 00 04 */ lbz r0, 4(r3) -/* 80074964 28 00 00 00 */ cmplwi r0, 0 -/* 80074968 41 82 00 18 */ beq lbl_80074980 -/* 8007496C 80 63 00 00 */ lwz r3, 0(r3) -/* 80074970 81 83 00 04 */ lwz r12, 4(r3) -/* 80074974 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80074978 7D 89 03 A6 */ mtctr r12 -/* 8007497C 4E 80 04 21 */ bctrl -lbl_80074980: -/* 80074980 3B DE 00 01 */ addi r30, r30, 1 -/* 80074984 2C 1E 01 00 */ cmpwi r30, 0x100 -/* 80074988 3B FF 00 14 */ addi r31, r31, 0x14 -/* 8007498C 41 80 FF D0 */ blt lbl_8007495C -/* 80074990 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074994 48 2E D8 95 */ bl _restgpr_29 -/* 80074998 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8007499C 7C 08 03 A6 */ mtlr r0 -/* 800749A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800749A4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Ct__4cBgSFv.s b/asm/d/bg/d_bg_s/Ct__4cBgSFv.s deleted file mode 100644 index ad3d4804cf0..00000000000 --- a/asm/d/bg/d_bg_s/Ct__4cBgSFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800742E4: -/* 800742E4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800742E8 7C 08 02 A6 */ mflr r0 -/* 800742EC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800742F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800742F4 48 2E DE E9 */ bl _savegpr_29 -/* 800742F8 7C 7D 1B 78 */ mr r29, r3 -/* 800742FC 3B E0 00 00 */ li r31, 0 -/* 80074300 93 ED 89 E0 */ stw r31, l_SetCounter(r13) -/* 80074304 3B C0 00 00 */ li r30, 0 -lbl_80074308: -/* 80074308 7C 7D FA 14 */ add r3, r29, r31 -/* 8007430C 4B FF FD E9 */ bl Init__11cBgS_ChkElmFv -/* 80074310 3B DE 00 01 */ addi r30, r30, 1 -/* 80074314 2C 1E 01 00 */ cmpwi r30, 0x100 -/* 80074318 3B FF 00 14 */ addi r31, r31, 0x14 -/* 8007431C 41 80 FF EC */ blt lbl_80074308 -/* 80074320 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074324 48 2E DF 05 */ bl _restgpr_29 -/* 80074328 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8007432C 7C 08 03 A6 */ mtlr r0 -/* 80074330 38 21 00 20 */ addi r1, r1, 0x20 -/* 80074334 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Ct__4dBgSFv.s b/asm/d/bg/d_bg_s/Ct__4dBgSFv.s deleted file mode 100644 index da3205e8520..00000000000 --- a/asm/d/bg/d_bg_s/Ct__4dBgSFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800748FC: -/* 800748FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074900 7C 08 02 A6 */ mflr r0 -/* 80074904 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074908 4B FF F9 DD */ bl Ct__4cBgSFv -/* 8007490C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074910 7C 08 03 A6 */ mtlr r0 -/* 80074914 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074918 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Dt__4cBgSFv.s b/asm/d/bg/d_bg_s/Dt__4cBgSFv.s deleted file mode 100644 index ef1721d04f7..00000000000 --- a/asm/d/bg/d_bg_s/Dt__4cBgSFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80074338: -/* 80074338 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8007433C 7C 08 02 A6 */ mflr r0 -/* 80074340 90 01 00 24 */ stw r0, 0x24(r1) -/* 80074344 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074348 48 2E DE 95 */ bl _savegpr_29 -/* 8007434C 7C 7D 1B 78 */ mr r29, r3 -/* 80074350 3B C0 00 00 */ li r30, 0 -/* 80074354 3B E0 00 00 */ li r31, 0 -lbl_80074358: -/* 80074358 7C 7D FA 14 */ add r3, r29, r31 -/* 8007435C 88 03 00 04 */ lbz r0, 4(r3) -/* 80074360 28 00 00 00 */ cmplwi r0, 0 -/* 80074364 41 82 00 08 */ beq lbl_8007436C -/* 80074368 4B FF FD C1 */ bl Release__11cBgS_ChkElmFv -lbl_8007436C: -/* 8007436C 3B DE 00 01 */ addi r30, r30, 1 -/* 80074370 2C 1E 01 00 */ cmpwi r30, 0x100 -/* 80074374 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80074378 41 80 FF E0 */ blt lbl_80074358 -/* 8007437C 3B C0 00 00 */ li r30, 0 -/* 80074380 3B E0 00 00 */ li r31, 0 -lbl_80074384: -/* 80074384 7C 7D FA 14 */ add r3, r29, r31 -/* 80074388 4B FF FD 6D */ bl Init__11cBgS_ChkElmFv -/* 8007438C 3B DE 00 01 */ addi r30, r30, 1 -/* 80074390 2C 1E 01 00 */ cmpwi r30, 0x100 -/* 80074394 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80074398 41 80 FF EC */ blt lbl_80074384 -/* 8007439C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800743A0 48 2E DE 89 */ bl _restgpr_29 -/* 800743A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800743A8 7C 08 03 A6 */ mtlr r0 -/* 800743AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800743B0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Dt__4dBgSFv.s b/asm/d/bg/d_bg_s/Dt__4dBgSFv.s deleted file mode 100644 index f6aa4db194c..00000000000 --- a/asm/d/bg/d_bg_s/Dt__4dBgSFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8007491C: -/* 8007491C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074920 7C 08 02 A6 */ mflr r0 -/* 80074924 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074928 4B FF FA 11 */ bl Dt__4cBgSFv -/* 8007492C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074930 7C 08 03 A6 */ mtlr r0 -/* 80074934 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074938 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetActorPointer__4cBgSCFi.s b/asm/d/bg/d_bg_s/GetActorPointer__4cBgSCFi.s deleted file mode 100644 index fdd13062092..00000000000 --- a/asm/d/bg/d_bg_s/GetActorPointer__4cBgSCFi.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80074618: -/* 80074618 1C 04 00 14 */ mulli r0, r4, 0x14 -/* 8007461C 7C 63 02 14 */ add r3, r3, r0 -/* 80074620 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80074624 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo.s deleted file mode 100644 index c545ae6147b..00000000000 --- a/asm/d/bg/d_bg_s/GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80074628: -/* 80074628 A0 04 00 02 */ lhz r0, 2(r4) -/* 8007462C 2C 00 00 00 */ cmpwi r0, 0 -/* 80074630 41 80 00 20 */ blt lbl_80074650 -/* 80074634 2C 00 01 00 */ cmpwi r0, 0x100 -/* 80074638 40 80 00 18 */ bge lbl_80074650 -/* 8007463C 1C A0 00 14 */ mulli r5, r0, 0x14 -/* 80074640 7C 83 2A 14 */ add r4, r3, r5 -/* 80074644 88 04 00 04 */ lbz r0, 4(r4) -/* 80074648 28 00 00 00 */ cmplwi r0, 0 -/* 8007464C 40 82 00 0C */ bne lbl_80074658 -lbl_80074650: -/* 80074650 38 60 00 00 */ li r3, 0 -/* 80074654 4E 80 00 20 */ blr -lbl_80074658: -/* 80074658 7C 63 28 2E */ lwzx r3, r3, r5 -/* 8007465C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index b30788288d0..00000000000 --- a/asm/d/bg/d_bg_s/GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074F40: -/* 80074F40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074F44 7C 08 02 A6 */ mflr r0 -/* 80074F48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074F4C A0 04 00 02 */ lhz r0, 2(r4) -/* 80074F50 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074F54 7C A3 32 14 */ add r5, r3, r6 -/* 80074F58 88 05 00 04 */ lbz r0, 4(r5) -/* 80074F5C 28 00 00 00 */ cmplwi r0, 0 -/* 80074F60 41 82 00 1C */ beq lbl_80074F7C -/* 80074F64 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074F68 81 83 00 04 */ lwz r12, 4(r3) -/* 80074F6C 81 8C 00 C4 */ lwz r12, 0xc4(r12) -/* 80074F70 7D 89 03 A6 */ mtctr r12 -/* 80074F74 4E 80 04 21 */ bctrl -/* 80074F78 48 00 00 08 */ b lbl_80074F80 -lbl_80074F7C: -/* 80074F7C 38 60 00 FF */ li r3, 0xff -lbl_80074F80: -/* 80074F80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074F84 7C 08 03 A6 */ mtlr r0 -/* 80074F88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074F8C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetExitId__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetExitId__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 3bdc371e58e..00000000000 --- a/asm/d/bg/d_bg_s/GetExitId__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074B98: -/* 80074B98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074B9C 7C 08 02 A6 */ mflr r0 -/* 80074BA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074BA4 A0 04 00 02 */ lhz r0, 2(r4) -/* 80074BA8 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074BAC 7C A3 32 14 */ add r5, r3, r6 -/* 80074BB0 88 05 00 04 */ lbz r0, 4(r5) -/* 80074BB4 28 00 00 00 */ cmplwi r0, 0 -/* 80074BB8 41 82 00 1C */ beq lbl_80074BD4 -/* 80074BBC 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074BC0 81 83 00 04 */ lwz r12, 4(r3) -/* 80074BC4 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 80074BC8 7D 89 03 A6 */ mtctr r12 -/* 80074BCC 4E 80 04 21 */ bctrl -/* 80074BD0 48 00 00 08 */ b lbl_80074BD8 -lbl_80074BD4: -/* 80074BD4 38 60 00 3F */ li r3, 0x3f -lbl_80074BD8: -/* 80074BD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074BDC 7C 08 03 A6 */ mtlr r0 -/* 80074BE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074BE4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetGroundCode__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetGroundCode__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index e61c5fa2d6b..00000000000 --- a/asm/d/bg/d_bg_s/GetGroundCode__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074EF0: -/* 80074EF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074EF4 7C 08 02 A6 */ mflr r0 -/* 80074EF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074EFC A0 04 00 02 */ lhz r0, 2(r4) -/* 80074F00 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074F04 7C A3 32 14 */ add r5, r3, r6 -/* 80074F08 88 05 00 04 */ lbz r0, 4(r5) -/* 80074F0C 28 00 00 00 */ cmplwi r0, 0 -/* 80074F10 41 82 00 1C */ beq lbl_80074F2C -/* 80074F14 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074F18 81 83 00 04 */ lwz r12, 4(r3) -/* 80074F1C 81 8C 00 B8 */ lwz r12, 0xb8(r12) -/* 80074F20 7D 89 03 A6 */ mtctr r12 -/* 80074F24 4E 80 04 21 */ bctrl -/* 80074F28 48 00 00 08 */ b lbl_80074F30 -lbl_80074F2C: -/* 80074F2C 38 60 00 00 */ li r3, 0 -lbl_80074F30: -/* 80074F30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074F34 7C 08 03 A6 */ mtlr r0 -/* 80074F38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074F3C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetGrpInf__4cBgSCFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetGrpInf__4cBgSCFRC13cBgS_PolyInfo.s deleted file mode 100644 index c9d4eae5c2e..00000000000 --- a/asm/d/bg/d_bg_s/GetGrpInf__4cBgSCFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800748AC: -/* 800748AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800748B0 7C 08 02 A6 */ mflr r0 -/* 800748B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800748B8 A0 04 00 02 */ lhz r0, 2(r4) -/* 800748BC 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 800748C0 7C A3 32 14 */ add r5, r3, r6 -/* 800748C4 88 05 00 04 */ lbz r0, 4(r5) -/* 800748C8 28 00 00 00 */ cmplwi r0, 0 -/* 800748CC 41 82 00 1C */ beq lbl_800748E8 -/* 800748D0 7C 63 30 2E */ lwzx r3, r3, r6 -/* 800748D4 81 83 00 04 */ lwz r12, 4(r3) -/* 800748D8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 800748DC 7D 89 03 A6 */ mtctr r12 -/* 800748E0 4E 80 04 21 */ bctrl -/* 800748E4 48 00 00 08 */ b lbl_800748EC -lbl_800748E8: -/* 800748E8 38 60 FF FF */ li r3, -1 -lbl_800748EC: -/* 800748EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800748F0 7C 08 03 A6 */ mtlr r0 -/* 800748F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800748F8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo.s deleted file mode 100644 index 9056a1a839b..00000000000 --- a/asm/d/bg/d_bg_s/GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800746F4: -/* 800746F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800746F8 7C 08 02 A6 */ mflr r0 -/* 800746FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074700 A0 04 00 02 */ lhz r0, 2(r4) -/* 80074704 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074708 7C A3 32 14 */ add r5, r3, r6 -/* 8007470C 88 05 00 04 */ lbz r0, 4(r5) -/* 80074710 28 00 00 00 */ cmplwi r0, 0 -/* 80074714 41 82 00 1C */ beq lbl_80074730 -/* 80074718 7C 63 30 2E */ lwzx r3, r3, r6 -/* 8007471C 81 83 00 04 */ lwz r12, 4(r3) -/* 80074720 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80074724 7D 89 03 A6 */ mtctr r12 -/* 80074728 4E 80 04 21 */ bctrl -/* 8007472C 48 00 00 08 */ b lbl_80074734 -lbl_80074730: -/* 80074730 38 60 00 FF */ li r3, 0xff -lbl_80074734: -/* 80074734 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074738 7C 08 03 A6 */ mtlr r0 -/* 8007473C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074740 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index c98523b496a..00000000000 --- a/asm/d/bg/d_bg_s/GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80075080: -/* 80075080 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80075084 7C 08 02 A6 */ mflr r0 -/* 80075088 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007508C A0 04 00 02 */ lhz r0, 2(r4) -/* 80075090 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80075094 7C A3 32 14 */ add r5, r3, r6 -/* 80075098 88 05 00 04 */ lbz r0, 4(r5) -/* 8007509C 28 00 00 00 */ cmplwi r0, 0 -/* 800750A0 41 82 00 1C */ beq lbl_800750BC -/* 800750A4 7C 63 30 2E */ lwzx r3, r3, r6 -/* 800750A8 81 83 00 04 */ lwz r12, 4(r3) -/* 800750AC 81 8C 00 D8 */ lwz r12, 0xd8(r12) -/* 800750B0 7D 89 03 A6 */ mtctr r12 -/* 800750B4 4E 80 04 21 */ bctrl -/* 800750B8 48 00 00 08 */ b lbl_800750C0 -lbl_800750BC: -/* 800750BC 38 60 00 FF */ li r3, 0xff -lbl_800750C0: -/* 800750C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800750C4 7C 08 03 A6 */ mtlr r0 -/* 800750C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800750CC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index d03bb791b2e..00000000000 --- a/asm/d/bg/d_bg_s/GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074C6C: -/* 80074C6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074C70 7C 08 02 A6 */ mflr r0 -/* 80074C74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074C78 A0 04 00 02 */ lhz r0, 2(r4) -/* 80074C7C 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074C80 7C A3 32 14 */ add r5, r3, r6 -/* 80074C84 88 05 00 04 */ lbz r0, 4(r5) -/* 80074C88 28 00 00 00 */ cmplwi r0, 0 -/* 80074C8C 41 82 00 1C */ beq lbl_80074CA8 -/* 80074C90 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074C94 81 83 00 04 */ lwz r12, 4(r3) -/* 80074C98 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 80074C9C 7D 89 03 A6 */ mtctr r12 -/* 80074CA0 4E 80 04 21 */ bctrl -/* 80074CA4 48 00 00 08 */ b lbl_80074CAC -lbl_80074CA8: -/* 80074CA8 38 60 00 00 */ li r3, 0 -lbl_80074CAC: -/* 80074CAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074CB0 7C 08 03 A6 */ mtlr r0 -/* 80074CB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074CB8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetMagnetCode__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetMagnetCode__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 3cd1bdf2bd7..00000000000 --- a/asm/d/bg/d_bg_s/GetMagnetCode__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074D0C: -/* 80074D0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074D10 7C 08 02 A6 */ mflr r0 -/* 80074D14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074D18 A0 04 00 02 */ lhz r0, 2(r4) -/* 80074D1C 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074D20 7C A3 32 14 */ add r5, r3, r6 -/* 80074D24 88 05 00 04 */ lbz r0, 4(r5) -/* 80074D28 28 00 00 00 */ cmplwi r0, 0 -/* 80074D2C 41 82 00 1C */ beq lbl_80074D48 -/* 80074D30 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074D34 81 83 00 04 */ lwz r12, 4(r3) -/* 80074D38 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 80074D3C 7D 89 03 A6 */ mtctr r12 -/* 80074D40 4E 80 04 21 */ bctrl -/* 80074D44 48 00 00 08 */ b lbl_80074D4C -lbl_80074D48: -/* 80074D48 38 60 00 00 */ li r3, 0 -lbl_80074D4C: -/* 80074D4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074D50 7C 08 03 A6 */ mtlr r0 -/* 80074D54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074D58 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index e24043de28a..00000000000 --- a/asm/d/bg/d_bg_s/GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074D5C: -/* 80074D5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074D60 7C 08 02 A6 */ mflr r0 -/* 80074D64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074D68 A0 04 00 02 */ lhz r0, 2(r4) -/* 80074D6C 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074D70 7C A3 32 14 */ add r5, r3, r6 -/* 80074D74 88 05 00 04 */ lbz r0, 4(r5) -/* 80074D78 28 00 00 00 */ cmplwi r0, 0 -/* 80074D7C 41 82 00 1C */ beq lbl_80074D98 -/* 80074D80 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074D84 81 83 00 04 */ lwz r12, 4(r3) -/* 80074D88 81 8C 00 A4 */ lwz r12, 0xa4(r12) -/* 80074D8C 7D 89 03 A6 */ mtctr r12 -/* 80074D90 4E 80 04 21 */ bctrl -/* 80074D94 48 00 00 08 */ b lbl_80074D9C -lbl_80074D98: -/* 80074D98 38 60 00 00 */ li r3, 0 -lbl_80074D9C: -/* 80074D9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074DA0 7C 08 03 A6 */ mtlr r0 -/* 80074DA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074DA8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index caad464fef2..00000000000 --- a/asm/d/bg/d_bg_s/GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074E50: -/* 80074E50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074E54 7C 08 02 A6 */ mflr r0 -/* 80074E58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074E5C A0 04 00 02 */ lhz r0, 2(r4) -/* 80074E60 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074E64 7C A3 32 14 */ add r5, r3, r6 -/* 80074E68 88 05 00 04 */ lbz r0, 4(r5) -/* 80074E6C 28 00 00 00 */ cmplwi r0, 0 -/* 80074E70 41 82 00 1C */ beq lbl_80074E8C -/* 80074E74 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074E78 81 83 00 04 */ lwz r12, 4(r3) -/* 80074E7C 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 80074E80 7D 89 03 A6 */ mtctr r12 -/* 80074E84 4E 80 04 21 */ bctrl -/* 80074E88 48 00 00 08 */ b lbl_80074E90 -lbl_80074E8C: -/* 80074E8C 38 60 00 00 */ li r3, 0 -lbl_80074E90: -/* 80074E90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074E94 7C 08 03 A6 */ mtlr r0 -/* 80074E98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074E9C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 345d689b968..00000000000 --- a/asm/d/bg/d_bg_s/GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074EA0: -/* 80074EA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074EA4 7C 08 02 A6 */ mflr r0 -/* 80074EA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074EAC A0 04 00 02 */ lhz r0, 2(r4) -/* 80074EB0 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074EB4 7C A3 32 14 */ add r5, r3, r6 -/* 80074EB8 88 05 00 04 */ lbz r0, 4(r5) -/* 80074EBC 28 00 00 00 */ cmplwi r0, 0 -/* 80074EC0 41 82 00 1C */ beq lbl_80074EDC -/* 80074EC4 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074EC8 81 83 00 04 */ lwz r12, 4(r3) -/* 80074ECC 81 8C 00 B4 */ lwz r12, 0xb4(r12) -/* 80074ED0 7D 89 03 A6 */ mtctr r12 -/* 80074ED4 4E 80 04 21 */ bctrl -/* 80074ED8 48 00 00 08 */ b lbl_80074EE0 -lbl_80074EDC: -/* 80074EDC 38 60 00 00 */ li r3, 0 -lbl_80074EE0: -/* 80074EE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074EE4 7C 08 03 A6 */ mtlr r0 -/* 80074EE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074EEC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index cb8cf0916c6..00000000000 --- a/asm/d/bg/d_bg_s/GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8007519C: -/* 8007519C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800751A0 7C 08 02 A6 */ mflr r0 -/* 800751A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800751A8 A0 04 00 02 */ lhz r0, 2(r4) -/* 800751AC 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 800751B0 7C A3 32 14 */ add r5, r3, r6 -/* 800751B4 88 05 00 04 */ lbz r0, 4(r5) -/* 800751B8 28 00 00 00 */ cmplwi r0, 0 -/* 800751BC 41 82 00 28 */ beq lbl_800751E4 -/* 800751C0 7C 63 30 2E */ lwzx r3, r3, r6 -/* 800751C4 A0 84 00 00 */ lhz r4, 0(r4) -/* 800751C8 81 83 00 04 */ lwz r12, 4(r3) -/* 800751CC 81 8C 00 C0 */ lwz r12, 0xc0(r12) -/* 800751D0 7D 89 03 A6 */ mtctr r12 -/* 800751D4 4E 80 04 21 */ bctrl -/* 800751D8 30 03 FF FF */ addic r0, r3, -1 -/* 800751DC 7C 60 19 10 */ subfe r3, r0, r3 -/* 800751E0 48 00 00 08 */ b lbl_800751E8 -lbl_800751E4: -/* 800751E4 38 60 00 00 */ li r3, 0 -lbl_800751E8: -/* 800751E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800751EC 7C 08 03 A6 */ mtlr r0 -/* 800751F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800751F4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetPolyColor__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetPolyColor__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 4b28ff1699b..00000000000 --- a/asm/d/bg/d_bg_s/GetPolyColor__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80074BE8: -/* 80074BE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074BEC 7C 08 02 A6 */ mflr r0 -/* 80074BF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074BF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80074BF8 93 C1 00 08 */ stw r30, 8(r1) -/* 80074BFC 7C 7E 1B 78 */ mr r30, r3 -/* 80074C00 7C 9F 23 78 */ mr r31, r4 -/* 80074C04 7F E3 FB 78 */ mr r3, r31 -/* 80074C08 48 1F 34 F1 */ bl ChkSetInfo__13cBgS_PolyInfoCFv -/* 80074C0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074C10 40 82 00 0C */ bne lbl_80074C1C -/* 80074C14 38 60 00 FF */ li r3, 0xff -/* 80074C18 48 00 00 3C */ b lbl_80074C54 -lbl_80074C1C: -/* 80074C1C A0 1F 00 02 */ lhz r0, 2(r31) -/* 80074C20 1C 80 00 14 */ mulli r4, r0, 0x14 -/* 80074C24 7C 7E 22 14 */ add r3, r30, r4 -/* 80074C28 88 03 00 04 */ lbz r0, 4(r3) -/* 80074C2C 28 00 00 00 */ cmplwi r0, 0 -/* 80074C30 41 82 00 20 */ beq lbl_80074C50 -/* 80074C34 7C 7E 20 2E */ lwzx r3, r30, r4 -/* 80074C38 7F E4 FB 78 */ mr r4, r31 -/* 80074C3C 81 83 00 04 */ lwz r12, 4(r3) -/* 80074C40 81 8C 00 68 */ lwz r12, 0x68(r12) -/* 80074C44 7D 89 03 A6 */ mtctr r12 -/* 80074C48 4E 80 04 21 */ bctrl -/* 80074C4C 48 00 00 08 */ b lbl_80074C54 -lbl_80074C50: -/* 80074C50 38 60 00 FF */ li r3, 0xff -lbl_80074C54: -/* 80074C54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80074C58 83 C1 00 08 */ lwz r30, 8(r1) -/* 80074C5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074C60 7C 08 03 A6 */ mtlr r0 -/* 80074C64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074C68 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetRoomCamId__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetRoomCamId__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 658dd09f8d2..00000000000 --- a/asm/d/bg/d_bg_s/GetRoomCamId__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074F90: -/* 80074F90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074F94 7C 08 02 A6 */ mflr r0 -/* 80074F98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074F9C A0 04 00 02 */ lhz r0, 2(r4) -/* 80074FA0 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074FA4 7C A3 32 14 */ add r5, r3, r6 -/* 80074FA8 88 05 00 04 */ lbz r0, 4(r5) -/* 80074FAC 28 00 00 00 */ cmplwi r0, 0 -/* 80074FB0 41 82 00 1C */ beq lbl_80074FCC -/* 80074FB4 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074FB8 81 83 00 04 */ lwz r12, 4(r3) -/* 80074FBC 81 8C 00 C8 */ lwz r12, 0xc8(r12) -/* 80074FC0 7D 89 03 A6 */ mtctr r12 -/* 80074FC4 4E 80 04 21 */ bctrl -/* 80074FC8 48 00 00 08 */ b lbl_80074FD0 -lbl_80074FCC: -/* 80074FCC 38 60 00 FF */ li r3, 0xff -lbl_80074FD0: -/* 80074FD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074FD4 7C 08 03 A6 */ mtlr r0 -/* 80074FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074FDC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetRoomPathId__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetRoomPathId__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index eff39b39ec0..00000000000 --- a/asm/d/bg/d_bg_s/GetRoomPathId__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074FE0: -/* 80074FE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074FE4 7C 08 02 A6 */ mflr r0 -/* 80074FE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074FEC A0 04 00 02 */ lhz r0, 2(r4) -/* 80074FF0 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074FF4 7C A3 32 14 */ add r5, r3, r6 -/* 80074FF8 88 05 00 04 */ lbz r0, 4(r5) -/* 80074FFC 28 00 00 00 */ cmplwi r0, 0 -/* 80075000 41 82 00 1C */ beq lbl_8007501C -/* 80075004 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80075008 81 83 00 04 */ lwz r12, 4(r3) -/* 8007500C 81 8C 00 CC */ lwz r12, 0xcc(r12) -/* 80075010 7D 89 03 A6 */ mtctr r12 -/* 80075014 4E 80 04 21 */ bctrl -/* 80075018 48 00 00 08 */ b lbl_80075020 -lbl_8007501C: -/* 8007501C 38 60 00 FF */ li r3, 0xff -lbl_80075020: -/* 80075020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80075024 7C 08 03 A6 */ mtlr r0 -/* 80075028 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007502C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 60b1561d962..00000000000 --- a/asm/d/bg/d_bg_s/GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80075030: -/* 80075030 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80075034 7C 08 02 A6 */ mflr r0 -/* 80075038 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007503C A0 04 00 02 */ lhz r0, 2(r4) -/* 80075040 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80075044 7C A3 32 14 */ add r5, r3, r6 -/* 80075048 88 05 00 04 */ lbz r0, 4(r5) -/* 8007504C 28 00 00 00 */ cmplwi r0, 0 -/* 80075050 41 82 00 1C */ beq lbl_8007506C -/* 80075054 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80075058 81 83 00 04 */ lwz r12, 4(r3) -/* 8007505C 81 8C 00 D0 */ lwz r12, 0xd0(r12) -/* 80075060 7D 89 03 A6 */ mtctr r12 -/* 80075064 4E 80 04 21 */ bctrl -/* 80075068 48 00 00 08 */ b lbl_80075070 -lbl_8007506C: -/* 8007506C 38 60 00 FF */ li r3, 0xff -lbl_80075070: -/* 80075070 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80075074 7C 08 03 A6 */ mtlr r0 -/* 80075078 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007507C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetSpecialCode__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetSpecialCode__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 05747257022..00000000000 --- a/asm/d/bg/d_bg_s/GetSpecialCode__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074CBC: -/* 80074CBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074CC0 7C 08 02 A6 */ mflr r0 -/* 80074CC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074CC8 A0 04 00 02 */ lhz r0, 2(r4) -/* 80074CCC 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074CD0 7C A3 32 14 */ add r5, r3, r6 -/* 80074CD4 88 05 00 04 */ lbz r0, 4(r5) -/* 80074CD8 28 00 00 00 */ cmplwi r0, 0 -/* 80074CDC 41 82 00 1C */ beq lbl_80074CF8 -/* 80074CE0 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074CE4 81 83 00 04 */ lwz r12, 4(r3) -/* 80074CE8 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 80074CEC 7D 89 03 A6 */ mtctr r12 -/* 80074CF0 4E 80 04 21 */ bctrl -/* 80074CF4 48 00 00 08 */ b lbl_80074CFC -lbl_80074CF8: -/* 80074CF8 38 60 00 00 */ li r3, 0 -lbl_80074CFC: -/* 80074CFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074D00 7C 08 03 A6 */ mtlr r0 -/* 80074D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074D08 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz.s b/asm/d/bg/d_bg_s/GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz.s deleted file mode 100644 index 1d22368cead..00000000000 --- a/asm/d/bg/d_bg_s/GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800747F0: -/* 800747F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800747F4 7C 08 02 A6 */ mflr r0 -/* 800747F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800747FC A0 04 00 02 */ lhz r0, 2(r4) -/* 80074800 1D 20 00 14 */ mulli r9, r0, 0x14 -/* 80074804 7D 03 4A 14 */ add r8, r3, r9 -/* 80074808 88 08 00 04 */ lbz r0, 4(r8) -/* 8007480C 28 00 00 00 */ cmplwi r0, 0 -/* 80074810 41 82 00 1C */ beq lbl_8007482C -/* 80074814 7C 63 48 2E */ lwzx r3, r3, r9 -/* 80074818 81 83 00 04 */ lwz r12, 4(r3) -/* 8007481C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80074820 7D 89 03 A6 */ mtctr r12 -/* 80074824 4E 80 04 21 */ bctrl -/* 80074828 48 00 00 08 */ b lbl_80074830 -lbl_8007482C: -/* 8007482C 38 60 00 00 */ li r3, 0 -lbl_80074830: -/* 80074830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074834 7C 08 03 A6 */ mtlr r0 -/* 80074838 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007483C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetUnderwaterRoofCode__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetUnderwaterRoofCode__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index 6f52973be82..00000000000 --- a/asm/d/bg/d_bg_s/GetUnderwaterRoofCode__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80074DAC: -/* 80074DAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074DB0 7C 08 02 A6 */ mflr r0 -/* 80074DB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074DB8 A0 04 00 02 */ lhz r0, 2(r4) -/* 80074DBC 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074DC0 7C A3 32 14 */ add r5, r3, r6 -/* 80074DC4 88 05 00 04 */ lbz r0, 4(r5) -/* 80074DC8 28 00 00 00 */ cmplwi r0, 0 -/* 80074DCC 41 82 00 20 */ beq lbl_80074DEC -/* 80074DD0 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074DD4 A0 84 00 00 */ lhz r4, 0(r4) -/* 80074DD8 81 83 00 04 */ lwz r12, 4(r3) -/* 80074DDC 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80074DE0 7D 89 03 A6 */ mtctr r12 -/* 80074DE4 4E 80 04 21 */ bctrl -/* 80074DE8 48 00 00 08 */ b lbl_80074DF0 -lbl_80074DEC: -/* 80074DEC 38 60 00 00 */ li r3, 0 -lbl_80074DF0: -/* 80074DF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074DF4 7C 08 03 A6 */ mtlr r0 -/* 80074DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074DFC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetWallCode__4dBgSFRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/GetWallCode__4dBgSFRC13cBgS_PolyInfo.s deleted file mode 100644 index cc32cb1c0af..00000000000 --- a/asm/d/bg/d_bg_s/GetWallCode__4dBgSFRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80074E00: -/* 80074E00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074E04 7C 08 02 A6 */ mflr r0 -/* 80074E08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074E0C A0 04 00 02 */ lhz r0, 2(r4) -/* 80074E10 1C C0 00 14 */ mulli r6, r0, 0x14 -/* 80074E14 7C A3 32 14 */ add r5, r3, r6 -/* 80074E18 88 05 00 04 */ lbz r0, 4(r5) -/* 80074E1C 28 00 00 00 */ cmplwi r0, 0 -/* 80074E20 41 82 00 1C */ beq lbl_80074E3C -/* 80074E24 7C 63 30 2E */ lwzx r3, r3, r6 -/* 80074E28 81 83 00 04 */ lwz r12, 4(r3) -/* 80074E2C 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 80074E30 7D 89 03 A6 */ mtctr r12 -/* 80074E34 4E 80 04 21 */ bctrl -/* 80074E38 48 00 00 08 */ b lbl_80074E40 -lbl_80074E3C: -/* 80074E3C 38 60 00 00 */ li r3, 0 -lbl_80074E40: -/* 80074E40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80074E44 7C 08 03 A6 */ mtlr r0 -/* 80074E48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074E4C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Init__11cBgS_ChkElmFv.s b/asm/d/bg/d_bg_s/Init__11cBgS_ChkElmFv.s deleted file mode 100644 index 6140c30762a..00000000000 --- a/asm/d/bg/d_bg_s/Init__11cBgS_ChkElmFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800740F4: -/* 800740F4 38 00 00 00 */ li r0, 0 -/* 800740F8 90 03 00 00 */ stw r0, 0(r3) -/* 800740FC 98 03 00 04 */ stb r0, 4(r3) -/* 80074100 90 03 00 0C */ stw r0, 0xc(r3) -/* 80074104 38 00 FF FF */ li r0, -1 -/* 80074108 90 03 00 08 */ stw r0, 8(r3) -/* 8007410C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb.s b/asm/d/bg/d_bg_s/MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb.s deleted file mode 100644 index e5b78a0153c..00000000000 --- a/asm/d/bg/d_bg_s/MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80075774: -/* 80075774 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80075778 7C 08 02 A6 */ mflr r0 -/* 8007577C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80075780 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075784 48 2E CA 3D */ bl _savegpr_22 -/* 80075788 7C 7A 1B 78 */ mr r26, r3 -/* 8007578C 7C 9B 23 78 */ mr r27, r4 -/* 80075790 7C BC 2B 78 */ mr r28, r5 -/* 80075794 7C DD 33 78 */ mr r29, r6 -/* 80075798 7C FE 3B 78 */ mr r30, r7 -/* 8007579C 7D 1F 43 78 */ mr r31, r8 -/* 800757A0 7D 36 4B 78 */ mr r22, r9 -/* 800757A4 7D 57 53 78 */ mr r23, r10 -/* 800757A8 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 800757AC 41 82 00 BC */ beq lbl_80075868 -/* 800757B0 7F 63 DB 78 */ mr r3, r27 -/* 800757B4 48 1F 29 F9 */ bl ChkBgIndex__13cBgS_PolyInfoCFv -/* 800757B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800757BC 40 82 00 08 */ bne lbl_800757C4 -/* 800757C0 48 00 00 A8 */ b lbl_80075868 -lbl_800757C4: -/* 800757C4 A0 1B 00 02 */ lhz r0, 2(r27) -/* 800757C8 1F 20 00 14 */ mulli r25, r0, 0x14 -/* 800757CC 7C 7A CA 14 */ add r3, r26, r25 -/* 800757D0 88 03 00 04 */ lbz r0, 4(r3) -/* 800757D4 28 00 00 00 */ cmplwi r0, 0 -/* 800757D8 41 82 00 90 */ beq lbl_80075868 -/* 800757DC 7F 1A C8 2E */ lwzx r24, r26, r25 -/* 800757E0 56 C0 06 3F */ clrlwi. r0, r22, 0x18 -/* 800757E4 41 82 00 10 */ beq lbl_800757F4 -/* 800757E8 88 18 00 0B */ lbz r0, 0xb(r24) -/* 800757EC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800757F0 41 82 00 78 */ beq lbl_80075868 -lbl_800757F4: -/* 800757F4 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 800757F8 41 82 00 10 */ beq lbl_80075808 -/* 800757FC 88 18 00 0B */ lbz r0, 0xb(r24) -/* 80075800 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80075804 41 82 00 64 */ beq lbl_80075868 -lbl_80075808: -/* 80075808 7F 03 C3 78 */ mr r3, r24 -/* 8007580C 81 98 00 04 */ lwz r12, 4(r24) -/* 80075810 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80075814 7D 89 03 A6 */ mtctr r12 -/* 80075818 4E 80 04 21 */ bctrl -/* 8007581C 28 03 00 00 */ cmplwi r3, 0 -/* 80075820 41 82 00 48 */ beq lbl_80075868 -/* 80075824 7F 43 D3 78 */ mr r3, r26 -/* 80075828 7F 64 DB 78 */ mr r4, r27 -/* 8007582C 4B FF EE 35 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo -/* 80075830 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075834 41 82 00 34 */ beq lbl_80075868 -/* 80075838 7F 03 C3 78 */ mr r3, r24 -/* 8007583C 7F 64 DB 78 */ mr r4, r27 -/* 80075840 7C BA CA 14 */ add r5, r26, r25 -/* 80075844 80 A5 00 0C */ lwz r5, 0xc(r5) -/* 80075848 7F 86 E3 78 */ mr r6, r28 -/* 8007584C 7F A7 EB 78 */ mr r7, r29 -/* 80075850 7F C8 F3 78 */ mr r8, r30 -/* 80075854 7F E9 FB 78 */ mr r9, r31 -/* 80075858 81 98 00 04 */ lwz r12, 4(r24) -/* 8007585C 81 8C 00 DC */ lwz r12, 0xdc(r12) -/* 80075860 7D 89 03 A6 */ mtctr r12 -/* 80075864 4E 80 04 21 */ bctrl -lbl_80075868: -/* 80075868 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007586C 48 2E C9 A1 */ bl _restgpr_22 -/* 80075870 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80075874 7C 08 03 A6 */ mtlr r0 -/* 80075878 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007587C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s b/asm/d/bg/d_bg_s/MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s deleted file mode 100644 index ba6b74e7bd1..00000000000 --- a/asm/d/bg/d_bg_s/MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_8007595C: -/* 8007595C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80075960 7C 08 02 A6 */ mflr r0 -/* 80075964 90 01 00 34 */ stw r0, 0x34(r1) -/* 80075968 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007596C 48 2E C8 5D */ bl _savegpr_24 -/* 80075970 7C 78 1B 78 */ mr r24, r3 -/* 80075974 7C 99 23 78 */ mr r25, r4 -/* 80075978 7C BA 2B 78 */ mr r26, r5 -/* 8007597C 7C DB 33 78 */ mr r27, r6 -/* 80075980 7C FC 3B 78 */ mr r28, r7 -/* 80075984 7D 1D 43 78 */ mr r29, r8 -/* 80075988 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 8007598C 41 82 00 80 */ beq lbl_80075A0C -/* 80075990 7F 23 CB 78 */ mr r3, r25 -/* 80075994 48 1F 28 19 */ bl ChkBgIndex__13cBgS_PolyInfoCFv -/* 80075998 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007599C 40 82 00 08 */ bne lbl_800759A4 -/* 800759A0 48 00 00 6C */ b lbl_80075A0C -lbl_800759A4: -/* 800759A4 A0 19 00 02 */ lhz r0, 2(r25) -/* 800759A8 1F E0 00 14 */ mulli r31, r0, 0x14 -/* 800759AC 7C 78 FA 14 */ add r3, r24, r31 -/* 800759B0 88 03 00 04 */ lbz r0, 4(r3) -/* 800759B4 28 00 00 00 */ cmplwi r0, 0 -/* 800759B8 41 82 00 54 */ beq lbl_80075A0C -/* 800759BC 7F D8 F8 2E */ lwzx r30, r24, r31 -/* 800759C0 7F C3 F3 78 */ mr r3, r30 -/* 800759C4 81 9E 00 04 */ lwz r12, 4(r30) -/* 800759C8 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 800759CC 7D 89 03 A6 */ mtctr r12 -/* 800759D0 4E 80 04 21 */ bctrl -/* 800759D4 28 03 00 00 */ cmplwi r3, 0 -/* 800759D8 41 82 00 34 */ beq lbl_80075A0C -/* 800759DC 7F C3 F3 78 */ mr r3, r30 -/* 800759E0 7F 24 CB 78 */ mr r4, r25 -/* 800759E4 7C B8 FA 14 */ add r5, r24, r31 -/* 800759E8 80 A5 00 0C */ lwz r5, 0xc(r5) -/* 800759EC 7F 46 D3 78 */ mr r6, r26 -/* 800759F0 7F 67 DB 78 */ mr r7, r27 -/* 800759F4 7F 88 E3 78 */ mr r8, r28 -/* 800759F8 7F A9 EB 78 */ mr r9, r29 -/* 800759FC 81 9E 00 04 */ lwz r12, 4(r30) -/* 80075A00 81 8C 00 E4 */ lwz r12, 0xe4(r12) -/* 80075A04 7D 89 03 A6 */ mtctr r12 -/* 80075A08 4E 80 04 21 */ bctrl -lbl_80075A0C: -/* 80075A0C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075A10 48 2E C8 05 */ bl _restgpr_24 -/* 80075A14 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80075A18 7C 08 03 A6 */ mtlr r0 -/* 80075A1C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80075A20 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s b/asm/d/bg/d_bg_s/MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s deleted file mode 100644 index d7170e451de..00000000000 --- a/asm/d/bg/d_bg_s/MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80075880: -/* 80075880 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80075884 7C 08 02 A6 */ mflr r0 -/* 80075888 90 01 00 34 */ stw r0, 0x34(r1) -/* 8007588C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075890 48 2E C9 39 */ bl _savegpr_24 -/* 80075894 7C 78 1B 78 */ mr r24, r3 -/* 80075898 7C 99 23 78 */ mr r25, r4 -/* 8007589C 7C BA 2B 78 */ mr r26, r5 -/* 800758A0 7C DB 33 78 */ mr r27, r6 -/* 800758A4 7C FC 3B 78 */ mr r28, r7 -/* 800758A8 7D 1D 43 78 */ mr r29, r8 -/* 800758AC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 800758B0 41 82 00 94 */ beq lbl_80075944 -/* 800758B4 7F 23 CB 78 */ mr r3, r25 -/* 800758B8 48 1F 28 F5 */ bl ChkBgIndex__13cBgS_PolyInfoCFv -/* 800758BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800758C0 40 82 00 08 */ bne lbl_800758C8 -/* 800758C4 48 00 00 80 */ b lbl_80075944 -lbl_800758C8: -/* 800758C8 A0 19 00 02 */ lhz r0, 2(r25) -/* 800758CC 1F E0 00 14 */ mulli r31, r0, 0x14 -/* 800758D0 7C 78 FA 14 */ add r3, r24, r31 -/* 800758D4 88 03 00 04 */ lbz r0, 4(r3) -/* 800758D8 28 00 00 00 */ cmplwi r0, 0 -/* 800758DC 41 82 00 68 */ beq lbl_80075944 -/* 800758E0 7F D8 F8 2E */ lwzx r30, r24, r31 -/* 800758E4 7F C3 F3 78 */ mr r3, r30 -/* 800758E8 81 9E 00 04 */ lwz r12, 4(r30) -/* 800758EC 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 800758F0 7D 89 03 A6 */ mtctr r12 -/* 800758F4 4E 80 04 21 */ bctrl -/* 800758F8 28 03 00 00 */ cmplwi r3, 0 -/* 800758FC 41 82 00 48 */ beq lbl_80075944 -/* 80075900 7F 03 C3 78 */ mr r3, r24 -/* 80075904 7F 24 CB 78 */ mr r4, r25 -/* 80075908 4B FF ED 59 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo -/* 8007590C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075910 41 82 00 34 */ beq lbl_80075944 -/* 80075914 7F C3 F3 78 */ mr r3, r30 -/* 80075918 7F 24 CB 78 */ mr r4, r25 -/* 8007591C 7C B8 FA 14 */ add r5, r24, r31 -/* 80075920 80 A5 00 0C */ lwz r5, 0xc(r5) -/* 80075924 7F 46 D3 78 */ mr r6, r26 -/* 80075928 7F 67 DB 78 */ mr r7, r27 -/* 8007592C 7F 88 E3 78 */ mr r8, r28 -/* 80075930 7F A9 EB 78 */ mr r9, r29 -/* 80075934 81 9E 00 04 */ lwz r12, 4(r30) -/* 80075938 81 8C 00 E0 */ lwz r12, 0xe0(r12) -/* 8007593C 7D 89 03 A6 */ mtctr r12 -/* 80075940 4E 80 04 21 */ bctrl -lbl_80075944: -/* 80075944 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075948 48 2E C8 CD */ bl _restgpr_24 -/* 8007594C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80075950 7C 08 03 A6 */ mtlr r0 -/* 80075954 38 21 00 30 */ addi r1, r1, 0x30 -/* 80075958 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv.s b/asm/d/bg/d_bg_s/Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv.s deleted file mode 100644 index 07854afdd61..00000000000 --- a/asm/d/bg/d_bg_s/Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80074110: -/* 80074110 38 00 00 01 */ li r0, 1 -/* 80074114 98 03 00 04 */ stb r0, 4(r3) -/* 80074118 90 83 00 00 */ stw r4, 0(r3) -/* 8007411C 90 A3 00 08 */ stw r5, 8(r3) -/* 80074120 90 C3 00 0C */ stw r6, 0xc(r3) -/* 80074124 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Release__11cBgS_ChkElmFv.s b/asm/d/bg/d_bg_s/Release__11cBgS_ChkElmFv.s deleted file mode 100644 index f61ebe6bbe3..00000000000 --- a/asm/d/bg/d_bg_s/Release__11cBgS_ChkElmFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80074128: -/* 80074128 38 80 00 00 */ li r4, 0 -/* 8007412C 98 83 00 04 */ stb r4, 4(r3) -/* 80074130 90 83 00 00 */ stw r4, 0(r3) -/* 80074134 38 00 FF FF */ li r0, -1 -/* 80074138 90 03 00 08 */ stw r0, 8(r3) -/* 8007413C 90 83 00 0C */ stw r4, 0xc(r3) -/* 80074140 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c.s b/asm/d/bg/d_bg_s/RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c.s deleted file mode 100644 index 72128f9ff2e..00000000000 --- a/asm/d/bg/d_bg_s/RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80075B84: -/* 80075B84 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075B88 7C 08 02 A6 */ mflr r0 -/* 80075B8C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075B90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075B94 48 2E C6 45 */ bl _savegpr_28 -/* 80075B98 7C 7C 1B 78 */ mr r28, r3 -/* 80075B9C 7C BD 2B 78 */ mr r29, r5 -/* 80075BA0 A0 04 00 02 */ lhz r0, 2(r4) -/* 80075BA4 1F E0 00 14 */ mulli r31, r0, 0x14 -/* 80075BA8 7F DC F8 2E */ lwzx r30, r28, r31 -/* 80075BAC 7F C3 F3 78 */ mr r3, r30 -/* 80075BB0 48 1F 26 25 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80075BB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075BB8 41 82 00 24 */ beq lbl_80075BDC -/* 80075BBC 7F C3 F3 78 */ mr r3, r30 -/* 80075BC0 7C 9C FA 14 */ add r4, r28, r31 -/* 80075BC4 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80075BC8 7F A5 EB 78 */ mr r5, r29 -/* 80075BCC 81 9E 00 04 */ lwz r12, 4(r30) -/* 80075BD0 81 8C 00 E8 */ lwz r12, 0xe8(r12) -/* 80075BD4 7D 89 03 A6 */ mtctr r12 -/* 80075BD8 4E 80 04 21 */ bctrl -lbl_80075BDC: -/* 80075BDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075BE0 48 2E C6 45 */ bl _restgpr_28 -/* 80075BE4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075BE8 7C 08 03 A6 */ mtlr r0 -/* 80075BEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075BF0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo.s deleted file mode 100644 index 246f224df58..00000000000 --- a/asm/d/bg/d_bg_s/dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80075D7C: -/* 80075D7C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075D80 7C 08 02 A6 */ mflr r0 -/* 80075D84 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075D88 7C 64 1B 78 */ mr r4, r3 -/* 80075D8C 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075D90 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075D94 90 01 00 18 */ stw r0, 0x18(r1) -/* 80075D98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80075D9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80075DA0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80075DA4 38 A1 00 08 */ addi r5, r1, 8 -/* 80075DA8 4B FF E9 9D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 80075DAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075DB0 40 82 00 18 */ bne lbl_80075DC8 -/* 80075DB4 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075DB8 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075DBC 90 01 00 18 */ stw r0, 0x18(r1) -/* 80075DC0 38 60 00 00 */ li r3, 0 -/* 80075DC4 48 00 00 18 */ b lbl_80075DDC -lbl_80075DC8: -/* 80075DC8 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80075DCC 48 1F 24 19 */ bl cBgW_CheckBGround__Ff -/* 80075DD0 3C 80 80 3A */ lis r4, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075DD4 38 04 37 C0 */ addi r0, r4, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075DD8 90 01 00 18 */ stw r0, 0x18(r1) -lbl_80075DDC: -/* 80075DDC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075DE0 7C 08 03 A6 */ mtlr r0 -/* 80075DE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075DE8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/dBgS_CheckBRoofPoly__FRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/dBgS_CheckBRoofPoly__FRC13cBgS_PolyInfo.s deleted file mode 100644 index 3208b8ecd63..00000000000 --- a/asm/d/bg/d_bg_s/dBgS_CheckBRoofPoly__FRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80075DEC: -/* 80075DEC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075DF0 7C 08 02 A6 */ mflr r0 -/* 80075DF4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075DF8 7C 64 1B 78 */ mr r4, r3 -/* 80075DFC 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075E00 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075E04 90 01 00 18 */ stw r0, 0x18(r1) -/* 80075E08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80075E0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80075E10 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80075E14 38 A1 00 08 */ addi r5, r1, 8 -/* 80075E18 4B FF E9 2D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 80075E1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075E20 40 82 00 18 */ bne lbl_80075E38 -/* 80075E24 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075E28 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075E2C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80075E30 38 60 00 00 */ li r3, 0 -/* 80075E34 48 00 00 18 */ b lbl_80075E4C -lbl_80075E38: -/* 80075E38 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80075E3C 48 1F 23 C1 */ bl cBgW_CheckBRoof__Ff -/* 80075E40 3C 80 80 3A */ lis r4, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075E44 38 04 37 C0 */ addi r0, r4, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075E48 90 01 00 18 */ stw r0, 0x18(r1) -lbl_80075E4C: -/* 80075E4C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075E50 7C 08 03 A6 */ mtlr r0 -/* 80075E54 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075E58 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo.s deleted file mode 100644 index 9c8a9d37107..00000000000 --- a/asm/d/bg/d_bg_s/dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80075D0C: -/* 80075D0C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075D10 7C 08 02 A6 */ mflr r0 -/* 80075D14 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075D18 7C 64 1B 78 */ mr r4, r3 -/* 80075D1C 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075D20 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075D24 90 01 00 18 */ stw r0, 0x18(r1) -/* 80075D28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80075D2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80075D30 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80075D34 38 A1 00 08 */ addi r5, r1, 8 -/* 80075D38 4B FF EA 0D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 80075D3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075D40 40 82 00 18 */ bne lbl_80075D58 -/* 80075D44 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075D48 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075D4C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80075D50 38 60 00 00 */ li r3, 0 -/* 80075D54 48 00 00 18 */ b lbl_80075D6C -lbl_80075D58: -/* 80075D58 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80075D5C 48 1F 24 B5 */ bl cBgW_CheckBWall__Ff -/* 80075D60 3C 80 80 3A */ lis r4, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075D64 38 04 37 C0 */ addi r0, r4, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075D68 90 01 00 18 */ stw r0, 0x18(r1) -lbl_80075D6C: -/* 80075D6C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075D70 7C 08 03 A6 */ mtlr r0 -/* 80075D74 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075D78 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/dBgS_GetNY__FRC13cBgS_PolyInfo.s b/asm/d/bg/d_bg_s/dBgS_GetNY__FRC13cBgS_PolyInfo.s deleted file mode 100644 index 06c7537b7e4..00000000000 --- a/asm/d/bg/d_bg_s/dBgS_GetNY__FRC13cBgS_PolyInfo.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80075E5C: -/* 80075E5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075E60 7C 08 02 A6 */ mflr r0 -/* 80075E64 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075E68 7C 64 1B 78 */ mr r4, r3 -/* 80075E6C 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075E70 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075E74 90 01 00 18 */ stw r0, 0x18(r1) -/* 80075E78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80075E7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80075E80 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80075E84 38 A1 00 08 */ addi r5, r1, 8 -/* 80075E88 4B FF E8 BD */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 80075E8C C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80075E90 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80075E94 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80075E98 90 01 00 18 */ stw r0, 0x18(r1) -/* 80075E9C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075EA0 7C 08 03 A6 */ mtlr r0 -/* 80075EA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075EA8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s b/asm/d/bg/d_bg_s/dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s deleted file mode 100644 index cb9ed24df07..00000000000 --- a/asm/d/bg/d_bg_s/dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80075AA4: -/* 80075AA4 28 09 00 00 */ cmplwi r9, 0 -/* 80075AA8 4D 82 00 20 */ beqlr -/* 80075AAC A8 63 00 0E */ lha r3, 0xe(r3) -/* 80075AB0 41 82 00 10 */ beq lbl_80075AC0 -/* 80075AB4 A8 09 00 02 */ lha r0, 2(r9) -/* 80075AB8 7C 00 1A 14 */ add r0, r0, r3 -/* 80075ABC B0 09 00 02 */ sth r0, 2(r9) -lbl_80075AC0: -/* 80075AC0 28 08 00 00 */ cmplwi r8, 0 -/* 80075AC4 4D 82 00 20 */ beqlr -/* 80075AC8 A8 08 00 02 */ lha r0, 2(r8) -/* 80075ACC 7C 00 1A 14 */ add r0, r0, r3 -/* 80075AD0 B0 08 00 02 */ sth r0, 2(r8) -/* 80075AD4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s b/asm/d/bg/d_bg_s/dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s deleted file mode 100644 index c70d7ad6354..00000000000 --- a/asm/d/bg/d_bg_s/dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80075B44: -/* 80075B44 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075B48 7C 08 02 A6 */ mflr r0 -/* 80075B4C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075B50 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80075B54 7C FF 3B 78 */ mr r31, r7 -/* 80075B58 38 81 00 08 */ addi r4, r1, 8 -/* 80075B5C 48 00 56 21 */ bl GetTrans__4cBgWCFP4cXyz -/* 80075B60 7F E3 FB 78 */ mr r3, r31 -/* 80075B64 38 81 00 08 */ addi r4, r1, 8 -/* 80075B68 7F E5 FB 78 */ mr r5, r31 -/* 80075B6C 48 2D 15 25 */ bl PSVECAdd -/* 80075B70 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80075B74 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075B78 7C 08 03 A6 */ mtlr r0 -/* 80075B7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075B80 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s b/asm/d/bg/d_bg_s/dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s deleted file mode 100644 index e6bf1ad58f5..00000000000 --- a/asm/d/bg/d_bg_s/dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80075AD8: -/* 80075AD8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80075ADC 7C 08 02 A6 */ mflr r0 -/* 80075AE0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80075AE4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075AE8 48 2E C6 E5 */ bl _savegpr_25 -/* 80075AEC 7C 79 1B 78 */ mr r25, r3 -/* 80075AF0 7C 9A 23 78 */ mr r26, r4 -/* 80075AF4 7C BB 2B 78 */ mr r27, r5 -/* 80075AF8 7C DC 33 78 */ mr r28, r6 -/* 80075AFC 7C FD 3B 78 */ mr r29, r7 -/* 80075B00 7D 1E 43 78 */ mr r30, r8 -/* 80075B04 7D 3F 4B 78 */ mr r31, r9 -/* 80075B08 4B FF FF 1D */ bl dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz -/* 80075B0C 7F 23 CB 78 */ mr r3, r25 -/* 80075B10 7F 44 D3 78 */ mr r4, r26 -/* 80075B14 7F 65 DB 78 */ mr r5, r27 -/* 80075B18 7F 86 E3 78 */ mr r6, r28 -/* 80075B1C 7F A7 EB 78 */ mr r7, r29 -/* 80075B20 7F C8 F3 78 */ mr r8, r30 -/* 80075B24 7F E9 FB 78 */ mr r9, r31 -/* 80075B28 4B FF FF 7D */ bl dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz -/* 80075B2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075B30 48 2E C6 E9 */ bl _restgpr_25 -/* 80075B34 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80075B38 7C 08 03 A6 */ mtlr r0 -/* 80075B3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80075B40 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s b/asm/d/bg/d_bg_s/dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s deleted file mode 100644 index bfa60cd0f24..00000000000 --- a/asm/d/bg/d_bg_s/dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80075A24: -/* 80075A24 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80075A28 7C 08 02 A6 */ mflr r0 -/* 80075A2C 90 01 00 64 */ stw r0, 0x64(r1) -/* 80075A30 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 80075A34 93 C1 00 58 */ stw r30, 0x58(r1) -/* 80075A38 7C 7E 1B 78 */ mr r30, r3 -/* 80075A3C 7C FF 3B 78 */ mr r31, r7 -/* 80075A40 38 7E 00 1C */ addi r3, r30, 0x1c -/* 80075A44 38 81 00 20 */ addi r4, r1, 0x20 -/* 80075A48 48 2D 0B 69 */ bl PSMTXInverse -/* 80075A4C 28 03 00 00 */ cmplwi r3, 0 -/* 80075A50 41 82 00 3C */ beq lbl_80075A8C -/* 80075A54 38 61 00 20 */ addi r3, r1, 0x20 -/* 80075A58 7F E4 FB 78 */ mr r4, r31 -/* 80075A5C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80075A60 48 2D 13 0D */ bl PSMTXMultVec -/* 80075A64 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 80075A68 38 81 00 14 */ addi r4, r1, 0x14 -/* 80075A6C 38 A1 00 08 */ addi r5, r1, 8 -/* 80075A70 48 2D 12 FD */ bl PSMTXMultVec -/* 80075A74 C0 01 00 08 */ lfs f0, 8(r1) -/* 80075A78 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80075A7C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80075A80 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80075A84 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80075A88 D0 1F 00 08 */ stfs f0, 8(r31) -lbl_80075A8C: -/* 80075A8C 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 80075A90 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 80075A94 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80075A98 7C 08 03 A6 */ mtlr r0 -/* 80075A9C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80075AA0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/CalcMovePosWork__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/CalcMovePosWork__9dBgS_AcchFv.s deleted file mode 100644 index ab5d6efa06c..00000000000 --- a/asm/d/bg/d_bg_s_acch/CalcMovePosWork__9dBgS_AcchFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_800772E8: -/* 800772E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800772EC 7C 08 02 A6 */ mflr r0 -/* 800772F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800772F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800772F8 7C 7F 1B 78 */ mr r31, r3 -/* 800772FC 4B FF FC C5 */ bl SetWallCir__9dBgS_AcchFv -/* 80077300 38 7F 00 44 */ addi r3, r31, 0x44 -/* 80077304 80 9F 00 34 */ lwz r4, 0x34(r31) -/* 80077308 80 BF 00 30 */ lwz r5, 0x30(r31) -/* 8007730C 48 1F 7F DD */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz -/* 80077310 7F E3 FB 78 */ mr r3, r31 -/* 80077314 4B FF FD 29 */ bl CalcWallBmdCyl__9dBgS_AcchFv -/* 80077318 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007731C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077320 7C 08 03 A6 */ mtlr r0 -/* 80077324 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077328 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/CalcWallRR__12dBgS_AcchCirFv.s b/asm/d/bg/d_bg_s_acch/CalcWallRR__12dBgS_AcchCirFv.s deleted file mode 100644 index 320fa965f6f..00000000000 --- a/asm/d/bg/d_bg_s_acch/CalcWallRR__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80075F48: -/* 80075F48 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 80075F4C EC 00 00 32 */ fmuls f0, f0, f0 -/* 80075F50 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80075F54 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/CalcWallRR__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/CalcWallRR__9dBgS_AcchFv.s deleted file mode 100644 index b2f1216965c..00000000000 --- a/asm/d/bg/d_bg_s_acch/CalcWallRR__9dBgS_AcchFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8007732C: -/* 8007732C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80077330 7C 08 02 A6 */ mflr r0 -/* 80077334 90 01 00 24 */ stw r0, 0x24(r1) -/* 80077338 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007733C 48 2E AE A1 */ bl _savegpr_29 -/* 80077340 7C 7D 1B 78 */ mr r29, r3 -/* 80077344 3B C0 00 00 */ li r30, 0 -/* 80077348 3B E0 00 00 */ li r31, 0 -/* 8007734C 48 00 00 18 */ b lbl_80077364 -lbl_80077350: -/* 80077350 80 1D 00 8C */ lwz r0, 0x8c(r29) -/* 80077354 7C 60 FA 14 */ add r3, r0, r31 -/* 80077358 4B FF EB F1 */ bl CalcWallRR__12dBgS_AcchCirFv -/* 8007735C 3B DE 00 01 */ addi r30, r30, 1 -/* 80077360 3B FF 00 40 */ addi r31, r31, 0x40 -lbl_80077364: -/* 80077364 80 1D 00 88 */ lwz r0, 0x88(r29) -/* 80077368 7C 1E 00 00 */ cmpw r30, r0 -/* 8007736C 41 80 FF E4 */ blt lbl_80077350 -/* 80077370 39 61 00 20 */ addi r11, r1, 0x20 -/* 80077374 48 2E AE B5 */ bl _restgpr_29 -/* 80077378 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8007737C 7C 08 03 A6 */ mtlr r0 -/* 80077380 38 21 00 20 */ addi r1, r1, 0x20 -/* 80077384 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/ChkGndThinCellingOff__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/ChkGndThinCellingOff__9dBgS_AcchFv.s deleted file mode 100644 index 85c5a9836b8..00000000000 --- a/asm/d/bg/d_bg_s_acch/ChkGndThinCellingOff__9dBgS_AcchFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800773E0: -/* 800773E0 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800773E4 54 03 5F FE */ rlwinm r3, r0, 0xb, 0x1f, 0x1f -/* 800773E8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/ChkLineDown__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/ChkLineDown__9dBgS_AcchFv.s deleted file mode 100644 index a5a5bdebb6e..00000000000 --- a/asm/d/bg/d_bg_s_acch/ChkLineDown__9dBgS_AcchFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80077408: -/* 80077408 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 8007740C 54 03 4F FE */ rlwinm r3, r0, 9, 0x1f, 0x1f -/* 80077410 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/ChkWallSort__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/ChkWallSort__9dBgS_AcchFv.s deleted file mode 100644 index ab0dfa76a83..00000000000 --- a/asm/d/bg/d_bg_s_acch/ChkWallSort__9dBgS_AcchFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800773FC: -/* 800773FC 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80077400 54 03 57 FE */ rlwinm r3, r0, 0xa, 0x1f, 0x1f -/* 80077404 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/ClrGndThinCellingOff__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/ClrGndThinCellingOff__9dBgS_AcchFv.s deleted file mode 100644 index b640fdecfba..00000000000 --- a/asm/d/bg/d_bg_s_acch/ClrGndThinCellingOff__9dBgS_AcchFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800773D0: -/* 800773D0 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800773D4 54 00 02 D2 */ rlwinm r0, r0, 0, 0xb, 9 -/* 800773D8 90 03 00 2C */ stw r0, 0x2c(r3) -/* 800773DC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/ClrMoveBGOnly__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/ClrMoveBGOnly__9dBgS_AcchFv.s deleted file mode 100644 index 32842b048e4..00000000000 --- a/asm/d/bg/d_bg_s_acch/ClrMoveBGOnly__9dBgS_AcchFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800773A4: -/* 800773A4 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800773A8 54 00 03 14 */ rlwinm r0, r0, 0, 0xc, 0xa -/* 800773AC 90 03 00 2C */ stw r0, 0x2c(r3) -/* 800773B0 80 03 01 D0 */ lwz r0, 0x1d0(r3) -/* 800773B4 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 800773B8 90 03 01 D0 */ stw r0, 0x1d0(r3) -/* 800773BC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/ClrWallHit__12dBgS_AcchCirFv.s b/asm/d/bg/d_bg_s_acch/ClrWallHit__12dBgS_AcchCirFv.s deleted file mode 100644 index a03dc95b5d3..00000000000 --- a/asm/d/bg/d_bg_s_acch/ClrWallHit__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80075F14: -/* 80075F14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80075F18 7C 08 02 A6 */ mflr r0 -/* 80075F1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80075F20 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80075F24 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80075F28 90 03 00 10 */ stw r0, 0x10(r3) -/* 80075F2C 48 1F 21 F5 */ bl ClearPi__13cBgS_PolyInfoFv -/* 80075F30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80075F34 7C 08 03 A6 */ mtlr r0 -/* 80075F38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80075F3C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/GetSpeedY__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/GetSpeedY__9dBgS_AcchFv.s deleted file mode 100644 index b029d2fa222..00000000000 --- a/asm/d/bg/d_bg_s_acch/GetSpeedY__9dBgS_AcchFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800771E4: -/* 800771E4 80 63 00 38 */ lwz r3, 0x38(r3) -/* 800771E8 28 03 00 00 */ cmplwi r3, 0 -/* 800771EC 41 82 00 0C */ beq lbl_800771F8 -/* 800771F0 C0 23 00 04 */ lfs f1, 4(r3) -/* 800771F4 4E 80 00 20 */ blr -lbl_800771F8: -/* 800771F8 C0 22 8C C0 */ lfs f1, lit_4025(r2) -/* 800771FC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/GetWallAllLowH_R__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/GetWallAllLowH_R__9dBgS_AcchFv.s deleted file mode 100644 index 5071d4f9c93..00000000000 --- a/asm/d/bg/d_bg_s_acch/GetWallAllLowH_R__9dBgS_AcchFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80077178: -/* 80077178 80 83 00 88 */ lwz r4, 0x88(r3) -/* 8007717C 2C 04 00 00 */ cmpwi r4, 0 -/* 80077180 41 81 00 0C */ bgt lbl_8007718C -/* 80077184 C0 22 8C C0 */ lfs f1, lit_4025(r2) -/* 80077188 4E 80 00 20 */ blr -lbl_8007718C: -/* 8007718C 38 C0 00 00 */ li r6, 0 -/* 80077190 80 A3 00 8C */ lwz r5, 0x8c(r3) -/* 80077194 C0 25 00 30 */ lfs f1, 0x30(r5) -/* 80077198 38 E0 00 01 */ li r7, 1 -/* 8007719C 38 60 00 40 */ li r3, 0x40 -/* 800771A0 38 04 FF FF */ addi r0, r4, -1 -/* 800771A4 7C 09 03 A6 */ mtctr r0 -/* 800771A8 2C 04 00 01 */ cmpwi r4, 1 -/* 800771AC 40 81 00 28 */ ble lbl_800771D4 -lbl_800771B0: -/* 800771B0 38 03 00 30 */ addi r0, r3, 0x30 -/* 800771B4 7C 05 04 2E */ lfsx f0, r5, r0 -/* 800771B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800771BC 40 81 00 0C */ ble lbl_800771C8 -/* 800771C0 FC 20 00 90 */ fmr f1, f0 -/* 800771C4 7C E6 3B 78 */ mr r6, r7 -lbl_800771C8: -/* 800771C8 38 E7 00 01 */ addi r7, r7, 1 -/* 800771CC 38 63 00 40 */ addi r3, r3, 0x40 -/* 800771D0 42 00 FF E0 */ bdnz lbl_800771B0 -lbl_800771D4: -/* 800771D4 54 C3 30 32 */ slwi r3, r6, 6 -/* 800771D8 38 03 00 34 */ addi r0, r3, 0x34 -/* 800771DC 7C 25 04 2E */ lfsx f1, r5, r0 -/* 800771E0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/GetWallAllLowH__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/GetWallAllLowH__9dBgS_AcchFv.s deleted file mode 100644 index b735697687a..00000000000 --- a/asm/d/bg/d_bg_s_acch/GetWallAllLowH__9dBgS_AcchFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80077128: -/* 80077128 80 83 00 88 */ lwz r4, 0x88(r3) -/* 8007712C 2C 04 00 00 */ cmpwi r4, 0 -/* 80077130 41 81 00 0C */ bgt lbl_8007713C -/* 80077134 C0 22 8C C0 */ lfs f1, lit_4025(r2) -/* 80077138 4E 80 00 20 */ blr -lbl_8007713C: -/* 8007713C 80 A3 00 8C */ lwz r5, 0x8c(r3) -/* 80077140 C0 25 00 30 */ lfs f1, 0x30(r5) -/* 80077144 38 60 00 40 */ li r3, 0x40 -/* 80077148 38 04 FF FF */ addi r0, r4, -1 -/* 8007714C 7C 09 03 A6 */ mtctr r0 -/* 80077150 2C 04 00 01 */ cmpwi r4, 1 -/* 80077154 4C 81 00 20 */ blelr -lbl_80077158: -/* 80077158 38 03 00 30 */ addi r0, r3, 0x30 -/* 8007715C 7C 05 04 2E */ lfsx f0, r5, r0 -/* 80077160 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80077164 40 81 00 08 */ ble lbl_8007716C -/* 80077168 FC 20 00 90 */ fmr f1, f0 -lbl_8007716C: -/* 8007716C 38 63 00 40 */ addi r3, r3, 0x40 -/* 80077170 42 00 FF E8 */ bdnz lbl_80077158 -/* 80077174 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/GetWallAllR__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/GetWallAllR__9dBgS_AcchFv.s deleted file mode 100644 index 004b5f1524a..00000000000 --- a/asm/d/bg/d_bg_s_acch/GetWallAllR__9dBgS_AcchFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80076F84: -/* 80076F84 C0 22 8C C0 */ lfs f1, lit_4025(r2) -/* 80076F88 38 80 00 00 */ li r4, 0 -/* 80076F8C 80 03 00 88 */ lwz r0, 0x88(r3) -/* 80076F90 7C 09 03 A6 */ mtctr r0 -/* 80076F94 2C 00 00 00 */ cmpwi r0, 0 -/* 80076F98 4C 81 00 20 */ blelr -lbl_80076F9C: -/* 80076F9C 80 A3 00 8C */ lwz r5, 0x8c(r3) -/* 80076FA0 38 04 00 34 */ addi r0, r4, 0x34 -/* 80076FA4 7C 05 04 2E */ lfsx f0, r5, r0 -/* 80076FA8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80076FAC 40 80 00 08 */ bge lbl_80076FB4 -/* 80076FB0 FC 20 00 90 */ fmr f1, f0 -lbl_80076FB4: -/* 80076FB4 38 84 00 40 */ addi r4, r4, 0x40 -/* 80076FB8 42 00 FF E4 */ bdnz lbl_80076F9C -/* 80076FBC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/GroundCheckInit__9dBgS_AcchFR4dBgS.s b/asm/d/bg/d_bg_s_acch/GroundCheckInit__9dBgS_AcchFR4dBgS.s deleted file mode 100644 index 468a85eb6b7..00000000000 --- a/asm/d/bg/d_bg_s_acch/GroundCheckInit__9dBgS_AcchFR4dBgS.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800762D8: -/* 800762D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800762DC 7C 08 02 A6 */ mflr r0 -/* 800762E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800762E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800762E8 7C 7F 1B 78 */ mr r31, r3 -/* 800762EC 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800762F0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800762F4 40 82 00 48 */ bne lbl_8007633C -/* 800762F8 C0 02 8C C4 */ lfs f0, lit_4089(r2) -/* 800762FC D0 1F 00 98 */ stfs f0, 0x98(r31) -/* 80076300 38 7F 00 DC */ addi r3, r31, 0xdc -/* 80076304 7F E4 FB 78 */ mr r4, r31 -/* 80076308 48 1F 18 B1 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk -/* 8007630C 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 80076310 54 00 DF FE */ rlwinm r0, r0, 0x1b, 0x1f, 0x1f -/* 80076314 98 1F 00 B4 */ stb r0, 0xb4(r31) -/* 80076318 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 8007631C 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 -/* 80076320 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 80076324 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 80076328 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 -/* 8007632C 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 80076330 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 80076334 54 00 06 2C */ rlwinm r0, r0, 0, 0x18, 0x16 -/* 80076338 90 1F 00 2C */ stw r0, 0x2c(r31) -lbl_8007633C: -/* 8007633C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80076340 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80076344 7C 08 03 A6 */ mtlr r0 -/* 80076348 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007634C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/GroundRoofProc__9dBgS_AcchFR4dBgS.s b/asm/d/bg/d_bg_s_acch/GroundRoofProc__9dBgS_AcchFR4dBgS.s deleted file mode 100644 index a1267ba90dc..00000000000 --- a/asm/d/bg/d_bg_s_acch/GroundRoofProc__9dBgS_AcchFR4dBgS.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_8007654C: -/* 8007654C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80076550 7C 08 02 A6 */ mflr r0 -/* 80076554 90 01 00 24 */ stw r0, 0x24(r1) -/* 80076558 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8007655C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80076560 7C 7E 1B 78 */ mr r30, r3 -/* 80076564 7C 9F 23 78 */ mr r31, r4 -/* 80076568 C0 22 8C C4 */ lfs f1, lit_4089(r2) -/* 8007656C C0 03 00 98 */ lfs f0, 0x98(r3) -/* 80076570 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80076574 41 82 00 98 */ beq lbl_8007660C -/* 80076578 C0 1E 00 BC */ lfs f0, 0xbc(r30) -/* 8007657C C0 3E 00 CC */ lfs f1, 0xcc(r30) -/* 80076580 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80076584 40 80 00 18 */ bge lbl_8007659C -/* 80076588 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 8007658C C0 03 00 04 */ lfs f0, 4(r3) -/* 80076590 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80076594 40 80 00 08 */ bge lbl_8007659C -/* 80076598 D0 23 00 04 */ stfs f1, 4(r3) -lbl_8007659C: -/* 8007659C 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 800765A0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 800765A4 40 82 00 68 */ bne lbl_8007660C -/* 800765A8 C0 3E 00 98 */ lfs f1, 0x98(r30) -/* 800765AC C0 1E 00 C4 */ lfs f0, 0xc4(r30) -/* 800765B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800765B4 4C 41 13 82 */ cror 2, 1, 2 -/* 800765B8 40 82 00 54 */ bne lbl_8007660C -/* 800765BC 38 7E 01 40 */ addi r3, r30, 0x140 -/* 800765C0 7F C4 F3 78 */ mr r4, r30 -/* 800765C4 48 1F 15 F5 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk -/* 800765C8 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 800765CC 54 00 05 EA */ rlwinm r0, r0, 0, 0x17, 0x15 -/* 800765D0 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 800765D4 80 7E 00 30 */ lwz r3, 0x30(r30) -/* 800765D8 C0 43 00 00 */ lfs f2, 0(r3) -/* 800765DC D0 41 00 08 */ stfs f2, 8(r1) -/* 800765E0 C0 23 00 04 */ lfs f1, 4(r3) -/* 800765E4 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 800765E8 C0 03 00 08 */ lfs f0, 8(r3) -/* 800765EC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800765F0 D0 5E 01 6C */ stfs f2, 0x16c(r30) -/* 800765F4 D0 3E 01 70 */ stfs f1, 0x170(r30) -/* 800765F8 D0 1E 01 74 */ stfs f0, 0x174(r30) -/* 800765FC 7F E3 FB 78 */ mr r3, r31 -/* 80076600 38 9E 01 30 */ addi r4, r30, 0x130 -/* 80076604 4B FF EE 99 */ bl RoofChk__4dBgSFP12dBgS_RoofChk -/* 80076608 D0 3E 00 C4 */ stfs f1, 0xc4(r30) -lbl_8007660C: -/* 8007660C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80076610 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80076614 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80076618 7C 08 03 A6 */ mtlr r0 -/* 8007661C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80076620 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/Init__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/Init__9dBgS_AcchFv.s deleted file mode 100644 index 87bbf492466..00000000000 --- a/asm/d/bg/d_bg_s_acch/Init__9dBgS_AcchFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800761CC: -/* 800761CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800761D0 7C 08 02 A6 */ mflr r0 -/* 800761D4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800761D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800761DC 48 2E C0 01 */ bl _savegpr_29 -/* 800761E0 7C 7D 1B 78 */ mr r29, r3 -/* 800761E4 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800761E8 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 800761EC 90 03 00 2C */ stw r0, 0x2c(r3) -/* 800761F0 3B C0 00 00 */ li r30, 0 -/* 800761F4 3B E0 00 00 */ li r31, 0 -/* 800761F8 48 00 00 2C */ b lbl_80076224 -lbl_800761FC: -/* 800761FC 80 1D 00 8C */ lwz r0, 0x8c(r29) -/* 80076200 7C 60 FA 14 */ add r3, r0, r31 -/* 80076204 4B FF FD 11 */ bl ClrWallHit__12dBgS_AcchCirFv -/* 80076208 80 9D 00 8C */ lwz r4, 0x8c(r29) -/* 8007620C 38 7F 00 10 */ addi r3, r31, 0x10 -/* 80076210 7C 04 18 2E */ lwzx r0, r4, r3 -/* 80076214 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 80076218 7C 04 19 2E */ stwx r0, r4, r3 -/* 8007621C 3B DE 00 01 */ addi r30, r30, 1 -/* 80076220 3B FF 00 40 */ addi r31, r31, 0x40 -lbl_80076224: -/* 80076224 80 1D 00 88 */ lwz r0, 0x88(r29) -/* 80076228 7C 1E 00 00 */ cmpw r30, r0 -/* 8007622C 41 80 FF D0 */ blt lbl_800761FC -/* 80076230 39 61 00 20 */ addi r11, r1, 0x20 -/* 80076234 48 2E BF F5 */ bl _restgpr_29 -/* 80076238 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8007623C 7C 08 03 A6 */ mtlr r0 -/* 80076240 38 21 00 20 */ addi r1, r1, 0x20 -/* 80076244 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/OnWallSort__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/OnWallSort__9dBgS_AcchFv.s deleted file mode 100644 index d59e39be32e..00000000000 --- a/asm/d/bg/d_bg_s_acch/OnWallSort__9dBgS_AcchFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800773EC: -/* 800773EC 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800773F0 64 00 00 40 */ oris r0, r0, 0x40 -/* 800773F4 90 03 00 2C */ stw r0, 0x2c(r3) -/* 800773F8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/SetGndThinCellingOff__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/SetGndThinCellingOff__9dBgS_AcchFv.s deleted file mode 100644 index c05820cd019..00000000000 --- a/asm/d/bg/d_bg_s_acch/SetGndThinCellingOff__9dBgS_AcchFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800773C0: -/* 800773C0 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 800773C4 64 00 00 20 */ oris r0, r0, 0x20 -/* 800773C8 90 03 00 2C */ stw r0, 0x2c(r3) -/* 800773CC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/SetGroundUpY__9dBgS_AcchFf.s b/asm/d/bg/d_bg_s_acch/SetGroundUpY__9dBgS_AcchFf.s deleted file mode 100644 index f4f35a98223..00000000000 --- a/asm/d/bg/d_bg_s_acch/SetGroundUpY__9dBgS_AcchFf.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80077114: -/* 80077114 C0 03 00 90 */ lfs f0, 0x90(r3) -/* 80077118 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8007711C D0 03 00 94 */ stfs f0, 0x94(r3) -/* 80077120 D0 23 00 90 */ stfs f1, 0x90(r3) -/* 80077124 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/SetMoveBGOnly__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/SetMoveBGOnly__9dBgS_AcchFv.s deleted file mode 100644 index 17ef6ca2c0b..00000000000 --- a/asm/d/bg/d_bg_s_acch/SetMoveBGOnly__9dBgS_AcchFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80077388: -/* 80077388 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 8007738C 64 00 00 10 */ oris r0, r0, 0x10 -/* 80077390 90 03 00 2C */ stw r0, 0x2c(r3) -/* 80077394 80 03 01 D0 */ lwz r0, 0x1d0(r3) -/* 80077398 60 00 00 04 */ ori r0, r0, 4 -/* 8007739C 90 03 01 D0 */ stw r0, 0x1d0(r3) -/* 800773A0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/SetNowActorInfo__9dBgS_AcchFiPvUi.s b/asm/d/bg/d_bg_s_acch/SetNowActorInfo__9dBgS_AcchFiPvUi.s deleted file mode 100644 index 85e37315cfc..00000000000 --- a/asm/d/bg/d_bg_s_acch/SetNowActorInfo__9dBgS_AcchFiPvUi.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80077278: -/* 80077278 90 83 00 78 */ stw r4, 0x78(r3) -/* 8007727C 90 A3 00 7C */ stw r5, 0x7c(r3) -/* 80077280 90 C3 00 80 */ stw r6, 0x80(r3) -/* 80077284 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/SetWallCir__9dBgS_AcchFv.s b/asm/d/bg/d_bg_s_acch/SetWallCir__9dBgS_AcchFv.s deleted file mode 100644 index 8ef21f7b076..00000000000 --- a/asm/d/bg/d_bg_s_acch/SetWallCir__9dBgS_AcchFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80076FC0: -/* 80076FC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80076FC4 7C 08 02 A6 */ mflr r0 -/* 80076FC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80076FCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80076FD0 48 2E B2 0D */ bl _savegpr_29 -/* 80076FD4 7C 7D 1B 78 */ mr r29, r3 -/* 80076FD8 3B C0 00 00 */ li r30, 0 -/* 80076FDC 3B E0 00 00 */ li r31, 0 -/* 80076FE0 48 00 00 38 */ b lbl_80077018 -lbl_80076FE4: -/* 80076FE4 80 BD 00 30 */ lwz r5, 0x30(r29) -/* 80076FE8 80 1D 00 8C */ lwz r0, 0x8c(r29) -/* 80076FEC 7C 80 FA 14 */ add r4, r0, r31 -/* 80076FF0 38 64 00 14 */ addi r3, r4, 0x14 -/* 80076FF4 C0 25 00 00 */ lfs f1, 0(r5) -/* 80076FF8 C0 45 00 08 */ lfs f2, 8(r5) -/* 80076FFC C0 65 00 04 */ lfs f3, 4(r5) -/* 80077000 C0 04 00 30 */ lfs f0, 0x30(r4) -/* 80077004 EC 63 00 2A */ fadds f3, f3, f0 -/* 80077008 C0 84 00 34 */ lfs f4, 0x34(r4) -/* 8007700C 48 1F 7F 69 */ bl Set__8cM3dGCirFffff -/* 80077010 3B DE 00 01 */ addi r30, r30, 1 -/* 80077014 3B FF 00 40 */ addi r31, r31, 0x40 -lbl_80077018: -/* 80077018 80 1D 00 88 */ lwz r0, 0x88(r29) -/* 8007701C 7C 1E 00 00 */ cmpw r30, r0 -/* 80077020 41 80 FF C4 */ blt lbl_80076FE4 -/* 80077024 39 61 00 20 */ addi r11, r1, 0x20 -/* 80077028 48 2E B2 01 */ bl _restgpr_29 -/* 8007702C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80077030 7C 08 03 A6 */ mtlr r0 -/* 80077034 38 21 00 20 */ addi r1, r1, 0x20 -/* 80077038 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/SetWallHDirect__12dBgS_AcchCirFf.s b/asm/d/bg/d_bg_s_acch/SetWallHDirect__12dBgS_AcchCirFf.s deleted file mode 100644 index 80528e445a7..00000000000 --- a/asm/d/bg/d_bg_s_acch/SetWallHDirect__12dBgS_AcchCirFf.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80075F80: -/* 80075F80 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80075F84 60 00 00 04 */ ori r0, r0, 4 -/* 80075F88 90 03 00 10 */ stw r0, 0x10(r3) -/* 80075F8C D0 23 00 38 */ stfs f1, 0x38(r3) -/* 80075F90 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/SetWallPolyIndex__9dBgS_AcchFii.s b/asm/d/bg/d_bg_s_acch/SetWallPolyIndex__9dBgS_AcchFii.s deleted file mode 100644 index a5b24bf0350..00000000000 --- a/asm/d/bg/d_bg_s_acch/SetWallPolyIndex__9dBgS_AcchFii.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80077288: -/* 80077288 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8007728C 7C 08 02 A6 */ mflr r0 -/* 80077290 90 01 00 24 */ stw r0, 0x24(r1) -/* 80077294 39 61 00 20 */ addi r11, r1, 0x20 -/* 80077298 48 2E AF 45 */ bl _savegpr_29 -/* 8007729C 7C 7D 1B 78 */ mr r29, r3 -/* 800772A0 7C BE 2B 78 */ mr r30, r5 -/* 800772A4 80 03 00 8C */ lwz r0, 0x8c(r3) -/* 800772A8 54 9F 30 32 */ slwi r31, r4, 6 -/* 800772AC 7C 60 FA 14 */ add r3, r0, r31 -/* 800772B0 80 9D 00 78 */ lwz r4, 0x78(r29) -/* 800772B4 80 BD 00 7C */ lwz r5, 0x7c(r29) -/* 800772B8 80 DD 00 80 */ lwz r6, 0x80(r29) -/* 800772BC 48 1F 0E B1 */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi -/* 800772C0 80 1D 00 8C */ lwz r0, 0x8c(r29) -/* 800772C4 7C 60 FA 14 */ add r3, r0, r31 -/* 800772C8 7F C4 F3 78 */ mr r4, r30 -/* 800772CC 48 1F 0E D9 */ bl SetPolyIndex__13cBgS_PolyInfoFi -/* 800772D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800772D4 48 2E AF 55 */ bl _restgpr_29 -/* 800772D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800772DC 7C 08 03 A6 */ mtlr r0 -/* 800772E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800772E4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/SetWallR__12dBgS_AcchCirFf.s b/asm/d/bg/d_bg_s_acch/SetWallR__12dBgS_AcchCirFf.s deleted file mode 100644 index 1341fbafd29..00000000000 --- a/asm/d/bg/d_bg_s_acch/SetWallR__12dBgS_AcchCirFf.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80075F40: -/* 80075F40 D0 23 00 34 */ stfs f1, 0x34(r3) -/* 80075F44 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/SetWall__12dBgS_AcchCirFff.s b/asm/d/bg/d_bg_s_acch/SetWall__12dBgS_AcchCirFff.s deleted file mode 100644 index 3abebce89ad..00000000000 --- a/asm/d/bg/d_bg_s_acch/SetWall__12dBgS_AcchCirFff.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80075F58: -/* 80075F58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80075F5C 7C 08 02 A6 */ mflr r0 -/* 80075F60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80075F64 D0 23 00 30 */ stfs f1, 0x30(r3) -/* 80075F68 FC 20 10 90 */ fmr f1, f2 -/* 80075F6C 4B FF FF D5 */ bl SetWallR__12dBgS_AcchCirFf -/* 80075F70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80075F74 7C 08 03 A6 */ mtlr r0 -/* 80075F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80075F7C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir.s b/asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir.s deleted file mode 100644 index 1e5cbe4a11c..00000000000 --- a/asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80076288: -/* 80076288 90 A3 00 88 */ stw r5, 0x88(r3) -/* 8007628C 90 C3 00 8C */ stw r6, 0x8c(r3) -/* 80076290 90 83 00 84 */ stw r4, 0x84(r3) -/* 80076294 28 04 00 00 */ cmplwi r4, 0 -/* 80076298 41 82 00 0C */ beq lbl_800762A4 -/* 8007629C 80 04 00 04 */ lwz r0, 4(r4) -/* 800762A0 48 00 00 08 */ b lbl_800762A8 -lbl_800762A4: -/* 800762A4 38 00 FF FF */ li r0, -1 -lbl_800762A8: -/* 800762A8 90 03 00 08 */ stw r0, 8(r3) -/* 800762AC 38 04 04 D0 */ addi r0, r4, 0x4d0 -/* 800762B0 90 03 00 30 */ stw r0, 0x30(r3) -/* 800762B4 38 04 04 BC */ addi r0, r4, 0x4bc -/* 800762B8 90 03 00 34 */ stw r0, 0x34(r3) -/* 800762BC 38 04 04 F8 */ addi r0, r4, 0x4f8 -/* 800762C0 90 03 00 38 */ stw r0, 0x38(r3) -/* 800762C4 38 04 04 DC */ addi r0, r4, 0x4dc -/* 800762C8 90 03 00 3C */ stw r0, 0x3c(r3) -/* 800762CC 38 04 04 E4 */ addi r0, r4, 0x4e4 -/* 800762D0 90 03 00 40 */ stw r0, 0x40(r3) -/* 800762D4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz.s b/asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz.s deleted file mode 100644 index d53fb093128..00000000000 --- a/asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80076248: -/* 80076248 81 61 00 08 */ lwz r11, 8(r1) -/* 8007624C 90 83 00 30 */ stw r4, 0x30(r3) -/* 80076250 90 A3 00 34 */ stw r5, 0x34(r3) -/* 80076254 90 C3 00 84 */ stw r6, 0x84(r3) -/* 80076258 28 06 00 00 */ cmplwi r6, 0 -/* 8007625C 41 82 00 0C */ beq lbl_80076268 -/* 80076260 80 06 00 04 */ lwz r0, 4(r6) -/* 80076264 48 00 00 08 */ b lbl_8007626C -lbl_80076268: -/* 80076268 38 00 FF FF */ li r0, -1 -lbl_8007626C: -/* 8007626C 90 03 00 08 */ stw r0, 8(r3) -/* 80076270 91 23 00 38 */ stw r9, 0x38(r3) -/* 80076274 90 E3 00 88 */ stw r7, 0x88(r3) -/* 80076278 91 03 00 8C */ stw r8, 0x8c(r3) -/* 8007627C 91 43 00 3C */ stw r10, 0x3c(r3) -/* 80076280 91 63 00 40 */ stw r11, 0x40(r3) -/* 80076284 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_acch/__ct__12dBgS_AcchCirFv.s b/asm/d/bg/d_bg_s_acch/__ct__12dBgS_AcchCirFv.s deleted file mode 100644 index 3004019517b..00000000000 --- a/asm/d/bg/d_bg_s_acch/__ct__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80075EAC: -/* 80075EAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80075EB0 7C 08 02 A6 */ mflr r0 -/* 80075EB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80075EB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80075EBC 7C 7F 1B 78 */ mr r31, r3 -/* 80075EC0 48 1F 21 B5 */ bl __ct__13cBgS_PolyInfoFv -/* 80075EC4 3C 60 80 3B */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x803AB664@ha */ -/* 80075EC8 38 03 B6 64 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x803AB664@l */ -/* 80075ECC 90 1F 00 0C */ stw r0, 0xc(r31) -/* 80075ED0 38 7F 00 14 */ addi r3, r31, 0x14 -/* 80075ED4 48 1F 8F E1 */ bl __ct__8cM3dGCirFv -/* 80075ED8 38 00 00 00 */ li r0, 0 -/* 80075EDC 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80075EE0 C0 02 8C C0 */ lfs f0, lit_4025(r2) -/* 80075EE4 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 80075EE8 D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 80075EEC D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 80075EF0 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 80075EF4 B0 1F 00 3C */ sth r0, 0x3c(r31) -/* 80075EF8 D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 80075EFC 7F E3 FB 78 */ mr r3, r31 -/* 80075F00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80075F04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80075F08 7C 08 03 A6 */ mtlr r0 -/* 80075F0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80075F10 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_chk/GetGrpPassChkInfo__8dBgS_ChkFv.s b/asm/d/bg/d_bg_s_chk/GetGrpPassChkInfo__8dBgS_ChkFv.s deleted file mode 100644 index 55dfb149a9d..00000000000 --- a/asm/d/bg/d_bg_s_chk/GetGrpPassChkInfo__8dBgS_ChkFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80077564: -/* 80077564 28 03 00 00 */ cmplwi r3, 0 -/* 80077568 4D 82 00 20 */ beqlr -/* 8007756C 38 63 00 10 */ addi r3, r3, 0x10 -/* 80077570 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_chk/__ct__8dBgS_ChkFv.s b/asm/d/bg/d_bg_s_chk/__ct__8dBgS_ChkFv.s deleted file mode 100644 index 557ead99812..00000000000 --- a/asm/d/bg/d_bg_s_chk/__ct__8dBgS_ChkFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8007749C: -/* 8007749C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800774A0 7C 08 02 A6 */ mflr r0 -/* 800774A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800774A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800774AC 7C 7F 1B 78 */ mr r31, r3 -/* 800774B0 48 00 18 B5 */ bl __ct__16dBgS_PolyPassChkFv -/* 800774B4 38 7F 00 10 */ addi r3, r31, 0x10 -/* 800774B8 48 00 06 E9 */ bl __ct__15dBgS_GrpPassChkFv -/* 800774BC 3C 60 80 3B */ lis r3, __vt__8dBgS_Chk@ha /* 0x803AB670@ha */ -/* 800774C0 38 63 B6 70 */ addi r3, r3, __vt__8dBgS_Chk@l /* 0x803AB670@l */ -/* 800774C4 90 7F 00 00 */ stw r3, 0(r31) -/* 800774C8 38 03 00 0C */ addi r0, r3, 0xc -/* 800774CC 90 1F 00 10 */ stw r0, 0x10(r31) -/* 800774D0 7F E3 FB 78 */ mr r3, r31 -/* 800774D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800774D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800774DC 7C 08 03 A6 */ mtlr r0 -/* 800774E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800774E4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/__ct__11dBgS_GndChkFv.s b/asm/d/bg/d_bg_s_gnd_chk/__ct__11dBgS_GndChkFv.s deleted file mode 100644 index b26bd6be13a..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__ct__11dBgS_GndChkFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8007757C: -/* 8007757C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077580 7C 08 02 A6 */ mflr r0 -/* 80077584 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077588 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007758C 7C 7F 1B 78 */ mr r31, r3 -/* 80077590 48 1F 06 8D */ bl __ct__11cBgS_GndChkFv -/* 80077594 38 7F 00 3C */ addi r3, r31, 0x3c -/* 80077598 4B FF FF 05 */ bl __ct__8dBgS_ChkFv -/* 8007759C 3C 60 80 3B */ lis r3, __vt__11dBgS_GndChk@ha /* 0x803AB778@ha */ -/* 800775A0 38 63 B7 78 */ addi r3, r3, __vt__11dBgS_GndChk@l /* 0x803AB778@l */ -/* 800775A4 90 7F 00 10 */ stw r3, 0x10(r31) -/* 800775A8 38 03 00 0C */ addi r0, r3, 0xc -/* 800775AC 90 1F 00 20 */ stw r0, 0x20(r31) -/* 800775B0 38 03 00 18 */ addi r0, r3, 0x18 -/* 800775B4 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 800775B8 38 03 00 24 */ addi r0, r3, 0x24 -/* 800775BC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 800775C0 38 7F 00 3C */ addi r3, r31, 0x3c -/* 800775C4 4B FF FF 9D */ bl GetPolyPassChkInfo__8dBgS_ChkFv -/* 800775C8 90 7F 00 00 */ stw r3, 0(r31) -/* 800775CC 38 7F 00 3C */ addi r3, r31, 0x3c -/* 800775D0 4B FF FF 95 */ bl GetGrpPassChkInfo__8dBgS_ChkFv -/* 800775D4 90 7F 00 04 */ stw r3, 4(r31) -/* 800775D8 7F E3 FB 78 */ mr r3, r31 -/* 800775DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800775E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800775E4 7C 08 03 A6 */ mtlr r0 -/* 800775E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800775EC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_CamGndChk_WtrFv.s b/asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_CamGndChk_WtrFv.s deleted file mode 100644 index 09c0e862b5a..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_CamGndChk_WtrFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80077A00: -/* 80077A00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077A04 7C 08 02 A6 */ mflr r0 -/* 80077A08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077A0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077A10 7C 7F 1B 78 */ mr r31, r3 -/* 80077A14 4B FF FB 69 */ bl __ct__11dBgS_GndChkFv -/* 80077A18 3C 60 80 3B */ lis r3, __vt__14dBgS_CamGndChk@ha /* 0x803AB6B8@ha */ -/* 80077A1C 38 63 B6 B8 */ addi r3, r3, __vt__14dBgS_CamGndChk@l /* 0x803AB6B8@l */ -/* 80077A20 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80077A24 38 03 00 0C */ addi r0, r3, 0xc -/* 80077A28 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80077A2C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80077A30 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 80077A34 38 03 00 24 */ addi r0, r3, 0x24 -/* 80077A38 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80077A3C 38 7F 00 3C */ addi r3, r31, 0x3c -/* 80077A40 48 00 14 41 */ bl SetCam__16dBgS_PolyPassChkFv -/* 80077A44 3C 60 80 3B */ lis r3, __vt__18dBgS_CamGndChk_Wtr@ha /* 0x803AB688@ha */ -/* 80077A48 38 63 B6 88 */ addi r3, r3, __vt__18dBgS_CamGndChk_Wtr@l /* 0x803AB688@l */ -/* 80077A4C 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80077A50 38 03 00 0C */ addi r0, r3, 0xc -/* 80077A54 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80077A58 38 03 00 18 */ addi r0, r3, 0x18 -/* 80077A5C 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 80077A60 38 03 00 24 */ addi r0, r3, 0x24 -/* 80077A64 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80077A68 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 80077A6C 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80077A70 90 1F 00 50 */ stw r0, 0x50(r31) -/* 80077A74 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 80077A78 60 00 00 02 */ ori r0, r0, 2 -/* 80077A7C 90 1F 00 50 */ stw r0, 0x50(r31) -/* 80077A80 7F E3 FB 78 */ mr r3, r31 -/* 80077A84 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077A88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077A8C 7C 08 03 A6 */ mtlr r0 -/* 80077A90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077A94 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_SplFv.s b/asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_SplFv.s deleted file mode 100644 index 6a6e86e2f8e..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_SplFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_800777B0: -/* 800777B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800777B4 7C 08 02 A6 */ mflr r0 -/* 800777B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800777BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800777C0 7C 7F 1B 78 */ mr r31, r3 -/* 800777C4 4B FF FD B9 */ bl __ct__11dBgS_GndChkFv -/* 800777C8 3C 60 80 3A */ lis r3, __vt__14dBgS_ObjGndChk@ha /* 0x803A382C@ha */ -/* 800777CC 38 63 38 2C */ addi r3, r3, __vt__14dBgS_ObjGndChk@l /* 0x803A382C@l */ -/* 800777D0 90 7F 00 10 */ stw r3, 0x10(r31) -/* 800777D4 38 03 00 0C */ addi r0, r3, 0xc -/* 800777D8 90 1F 00 20 */ stw r0, 0x20(r31) -/* 800777DC 38 03 00 18 */ addi r0, r3, 0x18 -/* 800777E0 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 800777E4 38 03 00 24 */ addi r0, r3, 0x24 -/* 800777E8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 800777EC 38 7F 00 3C */ addi r3, r31, 0x3c -/* 800777F0 48 00 16 79 */ bl SetObj__16dBgS_PolyPassChkFv -/* 800777F4 3C 60 80 3B */ lis r3, __vt__18dBgS_ObjGndChk_Spl@ha /* 0x803AB718@ha */ -/* 800777F8 38 63 B7 18 */ addi r3, r3, __vt__18dBgS_ObjGndChk_Spl@l /* 0x803AB718@l */ -/* 800777FC 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80077800 38 03 00 0C */ addi r0, r3, 0xc -/* 80077804 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80077808 38 03 00 18 */ addi r0, r3, 0x18 -/* 8007780C 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 80077810 38 03 00 24 */ addi r0, r3, 0x24 -/* 80077814 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80077818 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 8007781C 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80077820 90 1F 00 50 */ stw r0, 0x50(r31) -/* 80077824 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 80077828 60 00 00 02 */ ori r0, r0, 2 -/* 8007782C 90 1F 00 50 */ stw r0, 0x50(r31) -/* 80077830 7F E3 FB 78 */ mr r3, r31 -/* 80077834 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077838 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007783C 7C 08 03 A6 */ mtlr r0 -/* 80077840 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077844 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_WtrFv.s b/asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_WtrFv.s deleted file mode 100644 index ccca5af8a46..00000000000 --- a/asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_WtrFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80077678: -/* 80077678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007767C 7C 08 02 A6 */ mflr r0 -/* 80077680 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077684 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077688 7C 7F 1B 78 */ mr r31, r3 -/* 8007768C 4B FF FE F1 */ bl __ct__11dBgS_GndChkFv -/* 80077690 3C 60 80 3A */ lis r3, __vt__14dBgS_ObjGndChk@ha /* 0x803A382C@ha */ -/* 80077694 38 63 38 2C */ addi r3, r3, __vt__14dBgS_ObjGndChk@l /* 0x803A382C@l */ -/* 80077698 90 7F 00 10 */ stw r3, 0x10(r31) -/* 8007769C 38 03 00 0C */ addi r0, r3, 0xc -/* 800776A0 90 1F 00 20 */ stw r0, 0x20(r31) -/* 800776A4 38 03 00 18 */ addi r0, r3, 0x18 -/* 800776A8 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 800776AC 38 03 00 24 */ addi r0, r3, 0x24 -/* 800776B0 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 800776B4 38 7F 00 3C */ addi r3, r31, 0x3c -/* 800776B8 48 00 17 B1 */ bl SetObj__16dBgS_PolyPassChkFv -/* 800776BC 3C 60 80 3B */ lis r3, __vt__18dBgS_ObjGndChk_Wtr@ha /* 0x803AB748@ha */ -/* 800776C0 38 63 B7 48 */ addi r3, r3, __vt__18dBgS_ObjGndChk_Wtr@l /* 0x803AB748@l */ -/* 800776C4 90 7F 00 10 */ stw r3, 0x10(r31) -/* 800776C8 38 03 00 0C */ addi r0, r3, 0xc -/* 800776CC 90 1F 00 20 */ stw r0, 0x20(r31) -/* 800776D0 38 03 00 18 */ addi r0, r3, 0x18 -/* 800776D4 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 800776D8 38 03 00 24 */ addi r0, r3, 0x24 -/* 800776DC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 800776E0 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 800776E4 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800776E8 90 1F 00 50 */ stw r0, 0x50(r31) -/* 800776EC 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 800776F0 60 00 00 02 */ ori r0, r0, 2 -/* 800776F4 90 1F 00 50 */ stw r0, 0x50(r31) -/* 800776F8 7F E3 FB 78 */ mr r3, r31 -/* 800776FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077700 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077704 7C 08 03 A6 */ mtlr r0 -/* 80077708 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007770C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_grp_pass_chk/__ct__15dBgS_GrpPassChkFv.s b/asm/d/bg/d_bg_s_grp_pass_chk/__ct__15dBgS_GrpPassChkFv.s deleted file mode 100644 index c00a4f091e0..00000000000 --- a/asm/d/bg/d_bg_s_grp_pass_chk/__ct__15dBgS_GrpPassChkFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80077BA0: -/* 80077BA0 3C 80 80 3B */ lis r4, __vt__15cBgS_GrpPassChk@ha /* 0x803AB7B4@ha */ -/* 80077BA4 38 04 B7 B4 */ addi r0, r4, __vt__15cBgS_GrpPassChk@l /* 0x803AB7B4@l */ -/* 80077BA8 90 03 00 00 */ stw r0, 0(r3) -/* 80077BAC 3C 80 80 3B */ lis r4, __vt__15dBgS_GrpPassChk@ha /* 0x803AB7A8@ha */ -/* 80077BB0 38 04 B7 A8 */ addi r0, r4, __vt__15dBgS_GrpPassChk@l /* 0x803AB7A8@l */ -/* 80077BB4 90 03 00 00 */ stw r0, 0(r3) -/* 80077BB8 38 00 00 01 */ li r0, 1 -/* 80077BBC 90 03 00 04 */ stw r0, 4(r3) -/* 80077BC0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_grp_pass_chk/__dt__15cBgS_GrpPassChkFv.s b/asm/d/bg/d_bg_s_grp_pass_chk/__dt__15cBgS_GrpPassChkFv.s deleted file mode 100644 index 01075faa3e0..00000000000 --- a/asm/d/bg/d_bg_s_grp_pass_chk/__dt__15cBgS_GrpPassChkFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80077C20: -/* 80077C20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077C24 7C 08 02 A6 */ mflr r0 -/* 80077C28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077C2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077C30 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80077C34 41 82 00 1C */ beq lbl_80077C50 -/* 80077C38 3C A0 80 3B */ lis r5, __vt__15cBgS_GrpPassChk@ha /* 0x803AB7B4@ha */ -/* 80077C3C 38 05 B7 B4 */ addi r0, r5, __vt__15cBgS_GrpPassChk@l /* 0x803AB7B4@l */ -/* 80077C40 90 1F 00 00 */ stw r0, 0(r31) -/* 80077C44 7C 80 07 35 */ extsh. r0, r4 -/* 80077C48 40 81 00 08 */ ble lbl_80077C50 -/* 80077C4C 48 25 70 F1 */ bl __dl__FPv -lbl_80077C50: -/* 80077C50 7F E3 FB 78 */ mr r3, r31 -/* 80077C54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077C58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077C5C 7C 08 03 A6 */ mtlr r0 -/* 80077C60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077C64 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c.s b/asm/d/bg/d_bg_s_lin_chk/Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c.s deleted file mode 100644 index 4d1a506b201..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80077D64: -/* 80077D64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077D68 7C 08 02 A6 */ mflr r0 -/* 80077D6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077D70 28 06 00 00 */ cmplwi r6, 0 -/* 80077D74 41 82 00 18 */ beq lbl_80077D8C -/* 80077D78 41 82 00 0C */ beq lbl_80077D84 -/* 80077D7C 80 C6 00 04 */ lwz r6, 4(r6) -/* 80077D80 48 00 00 10 */ b lbl_80077D90 -lbl_80077D84: -/* 80077D84 38 C0 FF FF */ li r6, -1 -/* 80077D88 48 00 00 08 */ b lbl_80077D90 -lbl_80077D8C: -/* 80077D8C 38 C0 FF FF */ li r6, -1 -lbl_80077D90: -/* 80077D90 48 1F 01 41 */ bl Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi -/* 80077D94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077D98 7C 08 03 A6 */ mtlr r0 -/* 80077D9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077DA0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__11dBgS_LinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__11dBgS_LinChkFv.s deleted file mode 100644 index 7ba887c929f..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__11dBgS_LinChkFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80077C68: -/* 80077C68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077C6C 7C 08 02 A6 */ mflr r0 -/* 80077C70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077C74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077C78 7C 7F 1B 78 */ mr r31, r3 -/* 80077C7C 48 1F 00 E1 */ bl __ct__11cBgS_LinChkFv -/* 80077C80 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077C84 4B FF F8 19 */ bl __ct__8dBgS_ChkFv -/* 80077C88 3C 60 80 3B */ lis r3, __vt__11dBgS_LinChk@ha /* 0x803AB970@ha */ -/* 80077C8C 38 63 B9 70 */ addi r3, r3, __vt__11dBgS_LinChk@l /* 0x803AB970@l */ -/* 80077C90 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80077C94 38 03 00 0C */ addi r0, r3, 0xc -/* 80077C98 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80077C9C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80077CA0 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80077CA4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80077CA8 90 1F 00 68 */ stw r0, 0x68(r31) -/* 80077CAC 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077CB0 4B FF F8 B1 */ bl GetPolyPassChkInfo__8dBgS_ChkFv -/* 80077CB4 90 7F 00 00 */ stw r3, 0(r31) -/* 80077CB8 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077CBC 4B FF F8 A9 */ bl GetGrpPassChkInfo__8dBgS_ChkFv -/* 80077CC0 90 7F 00 04 */ stw r3, 4(r31) -/* 80077CC4 7F E3 FB 78 */ mr r3, r31 -/* 80077CC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077CCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077CD0 7C 08 03 A6 */ mtlr r0 -/* 80077CD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077CD8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_CamLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_CamLinChkFv.s deleted file mode 100644 index a3c4c6f4aa3..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_CamLinChkFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80077DA4: -/* 80077DA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077DA8 7C 08 02 A6 */ mflr r0 -/* 80077DAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077DB0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077DB4 7C 7F 1B 78 */ mr r31, r3 -/* 80077DB8 4B FF FE B1 */ bl __ct__11dBgS_LinChkFv -/* 80077DBC 3C 60 80 3B */ lis r3, __vt__14dBgS_CamLinChk@ha /* 0x803AB940@ha */ -/* 80077DC0 38 63 B9 40 */ addi r3, r3, __vt__14dBgS_CamLinChk@l /* 0x803AB940@l */ -/* 80077DC4 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80077DC8 38 03 00 0C */ addi r0, r3, 0xc -/* 80077DCC 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80077DD0 38 03 00 18 */ addi r0, r3, 0x18 -/* 80077DD4 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80077DD8 38 03 00 24 */ addi r0, r3, 0x24 -/* 80077DDC 90 1F 00 68 */ stw r0, 0x68(r31) -/* 80077DE0 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077DE4 48 00 10 9D */ bl SetCam__16dBgS_PolyPassChkFv -/* 80077DE8 7F E3 FB 78 */ mr r3, r31 -/* 80077DEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077DF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077DF4 7C 08 03 A6 */ mtlr r0 -/* 80077DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077DFC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_ObjLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_ObjLinChkFv.s deleted file mode 100644 index 7ed0b4d98b1..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_ObjLinChkFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80077F5C: -/* 80077F5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077F60 7C 08 02 A6 */ mflr r0 -/* 80077F64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077F68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077F6C 7C 7F 1B 78 */ mr r31, r3 -/* 80077F70 4B FF FC F9 */ bl __ct__11dBgS_LinChkFv -/* 80077F74 3C 60 80 3B */ lis r3, __vt__14dBgS_ObjLinChk@ha /* 0x803AB8E0@ha */ -/* 80077F78 38 63 B8 E0 */ addi r3, r3, __vt__14dBgS_ObjLinChk@l /* 0x803AB8E0@l */ -/* 80077F7C 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80077F80 38 03 00 0C */ addi r0, r3, 0xc -/* 80077F84 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80077F88 38 03 00 18 */ addi r0, r3, 0x18 -/* 80077F8C 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80077F90 38 03 00 24 */ addi r0, r3, 0x24 -/* 80077F94 90 1F 00 68 */ stw r0, 0x68(r31) -/* 80077F98 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077F9C 48 00 0E CD */ bl SetObj__16dBgS_PolyPassChkFv -/* 80077FA0 7F E3 FB 78 */ mr r3, r31 -/* 80077FA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077FA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077FAC 7C 08 03 A6 */ mtlr r0 -/* 80077FB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077FB4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_BombLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_BombLinChkFv.s deleted file mode 100644 index e94ea925edf..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_BombLinChkFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80078104: -/* 80078104 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078108 7C 08 02 A6 */ mflr r0 -/* 8007810C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078110 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078114 7C 7F 1B 78 */ mr r31, r3 -/* 80078118 4B FF FB 51 */ bl __ct__11dBgS_LinChkFv -/* 8007811C 3C 60 80 3B */ lis r3, __vt__15dBgS_BombLinChk@ha /* 0x803AB880@ha */ -/* 80078120 38 63 B8 80 */ addi r3, r3, __vt__15dBgS_BombLinChk@l /* 0x803AB880@l */ -/* 80078124 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80078128 38 03 00 0C */ addi r0, r3, 0xc -/* 8007812C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80078130 38 03 00 18 */ addi r0, r3, 0x18 -/* 80078134 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80078138 38 03 00 24 */ addi r0, r3, 0x24 -/* 8007813C 90 1F 00 68 */ stw r0, 0x68(r31) -/* 80078140 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80078144 48 00 0D 79 */ bl SetBomb__16dBgS_PolyPassChkFv -/* 80078148 7F E3 FB 78 */ mr r3, r31 -/* 8007814C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078150 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078154 7C 08 03 A6 */ mtlr r0 -/* 80078158 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007815C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_LinkLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_LinkLinChkFv.s deleted file mode 100644 index feee4ec7e13..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_LinkLinChkFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80078030: -/* 80078030 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078034 7C 08 02 A6 */ mflr r0 -/* 80078038 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007803C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078040 7C 7F 1B 78 */ mr r31, r3 -/* 80078044 4B FF FC 25 */ bl __ct__11dBgS_LinChkFv -/* 80078048 3C 60 80 3B */ lis r3, __vt__15dBgS_LinkLinChk@ha /* 0x803AB8B0@ha */ -/* 8007804C 38 63 B8 B0 */ addi r3, r3, __vt__15dBgS_LinkLinChk@l /* 0x803AB8B0@l */ -/* 80078050 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80078054 38 03 00 0C */ addi r0, r3, 0xc -/* 80078058 90 1F 00 20 */ stw r0, 0x20(r31) -/* 8007805C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80078060 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80078064 38 03 00 24 */ addi r0, r3, 0x24 -/* 80078068 90 1F 00 68 */ stw r0, 0x68(r31) -/* 8007806C 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80078070 48 00 0E 29 */ bl SetLink__16dBgS_PolyPassChkFv -/* 80078074 7F E3 FB 78 */ mr r3, r31 -/* 80078078 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007807C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078080 7C 08 03 A6 */ mtlr r0 -/* 80078084 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078088 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_RopeLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_RopeLinChkFv.s deleted file mode 100644 index c208e013926..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_RopeLinChkFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8007838C: -/* 8007838C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078390 7C 08 02 A6 */ mflr r0 -/* 80078394 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078398 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007839C 7C 7F 1B 78 */ mr r31, r3 -/* 800783A0 4B FF F8 C9 */ bl __ct__11dBgS_LinChkFv -/* 800783A4 3C 60 80 3B */ lis r3, __vt__15dBgS_RopeLinChk@ha /* 0x803AB7F0@ha */ -/* 800783A8 38 63 B7 F0 */ addi r3, r3, __vt__15dBgS_RopeLinChk@l /* 0x803AB7F0@l */ -/* 800783AC 90 7F 00 10 */ stw r3, 0x10(r31) -/* 800783B0 38 03 00 0C */ addi r0, r3, 0xc -/* 800783B4 90 1F 00 20 */ stw r0, 0x20(r31) -/* 800783B8 38 03 00 18 */ addi r0, r3, 0x18 -/* 800783BC 90 1F 00 58 */ stw r0, 0x58(r31) -/* 800783C0 38 03 00 24 */ addi r0, r3, 0x24 -/* 800783C4 90 1F 00 68 */ stw r0, 0x68(r31) -/* 800783C8 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800783CC 48 00 0B 15 */ bl SetRope__16dBgS_PolyPassChkFv -/* 800783D0 7F E3 FB 78 */ mr r3, r31 -/* 800783D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800783D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800783DC 7C 08 03 A6 */ mtlr r0 -/* 800783E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800783E4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_ArrowLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_ArrowLinChkFv.s deleted file mode 100644 index e4f94276ed7..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_ArrowLinChkFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800781D8: -/* 800781D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800781DC 7C 08 02 A6 */ mflr r0 -/* 800781E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800781E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800781E8 7C 7F 1B 78 */ mr r31, r3 -/* 800781EC 4B FF FA 7D */ bl __ct__11dBgS_LinChkFv -/* 800781F0 3C 60 80 3B */ lis r3, __vt__16dBgS_ArrowLinChk@ha /* 0x803AB850@ha */ -/* 800781F4 38 63 B8 50 */ addi r3, r3, __vt__16dBgS_ArrowLinChk@l /* 0x803AB850@l */ -/* 800781F8 90 7F 00 10 */ stw r3, 0x10(r31) -/* 800781FC 38 03 00 0C */ addi r0, r3, 0xc -/* 80078200 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80078204 38 03 00 18 */ addi r0, r3, 0x18 -/* 80078208 90 1F 00 58 */ stw r0, 0x58(r31) -/* 8007820C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80078210 90 1F 00 68 */ stw r0, 0x68(r31) -/* 80078214 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80078218 48 00 0C 99 */ bl SetArrow__16dBgS_PolyPassChkFv -/* 8007821C 80 1F 00 6C */ lwz r0, 0x6c(r31) -/* 80078220 60 00 00 01 */ ori r0, r0, 1 -/* 80078224 90 1F 00 6C */ stw r0, 0x6c(r31) -/* 80078228 7F E3 FB 78 */ mr r3, r31 -/* 8007822C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078230 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078234 7C 08 03 A6 */ mtlr r0 -/* 80078238 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007823C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_HorseLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_HorseLinChkFv.s deleted file mode 100644 index eb58c5ae008..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_HorseLinChkFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80078460: -/* 80078460 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078464 7C 08 02 A6 */ mflr r0 -/* 80078468 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007846C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078470 7C 7F 1B 78 */ mr r31, r3 -/* 80078474 4B FF F7 F5 */ bl __ct__11dBgS_LinChkFv -/* 80078478 3C 60 80 3B */ lis r3, __vt__16dBgS_HorseLinChk@ha /* 0x803AB7C0@ha */ -/* 8007847C 38 63 B7 C0 */ addi r3, r3, __vt__16dBgS_HorseLinChk@l /* 0x803AB7C0@l */ -/* 80078480 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80078484 38 03 00 0C */ addi r0, r3, 0xc -/* 80078488 90 1F 00 20 */ stw r0, 0x20(r31) -/* 8007848C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80078490 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80078494 38 03 00 24 */ addi r0, r3, 0x24 -/* 80078498 90 1F 00 68 */ stw r0, 0x68(r31) -/* 8007849C 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800784A0 48 00 0A 59 */ bl SetHorse__16dBgS_PolyPassChkFv -/* 800784A4 7F E3 FB 78 */ mr r3, r31 -/* 800784A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800784AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800784B0 7C 08 03 A6 */ mtlr r0 -/* 800784B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800784B8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__20dBgS_BoomerangLinChkFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__20dBgS_BoomerangLinChkFv.s deleted file mode 100644 index 8f743e97687..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__20dBgS_BoomerangLinChkFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800782B8: -/* 800782B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800782BC 7C 08 02 A6 */ mflr r0 -/* 800782C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800782C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800782C8 7C 7F 1B 78 */ mr r31, r3 -/* 800782CC 4B FF F9 9D */ bl __ct__11dBgS_LinChkFv -/* 800782D0 3C 60 80 3B */ lis r3, __vt__20dBgS_BoomerangLinChk@ha /* 0x803AB820@ha */ -/* 800782D4 38 63 B8 20 */ addi r3, r3, __vt__20dBgS_BoomerangLinChk@l /* 0x803AB820@l */ -/* 800782D8 90 7F 00 10 */ stw r3, 0x10(r31) -/* 800782DC 38 03 00 0C */ addi r0, r3, 0xc -/* 800782E0 90 1F 00 20 */ stw r0, 0x20(r31) -/* 800782E4 38 03 00 18 */ addi r0, r3, 0x18 -/* 800782E8 90 1F 00 58 */ stw r0, 0x58(r31) -/* 800782EC 38 03 00 24 */ addi r0, r3, 0x24 -/* 800782F0 90 1F 00 68 */ stw r0, 0x68(r31) -/* 800782F4 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800782F8 48 00 0B DD */ bl SetBoomerang__16dBgS_PolyPassChkFv -/* 800782FC 7F E3 FB 78 */ mr r3, r31 -/* 80078300 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078304 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078308 7C 08 03 A6 */ mtlr r0 -/* 8007830C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078310 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_lin_chk/__ct__21dBgS_CamLinChk_NorWtrFv.s b/asm/d/bg/d_bg_s_lin_chk/__ct__21dBgS_CamLinChk_NorWtrFv.s deleted file mode 100644 index 2d6260391bb..00000000000 --- a/asm/d/bg/d_bg_s_lin_chk/__ct__21dBgS_CamLinChk_NorWtrFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80077E78: -/* 80077E78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80077E7C 7C 08 02 A6 */ mflr r0 -/* 80077E80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80077E84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80077E88 7C 7F 1B 78 */ mr r31, r3 -/* 80077E8C 4B FF FF 19 */ bl __ct__14dBgS_CamLinChkFv -/* 80077E90 3C 60 80 3B */ lis r3, __vt__21dBgS_CamLinChk_NorWtr@ha /* 0x803AB910@ha */ -/* 80077E94 38 63 B9 10 */ addi r3, r3, __vt__21dBgS_CamLinChk_NorWtr@l /* 0x803AB910@l */ -/* 80077E98 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80077E9C 38 03 00 0C */ addi r0, r3, 0xc -/* 80077EA0 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80077EA4 38 03 00 18 */ addi r0, r3, 0x18 -/* 80077EA8 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80077EAC 38 03 00 24 */ addi r0, r3, 0x24 -/* 80077EB0 90 1F 00 68 */ stw r0, 0x68(r31) -/* 80077EB4 80 1F 00 6C */ lwz r0, 0x6c(r31) -/* 80077EB8 60 00 00 02 */ ori r0, r0, 2 -/* 80077EBC 90 1F 00 6C */ stw r0, 0x6c(r31) -/* 80077EC0 80 1F 00 6C */ lwz r0, 0x6c(r31) -/* 80077EC4 60 00 00 01 */ ori r0, r0, 1 -/* 80077EC8 90 1F 00 6C */ stw r0, 0x6c(r31) -/* 80077ECC 7F E3 FB 78 */ mr r3, r31 -/* 80077ED0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80077ED4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80077ED8 7C 08 03 A6 */ mtlr r0 -/* 80077EDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077EE0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_movebg_actor/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/d/bg/d_bg_s_movebg_actor/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 50c7f4a1e59..00000000000 --- a/asm/d/bg/d_bg_s_movebg_actor/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80078668: -/* 80078668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007866C 7C 08 02 A6 */ mflr r0 -/* 80078670 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078674 48 00 00 55 */ bl MoveBGCreateHeap__16dBgS_MoveBgActorFv -/* 80078678 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007867C 7C 08 03 A6 */ mtlr r0 -/* 80078680 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078684 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_movebg_actor/MoveBGCreateHeap__16dBgS_MoveBgActorFv.s b/asm/d/bg/d_bg_s_movebg_actor/MoveBGCreateHeap__16dBgS_MoveBgActorFv.s deleted file mode 100644 index b7b3ff0e14a..00000000000 --- a/asm/d/bg/d_bg_s_movebg_actor/MoveBGCreateHeap__16dBgS_MoveBgActorFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_800786C8: -/* 800786C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800786CC 7C 08 02 A6 */ mflr r0 -/* 800786D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800786D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800786D8 7C 7F 1B 78 */ mr r31, r3 -/* 800786DC 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 800786E0 81 8C 00 08 */ lwz r12, 8(r12) -/* 800786E4 7D 89 03 A6 */ mtctr r12 -/* 800786E8 4E 80 04 21 */ bctrl -/* 800786EC 2C 03 00 00 */ cmpwi r3, 0 -/* 800786F0 40 82 00 0C */ bne lbl_800786FC -/* 800786F4 38 60 00 00 */ li r3, 0 -/* 800786F8 48 00 00 B0 */ b lbl_800787A8 -lbl_800786FC: -/* 800786FC 80 0D 89 F4 */ lwz r0, m_dzb_id__16dBgS_MoveBgActor(r13) -/* 80078700 2C 00 FF FF */ cmpwi r0, -1 -/* 80078704 40 82 00 14 */ bne lbl_80078718 -/* 80078708 38 00 00 00 */ li r0, 0 -/* 8007870C 90 1F 05 68 */ stw r0, 0x568(r31) -/* 80078710 38 60 00 01 */ li r3, 1 -/* 80078714 48 00 00 94 */ b lbl_800787A8 -lbl_80078718: -/* 80078718 38 60 00 C0 */ li r3, 0xc0 -/* 8007871C 48 25 65 31 */ bl __nw__FUl -/* 80078720 7C 60 1B 79 */ or. r0, r3, r3 -/* 80078724 41 82 00 0C */ beq lbl_80078730 -/* 80078728 48 00 32 49 */ bl __ct__4dBgWFv -/* 8007872C 7C 60 1B 78 */ mr r0, r3 -lbl_80078730: -/* 80078730 90 1F 05 68 */ stw r0, 0x568(r31) -/* 80078734 80 1F 05 68 */ lwz r0, 0x568(r31) -/* 80078738 28 00 00 00 */ cmplwi r0, 0 -/* 8007873C 41 82 00 58 */ beq lbl_80078794 -/* 80078740 80 6D 89 F0 */ lwz r3, m_name__16dBgS_MoveBgActor(r13) -/* 80078744 80 8D 89 F4 */ lwz r4, m_dzb_id__16dBgS_MoveBgActor(r13) -/* 80078748 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8007874C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80078750 3C A5 00 02 */ addis r5, r5, 2 -/* 80078754 38 C0 00 80 */ li r6, 0x80 -/* 80078758 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8007875C 4B FC 3B 91 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80078760 7C 64 1B 78 */ mr r4, r3 -/* 80078764 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80078768 38 A0 00 01 */ li r5, 1 -/* 8007876C 38 DF 05 6C */ addi r6, r31, 0x56c -/* 80078770 48 00 17 C9 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80078774 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80078778 40 82 00 1C */ bne lbl_80078794 -/* 8007877C 80 0D 89 F8 */ lwz r0, m_set_func__16dBgS_MoveBgActor(r13) -/* 80078780 28 00 00 00 */ cmplwi r0, 0 -/* 80078784 41 82 00 20 */ beq lbl_800787A4 -/* 80078788 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 8007878C 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80078790 48 00 00 14 */ b lbl_800787A4 -lbl_80078794: -/* 80078794 38 00 00 00 */ li r0, 0 -/* 80078798 90 1F 05 68 */ stw r0, 0x568(r31) -/* 8007879C 38 60 00 00 */ li r3, 0 -/* 800787A0 48 00 00 08 */ b lbl_800787A8 -lbl_800787A4: -/* 800787A4 38 60 00 01 */ li r3, 1 -lbl_800787A8: -/* 800787A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800787AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800787B0 7C 08 03 A6 */ mtlr r0 -/* 800787B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800787B8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_movebg_actor/MoveBGDelete__16dBgS_MoveBgActorFv.s b/asm/d/bg/d_bg_s_movebg_actor/MoveBGDelete__16dBgS_MoveBgActorFv.s deleted file mode 100644 index 2cec83c0ace..00000000000 --- a/asm/d/bg/d_bg_s_movebg_actor/MoveBGDelete__16dBgS_MoveBgActorFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800788DC: -/* 800788DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800788E0 7C 08 02 A6 */ mflr r0 -/* 800788E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800788E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800788EC 93 C1 00 08 */ stw r30, 8(r1) -/* 800788F0 7C 7E 1B 78 */ mr r30, r3 -/* 800788F4 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 800788F8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 800788FC 7D 89 03 A6 */ mtctr r12 -/* 80078900 4E 80 04 21 */ bctrl -/* 80078904 7C 7F 1B 78 */ mr r31, r3 -/* 80078908 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 8007890C 28 03 00 00 */ cmplwi r3, 0 -/* 80078910 41 82 00 24 */ beq lbl_80078934 -/* 80078914 48 1E F8 C1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80078918 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007891C 41 82 00 18 */ beq lbl_80078934 -/* 80078920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80078924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80078928 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8007892C 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80078930 4B FF B9 21 */ bl Release__4cBgSFP9dBgW_Base -lbl_80078934: -/* 80078934 7F E3 FB 78 */ mr r3, r31 -/* 80078938 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007893C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80078940 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078944 7C 08 03 A6 */ mtlr r0 -/* 80078948 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007894C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_movebg_actor/MoveBGExecute__16dBgS_MoveBgActorFv.s b/asm/d/bg/d_bg_s_movebg_actor/MoveBGExecute__16dBgS_MoveBgActorFv.s deleted file mode 100644 index 328e5ea67ae..00000000000 --- a/asm/d/bg/d_bg_s_movebg_actor/MoveBGExecute__16dBgS_MoveBgActorFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80078950: -/* 80078950 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80078954 7C 08 02 A6 */ mflr r0 -/* 80078958 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007895C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80078960 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80078964 7C 7E 1B 78 */ mr r30, r3 -/* 80078968 38 00 00 00 */ li r0, 0 -/* 8007896C 90 01 00 08 */ stw r0, 8(r1) -/* 80078970 38 81 00 08 */ addi r4, r1, 8 -/* 80078974 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80078978 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8007897C 7D 89 03 A6 */ mtctr r12 -/* 80078980 4E 80 04 21 */ bctrl -/* 80078984 7C 7F 1B 78 */ mr r31, r3 -/* 80078988 80 61 00 08 */ lwz r3, 8(r1) -/* 8007898C 28 03 00 00 */ cmplwi r3, 0 -/* 80078990 40 82 00 50 */ bne lbl_800789E0 -/* 80078994 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80078998 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8007899C C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 800789A0 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 800789A4 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 800789A8 48 2C DF 41 */ bl PSMTXTrans -/* 800789AC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800789B0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800789B4 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800789B8 4B F9 3A 7D */ bl mDoMtx_YrotM__FPA4_fs -/* 800789BC C0 3E 04 EC */ lfs f1, 0x4ec(r30) -/* 800789C0 C0 5E 04 F0 */ lfs f2, 0x4f0(r30) -/* 800789C4 C0 7E 04 F4 */ lfs f3, 0x4f4(r30) -/* 800789C8 4B F9 44 71 */ bl scaleM__14mDoMtx_stack_cFfff -/* 800789CC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800789D0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800789D4 38 9E 05 6C */ addi r4, r30, 0x56c -/* 800789D8 48 2C DA D9 */ bl PSMTXCopy -/* 800789DC 48 00 00 0C */ b lbl_800789E8 -lbl_800789E0: -/* 800789E0 38 9E 05 6C */ addi r4, r30, 0x56c -/* 800789E4 48 2C DA CD */ bl PSMTXCopy -lbl_800789E8: -/* 800789E8 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 800789EC 28 03 00 00 */ cmplwi r3, 0 -/* 800789F0 41 82 00 08 */ beq lbl_800789F8 -/* 800789F4 48 00 2F CD */ bl Move__4dBgWFv -lbl_800789F8: -/* 800789F8 7F E3 FB 78 */ mr r3, r31 -/* 800789FC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80078A00 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80078A04 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80078A08 7C 08 03 A6 */ mtlr r0 -/* 80078A0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80078A10 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_movebg_actor/__ct__16dBgS_MoveBgActorFv.s b/asm/d/bg/d_bg_s_movebg_actor/__ct__16dBgS_MoveBgActorFv.s deleted file mode 100644 index 66cda099565..00000000000 --- a/asm/d/bg/d_bg_s_movebg_actor/__ct__16dBgS_MoveBgActorFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80078624: -/* 80078624 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078628 7C 08 02 A6 */ mflr r0 -/* 8007862C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078630 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078634 7C 7F 1B 78 */ mr r31, r3 -/* 80078638 4B FA 05 2D */ bl __ct__10fopAc_ac_cFv -/* 8007863C 3C 60 80 3B */ lis r3, __vt__16dBgS_MoveBgActor@ha /* 0x803AB9A0@ha */ -/* 80078640 38 03 B9 A0 */ addi r0, r3, __vt__16dBgS_MoveBgActor@l /* 0x803AB9A0@l */ -/* 80078644 90 1F 05 9C */ stw r0, 0x59c(r31) -/* 80078648 38 00 00 00 */ li r0, 0 -/* 8007864C 90 1F 05 68 */ stw r0, 0x568(r31) -/* 80078650 7F E3 FB 78 */ mr r3, r31 -/* 80078654 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078658 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007865C 7C 08 03 A6 */ mtlr r0 -/* 80078660 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078664 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_roof_chk/Init__12dBgS_RoofChkFv.s b/asm/d/bg/d_bg_s_roof_chk/Init__12dBgS_RoofChkFv.s deleted file mode 100644 index 078f80ddc19..00000000000 --- a/asm/d/bg/d_bg_s_roof_chk/Init__12dBgS_RoofChkFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80079124: -/* 80079124 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80079128 7C 08 02 A6 */ mflr r0 -/* 8007912C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80079130 C0 02 8C F4 */ lfs f0, lit_333(r2) -/* 80079134 D0 03 00 4C */ stfs f0, 0x4c(r3) -/* 80079138 48 1E EF E9 */ bl ClearPi__13cBgS_PolyInfoFv -/* 8007913C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80079140 7C 08 03 A6 */ mtlr r0 -/* 80079144 38 21 00 10 */ addi r1, r1, 0x10 -/* 80079148 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_roof_chk/__ct__12dBgS_RoofChkFv.s b/asm/d/bg/d_bg_s_roof_chk/__ct__12dBgS_RoofChkFv.s deleted file mode 100644 index cf7b4058397..00000000000 --- a/asm/d/bg/d_bg_s_roof_chk/__ct__12dBgS_RoofChkFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80078FF4: -/* 80078FF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078FF8 7C 08 02 A6 */ mflr r0 -/* 80078FFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80079000 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80079004 7C 7F 1B 78 */ mr r31, r3 -/* 80079008 48 1E F0 6D */ bl __ct__13cBgS_PolyInfoFv -/* 8007900C 38 7F 00 10 */ addi r3, r31, 0x10 -/* 80079010 48 1E EB 3D */ bl __ct__8cBgS_ChkFv -/* 80079014 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80079018 4B FF E4 85 */ bl __ct__8dBgS_ChkFv -/* 8007901C 3C 60 80 3B */ lis r3, __vt__12dBgS_RoofChk@ha /* 0x803ABA50@ha */ -/* 80079020 38 63 BA 50 */ addi r3, r3, __vt__12dBgS_RoofChk@l /* 0x803ABA50@l */ -/* 80079024 90 7F 00 0C */ stw r3, 0xc(r31) -/* 80079028 38 03 00 0C */ addi r0, r3, 0xc -/* 8007902C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80079030 38 03 00 18 */ addi r0, r3, 0x18 -/* 80079034 90 1F 00 24 */ stw r0, 0x24(r31) -/* 80079038 38 03 00 24 */ addi r0, r3, 0x24 -/* 8007903C 90 1F 00 34 */ stw r0, 0x34(r31) -/* 80079040 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80079044 4B FF E5 1D */ bl GetPolyPassChkInfo__8dBgS_ChkFv -/* 80079048 90 7F 00 10 */ stw r3, 0x10(r31) -/* 8007904C 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80079050 4B FF E5 15 */ bl GetGrpPassChkInfo__8dBgS_ChkFv -/* 80079054 90 7F 00 14 */ stw r3, 0x14(r31) -/* 80079058 C0 02 8C F0 */ lfs f0, lit_316(r2) -/* 8007905C D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 80079060 D0 1F 00 40 */ stfs f0, 0x40(r31) -/* 80079064 D0 1F 00 44 */ stfs f0, 0x44(r31) -/* 80079068 38 00 FF FF */ li r0, -1 -/* 8007906C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80079070 38 00 00 00 */ li r0, 0 -/* 80079074 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80079078 7F E3 FB 78 */ mr r3, r31 -/* 8007907C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80079080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80079084 7C 08 03 A6 */ mtlr r0 -/* 80079088 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007908C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_sph_chk/__ct__11dBgS_SphChkFv.s b/asm/d/bg/d_bg_s_sph_chk/__ct__11dBgS_SphChkFv.s deleted file mode 100644 index 95c9664f04e..00000000000 --- a/asm/d/bg/d_bg_s_sph_chk/__ct__11dBgS_SphChkFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80078A14: -/* 80078A14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078A18 7C 08 02 A6 */ mflr r0 -/* 80078A1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078A20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078A24 7C 7F 1B 78 */ mr r31, r3 -/* 80078A28 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 80078A2C 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 80078A30 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80078A34 38 7F 00 14 */ addi r3, r31, 0x14 -/* 80078A38 48 1E F6 3D */ bl __ct__13cBgS_PolyInfoFv -/* 80078A3C 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80078A40 48 1E F1 0D */ bl __ct__8cBgS_ChkFv -/* 80078A44 38 7F 00 38 */ addi r3, r31, 0x38 -/* 80078A48 4B FF EA 55 */ bl __ct__8dBgS_ChkFv -/* 80078A4C 3C 60 80 3B */ lis r3, __vt__11dBgS_SphChk@ha /* 0x803AB9C8@ha */ -/* 80078A50 38 63 B9 C8 */ addi r3, r3, __vt__11dBgS_SphChk@l /* 0x803AB9C8@l */ -/* 80078A54 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80078A58 38 03 00 0C */ addi r0, r3, 0xc -/* 80078A5C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80078A60 38 03 00 18 */ addi r0, r3, 0x18 -/* 80078A64 90 1F 00 34 */ stw r0, 0x34(r31) -/* 80078A68 38 03 00 24 */ addi r0, r3, 0x24 -/* 80078A6C 90 1F 00 38 */ stw r0, 0x38(r31) -/* 80078A70 38 03 00 30 */ addi r0, r3, 0x30 -/* 80078A74 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80078A78 38 7F 00 38 */ addi r3, r31, 0x38 -/* 80078A7C 4B FF EA E5 */ bl GetPolyPassChkInfo__8dBgS_ChkFv -/* 80078A80 90 7F 00 24 */ stw r3, 0x24(r31) -/* 80078A84 38 7F 00 38 */ addi r3, r31, 0x38 -/* 80078A88 4B FF EA DD */ bl GetGrpPassChkInfo__8dBgS_ChkFv -/* 80078A8C 90 7F 00 28 */ stw r3, 0x28(r31) -/* 80078A90 38 00 FF FF */ li r0, -1 -/* 80078A94 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 80078A98 38 7F 00 14 */ addi r3, r31, 0x14 -/* 80078A9C 48 1E F6 85 */ bl ClearPi__13cBgS_PolyInfoFv -/* 80078AA0 38 00 00 00 */ li r0, 0 -/* 80078AA4 90 1F 00 50 */ stw r0, 0x50(r31) -/* 80078AA8 7F E3 FB 78 */ mr r3, r31 -/* 80078AAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078AB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078AB4 7C 08 03 A6 */ mtlr r0 -/* 80078AB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078ABC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_sph_chk/__dt__11dBgS_SphChkFv.s b/asm/d/bg/d_bg_s_sph_chk/__dt__11dBgS_SphChkFv.s deleted file mode 100644 index b682a19ee78..00000000000 --- a/asm/d/bg/d_bg_s_sph_chk/__dt__11dBgS_SphChkFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80078AC0: -/* 80078AC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078AC4 7C 08 02 A6 */ mflr r0 -/* 80078AC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078ACC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078AD0 93 C1 00 08 */ stw r30, 8(r1) -/* 80078AD4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80078AD8 7C 9F 23 78 */ mr r31, r4 -/* 80078ADC 41 82 00 78 */ beq lbl_80078B54 -/* 80078AE0 3C 60 80 3B */ lis r3, __vt__11dBgS_SphChk@ha /* 0x803AB9C8@ha */ -/* 80078AE4 38 63 B9 C8 */ addi r3, r3, __vt__11dBgS_SphChk@l /* 0x803AB9C8@l */ -/* 80078AE8 90 7E 00 10 */ stw r3, 0x10(r30) -/* 80078AEC 38 03 00 0C */ addi r0, r3, 0xc -/* 80078AF0 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80078AF4 38 03 00 18 */ addi r0, r3, 0x18 -/* 80078AF8 90 1E 00 34 */ stw r0, 0x34(r30) -/* 80078AFC 38 03 00 24 */ addi r0, r3, 0x24 -/* 80078B00 90 1E 00 38 */ stw r0, 0x38(r30) -/* 80078B04 38 03 00 30 */ addi r0, r3, 0x30 -/* 80078B08 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80078B0C 38 7E 00 38 */ addi r3, r30, 0x38 -/* 80078B10 38 80 00 00 */ li r4, 0 -/* 80078B14 4B FF E9 D5 */ bl __dt__8dBgS_ChkFv -/* 80078B18 38 7E 00 24 */ addi r3, r30, 0x24 -/* 80078B1C 38 80 00 00 */ li r4, 0 -/* 80078B20 48 1E F0 51 */ bl __dt__8cBgS_ChkFv -/* 80078B24 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80078B28 38 80 00 00 */ li r4, 0 -/* 80078B2C 48 1E F5 85 */ bl __dt__13cBgS_PolyInfoFv -/* 80078B30 28 1E 00 00 */ cmplwi r30, 0 -/* 80078B34 41 82 00 10 */ beq lbl_80078B44 -/* 80078B38 3C 60 80 3A */ lis r3, __vt__8cM3dGSph@ha /* 0x803A7904@ha */ -/* 80078B3C 38 03 79 04 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x803A7904@l */ -/* 80078B40 90 1E 00 10 */ stw r0, 0x10(r30) -lbl_80078B44: -/* 80078B44 7F E0 07 35 */ extsh. r0, r31 -/* 80078B48 40 81 00 0C */ ble lbl_80078B54 -/* 80078B4C 7F C3 F3 78 */ mr r3, r30 -/* 80078B50 48 25 61 ED */ bl __dl__FPv -lbl_80078B54: -/* 80078B54 7F C3 F3 78 */ mr r3, r30 -/* 80078B58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078B5C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80078B60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078B64 7C 08 03 A6 */ mtlr r0 -/* 80078B68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078B6C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/Init__14dBgS_SplGrpChkFv.s b/asm/d/bg/d_bg_s_spl_grp_chk/Init__14dBgS_SplGrpChkFv.s deleted file mode 100644 index 04a3ad2c755..00000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/Init__14dBgS_SplGrpChkFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80078D0C: -/* 80078D0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078D10 7C 08 02 A6 */ mflr r0 -/* 80078D14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078D18 80 03 00 50 */ lwz r0, 0x50(r3) -/* 80078D1C 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80078D20 90 03 00 50 */ stw r0, 0x50(r3) -/* 80078D24 80 03 00 50 */ lwz r0, 0x50(r3) -/* 80078D28 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80078D2C 90 03 00 50 */ stw r0, 0x50(r3) -/* 80078D30 C0 03 00 40 */ lfs f0, 0x40(r3) -/* 80078D34 D0 03 00 4C */ stfs f0, 0x4c(r3) -/* 80078D38 48 1E F3 E9 */ bl ClearPi__13cBgS_PolyInfoFv -/* 80078D3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078D40 7C 08 03 A6 */ mtlr r0 -/* 80078D44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078D48 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/Set__14dBgS_SplGrpChkFR4cXyzf.s b/asm/d/bg/d_bg_s_spl_grp_chk/Set__14dBgS_SplGrpChkFR4cXyzf.s deleted file mode 100644 index 604b0ff5f07..00000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/Set__14dBgS_SplGrpChkFR4cXyzf.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80078B90: -/* 80078B90 C0 04 00 00 */ lfs f0, 0(r4) -/* 80078B94 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 80078B98 C0 04 00 04 */ lfs f0, 4(r4) -/* 80078B9C D0 03 00 40 */ stfs f0, 0x40(r3) -/* 80078BA0 C0 04 00 08 */ lfs f0, 8(r4) -/* 80078BA4 D0 03 00 44 */ stfs f0, 0x44(r3) -/* 80078BA8 D0 23 00 48 */ stfs f1, 0x48(r3) -/* 80078BAC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/__ct__14dBgS_SplGrpChkFv.s b/asm/d/bg/d_bg_s_spl_grp_chk/__ct__14dBgS_SplGrpChkFv.s deleted file mode 100644 index d763be48eca..00000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/__ct__14dBgS_SplGrpChkFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80078BB0: -/* 80078BB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078BB4 7C 08 02 A6 */ mflr r0 -/* 80078BB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078BBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078BC0 7C 7F 1B 78 */ mr r31, r3 -/* 80078BC4 48 1E F4 B1 */ bl __ct__13cBgS_PolyInfoFv -/* 80078BC8 38 7F 00 10 */ addi r3, r31, 0x10 -/* 80078BCC 48 1E EF 81 */ bl __ct__8cBgS_ChkFv -/* 80078BD0 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80078BD4 4B FF E8 C9 */ bl __ct__8dBgS_ChkFv -/* 80078BD8 3C 60 80 3B */ lis r3, __vt__14dBgS_SplGrpChk@ha /* 0x803ABA08@ha */ -/* 80078BDC 38 63 BA 08 */ addi r3, r3, __vt__14dBgS_SplGrpChk@l /* 0x803ABA08@l */ -/* 80078BE0 90 7F 00 0C */ stw r3, 0xc(r31) -/* 80078BE4 38 03 00 0C */ addi r0, r3, 0xc -/* 80078BE8 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80078BEC 38 03 00 18 */ addi r0, r3, 0x18 -/* 80078BF0 90 1F 00 24 */ stw r0, 0x24(r31) -/* 80078BF4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80078BF8 90 1F 00 34 */ stw r0, 0x34(r31) -/* 80078BFC 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80078C00 4B FF E9 61 */ bl GetPolyPassChkInfo__8dBgS_ChkFv -/* 80078C04 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80078C08 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80078C0C 4B FF E9 59 */ bl GetGrpPassChkInfo__8dBgS_ChkFv -/* 80078C10 90 7F 00 14 */ stw r3, 0x14(r31) -/* 80078C14 80 1F 00 38 */ lwz r0, 0x38(r31) -/* 80078C18 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80078C1C 90 1F 00 38 */ stw r0, 0x38(r31) -/* 80078C20 C0 22 8C E8 */ lfs f1, lit_319(r2) -/* 80078C24 D0 3F 00 3C */ stfs f1, 0x3c(r31) -/* 80078C28 D0 3F 00 40 */ stfs f1, 0x40(r31) -/* 80078C2C D0 3F 00 44 */ stfs f1, 0x44(r31) -/* 80078C30 C0 02 8C EC */ lfs f0, lit_320(r2) -/* 80078C34 D0 1F 00 48 */ stfs f0, 0x48(r31) -/* 80078C38 D0 3F 00 4C */ stfs f1, 0x4c(r31) -/* 80078C3C 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 80078C40 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 80078C44 90 1F 00 50 */ stw r0, 0x50(r31) -/* 80078C48 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 80078C4C 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80078C50 90 1F 00 50 */ stw r0, 0x50(r31) -/* 80078C54 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 80078C58 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80078C5C 90 1F 00 50 */ stw r0, 0x50(r31) -/* 80078C60 7F E3 FB 78 */ mr r3, r31 -/* 80078C64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078C68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078C6C 7C 08 03 A6 */ mtlr r0 -/* 80078C70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078C74 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_spl_grp_chk/__dt__14dBgS_SplGrpChkFv.s b/asm/d/bg/d_bg_s_spl_grp_chk/__dt__14dBgS_SplGrpChkFv.s deleted file mode 100644 index 9cd4a7f0515..00000000000 --- a/asm/d/bg/d_bg_s_spl_grp_chk/__dt__14dBgS_SplGrpChkFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80078C78: -/* 80078C78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078C7C 7C 08 02 A6 */ mflr r0 -/* 80078C80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078C84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078C88 93 C1 00 08 */ stw r30, 8(r1) -/* 80078C8C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80078C90 7C 9F 23 78 */ mr r31, r4 -/* 80078C94 41 82 00 5C */ beq lbl_80078CF0 -/* 80078C98 3C 60 80 3B */ lis r3, __vt__14dBgS_SplGrpChk@ha /* 0x803ABA08@ha */ -/* 80078C9C 38 63 BA 08 */ addi r3, r3, __vt__14dBgS_SplGrpChk@l /* 0x803ABA08@l */ -/* 80078CA0 90 7E 00 0C */ stw r3, 0xc(r30) -/* 80078CA4 38 03 00 0C */ addi r0, r3, 0xc -/* 80078CA8 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80078CAC 38 03 00 18 */ addi r0, r3, 0x18 -/* 80078CB0 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80078CB4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80078CB8 90 1E 00 34 */ stw r0, 0x34(r30) -/* 80078CBC 38 7E 00 24 */ addi r3, r30, 0x24 -/* 80078CC0 38 80 00 00 */ li r4, 0 -/* 80078CC4 4B FF E8 25 */ bl __dt__8dBgS_ChkFv -/* 80078CC8 38 7E 00 10 */ addi r3, r30, 0x10 -/* 80078CCC 38 80 00 00 */ li r4, 0 -/* 80078CD0 48 1E EE A1 */ bl __dt__8cBgS_ChkFv -/* 80078CD4 7F C3 F3 78 */ mr r3, r30 -/* 80078CD8 38 80 00 00 */ li r4, 0 -/* 80078CDC 48 1E F3 D5 */ bl __dt__13cBgS_PolyInfoFv -/* 80078CE0 7F E0 07 35 */ extsh. r0, r31 -/* 80078CE4 40 81 00 0C */ ble lbl_80078CF0 -/* 80078CE8 7F C3 F3 78 */ mr r3, r30 -/* 80078CEC 48 25 60 51 */ bl __dl__FPv -lbl_80078CF0: -/* 80078CF0 7F C3 F3 78 */ mr r3, r30 -/* 80078CF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078CF8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80078CFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078D00 7C 08 03 A6 */ mtlr r0 -/* 80078D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078D08 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s_wtr_chk/__ct__11dBgS_WtrChkFv.s b/asm/d/bg/d_bg_s_wtr_chk/__ct__11dBgS_WtrChkFv.s deleted file mode 100644 index 112055bf462..00000000000 --- a/asm/d/bg/d_bg_s_wtr_chk/__ct__11dBgS_WtrChkFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80079164: -/* 80079164 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80079168 7C 08 02 A6 */ mflr r0 -/* 8007916C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80079170 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80079174 7C 7F 1B 78 */ mr r31, r3 -/* 80079178 4B FF FA 39 */ bl __ct__14dBgS_SplGrpChkFv -/* 8007917C 3C 60 80 3A */ lis r3, __vt__11dBgS_WtrChk@ha /* 0x803A37FC@ha */ -/* 80079180 38 63 37 FC */ addi r3, r3, __vt__11dBgS_WtrChk@l /* 0x803A37FC@l */ -/* 80079184 90 7F 00 0C */ stw r3, 0xc(r31) -/* 80079188 38 03 00 0C */ addi r0, r3, 0xc -/* 8007918C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80079190 38 03 00 18 */ addi r0, r3, 0x18 -/* 80079194 90 1F 00 24 */ stw r0, 0x24(r31) -/* 80079198 38 03 00 24 */ addi r0, r3, 0x24 -/* 8007919C 90 1F 00 34 */ stw r0, 0x34(r31) -/* 800791A0 80 1F 00 38 */ lwz r0, 0x38(r31) -/* 800791A4 60 00 00 02 */ ori r0, r0, 2 -/* 800791A8 90 1F 00 38 */ stw r0, 0x38(r31) -/* 800791AC 7F E3 FB 78 */ mr r3, r31 -/* 800791B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800791B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800791B8 7C 08 03 A6 */ mtlr r0 -/* 800791BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800791C0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/FreeArea__4cBgWFv.s b/asm/d/bg/d_bg_w/FreeArea__4cBgWFv.s deleted file mode 100644 index a2fc07439dc..00000000000 --- a/asm/d/bg/d_bg_w/FreeArea__4cBgWFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800793A4: -/* 800793A4 38 00 00 00 */ li r0, 0 -/* 800793A8 90 03 00 94 */ stw r0, 0x94(r3) -/* 800793AC 90 03 00 98 */ stw r0, 0x98(r3) -/* 800793B0 90 03 00 AC */ stw r0, 0xac(r3) -/* 800793B4 90 03 00 A4 */ stw r0, 0xa4(r3) -/* 800793B8 90 03 00 A8 */ stw r0, 0xa8(r3) -/* 800793BC 90 03 00 9C */ stw r0, 0x9c(r3) -/* 800793C0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__ct__11cBgW_RwgElmFv.s b/asm/d/bg/d_bg_w/__ct__11cBgW_RwgElmFv.s deleted file mode 100644 index a64dcff4df4..00000000000 --- a/asm/d/bg/d_bg_w/__ct__11cBgW_RwgElmFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800791C4: -/* 800791C4 3C 80 80 3B */ lis r4, __vt__11cBgW_RwgElm@ha /* 0x803ABCB8@ha */ -/* 800791C8 38 04 BC B8 */ addi r0, r4, __vt__11cBgW_RwgElm@l /* 0x803ABCB8@l */ -/* 800791CC 90 03 00 04 */ stw r0, 4(r3) -/* 800791D0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__ct__13cBgW_NodeTreeFv.s b/asm/d/bg/d_bg_w/__ct__13cBgW_NodeTreeFv.s deleted file mode 100644 index d298d188069..00000000000 --- a/asm/d/bg/d_bg_w/__ct__13cBgW_NodeTreeFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8007921C: -/* 8007921C 3C 80 80 3A */ lis r4, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80079220 38 04 72 18 */ addi r0, r4, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80079224 90 03 00 18 */ stw r0, 0x18(r3) -/* 80079228 3C 80 80 3B */ lis r4, __vt__13cBgW_NodeTree@ha /* 0x803ABCAC@ha */ -/* 8007922C 38 04 BC AC */ addi r0, r4, __vt__13cBgW_NodeTree@l /* 0x803ABCAC@l */ -/* 80079230 90 03 00 18 */ stw r0, 0x18(r3) -/* 80079234 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__ct__4cBgWFv.s b/asm/d/bg/d_bg_w/__ct__4cBgWFv.s deleted file mode 100644 index 26b4355d870..00000000000 --- a/asm/d/bg/d_bg_w/__ct__4cBgWFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80079294: -/* 80079294 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80079298 7C 08 02 A6 */ mflr r0 -/* 8007929C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800792A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800792A4 7C 7F 1B 78 */ mr r31, r3 -/* 800792A8 48 00 53 01 */ bl __ct__9dBgW_BaseFv -/* 800792AC 3C 60 80 3B */ lis r3, __vt__4cBgW@ha /* 0x803ABBA8@ha */ -/* 800792B0 38 03 BB A8 */ addi r0, r3, __vt__4cBgW@l /* 0x803ABBA8@l */ -/* 800792B4 90 1F 00 04 */ stw r0, 4(r31) -/* 800792B8 38 60 00 00 */ li r3, 0 -/* 800792BC 90 7F 00 A0 */ stw r3, 0xa0(r31) -/* 800792C0 38 00 00 20 */ li r0, 0x20 -/* 800792C4 98 1F 00 88 */ stb r0, 0x88(r31) -/* 800792C8 38 00 00 01 */ li r0, 1 -/* 800792CC 98 1F 00 89 */ stb r0, 0x89(r31) -/* 800792D0 98 7F 00 90 */ stb r3, 0x90(r31) -/* 800792D4 C0 02 8C F8 */ lfs f0, lit_3717(r2) -/* 800792D8 D0 1F 00 7C */ stfs f0, 0x7c(r31) -/* 800792DC D0 1F 00 80 */ stfs f0, 0x80(r31) -/* 800792E0 D0 1F 00 84 */ stfs f0, 0x84(r31) -/* 800792E4 90 7F 00 94 */ stw r3, 0x94(r31) -/* 800792E8 90 7F 00 98 */ stw r3, 0x98(r31) -/* 800792EC 90 7F 00 A4 */ stw r3, 0xa4(r31) -/* 800792F0 90 7F 00 AC */ stw r3, 0xac(r31) -/* 800792F4 90 7F 00 A8 */ stw r3, 0xa8(r31) -/* 800792F8 90 7F 00 9C */ stw r3, 0x9c(r31) -/* 800792FC 90 7F 00 18 */ stw r3, 0x18(r31) -/* 80079300 38 7F 00 1C */ addi r3, r31, 0x1c -/* 80079304 48 2C D1 81 */ bl PSMTXIdentity -/* 80079308 38 7F 00 4C */ addi r3, r31, 0x4c -/* 8007930C 48 2C D1 79 */ bl PSMTXIdentity -/* 80079310 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 80079314 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 80079318 B0 1F 00 92 */ sth r0, 0x92(r31) -/* 8007931C 38 00 00 00 */ li r0, 0 -/* 80079320 98 1F 00 91 */ stb r0, 0x91(r31) -/* 80079324 7F E3 FB 78 */ mr r3, r31 -/* 80079328 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007932C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80079330 7C 08 03 A6 */ mtlr r0 -/* 80079334 38 21 00 10 */ addi r1, r1, 0x10 -/* 80079338 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__dt__11cBgW_RwgElmFv.s b/asm/d/bg/d_bg_w/__dt__11cBgW_RwgElmFv.s deleted file mode 100644 index abd6c06a04f..00000000000 --- a/asm/d/bg/d_bg_w/__dt__11cBgW_RwgElmFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800791D4: -/* 800791D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800791D8 7C 08 02 A6 */ mflr r0 -/* 800791DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800791E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800791E4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800791E8 41 82 00 1C */ beq lbl_80079204 -/* 800791EC 3C A0 80 3B */ lis r5, __vt__11cBgW_RwgElm@ha /* 0x803ABCB8@ha */ -/* 800791F0 38 05 BC B8 */ addi r0, r5, __vt__11cBgW_RwgElm@l /* 0x803ABCB8@l */ -/* 800791F4 90 1F 00 04 */ stw r0, 4(r31) -/* 800791F8 7C 80 07 35 */ extsh. r0, r4 -/* 800791FC 40 81 00 08 */ ble lbl_80079204 -/* 80079200 48 25 5B 3D */ bl __dl__FPv -lbl_80079204: -/* 80079204 7F E3 FB 78 */ mr r3, r31 -/* 80079208 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007920C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80079210 7C 08 03 A6 */ mtlr r0 -/* 80079214 38 21 00 10 */ addi r1, r1, 0x10 -/* 80079218 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__dt__13cBgW_NodeTreeFv.s b/asm/d/bg/d_bg_w/__dt__13cBgW_NodeTreeFv.s deleted file mode 100644 index c61c67a2cfb..00000000000 --- a/asm/d/bg/d_bg_w/__dt__13cBgW_NodeTreeFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80079238: -/* 80079238 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007923C 7C 08 02 A6 */ mflr r0 -/* 80079240 90 01 00 14 */ stw r0, 0x14(r1) -/* 80079244 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80079248 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8007924C 41 82 00 30 */ beq lbl_8007927C -/* 80079250 3C 60 80 3B */ lis r3, __vt__13cBgW_NodeTree@ha /* 0x803ABCAC@ha */ -/* 80079254 38 03 BC AC */ addi r0, r3, __vt__13cBgW_NodeTree@l /* 0x803ABCAC@l */ -/* 80079258 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8007925C 41 82 00 10 */ beq lbl_8007926C -/* 80079260 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 80079264 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 80079268 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_8007926C: -/* 8007926C 7C 80 07 35 */ extsh. r0, r4 -/* 80079270 40 81 00 0C */ ble lbl_8007927C -/* 80079274 7F E3 FB 78 */ mr r3, r31 -/* 80079278 48 25 5A C5 */ bl __dl__FPv -lbl_8007927C: -/* 8007927C 7F E3 FB 78 */ mr r3, r31 -/* 80079280 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80079284 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80079288 7C 08 03 A6 */ mtlr r0 -/* 8007928C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80079290 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w_base/CalcDiffShapeAngleY__9dBgW_BaseFs.s b/asm/d/bg/d_bg_w_base/CalcDiffShapeAngleY__9dBgW_BaseFs.s deleted file mode 100644 index 36788e744c0..00000000000 --- a/asm/d/bg/d_bg_w_base/CalcDiffShapeAngleY__9dBgW_BaseFs.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8007E6E0: -/* 8007E6E0 A8 03 00 0C */ lha r0, 0xc(r3) -/* 8007E6E4 7C 00 20 50 */ subf r0, r0, r4 -/* 8007E6E8 B0 03 00 0E */ sth r0, 0xe(r3) -/* 8007E6EC B0 83 00 0C */ sth r4, 0xc(r3) -/* 8007E6F0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w_base/ClrDBgWBase__9dBgW_BaseFv.s b/asm/d/bg/d_bg_w_base/ClrDBgWBase__9dBgW_BaseFv.s deleted file mode 100644 index 765d4ae5552..00000000000 --- a/asm/d/bg/d_bg_w_base/ClrDBgWBase__9dBgW_BaseFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8007E69C: -/* 8007E69C 38 80 00 FF */ li r4, 0xff -/* 8007E6A0 98 83 00 09 */ stb r4, 9(r3) -/* 8007E6A4 38 00 00 02 */ li r0, 2 -/* 8007E6A8 98 03 00 08 */ stb r0, 8(r3) -/* 8007E6AC 98 83 00 0A */ stb r4, 0xa(r3) -/* 8007E6B0 38 80 00 00 */ li r4, 0 -/* 8007E6B4 B0 83 00 0E */ sth r4, 0xe(r3) -/* 8007E6B8 B0 83 00 0C */ sth r4, 0xc(r3) -/* 8007E6BC 90 83 00 10 */ stw r4, 0x10(r3) -/* 8007E6C0 38 00 00 01 */ li r0, 1 -/* 8007E6C4 98 03 00 14 */ stb r0, 0x14(r3) -/* 8007E6C8 98 83 00 0B */ stb r4, 0xb(r3) -/* 8007E6CC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w_base/__ct__9dBgW_BaseFv.s b/asm/d/bg/d_bg_w_base/__ct__9dBgW_BaseFv.s deleted file mode 100644 index 37c323d326d..00000000000 --- a/asm/d/bg/d_bg_w_base/__ct__9dBgW_BaseFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8007E5A8: -/* 8007E5A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007E5AC 7C 08 02 A6 */ mflr r0 -/* 8007E5B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007E5B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007E5B8 7C 7F 1B 78 */ mr r31, r3 -/* 8007E5BC 3C 80 80 3B */ lis r4, __vt__9cBgW_BgId@ha /* 0x803ABDB8@ha */ -/* 8007E5C0 38 04 BD B8 */ addi r0, r4, __vt__9cBgW_BgId@l /* 0x803ABDB8@l */ -/* 8007E5C4 90 03 00 04 */ stw r0, 4(r3) -/* 8007E5C8 38 00 01 00 */ li r0, 0x100 -/* 8007E5CC B0 03 00 00 */ sth r0, 0(r3) -/* 8007E5D0 3C 80 80 3B */ lis r4, __vt__9dBgW_Base@ha /* 0x803ABCC8@ha */ -/* 8007E5D4 38 04 BC C8 */ addi r0, r4, __vt__9dBgW_Base@l /* 0x803ABCC8@l */ -/* 8007E5D8 90 03 00 04 */ stw r0, 4(r3) -/* 8007E5DC 48 00 00 C1 */ bl ClrDBgWBase__9dBgW_BaseFv -/* 8007E5E0 7F E3 FB 78 */ mr r3, r31 -/* 8007E5E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007E5E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007E5EC 7C 08 03 A6 */ mtlr r0 -/* 8007E5F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007E5F4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w_base/__dt__9cBgW_BgIdFv.s b/asm/d/bg/d_bg_w_base/__dt__9cBgW_BgIdFv.s deleted file mode 100644 index f107298ae7a..00000000000 --- a/asm/d/bg/d_bg_w_base/__dt__9cBgW_BgIdFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8007E5F8: -/* 8007E5F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007E5FC 7C 08 02 A6 */ mflr r0 -/* 8007E600 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007E604 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007E608 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8007E60C 41 82 00 1C */ beq lbl_8007E628 -/* 8007E610 3C A0 80 3B */ lis r5, __vt__9cBgW_BgId@ha /* 0x803ABDB8@ha */ -/* 8007E614 38 05 BD B8 */ addi r0, r5, __vt__9cBgW_BgId@l /* 0x803ABDB8@l */ -/* 8007E618 90 1F 00 04 */ stw r0, 4(r31) -/* 8007E61C 7C 80 07 35 */ extsh. r0, r4 -/* 8007E620 40 81 00 08 */ ble lbl_8007E628 -/* 8007E624 48 25 07 19 */ bl __dl__FPv -lbl_8007E628: -/* 8007E628 7F E3 FB 78 */ mr r3, r31 -/* 8007E62C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007E630 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007E634 7C 08 03 A6 */ mtlr r0 -/* 8007E638 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007E63C 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h index 95434680376..87e50c9276f 100644 --- a/include/JSystem/J3DGraphBase/J3DVertex.h +++ b/include/JSystem/J3DGraphBase/J3DVertex.h @@ -2,6 +2,7 @@ #define J3DVERTEX_H #include "dolphin/gx/GX.h" +#include "dolphin/mtx/vec.h" #include "dolphin/types.h" class J3DModel; @@ -84,11 +85,11 @@ private: }; // Size: 0x38 struct VertexNormal { - u8 data[0xC]; + Vec data; }; struct VertexPosition { - u8 data[0xC]; + Vec data; }; #endif /* J3DVERTEX_H */ diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 3000479fa7c..eddabdabf30 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -3,19 +3,32 @@ #include "dolphin/types.h" +class cBgS_GrpPassChk { +public: + virtual ~cBgS_GrpPassChk(); +}; + +class cBgS_PolyPassChk; + class cBgS_Chk { private: - /* 0x0 */ u32 mPolyPassChk; - /* 0x4 */ u32 mGrpPassChk; + /* 0x0 */ cBgS_PolyPassChk* mPolyPassChk; + /* 0x4 */ cBgS_GrpPassChk* mGrpPassChk; /* 0x8 */ u32 mActorPid; /* 0xC */ u8 unk_0x0C; /* 0x10 */ // __vtable__ + public: - cBgS_Chk(void); - virtual ~cBgS_Chk(void); + cBgS_Chk(); void SetExtChk(cBgS_Chk&); bool ChkSameActorPid(unsigned int) const; + void setActorPid(u32 pid) { mActorPid = pid; } -}; // Size = 0x14 + u32 GetActorPid() const { return mActorPid; } + void SetPolyPassChk(cBgS_PolyPassChk* p_chk) { mPolyPassChk = p_chk; } + void SetGrpPassChk(cBgS_GrpPassChk* p_chk) { mGrpPassChk = p_chk; } + + virtual ~cBgS_Chk(void); +}; // 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 7c63a99c6a8..d1b2ceef598 100644 --- a/include/SSystem/SComponent/c_bg_s_gnd_chk.h +++ b/include/SSystem/SComponent/c_bg_s_gnd_chk.h @@ -7,15 +7,17 @@ #include "dolphin/types.h" class cBgS_GndChk : public cBgS_Chk, public cBgS_PolyInfo { +public: /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ virtual ~cBgS_GndChk(); /* 80267D28 */ void SetPos(cXyz const*); /* 80267D0C */ void SetPos(Vec const*); /* 80267D44 */ void PreCheck(); + /* 80267C94 */ virtual ~cBgS_GndChk(); + private: - /* 0x24 */ cXyz mPosition; - /* 0x30 */ s32 _30; + /* 0x24 */ cXyz m_pos; + /* 0x30 */ u32 mFlags; /* 0x34 */ f32 mNowY; /* 0x38 */ u32 mWallPrecheck; }; diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h index 8e42c128763..2db857959e1 100644 --- a/include/SSystem/SComponent/c_bg_s_lin_chk.h +++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h @@ -9,9 +9,9 @@ class cBgS_LinChk : public cBgS_Chk, public cBgS_PolyInfo { private: - /* 0x024 */ cM3dGLin mLin; + /* 0x024 */ cM3dGLin mLinP; /* 0x040 */ cXyz field_0x40; - /* 0x04C */ int field_0x4c; + /* 0x04C */ u32 field_0x4c; /* 0x050 */ bool mPreWallChk; /* 0x051 */ bool mPreGroundChk; /* 0x052 */ bool mPreRoofChk; @@ -19,11 +19,16 @@ private: /* 0x054 */ u8 mBackFlag; public: - cBgS_LinChk(void); - virtual ~cBgS_LinChk(void); - void ct(void); + cBgS_LinChk(); + void ct(); void Set2(const cXyz*, const cXyz*, unsigned int); - void PreCalc(void); + void PreCalc(); + + virtual ~cBgS_LinChk(); + + void ClrHit() { field_0x4c &= ~16; } + void SetHit() { field_0x4c |= 16; } + u32 ChkHit() const { return field_0x4c & 16; } }; #endif /* C_BG_S_LIN_CHK_H */ diff --git a/include/SSystem/SComponent/c_bg_s_poly_info.h b/include/SSystem/SComponent/c_bg_s_poly_info.h index ed0ca41b602..984c0cd5b9a 100644 --- a/include/SSystem/SComponent/c_bg_s_poly_info.h +++ b/include/SSystem/SComponent/c_bg_s_poly_info.h @@ -6,20 +6,24 @@ class cBgS_PolyInfo { private: /* 0x00 */ u16 mPolyIndex; - /* 0x02 */ u16 unk_0x02; + /* 0x02 */ u16 mBgIndex; /* 0x04 */ void* unk_0x04; /* 0x08 */ u32 unk_0x08; public: - cBgS_PolyInfo(void); - virtual ~cBgS_PolyInfo(void); - bool ChkSetInfo(void) const; - void ClearPi(void); + cBgS_PolyInfo(); + bool ChkSetInfo() const; + void ClearPi(); void SetPolyInfo(const cBgS_PolyInfo&); void SetActorInfo(int, void*, unsigned int); bool ChkSafe(const void*, unsigned int) const; void SetPolyIndex(int); - bool ChkBgIndex(void) const; -}; + bool ChkBgIndex() const; + + virtual ~cBgS_PolyInfo(); + + u16 GetPolyIndex() const { return mPolyIndex; } + u16 GetBgIndex() const { return mBgIndex; } +}; // Size: 0x10 #endif /* C_BG_S_POLY_INFO_H */ diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h index b46c178241a..9837f8a2e0b 100644 --- a/include/SSystem/SComponent/c_bg_w.h +++ b/include/SSystem/SComponent/c_bg_w.h @@ -4,14 +4,19 @@ #include "dolphin/types.h" class cBgW_BgId { -public: - void Regist(int a1); - void Release(); - - unsigned int ChkUsed() const; - private: - unsigned short mId; + /* 0x0 */ u16 m_id; + /* 0x4 vtable */ + +public: + /* 802681C8 */ void Release(); + /* 802681D4 */ bool ChkUsed() const; + /* 802681C0 */ void Regist(int); + + /* 8007E5F8 */ virtual ~cBgW_BgId(); + + cBgW_BgId() { Ct(); } + void Ct() { m_id = 0x100; } }; bool cBgW_CheckBGround(float a1); diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index a60742f190c..0f28e22048d 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -100,15 +100,22 @@ struct cXyz : Vec { } float getSquareMag() const { return PSVECSquareMag(this); } + f32 getSquareDistance(const Vec& other) const { return PSVECSquareDistance(this, &other); } static float getNearZeroValue() { return 8e-11f; } bool isNearZeroSquare() const { return (this->getSquareMag() < getNearZeroValue()); } f32 abs2() const { return this->getSquareMag(); } + f32 abs2(const Vec& other) const { return this->getSquareDistance(other); } f32 abs2XZ() const { cXyz tmp(this->x, 0, this->z); return tmp.abs2(); } + f32 abs2XZ(const Vec& other) const { + cXyz tmp(this->x, 0, this->z); + cXyz tmp2(other.x, 0, other.z); + return tmp.abs2(tmp2); + } f32 getMagXZ() const { return cXyz(this->x, 0, this->z).getSquareMag(); } }; diff --git a/include/d/bg/d_bg_pc.h b/include/d/bg/d_bg_pc.h index 863737a92b7..b1f91e96c29 100644 --- a/include/d/bg/d_bg_pc.h +++ b/include/d/bg/d_bg_pc.h @@ -3,4 +3,20 @@ #include "dolphin/types.h" +struct sBgPc { + /* 0x00 */ u32 code0; + /* 0x04 */ u32 code1; + /* 0x08 */ u32 code2; + /* 0x0C */ u32 code3; + /* 0x10 */ u32 code4; +}; // Size: 0x14 + +class dBgPc { +public: + void setCode(sBgPc&); + +private: + /* 0x0 */ sBgPc m_code; +}; + #endif /* D_BG_D_BG_PC_H */ diff --git a/include/d/bg/d_bg_plc.h b/include/d/bg/d_bg_plc.h index 9710355ed65..ed0c55085f8 100644 --- a/include/d/bg/d_bg_plc.h +++ b/include/d/bg/d_bg_plc.h @@ -1,6 +1,30 @@ #ifndef D_BG_D_BG_PLC_H #define D_BG_D_BG_PLC_H +#include "d/bg/d_bg_pc.h" #include "dolphin/types.h" +enum { + /* 0x14 */ ZELDA_CODE_SIZE = 0x14 +}; + +struct PLC { + /* 0x0 */ u32 magic; + /* 0x4 */ u16 m_code_size; + /* 0x6 */ u16 m_num; + // ... +}; + +class dBgPlc { +public: + /* 80074074 */ dBgPlc(); + /* 80074080 */ ~dBgPlc(); + /* 800740BC */ void setBase(void*); + /* 800740C4 */ void getCode(int, sBgPc**) const; + /* 800740DC */ void getGrpCode(int) const; + +private: + /* 0x00 */ void* m_base; +}; + #endif /* D_BG_D_BG_PLC_H */ diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index 0b759c8198a..0f8b51946b2 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -8,64 +8,52 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" -struct cBgW_BgId { - /* 802681C8 */ void Release(); - /* 802681D4 */ void ChkUsed() const; -}; - class cBgS_ChkElm { -private: - /* 0x00 */ dBgW_Base* bgw_base_pointer; - /* 0x04 */ u8 used; - /* 0x05 */ u8 padding[3]; - /* 0x08 */ u32 field_0x8; - /* 0x0C */ void* actor_pointer; - /* 0x10 vtable */ public: - cBgS_ChkElm(void) { this->Init(); } - virtual ~cBgS_ChkElm() {} + /* 0x00 */ dBgW_Base* m_bgw_base_ptr; + /* 0x04 */ bool m_used; + /* 0x08 */ u32 field_0x8; + /* 0x0C */ fopAc_ac_c* m_actor_ptr; + /* 0x10 vtable */ + +public: + cBgS_ChkElm() { this->Init(); } void Init(); - virtual void Regist2(dBgW_Base*, unsigned int, void*); void Release(); -}; // Size = 0x14 + + virtual ~cBgS_ChkElm() {} + virtual void Regist2(dBgW_Base*, unsigned int, void*); + + bool ChkUsed() const { return m_used; } +}; // Size: 0x14 STATIC_ASSERT(sizeof(cBgS_ChkElm) == 0x14); class cBgS { -private: - /* 0x0000 */ cBgS_ChkElm cbgs_elements[256]; +public: + /* 0x0000 */ cBgS_ChkElm m_chk_element[256]; /* 0x1400 vtable */ + public: cBgS() {} - virtual ~cBgS() {} - void Regist(dBgW_Base*, unsigned int, void*); + bool Regist(dBgW_Base*, unsigned int, void*); void Release(dBgW_Base*); + bool LineCross(cBgS_LinChk*); + f32 GroundCross(cBgS_GndChk*); + static void ConvDzb(void*); + fopAc_ac_c* GetActorPointer(int) const; + dBgW_Base* GetBgWBasePointer(cBgS_PolyInfo const&) const; + bool ChkPolySafe(cBgS_PolyInfo const&); + s32 GetGrpRoomId(cBgS_PolyInfo const&) const; + bool GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; + bool GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; + void ShdwDraw(cBgS_ShdwDraw*); + u32 GetGrpInf(cBgS_PolyInfo const&) const; + + virtual ~cBgS() {} virtual void Ct(); virtual void Dt(); - void LineCross(cBgS_LinChk*); - void GroundCross(cBgS_GndChk*); - void ConvDzb(void*); - void GetActorPointer(int) const; - void GetBgWBasePointer(cBgS_PolyInfo const&) const; - void ChkPolySafe(cBgS_PolyInfo const&); - void GetGrpRoomId(cBgS_PolyInfo const&) const; - void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; - void GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; - void ShdwDraw(cBgS_ShdwDraw*); - void GetGrpInf(cBgS_PolyInfo const&) const; -}; // Size = 0x1404 - -class dBgS_HIO { - /* 0x00 */ u8 vtable[4]; - /* 0x04 */ u8 field_0x4[2]; - /* 0x06 */ u16 field_0x6; - /* 0x08 */ u16 field_0x8; - /* 0x0A */ u8 field_0xa[2]; - /* 0x0C */ cXyz field_0xc; - /* 0x18 */ cXyz field_0x18; - /* 0x24 */ cXyz field_0x24; - /* 0x30 */ u8 field_0x30[4]; -}; +}; // Size: 0x1404 class dBgS_Acch; @@ -77,44 +65,45 @@ public: void Dt(); void ClrMoveFlag(); void Move(); - void Regist(dBgW_Base*, fopAc_ac_c*); - void ChkMoveBG(cBgS_PolyInfo const&); - void ChkMoveBG_NoDABg(cBgS_PolyInfo const&); - void GetExitId(cBgS_PolyInfo const&); - void GetPolyColor(cBgS_PolyInfo const&); - void GetHorseNoEntry(cBgS_PolyInfo const&); - void GetSpecialCode(cBgS_PolyInfo const&); - void GetMagnetCode(cBgS_PolyInfo const&); - void GetMonkeyBarsCode(cBgS_PolyInfo const&); - void GetUnderwaterRoofCode(cBgS_PolyInfo const&); - void GetWallCode(cBgS_PolyInfo const&); - void GetPolyAtt0(cBgS_PolyInfo const&); - void GetPolyAtt1(cBgS_PolyInfo const&); - void GetGroundCode(cBgS_PolyInfo const&); - void GetCamMoveBG(cBgS_PolyInfo const&); - void GetRoomCamId(cBgS_PolyInfo const&); - void GetRoomPathId(cBgS_PolyInfo const&); - void GetRoomPathPntNo(cBgS_PolyInfo const&); - void GetGrpSoundId(cBgS_PolyInfo const&); - void ChkGrpInf(cBgS_PolyInfo const&, u32); - void GetRoomId(cBgS_PolyInfo const&); - void GetPolyAttackThrough(cBgS_PolyInfo const&); - void ChkPolyHSStick(cBgS_PolyInfo const&); + bool Regist(dBgW_Base*, fopAc_ac_c*); + bool ChkMoveBG(cBgS_PolyInfo const&); + bool ChkMoveBG_NoDABg(cBgS_PolyInfo const&); + s32 GetExitId(cBgS_PolyInfo const&); + s32 GetPolyColor(cBgS_PolyInfo const&); + bool GetHorseNoEntry(cBgS_PolyInfo const&); + bool GetSpecialCode(cBgS_PolyInfo const&); + bool GetMagnetCode(cBgS_PolyInfo const&); + bool GetMonkeyBarsCode(cBgS_PolyInfo const&); + bool GetUnderwaterRoofCode(cBgS_PolyInfo const&); + bool GetWallCode(cBgS_PolyInfo const&); + bool GetPolyAtt0(cBgS_PolyInfo const&); + bool GetPolyAtt1(cBgS_PolyInfo const&); + bool GetGroundCode(cBgS_PolyInfo const&); + s32 GetCamMoveBG(cBgS_PolyInfo const&); + s32 GetRoomCamId(cBgS_PolyInfo const&); + s32 GetRoomPathId(cBgS_PolyInfo const&); + s32 GetRoomPathPntNo(cBgS_PolyInfo const&); + s32 GetGrpSoundId(cBgS_PolyInfo const&); + u32 ChkGrpInf(cBgS_PolyInfo const&, u32); + s32 GetRoomId(cBgS_PolyInfo const&); + bool GetPolyAttackThrough(cBgS_PolyInfo const&); + bool ChkPolyHSStick(cBgS_PolyInfo const&); void WallCorrect(dBgS_Acch*); void WallCorrectSort(dBgS_Acch*); - void RoofChk(dBgS_RoofChk*); - void SplGrpChk(dBgS_SplGrpChk*); + f32 RoofChk(dBgS_RoofChk*); + bool SplGrpChk(dBgS_SplGrpChk*); void SphChk(dBgS_SphChk*, void*); void MoveBgCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*, bool, bool); void MoveBgTransPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void MoveBgMatrixCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*); void ArrowStickCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, cXyz&); - void PushPullCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); + bool PushPullCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel); -private: - // /* 0x0000 */ cBgS cbgs; - // /* 0x1400 */ void* vtable; -}; + bool WaterChk(dBgS_SplGrpChk* chk) { return SplGrpChk(chk); } +}; // Size: 0x1404 + +bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const&); +bool dBgS_CheckBWallPoly(cBgS_PolyInfo const&); #endif /* D_BG_D_BG_S_H */ diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index b0e2facd96c..a1d6f5dc105 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -14,33 +14,66 @@ #include "dolphin/types.h" //#include "d/bg/d_bg_s.h" -class dBgS_AcchCir { +class dBgS_AcchCir : public cBgS_PolyInfo { +private: + /* 0x10 */ u32 m_flags; + /* 0x14 */ cM3dGCir m_cir; + /* 0x28 */ f32 m_wall_rr; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 m_wall_h; + /* 0x34 */ f32 m_wall_r; + /* 0x38 */ f32 m_wall_h_direct; + /* 0x3C */ s16 m_wall_angle_y; + public: + enum { + /* 0x2 */ WALL_HIT = 2, + /* 0x4 */ WALL_H_DIRECT = 4, + }; + /* 80075EAC */ dBgS_AcchCir(); /* 80075F14 */ void ClrWallHit(); /* 80075F40 */ void SetWallR(f32); /* 80075F48 */ void CalcWallRR(); /* 80075F58 */ void SetWall(f32, f32); /* 80075F80 */ void SetWallHDirect(f32); - /* 80077414 */ ~dBgS_AcchCir(); -private: - /* 0x00 */ cBgS_PolyInfo mPolyInfo; - /* 0x10 */ int mWallHit; - /* 0x14 */ cM3dGCir m3DGCir; - /* 0x28 */ float mWallRR; - /* 0x2C */ float field_0x2c; - /* 0x30 */ float mWallH; - /* 0x34 */ float mWallR; - /* 0x38 */ float mWallHDirect; - /* 0x3C */ s16 mWallAngleY; - /* 0x3E */ u8 padding[2]; + /* 80077414 */ virtual ~dBgS_AcchCir(); + + f32 GetWallH() { return m_wall_h; } + f32 GetWallR() { return m_wall_r; } + void SetWallH(f32 h) { m_wall_h = h; } + void ClrWallHDirect() { m_flags &= ~WALL_H_DIRECT; } + bool ChkWallHit() { return m_flags & WALL_HIT; } + + void SetCir(cXyz& pos) { m_cir.Set(pos.x, pos.z, pos.y + GetWallH(), m_wall_r); } }; class dBgS; -class dBgS_Acch { +class dBgS_Acch : public cBgS_Chk, public dBgS_Chk { public: - /* 80075F94 */ ~dBgS_Acch(); + enum { + /* 0x000002 */ GRND_NONE = (1 << 1), + /* 0x000004 */ WALL_NONE = (1 << 2), + /* 0x000008 */ ROOF_NONE = (1 << 3), + /* 0x000010 */ WALL_HIT = (1 << 4), + /* 0x000020 */ GROUND_HIT = (1 << 5), + /* 0x000040 */ GROUND_FIND = (1 << 6), + /* 0x000080 */ GROUND_LANDING = (1 << 7), + /* 0x000100 */ GROUND_AWAY = (1 << 8), + /* 0x000200 */ ROOF_HIT = (1 << 9), + /* 0x000800 */ WATER_HIT = (1 << 11), + /* 0x001000 */ WATER_IN = (1 << 12), + /* 0x002000 */ LINE_CHECK = (1 << 13), + /* 0x004000 */ LINE_CHECK_NONE = (1 << 14), + /* 0x008000 */ CLR_SPEED_Y = (1 << 15), + /* 0x010000 */ LINE_CHECK_HIT = (1 << 16), + /* 0x100000 */ MOVE_BG_ONLY = (1 << 20), + /* 0x200000 */ GND_THIN_CELLING_OFF = (1 << 21), + /* 0x400000 */ WALL_SORT = (1 << 22), + /* 0x800000 */ LINE_DOWN = (1 << 23), + }; + /* 800760A0 */ dBgS_Acch(); /* 800761CC */ void Init(); /* 80076288 */ void Set(fopAc_ac_c*, int, dBgS_AcchCir*); @@ -50,14 +83,14 @@ public: /* 8007654C */ void GroundRoofProc(dBgS&); /* 80076624 */ void LineCheck(dBgS&); /* 80076AAC */ void CrrPos(dBgS&); - /* 80076F84 */ void GetWallAllR(); + /* 80076F84 */ f32 GetWallAllR(); /* 80076FC0 */ void SetWallCir(); /* 8007703C */ void CalcWallBmdCyl(); /* 80077114 */ void SetGroundUpY(f32); - /* 80077128 */ void GetWallAllLowH(); - /* 80077178 */ void GetWallAllLowH_R(); - /* 800771E4 */ void GetSpeedY(); - /* 80077200 */ void GetWallAddY(Vec&); + /* 80077128 */ f32 GetWallAllLowH(); + /* 80077178 */ f32 GetWallAllLowH_R(); + /* 800771E4 */ f32 GetSpeedY(); + /* 80077200 */ f32 GetWallAddY(Vec&); /* 80077278 */ void SetNowActorInfo(int, void*, unsigned int); /* 80077288 */ void SetWallPolyIndex(int, int); /* 800772E8 */ void CalcMovePosWork(); @@ -66,56 +99,90 @@ public: /* 800773A4 */ void ClrMoveBGOnly(); /* 800773C0 */ void SetGndThinCellingOff(); /* 800773D0 */ void ClrGndThinCellingOff(); - /* 800773E0 */ void ChkGndThinCellingOff(); + /* 800773E0 */ bool ChkGndThinCellingOff(); /* 800773EC */ void OnWallSort(); - /* 800773FC */ void ChkWallSort(); - /* 80077408 */ void ChkLineDown(); - /* 800D00D0 */ void ChkRoofHit() const; + /* 800773FC */ bool ChkWallSort(); + /* 80077408 */ bool ChkLineDown(); + /* 800D00D0 */ bool ChkRoofHit() const; /* 800D00DC */ void ClrGroundHit(); - /* 80141404 */ void ChkGroundHit() const; + /* 80141404 */ bool ChkGroundHit() const; - float GetGroundH() const { return mGroundH; } + /* 80075F94 */ virtual ~dBgS_Acch(); -private: - /* 0x000 */ cBgS_Chk field_0x000; - /* 0x014 */ dBgS_Chk field_0x014; - /* 0x02C */ int field_0x2c; - /* 0x030 */ cXyz* mPos; - /* 0x034 */ cXyz* mOldPos; - /* 0x038 */ cXyz* mSpeed; - /* 0x03C */ csXyz* mAngle; - /* 0x040 */ csXyz* mShapeAngle; - /* 0x044 */ cM3dGLin field_0x44; - /* 0x060 */ cM3dGCyl mWallBmdCyl; - /* 0x078 */ int field_0x78; + cXyz* GetPos() { return pm_pos; } + cXyz* GetOldPos() { return pm_old_pos; } + f32 GetGroundH() const { return m_ground_h; } + void SetLin() { m_lin.SetStartEnd(*pm_old_pos, *pm_pos); } + bool ChkGroundFind() { return m_flags & GROUND_FIND; } + bool ChkGroundHit() { return m_flags & GROUND_HIT; } + void ClrGroundLanding() { m_flags &= ~GROUND_LANDING; } + void ClrGroundAway() { m_flags &= ~GROUND_AWAY; } + void ClrWallHit() { m_flags &= ~WALL_HIT; } + void SetRoofNone() { m_flags |= ROOF_NONE; } + void SetRoofHit() { m_flags |= ROOF_HIT; } + bool ChkWallHit() { return m_flags & WALL_HIT; } + void OffLineCheckHit() { m_flags &= ~LINE_CHECK_HIT; } + bool ChkLineCheckNone() { return m_flags & LINE_CHECK_NONE; } + bool ChkLineCheck() { return m_flags & LINE_CHECK; } + void ClrRoofHit() { m_flags &= ~ROOF_HIT; } + void ClrWaterHit() { m_flags &= ~WATER_HIT; } + void SetWaterHit() { m_flags |= WATER_HIT; } + void ClrWaterIn() { m_flags &= ~WATER_IN; } + void SetWaterIn() { m_flags |= WATER_IN; } + void ClrGroundFind() { m_flags &= ~GROUND_FIND; } + u32 MaskRoofHit() { return m_flags & ROOF_HIT; } + bool ChkRoofHit() { return MaskRoofHit(); } + bool ChkClrSpeedY() { return m_flags & CLR_SPEED_Y; } + void SetGroundFind() { m_flags |= GROUND_FIND; } + void SetGroundHit() { m_flags |= GROUND_HIT; } + void SetGroundLanding() { m_flags |= GROUND_LANDING; } + void SetGroundAway() { m_flags |= GROUND_AWAY; } + + // inline dupe + void i_ClrGroundHit() { m_flags &= ~GROUND_HIT; } + +public: + /* 0x02C */ u32 m_flags; + /* 0x030 */ cXyz* pm_pos; + /* 0x034 */ cXyz* pm_old_pos; + /* 0x038 */ cXyz* pm_speed; + /* 0x03C */ csXyz* pm_angle; + /* 0x040 */ csXyz* pm_shape_angle; + /* 0x044 */ cM3dGLin m_lin; + /* 0x060 */ cM3dGCyl m_wall_cyl; + /* 0x078 */ int m_bg_index; /* 0x07C */ void* field_0x7c; /* 0x080 */ u32 field_0x80; - /* 0x084 */ fopAc_ac_c* mMyAc; + /* 0x084 */ fopAc_ac_c* m_my_ac; /* 0x088 */ int m_tbl_size; /* 0x08C */ dBgS_AcchCir* field_0x8c; - /* 0x090 */ float field_0x90; - /* 0x094 */ float field_0x94; - /* 0x098 */ float mGroundH; - /* 0x09C */ float field_0x9c; + /* 0x090 */ f32 field_0x90; + /* 0x094 */ f32 field_0x94; + /* 0x098 */ f32 m_ground_h; + /* 0x09C */ f32 field_0x9c; /* 0x0A0 */ cM3dGPla field_0xa0; - /* 0x0B4 */ u8 field_0xb4[4]; - /* 0x0B8 */ float field_0xb8; - /* 0x0BC */ float field_0xbc; - /* 0x0C0 */ u8 field_0xc0[4]; - /* 0x0C4 */ float mRoofHeight; - /* 0x0C8 */ float mRoofCrrHeight; - /* 0x0CC */ float field_0xcc; - /* 0x0D0 */ float mWaterCheckOffset; + /* 0x0B4 */ u8 field_0xb4; + /* 0x0B8 */ f32 field_0xb8; + /* 0x0BC */ f32 field_0xbc; + /* 0x0C0 */ u8 field_0xc0; + /* 0x0C4 */ f32 m_roof_height; + /* 0x0C8 */ f32 m_roof_crr_height; + /* 0x0CC */ f32 field_0xcc; + /* 0x0D0 */ f32 m_wtr_chk_offset; /* 0x0D4 */ int field_0xd4; - /* 0x0D8 */ float field_0xd8; - /* 0x0DC */ dBgS_GndChk mGndChk; - /* 0x130 */ dBgS_RoofChk mRoofChk; - /* 0x180 */ dBgS_WtrChk mWtrChk; - /* 0x1D4 */ u8 mWtrChkMode; + /* 0x0D8 */ f32 field_0xd8; + /* 0x0DC */ dBgS_GndChk m_gnd; + /* 0x130 */ dBgS_RoofChk m_roof; + /* 0x180 */ dBgS_WtrChk m_wtr; + /* 0x1D4 */ u8 m_wtr_mode; }; class dBgS_LinkAcch : public dBgS_Acch { - /* 80140F30 */ ~dBgS_LinkAcch(); + /* 80140F30 */ virtual ~dBgS_LinkAcch(); +}; + +class dBgS_ObjAcch : public dBgS_Acch { + /* 80BB336C */ virtual ~dBgS_ObjAcch(); }; #endif /* D_BG_D_BG_S_ACCH_H */ diff --git a/include/d/bg/d_bg_s_chk.h b/include/d/bg/d_bg_s_chk.h index 549b8c2eedb..fb0a238abb0 100644 --- a/include/d/bg/d_bg_s_chk.h +++ b/include/d/bg/d_bg_s_chk.h @@ -5,16 +5,13 @@ #include "d/bg/d_bg_s_poly_pass_chk.h" #include "dolphin/types.h" -class dBgS_Chk { +class dBgS_Chk : public dBgS_PolyPassChk, public dBgS_GrpPassChk { public: /* 8007749C */ dBgS_Chk(); - /* 800774E8 */ ~dBgS_Chk(); - /* 80077560 */ void GetPolyPassChkInfo(); - /* 80077564 */ void GetGrpPassChkInfo(); + /* 80077560 */ cBgS_PolyPassChk* GetPolyPassChkInfo(); + /* 80077564 */ cBgS_GrpPassChk* GetGrpPassChkInfo(); -private: - /* 0x000 */ dBgS_PolyPassChk mPolyPassChkInfo; - /* 0x010 */ dBgS_GrpPassChk mGrpPassChkInfo; -}; // Size = 0x18 + /* 800774E8 */ virtual ~dBgS_Chk(); +}; // Size: 0x18 #endif /* D_BG_D_BG_S_CHK_H */ diff --git a/include/d/bg/d_bg_s_gnd_chk.h b/include/d/bg/d_bg_s_gnd_chk.h index bdd5831102a..5087082ca80 100644 --- a/include/d/bg/d_bg_s_gnd_chk.h +++ b/include/d/bg/d_bg_s_gnd_chk.h @@ -5,21 +5,55 @@ #include "d/bg/d_bg_s_chk.h" #include "dolphin/types.h" -class dBgS_GndChk : public cBgS_GndChk { +class dBgS_GndChk : public cBgS_GndChk, public dBgS_Chk { public: /* 8007757C */ dBgS_GndChk(); - virtual void temp(); // temp to build OK /* 800775F0 */ virtual ~dBgS_GndChk(); +}; // Size: 0x54 -private: - /* 0x3C */ dBgS_Chk mChk; -}; // Size = 0x54 - -class dBgS_LinkGndChk : dBgS_GndChk { - virtual void temp(); // temp to build OK +class dBgS_LinkGndChk : public dBgS_GndChk { +public: /* 80140EB8 */ virtual ~dBgS_LinkGndChk(); }; -class dBgS_ObjGndChk : dBgS_GndChk {}; +class dBgS_ObjGndChk : public dBgS_GndChk { +public: + dBgS_ObjGndChk() { SetObj(); } + + /* 8001E020 */ virtual ~dBgS_ObjGndChk(); +}; + +class dBgS_ObjGndChk_Wtr : public dBgS_ObjGndChk { +public: + /* 80077678 */ dBgS_ObjGndChk_Wtr(); + + /* 80077710 */ virtual ~dBgS_ObjGndChk_Wtr(); +}; + +class dBgS_ObjGndChk_Spl : public dBgS_ObjGndChk { +public: + /* 800777B0 */ dBgS_ObjGndChk_Spl(); + + /* 80077848 */ virtual ~dBgS_ObjGndChk_Spl(); +}; + +class dBgS_ObjGndChk_All : public dBgS_ObjGndChk { +public: + /* 800778E8 */ virtual ~dBgS_ObjGndChk_All(); +}; + +class dBgS_CamGndChk : public dBgS_GndChk { +public: + dBgS_CamGndChk() { SetCam(); } + + /* 80077988 */ virtual ~dBgS_CamGndChk(); +}; + +class dBgS_CamGndChk_Wtr : public dBgS_CamGndChk { +public: + /* 80077A00 */ dBgS_CamGndChk_Wtr(); + + /* 80077A98 */ virtual ~dBgS_CamGndChk_Wtr(); +}; #endif /* D_BG_D_BG_S_GND_CHK_H */ diff --git a/include/d/bg/d_bg_s_grp_pass_chk.h b/include/d/bg/d_bg_s_grp_pass_chk.h index eb5e06d579f..5d426af4ccf 100644 --- a/include/d/bg/d_bg_s_grp_pass_chk.h +++ b/include/d/bg/d_bg_s_grp_pass_chk.h @@ -1,22 +1,27 @@ #ifndef D_BG_D_BG_S_GRP_PASS_CHK_H #define D_BG_D_BG_S_GRP_PASS_CHK_H +#include "SSystem/SComponent/c_bg_s_chk.h" #include "dolphin/types.h" -class cBgS_GrpPassChk { -public: - ~cBgS_GrpPassChk(); - - void* vtable; -}; - class dBgS_GrpPassChk : public cBgS_GrpPassChk { public: + enum { + /* 0x1 */ NORMAL_GRP = 1, + /* 0x2 */ WATER_GRP + }; + /* 80077BA0 */ dBgS_GrpPassChk(); - /* 80077BC4 */ ~dBgS_GrpPassChk(); + + /* 80077BC4 */ virtual ~dBgS_GrpPassChk(); + + void OnWaterGrp() { mGrp |= WATER_GRP; } + void OnSpl() { mGrp |= WATER_GRP; } + void OnNormalGrp() { mGrp |= NORMAL_GRP; } + void OffNormalGrp() { mGrp &= ~NORMAL_GRP; } private: - u32 mGrp; + /* 0x4 */ u32 mGrp; }; #endif /* D_BG_D_BG_S_GRP_PASS_CHK_H */ diff --git a/include/d/bg/d_bg_s_lin_chk.h b/include/d/bg/d_bg_s_lin_chk.h index 33029a5acbc..b1544967720 100644 --- a/include/d/bg/d_bg_s_lin_chk.h +++ b/include/d/bg/d_bg_s_lin_chk.h @@ -6,46 +6,78 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" -class dBgS_LinChk { +class dBgS_LinChk : public cBgS_LinChk, public dBgS_Chk { public: /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -private: - /* 0x00 */ cBgS_LinChk mLinChk; - /* 0x58 */ dBgS_Chk mChk; + /* 80077CDC */ virtual ~dBgS_LinChk(); + + /* 0x00 cBgS_LinChk */; + /* 0x58 dBgS_Chk */; }; -class dBgS_LinkLinChk : dBgS_LinChk { +class dBgS_LinkLinChk : public dBgS_LinChk { public: /* 80078030 */ dBgS_LinkLinChk(); - /* 8007808C */ ~dBgS_LinkLinChk(); + + /* 8007808C */ virtual ~dBgS_LinkLinChk(); }; -class dBgS_RopeLinChk : dBgS_LinChk { +class dBgS_RopeLinChk : public dBgS_LinChk { +public: /* 8007838C */ dBgS_RopeLinChk(); - /* 800783E8 */ ~dBgS_RopeLinChk(); + + /* 800783E8 */ virtual ~dBgS_RopeLinChk(); }; -class dBgS_BoomerangLinChk : dBgS_LinChk { +class dBgS_BoomerangLinChk : public dBgS_LinChk { +public: /* 800782B8 */ dBgS_BoomerangLinChk(); - /* 80078314 */ ~dBgS_BoomerangLinChk(); + + /* 80078314 */ virtual ~dBgS_BoomerangLinChk(); }; -class dBgS_ArrowLinChk : dBgS_LinChk { +class dBgS_ArrowLinChk : public dBgS_LinChk { +public: /* 800781D8 */ dBgS_ArrowLinChk(); - /* 80078240 */ ~dBgS_ArrowLinChk(); + + /* 80078240 */ virtual ~dBgS_ArrowLinChk(); }; -class dBgS_ObjLinChk : dBgS_LinChk { +class dBgS_ObjLinChk : public dBgS_LinChk { +public: /* 80077F5C */ dBgS_ObjLinChk(); - /* 80077FB8 */ ~dBgS_ObjLinChk(); + + /* 80077FB8 */ virtual ~dBgS_ObjLinChk(); }; -class dBgS_BombLinChk : dBgS_LinChk { +class dBgS_BombLinChk : public dBgS_LinChk { +public: /* 80078104 */ dBgS_BombLinChk(); - /* 80078160 */ ~dBgS_BombLinChk(); + + /* 80078160 */ virtual ~dBgS_BombLinChk(); +}; + +class dBgS_HorseLinChk : public dBgS_LinChk { +public: + /* 80078460 */ dBgS_HorseLinChk(); + + /* 800784BC */ virtual ~dBgS_HorseLinChk(); +}; + +class dBgS_CamLinChk : public dBgS_LinChk { +public: + /* 80077DA4 */ dBgS_CamLinChk(); + + /* 80077E00 */ virtual ~dBgS_CamLinChk(); +}; + +class dBgS_CamLinChk_NorWtr : public dBgS_CamLinChk { +public: + /* 80077E78 */ dBgS_CamLinChk_NorWtr(); + + /* 80077EE4 */ virtual ~dBgS_CamLinChk_NorWtr(); }; #endif /* D_BG_D_BG_S_LIN_CHK_H */ diff --git a/include/d/bg/d_bg_s_movebg_actor.h b/include/d/bg/d_bg_s_movebg_actor.h index 3f588b15f30..2eacdec49e5 100644 --- a/include/d/bg/d_bg_s_movebg_actor.h +++ b/include/d/bg/d_bg_s_movebg_actor.h @@ -1,6 +1,38 @@ #ifndef D_BG_D_BG_S_MOVEBG_ACTOR_H #define D_BG_D_BG_S_MOVEBG_ACTOR_H +#include "SSystem/SComponent/c_bg_s_poly_info.h" +#include "d/bg/d_bg_w.h" #include "dolphin/types.h" +class dBgW; +typedef void (*MoveBGActor_SetFunc)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, + csXyz*); + +class dBgS_MoveBgActor : public fopAc_ac_c { +private: + /* 0x568 */ dBgW* field_0x568; + /* 0x56C */ Mtx field_0x56c; + +public: + /* 80078624 */ dBgS_MoveBgActor(); + /* 800786C8 */ int MoveBGCreateHeap(); + /* 800787BC */ int MoveBGCreate(char const*, int, MoveBGActor_SetFunc, u32, Mtx*); + /* 800788DC */ bool MoveBGDelete(); + /* 80078950 */ bool MoveBGExecute(); + + /* 80078688 */ virtual s32 CreateHeap(); + /* 80078690 */ virtual bool Create(); + /* 80078698 */ virtual bool Execute(f32 (**)[3][4]); + /* 800786A0 */ virtual bool Draw(); + /* 800786A8 */ virtual bool Delete(); + /* 800786B0 */ virtual bool IsDelete(); + /* 800786B8 */ virtual bool ToFore(); + /* 800786C0 */ virtual bool ToBack(); + + static const char* m_name; + static int m_dzb_id; + static MoveBGActor_SetFunc m_set_func; +}; + #endif /* D_BG_D_BG_S_MOVEBG_ACTOR_H */ diff --git a/include/d/bg/d_bg_s_poly_pass_chk.h b/include/d/bg/d_bg_s_poly_pass_chk.h index 0fb5100aee0..c5aff507f4e 100644 --- a/include/d/bg/d_bg_s_poly_pass_chk.h +++ b/include/d/bg/d_bg_s_poly_pass_chk.h @@ -11,7 +11,6 @@ public: class dBgS_PolyPassChk : public cBgS_PolyPassChk { public: dBgS_PolyPassChk(); - virtual void temp(); // temp to build OK, remove later virtual ~dBgS_PolyPassChk(); bool ChkArrow() { return mArrow; } diff --git a/include/d/bg/d_bg_s_roof_chk.h b/include/d/bg/d_bg_s_roof_chk.h index 2fbdc6da07f..78a4e64f333 100644 --- a/include/d/bg/d_bg_s_roof_chk.h +++ b/include/d/bg/d_bg_s_roof_chk.h @@ -7,25 +7,26 @@ #include "d/bg/d_bg_s_chk.h" #include "dolphin/types.h" -class dBgS_RoofChk { +class dBgS_RoofChk : public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk { public: /* 80078FF4 */ dBgS_RoofChk(); - /* 80079090 */ ~dBgS_RoofChk(); /* 80079124 */ void Init(); /* 800B146C */ void SetPos(cXyz const&); + /* 80079090 */ virtual ~dBgS_RoofChk(); + + void SetNowY(f32 y) { mNowY = y; } + void i_SetPos(cXyz const& pos) { m_pos = pos; } + private: - /* 0x00 */ cBgS_PolyInfo field_0x00; - /* 0x10 */ cBgS_Chk field_0x10; - /* 0x24 */ dBgS_Chk field_0x24; /* 0x3C */ cXyz m_pos; /* 0x48 */ int field_0x48; - /* 0x4C */ float mNowY; -}; // Size = 0x50 + /* 0x4C */ f32 mNowY; +}; // Size: 0x50 class dBgS_LinkRoofChk : dBgS_RoofChk { public: - /* 80140E40 */ ~dBgS_LinkRoofChk(); + /* 80140E40 */ virtual ~dBgS_LinkRoofChk(); }; #endif /* D_BG_D_BG_S_ROOF_CHK_H */ diff --git a/include/d/bg/d_bg_s_sph_chk.h b/include/d/bg/d_bg_s_sph_chk.h index 07ede4cc1e4..6a5225ace12 100644 --- a/include/d/bg/d_bg_s_sph_chk.h +++ b/include/d/bg/d_bg_s_sph_chk.h @@ -1,6 +1,25 @@ #ifndef D_BG_D_BG_S_SPH_CHK_H #define D_BG_D_BG_S_SPH_CHK_H +#include "SSystem/SComponent/c_bg_s_poly_info.h" +#include "SSystem/SComponent/c_m3d_g_pla.h" +#include "SSystem/SComponent/c_m3d_g_sph.h" +#include "d/bg/d_bg_s_chk.h" #include "dolphin/types.h" +struct cBgD_Vtx_t; + +class dBgS_SphChk; +typedef void* (*SphChk_Callback)(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*); + +class dBgS_SphChk : public cM3dGSph, public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk { +public: + /* 80078A14 */ dBgS_SphChk(); + + /* 80078AC0 */ virtual ~dBgS_SphChk(); + +private: + /* 0x50 */ SphChk_Callback mCallback; +}; + #endif /* D_BG_D_BG_S_SPH_CHK_H */ diff --git a/include/d/bg/d_bg_s_spl_grp_chk.h b/include/d/bg/d_bg_s_spl_grp_chk.h index 4fb3645b49a..76d4f0212e0 100644 --- a/include/d/bg/d_bg_s_spl_grp_chk.h +++ b/include/d/bg/d_bg_s_spl_grp_chk.h @@ -7,21 +7,33 @@ #include "d/bg/d_bg_s_chk.h" #include "dolphin/types.h" -class dBgS_SplGrpChk { +class dBgS_SplGrpChk : public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk { public: + enum { + /* 0x1 */ FIND = 1, + /* 0x2 */ IN = 2, + /* 0x4 */ MOVE_BG_ONLY = 4 + }; + /* 80078B90 */ void Set(cXyz&, f32); /* 80078BB0 */ dBgS_SplGrpChk(); - /* 80078C78 */ ~dBgS_SplGrpChk(); /* 80078D0C */ void Init(); + /* 80078C78 */ virtual ~dBgS_SplGrpChk(); + + void OffFind() { m_flags &= ~FIND; } + void OffIn() { m_flags &= ~IN; } + void OffMoveBGOnly() { m_flags &= ~MOVE_BG_ONLY; } + void OnMoveBGOnly() { m_flags |= MOVE_BG_ONLY; } + void SetHeight(f32 height) { m_height = height; } + f32 GetHeight() { return m_height; } + cXyz& GetPosP() { return m_ground; } + private: - /* 0x00 */ cBgS_PolyInfo field_0x00; - /* 0x10 */ cBgS_Chk field_0x10; - /* 0x24 */ dBgS_Chk field_0x24; /* 0x3C */ cXyz m_ground; - /* 0x48 */ float mRoof; - /* 0x4C */ float mHeight; - /* 0x50 */ int field_0x50; -}; // Size = 0x54 + /* 0x48 */ f32 m_roof; + /* 0x4C */ f32 m_height; + /* 0x50 */ u32 m_flags; +}; // Size: 0x54 #endif /* D_BG_D_BG_S_SPL_GRP_CHK_H */ diff --git a/include/d/bg/d_bg_s_wtr_chk.h b/include/d/bg/d_bg_s_wtr_chk.h index 79a6806bab1..2ea0f5e51cf 100644 --- a/include/d/bg/d_bg_s_wtr_chk.h +++ b/include/d/bg/d_bg_s_wtr_chk.h @@ -4,12 +4,11 @@ #include "d/bg/d_bg_s_spl_grp_chk.h" #include "dolphin/types.h" -class dBgS_WtrChk { +class dBgS_WtrChk : public dBgS_SplGrpChk { public: /* 80079164 */ dBgS_WtrChk(); -private: - /* 0x00 */ dBgS_SplGrpChk mSplGrp; -}; // Size = 0x54 + /* 8001DF30 */ virtual ~dBgS_WtrChk(); +}; // Size: 0x54 #endif /* D_BG_D_BG_S_WTR_CHK_H */ diff --git a/include/d/bg/d_bg_w.h b/include/d/bg/d_bg_w.h index 8580ef0f94a..121895ba9e4 100644 --- a/include/d/bg/d_bg_w.h +++ b/include/d/bg/d_bg_w.h @@ -1,6 +1,7 @@ #ifndef D_BG_D_BG_W_H #define D_BG_D_BG_W_H +#include "JSystem/J3DGraphBase/J3DVertex.h" #include "SSystem/SComponent/c_bg_s_gnd_chk.h" #include "SSystem/SComponent/c_bg_s_lin_chk.h" #include "SSystem/SComponent/c_bg_s_poly_info.h" @@ -8,81 +9,74 @@ #include "d/bg/d_bg_s_acch.h" #include "d/bg/d_bg_s_grp_pass_chk.h" #include "d/bg/d_bg_s_poly_pass_chk.h" +#include "d/bg/d_bg_w_base.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" struct dBgS_CaptPoly {}; -struct dBgS_SphChk {}; - -struct cBgW_TriElm { - /* 800796F8 */ ~cBgW_TriElm(); +class cBgW_TriElm : public cM3dGPla { +public: /* 80079754 */ cBgW_TriElm(); + + /* 800796F8 */ virtual ~cBgW_TriElm(); }; -struct cBgW_RwgElm { +class cBgW_RwgElm { +private: + /* 0x0 */ u8 field_0x0[4]; + +public: /* 800791C4 */ cBgW_RwgElm(); - /* 800791D4 */ ~cBgW_RwgElm(); + + /* 800791D4 */ virtual ~cBgW_RwgElm(); }; -struct cBgW_NodeTree { +class cBgW_NodeTree : public cM3dGAab { +public: /* 8007921C */ cBgW_NodeTree(); - /* 80079238 */ ~cBgW_NodeTree(); + + /* 80079238 */ virtual ~cBgW_NodeTree(); }; -struct cBgW_GrpElm { - /* 8007A184 */ ~cBgW_GrpElm(); +class cBgW_GrpElm : public cM3dGAab { +public: /* 8007A1E4 */ cBgW_GrpElm(); -}; -struct cBgS_ShdwDraw {}; + /* 8007A184 */ virtual ~cBgW_GrpElm(); +}; struct cBgD_t {}; -struct cBgW { +class cBgW : public dBgW_Base { +public: /* 80079294 */ cBgW(); - /* 8007933C */ ~cBgW(); /* 800793A4 */ void FreeArea(); /* 800793C4 */ void GlobalVtx(); /* 80079484 */ void SetVtx(); - /* 80079564 */ void CalcPlane(); /* 80079668 */ void SetTri(); /* 80079770 */ void BlckConnect(u16*, int*, int); - /* 800797BC */ void ClassifyPlane(); /* 8007998C */ void MakeBlckTransMinMax(cXyz*, cXyz*); /* 800799E0 */ void MakeBlckMinMax(int, cXyz*, cXyz*); /* 80079A68 */ void MakeBlckBnd(int, cXyz*, cXyz*); /* 80079BDC */ void MakeNodeTreeRp(int); /* 80079CC4 */ void MakeNodeTreeGrpRp(int); /* 80079DF0 */ void MakeNodeTree(); - /* 80079EEC */ void ChkMemoryError(); - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); + /* 80079F38 */ bool Set(cBgD_t*, u32, f32 (*)[3][4]); /* 8007A200 */ void RwgLineCheck(u16, cBgS_LinChk*); /* 8007A3A0 */ void LineCheckRp(cBgS_LinChk*, int); /* 8007A52C */ void LineCheckGrpRp(cBgS_LinChk*, int, int); - /* 8007A658 */ void LineCheck(cBgS_LinChk*); /* 8007A680 */ void RwgGroundCheckCommon(f32, u16, cBgS_GndChk*); /* 8007A774 */ void RwgGroundCheckGnd(u16, cBgS_GndChk*); /* 8007A824 */ void RwgGroundCheckWall(u16, cBgS_GndChk*); /* 8007A8F4 */ void GroundCrossRp(cBgS_GndChk*, int); /* 8007AA50 */ void GroundCrossGrpRp(cBgS_GndChk*, int, int); - /* 8007AB9C */ void GroundCross(cBgS_GndChk*); /* 8007ABC4 */ void CopyOldMtx(); /* 8007AC10 */ void Move(); /* 8007ADF0 */ void RwgShdwDraw(int, cBgS_ShdwDraw*); /* 8007AEA4 */ void ShdwDrawRp(cBgS_ShdwDraw*, int); /* 8007AFC0 */ void ShdwDrawGrpRp(cBgS_ShdwDraw*, int); - /* 8007B084 */ void ShdwDraw(cBgS_ShdwDraw*); - /* 8007B0A8 */ bool ChkPolyThrough(int, cBgS_PolyPassChk*); - /* 8007B0B0 */ void ChkShdwDrawThrough(int, cBgS_PolyPassChk*); - /* 8007B0DC */ bool ChkGrpThrough(int, cBgS_GrpPassChk*, int); - /* 8007B0E4 */ void GetGrpRoomIndex(cBgS_PolyInfo const&) const; - /* 8007B164 */ void GetBnd() const; /* 8007B17C */ void GetTrans(cXyz*) const; - /* 8007B1B4 */ void GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; - /* 8007B240 */ void GetTopUnder(f32*, f32*) const; - /* 8007B270 */ void GetTriPla(cBgS_PolyInfo const&) const; - /* 8007B2B0 */ void GetGrpInf(cBgS_PolyInfo const&) const; /* 8007B2F4 */ void GetPolyInfId(int) const; /* 8007B30C */ void GetPolyInf0(int, u32, u32) const; /* 8007B360 */ void GetMaskPolyInf0_NoShift(int, u32) const; @@ -90,104 +84,177 @@ struct cBgW { /* 8007B78C */ void GetMaskPolyInf1_NoShift(int, u32) const; /* 8007B824 */ void GetPolyInf2(int, u32, u32) const; /* 8007B930 */ void GetTriGrp(int) const; - /* 8007B948 */ void ChkNotReady() const; - /* 8007B958 */ void ChkLock() const; - /* 8007B964 */ void ChkMoveBg() const; + + /* 8007933C */ virtual ~cBgW(); + /* 80079EEC */ virtual void ChkMemoryError(); + /* 8007B948 */ virtual void ChkNotReady() const; + /* 8007B958 */ virtual bool ChkLock() const; + /* 8007B964 */ virtual bool ChkMoveBg() const; + virtual u32 ChkMoveFlag() const = 0; + /* 8007B270 */ virtual void GetTriPla(cBgS_PolyInfo const&) const; + /* 8007B1B4 */ virtual bool GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; + /* 8007B164 */ virtual void GetBnd() const; + /* 8007B2B0 */ virtual u32 GetGrpInf(cBgS_PolyInfo const&) const; + virtual void OffMoveFlag() = 0; + /* 8007B240 */ virtual void GetTopUnder(f32*, f32*) const; + /* 8007A658 */ virtual bool LineCheck(cBgS_LinChk*); + /* 8007AB9C */ virtual void GroundCross(cBgS_GndChk*); + /* 8007B084 */ virtual void ShdwDraw(cBgS_ShdwDraw*); + virtual void CaptPoly(dBgS_CaptPoly&) = 0; + virtual void WallCorrect(dBgS_Acch*) = 0; + virtual void WallCorrectSort(dBgS_Acch*) = 0; + virtual void RoofChk(dBgS_RoofChk*) = 0; + virtual void SplGrpChk(dBgS_SplGrpChk*) = 0; + virtual void SphChk(dBgS_SphChk*, void*) = 0; + /* 8007B0E4 */ virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const; + virtual s32 GetExitId(cBgS_PolyInfo const&) = 0; + virtual s32 GetPolyColor(cBgS_PolyInfo const&) = 0; + virtual bool GetHorseNoEntry(cBgS_PolyInfo const&) = 0; + virtual bool GetSpecialCode(cBgS_PolyInfo const&) = 0; + virtual void GetSpecialCode(int) = 0; + virtual bool GetMagnetCode(cBgS_PolyInfo const&) = 0; + virtual void GetPolyObjThrough(int) = 0; + virtual void GetPolyCamThrough(int) = 0; + virtual void GetPolyLinkThrough(int) = 0; + virtual void GetPolyArrowThrough(int) = 0; + virtual bool GetPolyHSStick(int) = 0; + virtual void GetPolyBoomerangThrough(int) = 0; + virtual void GetPolyRopeThrough(int) = 0; + virtual void GetPolyBombThrough(int) = 0; + virtual void GetShdwThrough(int) = 0; + virtual bool GetUnderwaterRoofCode(int) = 0; + virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0; + virtual bool GetWallCode(cBgS_PolyInfo const&) = 0; + virtual bool GetPolyAtt0(cBgS_PolyInfo const&) = 0; + virtual bool GetPolyAtt1(cBgS_PolyInfo const&) = 0; + virtual bool GetGroundCode(cBgS_PolyInfo const&) = 0; + virtual void GetIronBallThrough(int) = 0; + virtual u32 GetAttackThrough(int) = 0; + virtual s32 GetCamMoveBG(cBgS_PolyInfo const&) = 0; + virtual s32 GetRoomCamId(cBgS_PolyInfo const&) = 0; + virtual s32 GetRoomPathId(cBgS_PolyInfo const&) = 0; + virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&) = 0; + virtual void GetPolyGrpRoomInfId(cBgS_PolyInfo const&) = 0; + virtual s32 GetGrpSoundId(cBgS_PolyInfo const&) = 0; + virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0; + virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0; + virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0; + /* 80079564 */ virtual void CalcPlane(); + /* 800797BC */ virtual void ClassifyPlane(); + /* 8007B0A8 */ virtual bool ChkPolyThrough(int, cBgS_PolyPassChk*); + /* 8007B0B0 */ virtual void ChkShdwDrawThrough(int, cBgS_PolyPassChk*); + /* 8007B0DC */ virtual bool ChkGrpThrough(int, cBgS_GrpPassChk*, int); + + u32 GetOldInvMtx(Mtx m) { return PSMTXInverse(m_inv_mtx, m); } + MtxP GetBaseMtxP() { return pm_base_mtx; } + +public: + /* 0x18 */ MtxP pm_base_mtx; + /* 0x1C */ Mtx m_inv_mtx; + /* 0x4C */ Mtx field_0x4c; + /* 0x7C */ cXyz field_0x7c; + /* 0x88 */ u8 field_0x88; + /* 0x89 */ u8 field_0x89; + /* 0x8A */ u8 field_0x8a[6]; + /* 0x90 */ u8 field_0x90; + /* 0x91 */ u8 field_0x91; + /* 0x92 */ u16 field_0x92; + /* 0x94 */ cBgW_TriElm* pm_tri; + /* 0x98 */ cBgW_RwgElm* pm_rwg; + /* 0x9C */ VertexPosition* pm_vtx_tbl; // type not confirmed + /* 0xA0 */ void* pm_bgd; + /* 0xA4 */ void* field_0xa4; + /* 0xA8 */ cBgW_GrpElm* pm_grp; + /* 0xAC */ cBgW_NodeTree* pm_node_tree; }; -class dBgW_Base { +class dBgW; +typedef void (*dBgW_RideCallback)(dBgW*, fopAc_ac_c*, fopAc_ac_c*); +typedef void (*dBgW_ArrowStickCallback)(fopAc_ac_c*, fopAc_ac_c*, cXyz&); +typedef void (*dBgW_CrrFunc)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); + +class dBgW : public cBgW { public: - enum PushPullLabel {}; - - /* 8007E5A8 */ dBgW_Base(); - /* 8007E640 */ ~dBgW_Base(); - /* 8007E6D8 */ void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*); - /* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); - /* 80074AB4 */ void SetOldShapeAngleY(s16); - /* 8007E6E0 */ void CalcDiffShapeAngleY(s16); - -private: - u16 field_0x0; - u8 field_0x2[2]; - void* field_0x4; - u8 field_0x8; - u8 field_0x9; - u8 field_0xa; - u8 field_0xb; - s16 field_0xc; - s16 field_0xe; -}; - -class dBgW { -public: - /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&); - /* 8007B3D8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 8007B404 */ void GetHorseNoEntry(cBgS_PolyInfo const&); - /* 8007B430 */ void GetSpecialCode(cBgS_PolyInfo const&); - /* 8007B460 */ void GetSpecialCode(int); - /* 8007B488 */ void GetMagnetCode(cBgS_PolyInfo const&); - /* 8007B4B4 */ void GetMonkeyBarsCode(cBgS_PolyInfo const&); - /* 8007B4E0 */ void GetPolyObjThrough(int); - /* 8007B504 */ void GetPolyCamThrough(int); - /* 8007B52C */ void GetPolyLinkThrough(int); - /* 8007B550 */ void GetPolyArrowThrough(int); - /* 8007B574 */ void GetPolyHSStick(int); - /* 8007B598 */ void GetPolyBoomerangThrough(int); - /* 8007B5BC */ void GetPolyRopeThrough(int); - /* 8007B5E0 */ void GetPolyBombThrough(int); - /* 8007B604 */ void GetShdwThrough(int); - /* 8007B630 */ void GetUnderwaterRoofCode(int); - /* 8007B6AC */ void GetLinkNo(cBgS_PolyInfo const&); - /* 8007B6D8 */ void GetWallCode(cBgS_PolyInfo const&); - /* 8007B704 */ void GetPolyAtt0(cBgS_PolyInfo const&); - /* 8007B734 */ void GetPolyAtt1(cBgS_PolyInfo const&); - /* 8007B760 */ void GetGroundCode(cBgS_PolyInfo const&); - /* 8007B7DC */ void GetIronBallThrough(int); - /* 8007B800 */ void GetAttackThrough(int); - /* 8007B87C */ void GetCamMoveBG(cBgS_PolyInfo const&); - /* 8007B8A8 */ void GetRoomCamId(cBgS_PolyInfo const&); - /* 8007B8D8 */ void GetRoomPathId(cBgS_PolyInfo const&); - /* 8007B904 */ void GetRoomPathPntNo(cBgS_PolyInfo const&); /* 8007B970 */ dBgW(); /* 8007B9C0 */ void Move(); /* 8007B9EC */ void positionWallCorrect(dBgS_Acch*, f32, cM3dGPla&, cXyz*, f32); /* 8007BA40 */ void RwgWallCorrect(dBgS_Acch*, u16); /* 8007C234 */ void WallCorrectRp(dBgS_Acch*, int); /* 8007C360 */ void WallCorrectGrpRp(dBgS_Acch*, int, int); - /* 8007C484 */ void WallCorrect(dBgS_Acch*); /* 8007C4AC */ void RwgWallCorrectSort(dBgS_Acch*, u16); /* 8007C714 */ void WallCorrectRpSort(dBgS_Acch*, int); /* 8007C808 */ void WallCorrectGrpRpSort(dBgS_Acch*, int, int); - /* 8007C910 */ void WallCorrectSort(dBgS_Acch*); /* 8007D0DC */ void RwgRoofChk(u16, dBgS_RoofChk*); /* 8007D208 */ void RoofChkRp(dBgS_RoofChk*, int); /* 8007D330 */ void RoofChkGrpRp(dBgS_RoofChk*, int, int); - /* 8007D470 */ void RoofChk(dBgS_RoofChk*); /* 8007D498 */ void RwgSplGrpChk(u16, dBgS_SplGrpChk*); /* 8007D5C4 */ void SplGrpChkRp(dBgS_SplGrpChk*, int); /* 8007D6F0 */ void SplGrpChkGrpRp(dBgS_SplGrpChk*, int, int); - /* 8007D830 */ void SplGrpChk(dBgS_SplGrpChk*); /* 8007D858 */ void RwgCaptPoly(int, dBgS_CaptPoly&); /* 8007D8E8 */ void CaptPolyRp(dBgS_CaptPoly&, int); /* 8007DA04 */ void CaptPolyGrpRp(dBgS_CaptPoly&, int, int); - /* 8007DAF8 */ void CaptPoly(dBgS_CaptPoly&); /* 8007DB20 */ void RwgSphChk(u16, dBgS_SphChk*, void*); /* 8007DC70 */ void SphChkRp(dBgS_SphChk*, void*, int); /* 8007DDE0 */ void SphChkGrpRp(dBgS_SphChk*, void*, int, int); - /* 8007DF00 */ void SphChk(dBgS_SphChk*, void*); - /* 8007DF28 */ void GetPolyGrpRoomInfId(cBgS_PolyInfo const&); - /* 8007DF58 */ void GetGrpSoundId(cBgS_PolyInfo const&); - /* 8007DF88 */ void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); - /* 8007DFC4 */ void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); - /* 8007E000 */ void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); - /* 8007E02C */ void ChkPolyThrough(int, cBgS_PolyPassChk*); - /* 8007E360 */ void ChkShdwDrawThrough(int, cBgS_PolyPassChk*); - /* 8007E3D8 */ void ChkGrpThrough(int, cBgS_GrpPassChk*, int); - /* 8007E444 */ void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*); - /* 8007E474 */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); - /* 8007E4A4 */ void OffMoveFlag(); - /* 8007E4B4 */ void ChkMoveFlag() const; - /* 8007E548 */ ~dBgW(); + + /* 8007E548 */ virtual ~dBgW(); + /* 8007E4B4 */ virtual u32 ChkMoveFlag() const; + /* 8007E4A4 */ virtual void OffMoveFlag(); + /* 8007DAF8 */ virtual void CaptPoly(dBgS_CaptPoly&); + /* 8007C484 */ virtual void WallCorrect(dBgS_Acch*); + /* 8007C910 */ virtual void WallCorrectSort(dBgS_Acch*); + /* 8007D470 */ virtual void RoofChk(dBgS_RoofChk*); + /* 8007D830 */ virtual void SplGrpChk(dBgS_SplGrpChk*); + /* 8007DF00 */ virtual void SphChk(dBgS_SphChk*, virtual void*); + /* 8007B3AC */ virtual s32 GetExitId(cBgS_PolyInfo const&); + /* 8007B3D8 */ virtual s32 GetPolyColor(cBgS_PolyInfo const&); + /* 8007B404 */ virtual bool GetHorseNoEntry(cBgS_PolyInfo const&); + /* 8007B430 */ virtual bool GetSpecialCode(cBgS_PolyInfo const&); + /* 8007B460 */ virtual void GetSpecialCode(int); + /* 8007B488 */ virtual bool GetMagnetCode(cBgS_PolyInfo const&); + /* 8007B4E0 */ virtual void GetPolyObjThrough(int); + /* 8007B504 */ virtual void GetPolyCamThrough(int); + /* 8007B52C */ virtual void GetPolyLinkThrough(int); + /* 8007B550 */ virtual void GetPolyArrowThrough(int); + /* 8007B574 */ virtual bool GetPolyHSStick(int); + /* 8007B598 */ virtual void GetPolyBoomerangThrough(int); + /* 8007B5BC */ virtual void GetPolyRopeThrough(int); + /* 8007B5E0 */ virtual void GetPolyBombThrough(int); + /* 8007B604 */ virtual void GetShdwThrough(int); + /* 8007B630 */ virtual bool GetUnderwaterRoofCode(int); + /* 8007B4B4 */ virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&); + /* 8007B6AC */ virtual void GetLinkNo(cBgS_PolyInfo const&); + /* 8007B6D8 */ virtual bool GetWallCode(cBgS_PolyInfo const&); + /* 8007B704 */ virtual bool GetPolyAtt0(cBgS_PolyInfo const&); + /* 8007B734 */ virtual bool GetPolyAtt1(cBgS_PolyInfo const&); + /* 8007B760 */ virtual bool GetGroundCode(cBgS_PolyInfo const&); + /* 8007B7DC */ virtual void GetIronBallThrough(int); + /* 8007B800 */ virtual u32 GetAttackThrough(int); + /* 8007B87C */ virtual s32 GetCamMoveBG(cBgS_PolyInfo const&); + /* 8007B8A8 */ virtual s32 GetRoomCamId(cBgS_PolyInfo const&); + /* 8007B8D8 */ virtual s32 GetRoomPathId(cBgS_PolyInfo const&); + /* 8007B904 */ virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&); + /* 8007DF28 */ virtual void GetPolyGrpRoomInfId(cBgS_PolyInfo const&); + /* 8007DF58 */ virtual s32 GetGrpSoundId(cBgS_PolyInfo const&); + /* 8007DF88 */ virtual void CrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*, + csXyz*); + /* 8007DFC4 */ virtual void TransPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*, + csXyz*); + /* 8007E000 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, + csXyz*, csXyz*); + /* 8007E444 */ virtual void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*); + /* 8007E474 */ virtual void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); + /* 8007E02C */ virtual void ChkPolyThrough(int, cBgS_PolyPassChk*); + /* 8007E360 */ virtual void ChkShdwDrawThrough(int, cBgS_PolyPassChk*); + /* 8007E3D8 */ virtual void ChkGrpThrough(int, cBgS_GrpPassChk*, int); + + void SetCrrFunc(dBgW_CrrFunc func) { m_crr_func = func; } + +private: + /* 0xB0 */ dBgW_CrrFunc m_crr_func; + /* 0xB4 */ dBgW_RideCallback m_ride_callback; + /* 0xB8 */ dBgW_ArrowStickCallback m_arrow_stick_callback; + /* 0xBC */ u8 m_flags; }; #endif /* D_BG_D_BG_W_H */ diff --git a/include/d/bg/d_bg_w_base.h b/include/d/bg/d_bg_w_base.h index c361a4a17ed..2b67b17c5a0 100644 --- a/include/d/bg/d_bg_w_base.h +++ b/include/d/bg/d_bg_w_base.h @@ -1,6 +1,103 @@ #ifndef D_BG_D_BG_W_BASE_H #define D_BG_D_BG_W_BASE_H +#include "SSystem/SComponent/c_bg_s_gnd_chk.h" +#include "SSystem/SComponent/c_bg_s_lin_chk.h" +#include "SSystem/SComponent/c_bg_s_poly_info.h" +#include "SSystem/SComponent/c_bg_s_shdw_draw.h" +#include "SSystem/SComponent/c_bg_w.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/bg/d_bg_s_sph_chk.h" #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +struct dBgS_CaptPoly; + +class dBgW_Base : public cBgW_BgId { +public: + enum PushPullLabel {}; + + typedef s32 (*PushPull_CallBack)(cBgS_PolyInfo const&, fopAc_ac_c*, s16, + dBgW_Base::PushPullLabel); + + /* 8007E5A8 */ dBgW_Base(); + /* 8007E69C */ void ClrDBgWBase(); + /* 8007E6E0 */ void CalcDiffShapeAngleY(s16); + + /* 8007E640 */ virtual ~dBgW_Base(); + /* 8007E6D0 */ virtual bool ChkMemoryError(); + virtual void ChkNotReady() const = 0; + virtual bool ChkLock() const = 0; + virtual bool ChkMoveBg() const = 0; + virtual u32 ChkMoveFlag() const = 0; + virtual void GetTriPla(cBgS_PolyInfo const&) const = 0; + virtual bool GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const = 0; + virtual void GetBnd() const = 0; + virtual u32 GetGrpInf(cBgS_PolyInfo const&) const = 0; + virtual void OffMoveFlag() = 0; + virtual void GetTopUnder(f32*, f32*) const = 0; + /* 80074AB4 */ virtual void SetOldShapeAngleY(s16); + virtual bool LineCheck(cBgS_LinChk*) = 0; + virtual void GroundCross(cBgS_GndChk*) = 0; + virtual void ShdwDraw(cBgS_ShdwDraw*) = 0; + virtual void CaptPoly(dBgS_CaptPoly&) = 0; + virtual void WallCorrect(dBgS_Acch*) = 0; + virtual void WallCorrectSort(dBgS_Acch*) = 0; + virtual void RoofChk(dBgS_RoofChk*) = 0; + virtual void SplGrpChk(dBgS_SplGrpChk*) = 0; + virtual void SphChk(dBgS_SphChk*, void*) = 0; + virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const = 0; + virtual s32 GetExitId(cBgS_PolyInfo const&) = 0; + virtual s32 GetPolyColor(cBgS_PolyInfo const&) = 0; + virtual bool GetHorseNoEntry(cBgS_PolyInfo const&) = 0; + virtual bool GetSpecialCode(cBgS_PolyInfo const&) = 0; + virtual void GetSpecialCode(int) = 0; + virtual bool GetMagnetCode(cBgS_PolyInfo const&) = 0; + virtual void GetPolyObjThrough(int) = 0; + virtual void GetPolyCamThrough(int) = 0; + virtual void GetPolyLinkThrough(int) = 0; + virtual void GetPolyArrowThrough(int) = 0; + virtual bool GetPolyHSStick(int) = 0; + virtual void GetPolyBoomerangThrough(int) = 0; + virtual void GetPolyRopeThrough(int) = 0; + virtual void GetPolyBombThrough(int) = 0; + virtual void GetShdwThrough(int) = 0; + virtual bool GetUnderwaterRoofCode(int) = 0; + virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0; + virtual void GetLinkNo(cBgS_PolyInfo const&) = 0; + virtual bool GetWallCode(cBgS_PolyInfo const&) = 0; + virtual bool GetPolyAtt0(cBgS_PolyInfo const&) = 0; + virtual bool GetPolyAtt1(cBgS_PolyInfo const&) = 0; + virtual bool GetGroundCode(cBgS_PolyInfo const&) = 0; + virtual void GetIronBallThrough(int) = 0; + virtual u32 GetAttackThrough(int) = 0; + virtual s32 GetCamMoveBG(cBgS_PolyInfo const&) = 0; + virtual s32 GetRoomCamId(cBgS_PolyInfo const&) = 0; + virtual s32 GetRoomPathId(cBgS_PolyInfo const&) = 0; + virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&) = 0; + virtual void GetPolyGrpRoomInfId(cBgS_PolyInfo const&) = 0; + virtual s32 GetGrpSoundId(cBgS_PolyInfo const&) = 0; + virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0; + virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0; + virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0; + /* 8007E6D8 */ virtual void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*); + /* 8007E6DC */ virtual void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); + + PushPull_CallBack GetPushPullCallback() const { return m_pushPull_Callback; } + s16 GetDiffShapeAngleY() { return m_diff_ShapeAngleY; } + u8 GetRoomId() { return m_roomId; } + bool chkStickWall() { return field_0xb & 1; } + bool chkStickRoof() { return field_0xb & 2; } + +private: + /* 0x08 */ u8 m_priority; + /* 0x09 */ u8 m_roomId; + /* 0x0A */ u8 field_0xa; + /* 0x0B */ u8 field_0xb; + /* 0x0C */ s16 m_old_ShapeAngleY; + /* 0x0E */ s16 m_diff_ShapeAngleY; + /* 0x10 */ PushPull_CallBack m_pushPull_Callback; + /* 0x14 */ bool m_pushPull_Ok; +}; // Size: 0x18 #endif /* D_BG_D_BG_W_BASE_H */ diff --git a/include/d/bg/d_bg_w_kcol.h b/include/d/bg/d_bg_w_kcol.h index 9ec288792bc..f46686e1572 100644 --- a/include/d/bg/d_bg_w_kcol.h +++ b/include/d/bg/d_bg_w_kcol.h @@ -1,6 +1,89 @@ #ifndef D_BG_D_BG_W_KCOL_H #define D_BG_D_BG_W_KCOL_H +#include "d/bg/d_bg_plc.h" +#include "d/bg/d_bg_w_base.h" #include "dolphin/types.h" +struct dBgS_CaptPoly; + +struct KC_PrismData {}; + +class dBgWKCol : public dBgW_Base { +public: + /* 8007E6F4 */ dBgWKCol(); + /* 8007E7D0 */ void initKCollision(void*); + /* 8007E804 */ void create(void*, void*); + /* 8007E850 */ void getTriNrm(KC_PrismData*, Vec**) const; + /* 8007E8C0 */ void GetTriPla(int) const; + /* 8007E9A4 */ void GetTriPnt(int, Vec*, Vec*, Vec*) const; + /* 8007E9D4 */ void GetTriPnt(KC_PrismData const*, Vec*, Vec*, Vec*) const; + /* 8007EB70 */ void getPolyCode(int, dBgPc*) const; + /* 8007EBC4 */ void chkPolyThrough(dBgPc*, cBgS_PolyPassChk*, cBgS_GrpPassChk*, cXyz&) const; + /* 8007FF00 */ void ChkShdwDrawThrough(dBgPc*); + + /* 8007E74C */ virtual ~dBgWKCol(); + /* 8007E86C */ virtual void ChkNotReady() const; + /* 8007E87C */ virtual bool ChkLock() const; + /* 8007E884 */ virtual bool ChkMoveBg() const; + /* 8007E88C */ virtual bool ChkMoveFlag() const; + /* 8007E894 */ virtual void GetTriPla(cBgS_PolyInfo const&) const; + /* 8007E980 */ virtual void GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; + /* 8007EB28 */ virtual void GetBnd() const; + /* 8007EB30 */ virtual void GetGrpInf(cBgS_PolyInfo const&) const; + /* 8007EB6C */ virtual void OffMoveFlag(); + /* 800829AC */ virtual void GetTopUnder(f32*, f32*) const; + /* 8007EE34 */ virtual void LineCheck(cBgS_LinChk*); + /* 8007F628 */ virtual void GroundCross(cBgS_GndChk*); + /* 8007F9A4 */ virtual void ShdwDraw(cBgS_ShdwDraw*); + /* 8007FF1C */ virtual void CaptPoly(dBgS_CaptPoly&); + /* 800811A0 */ virtual void WallCorrect(dBgS_Acch*); + /* 80080330 */ virtual void WallCorrectSort(dBgS_Acch*); + /* 80081E18 */ virtual void RoofChk(dBgS_RoofChk*); + /* 80082184 */ virtual void SplGrpChk(dBgS_SplGrpChk*); + /* 800824EC */ virtual void SphChk(dBgS_SphChk*, virtual void*); + /* 800829F0 */ virtual void GetGrpRoomIndex(cBgS_PolyInfo const&) const; + /* 80082A20 */ virtual void GetExitId(cBgS_PolyInfo const&); + /* 80082A50 */ virtual void GetPolyColor(cBgS_PolyInfo const&); + /* 80082A80 */ virtual void GetHorseNoEntry(cBgS_PolyInfo const&); + /* 80082AB0 */ virtual void GetSpecialCode(cBgS_PolyInfo const&); + /* 80082AE0 */ virtual void GetSpecialCode(int); + /* 80082B0C */ virtual void GetMagnetCode(cBgS_PolyInfo const&); + /* 80082B6C */ virtual void GetPolyObjThrough(int); + /* 80082B98 */ virtual void GetPolyCamThrough(int); + /* 80082BC4 */ virtual void GetPolyLinkThrough(int); + /* 80082BF0 */ virtual void GetPolyArrowThrough(int); + /* 80082C1C */ virtual void GetPolyHSStick(int); + /* 80082C48 */ virtual void GetPolyBoomerangThrough(int); + /* 80082C74 */ virtual void GetPolyRopeThrough(int); + /* 80082CA0 */ virtual void GetPolyBombThrough(int); + /* 80082CF8 */ virtual void GetShdwThrough(int); + /* 80082CCC */ virtual void GetUnderwaterRoofCode(int); + /* 80082B3C */ virtual void GetMonkeyBarsCode(cBgS_PolyInfo const&); + /* 80082D24 */ virtual void GetLinkNo(cBgS_PolyInfo const&); + /* 80082D54 */ virtual void GetWallCode(cBgS_PolyInfo const&); + /* 80082D84 */ virtual void GetPolyAtt0(cBgS_PolyInfo const&); + /* 80082DB4 */ virtual void GetPolyAtt1(cBgS_PolyInfo const&); + /* 80082DE4 */ virtual void GetGroundCode(cBgS_PolyInfo const&); + /* 80082E14 */ virtual void GetIronBallThrough(int); + /* 80082E40 */ virtual void GetAttackThrough(int); + /* 80082E6C */ virtual void GetCamMoveBG(cBgS_PolyInfo const&); + /* 80082E9C */ virtual void GetRoomCamId(cBgS_PolyInfo const&); + /* 80082ECC */ virtual void GetRoomPathId(cBgS_PolyInfo const&); + /* 80082EFC */ virtual void GetRoomPathPntNo(cBgS_PolyInfo const&); + /* 80082F2C */ virtual void GetPolyGrpRoomInfId(cBgS_PolyInfo const&); + /* 80082F5C */ virtual void GetGrpSoundId(cBgS_PolyInfo const&); + /* 80082F8C */ virtual void CrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*, + csXyz*); + /* 80082F90 */ virtual void TransPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*, + csXyz*); + /* 80082F94 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, + csXyz*, csXyz*); + +private: + /* 0x18 */ void* m_pkc_head; + /* 0x1C */ dBgPlc m_code; + /* 0x20 */ cM3dGAab m_bnd; +}; + #endif /* D_BG_D_BG_W_KCOL_H */ diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 15bf9bea675..058e907b88d 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -995,6 +995,10 @@ inline void* dComIfG_getObjectRes(const char* arcName, const char* resName) { return g_dComIfG_gameInfo.mResControl.getObjectRes(arcName, resName); } +inline void* dComIfG_getObjectRes(const char* arcName, int param_1) { + return g_dComIfG_gameInfo.mResControl.getObjectRes(arcName, param_1); +} + inline daPy_py_c* dComIfGp_getLinkPlayer() { return (daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); } @@ -1011,4 +1015,8 @@ inline J2DGrafContext* dComIfGp_getCurrentGrafPort() { return g_dComIfG_gameInfo.play.getCurrentGrafPort(); } +inline dBgS& dComIfG_Bgsp() { + return g_dComIfG_gameInfo.play.mDBgS; +} + #endif /* D_COM_D_COM_INF_GAME_H */ diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index b19e2993c8f..8c038fcdfb1 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -75,6 +75,10 @@ public: return getRes(arcName, resName, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); } + void* getObjectRes(const char* arcName, s32 param_1) { + return getRes(arcName, param_1, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + } + int syncObjectRes(const char* name) { return syncRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); } diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index efc46b8ca4e..ac29bdf8941 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -112,6 +112,26 @@ inline fopAc_ac_c* fopAcM_SearchByID(unsigned int id) { return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id); } +inline cXyz& fopAcM_GetPosition_p(fopAc_ac_c* pActor) { + return pActor->mCurrent.mPosition; +} + +inline cXyz& fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) { + return pActor->mNext.mPosition; +} + +inline cXyz& fopAcM_GetSpeed_p(fopAc_ac_c* pActor) { + return pActor->mSpeed; +} + +inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) { + return pActor->mCurrent.mAngle; +} + +inline csXyz& fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) { + return pActor->mCollisionRot; +} + void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData); void fopAcM_setStageLayer(void*); int fopAcM_setRoomLayer(void*, int); @@ -143,9 +163,6 @@ void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void fopAcM_setCullSizeSphere(fopAc_ac_c*, f32, f32, f32, f32); void fopAcM_setCullSizeBox2(fopAc_ac_c*, J3DModelData*); bool fopAcM_addAngleY(fopAc_ac_c*, s16, s16); -inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) { - return pActor->mCurrent.mAngle; -} void fopAcM_calcSpeed(fopAc_ac_c*); void fopAcM_posMove(fopAc_ac_c*, const cXyz*); void fopAcM_posMoveF(fopAc_ac_c*, const cXyz*); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index c091ec9af6a..7eaa3aa2e27 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -14,6 +14,7 @@ void mDoMtx_ZXYrotM(Mtx, s16, s16, s16); void mDoMtx_ZrotS(Mtx, s16); void mDoMtx_YrotS(Mtx, s16); void mDoMtx_XrotS(Mtx, s16); +void mDoMtx_YrotM(Mtx, s16); class mDoMtx_stack_c { public: @@ -32,13 +33,14 @@ public: /* 8000CF7C */ static void quatM(Quaternion const*); /* 8000D070 */ ~mDoMtx_stack_c(); // inline - Mtx* get() { return &now; } + static Mtx* get() { return &now; } static void transS(f32 x, f32 y, f32 z) { PSMTXTrans(now, x, y, z); } static void scaleS(f32 x, f32 y, f32 z) { PSMTXScale(now, x, y, z); } static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); } static void XYZrotM(s16 x, s16 y, s16 z) { mDoMtx_XYZrotM(now, x, y, z); } static void ZXYrotS(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotS(now, x, y, z); } static void ZXYrotM(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotM(now, x, y, z); } + static void YrotM(s16 y) { mDoMtx_YrotM(now, y); } static Mtx now; static Mtx buffer[16]; diff --git a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp index 55fb8308235..5f29ffd5446 100644 --- a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp @@ -18,9 +18,9 @@ /* 80267C1C-80267C94 26255C 0078+00 0/0 2/2 123/123 .text __ct__11cBgS_GndChkFv */ cBgS_GndChk::cBgS_GndChk() { - mPosition = cXyz::Zero; + m_pos = cXyz::Zero; setActorPid(0xFFFFFFFF); - _30 = 2; + mFlags = 2; } /* 80267C94-80267D0C 2625D4 0078+00 2/1 4/4 110/110 .text __dt__11cBgS_GndChkFv */ @@ -28,16 +28,16 @@ cBgS_GndChk::~cBgS_GndChk() {} /* 80267D0C-80267D28 26264C 001C+00 0/0 0/0 62/62 .text SetPos__11cBgS_GndChkFPC3Vec */ void cBgS_GndChk::SetPos(Vec const* pVec) { - mPosition = *pVec; + m_pos = *pVec; } /* 80267D28-80267D44 262668 001C+00 0/0 51/51 185/185 .text SetPos__11cBgS_GndChkFPC4cXyz */ void cBgS_GndChk::SetPos(cXyz const* pVec) { - mPosition = *pVec; + m_pos = *pVec; } /* 80267D44-80267D54 262684 0010+00 0/0 1/1 0/0 .text PreCheck__11cBgS_GndChkFv */ void cBgS_GndChk::PreCheck() { - mWallPrecheck = _30 & 2; + mWallPrecheck = mFlags & 2; } diff --git a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp index 94b906a520c..7789d948c9e 100644 --- a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp @@ -24,7 +24,7 @@ cBgS_LinChk::~cBgS_LinChk() {} /* 80267E48-80267ED0 262788 0088+00 1/1 0/0 0/0 .text ct__11cBgS_LinChkFv */ void cBgS_LinChk::ct() { cXyz xyz(cXyz::Zero); - mLin.SetStartEnd(xyz, xyz); + mLinP.SetStartEnd(xyz, xyz); field_0x40 = xyz; setActorPid(0xFFFFFFFF); field_0x4c = 0; @@ -34,7 +34,7 @@ void cBgS_LinChk::ct() { /* 80267ED0-80267F40 262810 0070+00 0/0 2/2 0/0 .text Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi */ void cBgS_LinChk::Set2(cXyz const* pStart, cXyz const* pEnd, unsigned int actorPid) { - mLin.SetStartEnd(*pStart, *pEnd); + mLinP.SetStartEnd(*pStart, *pEnd); field_0x40 = *pEnd; setActorPid(actorPid); field_0x4c &= ~0x10; diff --git a/libs/SSystem/SComponent/c_bg_s_poly_info.cpp b/libs/SSystem/SComponent/c_bg_s_poly_info.cpp index c7759bcf7ef..d9abd4d056a 100644 --- a/libs/SSystem/SComponent/c_bg_s_poly_info.cpp +++ b/libs/SSystem/SComponent/c_bg_s_poly_info.cpp @@ -8,16 +8,16 @@ #include "dolphin/types.h" /* 80268074-802680B0 2629B4 003C+00 0/0 7/7 9/9 .text __ct__13cBgS_PolyInfoFv */ -cBgS_PolyInfo::cBgS_PolyInfo(void) { +cBgS_PolyInfo::cBgS_PolyInfo() { this->ClearPi(); } /* 802680B0-802680F8 2629F0 0048+00 1/0 10/10 393/393 .text __dt__13cBgS_PolyInfoFv */ -cBgS_PolyInfo::~cBgS_PolyInfo(void) {} +cBgS_PolyInfo::~cBgS_PolyInfo() {} /* 802680F8-80268120 262A38 0028+00 0/0 4/4 0/0 .text ChkSetInfo__13cBgS_PolyInfoCFv */ -bool cBgS_PolyInfo::ChkSetInfo(void) const { - if (mPolyIndex == 0xFFFF || unk_0x02 == 0x100) { +bool cBgS_PolyInfo::ChkSetInfo() const { + if (mPolyIndex == 0xFFFF || mBgIndex == 0x100) { return false; } else { return true; @@ -25,9 +25,9 @@ bool cBgS_PolyInfo::ChkSetInfo(void) const { } /* 80268120-80268148 262A60 0028+00 1/1 11/11 0/0 .text ClearPi__13cBgS_PolyInfoFv */ -void cBgS_PolyInfo::ClearPi(void) { +void cBgS_PolyInfo::ClearPi() { mPolyIndex = 0xFFFF; - unk_0x02 = 0x100; + mBgIndex = 0x100; unk_0x04 = 0; unk_0x08 = -1; } @@ -36,7 +36,7 @@ void cBgS_PolyInfo::ClearPi(void) { * SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo */ void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& pOther) { mPolyIndex = pOther.mPolyIndex; - unk_0x02 = pOther.unk_0x02; + mBgIndex = pOther.mBgIndex; unk_0x04 = pOther.unk_0x04; unk_0x08 = pOther.unk_0x08; } @@ -44,7 +44,7 @@ void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& pOther) { /* 8026816C-8026817C 262AAC 0010+00 0/0 6/6 0/0 .text SetActorInfo__13cBgS_PolyInfoFiPvUi */ void cBgS_PolyInfo::SetActorInfo(int param_1, void* param_2, unsigned int param_3) { - unk_0x02 = param_1; + mBgIndex = param_1; unk_0x04 = param_2; unk_0x08 = param_3; } @@ -65,6 +65,6 @@ void cBgS_PolyInfo::SetPolyIndex(int pPolyIndex) { } /* 802681AC-802681C0 262AEC 0014+00 0/0 3/3 0/0 .text ChkBgIndex__13cBgS_PolyInfoCFv */ -bool cBgS_PolyInfo::ChkBgIndex(void) const { - return unk_0x02 != 0x100; +bool cBgS_PolyInfo::ChkBgIndex() const { + return mBgIndex != 0x100; } diff --git a/libs/SSystem/SComponent/c_bg_w.cpp b/libs/SSystem/SComponent/c_bg_w.cpp index dede9151025..62855418d28 100644 --- a/libs/SSystem/SComponent/c_bg_w.cpp +++ b/libs/SSystem/SComponent/c_bg_w.cpp @@ -13,17 +13,17 @@ /* 802681C0-802681C8 262B00 0008+00 0/0 1/1 0/0 .text Regist__9cBgW_BgIdFi */ void cBgW_BgId::Regist(int a1) { - mId = a1; + m_id = a1; } /* 802681C8-802681D4 262B08 000C+00 0/0 2/2 0/0 .text Release__9cBgW_BgIdFv */ void cBgW_BgId::Release() { - mId = 0x100; + m_id = 0x100; } /* 802681D4-802681E4 262B14 0010+00 0/0 7/7 121/121 .text ChkUsed__9cBgW_BgIdCFv */ -unsigned int cBgW_BgId::ChkUsed() const { - return mId < 0x100; +bool cBgW_BgId::ChkUsed() const { + return m_id < 0x100; } /* 802681E4-802681FC 262B24 0018+00 1/1 22/22 8/8 .text cBgW_CheckBGround__Ff */ diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 296f216b535..cb7d394ae04 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -4,27 +4,19 @@ // #include "d/a/d_a_alink.h" +#include "JSystem/J3DGraphLoader/J3DAnmLoader.h" +#include "Z2AudioLib/Z2AudioMgr.h" +#include "d/a/d_a_horse_static.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_ext.h" +#include "m_Do/m_Do_mtx.h" // // Types: // -// - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - /* 8000CF7C */ void quatM(Quaternion const*); - - static u8 now[48]; -}; struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); @@ -40,16 +32,6 @@ struct mDoExt_MtxCalcAnmBlendTbl { struct fopEn_enemy_c {}; -struct e_wb_class { - /* 80037C7C */ void checkWait(); - /* 80037C90 */ void setPlayerRideNow(); - /* 80037CB0 */ void setPlayerRide(); - /* 80037CF4 */ void getOff(); - /* 80037D68 */ void checkDownDamage(); - /* 80037D94 */ void checkNormalRideMode() const; - /* 80037DBC */ void setRunRideMode(); -}; - struct daTagMist_c { /* 80031CF0 */ void getPlayerNo(); }; @@ -58,10 +40,6 @@ struct daTagMagne_c { /* 80031B50 */ void checkMagnetCode(cBgS_PolyInfo&); }; -struct daTagHstop_c { - static u8 m_top[4 + 4 /* padding */]; -}; - struct daObj_Sekizoa_c { /* 801312C8 */ void setWolfHowling(); }; @@ -621,30 +599,6 @@ struct dCamera_c { /* 80181500 */ void GetForceLockOnActor(); }; -struct dBgS_ObjAcch { - /* 800D0C6C */ ~dBgS_ObjAcch(); -}; - -struct Z2SeqMgr { - /* 802AF010 */ void bgmStart(u32, u32, s32); - /* 802AF49C */ void subBgmStart(u32); - /* 802AF884 */ void subBgmStop(); - /* 802AFF8C */ void changeBgmStatus(s32); - /* 802B1DF4 */ void changeSubBgmStatus(s32); - /* 802B5E84 */ void bgmSetSwordUsing(s32); - /* 802B5E8C */ void taktModeMute(); - /* 802B5ED4 */ void taktModeMuteOff(); -}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - namespace JStudio { namespace stb { struct data { @@ -659,16 +613,10 @@ struct data { }; // namespace JStudio -struct JMath { - static u8 sincosTable_[65536]; -}; - struct JASKernel { /* 80290B08 */ void getAramHeap(); }; -struct JAISeqMgr {}; - struct JAISeq { /* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr*); }; @@ -679,12 +627,6 @@ struct J3DMaterialAnm { /* 8032C3C4 */ void calc(J3DMaterial*) const; }; -struct J3DAnmLoaderDataBaseFlag {}; - -struct J3DAnmLoaderDataBase { - /* 80337B40 */ void load(void const*, J3DAnmLoaderDataBaseFlag); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; @@ -15763,14 +15705,9 @@ asm void daAlink_c::setFrontWallType() { #pragma pop /* 800B146C-800B1488 0ABDAC 001C+00 1/1 0/0 0/0 .text SetPos__12dBgS_RoofChkFRC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_RoofChk::SetPos(cXyz const& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/SetPos__12dBgS_RoofChkFRC4cXyz.s" +void dBgS_RoofChk::SetPos(cXyz const& pos) { + m_pos = pos; } -#pragma pop /* 800B1488-800B14B4 0ABDC8 002C+00 4/4 0/0 0/0 .text checkWaterPolygonUnder__9daAlink_cFv */ #pragma push @@ -19192,24 +19129,14 @@ asm void mDoExt_MtxCalcAnmBlendTbl::getAnm(int param_0) { #pragma pop /* 800D00D0-800D00DC 0CAA10 000C+00 1/1 0/0 0/0 .text ChkRoofHit__9dBgS_AcchCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::ChkRoofHit() const { - nofralloc -#include "asm/d/a/d_a_alink/ChkRoofHit__9dBgS_AcchCFv.s" +bool dBgS_Acch::ChkRoofHit() const { + return m_flags & ROOF_HIT; } -#pragma pop /* 800D00DC-800D00EC 0CAA1C 0010+00 1/1 0/0 0/0 .text ClrGroundHit__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::ClrGroundHit() { - nofralloc -#include "asm/d/a/d_a_alink/ClrGroundHit__9dBgS_AcchFv.s" +void dBgS_Acch::ClrGroundHit() { + m_flags &= ~GROUND_HIT; } -#pragma pop /* 800D00EC-800D0110 0CAA2C 0024+00 1/1 0/0 0/0 .text checkReinRide__9daAlink_cCFv */ // regalloc @@ -20223,7 +20150,8 @@ SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__12dBgS_ObjAcchFv.s" } @@ -34629,7 +34557,8 @@ asm mDoExt_AnmRatioPack::mDoExt_AnmRatioPack() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_LinkRoofChk::~dBgS_LinkRoofChk() { +// asm dBgS_LinkRoofChk::~dBgS_LinkRoofChk() { +extern "C" asm void __dt__16dBgS_LinkRoofChkFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__16dBgS_LinkRoofChkFv.s" } @@ -34639,7 +34568,8 @@ asm dBgS_LinkRoofChk::~dBgS_LinkRoofChk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_LinkGndChk::~dBgS_LinkGndChk() { +// asm dBgS_LinkGndChk::~dBgS_LinkGndChk() { +extern "C" asm void __dt__15dBgS_LinkGndChkFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__15dBgS_LinkGndChkFv.s" } @@ -34649,7 +34579,8 @@ asm dBgS_LinkGndChk::~dBgS_LinkGndChk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_LinkAcch::~dBgS_LinkAcch() { +// asm dBgS_LinkAcch::~dBgS_LinkAcch() { +extern "C" asm void __dt__13dBgS_LinkAcchFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__13dBgS_LinkAcchFv.s" } @@ -34986,14 +34917,9 @@ int daPy_py_c::checkResetFlg0(daPy_RFLG0 pFlag) const { } /* 80141404-80141410 13BD44 000C+00 1/1 0/0 0/0 .text ChkGroundHit__9dBgS_AcchCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::ChkGroundHit() const { - nofralloc -#include "asm/d/a/d_a_alink/ChkGroundHit__9dBgS_AcchCFv.s" +bool dBgS_Acch::ChkGroundHit() const { + return m_flags & GROUND_HIT; } -#pragma pop /* 80141410-8014141C 13BD50 000C+00 1/1 0/0 0/0 .text * checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 */ diff --git a/src/d/bg/d_bg_pc.cpp b/src/d/bg/d_bg_pc.cpp index 63411d6aab2..e90096b82f9 100644 --- a/src/d/bg/d_bg_pc.cpp +++ b/src/d/bg/d_bg_pc.cpp @@ -1,42 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_pc -// - #include "d/bg/d_bg_pc.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct sBgPc {}; - -struct dBgPc { - /* 80074048 */ void setCode(sBgPc&); -}; - -// -// Forward References: -// - -extern "C" void setCode__5dBgPcFR5sBgPc(); - -// -// External References: -// - -// -// Declarations: -// - -/* 80074048-80074074 06E988 002C+00 0/0 1/1 0/0 .text setCode__5dBgPcFR5sBgPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgPc::setCode(sBgPc& param_0) { - nofralloc -#include "asm/d/bg/d_bg_pc/setCode__5dBgPcFR5sBgPc.s" +void dBgPc::setCode(sBgPc& code) { + m_code = code; } -#pragma pop diff --git a/src/d/bg/d_bg_plc.cpp b/src/d/bg/d_bg_plc.cpp index 040eadba3f9..9ae849296d0 100644 --- a/src/d/bg/d_bg_plc.cpp +++ b/src/d/bg/d_bg_plc.cpp @@ -7,20 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct sBgPc {}; - -struct dBgPlc { - /* 80074074 */ dBgPlc(); - /* 80074080 */ ~dBgPlc(); - /* 800740BC */ void setBase(void*); - /* 800740C4 */ void getCode(int, sBgPc**) const; - /* 800740DC */ void getGrpCode(int) const; -}; - // // Forward References: // @@ -42,28 +28,16 @@ extern "C" void __dl__FPv(); // /* 80074074-80074080 06E9B4 000C+00 0/0 1/1 0/0 .text __ct__6dBgPlcFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgPlc::dBgPlc() { - nofralloc -#include "asm/d/bg/d_bg_plc/__ct__6dBgPlcFv.s" +dBgPlc::dBgPlc() { + m_base = NULL; } -#pragma pop /* 80074080-800740BC 06E9C0 003C+00 0/0 1/1 0/0 .text __dt__6dBgPlcFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgPlc::~dBgPlc() { - nofralloc -#include "asm/d/bg/d_bg_plc/__dt__6dBgPlcFv.s" -} -#pragma pop +dBgPlc::~dBgPlc() {} /* 800740BC-800740C4 -00001 0008+00 0/0 0/0 0/0 .text setBase__6dBgPlcFPv */ -void dBgPlc::setBase(void* param_0) { - *(u32*)this = (u32)(param_0); +void dBgPlc::setBase(void* p_base) { + m_base = p_base; } /* 800740C4-800740DC 06EA04 0018+00 0/0 1/1 0/0 .text getCode__6dBgPlcCFiPP5sBgPc */ diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index b1895a83424..6182b7c4169 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -4,6 +4,7 @@ // #include "d/bg/d_bg_s.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" @@ -109,7 +110,7 @@ extern "C" void Regist__9cBgW_BgIdFi(); extern "C" void Release__9cBgW_BgIdFv(); extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void cBgW_CheckBGround__Ff(); -extern "C" void cBgW_CheckBRoof__Ff(); +extern "C" bool cBgW_CheckBRoof__Ff(f32); extern "C" void cBgW_CheckBWall__Ff(); extern "C" void _savegpr_22(); extern "C" void _savegpr_24(); @@ -126,55 +127,75 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: // /* 800740F4-80074110 06EA34 001C+00 2/2 1/1 0/0 .text Init__11cBgS_ChkElmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_ChkElm::Init() { - nofralloc -#include "asm/d/bg/d_bg_s/Init__11cBgS_ChkElmFv.s" +void cBgS_ChkElm::Init() { + m_bgw_base_ptr = NULL; + m_used = false; + m_actor_ptr = NULL; + field_0x8 = 0xFFFFFFFF; } -#pragma pop /* 80074110-80074128 06EA50 0018+00 1/0 0/0 0/0 .text Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_ChkElm::Regist2(dBgW_Base* param_0, unsigned int param_1, void* param_2) { - nofralloc -#include "asm/d/bg/d_bg_s/Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv.s" +void cBgS_ChkElm::Regist2(dBgW_Base* base_ptr, unsigned int param_1, void* param_2) { + m_used = true; + m_bgw_base_ptr = base_ptr; + field_0x8 = param_1; + m_actor_ptr = (fopAc_ac_c*)param_2; } -#pragma pop /* 80074128-80074144 06EA68 001C+00 2/2 0/0 0/0 .text Release__11cBgS_ChkElmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_ChkElm::Release() { - nofralloc -#include "asm/d/bg/d_bg_s/Release__11cBgS_ChkElmFv.s" +void cBgS_ChkElm::Release() { + m_used = false; + m_bgw_base_ptr = NULL; + field_0x8 = 0xFFFFFFFF; + m_actor_ptr = NULL; } -#pragma pop /* ############################################################################################## */ /* 80450F60-80450F68 000460 0004+04 2/2 0/0 0/0 .sbss l_SetCounter */ -static u8 l_SetCounter[4 + 4 /* padding */]; +static int l_SetCounter; /* 80074144-80074250 06EA84 010C+00 1/1 0/0 0/0 .text Regist__4cBgSFP9dBgW_BaseUiPv */ +#ifdef NONMATCHING +bool cBgS::Regist(dBgW_Base* p_data, unsigned int param_1, void* param_2) { + if (p_data == NULL) { + return true; + } else if (p_data->ChkUsed()) { + return true; + } else if (p_data->ChkMemoryError()) { + return true; + } else { + for (int i = 0; i < 0x100; i++) { + if (!m_chk_element[i].m_bgw_base_ptr->ChkUsed()) { + m_chk_element[i].Regist2(p_data, param_1, param_2); + p_data->Regist(i); + + l_SetCounter = i + 1; + if (l_SetCounter > 0x100) { + l_SetCounter = 0; + } + return false; + } + } + p_data->Release(); + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgS::Regist(dBgW_Base* param_0, unsigned int param_1, void* param_2) { +asm bool cBgS::Regist(dBgW_Base* param_0, unsigned int param_1, void* param_2) { nofralloc #include "asm/d/bg/d_bg_s/Regist__4cBgSFP9dBgW_BaseUiPv.s" } #pragma pop +#endif /* 80074250-800742E4 06EB90 0094+00 0/0 2/2 187/187 .text Release__4cBgSFP9dBgW_Base */ #pragma push @@ -187,34 +208,53 @@ asm void cBgS::Release(dBgW_Base* param_0) { #pragma pop /* 800742E4-80074338 06EC24 0054+00 2/1 0/0 0/0 .text Ct__4cBgSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::Ct() { - nofralloc -#include "asm/d/bg/d_bg_s/Ct__4cBgSFv.s" +void cBgS::Ct() { + l_SetCounter = 0; + for (int i = 0; i < 0x100; i++) { + m_chk_element[i].Init(); + } } -#pragma pop /* 80074338-800743B4 06EC78 007C+00 2/1 0/0 0/0 .text Dt__4cBgSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::Dt() { - nofralloc -#include "asm/d/bg/d_bg_s/Dt__4cBgSFv.s" +void cBgS::Dt() { + for (int i = 0; i < 0x100; i++) { + if (m_chk_element[i].ChkUsed()) { + m_chk_element[i].Release(); + } + } + + for (int i = 0; i < 0x100; i++) { + m_chk_element[i].Init(); + } } -#pragma pop /* 800743B4-800744A0 06ECF4 00EC+00 0/0 16/16 305/305 .text LineCross__4cBgSFP11cBgS_LinChk */ +#ifdef NONMATCHING +bool cBgS::LineCross(cBgS_LinChk* param_0) { + param_0->ClearPi(); + param_0->ClrHit(); + param_0->PreCalc(); + + for (int i = 0; i < 0x100; i++) { + if (m_chk_element[i].ChkUsed() && !m_chk_element[i].m_bgw_base_ptr->ChkLock() && + !param_0->ChkSameActorPid(m_chk_element[i].field_0x8) && + m_chk_element[i].m_bgw_base_ptr->LineCheck(param_0)) { + param_0->SetActorInfo(i, &m_chk_element[0], m_chk_element[i].field_0x8); + param_0->SetHit(); + } + } + return param_0->ChkHit() ? true : false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgS::LineCross(cBgS_LinChk* param_0) { +asm bool cBgS::LineCross(cBgS_LinChk* param_0) { nofralloc #include "asm/d/bg/d_bg_s/LineCross__4cBgSFP11cBgS_LinChk.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804526B8-804526C0 000CB8 0004+04 1/1 0/0 0/0 .sdata2 @3738 */ @@ -228,7 +268,7 @@ SECTION_SDATA2 static f32 lit_3738[1 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgS::GroundCross(cBgS_GndChk* param_0) { +asm f32 cBgS::GroundCross(cBgS_GndChk* param_0) { nofralloc #include "asm/d/bg/d_bg_s/GroundCross__4cBgSFP11cBgS_GndChk.s" } @@ -245,68 +285,87 @@ asm void cBgS::ConvDzb(void* param_0) { #pragma pop /* 80074618-80074628 06EF58 0010+00 0/0 9/9 13/13 .text GetActorPointer__4cBgSCFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::GetActorPointer(int param_0) const { - nofralloc -#include "asm/d/bg/d_bg_s/GetActorPointer__4cBgSCFi.s" +fopAc_ac_c* cBgS::GetActorPointer(int actor_index) const { + return m_chk_element[actor_index].m_actor_ptr; } -#pragma pop /* 80074628-80074660 06EF68 0038+00 2/2 3/3 0/0 .text GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::GetBgWBasePointer(cBgS_PolyInfo const& param_0) const { - nofralloc -#include "asm/d/bg/d_bg_s/GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo.s" +dBgW_Base* cBgS::GetBgWBasePointer(cBgS_PolyInfo const& poly) const { + int bg_index = poly.GetBgIndex(); + + if (bg_index < 0 || bg_index >= 0x100 || !m_chk_element[bg_index].ChkUsed()) { + return NULL; + } + return m_chk_element[bg_index].m_bgw_base_ptr; } -#pragma pop /* 80074660-800746F4 06EFA0 0094+00 3/3 35/35 9/9 .text ChkPolySafe__4cBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::ChkPolySafe(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/ChkPolySafe__4cBgSFRC13cBgS_PolyInfo.s" +bool cBgS::ChkPolySafe(cBgS_PolyInfo const& poly) { + if (!poly.ChkSetInfo()) { + return false; + } + + int bg_index = poly.GetBgIndex(); + if (bg_index < 0 || bg_index >= 0x100) { + return false; + } else { + if (m_chk_element[bg_index].ChkUsed()) { + return poly.ChkSafe(m_chk_element[bg_index].m_bgw_base_ptr, + m_chk_element[bg_index].field_0x8); + } else { + return false; + } + } } -#pragma pop /* 800746F4-80074744 06F034 0050+00 1/1 0/0 0/0 .text GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::GetGrpRoomId(cBgS_PolyInfo const& param_0) const { - nofralloc -#include "asm/d/bg/d_bg_s/GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo.s" +s32 cBgS::GetGrpRoomId(cBgS_PolyInfo const& poly) const { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetGrpRoomIndex(poly); + } else { + return 0xFF; + } } -#pragma pop /* 80074744-800747F0 06F084 00AC+00 4/4 62/62 142/142 .text * GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla */ +// something weird with virtual call +#ifdef NONMATCHING +bool cBgS::GetTriPla(cBgS_PolyInfo const& poly, cM3dGPla* param_1) const { + int bg_index = poly.GetBgIndex(); + if (bg_index < 0 || bg_index >= 0x100 || !m_chk_element[bg_index].ChkUsed()) { + return false; + } + cM3dGPla pla; + m_chk_element[bg_index].m_bgw_base_ptr->GetTriPla(poly); + param_1->mNormal.x = pla.mNormal.x; + param_1->mNormal.y = pla.mNormal.y; + param_1->mNormal.z = pla.mNormal.z; + param_1->mD = pla.mD; + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgS::GetTriPla(cBgS_PolyInfo const& param_0, cM3dGPla* param_1) const { +asm bool cBgS::GetTriPla(cBgS_PolyInfo const& param_0, cM3dGPla* param_1) const { nofralloc #include "asm/d/bg/d_bg_s/GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla.s" } #pragma pop +#endif /* 800747F0-80074840 06F130 0050+00 0/0 1/1 0/0 .text * GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::GetTriPnt(cBgS_PolyInfo const& param_0, cXyz* param_1, cXyz* param_2, - cXyz* param_3) const { - nofralloc -#include "asm/d/bg/d_bg_s/GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz.s" +bool cBgS::GetTriPnt(cBgS_PolyInfo const& poly, cXyz* param_1, cXyz* param_2, cXyz* param_3) const { + int id = poly.GetBgIndex(); + if (!m_chk_element[id].ChkUsed()) { + return false; + } + return m_chk_element[id].m_bgw_base_ptr->GetTriPnt(poly, param_1, param_2, param_3); } -#pragma pop /* 80074840-800748AC 06F180 006C+00 0/0 1/1 0/0 .text ShdwDraw__4cBgSFP13cBgS_ShdwDraw */ #pragma push @@ -320,44 +379,32 @@ asm void cBgS::ShdwDraw(cBgS_ShdwDraw* param_0) { /* 800748AC-800748FC 06F1EC 0050+00 1/1 0/0 0/0 .text GetGrpInf__4cBgSCFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::GetGrpInf(cBgS_PolyInfo const& param_0) const { - nofralloc -#include "asm/d/bg/d_bg_s/GetGrpInf__4cBgSCFRC13cBgS_PolyInfo.s" +u32 cBgS::GetGrpInf(cBgS_PolyInfo const& poly) const { + int id = poly.GetBgIndex(); + if (!m_chk_element[id].ChkUsed()) { + return -1; + } + return m_chk_element[id].m_bgw_base_ptr->GetGrpInf(poly); } -#pragma pop /* 800748FC-8007491C 06F23C 0020+00 1/0 0/0 0/0 .text Ct__4dBgSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::Ct() { - nofralloc -#include "asm/d/bg/d_bg_s/Ct__4dBgSFv.s" +void dBgS::Ct() { + cBgS::Ct(); } -#pragma pop /* 8007491C-8007493C 06F25C 0020+00 1/0 0/0 0/0 .text Dt__4dBgSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::Dt() { - nofralloc -#include "asm/d/bg/d_bg_s/Dt__4dBgSFv.s" +void dBgS::Dt() { + cBgS::Dt(); } -#pragma pop /* 8007493C-800749A8 06F27C 006C+00 0/0 1/1 0/0 .text ClrMoveFlag__4dBgSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::ClrMoveFlag() { - nofralloc -#include "asm/d/bg/d_bg_s/ClrMoveFlag__4dBgSFv.s" +void dBgS::ClrMoveFlag() { + for (int i = 0; i < 0x100; i++) { + if (m_chk_element[i].ChkUsed()) { + m_chk_element[i].m_bgw_base_ptr->OffMoveFlag(); + } + } } -#pragma pop /* 800749A8-80074A08 06F2E8 0060+00 0/0 1/1 0/0 .text Move__4dBgSFv */ #pragma push @@ -374,240 +421,264 @@ asm void dBgS::Move() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgS::Regist(dBgW_Base* param_0, fopAc_ac_c* param_1) { +asm bool dBgS::Regist(dBgW_Base* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/bg/d_bg_s/Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c.s" } #pragma pop /* 80074AB4-80074ABC -00001 0008+00 0/0 0/0 0/0 .text SetOldShapeAngleY__9dBgW_BaseFs */ -void dBgW_Base::SetOldShapeAngleY(s16 param_0) { - *(u16*)(((u8*)this) + 12) /* this->field_0xc */ = (u16)(param_0); +void dBgW_Base::SetOldShapeAngleY(s16 shape_angle) { + m_old_ShapeAngleY = shape_angle; } /* 80074ABC-80074B40 06F3FC 0084+00 0/0 11/11 5/5 .text ChkMoveBG__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::ChkMoveBG(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/ChkMoveBG__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::ChkMoveBG(cBgS_PolyInfo const& poly) { + dBgW_Base* base = dComIfG_Bgsp().GetBgWBasePointer(poly); + if (base != NULL) { + if (base->ChkLock()) { + return false; + } + if (base->ChkMoveBg()) { + return true; + } + } + return false; } -#pragma pop /* 80074B40-80074B98 06F480 0058+00 0/0 4/4 4/4 .text ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::ChkMoveBG_NoDABg(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::ChkMoveBG_NoDABg(cBgS_PolyInfo const& poly) { + dBgW_Base* base = dComIfG_Bgsp().GetBgWBasePointer(poly); + if (base != NULL && base->ChkMoveBg()) { + return true; + } + return false; } -#pragma pop /* 80074B98-80074BE8 06F4D8 0050+00 0/0 4/4 1/1 .text GetExitId__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetExitId(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetExitId__4dBgSFRC13cBgS_PolyInfo.s" +s32 dBgS::GetExitId(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetExitId(poly); + } else { + return 0x3F; + } } -#pragma pop /* 80074BE8-80074C6C 06F528 0084+00 0/0 7/7 35/35 .text GetPolyColor__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetPolyColor(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetPolyColor__4dBgSFRC13cBgS_PolyInfo.s" +s32 dBgS::GetPolyColor(cBgS_PolyInfo const& poly) { + if (!poly.ChkSetInfo()) { + return 0xFF; + } + + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetPolyColor(poly); + } + + return 0xFF; } -#pragma pop /* 80074C6C-80074CBC 06F5AC 0050+00 0/0 1/1 2/2 .text GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetHorseNoEntry(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetHorseNoEntry(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetHorseNoEntry(poly); + } + + return false; } -#pragma pop /* 80074CBC-80074D0C 06F5FC 0050+00 0/0 4/4 9/9 .text GetSpecialCode__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetSpecialCode(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetSpecialCode__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetSpecialCode(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetSpecialCode(poly); + } + + return false; } -#pragma pop /* 80074D0C-80074D5C 06F64C 0050+00 0/0 2/2 2/2 .text GetMagnetCode__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetMagnetCode(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetMagnetCode__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetMagnetCode(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetMagnetCode(poly); + } + + return false; } -#pragma pop /* 80074D5C-80074DAC 06F69C 0050+00 0/0 5/5 0/0 .text GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetMonkeyBarsCode(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetMonkeyBarsCode(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetMonkeyBarsCode(poly); + } + + return false; } -#pragma pop /* 80074DAC-80074E00 06F6EC 0054+00 0/0 0/0 1/1 .text * GetUnderwaterRoofCode__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetUnderwaterRoofCode(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetUnderwaterRoofCode__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetUnderwaterRoofCode(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetUnderwaterRoofCode(poly.GetPolyIndex()); + } + + return false; } -#pragma pop /* 80074E00-80074E50 06F740 0050+00 0/0 13/13 5/5 .text GetWallCode__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetWallCode(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetWallCode__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetWallCode(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetWallCode(poly); + } + + return false; } -#pragma pop /* 80074E50-80074EA0 06F790 0050+00 0/0 29/29 28/28 .text GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetPolyAtt0(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetPolyAtt0(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetPolyAtt0(poly); + } + + return false; } -#pragma pop /* 80074EA0-80074EF0 06F7E0 0050+00 0/0 13/13 0/0 .text GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetPolyAtt1(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetPolyAtt1(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetPolyAtt1(poly); + } + + return false; } -#pragma pop /* 80074EF0-80074F40 06F830 0050+00 0/0 7/7 8/8 .text GetGroundCode__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetGroundCode(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetGroundCode__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetGroundCode(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetGroundCode(poly); + } + + return false; } -#pragma pop /* 80074F40-80074F90 06F880 0050+00 0/0 1/1 0/0 .text GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetCamMoveBG(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo.s" +s32 dBgS::GetCamMoveBG(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetCamMoveBG(poly); + } + + return 0xFF; } -#pragma pop /* 80074F90-80074FE0 06F8D0 0050+00 0/0 1/1 0/0 .text GetRoomCamId__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetRoomCamId(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetRoomCamId__4dBgSFRC13cBgS_PolyInfo.s" +s32 dBgS::GetRoomCamId(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetRoomCamId(poly); + } + + return 0xFF; } -#pragma pop /* 80074FE0-80075030 06F920 0050+00 0/0 2/2 0/0 .text GetRoomPathId__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetRoomPathId(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetRoomPathId__4dBgSFRC13cBgS_PolyInfo.s" +s32 dBgS::GetRoomPathId(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetRoomPathId(poly); + } + + return 0xFF; } -#pragma pop /* 80075030-80075080 06F970 0050+00 0/0 1/1 0/0 .text GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetRoomPathPntNo(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo.s" +s32 dBgS::GetRoomPathPntNo(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetRoomPathPntNo(poly); + } + + return 0xFF; } -#pragma pop /* 80075080-800750D0 06F9C0 0050+00 0/0 2/2 0/0 .text GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetGrpSoundId(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo.s" +s32 dBgS::GetGrpSoundId(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetGrpSoundId(poly); + } + + return 0xFF; } -#pragma pop /* 800750D0-80075100 06FA10 0030+00 0/0 1/1 0/0 .text ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::ChkGrpInf(cBgS_PolyInfo const& param_0, u32 param_1) { - nofralloc -#include "asm/d/bg/d_bg_s/ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl.s" +u32 dBgS::ChkGrpInf(cBgS_PolyInfo const& poly, u32 param_1) { + u32 grp_inf = GetGrpInf(poly); + return grp_inf & param_1; } -#pragma pop /* 80075100-8007519C 06FA40 009C+00 0/0 16/16 60/60 .text GetRoomId__4dBgSFRC13cBgS_PolyInfo */ +// close +#ifdef NONMATCHING +s32 dBgS::GetRoomId(cBgS_PolyInfo const& poly) { + if (!poly.ChkSetInfo()) { + return -1; + } + + int id = poly.GetBgIndex(); + if (!ChkPolySafe(poly)) { + return -1; + } + + s32 roomId = m_chk_element[id].m_bgw_base_ptr->GetRoomId(); + if (roomId == 0xFF && GetGrpRoomId(poly) == 0xFF) { + return -1; + } + + // return -1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgS::GetRoomId(cBgS_PolyInfo const& param_0) { +asm s32 dBgS::GetRoomId(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_s/GetRoomId__4dBgSFRC13cBgS_PolyInfo.s" } #pragma pop +#endif /* 8007519C-800751F8 06FADC 005C+00 0/0 3/3 0/0 .text * GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::GetPolyAttackThrough(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::GetPolyAttackThrough(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetAttackThrough(poly.GetPolyIndex()) != 0; + } + + return false; } -#pragma pop /* 800751F8-8007524C 06FB38 0054+00 0/0 1/1 0/0 .text ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::ChkPolyHSStick(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo.s" +bool dBgS::ChkPolyHSStick(cBgS_PolyInfo const& poly) { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + return m_chk_element[bg_index].m_bgw_base_ptr->GetPolyHSStick(poly.GetPolyIndex()); + } + + return false; } -#pragma pop /* 8007524C-80075374 06FB8C 0128+00 0/0 1/1 0/0 .text WallCorrect__4dBgSFP9dBgS_Acch */ #pragma push @@ -634,7 +705,7 @@ asm void dBgS::WallCorrectSort(dBgS_Acch* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgS::RoofChk(dBgS_RoofChk* param_0) { +asm f32 dBgS::RoofChk(dBgS_RoofChk* param_0) { nofralloc #include "asm/d/bg/d_bg_s/RoofChk__4dBgSFP12dBgS_RoofChk.s" } @@ -645,7 +716,7 @@ asm void dBgS::RoofChk(dBgS_RoofChk* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgS::SplGrpChk(dBgS_SplGrpChk* param_0) { +asm bool dBgS::SplGrpChk(dBgS_SplGrpChk* param_0) { nofralloc #include "asm/d/bg/d_bg_s/SplGrpChk__4dBgSFP14dBgS_SplGrpChk.s" } @@ -663,162 +734,202 @@ asm void dBgS::SphChk(dBgS_SphChk* param_0, void* param_1) { /* 80075774-80075880 0700B4 010C+00 0/0 3/3 0/0 .text * MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::MoveBgCrrPos(cBgS_PolyInfo const& param_0, bool param_1, cXyz* param_2, - csXyz* param_3, csXyz* param_4, bool param_5, bool param_6) { - nofralloc -#include "asm/d/bg/d_bg_s/MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb.s" +void dBgS::MoveBgCrrPos(cBgS_PolyInfo const& poly, bool param_1, cXyz* param_2, csXyz* param_3, + csXyz* param_4, bool param_5, bool param_6) { + if (!param_1 || !poly.ChkBgIndex()) { + return; + } else { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr; + if ((!param_5 || base->chkStickWall()) && (!param_6 || base->chkStickRoof()) && + base->ChkMoveFlag() && ChkPolySafe(poly)) { + base->CrrPos(poly, m_chk_element[bg_index].m_actor_ptr, param_1, param_2, param_3, + param_4); + } + } + } } -#pragma pop /* 80075880-8007595C 0701C0 00DC+00 0/0 7/7 2/2 .text * MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::MoveBgTransPos(cBgS_PolyInfo const& param_0, bool param_1, cXyz* param_2, - csXyz* param_3, csXyz* param_4) { - nofralloc -#include "asm/d/bg/d_bg_s/MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s" +void dBgS::MoveBgTransPos(cBgS_PolyInfo const& poly, bool param_1, cXyz* param_2, csXyz* param_3, + csXyz* param_4) { + if (!param_1 || !poly.ChkBgIndex()) { + return; + } else { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr; + if (base->ChkMoveFlag() && ChkPolySafe(poly)) { + base->TransPos(poly, m_chk_element[bg_index].m_actor_ptr, param_1, param_2, param_3, + param_4); + } + } + } } -#pragma pop /* 8007595C-80075A24 07029C 00C8+00 0/0 6/6 0/0 .text * MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::MoveBgMatrixCrrPos(cBgS_PolyInfo const& param_0, bool param_1, cXyz* param_2, - csXyz* param_3, csXyz* param_4) { - nofralloc -#include "asm/d/bg/d_bg_s/MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s" +void dBgS::MoveBgMatrixCrrPos(cBgS_PolyInfo const& poly, bool param_1, cXyz* param_2, + csXyz* param_3, csXyz* param_4) { + if (!param_1 || !poly.ChkBgIndex()) { + return; + } else { + int bg_index = poly.GetBgIndex(); + if (m_chk_element[bg_index].ChkUsed()) { + dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr; + if (base->ChkMoveFlag()) { + base->MatrixCrrPos(poly, m_chk_element[bg_index].m_actor_ptr, param_1, param_2, + param_3, param_4); + } + } + } } -#pragma pop /* 80075A24-80075AA4 070364 0080+00 1/1 0/0 46/46 .text * dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, - bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6) { - nofralloc -#include "asm/d/bg/d_bg_s/dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s" +void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, + bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6) { + Mtx tmp; + if (param_0->GetOldInvMtx(tmp) != 0) { + cXyz tmp2; + PSMTXMultVec(tmp, param_4, &tmp2); + + cXyz tmp3; + PSMTXMultVec(param_0->GetBaseMtxP(), &tmp2, &tmp3); + param_4->x = tmp3.x; + param_4->y = tmp3.y; + param_4->z = tmp3.z; + } } -#pragma pop /* 80075AA4-80075AD8 0703E4 0034+00 1/1 0/0 0/0 .text * dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dBgS_MoveBGProc_RotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, - bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6) { - nofralloc -#include "asm/d/bg/d_bg_s/dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s" +static void dBgS_MoveBGProc_RotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, + bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6) { + if (param_6 != NULL) { + s16 y = param_0->GetDiffShapeAngleY(); + if (param_6 != NULL) { + param_6->y += y; + } + if (param_5 != NULL) { + param_5->y += y; + } + } } -#pragma pop /* 80075AD8-80075B44 070418 006C+00 0/0 0/0 124/124 .text * dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_MoveBGProc_TypicalRotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, - bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6) { - nofralloc -#include "asm/d/bg/d_bg_s/dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s" +void dBgS_MoveBGProc_TypicalRotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, + bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6) { + dBgS_MoveBGProc_Typical(param_0, param_1, param_2, param_3, param_4, param_5, param_6); + dBgS_MoveBGProc_RotY(param_0, param_1, param_2, param_3, param_4, param_5, param_6); } -#pragma pop /* 80075B44-80075B84 070484 0040+00 0/0 0/0 10/10 .text * dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_MoveBGProc_Trans(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, - bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6) { - nofralloc -#include "asm/d/bg/d_bg_s/dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz.s" +void dBgS_MoveBGProc_Trans(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, bool param_3, + cXyz* param_4, csXyz* param_5, csXyz* param_6) { + cXyz xyz; + param_0->GetTrans(&xyz); + + PSVECAdd(param_4, &xyz, param_4); } -#pragma pop /* 80075B84-80075BF4 0704C4 0070+00 0/0 1/1 2/2 .text * RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::RideCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/bg/d_bg_s/RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c.s" +void dBgS::RideCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1) { + u16 bg_index = param_0.GetBgIndex(); + dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr; + if (base->ChkUsed()) { + base->CallRideCallBack(m_chk_element[bg_index].m_actor_ptr, param_1); + } } -#pragma pop /* 80075BF4-80075C6C 070534 0078+00 0/0 0/0 2/2 .text * ArrowStickCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_cR4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::ArrowStickCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1, - cXyz& param_2) { - nofralloc -#include "asm/d/bg/d_bg_s/ArrowStickCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_cR4cXyz.s" +void dBgS::ArrowStickCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1, cXyz& param_2) { + u16 bg_index = param_0.GetBgIndex(); + dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr; + if (base->ChkUsed()) { + base->CallArrowStickCallBack(m_chk_element[bg_index].m_actor_ptr, param_1, param_2); + } } -#pragma pop /* 80075C6C-80075D0C 0705AC 00A0+00 0/0 1/1 0/0 .text * PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ +#ifdef NONMATCHING +bool dBgS::PushPullCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1, s16 param_2, + dBgW_Base::PushPullLabel param_3) { + u16 bg_index = param_0.GetBgIndex(); + dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr; + if (!base->ChkUsed()) { + return false; + } + + if (m_chk_element[bg_index].m_actor_ptr == NULL) { + return false; + } + + if (base->GetPushPullCallback() == NULL) { + return false; + } + + base->GetPushPullCallback()(param_0, param_1, param_2, param_3); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgS::PushPullCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1, s16 param_2, +asm bool dBgS::PushPullCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1, s16 param_2, dBgW_Base::PushPullLabel param_3) { nofralloc #include "asm/d/bg/d_bg_s/PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel.s" } #pragma pop +#endif /* 80075D0C-80075D7C 07064C 0070+00 0/0 8/8 1/1 .text dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_CheckBWallPoly(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo.s" +bool dBgS_CheckBWallPoly(cBgS_PolyInfo const& param_0) { + cM3dGPla pla; + + if (!dComIfG_Bgsp().GetTriPla(param_0, &pla)) { + return false; + } + + return cBgW_CheckBWall(pla.mNormal.y); } -#pragma pop /* 80075D7C-80075DEC 0706BC 0070+00 0/0 3/3 1/1 .text dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_CheckBGroundPoly(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo.s" +bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const& param_0) { + cM3dGPla pla; + + if (!dComIfG_Bgsp().GetTriPla(param_0, &pla)) { + return false; + } + + return cBgW_CheckBGround(pla.mNormal.y); } -#pragma pop /* 80075DEC-80075E5C 07072C 0070+00 0/0 0/0 1/1 .text dBgS_CheckBRoofPoly__FRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_CheckBRoofPoly(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/dBgS_CheckBRoofPoly__FRC13cBgS_PolyInfo.s" +bool dBgS_CheckBRoofPoly(cBgS_PolyInfo const& param_0) { + cM3dGPla pla; + + if (!dComIfG_Bgsp().GetTriPla(param_0, &pla)) { + return false; + } + + return cBgW_CheckBRoof(pla.mNormal.y); } -#pragma pop /* 80075E5C-80075EAC 07079C 0050+00 0/0 1/1 0/0 .text dBgS_GetNY__FRC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_GetNY(cBgS_PolyInfo const& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/dBgS_GetNY__FRC13cBgS_PolyInfo.s" +f32 dBgS_GetNY(cBgS_PolyInfo const& param_0) { + cM3dGPla pla; + + dComIfG_Bgsp().GetTriPla(param_0, &pla); + return pla.mNormal.y; } -#pragma pop /* ############################################################################################## */ /* 803AB608-803AB61C 008728 0014+00 0/0 3/3 0/0 .data __vt__4dBgS */ @@ -843,4 +954,4 @@ SECTION_DATA extern void* __vt__11cBgS_ChkElm[4] = { /* 80450F68-80450F70 000468 0008+00 0/0 1/1 0/0 .sbss None */ extern u8 data_80450F68[8]; -u8 data_80450F68[8]; +u8 data_80450F68[8] ALIGN_DECL(8); diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index add8b58ff12..5c1fedf3e1e 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -4,6 +4,7 @@ // #include "d/bg/d_bg_s_acch.h" +#include "d/bg/d_bg_s.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -108,7 +109,7 @@ extern "C" extern void* __vt__11dBgS_WtrChk[12]; extern "C" extern void* __vt__8cM3dGCyl[3]; extern "C" extern void* __vt__8cM3dGLin[3]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80450F68[8]; +extern "C" extern s8 data_80450F68; // // Declarations: @@ -144,70 +145,51 @@ SECTION_SDATA2 static u8 lit_4025[4] = { }; /* 80075EAC-80075F14 0707EC 0068+00 0/0 4/4 336/336 .text __ct__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::dBgS_AcchCir() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/__ct__12dBgS_AcchCirFv.s" +dBgS_AcchCir::dBgS_AcchCir() { + m_flags = 0; + f32 tmp_0 = FLOAT_LABEL(lit_4025); + m_wall_rr = tmp_0; + field_0x2c = tmp_0; + m_wall_h = tmp_0; + m_wall_r = tmp_0; + m_wall_angle_y = 0; + m_wall_h_direct = tmp_0; } -#pragma pop /* 80075F14-80075F40 070854 002C+00 1/1 0/0 0/0 .text ClrWallHit__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_AcchCir::ClrWallHit() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/ClrWallHit__12dBgS_AcchCirFv.s" +void dBgS_AcchCir::ClrWallHit() { + m_flags &= ~WALL_HIT; + ClearPi(); } -#pragma pop /* 80075F40-80075F48 070880 0008+00 1/1 2/2 109/109 .text SetWallR__12dBgS_AcchCirFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_AcchCir::SetWallR(f32 param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/SetWallR__12dBgS_AcchCirFf.s" +void dBgS_AcchCir::SetWallR(f32 r) { + m_wall_r = r; } -#pragma pop /* 80075F48-80075F58 070888 0010+00 1/1 0/0 0/0 .text CalcWallRR__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_AcchCir::CalcWallRR() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/CalcWallRR__12dBgS_AcchCirFv.s" +void dBgS_AcchCir::CalcWallRR() { + m_wall_rr = m_wall_r * m_wall_r; } -#pragma pop /* 80075F58-80075F80 070898 0028+00 0/0 3/3 272/272 .text SetWall__12dBgS_AcchCirFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_AcchCir::SetWall(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/SetWall__12dBgS_AcchCirFff.s" +void dBgS_AcchCir::SetWall(f32 wall_h, f32 wall_r) { + SetWallH(wall_h); + SetWallR(wall_r); } -#pragma pop /* 80075F80-80075F94 0708C0 0014+00 1/1 0/0 1/1 .text SetWallHDirect__12dBgS_AcchCirFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_AcchCir::SetWallHDirect(f32 param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/SetWallHDirect__12dBgS_AcchCirFf.s" +void dBgS_AcchCir::SetWallHDirect(f32 h_direct) { + m_flags |= WALL_H_DIRECT; + m_wall_h_direct = h_direct; } -#pragma pop /* 80075F94-800760A0 0708D4 010C+00 3/2 6/6 468/468 .text __dt__9dBgS_AcchFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_Acch::~dBgS_Acch() { +// asm dBgS_Acch::~dBgS_Acch() { +extern "C" asm void __dt__9dBgS_AcchFv() { nofralloc #include "asm/d/bg/d_bg_s_acch/__dt__9dBgS_AcchFv.s" } @@ -227,6 +209,43 @@ SECTION_SDATA2 static f32 lit_4091 = 1000000000.0f; SECTION_SDATA2 static f32 lit_4092 = 1000.0f; /* 800760A0-800761CC 0709E0 012C+00 0/0 4/4 338/338 .text __ct__9dBgS_AcchFv */ +// matches with literals +#ifdef NONMATCHING +dBgS_Acch::dBgS_Acch() { + SetPolyPassChk(&GetPolyPassChkInfo()); + SetGrpPassChk(&GetGrpPassChkInfo()); + + m_flags = 0; + SetRoofNone(); + + pm_pos = NULL; + pm_old_pos = NULL; + pm_speed = NULL; + m_ground_h = -1000000000.0f; + field_0x90 = 0.0f; + field_0x9c = 60.0f; + field_0x94 = 0.0f; + field_0xb4 = 0; + field_0xb8 = 0.0f; + field_0xbc = 0.0f; + + m_tbl_size = 0; + field_0x8c = NULL; + + m_roof_height = 1000000000.0f; + m_roof_crr_height = 0.0f; + field_0xcc = 0.0f; + + m_wtr_mode = 1; + m_wtr_chk_offset = 1000.0f; + + pm_angle = NULL; + pm_shape_angle = NULL; + m_my_ac = NULL; + field_0xd4 = 0; + field_0xd8 = -1000000000.0f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -235,50 +254,59 @@ asm dBgS_Acch::dBgS_Acch() { #include "asm/d/bg/d_bg_s_acch/__ct__9dBgS_AcchFv.s" } #pragma pop +#endif /* 800761CC-80076248 070B0C 007C+00 1/1 0/0 0/0 .text Init__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::Init() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/Init__9dBgS_AcchFv.s" +void dBgS_Acch::Init() { + ClrWallHit(); + for (int i = 0; i < m_tbl_size; i++) { + static_cast(field_0x8c + i)->ClrWallHit(); + static_cast(field_0x8c + i)->ClrWallHDirect(); + } } -#pragma pop /* 80076248-80076288 070B88 0040+00 0/0 2/2 314/314 .text * Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::Set(cXyz* param_0, cXyz* param_1, fopAc_ac_c* param_2, int param_3, - dBgS_AcchCir* param_4, cXyz* param_5, csXyz* param_6, csXyz* param_7) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz.s" +void dBgS_Acch::Set(cXyz* p_pos, cXyz* p_old_pos, fopAc_ac_c* p_actor, int table_size, + dBgS_AcchCir* param_4, cXyz* p_speed, csXyz* p_angle, csXyz* p_shape_angle) { + pm_pos = p_pos; + pm_old_pos = p_old_pos; + m_my_ac = p_actor; + setActorPid(fopAcM_GetID(p_actor)); + pm_speed = p_speed; + m_tbl_size = table_size; + field_0x8c = param_4; + pm_angle = p_angle; + pm_shape_angle = p_shape_angle; } -#pragma pop /* 80076288-800762D8 070BC8 0050+00 0/0 1/1 7/7 .text * Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::Set(fopAc_ac_c* param_0, int param_1, dBgS_AcchCir* param_2) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir.s" +void dBgS_Acch::Set(fopAc_ac_c* p_actor, int table_size, dBgS_AcchCir* param_2) { + m_tbl_size = table_size; + field_0x8c = param_2; + m_my_ac = p_actor; + + setActorPid(fopAcM_GetID(p_actor)); + pm_pos = &fopAcM_GetPosition_p(p_actor); + pm_old_pos = &fopAcM_GetOldPosition_p(p_actor); + pm_speed = &fopAcM_GetSpeed_p(p_actor); + pm_angle = &fopAcM_GetAngle_p(p_actor); + pm_shape_angle = &fopAcM_GetShapeAngle_p(p_actor); } -#pragma pop /* 800762D8-80076350 070C18 0078+00 1/1 0/0 0/0 .text GroundCheckInit__9dBgS_AcchFR4dBgS */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::GroundCheckInit(dBgS& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/GroundCheckInit__9dBgS_AcchFR4dBgS.s" +void dBgS_Acch::GroundCheckInit(dBgS& param_0) { + if (!(m_flags & 2)) { + m_ground_h = lit_4089; + m_gnd.SetExtChk(static_cast(*this)); + field_0xb4 = ChkGroundHit(); + i_ClrGroundHit(); + ClrGroundLanding(); + ClrGroundAway(); + } } -#pragma pop /* ############################################################################################## */ /* 80424B20-80424B2C 051840 000C+00 1/1 0/0 0/0 .bss @4166 */ @@ -286,8 +314,60 @@ static u8 lit_4166[12]; /* 80424B2C-80424B80 05184C 0050+04 1/1 0/0 0/0 .bss tmpRoofChk$4165 */ static u8 tmpRoofChk[80 + 4 /* padding */]; +// static dBgS_RoofChk tmpRoofChk; /* 80076350-8007654C 070C90 01FC+00 2/2 0/0 0/0 .text GroundCheck__9dBgS_AcchFR4dBgS */ +// issues with tmpRoofChk +#ifdef NONMATCHING +void dBgS_Acch::GroundCheck(dBgS& param_0) { + if (!(m_flags & GRND_NONE)) { + cXyz grnd_pos; + grnd_pos.x = pm_pos->x; + grnd_pos.y = pm_pos->y; + grnd_pos.z = pm_pos->z; + grnd_pos.y += field_0x94 + (field_0x9c - field_0x90); + + if (!ChkGndThinCellingOff()) { + if (data_80450F68 == 0) { + dBgS_RoofChk tmpRoofChk; + data_80450F68 = 1; + } + tmpRoofChk.setActorPid(m_gnd.GetActorPid()); + tmpRoofChk.i_SetPos(*pm_pos); + f32 tmp = param_0.RoofChk(&tmpRoofChk); + if (grnd_pos.y > tmp) { + grnd_pos.y = tmp; + } + } + field_0x94 = 0.0f; + m_gnd.SetPos(&grnd_pos); + m_ground_h = param_0.GroundCross(&m_gnd); + + if (lit_4089 != m_ground_h) { + field_0xbc = m_ground_h + field_0x90; + if (field_0xbc > field_0xb8) { + pm_pos->y = field_0xbc; + if (ChkClrSpeedY() && pm_speed != NULL) { + pm_speed->y = 0.0f; + } + param_0.GetTriPla(m_gnd, &field_0xa0); + SetGroundFind(); + SetGroundHit(); + if (field_0xc0 == 0) { + field_0xc0 = 1; + param_0.RideCallBack(m_gnd, m_my_ac); + } + if (field_0xb4 == 0) { + SetGroundLanding(); + } + } + if (field_0xb4 && !ChkGroundHit()) { + SetGroundAway(); + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -296,17 +376,28 @@ asm void dBgS_Acch::GroundCheck(dBgS& param_0) { #include "asm/d/bg/d_bg_s_acch/GroundCheck__9dBgS_AcchFR4dBgS.s" } #pragma pop +#endif /* 8007654C-80076624 070E8C 00D8+00 1/1 0/0 0/0 .text GroundRoofProc__9dBgS_AcchFR4dBgS */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::GroundRoofProc(dBgS& param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/GroundRoofProc__9dBgS_AcchFR4dBgS.s" +void dBgS_Acch::GroundRoofProc(dBgS& param_0) { + if (lit_4089 != m_ground_h) { + if (field_0xbc < field_0xcc && field_0xcc < pm_pos->y) { + pm_pos->y = field_0xcc; + } + + if (!(m_flags & ROOF_NONE) && m_ground_h >= m_roof_height) { + m_roof.SetExtChk(static_cast(*this)); + ClrRoofHit(); + cXyz roof_pos; + roof_pos.x = pm_pos->x; + roof_pos.y = pm_pos->y; + roof_pos.z = pm_pos->z; + m_roof.i_SetPos(roof_pos); + m_roof_height = param_0.RoofChk(&m_roof); + } + } } -#pragma pop /* ############################################################################################## */ /* 804526D4-804526D8 000CD4 0004+00 1/1 0/0 0/0 .sdata2 @4424 */ @@ -330,6 +421,135 @@ SECTION_SDATA2 static f32 lit_4554 = 50.0f; SECTION_SDATA2 static f32 lit_4555 = 1000000.0f; /* 80076AAC-80076F84 0713EC 04D8+00 0/0 15/15 414/414 .text CrrPos__9dBgS_AcchFR4dBgS */ +// close +#ifdef NONMATCHING +void dBgS_Acch::CrrPos(dBgS& param_0) { + bool bvar9; + if (!(m_flags & 1)) { + param_0.MoveBgCrrPos(m_gnd, ChkGroundHit(), pm_pos, pm_angle, pm_shape_angle, false, false); + + if (!ChkGroundHit()) { + bvar9 = false; + + if (ChkWallHit()) { + for (int i = 0; i < m_tbl_size; i++) { + if (static_cast(field_0x8c + i)->ChkWallHit()) { + param_0.MoveBgCrrPos(*static_cast(field_0x8c + i), true, + pm_pos, pm_angle, pm_shape_angle, true, false); + bvar9 = true; + break; + } + } + } + if (!bvar9 && ChkRoofHit()) { + param_0.MoveBgCrrPos(m_roof, true, pm_pos, pm_angle, pm_shape_angle, false, true); + } + } + + GroundCheckInit(param_0); + Init(); + + f32 tmp = GetWallAllLowH_R(); + f32 dvar10 = GetOldPos()->abs2XZ(*GetPos()); + f32 dvar11 = GetOldPos()->y - GetPos()->y; + f32 tmp2 = GetWallAllLowH(); + + field_0xb8 = GetPos()->y; + field_0xc0 = 0; + f32 fvar12 = tmp2 + GetOldPos()->y; + f32 fvar1 = field_0x9c + GetPos()->y; + bool bvar2 = false; + + OffLineCheckHit(); + if (!ChkLineCheckNone() && !cM3d_IsZero(tmp) && + (dvar10 > (tmp * tmp) || fvar12 > fvar1 || dvar11 > field_0x9c || ChkLineCheck())) { + bvar2 = true; + LineCheck(param_0); + } + + if (!(m_flags & WALL_NONE)) { + if (ChkWallSort()) { + param_0.WallCorrectSort(this); + } else { + param_0.WallCorrect(this); + } + } + + if (ChkWallHit() && bvar2) { + LineCheck(param_0); + } + field_0xcc = 1000000000.0f; + + if (!(m_flags & ROOF_NONE)) { + m_roof.SetExtChk(static_cast(*this)); + ClrRoofHit(); + cXyz roof_pos; + roof_pos.x = pm_pos->x; + roof_pos.y = pm_pos->y; + roof_pos.z = pm_pos->z; + + m_roof.i_SetPos(roof_pos); + m_roof_height = param_0.RoofChk(&m_roof); + + // register issues + if (1000000000.0f != m_roof_height && GetPos()->y > 1000000000.0f + m_roof_crr_height) { + field_0xcc = m_roof_height - m_roof_crr_height; + SetRoofHit(); + } + } + + if (!(m_flags & GRND_NONE)) { + ClrGroundFind(); + GroundCheck(param_0); + GroundRoofProc(param_0); + } else { + if (field_0xcc < GetPos()->y) { + GetPos()->y = field_0xcc; + } + } + + if (!(m_flags & 0x400)) { + ClrWaterHit(); + ClrWaterIn(); + f32 tmp4 = -1000000000.0f; + m_wtr.SetHeight(-1000000000.0f); + + f32 tmp3 = m_ground_h; + if (tmp4 == tmp3) { + tmp3 = GetPos()->y - 50.0f; // register issues + } else { + tmp3 = 50.0f; // needs to be fmr + } + + if (m_wtr_mode == 1) { + tmp4 = tmp3 + m_wtr_chk_offset; + } else { + dBgS_RoofChk roof_chk; + roof_chk.SetUnderwaterRoof(); + roof_chk.i_SetPos(*pm_pos); + tmp4 = param_0.RoofChk(&roof_chk); + if (1000000000.0f == tmp4) { + tmp4 = GetPos()->y + 1000000.0f; + } + } + cXyz xyz; + xyz.x = pm_pos->x; + xyz.y = pm_pos->y; + xyz.z = pm_pos->z; + xyz.y = tmp3; + + m_wtr.Set(xyz, tmp4); + m_wtr.SetPassChkInfo(static_cast(*this)); + if (param_0.WaterChk(&m_wtr)) { + SetWaterHit(); + if (m_wtr.GetHeight() > GetPos()->y) { + SetWaterIn(); + } + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -338,28 +558,61 @@ asm void dBgS_Acch::CrrPos(dBgS& param_0) { #include "asm/d/bg/d_bg_s_acch/CrrPos__9dBgS_AcchFR4dBgS.s" } #pragma pop +#endif /* 80076F84-80076FC0 0718C4 003C+00 1/1 0/0 0/0 .text GetWallAllR__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::GetWallAllR() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/GetWallAllR__9dBgS_AcchFv.s" +f32 dBgS_Acch::GetWallAllR() { + f32 ret = FLOAT_LABEL(lit_4025); + + for (int i = 0; i < m_tbl_size; i++) { + f32 wall_r = static_cast(field_0x8c + i)->GetWallR(); + if (ret < wall_r) { + ret = wall_r; + } + } + return ret; } -#pragma pop /* 80076FC0-8007703C 071900 007C+00 1/1 0/0 0/0 .text SetWallCir__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::SetWallCir() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/SetWallCir__9dBgS_AcchFv.s" +void dBgS_Acch::SetWallCir() { + for (int i = 0; i < m_tbl_size; i++) { + static_cast(field_0x8c + i)->SetCir(*pm_pos); + } } -#pragma pop /* 8007703C-80077114 07197C 00D8+00 1/1 0/0 0/0 .text CalcWallBmdCyl__9dBgS_AcchFv */ +// matches with literals +#ifdef NONMATCHING +void dBgS_Acch::CalcWallBmdCyl() { + if (m_tbl_size <= 0) { + m_wall_cyl.Set(*pm_pos, 0.0f, 0.0f); + } else { + f32 dvar8 = GetWallAllR(); + f32 dvar9 = field_0x8c->GetWallH(); + f32 dvar10 = field_0x8c->GetWallH(); + if (m_tbl_size >= 1) { + for (int i = 0; i < m_tbl_size; i++) { + f32 tmp = static_cast(field_0x8c + i)->GetWallH(); + if (dvar9 > tmp) { + dvar9 = static_cast(field_0x8c + i)->GetWallH(); + } + + f32 tmp2 = static_cast(field_0x8c + i)->GetWallH(); + if (dvar10 < tmp2) { + dvar10 = static_cast(field_0x8c + i)->GetWallH(); + } + } + } + cXyz xyz; + xyz.x = pm_pos->x; + xyz.y = pm_pos->y; + xyz.z = pm_pos->z; + xyz.y += dvar9; + + m_wall_cyl.Set(xyz, dvar8, dvar10 - dvar9); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -368,46 +621,55 @@ asm void dBgS_Acch::CalcWallBmdCyl() { #include "asm/d/bg/d_bg_s_acch/CalcWallBmdCyl__9dBgS_AcchFv.s" } #pragma pop +#endif /* 80077114-80077128 071A54 0014+00 0/0 0/0 24/24 .text SetGroundUpY__9dBgS_AcchFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::SetGroundUpY(f32 param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/SetGroundUpY__9dBgS_AcchFf.s" +void dBgS_Acch::SetGroundUpY(f32 param_0) { + field_0x94 = param_0 - field_0x90; + field_0x90 = param_0; } -#pragma pop /* 80077128-80077178 071A68 0050+00 1/1 0/0 0/0 .text GetWallAllLowH__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::GetWallAllLowH() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/GetWallAllLowH__9dBgS_AcchFv.s" +f32 dBgS_Acch::GetWallAllLowH() { + if (m_tbl_size <= 0) { + return FLOAT_LABEL(lit_4025); + } + + f32 tmp = field_0x8c->GetWallH(); + for (int i = 1; i < m_tbl_size; i++) { + f32 tmp2 = static_cast(field_0x8c + i)->GetWallH(); + if (tmp > tmp2) { + tmp = static_cast(field_0x8c + i)->GetWallH(); + } + } + return tmp; } -#pragma pop /* 80077178-800771E4 071AB8 006C+00 1/1 0/0 0/0 .text GetWallAllLowH_R__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::GetWallAllLowH_R() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/GetWallAllLowH_R__9dBgS_AcchFv.s" +f32 dBgS_Acch::GetWallAllLowH_R() { + if (m_tbl_size <= 0) { + return FLOAT_LABEL(lit_4025); + } + + int index = 0; + f32 tmp = field_0x8c->GetWallH(); + for (int i = 1; i < m_tbl_size; i++) { + f32 tmp2 = static_cast(field_0x8c + i)->GetWallH(); + if (tmp > tmp2) { + tmp = static_cast(field_0x8c + i)->GetWallH(); + index = i; + } + } + return static_cast(field_0x8c + index)->GetWallR(); } -#pragma pop /* 800771E4-80077200 071B24 001C+00 1/1 4/4 0/0 .text GetSpeedY__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::GetSpeedY() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/GetSpeedY__9dBgS_AcchFv.s" +f32 dBgS_Acch::GetSpeedY() { + if (pm_speed != NULL) { + return pm_speed->y; + } + return FLOAT_LABEL(lit_4025); } -#pragma pop /* ############################################################################################## */ /* 804526E0-804526E8 000CE0 0004+04 1/1 0/0 0/0 .sdata2 @4762 */ @@ -418,144 +680,113 @@ SECTION_SDATA2 static f32 lit_4762[1 + 1 /* padding */] = { }; /* 80077200-80077278 071B40 0078+00 0/0 4/4 0/0 .text GetWallAddY__9dBgS_AcchFR3Vec */ +// matches with literals +#ifdef NONMATCHING +f32 dBgS_Acch::GetWallAddY(Vec& param_0) { + if (!ChkGroundFind() || field_0xa0.mNormal.y < 0.5f) { + return 0.0f; + } + + f32 tmp; + if (field_0xa0.getCrossYLessD(param_0, &tmp)) { + if (tmp > 0.0f) { + tmp = 0.0f; + } + return -tmp; + } + return 0.0f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgS_Acch::GetWallAddY(Vec& param_0) { +asm f32 dBgS_Acch::GetWallAddY(Vec& param_0) { nofralloc #include "asm/d/bg/d_bg_s_acch/GetWallAddY__9dBgS_AcchFR3Vec.s" } #pragma pop +#endif /* 80077278-80077288 071BB8 0010+00 0/0 2/2 0/0 .text SetNowActorInfo__9dBgS_AcchFiPvUi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::SetNowActorInfo(int param_0, void* param_1, unsigned int param_2) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/SetNowActorInfo__9dBgS_AcchFiPvUi.s" +void dBgS_Acch::SetNowActorInfo(int bg_index, void* param_1, unsigned int param_2) { + m_bg_index = bg_index; + field_0x7c = param_1; + field_0x80 = param_2; } -#pragma pop /* 80077288-800772E8 071BC8 0060+00 0/0 4/4 0/0 .text SetWallPolyIndex__9dBgS_AcchFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::SetWallPolyIndex(int param_0, int param_1) { - nofralloc -#include "asm/d/bg/d_bg_s_acch/SetWallPolyIndex__9dBgS_AcchFii.s" +void dBgS_Acch::SetWallPolyIndex(int index, int poly_index) { + static_cast(field_0x8c + index) + ->SetActorInfo(m_bg_index, field_0x7c, field_0x80); + static_cast(field_0x8c + index)->SetPolyIndex(poly_index); } -#pragma pop /* 800772E8-8007732C 071C28 0044+00 0/0 6/6 0/0 .text CalcMovePosWork__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::CalcMovePosWork() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/CalcMovePosWork__9dBgS_AcchFv.s" +void dBgS_Acch::CalcMovePosWork() { + SetWallCir(); + SetLin(); + CalcWallBmdCyl(); } -#pragma pop /* 8007732C-80077388 071C6C 005C+00 0/0 2/2 0/0 .text CalcWallRR__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::CalcWallRR() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/CalcWallRR__9dBgS_AcchFv.s" +void dBgS_Acch::CalcWallRR() { + for (int i = 0; i < m_tbl_size; i++) { + static_cast(field_0x8c + i)->CalcWallRR(); + } } -#pragma pop /* 80077388-800773A4 071CC8 001C+00 0/0 1/1 0/0 .text SetMoveBGOnly__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::SetMoveBGOnly() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/SetMoveBGOnly__9dBgS_AcchFv.s" +void dBgS_Acch::SetMoveBGOnly() { + m_flags |= MOVE_BG_ONLY; + m_wtr.OnMoveBGOnly(); } -#pragma pop /* 800773A4-800773C0 071CE4 001C+00 0/0 4/4 17/17 .text ClrMoveBGOnly__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::ClrMoveBGOnly() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/ClrMoveBGOnly__9dBgS_AcchFv.s" +void dBgS_Acch::ClrMoveBGOnly() { + m_flags &= ~MOVE_BG_ONLY; + m_wtr.OffMoveBGOnly(); } -#pragma pop /* 800773C0-800773D0 071D00 0010+00 0/0 1/1 2/2 .text SetGndThinCellingOff__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::SetGndThinCellingOff() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/SetGndThinCellingOff__9dBgS_AcchFv.s" +void dBgS_Acch::SetGndThinCellingOff() { + m_flags |= GND_THIN_CELLING_OFF; } -#pragma pop /* 800773D0-800773E0 071D10 0010+00 0/0 1/1 0/0 .text ClrGndThinCellingOff__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::ClrGndThinCellingOff() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/ClrGndThinCellingOff__9dBgS_AcchFv.s" +void dBgS_Acch::ClrGndThinCellingOff() { + m_flags &= ~GND_THIN_CELLING_OFF; } -#pragma pop /* 800773E0-800773EC 071D20 000C+00 1/1 0/0 0/0 .text ChkGndThinCellingOff__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::ChkGndThinCellingOff() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/ChkGndThinCellingOff__9dBgS_AcchFv.s" +bool dBgS_Acch::ChkGndThinCellingOff() { + return m_flags & GND_THIN_CELLING_OFF; } -#pragma pop /* 800773EC-800773FC 071D2C 0010+00 0/0 1/1 1/1 .text OnWallSort__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::OnWallSort() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/OnWallSort__9dBgS_AcchFv.s" +void dBgS_Acch::OnWallSort() { + m_flags |= WALL_SORT; } -#pragma pop /* 800773FC-80077408 071D3C 000C+00 1/1 0/0 0/0 .text ChkWallSort__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::ChkWallSort() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/ChkWallSort__9dBgS_AcchFv.s" +bool dBgS_Acch::ChkWallSort() { + return m_flags & WALL_SORT; } -#pragma pop /* 80077408-80077414 071D48 000C+00 1/1 0/0 0/0 .text ChkLineDown__9dBgS_AcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Acch::ChkLineDown() { - nofralloc -#include "asm/d/bg/d_bg_s_acch/ChkLineDown__9dBgS_AcchFv.s" +bool dBgS_Acch::ChkLineDown() { + return m_flags & LINE_DOWN; } -#pragma pop /* 80077414-80077484 071D54 0070+00 1/0 2/2 0/0 .text __dt__12dBgS_AcchCirFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/d/bg/d_bg_s_acch/__dt__12dBgS_AcchCirFv.s" } diff --git a/src/d/bg/d_bg_s_chk.cpp b/src/d/bg/d_bg_s_chk.cpp index 5cd536c8142..79474f4054d 100644 --- a/src/d/bg/d_bg_s_chk.cpp +++ b/src/d/bg/d_bg_s_chk.cpp @@ -39,39 +39,28 @@ SECTION_DATA extern void* __vt__8dBgS_Chk[6] = { }; /* 8007749C-800774E8 071DDC 004C+00 0/0 6/6 0/0 .text __ct__8dBgS_ChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_Chk::dBgS_Chk() { - nofralloc -#include "asm/d/bg/d_bg_s_chk/__ct__8dBgS_ChkFv.s" -} -#pragma pop +dBgS_Chk::dBgS_Chk() {} /* 800774E8-80077560 071E28 0078+00 2/1 6/6 0/0 .text __dt__8dBgS_ChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_Chk::~dBgS_Chk() { +// asm dBgS_Chk::~dBgS_Chk() { +extern "C" asm void __dt__8dBgS_ChkFv() { nofralloc #include "asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s" } #pragma pop /* 80077560-80077564 071EA0 0004+00 0/0 6/6 0/0 .text GetPolyPassChkInfo__8dBgS_ChkFv */ -void dBgS_Chk::GetPolyPassChkInfo() { - /* empty function */ +cBgS_PolyPassChk* dBgS_Chk::GetPolyPassChkInfo() { + return this; } /* 80077564-80077574 071EA4 0010+00 0/0 6/6 0/0 .text GetGrpPassChkInfo__8dBgS_ChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_Chk::GetGrpPassChkInfo() { - nofralloc -#include "asm/d/bg/d_bg_s_chk/GetGrpPassChkInfo__8dBgS_ChkFv.s" +cBgS_GrpPassChk* dBgS_Chk::GetGrpPassChkInfo() { + return this; } -#pragma pop /* 80077574-8007757C 071EB4 0008+00 1/0 0/0 0/0 .text @16@__dt__8dBgS_ChkFv */ #pragma push diff --git a/src/d/bg/d_bg_s_gnd_chk.cpp b/src/d/bg/d_bg_s_gnd_chk.cpp index e980aaa35f5..f8d44ceecdc 100644 --- a/src/d/bg/d_bg_s_gnd_chk.cpp +++ b/src/d/bg/d_bg_s_gnd_chk.cpp @@ -7,33 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct dBgS_ObjGndChk_Wtr { - /* 80077678 */ dBgS_ObjGndChk_Wtr(); - /* 80077710 */ ~dBgS_ObjGndChk_Wtr(); -}; - -struct dBgS_ObjGndChk_Spl { - /* 800777B0 */ dBgS_ObjGndChk_Spl(); - /* 80077848 */ ~dBgS_ObjGndChk_Spl(); -}; - -struct dBgS_ObjGndChk_All { - /* 800778E8 */ ~dBgS_ObjGndChk_All(); -}; - -struct dBgS_CamGndChk_Wtr { - /* 80077A00 */ dBgS_CamGndChk_Wtr(); - /* 80077A98 */ ~dBgS_CamGndChk_Wtr(); -}; - -struct dBgS_CamGndChk { - /* 80077988 */ ~dBgS_CamGndChk(); -}; - // // Forward References: // @@ -184,60 +157,51 @@ SECTION_DATA extern void* __vt__11dBgS_GndChk[12] = { }; /* 8007757C-800775F0 071EBC 0074+00 3/3 15/15 289/289 .text __ct__11dBgS_GndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_GndChk::dBgS_GndChk() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__ct__11dBgS_GndChkFv.s" +dBgS_GndChk::dBgS_GndChk() { + SetPolyPassChk(GetPolyPassChkInfo()); + SetGrpPassChk(GetGrpPassChkInfo()); } -#pragma pop /* 800775F0-80077678 071F30 0088+00 8/7 13/13 295/295 .text __dt__11dBgS_GndChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_GndChk::~dBgS_GndChk() { +// asm dBgS_GndChk::~dBgS_GndChk() { +extern "C" asm void __dt__11dBgS_GndChkFv() { nofralloc #include "asm/d/bg/d_bg_s_gnd_chk/__dt__11dBgS_GndChkFv.s" } #pragma pop /* 80077678-80077710 071FB8 0098+00 0/0 0/0 1/1 .text __ct__18dBgS_ObjGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjGndChk_Wtr::dBgS_ObjGndChk_Wtr() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_WtrFv.s" +dBgS_ObjGndChk_Wtr::dBgS_ObjGndChk_Wtr() { + OffNormalGrp(); + OnWaterGrp(); } -#pragma pop /* 80077710-800777B0 072050 00A0+00 4/3 0/0 1/1 .text __dt__18dBgS_ObjGndChk_WtrFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk_Wtr::~dBgS_ObjGndChk_Wtr() { +// asm dBgS_ObjGndChk_Wtr::~dBgS_ObjGndChk_Wtr() { +extern "C" asm void __dt__18dBgS_ObjGndChk_WtrFv() { nofralloc #include "asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_WtrFv.s" } #pragma pop /* 800777B0-80077848 0720F0 0098+00 0/0 0/0 61/61 .text __ct__18dBgS_ObjGndChk_SplFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjGndChk_Spl::dBgS_ObjGndChk_Spl() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_ObjGndChk_SplFv.s" +dBgS_ObjGndChk_Spl::dBgS_ObjGndChk_Spl() { + OffNormalGrp(); + OnSpl(); } -#pragma pop /* 80077848-800778E8 072188 00A0+00 4/3 0/0 61/61 .text __dt__18dBgS_ObjGndChk_SplFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk_Spl::~dBgS_ObjGndChk_Spl() { +// asm dBgS_ObjGndChk_Spl::~dBgS_ObjGndChk_Spl() { +extern "C" asm void __dt__18dBgS_ObjGndChk_SplFv() { nofralloc #include "asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_SplFv.s" } @@ -247,7 +211,8 @@ asm dBgS_ObjGndChk_Spl::~dBgS_ObjGndChk_Spl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk_All::~dBgS_ObjGndChk_All() { +// asm dBgS_ObjGndChk_All::~dBgS_ObjGndChk_All() { +extern "C" asm void __dt__18dBgS_ObjGndChk_AllFv() { nofralloc #include "asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_ObjGndChk_AllFv.s" } @@ -257,27 +222,25 @@ asm dBgS_ObjGndChk_All::~dBgS_ObjGndChk_All() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_CamGndChk::~dBgS_CamGndChk() { +// asm dBgS_CamGndChk::~dBgS_CamGndChk() { +extern "C" asm void __dt__14dBgS_CamGndChkFv() { nofralloc #include "asm/d/bg/d_bg_s_gnd_chk/__dt__14dBgS_CamGndChkFv.s" } #pragma pop /* 80077A00-80077A98 072340 0098+00 0/0 5/5 1/1 .text __ct__18dBgS_CamGndChk_WtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_CamGndChk_Wtr::dBgS_CamGndChk_Wtr() { - nofralloc -#include "asm/d/bg/d_bg_s_gnd_chk/__ct__18dBgS_CamGndChk_WtrFv.s" +dBgS_CamGndChk_Wtr::dBgS_CamGndChk_Wtr() { + OffNormalGrp(); + OnWaterGrp(); } -#pragma pop /* 80077A98-80077B10 0723D8 0078+00 4/3 5/5 1/1 .text __dt__18dBgS_CamGndChk_WtrFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_CamGndChk_Wtr::~dBgS_CamGndChk_Wtr() { +// asm dBgS_CamGndChk_Wtr::~dBgS_CamGndChk_Wtr() { +extern "C" asm void __dt__18dBgS_CamGndChk_WtrFv() { nofralloc #include "asm/d/bg/d_bg_s_gnd_chk/__dt__18dBgS_CamGndChk_WtrFv.s" } diff --git a/src/d/bg/d_bg_s_grp_pass_chk.cpp b/src/d/bg/d_bg_s_grp_pass_chk.cpp index 3576dc35005..8b4bb13ecde 100644 --- a/src/d/bg/d_bg_s_grp_pass_chk.cpp +++ b/src/d/bg/d_bg_s_grp_pass_chk.cpp @@ -41,31 +41,20 @@ SECTION_DATA extern void* __vt__15cBgS_GrpPassChk[3] = { }; /* 80077BA0-80077BC4 0724E0 0024+00 0/0 1/1 0/0 .text __ct__15dBgS_GrpPassChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_GrpPassChk::dBgS_GrpPassChk() { - nofralloc -#include "asm/d/bg/d_bg_s_grp_pass_chk/__ct__15dBgS_GrpPassChkFv.s" +dBgS_GrpPassChk::dBgS_GrpPassChk() { + mGrp = 1; } -#pragma pop /* 80077BC4-80077C20 072504 005C+00 1/0 1/1 0/0 .text __dt__15dBgS_GrpPassChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_GrpPassChk::~dBgS_GrpPassChk() { +// asm dBgS_GrpPassChk::~dBgS_GrpPassChk() { +extern "C" asm void __dt__15dBgS_GrpPassChkFv() { nofralloc #include "asm/d/bg/d_bg_s_grp_pass_chk/__dt__15dBgS_GrpPassChkFv.s" } #pragma pop /* 80077C20-80077C68 072560 0048+00 1/0 0/0 0/0 .text __dt__15cBgS_GrpPassChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgS_GrpPassChk::~cBgS_GrpPassChk() { - nofralloc -#include "asm/d/bg/d_bg_s_grp_pass_chk/__dt__15cBgS_GrpPassChkFv.s" -} -#pragma pop +cBgS_GrpPassChk::~cBgS_GrpPassChk() {} diff --git a/src/d/bg/d_bg_s_lin_chk.cpp b/src/d/bg/d_bg_s_lin_chk.cpp index a36d4f35c8e..cbce9324573 100644 --- a/src/d/bg/d_bg_s_lin_chk.cpp +++ b/src/d/bg/d_bg_s_lin_chk.cpp @@ -6,25 +6,7 @@ #include "d/bg/d_bg_s_lin_chk.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct dBgS_HorseLinChk { - /* 80078460 */ dBgS_HorseLinChk(); - /* 800784BC */ ~dBgS_HorseLinChk(); -}; - -struct dBgS_CamLinChk_NorWtr { - /* 80077E78 */ dBgS_CamLinChk_NorWtr(); - /* 80077EE4 */ ~dBgS_CamLinChk_NorWtr(); -}; - -struct dBgS_CamLinChk { - /* 80077DA4 */ dBgS_CamLinChk(); - /* 80077E00 */ ~dBgS_CamLinChk(); -}; +#include "f_op/f_op_actor_mng.h" // // Forward References: @@ -269,20 +251,17 @@ SECTION_DATA extern void* __vt__11dBgS_LinChk[12] = { }; /* 80077C68-80077CDC 0725A8 0074+00 8/8 3/3 388/388 .text __ct__11dBgS_LinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_LinChk::dBgS_LinChk() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__11dBgS_LinChkFv.s" +dBgS_LinChk::dBgS_LinChk() { + SetPolyPassChk(GetPolyPassChkInfo()); + SetGrpPassChk(GetGrpPassChkInfo()); } -#pragma pop /* 80077CDC-80077D64 07261C 0088+00 12/11 5/5 378/378 .text __dt__11dBgS_LinChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_LinChk::~dBgS_LinChk() { +// asm dBgS_LinChk::~dBgS_LinChk() { +extern "C" asm void __dt__11dBgS_LinChkFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__11dBgS_LinChkFv.s" } @@ -290,190 +269,158 @@ asm dBgS_LinChk::~dBgS_LinChk() { /* 80077D64-80077DA4 0726A4 0040+00 0/0 15/15 307/307 .text * Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_LinChk::Set(cXyz const* param_0, cXyz const* param_1, fopAc_ac_c const* param_2) { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c.s" +void dBgS_LinChk::Set(cXyz const* pi_start, cXyz const* pi_end, fopAc_ac_c const* p_actor) { + u32 id; + + if (p_actor != NULL) { + id = fopAcM_GetID(p_actor); + } else { + id = 0xFFFFFFFF; + } + Set2(pi_start, pi_end, id); } -#pragma pop /* 80077DA4-80077E00 0726E4 005C+00 1/1 12/12 1/1 .text __ct__14dBgS_CamLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_CamLinChk::dBgS_CamLinChk() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_CamLinChkFv.s" +dBgS_CamLinChk::dBgS_CamLinChk() { + SetCam(); } -#pragma pop /* 80077E00-80077E78 072740 0078+00 5/4 12/12 1/1 .text __dt__14dBgS_CamLinChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_CamLinChk::~dBgS_CamLinChk() { +// asm dBgS_CamLinChk::~dBgS_CamLinChk() { +extern "C" asm void __dt__14dBgS_CamLinChkFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_CamLinChkFv.s" } #pragma pop /* 80077E78-80077EE4 0727B8 006C+00 0/0 0/0 1/1 .text __ct__21dBgS_CamLinChk_NorWtrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_CamLinChk_NorWtr::dBgS_CamLinChk_NorWtr() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__21dBgS_CamLinChk_NorWtrFv.s" +dBgS_CamLinChk_NorWtr::dBgS_CamLinChk_NorWtr() { + OnWaterGrp(); + OnNormalGrp(); } -#pragma pop /* 80077EE4-80077F5C 072824 0078+00 4/3 0/0 1/1 .text __dt__21dBgS_CamLinChk_NorWtrFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_CamLinChk_NorWtr::~dBgS_CamLinChk_NorWtr() { +// asm dBgS_CamLinChk_NorWtr::~dBgS_CamLinChk_NorWtr() { +extern "C" asm void __dt__21dBgS_CamLinChk_NorWtrFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__21dBgS_CamLinChk_NorWtrFv.s" } #pragma pop /* 80077F5C-80077FB8 07289C 005C+00 0/0 4/4 9/9 .text __ct__14dBgS_ObjLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjLinChk::dBgS_ObjLinChk() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__14dBgS_ObjLinChkFv.s" +dBgS_ObjLinChk::dBgS_ObjLinChk() { + SetObj(); } -#pragma pop /* 80077FB8-80078030 0728F8 0078+00 4/3 2/2 11/11 .text __dt__14dBgS_ObjLinChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjLinChk::~dBgS_ObjLinChk() { +// asm dBgS_ObjLinChk::~dBgS_ObjLinChk() { +extern "C" asm void __dt__14dBgS_ObjLinChkFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__14dBgS_ObjLinChkFv.s" } #pragma pop /* 80078030-8007808C 072970 005C+00 0/0 1/1 4/4 .text __ct__15dBgS_LinkLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_LinkLinChk::dBgS_LinkLinChk() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_LinkLinChkFv.s" +dBgS_LinkLinChk::dBgS_LinkLinChk() { + SetLink(); } -#pragma pop /* 8007808C-80078104 0729CC 0078+00 4/3 1/1 5/5 .text __dt__15dBgS_LinkLinChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_LinkLinChk::~dBgS_LinkLinChk() { +// asm dBgS_LinkLinChk::~dBgS_LinkLinChk() { +extern "C" asm void __dt__15dBgS_LinkLinChkFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_LinkLinChkFv.s" } #pragma pop /* 80078104-80078160 072A44 005C+00 0/0 0/0 1/1 .text __ct__15dBgS_BombLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_BombLinChk::dBgS_BombLinChk() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_BombLinChkFv.s" +dBgS_BombLinChk::dBgS_BombLinChk() { + SetBomb(); } -#pragma pop /* 80078160-800781D8 072AA0 0078+00 4/3 0/0 1/1 .text __dt__15dBgS_BombLinChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_BombLinChk::~dBgS_BombLinChk() { +// asm dBgS_BombLinChk::~dBgS_BombLinChk() { +extern "C" asm void __dt__15dBgS_BombLinChkFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_BombLinChkFv.s" } #pragma pop /* 800781D8-80078240 072B18 0068+00 0/0 1/1 2/2 .text __ct__16dBgS_ArrowLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ArrowLinChk::dBgS_ArrowLinChk() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_ArrowLinChkFv.s" +dBgS_ArrowLinChk::dBgS_ArrowLinChk() { + SetArrow(); + OnNormalGrp(); } -#pragma pop /* 80078240-800782B8 072B80 0078+00 4/3 1/1 2/2 .text __dt__16dBgS_ArrowLinChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ArrowLinChk::~dBgS_ArrowLinChk() { +// asm dBgS_ArrowLinChk::~dBgS_ArrowLinChk() { +extern "C" asm void __dt__16dBgS_ArrowLinChkFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_ArrowLinChkFv.s" } #pragma pop /* 800782B8-80078314 072BF8 005C+00 0/0 1/1 1/1 .text __ct__20dBgS_BoomerangLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_BoomerangLinChk::dBgS_BoomerangLinChk() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__20dBgS_BoomerangLinChkFv.s" +dBgS_BoomerangLinChk::dBgS_BoomerangLinChk() { + SetBoomerang(); } -#pragma pop /* 80078314-8007838C 072C54 0078+00 4/3 1/1 1/1 .text __dt__20dBgS_BoomerangLinChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_BoomerangLinChk::~dBgS_BoomerangLinChk() { +// asm dBgS_BoomerangLinChk::~dBgS_BoomerangLinChk() { +extern "C" asm void __dt__20dBgS_BoomerangLinChkFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__20dBgS_BoomerangLinChkFv.s" } #pragma pop /* 8007838C-800783E8 072CCC 005C+00 0/0 1/1 0/0 .text __ct__15dBgS_RopeLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_RopeLinChk::dBgS_RopeLinChk() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__15dBgS_RopeLinChkFv.s" +dBgS_RopeLinChk::dBgS_RopeLinChk() { + SetRope(); } -#pragma pop /* 800783E8-80078460 072D28 0078+00 4/3 1/1 0/0 .text __dt__15dBgS_RopeLinChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_RopeLinChk::~dBgS_RopeLinChk() { +// asm dBgS_RopeLinChk::~dBgS_RopeLinChk() { +extern "C" asm void __dt__15dBgS_RopeLinChkFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__15dBgS_RopeLinChkFv.s" } #pragma pop /* 80078460-800784BC 072DA0 005C+00 0/0 0/0 1/1 .text __ct__16dBgS_HorseLinChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_HorseLinChk::dBgS_HorseLinChk() { - nofralloc -#include "asm/d/bg/d_bg_s_lin_chk/__ct__16dBgS_HorseLinChkFv.s" +dBgS_HorseLinChk::dBgS_HorseLinChk() { + SetHorse(); } -#pragma pop /* 800784BC-80078534 072DFC 0078+00 4/3 0/0 1/1 .text __dt__16dBgS_HorseLinChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_HorseLinChk::~dBgS_HorseLinChk() { +// asm dBgS_HorseLinChk::~dBgS_HorseLinChk() { +extern "C" asm void __dt__16dBgS_HorseLinChkFv() { nofralloc #include "asm/d/bg/d_bg_s_lin_chk/__dt__16dBgS_HorseLinChkFv.s" } diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp index b1c69762f7d..35c3973ec66 100644 --- a/src/d/bg/d_bg_s_movebg_actor.cpp +++ b/src/d/bg/d_bg_s_movebg_actor.cpp @@ -4,82 +4,10 @@ // #include "d/bg/d_bg_s_movebg_actor.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct cXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078688 */ bool CreateHeap(); - /* 80078690 */ bool Create(); - /* 80078698 */ bool Execute(f32 (**)[3][4]); - /* 800786A0 */ bool Draw(); - /* 800786A8 */ bool Delete(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800786C8 */ void MoveBGCreateHeap(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); - - static u8 m_name[4]; - static u8 m_dzb_id[4]; - static u8 m_set_func[4 + 4 /* padding */]; -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; +#include "m_Do/m_Do_mtx.h" // // Forward References: @@ -120,12 +48,9 @@ extern "C" void __ct__4dBgWFv(); extern "C" void Move__4dBgWFv(); extern "C" void ChkUsed__9cBgW_BgIdCFv(); extern "C" void* __nw__FUl(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void _savegpr_27(); extern "C" void _restgpr_27(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: @@ -147,28 +72,18 @@ SECTION_DATA extern void* __vt__16dBgS_MoveBgActor[10] = { }; /* 80078624-80078668 072F64 0044+00 0/0 0/0 173/173 .text __ct__16dBgS_MoveBgActorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_MoveBgActor::dBgS_MoveBgActor() { - nofralloc -#include "asm/d/bg/d_bg_s_movebg_actor/__ct__16dBgS_MoveBgActorFv.s" +dBgS_MoveBgActor::dBgS_MoveBgActor() { + field_0x568 = NULL; } -#pragma pop /* 80078668-80078688 072FA8 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void CheckCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/bg/d_bg_s_movebg_actor/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* p_actor) { + return static_cast(p_actor)->MoveBGCreateHeap(); } -#pragma pop /* 80078688-80078690 072FC8 0008+00 1/0 0/0 2/0 .text CreateHeap__16dBgS_MoveBgActorFv */ -bool dBgS_MoveBgActor::CreateHeap() { - return true; +s32 dBgS_MoveBgActor::CreateHeap() { + return 1; } /* 80078690-80078698 072FD0 0008+00 1/0 0/0 60/0 .text Create__16dBgS_MoveBgActorFv */ @@ -208,55 +123,112 @@ bool dBgS_MoveBgActor::ToBack() { /* ############################################################################################## */ /* 80450F70-80450F74 000470 0004+00 2/2 0/0 0/0 .sbss m_name__16dBgS_MoveBgActor */ -u8 dBgS_MoveBgActor::m_name[4]; +const char* dBgS_MoveBgActor::m_name; /* 80450F74-80450F78 000474 0004+00 2/2 0/0 0/0 .sbss m_dzb_id__16dBgS_MoveBgActor */ -u8 dBgS_MoveBgActor::m_dzb_id[4]; +int dBgS_MoveBgActor::m_dzb_id; /* 80450F78-80450F80 000478 0004+04 2/2 0/0 1/1 .sbss m_set_func__16dBgS_MoveBgActor */ -u8 dBgS_MoveBgActor::m_set_func[4 + 4 /* padding */]; +MoveBGActor_SetFunc dBgS_MoveBgActor::m_set_func; /* 800786C8-800787BC 073008 00F4+00 1/1 0/0 0/0 .text MoveBGCreateHeap__16dBgS_MoveBgActorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_MoveBgActor::MoveBGCreateHeap() { - nofralloc -#include "asm/d/bg/d_bg_s_movebg_actor/MoveBGCreateHeap__16dBgS_MoveBgActorFv.s" +int dBgS_MoveBgActor::MoveBGCreateHeap() { + if (!CreateHeap()) { + return 0; + } + + if (m_dzb_id == -1) { + field_0x568 = NULL; + return 1; + } else { + field_0x568 = new dBgW(); + if (field_0x568 != NULL) { + cBgD_t* res = (cBgD_t*)dComIfG_getObjectRes(m_name, m_dzb_id); + if (!field_0x568->Set(res, 1, &field_0x56c)) { + if (m_set_func != NULL) { + field_0x568->SetCrrFunc(m_set_func); + } + } else { + goto RET; // probably fake match, clean up later + } + } else { + RET: + field_0x568 = NULL; + return 0; + } + + return 1; + } } -#pragma pop /* 800787BC-800788DC 0730FC 0120+00 0/0 0/0 169/169 .text * MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f */ +// close +#ifdef NONMATCHING +int dBgS_MoveBgActor::MoveBGCreate(char const* p_name, int dzb_id, MoveBGActor_SetFunc set_func, + u32 param_3, Mtx* param_4) { + if (param_4 == NULL) { + mDoMtx_stack_c::transS(mCurrent.mPosition.x, mCurrent.mPosition.y, mCurrent.mPosition.z); + mDoMtx_stack_c::YrotM(mCollisionRot.y); + mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); + PSMTXCopy(*mDoMtx_stack_c::get(), field_0x56c); + } else { + PSMTXCopy(*param_4, field_0x56c); + } + + m_name = p_name; + m_dzb_id = dzb_id; + m_set_func = set_func; + + if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, param_3)) { + return 5; + } else { + if (field_0x568 == NULL || dComIfG_Bgsp().Regist(field_0x568, this)) { + return 5; + } else { + return Create() + 5; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgS_MoveBgActor::MoveBGCreate(char const* param_0, int param_1, - void (*param_2)(dBgW*, void*, cBgS_PolyInfo const&, bool, - cXyz*, csXyz*, csXyz*), - u32 param_3, f32 (*param_4)[3][4]) { +asm int dBgS_MoveBgActor::MoveBGCreate(char const* param_0, int param_1, MoveBGActor_SetFunc, + u32 param_3, Mtx* param_4) { nofralloc #include "asm/d/bg/d_bg_s_movebg_actor/func_800787BC.s" } #pragma pop +#endif /* 800788DC-80078950 07321C 0074+00 0/0 0/0 169/169 .text MoveBGDelete__16dBgS_MoveBgActorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_MoveBgActor::MoveBGDelete() { - nofralloc -#include "asm/d/bg/d_bg_s_movebg_actor/MoveBGDelete__16dBgS_MoveBgActorFv.s" +bool dBgS_MoveBgActor::MoveBGDelete() { + bool ret = Delete(); + + if (field_0x568 != NULL && field_0x568->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x568); + } + return ret; } -#pragma pop /* 80078950-80078A14 073290 00C4+00 0/0 0/0 183/183 .text MoveBGExecute__16dBgS_MoveBgActorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_MoveBgActor::MoveBGExecute() { - nofralloc -#include "asm/d/bg/d_bg_s_movebg_actor/MoveBGExecute__16dBgS_MoveBgActorFv.s" +bool dBgS_MoveBgActor::MoveBGExecute() { + Mtx* tmp = NULL; + + bool ret = Execute(&tmp); + if (tmp == NULL) { + mDoMtx_stack_c::transS(mCurrent.mPosition.x, mCurrent.mPosition.y, mCurrent.mPosition.z); + mDoMtx_stack_c::YrotM(mCollisionRot.y); + mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); + PSMTXCopy(*mDoMtx_stack_c::get(), field_0x56c); + } else { + PSMTXCopy(*tmp, field_0x56c); + } + + if (field_0x568 != NULL) { + field_0x568->Move(); + } + return ret; } -#pragma pop diff --git a/src/d/bg/d_bg_s_poly_pass_chk.cpp b/src/d/bg/d_bg_s_poly_pass_chk.cpp index e8fbcf8b603..b8ca08307df 100644 --- a/src/d/bg/d_bg_s_poly_pass_chk.cpp +++ b/src/d/bg/d_bg_s_poly_pass_chk.cpp @@ -67,7 +67,8 @@ dBgS_PolyPassChk::dBgS_PolyPassChk() #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_PolyPassChk::~dBgS_PolyPassChk() { +// asm dBgS_PolyPassChk::~dBgS_PolyPassChk() { +extern "C" asm void __dt__16dBgS_PolyPassChkFv() { nofralloc #include "asm/d/bg/d_bg_s_poly_pass_chk/__dt__16dBgS_PolyPassChkFv.s" } diff --git a/src/d/bg/d_bg_s_roof_chk.cpp b/src/d/bg/d_bg_s_roof_chk.cpp index b7dc29e9437..fb4e37b0c8e 100644 --- a/src/d/bg/d_bg_s_roof_chk.cpp +++ b/src/d/bg/d_bg_s_roof_chk.cpp @@ -54,47 +54,33 @@ SECTION_DATA extern void* __vt__12dBgS_RoofChk[12] = { (void*)func_80079154, }; -/* 804526F0-804526F4 000CF0 0004+00 1/1 0/0 0/0 .sdata2 @316 */ -SECTION_SDATA2 static u8 lit_316[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 80078FF4-80079090 073934 009C+00 0/0 10/10 1/1 .text __ct__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_RoofChk::dBgS_RoofChk() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/__ct__12dBgS_RoofChkFv.s" +dBgS_RoofChk::dBgS_RoofChk() { + SetPolyPassChk(GetPolyPassChkInfo()); + SetGrpPassChk(GetGrpPassChkInfo()); + m_pos.x = 0.0f; + m_pos.y = 0.0f; + m_pos.z = 0.0f; + setActorPid(0xFFFFFFFF); + field_0x48 = 0; } -#pragma pop /* 80079090-80079124 0739D0 0094+00 4/3 11/11 1/1 .text __dt__12dBgS_RoofChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_RoofChk::~dBgS_RoofChk() { +// asm dBgS_RoofChk::~dBgS_RoofChk() { +extern "C" asm void __dt__12dBgS_RoofChkFv() { nofralloc #include "asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s" } #pragma pop -/* ############################################################################################## */ -/* 804526F4-804526F8 000CF4 0004+00 1/1 0/0 0/0 .sdata2 @333 */ -SECTION_SDATA2 static f32 lit_333 = 1000000000.0f; - /* 80079124-8007914C 073A64 0028+00 0/0 1/1 0/0 .text Init__12dBgS_RoofChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_RoofChk::Init() { - nofralloc -#include "asm/d/bg/d_bg_s_roof_chk/Init__12dBgS_RoofChkFv.s" +void dBgS_RoofChk::Init() { + SetNowY(1000000000.0f); + ClearPi(); } -#pragma pop /* 8007914C-80079154 073A8C 0008+00 1/0 0/0 0/0 .text @16@__dt__12dBgS_RoofChkFv */ #pragma push diff --git a/src/d/bg/d_bg_s_sph_chk.cpp b/src/d/bg/d_bg_s_sph_chk.cpp index 8fe660ba437..a79529cc430 100644 --- a/src/d/bg/d_bg_s_sph_chk.cpp +++ b/src/d/bg/d_bg_s_sph_chk.cpp @@ -7,33 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct dBgS_SphChk { - /* 80078A14 */ dBgS_SphChk(); - /* 80078AC0 */ ~dBgS_SphChk(); -}; - -struct dBgS_Chk { - /* 8007749C */ dBgS_Chk(); - /* 800774E8 */ ~dBgS_Chk(); - /* 80077560 */ void GetPolyPassChkInfo(); - /* 80077564 */ void GetGrpPassChkInfo(); -}; - -struct cBgS_PolyInfo { - /* 80268074 */ cBgS_PolyInfo(); - /* 802680B0 */ ~cBgS_PolyInfo(); - /* 80268120 */ void ClearPi(); -}; - -struct cBgS_Chk { - /* 80267B4C */ cBgS_Chk(); - /* 80267B70 */ ~cBgS_Chk(); -}; - // // Forward References: // @@ -88,24 +61,16 @@ SECTION_DATA extern void* __vt__11dBgS_SphChk[15 + 1 /* padding */] = { }; /* 80078A14-80078AC0 073354 00AC+00 0/0 1/1 1/1 .text __ct__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_SphChk::dBgS_SphChk() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/__ct__11dBgS_SphChkFv.s" +dBgS_SphChk::dBgS_SphChk() { + SetPolyPassChk(GetPolyPassChkInfo()); + SetGrpPassChk(GetGrpPassChkInfo()); + setActorPid(0xFFFFFFFF); + ClearPi(); + mCallback = NULL; } -#pragma pop /* 80078AC0-80078B70 073400 00B0+00 5/4 2/2 0/0 .text __dt__11dBgS_SphChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_SphChk::~dBgS_SphChk() { - nofralloc -#include "asm/d/bg/d_bg_s_sph_chk/__dt__11dBgS_SphChkFv.s" -} -#pragma pop +dBgS_SphChk::~dBgS_SphChk() {} /* 80078B70-80078B78 0734B0 0008+00 1/0 0/0 0/0 .text @20@__dt__11dBgS_SphChkFv */ #pragma push diff --git a/src/d/bg/d_bg_s_spl_grp_chk.cpp b/src/d/bg/d_bg_s_spl_grp_chk.cpp index a37da2496bd..68900a8c794 100644 --- a/src/d/bg/d_bg_s_spl_grp_chk.cpp +++ b/src/d/bg/d_bg_s_spl_grp_chk.cpp @@ -39,14 +39,10 @@ extern "C" void __dl__FPv(); // /* 80078B90-80078BB0 0734D0 0020+00 0/0 2/2 3/3 .text Set__14dBgS_SplGrpChkFR4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_SplGrpChk::Set(cXyz& param_0, f32 param_1) { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/Set__14dBgS_SplGrpChkFR4cXyzf.s" +void dBgS_SplGrpChk::Set(cXyz& ground, f32 roof) { + m_ground = ground; + m_roof = roof; } -#pragma pop /* ############################################################################################## */ /* 803ABA08-803ABA38 008B28 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_SplGrpChk */ @@ -65,46 +61,33 @@ SECTION_DATA extern void* __vt__14dBgS_SplGrpChk[12] = { (void*)func_80078D54, }; -/* 804526E8-804526EC 000CE8 0004+00 1/1 0/0 0/0 .sdata2 @319 */ -SECTION_SDATA2 static u8 lit_319[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 804526EC-804526F0 000CEC 0004+00 1/1 0/0 0/0 .sdata2 @320 */ -SECTION_SDATA2 static f32 lit_320 = 1000000000.0f; - /* 80078BB0-80078C78 0734F0 00C8+00 0/0 1/1 0/0 .text __ct__14dBgS_SplGrpChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_SplGrpChk::dBgS_SplGrpChk() { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/__ct__14dBgS_SplGrpChkFv.s" +dBgS_SplGrpChk::dBgS_SplGrpChk() { + SetPolyPassChk(GetPolyPassChkInfo()); + SetGrpPassChk(GetGrpPassChkInfo()); + OffNormalGrp(); + + m_ground.x = 0.0f; + m_ground.y = 0.0f; + m_ground.z = 0.0f; + m_roof = 1000000000.0f; + m_height = 0.0f; + + OffMoveBGOnly(); + OffIn(); + OffFind(); } -#pragma pop /* 80078C78-80078D0C 0735B8 0094+00 4/3 2/2 4/4 .text __dt__14dBgS_SplGrpChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_SplGrpChk::~dBgS_SplGrpChk() { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/__dt__14dBgS_SplGrpChkFv.s" -} -#pragma pop +dBgS_SplGrpChk::~dBgS_SplGrpChk() {} /* 80078D0C-80078D4C 07364C 0040+00 0/0 1/1 0/0 .text Init__14dBgS_SplGrpChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS_SplGrpChk::Init() { - nofralloc -#include "asm/d/bg/d_bg_s_spl_grp_chk/Init__14dBgS_SplGrpChkFv.s" +void dBgS_SplGrpChk::Init() { + OffIn(); + OffFind(); + SetHeight(GetPosP().y); + ClearPi(); } -#pragma pop /* 80078D4C-80078D54 07368C 0008+00 1/0 0/0 0/0 .text @16@__dt__14dBgS_SplGrpChkFv */ #pragma push diff --git a/src/d/bg/d_bg_s_wtr_chk.cpp b/src/d/bg/d_bg_s_wtr_chk.cpp index 20f10e438db..499179c8abd 100644 --- a/src/d/bg/d_bg_s_wtr_chk.cpp +++ b/src/d/bg/d_bg_s_wtr_chk.cpp @@ -1,35 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_s_wtr_chk -// - #include "d/bg/d_bg_s_wtr_chk.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void __ct__11dBgS_WtrChkFv(); - -// -// External References: -// - -extern "C" void __ct__14dBgS_SplGrpChkFv(); -extern "C" extern void* __vt__11dBgS_WtrChk[12]; - -// -// Declarations: -// - -/* 80079164-800791C4 073AA4 0060+00 0/0 2/2 3/3 .text __ct__11dBgS_WtrChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_WtrChk::dBgS_WtrChk() { - nofralloc -#include "asm/d/bg/d_bg_s_wtr_chk/__ct__11dBgS_WtrChkFv.s" +dBgS_WtrChk::dBgS_WtrChk() { + OnWaterGrp(); } -#pragma pop diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index de0ca35dfdd..51cd65b8ba7 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -4,18 +4,12 @@ // #include "d/bg/d_bg_w.h" +#include "JSystem/JMath/JMATrigonometric.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" -// -// Types: -// - -struct JMath { - static u8 sincosTable_[65536]; -}; - // // Forward References: // @@ -217,7 +211,6 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); 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]; // @@ -401,44 +394,16 @@ SECTION_DATA extern void* __vt__11cBgW_RwgElm[3 + 1 /* padding */] = { }; /* 800791C4-800791D4 073B04 0010+00 1/1 0/0 0/0 .text __ct__11cBgW_RwgElmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgW_RwgElm::cBgW_RwgElm() { - nofralloc -#include "asm/d/bg/d_bg_w/__ct__11cBgW_RwgElmFv.s" -} -#pragma pop +cBgW_RwgElm::cBgW_RwgElm() {} /* 800791D4-8007921C 073B14 0048+00 2/1 0/0 0/0 .text __dt__11cBgW_RwgElmFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgW_RwgElm::~cBgW_RwgElm() { - nofralloc -#include "asm/d/bg/d_bg_w/__dt__11cBgW_RwgElmFv.s" -} -#pragma pop +cBgW_RwgElm::~cBgW_RwgElm() {} /* 8007921C-80079238 073B5C 001C+00 1/1 0/0 0/0 .text __ct__13cBgW_NodeTreeFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgW_NodeTree::cBgW_NodeTree() { - nofralloc -#include "asm/d/bg/d_bg_w/__ct__13cBgW_NodeTreeFv.s" -} -#pragma pop +cBgW_NodeTree::cBgW_NodeTree() {} /* 80079238-80079294 073B78 005C+00 2/1 0/0 0/0 .text __dt__13cBgW_NodeTreeFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgW_NodeTree::~cBgW_NodeTree() { - nofralloc -#include "asm/d/bg/d_bg_w/__dt__13cBgW_NodeTreeFv.s" -} -#pragma pop +cBgW_NodeTree::~cBgW_NodeTree() {} /* ############################################################################################## */ /* 804526F8-804526FC 000CF8 0004+00 6/6 0/0 0/0 .sdata2 @3717 */ @@ -450,34 +415,47 @@ SECTION_SDATA2 static u8 lit_3717[4] = { }; /* 80079294-8007933C 073BD4 00A8+00 1/1 0/0 0/0 .text __ct__4cBgWFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgW::cBgW() { - nofralloc -#include "asm/d/bg/d_bg_w/__ct__4cBgWFv.s" +cBgW::cBgW() { + pm_bgd = NULL; + field_0x88 = 0x20; + field_0x89 = 1; + field_0x90 = 0; + field_0x7c.set(FLOAT_LABEL(lit_3717), FLOAT_LABEL(lit_3717), FLOAT_LABEL(lit_3717)); + + pm_tri = NULL; + pm_rwg = NULL; + field_0xa4 = NULL; + pm_node_tree = NULL; + pm_grp = NULL; + pm_vtx_tbl = NULL; + pm_base_mtx = NULL; + + PSMTXIdentity(m_inv_mtx); + PSMTXIdentity(field_0x4c); + field_0x92 = 0xFFFF; + field_0x91 = 0; } -#pragma pop /* 8007933C-800793A4 073C7C 0068+00 2/1 1/1 5/5 .text __dt__4cBgWFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cBgW::~cBgW() { +// asm cBgW::~cBgW() { +extern "C" asm void __dt__4cBgWFv() { nofralloc #include "asm/d/bg/d_bg_w/__dt__4cBgWFv.s" } #pragma pop /* 800793A4-800793C4 073CE4 0020+00 2/2 0/0 0/0 .text FreeArea__4cBgWFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgW::FreeArea() { - nofralloc -#include "asm/d/bg/d_bg_w/FreeArea__4cBgWFv.s" +void cBgW::FreeArea() { + pm_tri = NULL; + pm_rwg = NULL; + pm_node_tree = NULL; + field_0xa4 = NULL; + pm_grp = NULL; + pm_vtx_tbl = NULL; } -#pragma pop /* 800793C4-80079484 073D04 00C0+00 2/2 0/0 1/1 .text GlobalVtx__4cBgWFv */ #pragma push @@ -523,7 +501,8 @@ asm void cBgW::SetTri() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cBgW_TriElm::~cBgW_TriElm() { +// asm cBgW_TriElm::~cBgW_TriElm() { +extern "C" asm void __dt__11cBgW_TriElmFv() { nofralloc #include "asm/d/bg/d_bg_w/__dt__11cBgW_TriElmFv.s" } @@ -648,7 +627,7 @@ SECTION_SDATA2 static f32 lit_4073 = 128.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::Set(cBgD_t* param_0, u32 param_1, f32 (*param_2)[3][4]) { +asm bool cBgW::Set(cBgD_t* param_0, u32 param_1, f32 (*param_2)[3][4]) { nofralloc #include "asm/d/bg/d_bg_w/Set__4cBgWFP6cBgD_tUlPA3_A4_f.s" } @@ -658,7 +637,8 @@ asm void cBgW::Set(cBgD_t* param_0, u32 param_1, f32 (*param_2)[3][4]) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cBgW_GrpElm::~cBgW_GrpElm() { +// asm cBgW_GrpElm::~cBgW_GrpElm() { +extern "C" asm void __dt__11cBgW_GrpElmFv() { nofralloc #include "asm/d/bg/d_bg_w/__dt__11cBgW_GrpElmFv.s" } @@ -720,7 +700,7 @@ asm void cBgW::LineCheckGrpRp(cBgS_LinChk* param_0, int param_1, int param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::LineCheck(cBgS_LinChk* param_0) { +asm bool cBgW::LineCheck(cBgS_LinChk* param_0) { nofralloc #include "asm/d/bg/d_bg_w/LineCheck__4cBgWFP11cBgS_LinChk.s" } @@ -880,7 +860,7 @@ bool cBgW::ChkGrpThrough(int param_0, cBgS_GrpPassChk* param_1, int param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::GetGrpRoomIndex(cBgS_PolyInfo const& param_0) const { +asm s32 cBgW::GetGrpRoomIndex(cBgS_PolyInfo const& param_0) const { nofralloc #include "asm/d/bg/d_bg_w/GetGrpRoomIndex__4cBgWCFRC13cBgS_PolyInfo.s" } @@ -911,7 +891,7 @@ asm void cBgW::GetTrans(cXyz* param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::GetTriPnt(cBgS_PolyInfo const& param_0, cXyz* param_1, cXyz* param_2, +asm bool cBgW::GetTriPnt(cBgS_PolyInfo const& param_0, cXyz* param_1, cXyz* param_2, cXyz* param_3) const { nofralloc #include "asm/d/bg/d_bg_w/GetTriPnt__4cBgWCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz.s" @@ -944,7 +924,7 @@ asm void cBgW::GetTriPla(cBgS_PolyInfo const& param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::GetGrpInf(cBgS_PolyInfo const& param_0) const { +asm u32 cBgW::GetGrpInf(cBgS_PolyInfo const& param_0) const { nofralloc #include "asm/d/bg/d_bg_w/GetGrpInf__4cBgWCFRC13cBgS_PolyInfo.s" } @@ -985,7 +965,7 @@ asm void cBgW::GetMaskPolyInf0_NoShift(int param_0, u32 param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetExitId(cBgS_PolyInfo const& param_0) { +asm s32 dBgW::GetExitId(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetExitId__4dBgWFRC13cBgS_PolyInfo.s" } @@ -995,7 +975,7 @@ asm void dBgW::GetExitId(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetPolyColor(cBgS_PolyInfo const& param_0) { +asm s32 dBgW::GetPolyColor(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetPolyColor__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1005,7 +985,7 @@ asm void dBgW::GetPolyColor(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetHorseNoEntry(cBgS_PolyInfo const& param_0) { +asm bool dBgW::GetHorseNoEntry(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetHorseNoEntry__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1015,7 +995,7 @@ asm void dBgW::GetHorseNoEntry(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetSpecialCode(cBgS_PolyInfo const& param_0) { +asm bool dBgW::GetSpecialCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetSpecialCode__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1035,7 +1015,7 @@ asm void dBgW::GetSpecialCode(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetMagnetCode(cBgS_PolyInfo const& param_0) { +asm bool dBgW::GetMagnetCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetMagnetCode__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1046,7 +1026,7 @@ asm void dBgW::GetMagnetCode(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetMonkeyBarsCode(cBgS_PolyInfo const& param_0) { +asm bool dBgW::GetMonkeyBarsCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetMonkeyBarsCode__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1096,7 +1076,7 @@ asm void dBgW::GetPolyArrowThrough(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetPolyHSStick(int param_0) { +asm bool dBgW::GetPolyHSStick(int param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetPolyHSStick__4dBgWFi.s" } @@ -1146,7 +1126,7 @@ asm void dBgW::GetShdwThrough(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetUnderwaterRoofCode(int param_0) { +asm bool dBgW::GetUnderwaterRoofCode(int param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetUnderwaterRoofCode__4dBgWFi.s" } @@ -1177,7 +1157,7 @@ asm void dBgW::GetLinkNo(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetWallCode(cBgS_PolyInfo const& param_0) { +asm bool dBgW::GetWallCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetWallCode__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1187,7 +1167,7 @@ asm void dBgW::GetWallCode(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetPolyAtt0(cBgS_PolyInfo const& param_0) { +asm bool dBgW::GetPolyAtt0(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetPolyAtt0__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1197,7 +1177,7 @@ asm void dBgW::GetPolyAtt0(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetPolyAtt1(cBgS_PolyInfo const& param_0) { +asm bool dBgW::GetPolyAtt1(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetPolyAtt1__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1207,7 +1187,7 @@ asm void dBgW::GetPolyAtt1(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetGroundCode(cBgS_PolyInfo const& param_0) { +asm bool dBgW::GetGroundCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetGroundCode__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1238,7 +1218,7 @@ asm void dBgW::GetIronBallThrough(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetAttackThrough(int param_0) { +asm u32 dBgW::GetAttackThrough(int param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetAttackThrough__4dBgWFi.s" } @@ -1258,7 +1238,7 @@ asm void cBgW::GetPolyInf2(int param_0, u32 param_1, u32 param_2) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetCamMoveBG(cBgS_PolyInfo const& param_0) { +asm s32 dBgW::GetCamMoveBG(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetCamMoveBG__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1268,7 +1248,7 @@ asm void dBgW::GetCamMoveBG(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetRoomCamId(cBgS_PolyInfo const& param_0) { +asm s32 dBgW::GetRoomCamId(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetRoomCamId__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1278,7 +1258,7 @@ asm void dBgW::GetRoomCamId(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetRoomPathId(cBgS_PolyInfo const& param_0) { +asm s32 dBgW::GetRoomPathId(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetRoomPathId__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1288,7 +1268,7 @@ asm void dBgW::GetRoomPathId(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetRoomPathPntNo(cBgS_PolyInfo const& param_0) { +asm s32 dBgW::GetRoomPathPntNo(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetRoomPathPntNo__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1318,7 +1298,7 @@ asm void cBgW::ChkNotReady() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::ChkLock() const { +asm bool cBgW::ChkLock() const { nofralloc #include "asm/d/bg/d_bg_w/ChkLock__4cBgWCFv.s" } @@ -1328,7 +1308,7 @@ asm void cBgW::ChkLock() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::ChkMoveBg() const { +asm bool cBgW::ChkMoveBg() const { nofralloc #include "asm/d/bg/d_bg_w/ChkMoveBg__4cBgWCFv.s" } @@ -1648,7 +1628,7 @@ asm void dBgW::GetPolyGrpRoomInfId(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetGrpSoundId(cBgS_PolyInfo const& param_0) { +asm s32 dBgW::GetGrpSoundId(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetGrpSoundId__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1758,7 +1738,7 @@ asm void dBgW::OffMoveFlag() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::ChkMoveFlag() const { +asm u32 dBgW::ChkMoveFlag() const { nofralloc #include "asm/d/bg/d_bg_w/ChkMoveFlag__4dBgWCFv.s" } @@ -1778,7 +1758,8 @@ asm void dBgW_NewSet(cBgD_t* param_0, u32 param_1, f32 (*param_2)[3][4]) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgW::~dBgW() { +// asm dBgW::~dBgW() { +extern "C" asm void __dt__4dBgWFv() { nofralloc #include "asm/d/bg/d_bg_w/__dt__4dBgWFv.s" } diff --git a/src/d/bg/d_bg_w_base.cpp b/src/d/bg/d_bg_w_base.cpp index 26e43d321c1..050a7cdd63b 100644 --- a/src/d/bg/d_bg_w_base.cpp +++ b/src/d/bg/d_bg_w_base.cpp @@ -7,28 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct fopAc_ac_c {}; - -struct cXyz {}; - -struct dBgW_Base { - /* 8007E5A8 */ dBgW_Base(); - /* 8007E640 */ ~dBgW_Base(); - /* 8007E69C */ void ClrDBgWBase(); - /* 8007E6D0 */ bool ChkMemoryError(); - /* 8007E6D8 */ void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*); - /* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); - /* 8007E6E0 */ void CalcDiffShapeAngleY(s16); -}; - -struct cBgW_BgId { - /* 8007E5F8 */ ~cBgW_BgId(); -}; - // // Forward References: // @@ -128,44 +106,35 @@ SECTION_DATA extern void* __vt__9cBgW_BgId[3 + 1 /* padding */] = { }; /* 8007E5A8-8007E5F8 078EE8 0050+00 0/0 2/2 0/0 .text __ct__9dBgW_BaseFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgW_Base::dBgW_Base() { - nofralloc -#include "asm/d/bg/d_bg_w_base/__ct__9dBgW_BaseFv.s" +dBgW_Base::dBgW_Base() { + ClrDBgWBase(); } -#pragma pop /* 8007E5F8-8007E640 078F38 0048+00 1/0 0/0 0/0 .text __dt__9cBgW_BgIdFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cBgW_BgId::~cBgW_BgId() { - nofralloc -#include "asm/d/bg/d_bg_w_base/__dt__9cBgW_BgIdFv.s" -} -#pragma pop +cBgW_BgId::~cBgW_BgId() {} /* 8007E640-8007E69C 078F80 005C+00 1/0 2/2 0/0 .text __dt__9dBgW_BaseFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgW_Base::~dBgW_Base() { +// asm dBgW_Base::~dBgW_Base() { +extern "C" asm void __dt__9dBgW_BaseFv() { nofralloc #include "asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s" } #pragma pop /* 8007E69C-8007E6D0 078FDC 0034+00 1/1 1/1 0/0 .text ClrDBgWBase__9dBgW_BaseFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgW_Base::ClrDBgWBase() { - nofralloc -#include "asm/d/bg/d_bg_w_base/ClrDBgWBase__9dBgW_BaseFv.s" +void dBgW_Base::ClrDBgWBase() { + m_roomId = 0xFF; + m_priority = 2; + field_0xa = 0xFF; + m_diff_ShapeAngleY = 0; + m_old_ShapeAngleY = 0; + m_pushPull_Callback = NULL; + m_pushPull_Ok = true; + field_0xb = 0; } -#pragma pop /* 8007E6D0-8007E6D8 079010 0008+00 1/0 1/0 0/0 .text ChkMemoryError__9dBgW_BaseFv */ bool dBgW_Base::ChkMemoryError() { @@ -186,11 +155,7 @@ void dBgW_Base::CallArrowStickCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, /* 8007E6E0-8007E6F4 079020 0014+00 0/0 1/1 0/0 .text CalcDiffShapeAngleY__9dBgW_BaseFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgW_Base::CalcDiffShapeAngleY(s16 param_0) { - nofralloc -#include "asm/d/bg/d_bg_w_base/CalcDiffShapeAngleY__9dBgW_BaseFs.s" +void dBgW_Base::CalcDiffShapeAngleY(s16 param_0) { + m_diff_ShapeAngleY = param_0 - m_old_ShapeAngleY; + m_old_ShapeAngleY = param_0; } -#pragma pop diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp index 95d80bcf468..dbf04a7a1e8 100644 --- a/src/d/bg/d_bg_w_kcol.cpp +++ b/src/d/bg/d_bg_w_kcol.cpp @@ -11,154 +11,10 @@ // Types: // -struct sBgPc {}; - -struct fopAc_ac_c {}; - -struct cXyz {}; - -struct dBgW_Base { - /* 8007E5A8 */ dBgW_Base(); - /* 8007E640 */ ~dBgW_Base(); - /* 8007E69C */ void ClrDBgWBase(); - /* 8007E6D0 */ bool ChkMemoryError(); - /* 8007E6D8 */ void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*); - /* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct cBgS_ShdwDraw {}; - -struct dBgPc { - /* 80074048 */ void setCode(sBgPc&); -}; - -struct Vec {}; - -struct dBgS_Acch { - /* 800771E4 */ void GetSpeedY(); - /* 80077200 */ void GetWallAddY(Vec&); - /* 80077288 */ void SetWallPolyIndex(int, int); - /* 800772E8 */ void CalcMovePosWork(); -}; - -struct dBgS_SphChk {}; - -struct dBgS_CaptPoly {}; - -struct dBgS_SplGrpChk {}; - -struct KC_PrismData {}; - -struct cBgS_GrpPassChk {}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk {}; - -struct dBgS_RoofChk {}; - -struct cBgS_PolyPassChk {}; - -struct dBgWKCol { - /* 8007E6F4 */ dBgWKCol(); - /* 8007E74C */ ~dBgWKCol(); - /* 8007E7D0 */ void initKCollision(void*); - /* 8007E804 */ void create(void*, void*); - /* 8007E850 */ void getTriNrm(KC_PrismData*, Vec**) const; - /* 8007E86C */ void ChkNotReady() const; - /* 8007E87C */ bool ChkLock() const; - /* 8007E884 */ bool ChkMoveBg() const; - /* 8007E88C */ bool ChkMoveFlag() const; - /* 8007E894 */ void GetTriPla(cBgS_PolyInfo const&) const; - /* 8007E8C0 */ void GetTriPla(int) const; - /* 8007E980 */ void GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; - /* 8007E9A4 */ void GetTriPnt(int, Vec*, Vec*, Vec*) const; - /* 8007E9D4 */ void GetTriPnt(KC_PrismData const*, Vec*, Vec*, Vec*) const; - /* 8007EB28 */ void GetBnd() const; - /* 8007EB30 */ void GetGrpInf(cBgS_PolyInfo const&) const; - /* 8007EB6C */ void OffMoveFlag(); - /* 8007EB70 */ void getPolyCode(int, dBgPc*) const; - /* 8007EBC4 */ void chkPolyThrough(dBgPc*, cBgS_PolyPassChk*, cBgS_GrpPassChk*, cXyz&) const; - /* 8007EE34 */ void LineCheck(cBgS_LinChk*); - /* 8007F628 */ void GroundCross(cBgS_GndChk*); - /* 8007F9A4 */ void ShdwDraw(cBgS_ShdwDraw*); - /* 8007FF00 */ void ChkShdwDrawThrough(dBgPc*); - /* 8007FF1C */ void CaptPoly(dBgS_CaptPoly&); - /* 80080330 */ void WallCorrectSort(dBgS_Acch*); - /* 800811A0 */ void WallCorrect(dBgS_Acch*); - /* 80081E18 */ void RoofChk(dBgS_RoofChk*); - /* 80082184 */ void SplGrpChk(dBgS_SplGrpChk*); - /* 800824EC */ void SphChk(dBgS_SphChk*, void*); - /* 800829AC */ void GetTopUnder(f32*, f32*) const; - /* 800829F0 */ void GetGrpRoomIndex(cBgS_PolyInfo const&) const; - /* 80082A20 */ void GetExitId(cBgS_PolyInfo const&); - /* 80082A50 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80082A80 */ void GetHorseNoEntry(cBgS_PolyInfo const&); - /* 80082AB0 */ void GetSpecialCode(cBgS_PolyInfo const&); - /* 80082AE0 */ void GetSpecialCode(int); - /* 80082B0C */ void GetMagnetCode(cBgS_PolyInfo const&); - /* 80082B3C */ void GetMonkeyBarsCode(cBgS_PolyInfo const&); - /* 80082B6C */ void GetPolyObjThrough(int); - /* 80082B98 */ void GetPolyCamThrough(int); - /* 80082BC4 */ void GetPolyLinkThrough(int); - /* 80082BF0 */ void GetPolyArrowThrough(int); - /* 80082C1C */ void GetPolyHSStick(int); - /* 80082C48 */ void GetPolyBoomerangThrough(int); - /* 80082C74 */ void GetPolyRopeThrough(int); - /* 80082CA0 */ void GetPolyBombThrough(int); - /* 80082CCC */ void GetUnderwaterRoofCode(int); - /* 80082CF8 */ void GetShdwThrough(int); - /* 80082D24 */ void GetLinkNo(cBgS_PolyInfo const&); - /* 80082D54 */ void GetWallCode(cBgS_PolyInfo const&); - /* 80082D84 */ void GetPolyAtt0(cBgS_PolyInfo const&); - /* 80082DB4 */ void GetPolyAtt1(cBgS_PolyInfo const&); - /* 80082DE4 */ void GetGroundCode(cBgS_PolyInfo const&); - /* 80082E14 */ void GetIronBallThrough(int); - /* 80082E40 */ void GetAttackThrough(int); - /* 80082E6C */ void GetCamMoveBG(cBgS_PolyInfo const&); - /* 80082E9C */ void GetRoomCamId(cBgS_PolyInfo const&); - /* 80082ECC */ void GetRoomPathId(cBgS_PolyInfo const&); - /* 80082EFC */ void GetRoomPathPntNo(cBgS_PolyInfo const&); - /* 80082F2C */ void GetPolyGrpRoomInfId(cBgS_PolyInfo const&); - /* 80082F5C */ void GetGrpSoundId(cBgS_PolyInfo const&); - /* 80082F8C */ void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); - /* 80082F90 */ void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); - /* 80082F94 */ void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); -}; - -struct dBgS_PolyPassChk { - /* 80078F04 */ void ChkNoHorse(); -}; - -struct dBgPlc { - /* 80074074 */ dBgPlc(); - /* 80074080 */ ~dBgPlc(); - /* 800740C4 */ void getCode(int, sBgPc**) const; - /* 800740DC */ void getGrpCode(int) const; -}; - struct cM3dGTri { /* 8026F8C8 */ void set(Vec const*, Vec const*, Vec const*, Vec const*); }; -struct cM3dGSph { - /* 8026F76C */ void GetMinMaxCube(cXyz&, cXyz&) const; -}; - -struct cM3dGPla { - /* 8026F52C */ void SetupNP(Vec const&, Vec const&); -}; - -struct cM3dGCyl { - /* 8026F24C */ void calcMinMax(cXyz*, cXyz*); -}; - -struct cM2dGCir {}; - struct JMath { static u8 sincosTable_[65536]; }; @@ -268,12 +124,6 @@ extern "C" void SetupNP__8cM3dGPlaFRC3VecRC3Vec(); extern "C" void GetMinMaxCube__8cM3dGSphCFR4cXyzR4cXyz(); extern "C" void set__8cM3dGTriFPC3VecPC3VecPC3VecPC3Vec(); extern "C" void __dl__FPv(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSubtract(); -extern "C" void PSVECScale(); -extern "C" void PSVECDotProduct(); -extern "C" void PSVECCrossProduct(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void __save_gpr(); @@ -289,8 +139,6 @@ extern "C" extern void* __vt__8cM3dGAab[3]; extern "C" extern void* __vt__8cM3dGTri[3]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; // // Declarations: @@ -375,7 +223,8 @@ asm dBgWKCol::dBgWKCol() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgWKCol::~dBgWKCol() { +// asm dBgWKCol::~dBgWKCol() { +extern "C" asm void __dt__8dBgWKColFv() { nofralloc #include "asm/d/bg/d_bg_w_kcol/__dt__8dBgWKColFv.s" } diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 358a33acbcc..fbdf59e1e1f 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -32,11 +32,6 @@ struct dPa_control_c { cXyz const*, f32); }; -struct dBgS_CamGndChk_Wtr { - /* 80077A00 */ dBgS_CamGndChk_Wtr(); - /* 80077A98 */ ~dBgS_CamGndChk_Wtr(); -}; - struct color_RGB_class {}; struct Z2SeMgr {