diff --git a/asm/m_Do/m_Do_mtx/mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion.s b/asm/m_Do/m_Do_mtx/mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion.s deleted file mode 100644 index a319208703c..00000000000 --- a/asm/m_Do/m_Do_mtx/mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8000CB5C: -/* 8000CB5C C1 43 00 0C */ lfs f10, 0xc(r3) -/* 8000CB60 C1 24 00 0C */ lfs f9, 0xc(r4) -/* 8000CB64 EC 2A 02 72 */ fmuls f1, f10, f9 -/* 8000CB68 C1 03 00 00 */ lfs f8, 0(r3) -/* 8000CB6C C0 E4 00 00 */ lfs f7, 0(r4) -/* 8000CB70 EC 08 01 F2 */ fmuls f0, f8, f7 -/* 8000CB74 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8000CB78 C0 C3 00 04 */ lfs f6, 4(r3) -/* 8000CB7C C0 A4 00 04 */ lfs f5, 4(r4) -/* 8000CB80 EC 06 01 72 */ fmuls f0, f6, f5 -/* 8000CB84 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8000CB88 C0 83 00 08 */ lfs f4, 8(r3) -/* 8000CB8C C0 64 00 08 */ lfs f3, 8(r4) -/* 8000CB90 EC 04 00 F2 */ fmuls f0, f4, f3 -/* 8000CB94 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8000CB98 D0 05 00 0C */ stfs f0, 0xc(r5) -/* 8000CB9C EC 46 00 F2 */ fmuls f2, f6, f3 -/* 8000CBA0 EC 2A 01 F2 */ fmuls f1, f10, f7 -/* 8000CBA4 EC 08 02 72 */ fmuls f0, f8, f9 -/* 8000CBA8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8000CBAC EC 22 00 2A */ fadds f1, f2, f0 -/* 8000CBB0 EC 04 01 72 */ fmuls f0, f4, f5 -/* 8000CBB4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8000CBB8 D0 05 00 00 */ stfs f0, 0(r5) -/* 8000CBBC EC 44 01 F2 */ fmuls f2, f4, f7 -/* 8000CBC0 EC 2A 01 72 */ fmuls f1, f10, f5 -/* 8000CBC4 EC 06 02 72 */ fmuls f0, f6, f9 -/* 8000CBC8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8000CBCC EC 22 00 2A */ fadds f1, f2, f0 -/* 8000CBD0 EC 08 00 F2 */ fmuls f0, f8, f3 -/* 8000CBD4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8000CBD8 D0 05 00 04 */ stfs f0, 4(r5) -/* 8000CBDC EC 48 01 72 */ fmuls f2, f8, f5 -/* 8000CBE0 EC 2A 00 F2 */ fmuls f1, f10, f3 -/* 8000CBE4 EC 04 02 72 */ fmuls f0, f4, f9 -/* 8000CBE8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8000CBEC EC 22 00 2A */ fadds f1, f2, f0 -/* 8000CBF0 EC 06 01 F2 */ fmuls f0, f6, f7 -/* 8000CBF4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8000CBF8 D0 05 00 08 */ stfs f0, 8(r5) -/* 8000CBFC 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_mtx/mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f.s b/asm/m_Do/m_Do_mtx/mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f.s deleted file mode 100644 index 8c7d3e88ffd..00000000000 --- a/asm/m_Do/m_Do_mtx/mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_8000C8D0: -/* 8000C8D0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8000C8D4 7C 08 02 A6 */ mflr r0 -/* 8000C8D8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8000C8DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000C8E0 48 35 58 FD */ bl _savegpr_29 -/* 8000C8E4 7C 7D 1B 78 */ mr r29, r3 -/* 8000C8E8 7C 9E 23 78 */ mr r30, r4 -/* 8000C8EC 7C BF 2B 78 */ mr r31, r5 -/* 8000C8F0 48 33 9B F5 */ bl PSMTXConcat -/* 8000C8F4 C0 DD 00 38 */ lfs f6, 0x38(r29) -/* 8000C8F8 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 8000C8FC EC 46 00 32 */ fmuls f2, f6, f0 -/* 8000C900 C0 BD 00 30 */ lfs f5, 0x30(r29) -/* 8000C904 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8000C908 EC 25 00 32 */ fmuls f1, f5, f0 -/* 8000C90C C0 9D 00 34 */ lfs f4, 0x34(r29) -/* 8000C910 C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 8000C914 EC 04 00 32 */ fmuls f0, f4, f0 -/* 8000C918 EC 01 00 2A */ fadds f0, f1, f0 -/* 8000C91C EC 02 00 2A */ fadds f0, f2, f0 -/* 8000C920 D0 1F 00 30 */ stfs f0, 0x30(r31) -/* 8000C924 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 8000C928 EC 46 00 32 */ fmuls f2, f6, f0 -/* 8000C92C C0 1E 00 04 */ lfs f0, 4(r30) -/* 8000C930 EC 25 00 32 */ fmuls f1, f5, f0 -/* 8000C934 C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 8000C938 EC 04 00 32 */ fmuls f0, f4, f0 -/* 8000C93C EC 01 00 2A */ fadds f0, f1, f0 -/* 8000C940 EC 02 00 2A */ fadds f0, f2, f0 -/* 8000C944 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8000C948 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 8000C94C EC 46 00 32 */ fmuls f2, f6, f0 -/* 8000C950 C0 1E 00 08 */ lfs f0, 8(r30) -/* 8000C954 EC 25 00 32 */ fmuls f1, f5, f0 -/* 8000C958 C0 1E 00 18 */ lfs f0, 0x18(r30) -/* 8000C95C EC 04 00 32 */ fmuls f0, f4, f0 -/* 8000C960 EC 01 00 2A */ fadds f0, f1, f0 -/* 8000C964 EC 02 00 2A */ fadds f0, f2, f0 -/* 8000C968 D0 1F 00 38 */ stfs f0, 0x38(r31) -/* 8000C96C C0 7D 00 3C */ lfs f3, 0x3c(r29) -/* 8000C970 C0 1E 00 2C */ lfs f0, 0x2c(r30) -/* 8000C974 EC 46 00 32 */ fmuls f2, f6, f0 -/* 8000C978 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 8000C97C EC 25 00 32 */ fmuls f1, f5, f0 -/* 8000C980 C0 1E 00 1C */ lfs f0, 0x1c(r30) -/* 8000C984 EC 04 00 32 */ fmuls f0, f4, f0 -/* 8000C988 EC 01 00 2A */ fadds f0, f1, f0 -/* 8000C98C EC 02 00 2A */ fadds f0, f2, f0 -/* 8000C990 EC 03 00 2A */ fadds f0, f3, f0 -/* 8000C994 D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 8000C998 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000C99C 48 35 58 8D */ bl _restgpr_29 -/* 8000C9A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8000C9A4 7C 08 03 A6 */ mtlr r0 -/* 8000C9A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000C9AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Delete__14daMagLiftRot_cFv.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Delete__14daMagLiftRot_cFv.s deleted file mode 100644 index d323b2c23dd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Delete__14daMagLiftRot_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C8F970: -/* 80C8F970 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8F974 7C 08 02 A6 */ mflr r0 -/* 80C8F978 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8F97C 7C 64 1B 78 */ mr r4, r3 -/* 80C8F980 38 64 05 A0 */ addi r3, r4, 0x5a0 -/* 80C8F984 88 04 05 DC */ lbz r0, 0x5dc(r4) -/* 80C8F988 54 00 10 3A */ slwi r0, r0, 2 -/* 80C8F98C 3C 80 80 C9 */ lis r4, l_arcName@ha /* 0x80C8FBB0@ha */ -/* 80C8F990 38 84 FB B0 */ addi r4, r4, l_arcName@l /* 0x80C8FBB0@l */ -/* 80C8F994 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C8F998 4B 39 D6 71 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C8F99C 38 60 00 01 */ li r3, 1 -/* 80C8F9A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8F9A4 7C 08 03 A6 */ mtlr r0 -/* 80C8F9A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8F9AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Draw__14daMagLiftRot_cFv.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Draw__14daMagLiftRot_cFv.s deleted file mode 100644 index 59887a0c7e8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Draw__14daMagLiftRot_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_80C8F86C: -/* 80C8F86C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8F870 7C 08 02 A6 */ mflr r0 -/* 80C8F874 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8F878 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C8F87C 93 C1 00 08 */ stw r30, 8(r1) -/* 80C8F880 7C 7F 1B 78 */ mr r31, r3 -/* 80C8F884 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C8F888 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C8F88C 38 80 00 40 */ li r4, 0x40 -/* 80C8F890 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C8F894 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C8F898 4B 51 3F 2D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C8F89C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C8F8A0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C8F8A4 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C8F8A8 80 84 00 04 */ lwz r4, 4(r4) -/* 80C8F8AC 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C8F8B0 4B 51 54 F1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C8F8B4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C8F8B8 83 C3 00 04 */ lwz r30, 4(r3) -/* 80C8F8BC 88 1F 05 DC */ lbz r0, 0x5dc(r31) -/* 80C8F8C0 54 00 10 3A */ slwi r0, r0, 2 -/* 80C8F8C4 3C 60 80 C9 */ lis r3, l_btkIdx@ha /* 0x80C8FB30@ha */ -/* 80C8F8C8 38 63 FB 30 */ addi r3, r3, l_btkIdx@l /* 0x80C8FB30@l */ -/* 80C8F8CC 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80C8F8D0 2C 00 FF FF */ cmpwi r0, -1 -/* 80C8F8D4 41 82 00 14 */ beq lbl_80C8F8E8 -/* 80C8F8D8 C0 3F 05 BC */ lfs f1, 0x5bc(r31) -/* 80C8F8DC 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 80C8F8E0 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80C8F8E4 4B 37 DD F5 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -lbl_80C8F8E8: -/* 80C8F8E8 88 1F 05 DC */ lbz r0, 0x5dc(r31) -/* 80C8F8EC 54 00 10 3A */ slwi r0, r0, 2 -/* 80C8F8F0 3C 60 80 C9 */ lis r3, l_brkIdx@ha /* 0x80C8FB3C@ha */ -/* 80C8F8F4 38 63 FB 3C */ addi r3, r3, l_brkIdx@l /* 0x80C8FB3C@l */ -/* 80C8F8F8 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80C8F8FC 2C 00 FF FF */ cmpwi r0, -1 -/* 80C8F900 41 82 00 14 */ beq lbl_80C8F914 -/* 80C8F904 C0 3F 05 D4 */ lfs f1, 0x5d4(r31) -/* 80C8F908 38 7F 05 C4 */ addi r3, r31, 0x5c4 -/* 80C8F90C 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80C8F910 4B 37 DE 99 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -lbl_80C8F914: -/* 80C8F914 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C8F918 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C8F91C 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C8F920 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C8F924 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C8F928 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C8F92C 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C8F930 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C8F934 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C8F938 4B 37 E3 8D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C8F93C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C8F940 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C8F944 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C8F948 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C8F94C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C8F950 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C8F954 38 60 00 01 */ li r3, 1 -/* 80C8F958 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C8F95C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C8F960 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8F964 7C 08 03 A6 */ mtlr r0 -/* 80C8F968 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8F96C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Execute__14daMagLiftRot_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Execute__14daMagLiftRot_cFPPA3_A4_f.s deleted file mode 100644 index e4086ff3441..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Execute__14daMagLiftRot_cFPPA3_A4_f.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80C8EF94: -/* 80C8EF94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8EF98 7C 08 02 A6 */ mflr r0 -/* 80C8EF9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8EFA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C8EFA4 93 C1 00 08 */ stw r30, 8(r1) -/* 80C8EFA8 7C 7E 1B 78 */ mr r30, r3 -/* 80C8EFAC 7C 9F 23 78 */ mr r31, r4 -/* 80C8EFB0 48 00 00 7D */ bl moveLift__14daMagLiftRot_cFv -/* 80C8EFB4 88 1E 05 DC */ lbz r0, 0x5dc(r30) -/* 80C8EFB8 54 00 10 3A */ slwi r0, r0, 2 -/* 80C8EFBC 3C 60 80 C9 */ lis r3, l_btkIdx@ha /* 0x80C8FB30@ha */ -/* 80C8EFC0 38 63 FB 30 */ addi r3, r3, l_btkIdx@l /* 0x80C8FB30@l */ -/* 80C8EFC4 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80C8EFC8 2C 00 FF FF */ cmpwi r0, -1 -/* 80C8EFCC 41 82 00 0C */ beq lbl_80C8EFD8 -/* 80C8EFD0 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 80C8EFD4 4B 37 E4 55 */ bl play__14mDoExt_baseAnmFv -lbl_80C8EFD8: -/* 80C8EFD8 88 1E 05 DC */ lbz r0, 0x5dc(r30) -/* 80C8EFDC 54 00 10 3A */ slwi r0, r0, 2 -/* 80C8EFE0 3C 60 80 C9 */ lis r3, l_brkIdx@ha /* 0x80C8FB3C@ha */ -/* 80C8EFE4 38 63 FB 3C */ addi r3, r3, l_brkIdx@l /* 0x80C8FB3C@l */ -/* 80C8EFE8 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80C8EFEC 2C 00 FF FF */ cmpwi r0, -1 -/* 80C8EFF0 41 82 00 0C */ beq lbl_80C8EFFC -/* 80C8EFF4 38 7E 05 C4 */ addi r3, r30, 0x5c4 -/* 80C8EFF8 4B 37 E4 31 */ bl play__14mDoExt_baseAnmFv -lbl_80C8EFFC: -/* 80C8EFFC 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C8F000 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C8F004 90 1F 00 00 */ stw r0, 0(r31) -/* 80C8F008 7F C3 F3 78 */ mr r3, r30 -/* 80C8F00C 4B FF FA 1D */ bl setBaseMtx__14daMagLiftRot_cFv -/* 80C8F010 38 60 00 01 */ li r3, 1 -/* 80C8F014 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C8F018 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C8F01C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8F020 7C 08 03 A6 */ mtlr r0 -/* 80C8F024 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8F028 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/__sinit_d_a_obj_magLiftRot_cpp.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/__sinit_d_a_obj_magLiftRot_cpp.s deleted file mode 100644 index a66263e59b8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/__sinit_d_a_obj_magLiftRot_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C8FA98: -/* 80C8FA98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8FA9C 7C 08 02 A6 */ mflr r0 -/* 80C8FAA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8FAA4 3C 60 80 C9 */ lis r3, l_HIO@ha /* 0x80C8FCCC@ha */ -/* 80C8FAA8 38 63 FC CC */ addi r3, r3, l_HIO@l /* 0x80C8FCCC@l */ -/* 80C8FAAC 4B FF EE A1 */ bl __ct__18daMagLiftRot_HIO_cFv -/* 80C8FAB0 3C 80 80 C9 */ lis r4, __dt__18daMagLiftRot_HIO_cFv@ha /* 0x80C8FA3C@ha */ -/* 80C8FAB4 38 84 FA 3C */ addi r4, r4, __dt__18daMagLiftRot_HIO_cFv@l /* 0x80C8FA3C@l */ -/* 80C8FAB8 3C A0 80 C9 */ lis r5, lit_3621@ha /* 0x80C8FCC0@ha */ -/* 80C8FABC 38 A5 FC C0 */ addi r5, r5, lit_3621@l /* 0x80C8FCC0@l */ -/* 80C8FAC0 4B FF EE 19 */ bl __register_global_object -/* 80C8FAC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8FAC8 7C 08 03 A6 */ mtlr r0 -/* 80C8FACC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8FAD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Create__FP10fopAc_ac_c.s deleted file mode 100644 index bea4d5223cd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C8FA1C: -/* 80C8FA1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8FA20 7C 08 02 A6 */ mflr r0 -/* 80C8FA24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8FA28 4B FF F2 3D */ bl create__14daMagLiftRot_cFv -/* 80C8FA2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8FA30 7C 08 03 A6 */ mtlr r0 -/* 80C8FA34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8FA38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Delete__FP14daMagLiftRot_c.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Delete__FP14daMagLiftRot_c.s deleted file mode 100644 index 53852fef262..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Delete__FP14daMagLiftRot_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C8F9FC: -/* 80C8F9FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8FA00 7C 08 02 A6 */ mflr r0 -/* 80C8FA04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8FA08 4B 3E 8E D5 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C8FA0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8FA10 7C 08 03 A6 */ mtlr r0 -/* 80C8FA14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8FA18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Draw__FP14daMagLiftRot_c.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Draw__FP14daMagLiftRot_c.s deleted file mode 100644 index fd93d6a1d00..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Draw__FP14daMagLiftRot_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C8F9B0: -/* 80C8F9B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8F9B4 7C 08 02 A6 */ mflr r0 -/* 80C8F9B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8F9BC 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C8F9C0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C8F9C4 7D 89 03 A6 */ mtctr r12 -/* 80C8F9C8 4E 80 04 21 */ bctrl -/* 80C8F9CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8F9D0 7C 08 03 A6 */ mtlr r0 -/* 80C8F9D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8F9D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Execute__FP14daMagLiftRot_c.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Execute__FP14daMagLiftRot_c.s deleted file mode 100644 index 67d020ac024..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Execute__FP14daMagLiftRot_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C8F9DC: -/* 80C8F9DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8F9E0 7C 08 02 A6 */ mflr r0 -/* 80C8F9E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8F9E8 4B 3E 8F 69 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C8F9EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8F9F0 7C 08 03 A6 */ mtlr r0 -/* 80C8F9F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8F9F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/init_modeMoveWait__14daMagLiftRot_cFv.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/init_modeMoveWait__14daMagLiftRot_cFv.s deleted file mode 100644 index 33f7ec18044..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/init_modeMoveWait__14daMagLiftRot_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80C8F804: -/* 80C8F804 38 00 00 02 */ li r0, 2 -/* 80C8F808 98 03 05 E0 */ stb r0, 0x5e0(r3) -/* 80C8F80C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/modeMoveWait__14daMagLiftRot_cFv.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/modeMoveWait__14daMagLiftRot_cFv.s deleted file mode 100644 index 228f59d9a67..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/modeMoveWait__14daMagLiftRot_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80C8F810: -/* 80C8F810 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8F814 7C 08 02 A6 */ mflr r0 -/* 80C8F818 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8F81C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C8F820 7C 7F 1B 78 */ mr r31, r3 -/* 80C8F824 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C8F828 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C8F82C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C8F830 54 04 46 3E */ srwi r4, r0, 0x18 -/* 80C8F834 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C8F838 7C 05 07 74 */ extsb r5, r0 -/* 80C8F83C 4B 3A 5B 25 */ bl isSwitch__10dSv_info_cCFii -/* 80C8F840 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C8F844 41 82 00 14 */ beq lbl_80C8F858 -/* 80C8F848 38 00 00 0F */ li r0, 0xf -/* 80C8F84C B0 1F 05 DE */ sth r0, 0x5de(r31) -/* 80C8F850 7F E3 FB 78 */ mr r3, r31 -/* 80C8F854 4B FF FC E5 */ bl init_modeWait__14daMagLiftRot_cFv -lbl_80C8F858: -/* 80C8F858 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C8F85C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8F860 7C 08 03 A6 */ mtlr r0 -/* 80C8F864 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8F868 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/modeWait__14daMagLiftRot_cFv.s b/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/modeWait__14daMagLiftRot_cFv.s deleted file mode 100644 index 093c22fe683..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/modeWait__14daMagLiftRot_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C8F7CC: -/* 80C8F7CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C8F7D0 7C 08 02 A6 */ mflr r0 -/* 80C8F7D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C8F7D8 A8 83 05 DE */ lha r4, 0x5de(r3) -/* 80C8F7DC 2C 04 00 00 */ cmpwi r4, 0 -/* 80C8F7E0 40 82 00 0C */ bne lbl_80C8F7EC -/* 80C8F7E4 4B FF FA 81 */ bl init_modeMove__14daMagLiftRot_cFv -/* 80C8F7E8 48 00 00 0C */ b lbl_80C8F7F4 -lbl_80C8F7EC: -/* 80C8F7EC 38 04 FF FF */ addi r0, r4, -1 -/* 80C8F7F0 B0 03 05 DE */ sth r0, 0x5de(r3) -lbl_80C8F7F4: -/* 80C8F7F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C8F7F8 7C 08 03 A6 */ mtlr r0 -/* 80C8F7FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C8F800 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/CreateHeap__14daObj_Suisya_cFv.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/CreateHeap__14daObj_Suisya_cFv.s deleted file mode 100644 index 9af468518a8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/CreateHeap__14daObj_Suisya_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80CF0284: -/* 80CF0284 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF0288 7C 08 02 A6 */ mflr r0 -/* 80CF028C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF0290 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF0294 7C 7F 1B 78 */ mr r31, r3 -/* 80CF0298 3C 60 80 CF */ lis r3, d_a_obj_suisya__stringBase0@ha /* 0x80CF0544@ha */ -/* 80CF029C 38 63 05 44 */ addi r3, r3, d_a_obj_suisya__stringBase0@l /* 0x80CF0544@l */ -/* 80CF02A0 38 80 00 03 */ li r4, 3 -/* 80CF02A4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CF02A8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CF02AC 3C A5 00 02 */ addis r5, r5, 2 -/* 80CF02B0 38 C0 00 80 */ li r6, 0x80 -/* 80CF02B4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80CF02B8 4B 34 C0 35 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CF02BC 3C 80 00 08 */ lis r4, 8 -/* 80CF02C0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CF02C4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CF02C8 4B 32 49 8D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CF02CC 90 7F 05 70 */ stw r3, 0x570(r31) -/* 80CF02D0 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80CF02D4 30 03 FF FF */ addic r0, r3, -1 -/* 80CF02D8 7C 60 19 10 */ subfe r3, r0, r3 -/* 80CF02DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF02E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF02E4 7C 08 03 A6 */ mtlr r0 -/* 80CF02E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF02EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 93ec67e9738..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CF0478: -/* 80CF0478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF047C 7C 08 02 A6 */ mflr r0 -/* 80CF0480 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF0484 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CF0488 93 C1 00 08 */ stw r30, 8(r1) -/* 80CF048C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CF0490 7C 9F 23 78 */ mr r31, r4 -/* 80CF0494 41 82 00 38 */ beq lbl_80CF04CC -/* 80CF0498 3C 80 80 CF */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80CF059C@ha */ -/* 80CF049C 38 84 05 9C */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80CF059C@l */ -/* 80CF04A0 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80CF04A4 38 04 00 0C */ addi r0, r4, 0xc -/* 80CF04A8 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80CF04AC 38 04 00 18 */ addi r0, r4, 0x18 -/* 80CF04B0 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80CF04B4 38 80 00 00 */ li r4, 0 -/* 80CF04B8 4B 38 5A DD */ bl __dt__9dBgS_AcchFv -/* 80CF04BC 7F E0 07 35 */ extsh. r0, r31 -/* 80CF04C0 40 81 00 0C */ ble lbl_80CF04CC -/* 80CF04C4 7F C3 F3 78 */ mr r3, r30 -/* 80CF04C8 4B 5D E8 75 */ bl __dl__FPv -lbl_80CF04CC: -/* 80CF04CC 7F C3 F3 78 */ mr r3, r30 -/* 80CF04D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CF04D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CF04D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF04DC 7C 08 03 A6 */ mtlr r0 -/* 80CF04E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF04E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/_delete__14daObj_Suisya_cFv.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/_delete__14daObj_Suisya_cFv.s deleted file mode 100644 index b9b089f6472..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/_delete__14daObj_Suisya_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80CF0234: -/* 80CF0234 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF0238 7C 08 02 A6 */ mflr r0 -/* 80CF023C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF0240 3C 80 80 CF */ lis r4, d_a_obj_suisya__stringBase0@ha /* 0x80CF0544@ha */ -/* 80CF0244 38 84 05 44 */ addi r4, r4, d_a_obj_suisya__stringBase0@l /* 0x80CF0544@l */ -/* 80CF0248 38 63 05 68 */ addi r3, r3, 0x568 -/* 80CF024C 4B 33 CD BD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CF0250 38 60 00 01 */ li r3, 1 -/* 80CF0254 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF0258 7C 08 03 A6 */ mtlr r0 -/* 80CF025C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF0260 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/create__14daObj_Suisya_cFv.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/create__14daObj_Suisya_cFv.s deleted file mode 100644 index 508066c40d9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/create__14daObj_Suisya_cFv.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_80CF0310: -/* 80CF0310 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF0314 7C 08 02 A6 */ mflr r0 -/* 80CF0318 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF031C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF0320 4B 67 1E BD */ bl _savegpr_29 -/* 80CF0324 7C 7E 1B 78 */ mr r30, r3 -/* 80CF0328 3C 80 80 CF */ lis r4, lit_3662@ha /* 0x80CF0520@ha */ -/* 80CF032C 3B E4 05 20 */ addi r31, r4, lit_3662@l /* 0x80CF0520@l */ -/* 80CF0330 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CF0334 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CF0338 40 82 00 58 */ bne lbl_80CF0390 -/* 80CF033C 7F C0 F3 79 */ or. r0, r30, r30 -/* 80CF0340 41 82 00 44 */ beq lbl_80CF0384 -/* 80CF0344 7C 1D 03 78 */ mr r29, r0 -/* 80CF0348 4B 32 88 1D */ bl __ct__10fopAc_ac_cFv -/* 80CF034C 38 7D 05 78 */ addi r3, r29, 0x578 -/* 80CF0350 4B 38 5B 5D */ bl __ct__12dBgS_AcchCirFv -/* 80CF0354 3B BD 05 B8 */ addi r29, r29, 0x5b8 -/* 80CF0358 7F A3 EB 78 */ mr r3, r29 -/* 80CF035C 4B 38 5D 45 */ bl __ct__9dBgS_AcchFv -/* 80CF0360 3C 60 80 CF */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80CF059C@ha */ -/* 80CF0364 38 63 05 9C */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80CF059C@l */ -/* 80CF0368 90 7D 00 10 */ stw r3, 0x10(r29) -/* 80CF036C 38 03 00 0C */ addi r0, r3, 0xc -/* 80CF0370 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80CF0374 38 03 00 18 */ addi r0, r3, 0x18 -/* 80CF0378 90 1D 00 24 */ stw r0, 0x24(r29) -/* 80CF037C 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80CF0380 4B 38 8A E9 */ bl SetObj__16dBgS_PolyPassChkFv -lbl_80CF0384: -/* 80CF0384 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80CF0388 60 00 00 08 */ ori r0, r0, 8 -/* 80CF038C 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80CF0390: -/* 80CF0390 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80CF0394 3C 80 80 CF */ lis r4, d_a_obj_suisya__stringBase0@ha /* 0x80CF0544@ha */ -/* 80CF0398 38 84 05 44 */ addi r4, r4, d_a_obj_suisya__stringBase0@l /* 0x80CF0544@l */ -/* 80CF039C 4B 33 CB 21 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CF03A0 7C 7D 1B 78 */ mr r29, r3 -/* 80CF03A4 2C 1D 00 04 */ cmpwi r29, 4 -/* 80CF03A8 40 82 00 B4 */ bne lbl_80CF045C -/* 80CF03AC 7F C3 F3 78 */ mr r3, r30 -/* 80CF03B0 3C 80 80 CF */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80CF02F0@ha */ -/* 80CF03B4 38 84 02 F0 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80CF02F0@l */ -/* 80CF03B8 38 A0 08 00 */ li r5, 0x800 -/* 80CF03BC 4B 32 A0 F5 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80CF03C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CF03C4 40 82 00 0C */ bne lbl_80CF03D0 -/* 80CF03C8 38 60 00 05 */ li r3, 5 -/* 80CF03CC 48 00 00 94 */ b lbl_80CF0460 -lbl_80CF03D0: -/* 80CF03D0 38 00 00 00 */ li r0, 0 -/* 80CF03D4 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 80CF03D8 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80CF03DC 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CF03E0 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80CF03E4 7F C3 F3 78 */ mr r3, r30 -/* 80CF03E8 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80CF03EC C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 80CF03F0 FC 60 10 90 */ fmr f3, f2 -/* 80CF03F4 4B 32 A1 35 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80CF03F8 7F C3 F3 78 */ mr r3, r30 -/* 80CF03FC C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80CF0400 C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 80CF0404 FC 60 10 90 */ fmr f3, f2 -/* 80CF0408 4B 32 A1 31 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80CF040C 38 00 00 00 */ li r0, 0 -/* 80CF0410 90 01 00 08 */ stw r0, 8(r1) -/* 80CF0414 38 7E 05 B8 */ addi r3, r30, 0x5b8 -/* 80CF0418 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CF041C 38 BE 04 BC */ addi r5, r30, 0x4bc -/* 80CF0420 7F C6 F3 78 */ mr r6, r30 -/* 80CF0424 38 E0 00 01 */ li r7, 1 -/* 80CF0428 39 1E 05 78 */ addi r8, r30, 0x578 -/* 80CF042C 39 3E 04 F8 */ addi r9, r30, 0x4f8 -/* 80CF0430 39 40 00 00 */ li r10, 0 -/* 80CF0434 4B 38 5E 15 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80CF0438 38 7E 05 78 */ addi r3, r30, 0x578 -/* 80CF043C C0 3F 00 08 */ lfs f1, 8(r31) -/* 80CF0440 FC 40 08 90 */ fmr f2, f1 -/* 80CF0444 4B 38 5B 15 */ bl SetWall__12dBgS_AcchCirFff -/* 80CF0448 38 00 00 3C */ li r0, 0x3c -/* 80CF044C B0 1E 05 62 */ sth r0, 0x562(r30) -/* 80CF0450 B0 1E 05 60 */ sth r0, 0x560(r30) -/* 80CF0454 7F C3 F3 78 */ mr r3, r30 -/* 80CF0458 4B FF FD B5 */ bl daObj_Suisya_Execute__FP14daObj_Suisya_c -lbl_80CF045C: -/* 80CF045C 7F A3 EB 78 */ mr r3, r29 -lbl_80CF0460: -/* 80CF0460 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CF0464 4B 67 1D C5 */ bl _restgpr_29 -/* 80CF0468 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF046C 7C 08 03 A6 */ mtlr r0 -/* 80CF0470 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF0474 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Create__FP14daObj_Suisya_c.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Create__FP14daObj_Suisya_c.s deleted file mode 100644 index b72ba4f92ea..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Create__FP14daObj_Suisya_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF04E8: -/* 80CF04E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF04EC 7C 08 02 A6 */ mflr r0 -/* 80CF04F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF04F4 4B FF FE 1D */ bl create__14daObj_Suisya_cFv -/* 80CF04F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF04FC 7C 08 03 A6 */ mtlr r0 -/* 80CF0500 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF0504 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Delete__FP14daObj_Suisya_c.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Delete__FP14daObj_Suisya_c.s deleted file mode 100644 index 4d3c679e46d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Delete__FP14daObj_Suisya_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF0264: -/* 80CF0264 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF0268 7C 08 02 A6 */ mflr r0 -/* 80CF026C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF0270 4B FF FF C5 */ bl _delete__14daObj_Suisya_cFv -/* 80CF0274 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF0278 7C 08 03 A6 */ mtlr r0 -/* 80CF027C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF0280 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Draw__FP14daObj_Suisya_c.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Draw__FP14daObj_Suisya_c.s deleted file mode 100644 index 0f49ae997e6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Draw__FP14daObj_Suisya_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF0148: -/* 80CF0148 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF014C 7C 08 02 A6 */ mflr r0 -/* 80CF0150 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF0154 4B FF FF 25 */ bl draw__14daObj_Suisya_cFv -/* 80CF0158 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF015C 7C 08 03 A6 */ mtlr r0 -/* 80CF0160 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF0164 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Execute__FP14daObj_Suisya_c.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Execute__FP14daObj_Suisya_c.s deleted file mode 100644 index 848448e6f59..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Execute__FP14daObj_Suisya_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF020C: -/* 80CF020C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF0210 7C 08 02 A6 */ mflr r0 -/* 80CF0214 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF0218 4B FF FF 51 */ bl execute__14daObj_Suisya_cFv -/* 80CF021C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF0220 7C 08 03 A6 */ mtlr r0 -/* 80CF0224 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF0228 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/draw__14daObj_Suisya_cFv.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/draw__14daObj_Suisya_cFv.s deleted file mode 100644 index 26143c8f00a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/draw__14daObj_Suisya_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80CF0078: -/* 80CF0078 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF007C 7C 08 02 A6 */ mflr r0 -/* 80CF0080 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF0084 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CF0088 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80CF008C 7C 7E 1B 78 */ mr r30, r3 -/* 80CF0090 3C 60 80 CF */ lis r3, lit_3662@ha /* 0x80CF0520@ha */ -/* 80CF0094 3B E3 05 20 */ addi r31, r3, lit_3662@l /* 0x80CF0520@l */ -/* 80CF0098 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CF009C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CF00A0 38 80 00 10 */ li r4, 0x10 -/* 80CF00A4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CF00A8 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CF00AC 4B 4B 37 19 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CF00B0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CF00B4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CF00B8 80 9E 05 70 */ lwz r4, 0x570(r30) -/* 80CF00BC 80 84 00 04 */ lwz r4, 4(r4) -/* 80CF00C0 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CF00C4 4B 4B 4C DD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CF00C8 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80CF00CC 4B 31 DB F9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CF00D0 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 80CF00D4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80CF00D8 C0 7E 04 D4 */ lfs f3, 0x4d4(r30) -/* 80CF00DC EC 20 18 2A */ fadds f1, f0, f3 -/* 80CF00E0 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CF00E4 D0 01 00 08 */ stfs f0, 8(r1) -/* 80CF00E8 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80CF00EC D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80CF00F0 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80CF00F4 38 80 00 01 */ li r4, 1 -/* 80CF00F8 80 BE 05 70 */ lwz r5, 0x570(r30) -/* 80CF00FC 38 C1 00 08 */ addi r6, r1, 8 -/* 80CF0100 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80CF0104 C0 5F 00 08 */ lfs f2, 8(r31) -/* 80CF0108 C0 9E 06 50 */ lfs f4, 0x650(r30) -/* 80CF010C 38 FE 06 A8 */ addi r7, r30, 0x6a8 -/* 80CF0110 39 1E 01 0C */ addi r8, r30, 0x10c -/* 80CF0114 39 20 00 00 */ li r9, 0 -/* 80CF0118 C0 BF 00 0C */ lfs f5, 0xc(r31) -/* 80CF011C 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80CF0120 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80CF0124 4B 33 E7 ED */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 80CF0128 90 7E 05 74 */ stw r3, 0x574(r30) -/* 80CF012C 38 60 00 01 */ li r3, 1 -/* 80CF0130 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CF0134 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80CF0138 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF013C 7C 08 03 A6 */ mtlr r0 -/* 80CF0140 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF0144 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/execute__14daObj_Suisya_cFv.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/execute__14daObj_Suisya_cFv.s deleted file mode 100644 index c6d7a371bb7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/execute__14daObj_Suisya_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80CF0168: -/* 80CF0168 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CF016C 7C 08 02 A6 */ mflr r0 -/* 80CF0170 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CF0174 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CF0178 7C 7F 1B 78 */ mr r31, r3 -/* 80CF017C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800C1@ha */ -/* 80CF0180 38 03 00 C1 */ addi r0, r3, 0x00C1 /* 0x000800C1@l */ -/* 80CF0184 90 01 00 08 */ stw r0, 8(r1) -/* 80CF0188 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CF018C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CF0190 80 63 00 00 */ lwz r3, 0(r3) -/* 80CF0194 38 81 00 08 */ addi r4, r1, 8 -/* 80CF0198 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80CF019C 38 C0 00 00 */ li r6, 0 -/* 80CF01A0 38 E0 00 00 */ li r7, 0 -/* 80CF01A4 3D 00 80 CF */ lis r8, lit_3665@ha /* 0x80CF052C@ha */ -/* 80CF01A8 C0 28 05 2C */ lfs f1, lit_3665@l(r8) /* 0x80CF052C@l */ -/* 80CF01AC FC 40 08 90 */ fmr f2, f1 -/* 80CF01B0 3D 00 80 CF */ lis r8, lit_3682@ha /* 0x80CF0530@ha */ -/* 80CF01B4 C0 68 05 30 */ lfs f3, lit_3682@l(r8) /* 0x80CF0530@l */ -/* 80CF01B8 FC 80 18 90 */ fmr f4, f3 -/* 80CF01BC 39 00 00 00 */ li r8, 0 -/* 80CF01C0 4B 5B C3 4D */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CF01C4 A8 7F 04 E4 */ lha r3, 0x4e4(r31) -/* 80CF01C8 38 03 00 19 */ addi r0, r3, 0x19 -/* 80CF01CC B0 1F 04 E4 */ sth r0, 0x4e4(r31) -/* 80CF01D0 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80CF01D4 4B 31 CB 91 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CF01D8 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80CF01DC 4B 31 CD 69 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80CF01E0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CF01E4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CF01E8 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80CF01EC 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CF01F0 4B 65 62 C1 */ bl PSMTXCopy -/* 80CF01F4 38 60 00 01 */ li r3, 1 -/* 80CF01F8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CF01FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CF0200 7C 08 03 A6 */ mtlr r0 -/* 80CF0204 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CF0208 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/func_80CF0508.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/func_80CF0508.s deleted file mode 100644 index a346e16b981..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/func_80CF0508.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CF0508: -/* 80CF0508 38 63 FF DC */ addi r3, r3, -36 -/* 80CF050C 4B FF FF 6C */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/func_80CF0510.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/func_80CF0510.s deleted file mode 100644 index 8602e95ba6b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/func_80CF0510.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CF0510: -/* 80CF0510 38 63 FF EC */ addi r3, r3, -20 -/* 80CF0514 4B FF FF 64 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 7c665263d01..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CF02F0: -/* 80CF02F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CF02F4 7C 08 02 A6 */ mflr r0 -/* 80CF02F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CF02FC 4B FF FF 89 */ bl CreateHeap__14daObj_Suisya_cFv -/* 80CF0300 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CF0304 7C 08 03 A6 */ mtlr r0 -/* 80CF0308 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CF030C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/CreateHeap__11daObjGake_cFv.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/CreateHeap__11daObjGake_cFv.s deleted file mode 100644 index 5bf2434457f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/CreateHeap__11daObjGake_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80D0BD30: -/* 80D0BD30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0BD34 7C 08 02 A6 */ mflr r0 -/* 80D0BD38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0BD3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D0BD40 7C 7F 1B 78 */ mr r31, r3 -/* 80D0BD44 3C 60 80 D1 */ lis r3, l_arcName@ha /* 0x80D0C144@ha */ -/* 80D0BD48 38 63 C1 44 */ addi r3, r3, l_arcName@l /* 0x80D0C144@l */ -/* 80D0BD4C 80 63 00 00 */ lwz r3, 0(r3) -/* 80D0BD50 38 80 00 04 */ li r4, 4 -/* 80D0BD54 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D0BD58 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0BD5C 3C A5 00 02 */ addis r5, r5, 2 -/* 80D0BD60 38 C0 00 80 */ li r6, 0x80 -/* 80D0BD64 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80D0BD68 4B 33 05 85 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D0BD6C 3C 80 00 08 */ lis r4, 8 -/* 80D0BD70 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D0BD74 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D0BD78 4B 30 8E DD */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D0BD7C 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80D0BD80 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80D0BD84 30 03 FF FF */ addic r0, r3, -1 -/* 80D0BD88 7C 60 19 10 */ subfe r3, r0, r3 -/* 80D0BD8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D0BD90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0BD94 7C 08 03 A6 */ mtlr r0 -/* 80D0BD98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0BD9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Create__11daObjGake_cFv.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Create__11daObjGake_cFv.s deleted file mode 100644 index 00410c84d30..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Create__11daObjGake_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80D0BCB8: -/* 80D0BCB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0BCBC 7C 08 02 A6 */ mflr r0 -/* 80D0BCC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0BCC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D0BCC8 7C 7F 1B 78 */ mr r31, r3 -/* 80D0BCCC 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80D0BCD0 54 00 05 BE */ clrlwi r0, r0, 0x16 -/* 80D0BCD4 B0 03 05 AC */ sth r0, 0x5ac(r3) -/* 80D0BCD8 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80D0BCDC 54 00 B5 BE */ rlwinm r0, r0, 0x16, 0x16, 0x1f -/* 80D0BCE0 B0 03 05 AE */ sth r0, 0x5ae(r3) -/* 80D0BCE4 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80D0BCE8 54 00 66 3E */ rlwinm r0, r0, 0xc, 0x18, 0x1f -/* 80D0BCEC 98 03 00 FF */ stb r0, 0xff(r3) -/* 80D0BCF0 4B FF FF 29 */ bl initBaseMtx__11daObjGake_cFv -/* 80D0BCF4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80D0BCF8 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D0BCFC 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80D0BD00 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80D0BD04 80 83 00 04 */ lwz r4, 4(r3) -/* 80D0BD08 7F E3 FB 78 */ mr r3, r31 -/* 80D0BD0C 4B 30 E8 6D */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80D0BD10 7F E3 FB 78 */ mr r3, r31 -/* 80D0BD14 4B 36 CC 3D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80D0BD18 38 60 00 01 */ li r3, 1 -/* 80D0BD1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D0BD20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0BD24 7C 08 03 A6 */ mtlr r0 -/* 80D0BD28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0BD2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Delete__11daObjGake_cFv.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Delete__11daObjGake_cFv.s deleted file mode 100644 index 168836344be..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Delete__11daObjGake_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80D0C034: -/* 80D0C034 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0C038 7C 08 02 A6 */ mflr r0 -/* 80D0C03C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0C040 3C 80 80 D1 */ lis r4, l_arcName@ha /* 0x80D0C144@ha */ -/* 80D0C044 38 84 C1 44 */ addi r4, r4, l_arcName@l /* 0x80D0C144@l */ -/* 80D0C048 80 84 00 00 */ lwz r4, 0(r4) -/* 80D0C04C 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80D0C050 4B 32 0F B9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D0C054 38 60 00 01 */ li r3, 1 -/* 80D0C058 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0C05C 7C 08 03 A6 */ mtlr r0 -/* 80D0C060 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0C064 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Draw__11daObjGake_cFv.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Draw__11daObjGake_cFv.s deleted file mode 100644 index d0b891bb32c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Draw__11daObjGake_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80D0BF7C: -/* 80D0BF7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0BF80 7C 08 02 A6 */ mflr r0 -/* 80D0BF84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0BF88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D0BF8C 93 C1 00 08 */ stw r30, 8(r1) -/* 80D0BF90 7C 7E 1B 78 */ mr r30, r3 -/* 80D0BF94 88 03 05 B0 */ lbz r0, 0x5b0(r3) -/* 80D0BF98 28 00 00 00 */ cmplwi r0, 0 -/* 80D0BF9C 41 82 00 0C */ beq lbl_80D0BFA8 -/* 80D0BFA0 38 60 00 01 */ li r3, 1 -/* 80D0BFA4 48 00 00 78 */ b lbl_80D0C01C -lbl_80D0BFA8: -/* 80D0BFA8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D0BFAC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D0BFB0 38 80 00 10 */ li r4, 0x10 -/* 80D0BFB4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80D0BFB8 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80D0BFBC 4B 49 78 09 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D0BFC0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D0BFC4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D0BFC8 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80D0BFCC 80 84 00 04 */ lwz r4, 4(r4) -/* 80D0BFD0 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80D0BFD4 4B 49 8D CD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D0BFD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D0BFDC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0BFE0 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80D0BFE4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80D0BFE8 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80D0BFEC 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80D0BFF0 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80D0BFF4 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80D0BFF8 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80D0BFFC 4B 30 1C C9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D0C000 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D0C004 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0C008 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80D0C00C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80D0C010 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80D0C014 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80D0C018 38 60 00 01 */ li r3, 1 -lbl_80D0C01C: -/* 80D0C01C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D0C020 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D0C024 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0C028 7C 08 03 A6 */ mtlr r0 -/* 80D0C02C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0C030 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Execute__11daObjGake_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Execute__11daObjGake_cFPPA3_A4_f.s deleted file mode 100644 index 06d5cf4bbf6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Execute__11daObjGake_cFPPA3_A4_f.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_80D0BE24: -/* 80D0BE24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0BE28 7C 08 02 A6 */ mflr r0 -/* 80D0BE2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0BE30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D0BE34 93 C1 00 08 */ stw r30, 8(r1) -/* 80D0BE38 7C 7E 1B 78 */ mr r30, r3 -/* 80D0BE3C 7C 9F 23 78 */ mr r31, r4 -/* 80D0BE40 A0 03 05 AE */ lhz r0, 0x5ae(r3) -/* 80D0BE44 28 00 03 FF */ cmplwi r0, 0x3ff -/* 80D0BE48 41 82 00 2C */ beq lbl_80D0BE74 -/* 80D0BE4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D0BE50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0BE54 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80D0BE58 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 80D0BE5C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80D0BE60 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80D0BE64 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80D0BE68 4B 32 8B 55 */ bl isEventBit__11dSv_event_cCFUs -/* 80D0BE6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D0BE70 40 82 00 38 */ bne lbl_80D0BEA8 -lbl_80D0BE74: -/* 80D0BE74 A0 1E 05 AC */ lhz r0, 0x5ac(r30) -/* 80D0BE78 28 00 03 FF */ cmplwi r0, 0x3ff -/* 80D0BE7C 41 82 00 68 */ beq lbl_80D0BEE4 -/* 80D0BE80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D0BE84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0BE88 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80D0BE8C 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 80D0BE90 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80D0BE94 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80D0BE98 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80D0BE9C 4B 32 8B 21 */ bl isEventBit__11dSv_event_cCFUs -/* 80D0BEA0 2C 03 00 00 */ cmpwi r3, 0 -/* 80D0BEA4 40 82 00 40 */ bne lbl_80D0BEE4 -lbl_80D0BEA8: -/* 80D0BEA8 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80D0BEAC 28 03 00 00 */ cmplwi r3, 0 -/* 80D0BEB0 41 82 00 24 */ beq lbl_80D0BED4 -/* 80D0BEB4 4B 55 C3 21 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80D0BEB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D0BEBC 41 82 00 18 */ beq lbl_80D0BED4 -/* 80D0BEC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D0BEC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0BEC8 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D0BECC 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80D0BED0 4B 36 83 81 */ bl Release__4cBgSFP9dBgW_Base -lbl_80D0BED4: -/* 80D0BED4 38 00 00 01 */ li r0, 1 -/* 80D0BED8 98 1E 05 B0 */ stb r0, 0x5b0(r30) -/* 80D0BEDC 38 60 00 01 */ li r3, 1 -/* 80D0BEE0 48 00 00 84 */ b lbl_80D0BF64 -lbl_80D0BEE4: -/* 80D0BEE4 A0 1E 05 AC */ lhz r0, 0x5ac(r30) -/* 80D0BEE8 28 00 03 FF */ cmplwi r0, 0x3ff -/* 80D0BEEC 41 82 00 6C */ beq lbl_80D0BF58 -/* 80D0BEF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D0BEF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0BEF8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80D0BEFC 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 80D0BF00 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80D0BF04 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80D0BF08 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80D0BF0C 4B 32 8A B1 */ bl isEventBit__11dSv_event_cCFUs -/* 80D0BF10 2C 03 00 00 */ cmpwi r3, 0 -/* 80D0BF14 41 82 00 44 */ beq lbl_80D0BF58 -/* 80D0BF18 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80D0BF1C 28 03 00 00 */ cmplwi r3, 0 -/* 80D0BF20 41 82 00 28 */ beq lbl_80D0BF48 -/* 80D0BF24 4B 55 C2 B1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80D0BF28 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D0BF2C 40 82 00 1C */ bne lbl_80D0BF48 -/* 80D0BF30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D0BF34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0BF38 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D0BF3C 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80D0BF40 7F C5 F3 78 */ mr r5, r30 -/* 80D0BF44 4B 36 8A C5 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80D0BF48: -/* 80D0BF48 38 00 00 00 */ li r0, 0 -/* 80D0BF4C 98 1E 05 B0 */ stb r0, 0x5b0(r30) -/* 80D0BF50 38 60 00 01 */ li r3, 1 -/* 80D0BF54 48 00 00 10 */ b lbl_80D0BF64 -lbl_80D0BF58: -/* 80D0BF58 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80D0BF5C 90 1F 00 00 */ stw r0, 0(r31) -/* 80D0BF60 38 60 00 01 */ li r3, 1 -lbl_80D0BF64: -/* 80D0BF64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D0BF68 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D0BF6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0BF70 7C 08 03 A6 */ mtlr r0 -/* 80D0BF74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0BF78 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/create1st__11daObjGake_cFv.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/create1st__11daObjGake_cFv.s deleted file mode 100644 index d3be0ff9804..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/create1st__11daObjGake_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80D0BDA0: -/* 80D0BDA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0BDA4 7C 08 02 A6 */ mflr r0 -/* 80D0BDA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0BDAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D0BDB0 7C 7F 1B 78 */ mr r31, r3 -/* 80D0BDB4 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80D0BDB8 3C 80 80 D1 */ lis r4, l_arcName@ha /* 0x80D0C144@ha */ -/* 80D0BDBC 38 84 C1 44 */ addi r4, r4, l_arcName@l /* 0x80D0C144@l */ -/* 80D0BDC0 80 84 00 00 */ lwz r4, 0(r4) -/* 80D0BDC4 4B 32 10 F9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D0BDC8 7C 60 1B 78 */ mr r0, r3 -/* 80D0BDCC 2C 00 00 04 */ cmpwi r0, 4 -/* 80D0BDD0 40 82 00 3C */ bne lbl_80D0BE0C -/* 80D0BDD4 7F E3 FB 78 */ mr r3, r31 -/* 80D0BDD8 3C 80 80 D1 */ lis r4, l_arcName@ha /* 0x80D0C144@ha */ -/* 80D0BDDC 38 84 C1 44 */ addi r4, r4, l_arcName@l /* 0x80D0C144@l */ -/* 80D0BDE0 80 84 00 00 */ lwz r4, 0(r4) -/* 80D0BDE4 38 A0 00 07 */ li r5, 7 -/* 80D0BDE8 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80D0BDEC 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80D0BDF0 38 E0 40 00 */ li r7, 0x4000 -/* 80D0BDF4 39 00 00 00 */ li r8, 0 -/* 80D0BDF8 4B 36 C9 C5 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80D0BDFC 7C 60 1B 78 */ mr r0, r3 -/* 80D0BE00 2C 00 00 05 */ cmpwi r0, 5 -/* 80D0BE04 40 82 00 08 */ bne lbl_80D0BE0C -/* 80D0BE08 48 00 00 08 */ b lbl_80D0BE10 -lbl_80D0BE0C: -/* 80D0BE0C 7C 03 03 78 */ mr r3, r0 -lbl_80D0BE10: -/* 80D0BE10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D0BE14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0BE18 7C 08 03 A6 */ mtlr r0 -/* 80D0BE1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0BE20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGDelete__FP11daObjGake_c.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGDelete__FP11daObjGake_c.s deleted file mode 100644 index e68db9c41e4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGDelete__FP11daObjGake_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D0C0C8: -/* 80D0C0C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0C0CC 7C 08 02 A6 */ mflr r0 -/* 80D0C0D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0C0D4 4B 36 C8 09 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80D0C0D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0C0DC 7C 08 03 A6 */ mtlr r0 -/* 80D0C0E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0C0E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGDraw__FP11daObjGake_c.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGDraw__FP11daObjGake_c.s deleted file mode 100644 index 1010ee62294..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGDraw__FP11daObjGake_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80D0C108: -/* 80D0C108 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0C10C 7C 08 02 A6 */ mflr r0 -/* 80D0C110 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0C114 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80D0C118 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80D0C11C 7D 89 03 A6 */ mtctr r12 -/* 80D0C120 4E 80 04 21 */ bctrl -/* 80D0C124 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0C128 7C 08 03 A6 */ mtlr r0 -/* 80D0C12C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0C130 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGExecute__FP11daObjGake_c.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGExecute__FP11daObjGake_c.s deleted file mode 100644 index 5fdacf0fa48..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGExecute__FP11daObjGake_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D0C0E8: -/* 80D0C0E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0C0EC 7C 08 02 A6 */ mflr r0 -/* 80D0C0F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0C0F4 4B 36 C8 5D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80D0C0F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0C0FC 7C 08 03 A6 */ mtlr r0 -/* 80D0C100 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0C104 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_create1st__FP11daObjGake_c.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_create1st__FP11daObjGake_c.s deleted file mode 100644 index e70c2a052d6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_create1st__FP11daObjGake_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80D0C068: -/* 80D0C068 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0C06C 7C 08 02 A6 */ mflr r0 -/* 80D0C070 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0C074 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D0C078 7C 7F 1B 78 */ mr r31, r3 -/* 80D0C07C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D0C080 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D0C084 40 82 00 28 */ bne lbl_80D0C0AC -/* 80D0C088 28 1F 00 00 */ cmplwi r31, 0 -/* 80D0C08C 41 82 00 14 */ beq lbl_80D0C0A0 -/* 80D0C090 4B 36 C5 95 */ bl __ct__16dBgS_MoveBgActorFv -/* 80D0C094 3C 60 80 D1 */ lis r3, __vt__11daObjGake_c@ha /* 0x80D0C198@ha */ -/* 80D0C098 38 03 C1 98 */ addi r0, r3, __vt__11daObjGake_c@l /* 0x80D0C198@l */ -/* 80D0C09C 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80D0C0A0: -/* 80D0C0A0 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D0C0A4 60 00 00 08 */ ori r0, r0, 8 -/* 80D0C0A8 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D0C0AC: -/* 80D0C0AC 7F E3 FB 78 */ mr r3, r31 -/* 80D0C0B0 4B FF FC F1 */ bl create1st__11daObjGake_cFv -/* 80D0C0B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D0C0B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0C0BC 7C 08 03 A6 */ mtlr r0 -/* 80D0C0C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0C0C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/initBaseMtx__11daObjGake_cFv.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/initBaseMtx__11daObjGake_cFv.s deleted file mode 100644 index 18a99d3c4d7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/initBaseMtx__11daObjGake_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D0BC18: -/* 80D0BC18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0BC1C 7C 08 02 A6 */ mflr r0 -/* 80D0BC20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0BC24 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80D0BC28 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D0BC2C D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80D0BC30 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80D0BC34 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80D0BC38 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80D0BC3C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80D0BC40 48 00 00 15 */ bl setBaseMtx__11daObjGake_cFv -/* 80D0BC44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0BC48 7C 08 03 A6 */ mtlr r0 -/* 80D0BC4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0BC50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/setBaseMtx__11daObjGake_cFv.s b/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/setBaseMtx__11daObjGake_cFv.s deleted file mode 100644 index e60ea545e2d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/setBaseMtx__11daObjGake_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D0BC54: -/* 80D0BC54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0BC58 7C 08 02 A6 */ mflr r0 -/* 80D0BC5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0BC60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D0BC64 7C 7F 1B 78 */ mr r31, r3 -/* 80D0BC68 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80D0BC6C 4B 30 10 F9 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80D0BC70 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D0BC74 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D0BC78 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80D0BC7C 4B 30 07 B9 */ bl mDoMtx_YrotM__FPA4_fs -/* 80D0BC80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D0BC84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D0BC88 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80D0BC8C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D0BC90 4B 63 A8 21 */ bl PSMTXCopy -/* 80D0BC94 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D0BC98 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D0BC9C 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80D0BCA0 4B 63 A8 11 */ bl PSMTXCopy -/* 80D0BCA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D0BCA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0BCAC 7C 08 03 A6 */ mtlr r0 -/* 80D0BCB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D0BCB4 4E 80 00 20 */ blr diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index 0f64ca1c612..17a7274cd47 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -110,7 +110,7 @@ public: /* 800D00DC */ void ClrGroundHit(); /* 80141404 */ bool ChkGroundHit() const; - /* 80075F94 */ virtual ~dBgS_Acch() {} + /* 80075F94 */ virtual ~dBgS_Acch(); cXyz* GetPos() { return pm_pos; } cXyz* GetOldPos() { return pm_old_pos; } diff --git a/include/d/bg/d_bg_w_base.h b/include/d/bg/d_bg_w_base.h index 22ee1385950..59c3efed8b9 100644 --- a/include/d/bg/d_bg_w_base.h +++ b/include/d/bg/d_bg_w_base.h @@ -98,6 +98,8 @@ public: void SetRoomId(int id) { m_roomId = id; } bool ChkPriority(int prio) { return m_priority == prio; } void SetPriority(PRIORITY priority) { m_priority = priority; } + void onStickWall() { field_0xb |= 1; } + void onStickRoof() { field_0xb |= 2; } private: /* 0x08 */ u8 m_priority; diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 1311e28f681..e76c46d2257 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -52,6 +52,7 @@ public: u8 getMapToolId() { return mMapToolId; } s16 getEventId() { return mEventId; } s16 getIdx() { return mIndex; } + void setIdx(u8 i_idx) { mIndex = i_idx; } char* getArchiveName() { return mArchiveName; } BOOL chkCondition(u16 condition) { return (mCondition & condition) == condition; } void i_onCondition(u16 cond) { mCondition |= cond; } diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 4d95da5c86d..ad432f2ffe7 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -111,41 +111,180 @@ class mDoMtx_stack_c { public: /* 8000CCC8 */ static bool push(); /* 8000CD14 */ static bool pop(); - /* 8000CD64 */ static void transS(cXyz const&); - /* 8000CDD4 */ static void transM(cXyz const&); - /* 8000CD9C */ static void transM(f32, f32, f32); - /* 8000CE00 */ static void scaleS(cXyz const&); - /* 8000CE70 */ static void scaleM(cXyz const&); - /* 8000CE38 */ static void scaleM(f32, f32, f32); - /* 8000CE9C */ static void XYZrotS(csXyz const&); - /* 8000CED4 */ static void XYZrotM(csXyz const&); - /* 8000CF0C */ static void ZXYrotS(csXyz const&); - /* 8000CF44 */ static void ZXYrotM(csXyz const&); + + /** + * Translates the `now` Matrix by the given cXyz + * @param xyz The xyz translation vector + */ + /* 8000CD64 */ static void transS(cXyz const& xyz); + + /** + * Translates a new Matrix by the given cXyz and then concatenates it with the `now` matrix + * @param xyz The xyz translation vector + */ + /* 8000CDD4 */ static void transM(cXyz const& xyz); + + /** + * Translates a new Matrix by the given X, Y, and Z values and then concatenates it with the `now` matrix + * @param x The x-axis translation value + * @param y The y-axis translation value + * @param z The z-axis translation value + */ + /* 8000CD9C */ static void transM(f32 x, f32 y, f32 z); + + /** + * Scales the `now` Matrix by the given cXyz + * @param xyz The xyz scale vector + */ + /* 8000CE00 */ static void scaleS(cXyz const& xyz); + + /** + * Scales a new Matrix by the given cXyz and then concatenates it with the `now` matrix + * @param xyz The xyz scale vector + */ + /* 8000CE70 */ static void scaleM(cXyz const& xyz); + + /** + * Scales a new Matrix by the given X, Y, and Z values and then concatenates it with the `now` matrix + * @param x The x-axis scale value + * @param y The y-axis scale value + * @param z The z-axis scale value + */ + /* 8000CE38 */ static void scaleM(f32 x, f32 y, f32 z); + + /* 8000CE9C */ static void XYZrotS(csXyz const& xyz); + + /** + * Rotates the `now` matrix by the given csXyz in the order Z, Y, X + * @param xyz The xyz rotation vector + */ + /* 8000CED4 */ static void XYZrotM(csXyz const& xyz); + + /* 8000CF0C */ static void ZXYrotS(csXyz const& xyz); + + /** + * Rotates the `now` matrix by the given csXyz in the order X, Y, Z + * @param xyz The xyz rotation vector + */ + /* 8000CF44 */ static void ZXYrotM(csXyz const& xyz); + /* 8000CF7C */ static void quatM(Quaternion const*); /* 8000D070 */ ~mDoMtx_stack_c(); // inline + /** + * Returns the `now` Matrix + * @return The `now` Matrix + */ static MtxP get() { return now; } + + /** + * Translates the `now` Matrix by the given X, Y, and Z values + * @param x The x-axis translation value + * @param y The y-axis translation value + * @param z The z-axis translation value + */ static void transS(f32 x, f32 y, f32 z) { PSMTXTrans(now, x, y, z); } + + /** + * Scales the `now` Matrix by the given X, Y, and Z values + * @param x The x-axis scale value + * @param y The y-axis scale value + * @param z The z-axis scale value + */ static void scaleS(f32 x, f32 y, f32 z) { PSMTXScale(now, x, y, z); } + + /** + * Multiplies a given Vec `a` by the `now` Matrix and places the result into Vec `b` + * @param a The source Vec + * @param b The output Vec + */ static void multVec(const Vec* a, Vec* b) { PSMTXMultVec(now, a, b); } + + /** + * Multiplies a given Vec `a` by the `now` Matrix's "Scale-and-Rotate" component and places the result into Vec `b` + * @param a The source Vec + * @param b The output Vec + */ static void multVecSR(const Vec* a, Vec* b) { PSMTXMultVecSR(now, a, b); } + static void multVecZero(Vec* v) { mDoMtx_multVecZero(now, v); } + + /** + * Multiplies a given Vec array `src` by the `now` Matrix and places the result into Vec array `dst` + * @param src The source Vec array + * @param dst The output Vec array + * @param count The size of the array + */ static void multVecArray(const Vec* src, Vec* dst, u32 count) { PSMTXMultVecArray(now, src, dst, count); } + static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); } + + /** + * Rotates the `now` matrix by the given X, Y, and Z values in the order Z, Y, X + * @param x The x-axis rotation value + * @param y The y-axis rotation value + * @param z The z-axis rotation value + */ 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); } + + /** + * Rotates the `now` matrix by the given X, Y, and Z values in the order X, Y, Z + * @param x The x-axis rotation value + * @param y The y-axis rotation value + * @param z The z-axis rotation value + */ static void ZXYrotM(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotM(now, x, y, z); } + + /** + * Rotates a new matrix on the Y-axis then concatenates it with the `now` matrix + * @param y The rotation value + */ static void YrotM(s16 y) { mDoMtx_YrotM(now, y); } + + /** + * Rotates the `now` matrix on the Y-axis + * @param y The rotation value + */ static void YrotS(s16 y) { mDoMtx_YrotS(now, y); } + + /** + * Rotates the `now` matrix on the X-axis + * @param x The rotation value + */ static void XrotS(s16 x) { mDoMtx_XrotS(now, x); } + + /** + * Rotates a new matrix on the X-axis then concatenates it with the `now` matrix + * @param x The rotation value + */ static void XrotM(s16 x) { mDoMtx_XrotM(now, x); } + + /** + * Rotates a new matrix on the z-axis then concatenates it with the `now` matrix + * @param z The rotation value + */ static void ZrotM(s16 z) { mDoMtx_ZrotM(now, z); } + static void inverse() { PSMTXInverse(now, now); } + static void inverseTranspose() { mDoMtx_inverseTranspose(now, now); } + + /** + * Concatenates the `now` matrix with the given Matrix `m` + * @param m The matrix to concatenate with `now` + */ static void concat(const Mtx m) { PSMTXConcat(now, m, now); } + static void revConcat(const Mtx m) { PSMTXConcat(m, now, now); } + + /** + * Copies a given matrix `m` to the `now` matrix + * @param m The source matrix to copy + */ static void copy(const Mtx m) { PSMTXCopy(m, now); } static Mtx now; diff --git a/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h b/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h index db40d2202c0..9ff21329f1a 100644 --- a/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h +++ b/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h @@ -1,6 +1,7 @@ #ifndef D_A_OBJ_MAGLIFTROT_H #define D_A_OBJ_MAGLIFTROT_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "f_op/f_op_actor_mng.h" #endif /* D_A_OBJ_MAGLIFTROT_H */ diff --git a/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h b/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h index 9f38d88fb04..479d3aca664 100644 --- a/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h +++ b/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h @@ -1,6 +1,22 @@ #ifndef D_A_OBJ_SUISYA_H #define D_A_OBJ_SUISYA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_acch.h" + +class daObj_Suisya_c : public fopAc_ac_c { +public: + /* 80CF0078 */ int draw(); + /* 80CF0168 */ int execute(); + /* 80CF0234 */ int _delete(); + /* 80CF0284 */ int CreateHeap(); + /* 80CF0310 */ int create(); + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ u32 mShadowKey; + /* 0x578 */ dBgS_AcchCir mAcchCir; + /* 0x5B8 */ dBgS_ObjAcch mAcch; +}; #endif /* D_A_OBJ_SUISYA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h b/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h index fa06c3a95c2..49f25c6dedd 100644 --- a/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h +++ b/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h @@ -1,6 +1,30 @@ #ifndef D_A_OBJ_TGAKE_H #define D_A_OBJ_TGAKE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_movebg_actor.h" + +class daObjGake_c : public dBgS_MoveBgActor { +public: + /* 80D0BC18 */ void initBaseMtx(); + /* 80D0BC54 */ void setBaseMtx(); + /* 80D0BDA0 */ int create1st(); + + /* 80D0BD30 */ virtual int CreateHeap(); + /* 80D0BCB8 */ virtual int Create(); + /* 80D0BE24 */ virtual int Execute(Mtx**); + /* 80D0BF7C */ virtual int Draw(); + /* 80D0C034 */ virtual int Delete(); + + u16 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); } + u16 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); } + u8 getType() { return fopAcM_GetParamBit(this, 0x14, 8); } + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ u16 mEventBit1; + /* 0x5AE */ u16 mEventBit2; + /* 0x5B0 */ u8 mHide; +}; #endif /* D_A_OBJ_TGAKE_H */ diff --git a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp index e8e78f1a465..b062c38289c 100644 --- a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp +++ b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp @@ -4,52 +4,23 @@ // #include "rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_math.h" +#include "Z2AudioLib/Z2SeMgr.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "dol2asm.h" +#include "m_Do/m_Do_hostIO.h" // // Types: // -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C8E9E0 */ ~mDoHIO_entry_c(); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daMagLiftRot_c { +class daMagLiftRot_c : public dBgS_MoveBgActor { +public: /* 80C8EA28 */ void setBaseMtx(); - /* 80C8EB1C */ void CreateHeap(); - /* 80C8EC64 */ void create(); - /* 80C8EF94 */ void Execute(f32 (**)[3][4]); + /* 80C8EC64 */ int create(); /* 80C8F02C */ void moveLift(); /* 80C8F264 */ void init_modeMove(); /* 80C8F4A0 */ void modeMove(); @@ -57,77 +28,61 @@ struct daMagLiftRot_c { /* 80C8F7CC */ void modeWait(); /* 80C8F804 */ void init_modeMoveWait(); /* 80C8F810 */ void modeMoveWait(); - /* 80C8F86C */ void Draw(); - /* 80C8F970 */ void Delete(); + + /* 80C8EB1C */ virtual int CreateHeap(); + /* 80C8EF94 */ virtual int Execute(Mtx**); + /* 80C8F86C */ virtual int Draw(); + /* 80C8F970 */ virtual int Delete(); + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ mDoExt_btkAnm mBtk; + /* 0x5C4 */ mDoExt_brkAnm mBrk; + /* 0x5DC */ u8 mType; + /* 0x5DE */ s16 mTimer; + /* 0x5E0 */ u8 mMode; + /* 0x5E1 */ u8 field_0x5e1; + /* 0x5E2 */ s16 field_0x5e2; + /* 0x5E4 */ s16 field_0x5e4; + /* 0x5E6 */ csXyz field_0x5e6; + /* 0x5EC */ cXyz field_0x5ec; + /* 0x5F8 */ f32 field_0x5f8; + /* 0x5FC */ f32 mShakeStrength; + /* 0x600 */ f32 field_0x600; + /* 0x604 */ f32 mShakeYAmp; + /* 0x608 */ f32 mShakeDecay; + /* 0x60C */ f32 mMaxShakeDecay; + /* 0x610 */ f32 mMinShakeDecay; + /* 0x614 */ f32 mMoveStrength; + /* 0x618 */ f32 mXMoveAmp; + /* 0x61C */ f32 mZMoveAmp; + /* 0x620 */ f32 mMoveDecay; + /* 0x624 */ f32 mMaxMoveDecay; + /* 0x628 */ f32 mMinMoveDecay; + /* 0x62C */ f32 field_0x62c; + /* 0x630 */ f32 field_0x630; }; -struct daMagLiftRot_HIO_c { +class daMagLiftRot_HIO_c : public mDoHIO_entry_c { +public: /* 80C8E94C */ daMagLiftRot_HIO_c(); - /* 80C8FA3C */ ~daMagLiftRot_HIO_c(); -}; + /* 80C8FA3C */ virtual ~daMagLiftRot_HIO_c(); -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 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(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C8EF4C */ ~J3DFrameCtrl(); + /* 0x04 */ u8 mWaitTime; + /* 0x08 */ f32 mInitSpeed; + /* 0x0C */ f32 mAcceleration; + /* 0x10 */ f32 mMaxSpeed; + /* 0x14 */ f32 mShakeStrength; + /* 0x18 */ f32 mShakeAmpY; + /* 0x1C */ f32 mShakeDecay; + /* 0x20 */ f32 mMaxShakeDecay; + /* 0x24 */ f32 mMinShakeDecay; + /* 0x28 */ f32 mMoveAmpX; + /* 0x2C */ f32 mMoveAmpZ; + /* 0x30 */ f32 mMoveStrength; + /* 0x34 */ f32 mMoveDecay; + /* 0x38 */ f32 mMaxMoveDecay; + /* 0x3C */ f32 mMinMoveDecay; }; // @@ -197,21 +152,12 @@ extern "C" void cLib_chaseF__FPfff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -331,11 +277,7 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80C8FBB0-80C8FBBC -00001 000C+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName[3] = { - (void*)&d_a_obj_magLiftRot__stringBase0, - (void*)(((char*)&d_a_obj_magLiftRot__stringBase0) + 0x9), - (void*)(((char*)&d_a_obj_magLiftRot__stringBase0) + 0x12), -}; +SECTION_DATA static char* l_arcName[3] = {"MagLiftS", "MagLiftM", "MagLiftL"}; /* 80C8FBBC-80C8FBC8 -00001 000C+00 0/1 0/0 0/0 .data @3856 */ #pragma push @@ -378,14 +320,12 @@ SECTION_DATA static u8 mode_proc[36] = { #pragma pop /* 80C8FC04-80C8FC10 000074 000C+00 1/1 0/0 0/0 .data selLabel$3897 */ -SECTION_DATA static u8 selLabel_3897[12] = { - 0x00, 0x08, 0x01, 0x2F, 0x00, 0x08, 0x01, 0x31, 0x00, 0x08, 0x01, 0x33, -}; +SECTION_DATA static u32 selLabel_3897[] = {Z2SE_OBJ_MAGNELIFT_TURN_S, Z2SE_OBJ_MAGNELIFT_TURN_M, + Z2SE_OBJ_MAGNELIFT_TURN_L}; /* 80C8FC10-80C8FC1C 000080 000C+00 1/1 0/0 0/0 .data selLabel$3963 */ -SECTION_DATA static u8 selLabel_3963[12] = { - 0x00, 0x08, 0x01, 0x30, 0x00, 0x08, 0x01, 0x32, 0x00, 0x08, 0x01, 0x34, -}; +SECTION_DATA static u32 selLabel_3963[] = {Z2SE_OBJ_MAGNELIFT_STOP_S, Z2SE_OBJ_MAGNELIFT_STOP_M, + Z2SE_OBJ_MAGNELIFT_STOP_L}; /* 80C8FC1C-80C8FC3C -00001 0020+00 1/0 0/0 0/0 .data l_daMagLiftRot_Method */ SECTION_DATA static void* l_daMagLiftRot_Method[8] = { @@ -458,13 +398,35 @@ asm daMagLiftRot_HIO_c::daMagLiftRot_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/__dt__14mDoHIO_entry_cFv.s" } #pragma pop /* 80C8EA28-80C8EB1C 0001C8 00F4+00 2/2 0/0 0/0 .text setBaseMtx__14daMagLiftRot_cFv */ +// matches with literals +#ifdef NONMATCHING +void daMagLiftRot_c::setBaseMtx() { + mScale.x = field_0x62c; + mScale.y = 1.0f; + mScale.z = field_0x630; + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z); + mDoMtx_stack_c::ZXYrotM(field_0x5e6.x, field_0x5e6.y, field_0x5e6.z); + mDoMtx_stack_c::transM(field_0x5ec.x, field_0x5ec.y, field_0x5ec.z); + mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); + + // this generates a cXyz dtor symbol with causes issues, + // but this function doesnt match unless it's like this?? + mpModel->setBaseScale(cXyz(1.0f, 1.0f, 1.0f)); + + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + PSMTXCopy(mDoMtx_stack_c::get(), field_0x56c); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -473,47 +435,67 @@ asm void daMagLiftRot_c::setBaseMtx() { #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/setBaseMtx__14daMagLiftRot_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80C8FB18-80C8FB24 000030 000C+00 0/1 0/0 0/0 .rodata l_bmdIdx */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_bmdIdx[12] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x06, -}; +SECTION_RODATA static int const l_bmdIdx[] = {4, 4, 6}; COMPILER_STRIP_GATE(0x80C8FB18, &l_bmdIdx); #pragma pop /* 80C8FB24-80C8FB30 00003C 000C+00 0/1 0/0 0/0 .rodata l_dzbIdx */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_dzbIdx[12] = { - 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0F, -}; +SECTION_RODATA static int const l_dzbIdx[] = {7, 7, 15}; COMPILER_STRIP_GATE(0x80C8FB24, &l_dzbIdx); #pragma pop /* 80C8FB30-80C8FB3C 000048 000C+00 2/3 0/0 0/0 .rodata l_btkIdx */ -SECTION_RODATA static u8 const l_btkIdx[12] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0C, -}; +SECTION_RODATA static int const l_btkIdx[] = {-1, -1, 12}; COMPILER_STRIP_GATE(0x80C8FB30, &l_btkIdx); /* 80C8FB3C-80C8FB48 000054 000C+00 2/3 0/0 0/0 .rodata l_brkIdx */ -SECTION_RODATA static u8 const l_brkIdx[12] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x09, -}; +SECTION_RODATA static int const l_brkIdx[] = {-1, -1, 9}; COMPILER_STRIP_GATE(0x80C8FB3C, &l_brkIdx); /* 80C8EB1C-80C8EC64 0002BC 0148+00 1/0 0/0 0/0 .text CreateHeap__14daMagLiftRot_cFv */ +// matches with literals +#ifdef NONMATCHING +int daMagLiftRot_c::CreateHeap() { + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmdIdx[mType]); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (mpModel == NULL) { + return 0; + } + + if (l_btkIdx[mType] != -1) { + J3DAnmTextureSRTKey* res = + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[mType], l_btkIdx[mType]); + mBtk.init(modelData, res, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1); + } + + if (l_brkIdx[mType] != -1) { + J3DAnmTevRegKey* res = + (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[mType], l_brkIdx[mType]); + mBrk.init(modelData, res, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1); + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMagLiftRot_c::CreateHeap() { +// asm int daMagLiftRot_c::CreateHeap() { +extern "C" asm void CreateHeap__14daMagLiftRot_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/CreateHeap__14daMagLiftRot_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80C8FB48-80C8FB50 000060 0004+04 0/1 0/0 0/0 .rodata @3816 */ @@ -537,20 +519,111 @@ COMPILER_STRIP_GATE(0x80C8FB50, &lit_3818); #pragma pop /* 80C8EC64-80C8EF4C 000404 02E8+00 1/1 0/0 0/0 .text create__14daMagLiftRot_cFv */ +// matches with literals +#ifdef NONMATCHING +int daMagLiftRot_c::create() { + fopAcM_SetupActor(this, daMagLiftRot_c); + + mType = 0; + + u8 prm = (fopAcM_GetParam(this) >> 8) & 0xFF; + if (prm == 0 || prm == 0xFF) { + mType = (fopAcM_GetParam(this) >> 0x10) & 0xFF; + } + + int phase = dComIfG_resLoad(&mPhase, l_arcName[mType]); + if (phase == cPhs_COMPLEATE_e) { + u32 tmp = 0x1500; + if (mType == 2) { + tmp = 0x2500; + } + + if (MoveBGCreate(l_arcName[mType], l_dzbIdx[mType], dBgS_MoveBGProc_TypicalRotY, tmp, + NULL) == cPhs_ERROR_e) + { + return cPhs_ERROR_e; + } + + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + + field_0x568->onStickWall(); + field_0x568->onStickRoof(); + + field_0x5e1 = fopAcM_GetParam(this) & 0xFF; + field_0x5e2 = -0x8000; + field_0x5e4 = 0; + + if (field_0x5e1 == 0) { + current.angle.y += 0x8000; + } + + u8 prm = (fopAcM_GetParam(this) >> 8) & 0xFF; + if (prm == 0 || prm == 0xFF) { + field_0x62c = 1.0f; + } else { + field_0x62c = prm * 0.5f; + } + + u8 prm2 = (fopAcM_GetParam(this) >> 0x10) & 0xFF; + if (prm2 == 0 || prm2 == 0xFF) { + field_0x630 = 1.0f; + } else if (prm == 0 || prm == 0xFF) { + field_0x630 = 1.0f; + } else { + field_0x630 = prm2 * 0.5f; + } + + u8 prm3 = (fopAcM_GetParam(this) >> 0x18) & 0xFF; + setBaseMtx(); + + if (prm3 == 0xFF) { + init_modeWait(); + } else { + init_modeMoveWait(); + } + + mTimer = 0; + field_0x5f8 = 0.0f; + field_0x5e6.x = 0; + field_0x5e6.y = 0; + field_0x5e6.z = 0; + mShakeStrength = 0.0f; + mMoveStrength = 0.0f; + field_0x5ec.x = 0.0f; + field_0x5ec.y = 0.0f; + field_0x5ec.z = 0.0f; + mShakeYAmp = 0.0f; + field_0x600 = 0.0f; + mShakeDecay = 0.0f; + mMaxShakeDecay = 0.0f; + mMinShakeDecay = 0.0f; + mXMoveAmp = 0.0f; + mZMoveAmp = 0.0f; + mMoveDecay = 0.0f; + mMaxMoveDecay = 0.0f; + mMinMoveDecay = 0.0f; + } + + return phase; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMagLiftRot_c::create() { +asm int daMagLiftRot_c::create() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/create__14daMagLiftRot_cFv.s" } #pragma pop +#endif /* 80C8EF4C-80C8EF94 0006EC 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/__dt__12J3DFrameCtrlFv.s" } @@ -558,14 +631,21 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { /* 80C8EF94-80C8F02C 000734 0098+00 1/0 0/0 0/0 .text Execute__14daMagLiftRot_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMagLiftRot_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Execute__14daMagLiftRot_cFPPA3_A4_f.s" +int daMagLiftRot_c::Execute(Mtx** param_0) { + moveLift(); + + if (l_btkIdx[mType] != -1) { + mBtk.play(); + } + + if (l_brkIdx[mType] != -1) { + mBrk.play(); + } + + *param_0 = &mpModel->getBaseTRMtx(); + setBaseMtx(); + return 1; } -#pragma pop /* ############################################################################################## */ /* 80C8FB58-80C8FB60 000070 0004+04 1/2 0/0 0/0 .rodata @3882 */ @@ -585,16 +665,32 @@ SECTION_RODATA static u8 const lit_3885[8] = { COMPILER_STRIP_GATE(0x80C8FB60, &lit_3885); #pragma pop -/* 80C8FCC0-80C8FCCC 000008 000C+00 1/1 0/0 0/0 .bss @3621 */ -static u8 lit_3621[12]; - /* 80C8FCCC-80C8FD0C 000014 0040+00 4/4 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[64]; +static daMagLiftRot_HIO_c l_HIO; /* 80C8FD0C-80C8FD10 000054 0004+00 1/1 0/0 0/0 .bss None */ static u8 data_80C8FD0C[4]; /* 80C8F02C-80C8F264 0007CC 0238+00 1/1 0/0 0/0 .text moveLift__14daMagLiftRot_cFv */ +// matches with literals +#ifdef NONMATCHING +void daMagLiftRot_c::moveLift() { + typedef void (daMagLiftRot_c::*modeFunc)(); + static modeFunc mode_proc[] = {&daMagLiftRot_c::modeMove, &daMagLiftRot_c::modeWait, + &daMagLiftRot_c::modeMoveWait}; + + (this->*mode_proc[mMode])(); + + field_0x5e6.z = mShakeStrength * cM_scos(field_0x5f8 * cM_deg2s(mShakeYAmp)); + cLib_addCalc(&mShakeStrength, 0.0f, mShakeDecay, mMaxShakeDecay, mMinShakeDecay); + + field_0x5ec.x = mMoveStrength * cM_scos(field_0x5f8 * cM_deg2s(mXMoveAmp)); + field_0x5ec.y = mMoveStrength * cM_ssin(field_0x5f8 * cM_deg2s(mZMoveAmp)); + cLib_addCalc(&mMoveStrength, 0.0f, mMoveDecay, mMaxMoveDecay, mMinMoveDecay); + + field_0x5f8 += 1.0f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -603,6 +699,7 @@ asm void daMagLiftRot_c::moveLift() { #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/moveLift__14daMagLiftRot_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80C8FB68-80C8FB6C 000080 0004+00 0/2 0/0 0/0 .rodata @3949 */ @@ -628,6 +725,37 @@ COMPILER_STRIP_GATE(0x80C8FB70, &lit_3951); /* 80C8F264-80C8F4A0 000A04 023C+00 1/1 0/0 0/0 .text init_modeMove__14daMagLiftRot_cFv */ +// matches with literals +#ifdef NONMATCHING +void daMagLiftRot_c::init_modeMove() { + fopAcM_SetSpeedF(this, l_HIO.mInitSpeed); + + if (mType != 2) { + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + + cXyz sp20(0.0f, 0.0f, 0.0f); + mDoMtx_stack_c::multVec(&sp20, &sp20); + sp20 += current.pos; + + mDoAud_seStart(selLabel_3897[mType], &sp20, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } else { + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + + cXyz sp2C(0.0f, 0.0f, 1515.0f); + mDoMtx_stack_c::multVec(&sp2C, &sp2C); + sp2C += current.pos; + + cXyz sp38(0.0f, 0.0f, -1515.0f); + mDoMtx_stack_c::multVec(&sp38, &sp38); + sp38 += current.pos; + + mDoAud_seStart(selLabel_3897[mType], &sp2C, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mDoAud_seStart(selLabel_3897[mType], &sp38, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + + mMode = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -636,8 +764,23 @@ asm void daMagLiftRot_c::init_modeMove() { #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/init_modeMove__14daMagLiftRot_cFv.s" } #pragma pop +#endif /* 80C8F4A0-80C8F538 000C40 0098+00 1/0 0/0 0/0 .text modeMove__14daMagLiftRot_cFv */ +// matches with literals +#ifdef NONMATCHING +void daMagLiftRot_c::modeMove() { + cLib_chaseF(&speedF, l_HIO.mMaxSpeed, l_HIO.mAcceleration); + + if (cLib_addCalcAngleS(¤t.angle.z, field_0x5e2, 1, fopAcM_GetSpeedF(this) * 182.0444f, + 1) == 0) + { + field_0x5e2 += 0x8000; + field_0x5e4 = 0; + init_modeWait(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -646,9 +789,51 @@ asm void daMagLiftRot_c::modeMove() { #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/modeMove__14daMagLiftRot_cFv.s" } #pragma pop +#endif /* 80C8F538-80C8F7CC 000CD8 0294+00 3/3 0/0 0/0 .text init_modeWait__14daMagLiftRot_cFv */ +// matches with literals +#ifdef NONMATCHING +void daMagLiftRot_c::init_modeWait() { + if (mType != 2) { + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + + cXyz sp20(0.0f, 0.0f, 0.0f); + mDoMtx_stack_c::multVec(&sp20, &sp20); + sp20 += current.pos; + + mDoAud_seStart(selLabel_3963[mType], &sp20, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } else { + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + + cXyz sp2C(0.0f, 0.0f, 1515.0f); + mDoMtx_stack_c::multVec(&sp2C, &sp2C); + sp2C += current.pos; + + cXyz sp38(0.0f, 0.0f, -1515.0f); + mDoMtx_stack_c::multVec(&sp38, &sp38); + sp38 += current.pos; + + mDoAud_seStart(selLabel_3963[mType], &sp2C, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mDoAud_seStart(selLabel_3963[mType], &sp38, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + + mTimer = l_HIO.mWaitTime; + mShakeStrength = l_HIO.mShakeStrength; + mShakeYAmp = l_HIO.mShakeAmpY; + mShakeDecay = l_HIO.mShakeDecay; + mMaxShakeDecay = l_HIO.mMaxShakeDecay; + mMinShakeDecay = l_HIO.mMinShakeDecay; + mMoveStrength = l_HIO.mMoveStrength; + mXMoveAmp = l_HIO.mMoveAmpX; + mZMoveAmp = l_HIO.mMoveAmpZ; + mMoveDecay = l_HIO.mMoveDecay; + mMaxMoveDecay = l_HIO.mMaxMoveDecay; + mMinMoveDecay = l_HIO.mMinMoveDecay; + mMode = 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -657,121 +842,86 @@ asm void daMagLiftRot_c::init_modeWait() { #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/init_modeWait__14daMagLiftRot_cFv.s" } #pragma pop +#endif /* 80C8F7CC-80C8F804 000F6C 0038+00 1/0 0/0 0/0 .text modeWait__14daMagLiftRot_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMagLiftRot_c::modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/modeWait__14daMagLiftRot_cFv.s" +void daMagLiftRot_c::modeWait() { + if (mTimer == 0) { + init_modeMove(); + } else { + mTimer--; + } } -#pragma pop /* 80C8F804-80C8F810 000FA4 000C+00 1/1 0/0 0/0 .text init_modeMoveWait__14daMagLiftRot_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMagLiftRot_c::init_modeMoveWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/init_modeMoveWait__14daMagLiftRot_cFv.s" +void daMagLiftRot_c::init_modeMoveWait() { + mMode = 2; } -#pragma pop /* 80C8F810-80C8F86C 000FB0 005C+00 1/0 0/0 0/0 .text modeMoveWait__14daMagLiftRot_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMagLiftRot_c::modeMoveWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/modeMoveWait__14daMagLiftRot_cFv.s" +void daMagLiftRot_c::modeMoveWait() { + u8 sw_on = i_fopAcM_isSwitch(this, (fopAcM_GetParam(this) >> 0x18) & 0xFF); + + if (sw_on) { + mTimer = 15; + init_modeWait(); + } } -#pragma pop /* 80C8F86C-80C8F970 00100C 0104+00 1/0 0/0 0/0 .text Draw__14daMagLiftRot_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMagLiftRot_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Draw__14daMagLiftRot_cFv.s" +int daMagLiftRot_c::Draw() { + g_env_light.settingTevStruct(0x40, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + + J3DModelData* modelData = mpModel->getModelData(); + if (l_btkIdx[mType] != -1) { + mBtk.entry(modelData); + } + + if (l_brkIdx[mType] != -1) { + mBrk.entry(modelData); + } + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80C8F970-80C8F9B0 001110 0040+00 1/0 0/0 0/0 .text Delete__14daMagLiftRot_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMagLiftRot_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/Delete__14daMagLiftRot_cFv.s" +int daMagLiftRot_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName[mType]); + return 1; } -#pragma pop /* 80C8F9B0-80C8F9DC 001150 002C+00 1/0 0/0 0/0 .text daMagLiftRot_Draw__FP14daMagLiftRot_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMagLiftRot_Draw(daMagLiftRot_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Draw__FP14daMagLiftRot_c.s" +static int daMagLiftRot_Draw(daMagLiftRot_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80C8F9DC-80C8F9FC 00117C 0020+00 1/0 0/0 0/0 .text daMagLiftRot_Execute__FP14daMagLiftRot_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMagLiftRot_Execute(daMagLiftRot_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Execute__FP14daMagLiftRot_c.s" +static int daMagLiftRot_Execute(daMagLiftRot_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80C8F9FC-80C8FA1C 00119C 0020+00 1/0 0/0 0/0 .text daMagLiftRot_Delete__FP14daMagLiftRot_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMagLiftRot_Delete(daMagLiftRot_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Delete__FP14daMagLiftRot_c.s" +static int daMagLiftRot_Delete(daMagLiftRot_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80C8FA1C-80C8FA3C 0011BC 0020+00 1/0 0/0 0/0 .text daMagLiftRot_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMagLiftRot_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/daMagLiftRot_Create__FP10fopAc_ac_c.s" +static int daMagLiftRot_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80C8FA3C-80C8FA98 0011DC 005C+00 2/1 0/0 0/0 .text __dt__18daMagLiftRot_HIO_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daMagLiftRot_HIO_c::~daMagLiftRot_HIO_c() { +// asm daMagLiftRot_HIO_c::~daMagLiftRot_HIO_c() { +extern "C" asm void __dt__18daMagLiftRot_HIO_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/__dt__18daMagLiftRot_HIO_cFv.s" } #pragma pop - -/* 80C8FA98-80C8FAD4 001238 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_magLiftRot_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_magLiftRot_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot/__sinit_d_a_obj_magLiftRot_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C8FA98, __sinit_d_a_obj_magLiftRot_cpp); -#pragma pop - -/* 80C8FB74-80C8FB74 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp index d2048c0d9ac..93cd41ac691 100644 --- a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp +++ b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp @@ -1,395 +1,134 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_suisya -// +/** + * d_a_obj_suisya.cpp + * Ordon Village Water Wheel + */ #include "rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Suisya_c { - /* 80CF0078 */ void draw(); - /* 80CF0168 */ void execute(); - /* 80CF0234 */ void _delete(); - /* 80CF0284 */ void CreateHeap(); - /* 80CF0310 */ void create(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CF0478 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cBgS_PolyInfo {}; - -struct _GXTexObj {}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void draw__14daObj_Suisya_cFv(); -extern "C" static void daObj_Suisya_Draw__FP14daObj_Suisya_c(); -extern "C" void execute__14daObj_Suisya_cFv(); -extern "C" static void daObj_Suisya_Execute__FP14daObj_Suisya_c(); -extern "C" static bool daObj_Suisya_IsDelete__FP14daObj_Suisya_c(); -extern "C" void _delete__14daObj_Suisya_cFv(); -extern "C" static void daObj_Suisya_Delete__FP14daObj_Suisya_c(); -extern "C" void CreateHeap__14daObj_Suisya_cFv(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void create__14daObj_Suisya_cFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" static void daObj_Suisya_Create__FP14daObj_Suisya_c(); -extern "C" static void func_80CF0508(); -extern "C" static void func_80CF0510(); -extern "C" extern char const* const d_a_obj_suisya__stringBase0; - -// -// External References: -// - -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80CF0520-80CF0524 000000 0004+00 2/2 0/0 0/0 .rodata @3662 */ -SECTION_RODATA static f32 const lit_3662 = 100.0f; -COMPILER_STRIP_GATE(0x80CF0520, &lit_3662); - -/* 80CF0524-80CF0528 000004 0004+00 0/1 0/0 0/0 .rodata @3663 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3663 = 400.0f; -COMPILER_STRIP_GATE(0x80CF0524, &lit_3663); -#pragma pop - -/* 80CF0528-80CF052C 000008 0004+00 0/2 0/0 0/0 .rodata @3664 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3664[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CF0528, &lit_3664); -#pragma pop - -/* 80CF052C-80CF0530 00000C 0004+00 1/2 0/0 0/0 .rodata @3665 */ -SECTION_RODATA static f32 const lit_3665 = 1.0f; -COMPILER_STRIP_GATE(0x80CF052C, &lit_3665); +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80CF0078-80CF0148 000078 00D0+00 1/1 0/0 0/0 .text draw__14daObj_Suisya_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Suisya_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/draw__14daObj_Suisya_cFv.s" +int daObj_Suisya_c::draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + mDoExt_modelUpdateDL(mpModel); + + cXyz sp18; + sp18.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + + mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, &sp18, 400.0f, 0.0f, current.pos.y, + mAcch.GetGroundH(), mAcch.m_gnd, &mTevStr, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); + return 1; } -#pragma pop /* 80CF0148-80CF0168 000148 0020+00 1/0 0/0 0/0 .text daObj_Suisya_Draw__FP14daObj_Suisya_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Suisya_Draw(daObj_Suisya_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Draw__FP14daObj_Suisya_c.s" +static int daObj_Suisya_Draw(daObj_Suisya_c* i_this) { + return i_this->draw(); } -#pragma pop - -/* ############################################################################################## */ -/* 80CF0530-80CF0534 000010 0004+00 1/1 0/0 0/0 .rodata @3682 */ -SECTION_RODATA static f32 const lit_3682 = -1.0f; -COMPILER_STRIP_GATE(0x80CF0530, &lit_3682); /* 80CF0168-80CF020C 000168 00A4+00 1/1 0/0 0/0 .text execute__14daObj_Suisya_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Suisya_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/execute__14daObj_Suisya_cFv.s" +int daObj_Suisya_c::execute() { + Z2GetAudioMgr()->mSeMgr.seStartLevel(Z2SE_OBJ_WATERMILL_ROUND, ¤t.pos, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + shape_angle.x += 25; + + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + return 1; } -#pragma pop /* 80CF020C-80CF022C 00020C 0020+00 2/1 0/0 0/0 .text daObj_Suisya_Execute__FP14daObj_Suisya_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Suisya_Execute(daObj_Suisya_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Execute__FP14daObj_Suisya_c.s" +static int daObj_Suisya_Execute(daObj_Suisya_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80CF022C-80CF0234 00022C 0008+00 1/0 0/0 0/0 .text daObj_Suisya_IsDelete__FP14daObj_Suisya_c */ -static bool daObj_Suisya_IsDelete(daObj_Suisya_c* param_0) { - return true; +static int daObj_Suisya_IsDelete(daObj_Suisya_c* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80CF0544-80CF0544 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CF0544 = "Obj_sui"; -#pragma pop - /* 80CF0234-80CF0264 000234 0030+00 1/1 0/0 0/0 .text _delete__14daObj_Suisya_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Suisya_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/_delete__14daObj_Suisya_cFv.s" +int daObj_Suisya_c::_delete() { + dComIfG_resDelete(&mPhase, "Obj_sui"); + return 1; } -#pragma pop /* 80CF0264-80CF0284 000264 0020+00 1/0 0/0 0/0 .text daObj_Suisya_Delete__FP14daObj_Suisya_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Suisya_Delete(daObj_Suisya_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Delete__FP14daObj_Suisya_c.s" +static int daObj_Suisya_Delete(daObj_Suisya_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80CF0284-80CF02F0 000284 006C+00 1/1 0/0 0/0 .text CreateHeap__14daObj_Suisya_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Suisya_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/CreateHeap__14daObj_Suisya_cFv.s" +int daObj_Suisya_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_sui", 3); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + return 1; } -#pragma pop /* 80CF02F0-80CF0310 0002F0 0020+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop -/* ############################################################################################## */ -/* 80CF0534-80CF0538 000014 0004+00 0/1 0/0 0/0 .rodata @3749 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3749 = -200.0f; -COMPILER_STRIP_GATE(0x80CF0534, &lit_3749); -#pragma pop +/* 80CF0310-80CF0478 000310 0168+00 1/1 0/0 0/0 .text create__14daObj_Suisya_cFv */ +int daObj_Suisya_c::create() { + fopAcM_SetupActor(this, daObj_Suisya_c); -/* 80CF0538-80CF053C 000018 0004+00 0/1 0/0 0/0 .rodata @3750 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3750 = -500.0f; -COMPILER_STRIP_GATE(0x80CF0538, &lit_3750); -#pragma pop + int phase = dComIfG_resLoad(&mPhase, "Obj_sui"); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x800)) { + return cPhs_ERROR_e; + } -/* 80CF053C-80CF0540 00001C 0004+00 0/1 0/0 0/0 .rodata @3751 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3751 = 200.0f; -COMPILER_STRIP_GATE(0x80CF053C, &lit_3751); -#pragma pop + mAttentionInfo.mFlags = 0; + mCullMtx = mpModel->getBaseTRMtx(); + fopAcM_SetMin(this, -200.0f, -500.0f, -500.0f); + fopAcM_SetMax(this, 200.0f, 500.0, 500.0f); -/* 80CF0540-80CF0544 000020 0004+00 0/1 0/0 0/0 .rodata @3752 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3752 = 500.0f; -COMPILER_STRIP_GATE(0x80CF0540, &lit_3752); -#pragma pop + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcchCir.SetWall(0.0f, 0.0f); + mHealth = 60; + field_0x560 = 60; + + daObj_Suisya_Execute(this); + } + + return phase; +} + +/* 80CF04E8-80CF0508 0004E8 0020+00 1/0 0/0 0/0 .text daObj_Suisya_Create__FP14daObj_Suisya_c */ +static int daObj_Suisya_Create(daObj_Suisya_c* i_this) { + return i_this->create(); +} /* 80CF054C-80CF056C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Suisya_Method */ -SECTION_DATA static void* l_daObj_Suisya_Method[8] = { - (void*)daObj_Suisya_Create__FP14daObj_Suisya_c, - (void*)daObj_Suisya_Delete__FP14daObj_Suisya_c, - (void*)daObj_Suisya_Execute__FP14daObj_Suisya_c, - (void*)daObj_Suisya_IsDelete__FP14daObj_Suisya_c, - (void*)daObj_Suisya_Draw__FP14daObj_Suisya_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Suisya_Method = { + (process_method_func)daObj_Suisya_Create, (process_method_func)daObj_Suisya_Delete, + (process_method_func)daObj_Suisya_Execute, (process_method_func)daObj_Suisya_IsDelete, + (process_method_func)daObj_Suisya_Draw, }; /* 80CF056C-80CF059C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SUISYA */ -SECTION_DATA extern void* g_profile_OBJ_SUISYA[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x011D0000, (void*)&g_fpcLf_Method, - (void*)0x00000790, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00410000, (void*)&l_daObj_Suisya_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_SUISYA = { + -3, + 7, + -3, + PROC_OBJ_SUISYA, + &g_fpcLf_Method.mBase, + sizeof(daObj_Suisya_c), + 0, + 0, + &g_fopAc_Method.base, + 65, + &l_daObj_Suisya_Method, + 0x40100, + 0, + 14, }; - -/* 80CF059C-80CF05C0 000050 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80CF0510, - (void*)NULL, - (void*)NULL, - (void*)func_80CF0508, -}; - -/* 80CF0310-80CF0478 000310 0168+00 1/1 0/0 0/0 .text create__14daObj_Suisya_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Suisya_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/create__14daObj_Suisya_cFv.s" -} -#pragma pop - -/* 80CF0478-80CF04E8 000478 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80CF04E8-80CF0508 0004E8 0020+00 1/0 0/0 0/0 .text daObj_Suisya_Create__FP14daObj_Suisya_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Suisya_Create(daObj_Suisya_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/daObj_Suisya_Create__FP14daObj_Suisya_c.s" -} -#pragma pop - -/* 80CF0508-80CF0510 000508 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80CF0508() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/func_80CF0508.s" -} -#pragma pop - -/* 80CF0510-80CF0518 000510 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80CF0510() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya/func_80CF0510.s" -} -#pragma pop - -/* 80CF0544-80CF0544 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp index 0bd1f463d56..a2c437b6a72 100644 --- a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp +++ b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp @@ -1,319 +1,163 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_tgake -// +/** + * d_a_obj_tgake.cpp + * Howling Cliff + */ #include "rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjGake_c { - /* 80D0BC18 */ void initBaseMtx(); - /* 80D0BC54 */ void setBaseMtx(); - /* 80D0BCB8 */ void Create(); - /* 80D0BD30 */ void CreateHeap(); - /* 80D0BDA0 */ void create1st(); - /* 80D0BE24 */ void Execute(f32 (**)[3][4]); - /* 80D0BF7C */ void Draw(); - /* 80D0C034 */ void Delete(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 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(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void initBaseMtx__11daObjGake_cFv(); -extern "C" void setBaseMtx__11daObjGake_cFv(); -extern "C" void Create__11daObjGake_cFv(); -extern "C" void CreateHeap__11daObjGake_cFv(); -extern "C" void create1st__11daObjGake_cFv(); -extern "C" void Execute__11daObjGake_cFPPA3_A4_f(); -extern "C" void Draw__11daObjGake_cFv(); -extern "C" void Delete__11daObjGake_cFv(); -extern "C" static void daObjGake_create1st__FP11daObjGake_c(); -extern "C" static void daObjGake_MoveBGDelete__FP11daObjGake_c(); -extern "C" static void daObjGake_MoveBGExecute__FP11daObjGake_c(); -extern "C" static void daObjGake_MoveBGDraw__FP11daObjGake_c(); -extern "C" extern char const* const d_a_obj_tgake__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void PSMTXCopy(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80D0BC18-80D0BC54 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjGake_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGake_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/initBaseMtx__11daObjGake_cFv.s" +void daObjGake_c::initBaseMtx() { + mpModel->setBaseScale(mScale); + setBaseMtx(); } -#pragma pop /* 80D0BC54-80D0BCB8 0000B4 0064+00 1/1 0/0 0/0 .text setBaseMtx__11daObjGake_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGake_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/setBaseMtx__11daObjGake_cFv.s" +void daObjGake_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + PSMTXCopy(mDoMtx_stack_c::get(), field_0x56c); } -#pragma pop /* 80D0BCB8-80D0BD30 000118 0078+00 1/0 0/0 0/0 .text Create__11daObjGake_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGake_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Create__11daObjGake_cFv.s" -} -#pragma pop +int daObjGake_c::Create() { + mEventBit1 = getEventBit1(); + mEventBit2 = getEventBit2(); + mEvtInfo.setIdx(getType()); -/* ############################################################################################## */ -/* 80D0C13C-80D0C13C 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D0C13C = "A_TGake"; -#pragma pop + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + + MoveBGExecute(); + return 1; +} /* 80D0C144-80D0C148 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_tgake__stringBase0; +static char* l_arcName = "A_TGake"; /* 80D0BD30-80D0BDA0 000190 0070+00 1/0 0/0 0/0 .text CreateHeap__11daObjGake_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGake_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/CreateHeap__11daObjGake_cFv.s" +int daObjGake_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + return 1; } -#pragma pop /* 80D0BDA0-80D0BE24 000200 0084+00 1/1 0/0 0/0 .text create1st__11daObjGake_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGake_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/create1st__11daObjGake_cFv.s" +int daObjGake_c::create1st() { + int phase = dComIfG_resLoad(&mPhase, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + phase = MoveBGCreate(l_arcName, 7, dBgS_MoveBGProc_TypicalRotY, 0x4000, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + + return phase; } -#pragma pop /* 80D0BE24-80D0BF7C 000284 0158+00 1/0 0/0 0/0 .text Execute__11daObjGake_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGake_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Execute__11daObjGake_cFPPA3_A4_f.s" +int daObjGake_c::Execute(Mtx** param_0) { + if ((mEventBit2 != 0x3FF && + i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit2])) || + (mEventBit1 != 0x3FF && + !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit1]))) + { + if (field_0x568 != NULL && field_0x568->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x568); + } + + mHide = true; + return 1; + } + + if (mEventBit1 != 0x3FF && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit1])) { + if (field_0x568 != NULL && !field_0x568->ChkUsed()) { + dComIfG_Bgsp().Regist(field_0x568, this); + } + + mHide = false; + return 1; + } + + *param_0 = &field_0x56c; + return 1; } -#pragma pop /* 80D0BF7C-80D0C034 0003DC 00B8+00 1/0 0/0 0/0 .text Draw__11daObjGake_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGake_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Draw__11daObjGake_cFv.s" +int daObjGake_c::Draw() { + if (mHide) { + return 1; + } + + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + + return 1; } -#pragma pop /* 80D0C034-80D0C068 000494 0034+00 1/0 0/0 0/0 .text Delete__11daObjGake_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGake_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/Delete__11daObjGake_cFv.s" +int daObjGake_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName); + return 1; +} + +/* 80D0C068-80D0C0C8 0004C8 0060+00 1/0 0/0 0/0 .text daObjGake_create1st__FP11daObjGake_c */ +static int daObjGake_create1st(daObjGake_c* i_this) { + fopAcM_SetupActor(i_this, daObjGake_c); + + return i_this->create1st(); +} + +/* 80D0C0C8-80D0C0E8 000528 0020+00 1/0 0/0 0/0 .text daObjGake_MoveBGDelete__FP11daObjGake_c */ +static int daObjGake_MoveBGDelete(daObjGake_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80D0C0E8-80D0C108 000548 0020+00 1/0 0/0 0/0 .text daObjGake_MoveBGExecute__FP11daObjGake_c */ +static int daObjGake_MoveBGExecute(daObjGake_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80D0C108-80D0C134 000568 002C+00 1/0 0/0 0/0 .text daObjGake_MoveBGDraw__FP11daObjGake_c */ +static int daObjGake_MoveBGDraw(daObjGake_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* ############################################################################################## */ /* 80D0C148-80D0C168 -00001 0020+00 1/0 0/0 0/0 .data daObjGake_METHODS */ -SECTION_DATA static void* daObjGake_METHODS[8] = { - (void*)daObjGake_create1st__FP11daObjGake_c, - (void*)daObjGake_MoveBGDelete__FP11daObjGake_c, - (void*)daObjGake_MoveBGExecute__FP11daObjGake_c, - (void*)NULL, - (void*)daObjGake_MoveBGDraw__FP11daObjGake_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjGake_METHODS = { + (process_method_func)daObjGake_create1st, (process_method_func)daObjGake_MoveBGDelete, + (process_method_func)daObjGake_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjGake_MoveBGDraw, }; /* 80D0C168-80D0C198 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Gake */ -SECTION_DATA extern void* g_profile_Obj_Gake[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00BA0000, (void*)&g_fpcLf_Method, - (void*)0x000005B4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02380000, (void*)&daObjGake_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Gake = { + -3, + 3, + -3, + PROC_Obj_Gake, + &g_fpcLf_Method.mBase, + sizeof(daObjGake_c), + 0, + 0, + &g_fopAc_Method.base, + 568, + &daObjGake_METHODS, + 0x40100, + 0, + 14, }; - -/* 80D0C198-80D0C1C0 000054 0028+00 1/1 0/0 0/0 .data __vt__11daObjGake_c */ -SECTION_DATA extern void* __vt__11daObjGake_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__11daObjGake_cFv, - (void*)Create__11daObjGake_cFv, - (void*)Execute__11daObjGake_cFPPA3_A4_f, - (void*)Draw__11daObjGake_cFv, - (void*)Delete__11daObjGake_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80D0C068-80D0C0C8 0004C8 0060+00 1/0 0/0 0/0 .text daObjGake_create1st__FP11daObjGake_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjGake_create1st(daObjGake_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_create1st__FP11daObjGake_c.s" -} -#pragma pop - -/* 80D0C0C8-80D0C0E8 000528 0020+00 1/0 0/0 0/0 .text daObjGake_MoveBGDelete__FP11daObjGake_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjGake_MoveBGDelete(daObjGake_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGDelete__FP11daObjGake_c.s" -} -#pragma pop - -/* 80D0C0E8-80D0C108 000548 0020+00 1/0 0/0 0/0 .text daObjGake_MoveBGExecute__FP11daObjGake_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjGake_MoveBGExecute(daObjGake_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGExecute__FP11daObjGake_c.s" -} -#pragma pop - -/* 80D0C108-80D0C134 000568 002C+00 1/0 0/0 0/0 .text daObjGake_MoveBGDraw__FP11daObjGake_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjGake_MoveBGDraw(daObjGake_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake/daObjGake_MoveBGDraw__FP11daObjGake_c.s" -} -#pragma pop - -/* 80D0C13C-80D0C13C 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */