diff --git a/asm/JSystem/J2DGraph/J2DScreen/__ct__9J2DScreenFv.s b/asm/JSystem/J2DGraph/J2DScreen/__ct__9J2DScreenFv.s deleted file mode 100644 index 9cca38fd3c3..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/__ct__9J2DScreenFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_802F8498: -/* 802F8498 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802F849C 7C 08 02 A6 */ mflr r0 -/* 802F84A0 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F84A4 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 802F84A8 7C 7F 1B 78 */ mr r31, r3 -/* 802F84AC C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F84B0 D0 01 00 08 */ stfs f0, 8(r1) -/* 802F84B4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802F84B8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F84BC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802F84C0 C0 02 C8 24 */ lfs f0, lit_1562(r2) -/* 802F84C4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 802F84C8 C0 02 C8 28 */ lfs f0, lit_1563(r2) -/* 802F84CC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 802F84D0 38 80 00 00 */ li r4, 0 -/* 802F84D4 38 A0 00 01 */ li r5, 1 -/* 802F84D8 3C C0 72 6F */ lis r6, 0x726F /* 0x726F6F74@ha */ -/* 802F84DC 39 06 6F 74 */ addi r8, r6, 0x6F74 /* 0x726F6F74@l */ -/* 802F84E0 38 E0 00 00 */ li r7, 0 -/* 802F84E4 39 21 00 10 */ addi r9, r1, 0x10 -/* 802F84E8 4B FF D8 59 */ bl func_802F5D40 -/* 802F84EC 3C 60 80 3D */ lis r3, __vt__9J2DScreen@ha /* 0x803CD068@ha */ -/* 802F84F0 38 03 D0 68 */ addi r0, r3, __vt__9J2DScreen@l /* 0x803CD068@l */ -/* 802F84F4 90 1F 00 00 */ stw r0, 0(r31) -/* 802F84F8 38 00 FF FF */ li r0, -1 -/* 802F84FC 90 1F 01 14 */ stw r0, 0x114(r31) -/* 802F8500 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802F8504 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802F8508 B0 1F 00 04 */ sth r0, 4(r31) -/* 802F850C 38 00 00 00 */ li r0, 0 -/* 802F8510 98 1F 01 00 */ stb r0, 0x100(r31) -/* 802F8514 B0 1F 01 02 */ sth r0, 0x102(r31) -/* 802F8518 90 1F 01 04 */ stw r0, 0x104(r31) -/* 802F851C 90 1F 01 08 */ stw r0, 0x108(r31) -/* 802F8520 90 1F 01 0C */ stw r0, 0x10c(r31) -/* 802F8524 90 1F 01 10 */ stw r0, 0x110(r31) -/* 802F8528 7F E3 FB 78 */ mr r3, r31 -/* 802F852C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 802F8530 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802F8534 7C 08 03 A6 */ mtlr r0 -/* 802F8538 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F853C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/drawSelf__9J2DScreenFffPA3_A4_f.s b/asm/JSystem/J2DGraph/J2DScreen/drawSelf__9J2DScreenFffPA3_A4_f.s deleted file mode 100644 index 42a4475beae..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/drawSelf__9J2DScreenFffPA3_A4_f.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_802F9120: -/* 802F9120 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F9124 7C 08 02 A6 */ mflr r0 -/* 802F9128 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F912C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802F9130 7C 7F 1B 78 */ mr r31, r3 -/* 802F9134 80 83 01 14 */ lwz r4, 0x114(r3) -/* 802F9138 90 81 00 0C */ stw r4, 0xc(r1) -/* 802F913C 88 61 00 0F */ lbz r3, 0xf(r1) -/* 802F9140 88 1F 00 B2 */ lbz r0, 0xb2(r31) -/* 802F9144 7C 63 01 D6 */ mullw r3, r3, r0 -/* 802F9148 38 00 00 FF */ li r0, 0xff -/* 802F914C 7C 03 03 D6 */ divw r0, r3, r0 -/* 802F9150 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802F9154 41 82 01 18 */ beq lbl_802F926C -/* 802F9158 50 04 06 3E */ rlwimi r4, r0, 0, 0x18, 0x1f -/* 802F915C 90 81 00 08 */ stw r4, 8(r1) -/* 802F9160 88 01 00 08 */ lbz r0, 8(r1) -/* 802F9164 98 01 00 0C */ stb r0, 0xc(r1) -/* 802F9168 88 01 00 09 */ lbz r0, 9(r1) -/* 802F916C 98 01 00 0D */ stb r0, 0xd(r1) -/* 802F9170 88 01 00 0A */ lbz r0, 0xa(r1) -/* 802F9174 98 01 00 0E */ stb r0, 0xe(r1) -/* 802F9178 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802F917C 98 01 00 0F */ stb r0, 0xf(r1) -/* 802F9180 38 60 00 01 */ li r3, 1 -/* 802F9184 38 80 00 04 */ li r4, 4 -/* 802F9188 38 A0 00 05 */ li r5, 5 -/* 802F918C 38 C0 00 0F */ li r6, 0xf -/* 802F9190 48 06 6A 61 */ bl GXSetBlendMode -/* 802F9194 38 60 00 00 */ li r3, 0 -/* 802F9198 38 80 00 09 */ li r4, 9 -/* 802F919C 38 A0 00 01 */ li r5, 1 -/* 802F91A0 38 C0 00 04 */ li r6, 4 -/* 802F91A4 38 E0 00 00 */ li r7, 0 -/* 802F91A8 48 06 24 1D */ bl GXSetVtxAttrFmt -/* 802F91AC 38 60 00 80 */ li r3, 0x80 -/* 802F91B0 38 80 00 00 */ li r4, 0 -/* 802F91B4 38 A0 00 04 */ li r5, 4 -/* 802F91B8 48 06 35 AD */ bl GXBegin -/* 802F91BC C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F91C0 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 802F91C4 D0 03 80 00 */ stfs f0, 0x8000(r3) /* 0xCC008000@l */ -/* 802F91C8 C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F91CC D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802F91D0 C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F91D4 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802F91D8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802F91DC 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802F91E0 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 802F91E4 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 802F91E8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F91EC D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802F91F0 C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F91F4 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802F91F8 C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F91FC D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802F9200 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802F9204 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 802F9208 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 802F920C EC 41 00 28 */ fsubs f2, f1, f0 -/* 802F9210 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 802F9214 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 802F9218 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F921C D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802F9220 D0 43 80 00 */ stfs f2, -0x8000(r3) -/* 802F9224 C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F9228 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802F922C 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802F9230 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 802F9234 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 802F9238 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802F923C C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F9240 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802F9244 D0 23 80 00 */ stfs f1, -0x8000(r3) -/* 802F9248 C0 02 C8 20 */ lfs f0, lit_1561(r2) -/* 802F924C D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802F9250 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802F9254 38 60 00 00 */ li r3, 0 -/* 802F9258 38 80 00 09 */ li r4, 9 -/* 802F925C 38 A0 00 01 */ li r5, 1 -/* 802F9260 38 C0 00 03 */ li r6, 3 -/* 802F9264 38 E0 00 00 */ li r7, 0 -/* 802F9268 48 06 23 5D */ bl GXSetVtxAttrFmt -lbl_802F926C: -/* 802F926C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802F9270 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F9274 7C 08 03 A6 */ mtlr r0 -/* 802F9278 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F927C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/draw__9J2DScreenFffPC14J2DGrafContext.s b/asm/JSystem/J2DGraph/J2DScreen/draw__9J2DScreenFffPC14J2DGrafContext.s deleted file mode 100644 index b8c40e27a36..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/draw__9J2DScreenFffPC14J2DGrafContext.s +++ /dev/null @@ -1,122 +0,0 @@ -lbl_802F8ED4: -/* 802F8ED4 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 802F8ED8 7C 08 02 A6 */ mflr r0 -/* 802F8EDC 90 01 01 24 */ stw r0, 0x124(r1) -/* 802F8EE0 DB E1 01 10 */ stfd f31, 0x110(r1) -/* 802F8EE4 F3 E1 01 18 */ psq_st f31, 280(r1), 0, 0 /* qr0 */ -/* 802F8EE8 DB C1 01 00 */ stfd f30, 0x100(r1) -/* 802F8EEC F3 C1 01 08 */ psq_st f30, 264(r1), 0, 0 /* qr0 */ -/* 802F8EF0 93 E1 00 FC */ stw r31, 0xfc(r1) -/* 802F8EF4 93 C1 00 F8 */ stw r30, 0xf8(r1) -/* 802F8EF8 7C 7E 1B 78 */ mr r30, r3 -/* 802F8EFC FF C0 08 90 */ fmr f30, f1 -/* 802F8F00 FF E0 10 90 */ fmr f31, f2 -/* 802F8F04 7C 9F 23 78 */ mr r31, r4 -/* 802F8F08 88 03 01 00 */ lbz r0, 0x100(r3) -/* 802F8F0C 28 00 00 00 */ cmplwi r0, 0 -/* 802F8F10 41 82 00 18 */ beq lbl_802F8F28 -/* 802F8F14 38 61 00 14 */ addi r3, r1, 0x14 -/* 802F8F18 38 81 00 10 */ addi r4, r1, 0x10 -/* 802F8F1C 38 A1 00 0C */ addi r5, r1, 0xc -/* 802F8F20 38 C1 00 08 */ addi r6, r1, 8 -/* 802F8F24 48 06 76 25 */ bl GXGetScissor -lbl_802F8F28: -/* 802F8F28 28 1F 00 00 */ cmplwi r31, 0 -/* 802F8F2C 41 82 00 24 */ beq lbl_802F8F50 -/* 802F8F30 7F C3 F3 78 */ mr r3, r30 -/* 802F8F34 FC 20 F0 90 */ fmr f1, f30 -/* 802F8F38 FC 40 F8 90 */ fmr f2, f31 -/* 802F8F3C 7F E4 FB 78 */ mr r4, r31 -/* 802F8F40 88 BE 01 00 */ lbz r5, 0x100(r30) -/* 802F8F44 38 C0 00 01 */ li r6, 1 -/* 802F8F48 4B FF D8 99 */ bl draw__7J2DPaneFffPC14J2DGrafContextbb -/* 802F8F4C 48 00 00 60 */ b lbl_802F8FAC -lbl_802F8F50: -/* 802F8F50 38 61 00 18 */ addi r3, r1, 0x18 -/* 802F8F54 C0 22 C8 20 */ lfs f1, lit_1561(r2) -/* 802F8F58 FC 40 08 90 */ fmr f2, f1 -/* 802F8F5C C0 62 C8 24 */ lfs f3, lit_1562(r2) -/* 802F8F60 C0 82 C8 28 */ lfs f4, lit_1563(r2) -/* 802F8F64 C0 A2 C8 38 */ lfs f5, lit_1829(r2) -/* 802F8F68 C0 C2 C8 3C */ lfs f6, lit_1830(r2) -/* 802F8F6C 4B FF 07 65 */ bl __ct__13J2DOrthoGraphFffffff -/* 802F8F70 38 61 00 18 */ addi r3, r1, 0x18 -/* 802F8F74 4B FF 08 41 */ bl setPort__13J2DOrthoGraphFv -/* 802F8F78 7F C3 F3 78 */ mr r3, r30 -/* 802F8F7C FC 20 F0 90 */ fmr f1, f30 -/* 802F8F80 FC 40 F8 90 */ fmr f2, f31 -/* 802F8F84 38 81 00 18 */ addi r4, r1, 0x18 -/* 802F8F88 88 BE 01 00 */ lbz r5, 0x100(r30) -/* 802F8F8C 38 C0 00 01 */ li r6, 1 -/* 802F8F90 4B FF D8 51 */ bl draw__7J2DPaneFffPC14J2DGrafContextbb -/* 802F8F94 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 802F8F98 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 802F8F9C 90 01 00 18 */ stw r0, 0x18(r1) -/* 802F8FA0 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802F8FA4 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802F8FA8 90 01 00 18 */ stw r0, 0x18(r1) -lbl_802F8FAC: -/* 802F8FAC 88 1E 01 00 */ lbz r0, 0x100(r30) -/* 802F8FB0 28 00 00 00 */ cmplwi r0, 0 -/* 802F8FB4 41 82 00 18 */ beq lbl_802F8FCC -/* 802F8FB8 80 61 00 14 */ lwz r3, 0x14(r1) -/* 802F8FBC 80 81 00 10 */ lwz r4, 0x10(r1) -/* 802F8FC0 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 802F8FC4 80 C1 00 08 */ lwz r6, 8(r1) -/* 802F8FC8 48 06 75 09 */ bl GXSetScissor -lbl_802F8FCC: -/* 802F8FCC 38 60 00 00 */ li r3, 0 -/* 802F8FD0 48 06 61 05 */ bl GXSetNumIndStages -/* 802F8FD4 3B E0 00 00 */ li r31, 0 -lbl_802F8FD8: -/* 802F8FD8 7F E3 FB 78 */ mr r3, r31 -/* 802F8FDC 48 06 61 1D */ bl GXSetTevDirect -/* 802F8FE0 3B FF 00 01 */ addi r31, r31, 1 -/* 802F8FE4 2C 1F 00 10 */ cmpwi r31, 0x10 -/* 802F8FE8 41 80 FF F0 */ blt lbl_802F8FD8 -/* 802F8FEC 38 60 00 01 */ li r3, 1 -/* 802F8FF0 48 06 68 A1 */ bl GXSetNumTevStages -/* 802F8FF4 38 60 00 00 */ li r3, 0 -/* 802F8FF8 38 80 00 04 */ li r4, 4 -/* 802F8FFC 48 06 61 9D */ bl GXSetTevOp -/* 802F9000 38 60 00 00 */ li r3, 0 -/* 802F9004 38 80 00 FF */ li r4, 0xff -/* 802F9008 38 A0 00 FF */ li r5, 0xff -/* 802F900C 38 C0 00 04 */ li r6, 4 -/* 802F9010 48 06 66 E5 */ bl GXSetTevOrder -/* 802F9014 38 60 00 0D */ li r3, 0xd -/* 802F9018 38 80 00 00 */ li r4, 0 -/* 802F901C 48 06 1E 9D */ bl GXSetVtxDesc -/* 802F9020 38 60 00 00 */ li r3, 0 -/* 802F9024 48 06 39 61 */ bl GXSetCullMode -/* 802F9028 38 60 00 00 */ li r3, 0 -/* 802F902C 48 06 2D D1 */ bl GXSetNumTexGens -/* 802F9030 38 60 00 04 */ li r3, 4 -/* 802F9034 38 80 00 00 */ li r4, 0 -/* 802F9038 38 A0 00 00 */ li r5, 0 -/* 802F903C 38 C0 00 01 */ li r6, 1 -/* 802F9040 38 E0 00 00 */ li r7, 0 -/* 802F9044 39 00 00 00 */ li r8, 0 -/* 802F9048 39 20 00 02 */ li r9, 2 -/* 802F904C 48 06 4B 21 */ bl GXSetChanCtrl -/* 802F9050 3B E0 00 00 */ li r31, 0 -lbl_802F9054: -/* 802F9054 7F E3 FB 78 */ mr r3, r31 -/* 802F9058 38 80 00 00 */ li r4, 0 -/* 802F905C 38 A0 00 01 */ li r5, 1 -/* 802F9060 38 C0 00 02 */ li r6, 2 -/* 802F9064 38 E0 00 03 */ li r7, 3 -/* 802F9068 48 06 65 3D */ bl GXSetTevSwapModeTable -/* 802F906C 3B FF 00 01 */ addi r31, r31, 1 -/* 802F9070 2C 1F 00 04 */ cmpwi r31, 4 -/* 802F9074 41 80 FF E0 */ blt lbl_802F9054 -/* 802F9078 E3 E1 01 18 */ psq_l f31, 280(r1), 0, 0 /* qr0 */ -/* 802F907C CB E1 01 10 */ lfd f31, 0x110(r1) -/* 802F9080 E3 C1 01 08 */ psq_l f30, 264(r1), 0, 0 /* qr0 */ -/* 802F9084 CB C1 01 00 */ lfd f30, 0x100(r1) -/* 802F9088 83 E1 00 FC */ lwz r31, 0xfc(r1) -/* 802F908C 83 C1 00 F8 */ lwz r30, 0xf8(r1) -/* 802F9090 80 01 01 24 */ lwz r0, 0x124(r1) -/* 802F9094 7C 08 03 A6 */ mtlr r0 -/* 802F9098 38 21 01 20 */ addi r1, r1, 0x120 -/* 802F909C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcLoadMaterialTableSize__14J3DModelLoaderFPCv.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcLoadMaterialTableSize__14J3DModelLoaderFPCv.s deleted file mode 100644 index 95f2e4eb134..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcLoadMaterialTableSize__14J3DModelLoaderFPCv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_803369A0: -/* 803369A0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 803369A4 7C 08 02 A6 */ mflr r0 -/* 803369A8 90 01 00 34 */ stw r0, 0x34(r1) -/* 803369AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 803369B0 48 02 B8 1D */ bl _savegpr_25 -/* 803369B4 7C 79 1B 78 */ mr r25, r3 -/* 803369B8 3B 84 00 20 */ addi r28, r4, 0x20 -/* 803369BC 3B 60 00 00 */ li r27, 0 -/* 803369C0 3B 40 00 00 */ li r26, 0 -/* 803369C4 3B A0 00 20 */ li r29, 0x20 -/* 803369C8 3C 60 4D 41 */ lis r3, 0x4D41 /* 0x4D415433@ha */ -/* 803369CC 3B C3 54 33 */ addi r30, r3, 0x5433 /* 0x4D415433@l */ -/* 803369D0 83 E4 00 0C */ lwz r31, 0xc(r4) -/* 803369D4 48 00 00 94 */ b lbl_80336A68 -lbl_803369D8: -/* 803369D8 80 9C 00 00 */ lwz r4, 0(r28) -/* 803369DC 7C 04 F0 00 */ cmpw r4, r30 -/* 803369E0 41 82 00 30 */ beq lbl_80336A10 -/* 803369E4 40 80 00 18 */ bge lbl_803369FC -/* 803369E8 3C 60 4D 41 */ lis r3, 0x4D41 /* 0x4D415432@ha */ -/* 803369EC 38 03 54 32 */ addi r0, r3, 0x5432 /* 0x4D415432@l */ -/* 803369F0 7C 04 00 00 */ cmpw r4, r0 -/* 803369F4 40 80 00 68 */ bge lbl_80336A5C -/* 803369F8 48 00 00 54 */ b lbl_80336A4C -lbl_803369FC: -/* 803369FC 3C 60 54 45 */ lis r3, 0x5445 /* 0x54455831@ha */ -/* 80336A00 38 03 58 31 */ addi r0, r3, 0x5831 /* 0x54455831@l */ -/* 80336A04 7C 04 00 00 */ cmpw r4, r0 -/* 80336A08 41 82 00 2C */ beq lbl_80336A34 -/* 80336A0C 48 00 00 40 */ b lbl_80336A4C -lbl_80336A10: -/* 80336A10 7F 23 CB 78 */ mr r3, r25 -/* 80336A14 7F 84 E3 78 */ mr r4, r28 -/* 80336A18 3C A0 51 10 */ lis r5, 0x5110 -/* 80336A1C 81 99 00 00 */ lwz r12, 0(r25) -/* 80336A20 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 80336A24 7D 89 03 A6 */ mtctr r12 -/* 80336A28 4E 80 04 21 */ bctrl -/* 80336A2C 7F BD 1A 14 */ add r29, r29, r3 -/* 80336A30 48 00 00 2C */ b lbl_80336A5C -lbl_80336A34: -/* 80336A34 7F 23 CB 78 */ mr r3, r25 -/* 80336A38 7F 84 E3 78 */ mr r4, r28 -/* 80336A3C 48 00 05 B5 */ bl calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock -/* 80336A40 7F BD 1A 14 */ add r29, r29, r3 -/* 80336A44 3B 60 00 01 */ li r27, 1 -/* 80336A48 48 00 00 14 */ b lbl_80336A5C -lbl_80336A4C: -/* 80336A4C 3C 60 80 3A */ lis r3, J3DModelLoaderCalcSize__stringBase0@ha /* 0x803A20E8@ha */ -/* 80336A50 38 63 20 E8 */ addi r3, r3, J3DModelLoaderCalcSize__stringBase0@l /* 0x803A20E8@l */ -/* 80336A54 4C C6 31 82 */ crclr 6 -/* 80336A58 4B CD 00 65 */ bl OSReport -lbl_80336A5C: -/* 80336A5C 80 1C 00 04 */ lwz r0, 4(r28) -/* 80336A60 7F 9C 02 14 */ add r28, r28, r0 -/* 80336A64 3B 5A 00 01 */ addi r26, r26, 1 -lbl_80336A68: -/* 80336A68 7C 1A F8 40 */ cmplw r26, r31 -/* 80336A6C 41 80 FF 6C */ blt lbl_803369D8 -/* 80336A70 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80336A74 40 82 00 08 */ bne lbl_80336A7C -/* 80336A78 3B BD 00 0C */ addi r29, r29, 0xc -lbl_80336A7C: -/* 80336A7C 7F A3 EB 78 */ mr r3, r29 -/* 80336A80 39 61 00 30 */ addi r11, r1, 0x30 -/* 80336A84 48 02 B7 95 */ bl _restgpr_25 -/* 80336A88 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80336A8C 7C 08 03 A6 */ mtlr r0 -/* 80336A90 38 21 00 30 */ addi r1, r1, 0x30 -/* 80336A94 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock.s deleted file mode 100644 index c4caf4307b3..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80336DA0: -/* 80336DA0 A0 63 00 1A */ lhz r3, 0x1a(r3) -/* 80336DA4 A0 04 00 08 */ lhz r0, 8(r4) -/* 80336DA8 7C 03 00 50 */ subf r0, r3, r0 -/* 80336DAC 54 03 08 3C */ slwi r3, r0, 1 -/* 80336DB0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock.s deleted file mode 100644 index b919262a8d6..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80336D90: -/* 80336D90 A0 04 00 08 */ lhz r0, 8(r4) -/* 80336D94 B0 03 00 1A */ sth r0, 0x1a(r3) -/* 80336D98 38 60 00 00 */ li r3, 0 -/* 80336D9C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock.s deleted file mode 100644 index da654b2e8c7..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80336D64: -/* 80336D64 38 60 00 00 */ li r3, 0 -/* 80336D68 80 04 00 14 */ lwz r0, 0x14(r4) -/* 80336D6C 28 00 00 00 */ cmplwi r0, 0 -/* 80336D70 41 82 00 08 */ beq lbl_80336D78 -/* 80336D74 38 60 00 10 */ li r3, 0x10 -lbl_80336D78: -/* 80336D78 A0 84 00 08 */ lhz r4, 8(r4) -/* 80336D7C 54 80 10 3A */ slwi r0, r4, 2 -/* 80336D80 7C 63 02 14 */ add r3, r3, r0 -/* 80336D84 1C 04 00 5C */ mulli r0, r4, 0x5c -/* 80336D88 7C 63 02 14 */ add r3, r3, r0 -/* 80336D8C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl.s deleted file mode 100644 index 3bddb726305..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_803370A0: -/* 803370A0 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 803370A4 7C 08 02 A6 */ mflr r0 -/* 803370A8 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 803370AC 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 803370B0 48 02 B1 25 */ bl _savegpr_27 -/* 803370B4 7C 7B 1B 78 */ mr r27, r3 -/* 803370B8 7C 9C 23 78 */ mr r28, r4 -/* 803370BC 7C BF 2B 78 */ mr r31, r5 -/* 803370C0 3B C0 00 00 */ li r30, 0 -/* 803370C4 38 61 00 08 */ addi r3, r1, 8 -/* 803370C8 4B FF 91 6D */ bl __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock -/* 803370CC 88 1B 00 18 */ lbz r0, 0x18(r27) -/* 803370D0 28 00 00 00 */ cmplwi r0, 0 -/* 803370D4 40 82 00 54 */ bne lbl_80337128 -/* 803370D8 A3 BC 00 08 */ lhz r29, 8(r28) -/* 803370DC 80 1C 00 20 */ lwz r0, 0x20(r28) -/* 803370E0 28 00 00 00 */ cmplwi r0, 0 -/* 803370E4 41 82 00 08 */ beq lbl_803370EC -/* 803370E8 3B C0 00 10 */ li r30, 0x10 -lbl_803370EC: -/* 803370EC 57 A0 10 3A */ slwi r0, r29, 2 -/* 803370F0 7F DE 02 14 */ add r30, r30, r0 -/* 803370F4 3B 80 00 00 */ li r28, 0 -/* 803370F8 48 00 00 20 */ b lbl_80337118 -lbl_803370FC: -/* 803370FC 38 61 00 08 */ addi r3, r1, 8 -/* 80337100 38 80 00 00 */ li r4, 0 -/* 80337104 38 A0 00 01 */ li r5, 1 -/* 80337108 7F E7 FB 78 */ mr r7, r31 -/* 8033710C 4B FF A9 71 */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl -/* 80337110 7F DE 1A 14 */ add r30, r30, r3 -/* 80337114 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80337118: -/* 80337118 57 86 04 3E */ clrlwi r6, r28, 0x10 -/* 8033711C 7C 06 E8 40 */ cmplw r6, r29 -/* 80337120 41 80 FF DC */ blt lbl_803370FC -/* 80337124 48 00 00 38 */ b lbl_8033715C -lbl_80337128: -/* 80337128 A3 9C 00 08 */ lhz r28, 8(r28) -/* 8033712C 3B A0 00 00 */ li r29, 0 -/* 80337130 48 00 00 20 */ b lbl_80337150 -lbl_80337134: -/* 80337134 38 61 00 08 */ addi r3, r1, 8 -/* 80337138 7F 64 DB 78 */ mr r4, r27 -/* 8033713C 38 A0 00 01 */ li r5, 1 -/* 80337140 7F E7 FB 78 */ mr r7, r31 -/* 80337144 4B FF A9 39 */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl -/* 80337148 7F DE 1A 14 */ add r30, r30, r3 -/* 8033714C 3B BD 00 01 */ addi r29, r29, 1 -lbl_80337150: -/* 80337150 57 A6 04 3E */ clrlwi r6, r29, 0x10 -/* 80337154 7C 06 E0 40 */ cmplw r6, r28 -/* 80337158 41 80 FF DC */ blt lbl_80337134 -lbl_8033715C: -/* 8033715C 7F C3 F3 78 */ mr r3, r30 -/* 80337160 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80337164 48 02 B0 BD */ bl _restgpr_27 -/* 80337168 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 8033716C 7C 08 03 A6 */ mtlr r0 -/* 80337170 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80337174 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s deleted file mode 100644 index 1245df62a74..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80336F60: -/* 80336F60 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 80336F64 7C 08 02 A6 */ mflr r0 -/* 80336F68 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 80336F6C 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80336F70 48 02 B2 69 */ bl _savegpr_28 -/* 80336F74 7C 9D 23 78 */ mr r29, r4 -/* 80336F78 7C BC 2B 78 */ mr r28, r5 -/* 80336F7C 3B E0 00 00 */ li r31, 0 -/* 80336F80 A3 C4 00 08 */ lhz r30, 8(r4) -/* 80336F84 38 61 00 08 */ addi r3, r1, 8 -/* 80336F88 4B FF 90 65 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock -/* 80336F8C 80 1D 00 14 */ lwz r0, 0x14(r29) -/* 80336F90 28 00 00 00 */ cmplwi r0, 0 -/* 80336F94 41 82 00 08 */ beq lbl_80336F9C -/* 80336F98 3B E0 00 10 */ li r31, 0x10 -lbl_80336F9C: -/* 80336F9C 57 C0 10 3A */ slwi r0, r30, 2 -/* 80336FA0 7F FF 02 14 */ add r31, r31, r0 -/* 80336FA4 3B A0 00 00 */ li r29, 0 -/* 80336FA8 48 00 00 20 */ b lbl_80336FC8 -lbl_80336FAC: -/* 80336FAC 38 61 00 08 */ addi r3, r1, 8 -/* 80336FB0 38 80 00 00 */ li r4, 0 -/* 80336FB4 38 A0 00 00 */ li r5, 0 -/* 80336FB8 7F 87 E3 78 */ mr r7, r28 -/* 80336FBC 4B FF AA C1 */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl -/* 80336FC0 7F FF 1A 14 */ add r31, r31, r3 -/* 80336FC4 3B BD 00 01 */ addi r29, r29, 1 -lbl_80336FC8: -/* 80336FC8 57 A6 04 3E */ clrlwi r6, r29, 0x10 -/* 80336FCC 7C 06 F0 40 */ cmplw r6, r30 -/* 80336FD0 41 80 FF DC */ blt lbl_80336FAC -/* 80336FD4 7F E3 FB 78 */ mr r3, r31 -/* 80336FD8 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80336FDC 48 02 B2 49 */ bl _restgpr_28 -/* 80336FE0 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 80336FE4 7C 08 03 A6 */ mtlr r0 -/* 80336FE8 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80336FEC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s deleted file mode 100644 index c0abb0bdd47..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_80336DB4: -/* 80336DB4 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 80336DB8 7C 08 02 A6 */ mflr r0 -/* 80336DBC 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 80336DC0 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80336DC4 48 02 B4 11 */ bl _savegpr_27 -/* 80336DC8 7C 9C 23 78 */ mr r28, r4 -/* 80336DCC 7C BB 2B 78 */ mr r27, r5 -/* 80336DD0 3B E0 00 00 */ li r31, 0 -/* 80336DD4 38 61 00 08 */ addi r3, r1, 8 -/* 80336DD8 4B FF 92 15 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock -/* 80336DDC A3 DC 00 08 */ lhz r30, 8(r28) -/* 80336DE0 38 61 00 08 */ addi r3, r1, 8 -/* 80336DE4 4B FF 94 D9 */ bl countUniqueMaterials__18J3DMaterialFactoryFv -/* 80336DE8 54 7D 04 3E */ clrlwi r29, r3, 0x10 -/* 80336DEC 80 1C 00 14 */ lwz r0, 0x14(r28) -/* 80336DF0 28 00 00 00 */ cmplwi r0, 0 -/* 80336DF4 41 82 00 08 */ beq lbl_80336DFC -/* 80336DF8 3B E0 00 10 */ li r31, 0x10 -lbl_80336DFC: -/* 80336DFC 57 C0 10 3A */ slwi r0, r30, 2 -/* 80336E00 7F FF 02 14 */ add r31, r31, r0 -/* 80336E04 57 64 02 95 */ rlwinm. r4, r27, 0, 0xa, 0xa -/* 80336E08 41 82 00 14 */ beq lbl_80336E1C -/* 80336E0C 1C 7D 00 4C */ mulli r3, r29, 0x4c -/* 80336E10 38 03 00 1F */ addi r0, r3, 0x1f -/* 80336E14 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a -/* 80336E18 7F FF 02 14 */ add r31, r31, r0 -lbl_80336E1C: -/* 80336E1C 28 04 00 00 */ cmplwi r4, 0 -/* 80336E20 41 82 00 34 */ beq lbl_80336E54 -/* 80336E24 3B 80 00 00 */ li r28, 0 -/* 80336E28 48 00 00 24 */ b lbl_80336E4C -lbl_80336E2C: -/* 80336E2C 38 61 00 08 */ addi r3, r1, 8 -/* 80336E30 38 80 00 00 */ li r4, 0 -/* 80336E34 38 A0 00 00 */ li r5, 0 -/* 80336E38 7F 86 E3 78 */ mr r6, r28 -/* 80336E3C 7F 67 DB 78 */ mr r7, r27 -/* 80336E40 4B FF AC 3D */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl -/* 80336E44 7F FF 1A 14 */ add r31, r31, r3 -/* 80336E48 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80336E4C: -/* 80336E4C 7C 1C E8 40 */ cmplw r28, r29 -/* 80336E50 41 80 FF DC */ blt lbl_80336E2C -lbl_80336E54: -/* 80336E54 3B 80 00 00 */ li r28, 0 -/* 80336E58 48 00 00 24 */ b lbl_80336E7C -lbl_80336E5C: -/* 80336E5C 38 61 00 08 */ addi r3, r1, 8 -/* 80336E60 38 80 00 00 */ li r4, 0 -/* 80336E64 38 A0 00 00 */ li r5, 0 -/* 80336E68 7F 86 E3 78 */ mr r6, r28 -/* 80336E6C 7F 67 DB 78 */ mr r7, r27 -/* 80336E70 4B FF AC 0D */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl -/* 80336E74 7F FF 1A 14 */ add r31, r31, r3 -/* 80336E78 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80336E7C: -/* 80336E7C 7C 1C F0 40 */ cmplw r28, r30 -/* 80336E80 41 80 FF DC */ blt lbl_80336E5C -/* 80336E84 7F E3 FB 78 */ mr r3, r31 -/* 80336E88 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80336E8C 48 02 B3 95 */ bl _restgpr_27 -/* 80336E90 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 80336E94 7C 08 03 A6 */ mtlr r0 -/* 80336E98 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80336E9C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl.s deleted file mode 100644 index 0a214931890..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80337010: -/* 80337010 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 80337014 7C 08 02 A6 */ mflr r0 -/* 80337018 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 8033701C 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80337020 48 02 B1 B9 */ bl _savegpr_28 -/* 80337024 7C 9D 23 78 */ mr r29, r4 -/* 80337028 7C BC 2B 78 */ mr r28, r5 -/* 8033702C 3B E0 00 00 */ li r31, 0 -/* 80337030 A3 C4 00 08 */ lhz r30, 8(r4) -/* 80337034 38 61 00 08 */ addi r3, r1, 8 -/* 80337038 4B FF 8F B5 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock -/* 8033703C 80 1D 00 14 */ lwz r0, 0x14(r29) -/* 80337040 28 00 00 00 */ cmplwi r0, 0 -/* 80337044 41 82 00 08 */ beq lbl_8033704C -/* 80337048 3B E0 00 10 */ li r31, 0x10 -lbl_8033704C: -/* 8033704C 57 C0 10 3A */ slwi r0, r30, 2 -/* 80337050 7F FF 02 14 */ add r31, r31, r0 -/* 80337054 3B A0 00 00 */ li r29, 0 -/* 80337058 48 00 00 20 */ b lbl_80337078 -lbl_8033705C: -/* 8033705C 38 61 00 08 */ addi r3, r1, 8 -/* 80337060 38 80 00 00 */ li r4, 0 -/* 80337064 38 A0 00 02 */ li r5, 2 -/* 80337068 7F 87 E3 78 */ mr r7, r28 -/* 8033706C 4B FF AA 11 */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl -/* 80337070 7F FF 1A 14 */ add r31, r31, r3 -/* 80337074 3B BD 00 01 */ addi r29, r29, 1 -lbl_80337078: -/* 80337078 57 A6 04 3E */ clrlwi r6, r29, 0x10 -/* 8033707C 7C 06 F0 40 */ cmplw r6, r30 -/* 80337080 41 80 FF DC */ blt lbl_8033705C -/* 80337084 7F E3 FB 78 */ mr r3, r31 -/* 80337088 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8033708C 48 02 B1 99 */ bl _restgpr_28 -/* 80337090 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 80337094 7C 08 03 A6 */ mtlr r0 -/* 80337098 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8033709C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl.s deleted file mode 100644 index 7d80607dc59..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80336EA0: -/* 80336EA0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80336EA4 7C 08 02 A6 */ mflr r0 -/* 80336EA8 90 01 00 44 */ stw r0, 0x44(r1) -/* 80336EAC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80336EB0 48 02 B3 29 */ bl _savegpr_28 -/* 80336EB4 7C 7C 1B 78 */ mr r28, r3 -/* 80336EB8 7C 9E 23 78 */ mr r30, r4 -/* 80336EBC 7C BD 2B 78 */ mr r29, r5 -/* 80336EC0 3B E0 00 00 */ li r31, 0 -/* 80336EC4 38 61 00 08 */ addi r3, r1, 8 -/* 80336EC8 48 00 04 89 */ bl __ct__15J3DShapeFactoryFRC13J3DShapeBlock -/* 80336ECC A0 9E 00 08 */ lhz r4, 8(r30) -/* 80336ED0 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 80336ED4 28 00 00 00 */ cmplwi r0, 0 -/* 80336ED8 41 82 00 08 */ beq lbl_80336EE0 -/* 80336EDC 3B E0 00 10 */ li r31, 0x10 -lbl_80336EE0: -/* 80336EE0 54 80 10 3A */ slwi r0, r4, 2 -/* 80336EE4 7F FF 02 14 */ add r31, r31, r0 -/* 80336EE8 38 61 00 08 */ addi r3, r1, 8 -/* 80336EEC 48 00 0A ED */ bl calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl -/* 80336EF0 7F FF 1A 14 */ add r31, r31, r3 -/* 80336EF4 83 DC 00 14 */ lwz r30, 0x14(r28) -/* 80336EF8 48 00 00 24 */ b lbl_80336F1C -lbl_80336EFC: -/* 80336EFC 28 00 00 12 */ cmplwi r0, 0x12 -/* 80336F00 40 82 00 18 */ bne lbl_80336F18 -/* 80336F04 38 61 00 08 */ addi r3, r1, 8 -/* 80336F08 A0 9E 00 02 */ lhz r4, 2(r30) -/* 80336F0C 7F A5 EB 78 */ mr r5, r29 -/* 80336F10 48 00 0A 35 */ bl calcSize__15J3DShapeFactoryFiUl -/* 80336F14 7F FF 1A 14 */ add r31, r31, r3 -lbl_80336F18: -/* 80336F18 3B DE 00 04 */ addi r30, r30, 4 -lbl_80336F1C: -/* 80336F1C A0 1E 00 00 */ lhz r0, 0(r30) -/* 80336F20 28 00 00 00 */ cmplwi r0, 0 -/* 80336F24 40 82 FF D8 */ bne lbl_80336EFC -/* 80336F28 7F E3 FB 78 */ mr r3, r31 -/* 80336F2C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80336F30 48 02 B2 F5 */ bl _restgpr_28 -/* 80336F34 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80336F38 7C 08 03 A6 */ mtlr r0 -/* 80336F3C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80336F40 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock.s deleted file mode 100644 index a4a7e398ed9..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80336FF0: -/* 80336FF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80336FF4 7C 08 02 A6 */ mflr r0 -/* 80336FF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80336FFC 4B FF FF 49 */ bl calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock -/* 80337000 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80337004 7C 08 03 A6 */ mtlr r0 -/* 80337008 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033700C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock.s deleted file mode 100644 index af76fbbb682..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80336F44: -/* 80336F44 38 60 00 00 */ li r3, 0 -/* 80336F48 80 04 00 10 */ lwz r0, 0x10(r4) -/* 80336F4C 28 00 00 00 */ cmplwi r0, 0 -/* 80336F50 41 82 00 08 */ beq lbl_80336F58 -/* 80336F54 38 60 00 10 */ li r3, 0x10 -lbl_80336F58: -/* 80336F58 38 63 00 0C */ addi r3, r3, 0xc -/* 80336F5C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/countMaterialNum__14J3DModelLoaderFPCv.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/countMaterialNum__14J3DModelLoaderFPCv.s deleted file mode 100644 index de1b25b0ade..00000000000 --- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/countMaterialNum__14J3DModelLoaderFPCv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80336794: -/* 80336794 38 A4 00 20 */ addi r5, r4, 0x20 -/* 80336798 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8033679C 7C 09 03 A6 */ mtctr r0 -/* 803367A0 28 00 00 00 */ cmplwi r0, 0 -/* 803367A4 40 81 00 28 */ ble lbl_803367CC -lbl_803367A8: -/* 803367A8 80 65 00 00 */ lwz r3, 0(r5) -/* 803367AC 3C 03 B2 BF */ addis r0, r3, 0xb2bf -/* 803367B0 28 00 54 33 */ cmplwi r0, 0x5433 -/* 803367B4 40 82 00 0C */ bne lbl_803367C0 -/* 803367B8 A0 65 00 08 */ lhz r3, 8(r5) -/* 803367BC 4E 80 00 20 */ blr -lbl_803367C0: -/* 803367C0 80 05 00 04 */ lwz r0, 4(r5) -/* 803367C4 7C A5 02 14 */ add r5, r5, r0 -/* 803367C8 42 00 FF E0 */ bdnz lbl_803367A8 -lbl_803367CC: -/* 803367CC 38 60 00 00 */ li r3, 0 -/* 803367D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/CreateHeap__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/CreateHeap__10daRfHole_cFv.s deleted file mode 100644 index 3c920ca4d23..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/CreateHeap__10daRfHole_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80CB8F8C: -/* 80CB8F8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8F90 7C 08 02 A6 */ mflr r0 -/* 80CB8F94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8F98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8F9C 7C 7F 1B 78 */ mr r31, r3 -/* 80CB8FA0 3C 60 80 CC */ lis r3, d_a_obj_rfHole__stringBase0@ha /* 0x80CB9AC0@ha */ -/* 80CB8FA4 38 63 9A C0 */ addi r3, r3, d_a_obj_rfHole__stringBase0@l /* 0x80CB9AC0@l */ -/* 80CB8FA8 38 80 00 04 */ li r4, 4 -/* 80CB8FAC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB8FB0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB8FB4 3C A5 00 02 */ addis r5, r5, 2 -/* 80CB8FB8 38 C0 00 80 */ li r6, 0x80 -/* 80CB8FBC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80CB8FC0 4B 38 33 2D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CB8FC4 3C 80 00 08 */ lis r4, 8 -/* 80CB8FC8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CB8FCC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CB8FD0 4B 35 BC 85 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CB8FD4 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80CB8FD8 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CB8FDC 30 03 FF FF */ addic r0, r3, -1 -/* 80CB8FE0 7C 60 19 10 */ subfe r3, r0, r3 -/* 80CB8FE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB8FE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8FEC 7C 08 03 A6 */ mtlr r0 -/* 80CB8FF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8FF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Delete__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Delete__10daRfHole_cFv.s deleted file mode 100644 index 0dafed24e67..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Delete__10daRfHole_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80CB991C: -/* 80CB991C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB9920 7C 08 02 A6 */ mflr r0 -/* 80CB9924 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9928 3C 80 80 CC */ lis r4, d_a_obj_rfHole__stringBase0@ha /* 0x80CB9AC0@ha */ -/* 80CB992C 38 84 9A C0 */ addi r4, r4, d_a_obj_rfHole__stringBase0@l /* 0x80CB9AC0@l */ -/* 80CB9930 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80CB9934 4B 37 36 D5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CB9938 38 60 00 01 */ li r3, 1 -/* 80CB993C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9940 7C 08 03 A6 */ mtlr r0 -/* 80CB9944 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9948 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Draw__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Draw__10daRfHole_cFv.s deleted file mode 100644 index 293332febbe..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Draw__10daRfHole_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80CB9878: -/* 80CB9878 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB987C 7C 08 02 A6 */ mflr r0 -/* 80CB9880 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9884 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB9888 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB988C 7C 7E 1B 78 */ mr r30, r3 -/* 80CB9890 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CB9894 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CB9898 38 80 00 10 */ li r4, 0x10 -/* 80CB989C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CB98A0 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CB98A4 4B 4E 9F 21 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CB98A8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CB98AC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CB98B0 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80CB98B4 80 84 00 04 */ lwz r4, 4(r4) -/* 80CB98B8 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CB98BC 4B 4E B4 E5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CB98C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB98C4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB98C8 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80CB98CC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80CB98D0 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80CB98D4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CB98D8 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80CB98DC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CB98E0 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80CB98E4 4B 35 43 E1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CB98E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB98EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB98F0 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80CB98F4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CB98F8 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80CB98FC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CB9900 38 60 00 01 */ li r3, 1 -/* 80CB9904 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB9908 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB990C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9910 7C 08 03 A6 */ mtlr r0 -/* 80CB9914 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9918 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Execute__10daRfHole_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Execute__10daRfHole_cFPPA3_A4_f.s deleted file mode 100644 index c08495d7d68..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Execute__10daRfHole_cFPPA3_A4_f.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80CB940C: -/* 80CB940C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB9410 7C 08 02 A6 */ mflr r0 -/* 80CB9414 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9418 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB941C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB9420 7C 7E 1B 78 */ mr r30, r3 -/* 80CB9424 7C 9F 23 78 */ mr r31, r4 -/* 80CB9428 48 00 00 3D */ bl holeProc__10daRfHole_cFv -/* 80CB942C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80CB9430 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CB9434 90 1F 00 00 */ stw r0, 0(r31) -/* 80CB9438 7F C3 F3 78 */ mr r3, r30 -/* 80CB943C 4B FF FA C9 */ bl setBaseMtx__10daRfHole_cFv -/* 80CB9440 38 00 00 00 */ li r0, 0 -/* 80CB9444 98 1E 05 AE */ stb r0, 0x5ae(r30) -/* 80CB9448 38 60 00 01 */ li r3, 1 -/* 80CB944C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB9450 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB9454 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9458 7C 08 03 A6 */ mtlr r0 -/* 80CB945C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9460 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__ct__14daRfHole_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__ct__14daRfHole_HIO_cFv.s deleted file mode 100644 index 82b995aed13..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__ct__14daRfHole_HIO_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80CB8E6C: -/* 80CB8E6C 3C 80 80 CC */ lis r4, lit_3649@ha /* 0x80CB9A84@ha */ -/* 80CB8E70 38 A4 9A 84 */ addi r5, r4, lit_3649@l /* 0x80CB9A84@l */ -/* 80CB8E74 3C 80 80 CC */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80CB9BD0@ha */ -/* 80CB8E78 38 04 9B D0 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80CB9BD0@l */ -/* 80CB8E7C 90 03 00 00 */ stw r0, 0(r3) -/* 80CB8E80 3C 80 80 CC */ lis r4, __vt__14daRfHole_HIO_c@ha /* 0x80CB9BC4@ha */ -/* 80CB8E84 38 04 9B C4 */ addi r0, r4, __vt__14daRfHole_HIO_c@l /* 0x80CB9BC4@l */ -/* 80CB8E88 90 03 00 00 */ stw r0, 0(r3) -/* 80CB8E8C C0 05 00 00 */ lfs f0, 0(r5) -/* 80CB8E90 D0 03 00 04 */ stfs f0, 4(r3) -/* 80CB8E94 C0 25 00 04 */ lfs f1, 4(r5) -/* 80CB8E98 D0 23 00 08 */ stfs f1, 8(r3) -/* 80CB8E9C C0 05 00 08 */ lfs f0, 8(r5) -/* 80CB8EA0 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80CB8EA4 D0 23 00 0C */ stfs f1, 0xc(r3) -/* 80CB8EA8 38 00 00 0A */ li r0, 0xa -/* 80CB8EAC 98 03 00 14 */ stb r0, 0x14(r3) -/* 80CB8EB0 38 00 00 04 */ li r0, 4 -/* 80CB8EB4 98 03 00 15 */ stb r0, 0x15(r3) -/* 80CB8EB8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__dt__14daRfHole_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__dt__14daRfHole_HIO_cFv.s deleted file mode 100644 index f6fe6690b81..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__dt__14daRfHole_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CB99D8: -/* 80CB99D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB99DC 7C 08 02 A6 */ mflr r0 -/* 80CB99E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB99E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB99E8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CB99EC 41 82 00 30 */ beq lbl_80CB9A1C -/* 80CB99F0 3C 60 80 CC */ lis r3, __vt__14daRfHole_HIO_c@ha /* 0x80CB9BC4@ha */ -/* 80CB99F4 38 03 9B C4 */ addi r0, r3, __vt__14daRfHole_HIO_c@l /* 0x80CB9BC4@l */ -/* 80CB99F8 90 1F 00 00 */ stw r0, 0(r31) -/* 80CB99FC 41 82 00 10 */ beq lbl_80CB9A0C -/* 80CB9A00 3C 60 80 CC */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80CB9BD0@ha */ -/* 80CB9A04 38 03 9B D0 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80CB9BD0@l */ -/* 80CB9A08 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CB9A0C: -/* 80CB9A0C 7C 80 07 35 */ extsh. r0, r4 -/* 80CB9A10 40 81 00 0C */ ble lbl_80CB9A1C -/* 80CB9A14 7F E3 FB 78 */ mr r3, r31 -/* 80CB9A18 4B 61 53 25 */ bl __dl__FPv -lbl_80CB9A1C: -/* 80CB9A1C 7F E3 FB 78 */ mr r3, r31 -/* 80CB9A20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB9A24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9A28 7C 08 03 A6 */ mtlr r0 -/* 80CB9A2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9A30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index bad684b141d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CB8EBC: -/* 80CB8EBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8EC0 7C 08 02 A6 */ mflr r0 -/* 80CB8EC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8EC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8ECC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CB8ED0 41 82 00 1C */ beq lbl_80CB8EEC -/* 80CB8ED4 3C A0 80 CC */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80CB9BD0@ha */ -/* 80CB8ED8 38 05 9B D0 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80CB9BD0@l */ -/* 80CB8EDC 90 1F 00 00 */ stw r0, 0(r31) -/* 80CB8EE0 7C 80 07 35 */ extsh. r0, r4 -/* 80CB8EE4 40 81 00 08 */ ble lbl_80CB8EEC -/* 80CB8EE8 4B 61 5E 55 */ bl __dl__FPv -lbl_80CB8EEC: -/* 80CB8EEC 7F E3 FB 78 */ mr r3, r31 -/* 80CB8EF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB8EF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8EF8 7C 08 03 A6 */ mtlr r0 -/* 80CB8EFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8F00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__sinit_d_a_obj_rfHole_cpp.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__sinit_d_a_obj_rfHole_cpp.s deleted file mode 100644 index 4b7c6f2bd75..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__sinit_d_a_obj_rfHole_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80CB9A34: -/* 80CB9A34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB9A38 7C 08 02 A6 */ mflr r0 -/* 80CB9A3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9A40 3C 60 80 CC */ lis r3, l_HIO@ha /* 0x80CB9BF4@ha */ -/* 80CB9A44 38 63 9B F4 */ addi r3, r3, l_HIO@l /* 0x80CB9BF4@l */ -/* 80CB9A48 4B FF F4 25 */ bl __ct__14daRfHole_HIO_cFv -/* 80CB9A4C 3C 80 80 CC */ lis r4, __dt__14daRfHole_HIO_cFv@ha /* 0x80CB99D8@ha */ -/* 80CB9A50 38 84 99 D8 */ addi r4, r4, __dt__14daRfHole_HIO_cFv@l /* 0x80CB99D8@l */ -/* 80CB9A54 3C A0 80 CC */ lis r5, lit_3643@ha /* 0x80CB9BE8@ha */ -/* 80CB9A58 38 A5 9B E8 */ addi r5, r5, lit_3643@l /* 0x80CB9BE8@l */ -/* 80CB9A5C 4B FF F3 9D */ bl __register_global_object -/* 80CB9A60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9A64 7C 08 03 A6 */ mtlr r0 -/* 80CB9A68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9A6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/create__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/create__10daRfHole_cFv.s deleted file mode 100644 index abc8c6aae02..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/create__10daRfHole_cFv.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_80CB8FF8: -/* 80CB8FF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8FFC 7C 08 02 A6 */ mflr r0 -/* 80CB9000 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9004 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB9008 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB900C 7C 7E 1B 78 */ mr r30, r3 -/* 80CB9010 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CB9014 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CB9018 40 82 00 28 */ bne lbl_80CB9040 -/* 80CB901C 28 1E 00 00 */ cmplwi r30, 0 -/* 80CB9020 41 82 00 14 */ beq lbl_80CB9034 -/* 80CB9024 4B 3B F6 01 */ bl __ct__16dBgS_MoveBgActorFv -/* 80CB9028 3C 60 80 CC */ lis r3, __vt__10daRfHole_c@ha /* 0x80CB9B9C@ha */ -/* 80CB902C 38 03 9B 9C */ addi r0, r3, __vt__10daRfHole_c@l /* 0x80CB9B9C@l */ -/* 80CB9030 90 1E 05 9C */ stw r0, 0x59c(r30) -lbl_80CB9034: -/* 80CB9034 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80CB9038 60 00 00 08 */ ori r0, r0, 8 -/* 80CB903C 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80CB9040: -/* 80CB9040 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 80CB9044 3C 80 80 CC */ lis r4, d_a_obj_rfHole__stringBase0@ha /* 0x80CB9AC0@ha */ -/* 80CB9048 38 84 9A C0 */ addi r4, r4, d_a_obj_rfHole__stringBase0@l /* 0x80CB9AC0@l */ -/* 80CB904C 4B 37 3E 71 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CB9050 7C 7F 1B 78 */ mr r31, r3 -/* 80CB9054 2C 1F 00 04 */ cmpwi r31, 4 -/* 80CB9058 40 82 00 D4 */ bne lbl_80CB912C -/* 80CB905C 7F C3 F3 78 */ mr r3, r30 -/* 80CB9060 3C 80 80 CC */ lis r4, d_a_obj_rfHole__stringBase0@ha /* 0x80CB9AC0@ha */ -/* 80CB9064 38 84 9A C0 */ addi r4, r4, d_a_obj_rfHole__stringBase0@l /* 0x80CB9AC0@l */ -/* 80CB9068 38 A0 00 07 */ li r5, 7 -/* 80CB906C 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80CB9070 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80CB9074 38 E0 0B 40 */ li r7, 0xb40 -/* 80CB9078 39 00 00 00 */ li r8, 0 -/* 80CB907C 4B 3B F7 41 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80CB9080 2C 03 00 05 */ cmpwi r3, 5 -/* 80CB9084 40 82 00 0C */ bne lbl_80CB9090 -/* 80CB9088 38 60 00 05 */ li r3, 5 -/* 80CB908C 48 00 00 A4 */ b lbl_80CB9130 -lbl_80CB9090: -/* 80CB9090 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80CB9094 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CB9098 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80CB909C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80CB90A0 80 83 00 04 */ lwz r4, 4(r3) -/* 80CB90A4 7F C3 F3 78 */ mr r3, r30 -/* 80CB90A8 4B 36 14 D1 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80CB90AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB90B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB90B4 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80CB90B8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CB90BC 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80CB90C0 7C 05 07 74 */ extsb r5, r0 -/* 80CB90C4 4B 37 C2 9D */ bl isSwitch__10dSv_info_cCFii -/* 80CB90C8 2C 03 00 00 */ cmpwi r3, 0 -/* 80CB90CC 41 82 00 10 */ beq lbl_80CB90DC -/* 80CB90D0 7F C3 F3 78 */ mr r3, r30 -/* 80CB90D4 48 00 06 69 */ bl init_modeEnd__10daRfHole_cFv -/* 80CB90D8 48 00 00 40 */ b lbl_80CB9118 -lbl_80CB90DC: -/* 80CB90DC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80CB90E0 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80CB90E4 98 1E 05 AD */ stb r0, 0x5ad(r30) -/* 80CB90E8 88 1E 05 AD */ lbz r0, 0x5ad(r30) -/* 80CB90EC 28 00 00 01 */ cmplwi r0, 1 -/* 80CB90F0 41 82 00 20 */ beq lbl_80CB9110 -/* 80CB90F4 3C 60 80 CC */ lis r3, rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c@ha /* 0x80CB9148@ha */ -/* 80CB90F8 38 03 91 48 */ addi r0, r3, rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c@l /* 0x80CB9148@l */ -/* 80CB90FC 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80CB9100 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 80CB9104 7F C3 F3 78 */ mr r3, r30 -/* 80CB9108 48 00 04 19 */ bl init_modeWait__10daRfHole_cFv -/* 80CB910C 48 00 00 0C */ b lbl_80CB9118 -lbl_80CB9110: -/* 80CB9110 7F C3 F3 78 */ mr r3, r30 -/* 80CB9114 48 00 05 B9 */ bl init_modeBreakEff__10daRfHole_cFv -lbl_80CB9118: -/* 80CB9118 38 00 00 00 */ li r0, 0 -/* 80CB911C 98 1E 05 AE */ stb r0, 0x5ae(r30) -/* 80CB9120 98 1E 05 B0 */ stb r0, 0x5b0(r30) -/* 80CB9124 7F C3 F3 78 */ mr r3, r30 -/* 80CB9128 4B FF FD DD */ bl setBaseMtx__10daRfHole_cFv -lbl_80CB912C: -/* 80CB912C 7F E3 FB 78 */ mr r3, r31 -lbl_80CB9130: -/* 80CB9130 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB9134 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB9138 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB913C 7C 08 03 A6 */ mtlr r0 -/* 80CB9140 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9144 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Create__FP10fopAc_ac_c.s deleted file mode 100644 index d1e33d5af62..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB99B8: -/* 80CB99B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB99BC 7C 08 02 A6 */ mflr r0 -/* 80CB99C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB99C4 4B FF F6 35 */ bl create__10daRfHole_cFv -/* 80CB99C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB99CC 7C 08 03 A6 */ mtlr r0 -/* 80CB99D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB99D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Delete__FP10daRfHole_c.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Delete__FP10daRfHole_c.s deleted file mode 100644 index 95a287d6cbd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Delete__FP10daRfHole_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB9998: -/* 80CB9998 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB999C 7C 08 02 A6 */ mflr r0 -/* 80CB99A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB99A4 4B 3B EF 39 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80CB99A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB99AC 7C 08 03 A6 */ mtlr r0 -/* 80CB99B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB99B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Draw__FP10daRfHole_c.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Draw__FP10daRfHole_c.s deleted file mode 100644 index ddb79cc3c02..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Draw__FP10daRfHole_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80CB994C: -/* 80CB994C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB9950 7C 08 02 A6 */ mflr r0 -/* 80CB9954 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9958 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80CB995C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80CB9960 7D 89 03 A6 */ mtctr r12 -/* 80CB9964 4E 80 04 21 */ bctrl -/* 80CB9968 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB996C 7C 08 03 A6 */ mtlr r0 -/* 80CB9970 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9974 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Execute__FP10daRfHole_c.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Execute__FP10daRfHole_c.s deleted file mode 100644 index c90691263a4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Execute__FP10daRfHole_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB9978: -/* 80CB9978 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB997C 7C 08 02 A6 */ mflr r0 -/* 80CB9980 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9984 4B 3B EF CD */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80CB9988 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB998C 7C 08 03 A6 */ mtlr r0 -/* 80CB9990 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9994 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/holeProc__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/holeProc__10daRfHole_cFv.s deleted file mode 100644 index 3dbf00a4297..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/holeProc__10daRfHole_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80CB9464: -/* 80CB9464 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB9468 7C 08 02 A6 */ mflr r0 -/* 80CB946C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9470 3C 80 80 CC */ lis r4, cNullVec__6Z2Calc@ha /* 0x80CB9ACC@ha */ -/* 80CB9474 38 E4 9A CC */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80CB9ACC@l */ -/* 80CB9478 3C 80 80 CC */ lis r4, data_80CB9C0C@ha /* 0x80CB9C0C@ha */ -/* 80CB947C 38 C4 9C 0C */ addi r6, r4, data_80CB9C0C@l /* 0x80CB9C0C@l */ -/* 80CB9480 88 06 00 00 */ lbz r0, 0(r6) -/* 80CB9484 7C 00 07 75 */ extsb. r0, r0 -/* 80CB9488 40 82 00 70 */ bne lbl_80CB94F8 -/* 80CB948C 80 87 00 20 */ lwz r4, 0x20(r7) -/* 80CB9490 80 07 00 24 */ lwz r0, 0x24(r7) -/* 80CB9494 90 87 00 50 */ stw r4, 0x50(r7) -/* 80CB9498 90 07 00 54 */ stw r0, 0x54(r7) -/* 80CB949C 80 07 00 28 */ lwz r0, 0x28(r7) -/* 80CB94A0 90 07 00 58 */ stw r0, 0x58(r7) -/* 80CB94A4 38 A7 00 50 */ addi r5, r7, 0x50 -/* 80CB94A8 80 87 00 2C */ lwz r4, 0x2c(r7) -/* 80CB94AC 80 07 00 30 */ lwz r0, 0x30(r7) -/* 80CB94B0 90 85 00 0C */ stw r4, 0xc(r5) -/* 80CB94B4 90 05 00 10 */ stw r0, 0x10(r5) -/* 80CB94B8 80 07 00 34 */ lwz r0, 0x34(r7) -/* 80CB94BC 90 05 00 14 */ stw r0, 0x14(r5) -/* 80CB94C0 80 87 00 38 */ lwz r4, 0x38(r7) -/* 80CB94C4 80 07 00 3C */ lwz r0, 0x3c(r7) -/* 80CB94C8 90 85 00 18 */ stw r4, 0x18(r5) -/* 80CB94CC 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80CB94D0 80 07 00 40 */ lwz r0, 0x40(r7) -/* 80CB94D4 90 05 00 20 */ stw r0, 0x20(r5) -/* 80CB94D8 80 87 00 44 */ lwz r4, 0x44(r7) -/* 80CB94DC 80 07 00 48 */ lwz r0, 0x48(r7) -/* 80CB94E0 90 85 00 24 */ stw r4, 0x24(r5) -/* 80CB94E4 90 05 00 28 */ stw r0, 0x28(r5) -/* 80CB94E8 80 07 00 4C */ lwz r0, 0x4c(r7) -/* 80CB94EC 90 05 00 2C */ stw r0, 0x2c(r5) -/* 80CB94F0 38 00 00 01 */ li r0, 1 -/* 80CB94F4 98 06 00 00 */ stb r0, 0(r6) -lbl_80CB94F8: -/* 80CB94F8 88 03 05 AC */ lbz r0, 0x5ac(r3) -/* 80CB94FC 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80CB9500 39 87 00 50 */ addi r12, r7, 0x50 -/* 80CB9504 7D 8C 02 14 */ add r12, r12, r0 -/* 80CB9508 4B 6A 8B 7D */ bl __ptmf_scall -/* 80CB950C 60 00 00 00 */ nop -/* 80CB9510 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9514 7C 08 03 A6 */ mtlr r0 -/* 80CB9518 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB951C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeBreakEff__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeBreakEff__10daRfHole_cFv.s deleted file mode 100644 index 01d31e9a279..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeBreakEff__10daRfHole_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80CB96CC: -/* 80CB96CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB96D0 7C 08 02 A6 */ mflr r0 -/* 80CB96D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB96D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB96DC 7C 7F 1B 78 */ mr r31, r3 -/* 80CB96E0 48 00 00 89 */ bl setBreakEffect__10daRfHole_cFv -/* 80CB96E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB96E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB96EC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CB96F0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CB96F4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CB96F8 7C 05 07 74 */ extsb r5, r0 -/* 80CB96FC 4B 37 BB 05 */ bl onSwitch__10dSv_info_cFii -/* 80CB9700 38 00 00 02 */ li r0, 2 -/* 80CB9704 98 1F 05 AC */ stb r0, 0x5ac(r31) -/* 80CB9708 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB970C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9710 7C 08 03 A6 */ mtlr r0 -/* 80CB9714 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9718 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeBreak__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeBreak__10daRfHole_cFv.s deleted file mode 100644 index 3278e241b2d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeBreak__10daRfHole_cFv.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_80CB9558: -/* 80CB9558 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80CB955C 7C 08 02 A6 */ mflr r0 -/* 80CB9560 90 01 00 54 */ stw r0, 0x54(r1) -/* 80CB9564 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 80CB9568 93 C1 00 48 */ stw r30, 0x48(r1) -/* 80CB956C 7C 7E 1B 78 */ mr r30, r3 -/* 80CB9570 3C 80 80 CC */ lis r4, lit_3649@ha /* 0x80CB9A84@ha */ -/* 80CB9574 3B E4 9A 84 */ addi r31, r4, lit_3649@l /* 0x80CB9A84@l */ -/* 80CB9578 48 00 01 F1 */ bl setBreakEffect__10daRfHole_cFv -/* 80CB957C C0 3F 00 08 */ lfs f1, 8(r31) -/* 80CB9580 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80CB9584 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 80CB9588 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80CB958C D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80CB9590 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB9594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB9598 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80CB959C 3C 80 80 CC */ lis r4, l_HIO@ha /* 0x80CB9BF4@ha */ -/* 80CB95A0 38 84 9B F4 */ addi r4, r4, l_HIO@l /* 0x80CB9BF4@l */ -/* 80CB95A4 88 84 00 15 */ lbz r4, 0x15(r4) -/* 80CB95A8 38 A0 00 0F */ li r5, 0xf -/* 80CB95AC 38 C1 00 18 */ addi r6, r1, 0x18 -/* 80CB95B0 4B 3B 64 75 */ bl StartShock__12dVibration_cFii4cXyz -/* 80CB95B4 3C 60 80 CC */ lis r3, l_HIO@ha /* 0x80CB9BF4@ha */ -/* 80CB95B8 38 63 9B F4 */ addi r3, r3, l_HIO@l /* 0x80CB9BF4@l */ -/* 80CB95BC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80CB95C0 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CB95C4 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80CB95C8 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CB95CC D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80CB95D0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB95D4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB95D8 A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 80CB95DC A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 80CB95E0 A8 DE 04 E8 */ lha r6, 0x4e8(r30) -/* 80CB95E4 4B 35 2C 25 */ bl mDoMtx_ZXYrotS__FPA4_fsss -/* 80CB95E8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB95EC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB95F0 38 81 00 30 */ addi r4, r1, 0x30 -/* 80CB95F4 7C 85 23 78 */ mr r5, r4 -/* 80CB95F8 4B 68 D7 75 */ bl PSMTXMultVec -/* 80CB95FC 38 61 00 0C */ addi r3, r1, 0xc -/* 80CB9600 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CB9604 38 A1 00 30 */ addi r5, r1, 0x30 -/* 80CB9608 4B 5A D4 DD */ bl __pl__4cXyzCFRC3Vec -/* 80CB960C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80CB9610 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80CB9614 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80CB9618 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CB961C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80CB9620 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CB9624 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80CB9628 7C 03 07 74 */ extsb r3, r0 -/* 80CB962C 4B 37 3A 41 */ bl dComIfGp_getReverb__Fi -/* 80CB9630 7C 67 1B 78 */ mr r7, r3 -/* 80CB9634 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008010F@ha */ -/* 80CB9638 38 03 01 0F */ addi r0, r3, 0x010F /* 0x0008010F@l */ -/* 80CB963C 90 01 00 08 */ stw r0, 8(r1) -/* 80CB9640 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CB9644 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CB9648 80 63 00 00 */ lwz r3, 0(r3) -/* 80CB964C 38 81 00 08 */ addi r4, r1, 8 -/* 80CB9650 38 A1 00 24 */ addi r5, r1, 0x24 -/* 80CB9654 38 C0 00 00 */ li r6, 0 -/* 80CB9658 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80CB965C FC 40 08 90 */ fmr f2, f1 -/* 80CB9660 C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 80CB9664 FC 80 18 90 */ fmr f4, f3 -/* 80CB9668 39 00 00 00 */ li r8, 0 -/* 80CB966C 4B 5F 23 19 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CB9670 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB9674 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB9678 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80CB967C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CB9680 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80CB9684 7C 05 07 74 */ extsb r5, r0 -/* 80CB9688 4B 37 BB 79 */ bl onSwitch__10dSv_info_cFii -/* 80CB968C 38 00 00 01 */ li r0, 1 -/* 80CB9690 98 1E 05 AC */ stb r0, 0x5ac(r30) -/* 80CB9694 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 80CB9698 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 80CB969C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80CB96A0 7C 08 03 A6 */ mtlr r0 -/* 80CB96A4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80CB96A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeEnd__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeEnd__10daRfHole_cFv.s deleted file mode 100644 index 2fe26936923..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeEnd__10daRfHole_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80CB973C: -/* 80CB973C 38 00 00 03 */ li r0, 3 -/* 80CB9740 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80CB9744 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeWait__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeWait__10daRfHole_cFv.s deleted file mode 100644 index 72f48e7072b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeWait__10daRfHole_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80CB9520: -/* 80CB9520 38 00 00 00 */ li r0, 0 -/* 80CB9524 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80CB9528 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeBreakEff__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeBreakEff__10daRfHole_cFv.s deleted file mode 100644 index 6ca4c163134..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeBreakEff__10daRfHole_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB971C: -/* 80CB971C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB9720 7C 08 02 A6 */ mflr r0 -/* 80CB9724 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9728 4B 36 05 55 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80CB972C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9730 7C 08 03 A6 */ mtlr r0 -/* 80CB9734 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9738 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeBreak__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeBreak__10daRfHole_cFv.s deleted file mode 100644 index be80902389d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeBreak__10daRfHole_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB96AC: -/* 80CB96AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB96B0 7C 08 02 A6 */ mflr r0 -/* 80CB96B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB96B8 4B 36 05 C5 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80CB96BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB96C0 7C 08 03 A6 */ mtlr r0 -/* 80CB96C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB96C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeEnd__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeEnd__10daRfHole_cFv.s deleted file mode 100644 index c9f5d295325..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeEnd__10daRfHole_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB9748: -/* 80CB9748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB974C 7C 08 02 A6 */ mflr r0 -/* 80CB9750 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9754 4B 36 05 29 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80CB9758 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB975C 7C 08 03 A6 */ mtlr r0 -/* 80CB9760 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9764 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeWait__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeWait__10daRfHole_cFv.s deleted file mode 100644 index a6b66ea06ce..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeWait__10daRfHole_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80CB952C: -/* 80CB952C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB9530 7C 08 02 A6 */ mflr r0 -/* 80CB9534 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9538 88 03 05 AE */ lbz r0, 0x5ae(r3) -/* 80CB953C 28 00 00 00 */ cmplwi r0, 0 -/* 80CB9540 41 82 00 08 */ beq lbl_80CB9548 -/* 80CB9544 48 00 00 15 */ bl init_modeBreak__10daRfHole_cFv -lbl_80CB9548: -/* 80CB9548 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB954C 7C 08 03 A6 */ mtlr r0 -/* 80CB9550 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9554 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/playerAreaCheck__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/playerAreaCheck__10daRfHole_cFv.s deleted file mode 100644 index 9069f7e7d94..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/playerAreaCheck__10daRfHole_cFv.s +++ /dev/null @@ -1,170 +0,0 @@ -lbl_80CB9194: -/* 80CB9194 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80CB9198 7C 08 02 A6 */ mflr r0 -/* 80CB919C 90 01 00 74 */ stw r0, 0x74(r1) -/* 80CB91A0 39 61 00 70 */ addi r11, r1, 0x70 -/* 80CB91A4 4B 6A 90 35 */ bl _savegpr_28 -/* 80CB91A8 7C 7E 1B 78 */ mr r30, r3 -/* 80CB91AC 3C 60 80 CC */ lis r3, lit_3649@ha /* 0x80CB9A84@ha */ -/* 80CB91B0 3B E3 9A 84 */ addi r31, r3, lit_3649@l /* 0x80CB9A84@l */ -/* 80CB91B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB91B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB91BC 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 80CB91C0 3C 60 80 CC */ lis r3, l_HIO@ha /* 0x80CB9BF4@ha */ -/* 80CB91C4 38 63 9B F4 */ addi r3, r3, l_HIO@l /* 0x80CB9BF4@l */ -/* 80CB91C8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80CB91CC D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80CB91D0 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80CB91D4 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80CB91D8 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80CB91DC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB91E0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB91E4 A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 80CB91E8 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 80CB91EC A8 DE 04 E8 */ lha r6, 0x4e8(r30) -/* 80CB91F0 4B 35 30 19 */ bl mDoMtx_ZXYrotS__FPA4_fsss -/* 80CB91F4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB91F8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB91FC 38 81 00 4C */ addi r4, r1, 0x4c -/* 80CB9200 7C 85 23 78 */ mr r5, r4 -/* 80CB9204 4B 68 DB 69 */ bl PSMTXMultVec -/* 80CB9208 38 61 00 28 */ addi r3, r1, 0x28 -/* 80CB920C 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CB9210 38 A1 00 4C */ addi r5, r1, 0x4c -/* 80CB9214 4B 5A D8 D1 */ bl __pl__4cXyzCFRC3Vec -/* 80CB9218 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80CB921C D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80CB9220 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80CB9224 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80CB9228 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80CB922C D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80CB9230 38 61 00 1C */ addi r3, r1, 0x1c -/* 80CB9234 38 81 00 40 */ addi r4, r1, 0x40 -/* 80CB9238 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80CB923C 4B 5A D8 F9 */ bl __mi__4cXyzCFRC3Vec -/* 80CB9240 C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 80CB9244 D0 41 00 34 */ stfs f2, 0x34(r1) -/* 80CB9248 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80CB924C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80CB9250 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80CB9254 D0 21 00 3C */ stfs f1, 0x3c(r1) -/* 80CB9258 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80CB925C C0 1F 00 08 */ lfs f0, 8(r31) -/* 80CB9260 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80CB9264 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80CB9268 38 61 00 10 */ addi r3, r1, 0x10 -/* 80CB926C 4B 68 DE CD */ bl PSVECSquareMag -/* 80CB9270 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80CB9274 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CB9278 40 81 00 58 */ ble lbl_80CB92D0 -/* 80CB927C FC 00 08 34 */ frsqrte f0, f1 -/* 80CB9280 C8 9F 00 10 */ lfd f4, 0x10(r31) -/* 80CB9284 FC 44 00 32 */ fmul f2, f4, f0 -/* 80CB9288 C8 7F 00 18 */ lfd f3, 0x18(r31) -/* 80CB928C FC 00 00 32 */ fmul f0, f0, f0 -/* 80CB9290 FC 01 00 32 */ fmul f0, f1, f0 -/* 80CB9294 FC 03 00 28 */ fsub f0, f3, f0 -/* 80CB9298 FC 02 00 32 */ fmul f0, f2, f0 -/* 80CB929C FC 44 00 32 */ fmul f2, f4, f0 -/* 80CB92A0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80CB92A4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80CB92A8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80CB92AC FC 02 00 32 */ fmul f0, f2, f0 -/* 80CB92B0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80CB92B4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80CB92B8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80CB92BC FC 03 00 28 */ fsub f0, f3, f0 -/* 80CB92C0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80CB92C4 FC 21 00 32 */ fmul f1, f1, f0 -/* 80CB92C8 FC 20 08 18 */ frsp f1, f1 -/* 80CB92CC 48 00 00 88 */ b lbl_80CB9354 -lbl_80CB92D0: -/* 80CB92D0 C8 1F 00 20 */ lfd f0, 0x20(r31) -/* 80CB92D4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CB92D8 40 80 00 10 */ bge lbl_80CB92E8 -/* 80CB92DC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80CB92E0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80CB92E4 48 00 00 70 */ b lbl_80CB9354 -lbl_80CB92E8: -/* 80CB92E8 D0 21 00 08 */ stfs f1, 8(r1) -/* 80CB92EC 80 81 00 08 */ lwz r4, 8(r1) -/* 80CB92F0 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80CB92F4 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80CB92F8 7C 03 00 00 */ cmpw r3, r0 -/* 80CB92FC 41 82 00 14 */ beq lbl_80CB9310 -/* 80CB9300 40 80 00 40 */ bge lbl_80CB9340 -/* 80CB9304 2C 03 00 00 */ cmpwi r3, 0 -/* 80CB9308 41 82 00 20 */ beq lbl_80CB9328 -/* 80CB930C 48 00 00 34 */ b lbl_80CB9340 -lbl_80CB9310: -/* 80CB9310 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80CB9314 41 82 00 0C */ beq lbl_80CB9320 -/* 80CB9318 38 00 00 01 */ li r0, 1 -/* 80CB931C 48 00 00 28 */ b lbl_80CB9344 -lbl_80CB9320: -/* 80CB9320 38 00 00 02 */ li r0, 2 -/* 80CB9324 48 00 00 20 */ b lbl_80CB9344 -lbl_80CB9328: -/* 80CB9328 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80CB932C 41 82 00 0C */ beq lbl_80CB9338 -/* 80CB9330 38 00 00 05 */ li r0, 5 -/* 80CB9334 48 00 00 10 */ b lbl_80CB9344 -lbl_80CB9338: -/* 80CB9338 38 00 00 03 */ li r0, 3 -/* 80CB933C 48 00 00 08 */ b lbl_80CB9344 -lbl_80CB9340: -/* 80CB9340 38 00 00 04 */ li r0, 4 -lbl_80CB9344: -/* 80CB9344 2C 00 00 01 */ cmpwi r0, 1 -/* 80CB9348 40 82 00 0C */ bne lbl_80CB9354 -/* 80CB934C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80CB9350 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80CB9354: -/* 80CB9354 3B A0 00 00 */ li r29, 0 -/* 80CB9358 3C 60 80 CC */ lis r3, l_HIO@ha /* 0x80CB9BF4@ha */ -/* 80CB935C 38 63 9B F4 */ addi r3, r3, l_HIO@l /* 0x80CB9BF4@l */ -/* 80CB9360 C0 03 00 04 */ lfs f0, 4(r3) -/* 80CB9364 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CB9368 4C 40 13 82 */ cror 2, 0, 2 -/* 80CB936C 40 82 00 08 */ bne lbl_80CB9374 -/* 80CB9370 3B A0 00 01 */ li r29, 1 -lbl_80CB9374: -/* 80CB9374 3B 80 00 00 */ li r28, 0 -/* 80CB9378 3C 60 80 CC */ lis r3, l_HIO@ha /* 0x80CB9BF4@ha */ -/* 80CB937C 38 63 9B F4 */ addi r3, r3, l_HIO@l /* 0x80CB9BF4@l */ -/* 80CB9380 C0 03 00 08 */ lfs f0, 8(r3) -/* 80CB9384 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CB9388 4C 40 13 82 */ cror 2, 0, 2 -/* 80CB938C 40 82 00 60 */ bne lbl_80CB93EC -/* 80CB9390 3B 80 00 01 */ li r28, 1 -/* 80CB9394 88 1E 05 B0 */ lbz r0, 0x5b0(r30) -/* 80CB9398 2C 00 00 01 */ cmpwi r0, 1 -/* 80CB939C 41 82 00 50 */ beq lbl_80CB93EC -/* 80CB93A0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80CB93A4 7C 03 07 74 */ extsb r3, r0 -/* 80CB93A8 4B 37 3C C5 */ bl dComIfGp_getReverb__Fi -/* 80CB93AC 7C 67 1B 78 */ mr r7, r3 -/* 80CB93B0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080170@ha */ -/* 80CB93B4 38 03 01 70 */ addi r0, r3, 0x0170 /* 0x00080170@l */ -/* 80CB93B8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CB93BC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CB93C0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CB93C4 80 63 00 00 */ lwz r3, 0(r3) -/* 80CB93C8 38 81 00 0C */ addi r4, r1, 0xc -/* 80CB93CC 38 A1 00 40 */ addi r5, r1, 0x40 -/* 80CB93D0 38 C0 00 00 */ li r6, 0 -/* 80CB93D4 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80CB93D8 FC 40 08 90 */ fmr f2, f1 -/* 80CB93DC C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 80CB93E0 FC 80 18 90 */ fmr f4, f3 -/* 80CB93E4 39 00 00 00 */ li r8, 0 -/* 80CB93E8 4B 5F 25 9D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80CB93EC: -/* 80CB93EC 9B 9E 05 B0 */ stb r28, 0x5b0(r30) -/* 80CB93F0 7F A3 EB 78 */ mr r3, r29 -/* 80CB93F4 39 61 00 70 */ addi r11, r1, 0x70 -/* 80CB93F8 4B 6A 8E 2D */ bl _restgpr_28 -/* 80CB93FC 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80CB9400 7C 08 03 A6 */ mtlr r0 -/* 80CB9404 38 21 00 70 */ addi r1, r1, 0x70 -/* 80CB9408 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 92d23af0a08..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80CB9148: -/* 80CB9148 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB914C 7C 08 02 A6 */ mflr r0 -/* 80CB9150 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9154 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB9158 7C 9F 23 78 */ mr r31, r4 -/* 80CB915C A8 05 00 08 */ lha r0, 8(r5) -/* 80CB9160 2C 00 00 FD */ cmpwi r0, 0xfd -/* 80CB9164 40 82 00 1C */ bne lbl_80CB9180 -/* 80CB9168 7F E3 FB 78 */ mr r3, r31 -/* 80CB916C 48 00 00 29 */ bl playerAreaCheck__10daRfHole_cFv -/* 80CB9170 2C 03 00 00 */ cmpwi r3, 0 -/* 80CB9174 41 82 00 0C */ beq lbl_80CB9180 -/* 80CB9178 38 00 00 01 */ li r0, 1 -/* 80CB917C 98 1F 05 AE */ stb r0, 0x5ae(r31) -lbl_80CB9180: -/* 80CB9180 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB9184 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9188 7C 08 03 A6 */ mtlr r0 -/* 80CB918C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9190 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/setBaseMtx__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/setBaseMtx__10daRfHole_cFv.s deleted file mode 100644 index c3d502ca6e8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/setBaseMtx__10daRfHole_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80CB8F04: -/* 80CB8F04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8F08 7C 08 02 A6 */ mflr r0 -/* 80CB8F0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8F10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8F14 7C 7F 1B 78 */ mr r31, r3 -/* 80CB8F18 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB8F1C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB8F20 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CB8F24 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CB8F28 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CB8F2C 4B 68 D9 BD */ bl PSMTXTrans -/* 80CB8F30 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB8F34 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB8F38 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80CB8F3C A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80CB8F40 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80CB8F44 4B 35 33 5D */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80CB8F48 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CB8F4C C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CB8F50 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80CB8F54 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80CB8F58 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80CB8F5C C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80CB8F60 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80CB8F64 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB8F68 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB8F6C 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80CB8F70 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CB8F74 4B 68 D5 3D */ bl PSMTXCopy -/* 80CB8F78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB8F7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8F80 7C 08 03 A6 */ mtlr r0 -/* 80CB8F84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8F88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/setBreakEffect__10daRfHole_cFv.s b/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/setBreakEffect__10daRfHole_cFv.s deleted file mode 100644 index 68eb8568b14..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/setBreakEffect__10daRfHole_cFv.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_80CB9768: -/* 80CB9768 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80CB976C 7C 08 02 A6 */ mflr r0 -/* 80CB9770 90 01 00 64 */ stw r0, 0x64(r1) -/* 80CB9774 39 61 00 60 */ addi r11, r1, 0x60 -/* 80CB9778 4B 6A 8A 59 */ bl _savegpr_26 -/* 80CB977C 7C 7F 1B 78 */ mr r31, r3 -/* 80CB9780 3C 60 80 CC */ lis r3, lit_3649@ha /* 0x80CB9A84@ha */ -/* 80CB9784 3B 63 9A 84 */ addi r27, r3, lit_3649@l /* 0x80CB9A84@l */ -/* 80CB9788 3C 60 80 CC */ lis r3, l_HIO@ha /* 0x80CB9BF4@ha */ -/* 80CB978C 38 63 9B F4 */ addi r3, r3, l_HIO@l /* 0x80CB9BF4@l */ -/* 80CB9790 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80CB9794 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80CB9798 C0 1B 00 08 */ lfs f0, 8(r27) -/* 80CB979C D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80CB97A0 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80CB97A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB97A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB97AC A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80CB97B0 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80CB97B4 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80CB97B8 4B 35 2A 51 */ bl mDoMtx_ZXYrotS__FPA4_fsss -/* 80CB97BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB97C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB97C4 38 81 00 38 */ addi r4, r1, 0x38 -/* 80CB97C8 7C 85 23 78 */ mr r5, r4 -/* 80CB97CC 4B 68 D5 A1 */ bl PSMTXMultVec -/* 80CB97D0 38 61 00 20 */ addi r3, r1, 0x20 -/* 80CB97D4 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80CB97D8 38 A1 00 38 */ addi r5, r1, 0x38 -/* 80CB97DC 4B 5A D3 09 */ bl __pl__4cXyzCFRC3Vec -/* 80CB97E0 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80CB97E4 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CB97E8 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80CB97EC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CB97F0 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80CB97F4 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CB97F8 3B 40 00 00 */ li r26, 0 -/* 80CB97FC 3B C0 00 00 */ li r30, 0 -/* 80CB9800 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB9804 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB9808 3B BB 00 30 */ addi r29, r27, 0x30 -lbl_80CB980C: -/* 80CB980C 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80CB9810 38 80 00 00 */ li r4, 0 -/* 80CB9814 90 81 00 08 */ stw r4, 8(r1) -/* 80CB9818 38 00 FF FF */ li r0, -1 -/* 80CB981C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CB9820 90 81 00 10 */ stw r4, 0x10(r1) -/* 80CB9824 90 81 00 14 */ stw r4, 0x14(r1) -/* 80CB9828 90 81 00 18 */ stw r4, 0x18(r1) -/* 80CB982C 38 80 00 00 */ li r4, 0 -/* 80CB9830 7C BD F2 2E */ lhzx r5, r29, r30 -/* 80CB9834 38 C1 00 2C */ addi r6, r1, 0x2c -/* 80CB9838 38 E0 00 00 */ li r7, 0 -/* 80CB983C 39 00 00 00 */ li r8, 0 -/* 80CB9840 39 3F 04 EC */ addi r9, r31, 0x4ec -/* 80CB9844 39 40 00 FF */ li r10, 0xff -/* 80CB9848 C0 3B 00 28 */ lfs f1, 0x28(r27) -/* 80CB984C 4B 39 32 45 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80CB9850 3B 5A 00 01 */ addi r26, r26, 1 -/* 80CB9854 2C 1A 00 05 */ cmpwi r26, 5 -/* 80CB9858 3B DE 00 02 */ addi r30, r30, 2 -/* 80CB985C 41 80 FF B0 */ blt lbl_80CB980C -/* 80CB9860 39 61 00 60 */ addi r11, r1, 0x60 -/* 80CB9864 4B 6A 89 B9 */ bl _restgpr_26 -/* 80CB9868 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80CB986C 7C 08 03 A6 */ mtlr r0 -/* 80CB9870 38 21 00 60 */ addi r1, r1, 0x60 -/* 80CB9874 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h index 21ec5cd163c..581340cd03e 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h @@ -199,6 +199,46 @@ struct J3DTextureBlock : public J3DModelBlock { /* 0x10 */ void* mpNameTable; }; +enum J3DModelLoaderFlagTypes { + J3DMLF_None = 0x00000000, + + J3DMLF_MtxSoftImageCalc = 0x00000001, + J3DMLF_MtxMayaCalc = 0x00000002, + J3DMLF_MtxBasicCalc = 0x00000004, + J3DMLF_04 = 0x00000008, + J3DMLF_MtxTypeMask = J3DMLF_MtxSoftImageCalc | J3DMLF_MtxMayaCalc | J3DMLF_MtxBasicCalc | + J3DMLF_04, // 0 - 2 (0 = Basic, 1 = SoftImage, 2 = Maya) + + J3DMLF_UseImmediateMtx = 0x00000010, + J3DMLF_UsePostTexMtx = 0x00000020, + J3DMLF_07 = 0x00000040, + J3DMLF_08 = 0x00000080, + J3DMLF_NoMatrixTransform = 0x00000100, + J3DMLF_10 = 0x00000200, + J3DMLF_11 = 0x00000400, + J3DMLF_12 = 0x00000800, + J3DMLF_13 = 0x00001000, + J3DMLF_DoBdlMaterialCalc = 0x00002000, + J3DMLF_15 = 0x00004000, + J3DMLF_16 = 0x00008000, + J3DMLF_TevNumShift = 0x00010000, + J3DMLF_18 = 0x00020000, + J3DMLF_UseSingleSharedDL = 0x00040000, + J3DMLF_20 = 0x00080000, + J3DMLF_21 = 0x00100000, + J3DMLF_UseUniqueMaterials = 0x00200000, + J3DMLF_23 = 0x00400000, + J3DMLF_24 = 0x00800000, + J3DMLF_Material_UseIndirect = 0x01000000, + J3DMLF_26 = 0x02000000, + J3DMLF_27 = 0x04000000, + J3DMLF_Material_TexGen_Block4 = 0x08000000, + J3DMLF_Material_PE_Full = 0x10000000, + J3DMLF_Material_PE_FogOff = 0x20000000, + J3DMLF_Material_Color_LightOn = 0x40000000, + J3DMLF_Material_Color_AmbientOn = 0x80000000 +}; + /** * @ingroup jsystem-j3d * @@ -228,7 +268,24 @@ class J3DModelLoader { /* 80337010 */ u32 calcSizePatchedMaterial(J3DMaterialBlock const*, u32); /* 803370A0 */ u32 calcSizeMaterialDL(J3DMaterialDLBlock const*, u32); - // virtuals + // Remove when J3DModelLoader.cc is ok + #ifndef NON_VIRTUAL_J3DModelLoader + /* 803347E0 */ virtual J3DModelData* load(void const*, u32); + /* 80334ABC */ virtual J3DMaterialTable* loadMaterialTable(void const*); + /* 80334C20 */ virtual J3DModelData* loadBinaryDisplayList(void const*, u32); + /* 803367D4 */ virtual u32 calcLoadSize(void const*, u32); + /* 803369A0 */ virtual u32 calcLoadMaterialTableSize(void const*); + /* 80336A98 */ virtual u32 calcLoadBinaryDisplayListSize(void const*, u32); + /* 80336794 */ virtual u16 countMaterialNum(void const*); + /* 80334EE0 */ virtual void setupBBoardInfo(); + /* 80336450 */ virtual ~J3DModelLoader(); + /* 8033649C */ virtual void readMaterial(J3DMaterialBlock const*, u32); + /* 80336498 */ virtual void readMaterial_v21(J3DMaterialBlock_v21 const*, u32); + /* 803364A4 */ virtual void readMaterialTable(J3DMaterialBlock const*, u32); + /* 803364A0 */ virtual void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32); + /* 803364A8 */ virtual u32 calcSizeMaterial(J3DMaterialBlock const*, u32); + /* 803364B0 */ virtual u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32); + #else /* 803347E0 */ J3DModelData* load(void const*, u32); /* 80334ABC */ J3DMaterialTable* loadMaterialTable(void const*); /* 80334C20 */ J3DModelData* loadBinaryDisplayList(void const*, u32); @@ -244,8 +301,10 @@ class J3DModelLoader { /* 803364A0 */ void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32); /* 803364A8 */ u32 calcSizeMaterial(J3DMaterialBlock const*, u32); /* 803364B0 */ u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32); - + /* 0x00 */ void* _vtable; + #endif + /* 0x04 */ J3DModelData* mpModelData; /* 0x08 */ J3DMaterialTable* mpMaterialTable; /* 0x0C */ J3DShapeBlock const* mpShapeBlock; diff --git a/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h b/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h index ddd9319c3f1..341c4747204 100644 --- a/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h +++ b/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h @@ -2,6 +2,7 @@ #define D_A_OBJ_RFHOLE_H #include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_movebg_actor.h" /** * @ingroup actors-objects @@ -11,14 +12,23 @@ * @details * */ -class daRfHole_c : public fopAc_ac_c { +class daRfHole_c : public dBgS_MoveBgActor { public: + enum Mode { + MODE_WAIT, + MODE_BREAK, + MODE_BREAK_EFF, + MODE_END, + }; + + typedef void (daRfHole_c::*ModeFunc)(); + /* 80CB8F04 */ void setBaseMtx(); - /* 80CB8F8C */ void CreateHeap(); - /* 80CB8FF8 */ void create(); - /* 80CB9148 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80CB9194 */ void playerAreaCheck(); - /* 80CB940C */ void Execute(f32 (**)[3][4]); + /* 80CB8F8C */ int CreateHeap(); + /* 80CB8FF8 */ int create(); + /* 80CB9148 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80CB9194 */ int playerAreaCheck(); + /* 80CB940C */ int Execute(f32 (**)[3][4]); /* 80CB9464 */ void holeProc(); /* 80CB9520 */ void init_modeWait(); /* 80CB952C */ void modeWait(); @@ -29,20 +39,33 @@ class daRfHole_c : public fopAc_ac_c { /* 80CB973C */ void init_modeEnd(); /* 80CB9748 */ void modeEnd(); /* 80CB9768 */ void setBreakEffect(); - /* 80CB9878 */ void Draw(); - /* 80CB991C */ void Delete(); + /* 80CB9878 */ int Draw(); + /* 80CB991C */ int Delete(); private: - /* 0x568 */ u8 field_0x568[0x5b4 - 0x568]; + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mModel; + /* 0x5AC */ u8 mMode; + /* 0x5AD */ u8 field_0x5ad; + /* 0x5AE */ u8 field_0x5ae; + /* 0x5AF */ u8 field_0x5af; + /* 0x5B0 */ s8 mRoofSoundOn; + /* 0x5B1 */ u8 field_0x5b1[0x5b4 - 0x5b1]; }; STATIC_ASSERT(sizeof(daRfHole_c) == 0x5b4); -class daRfHole_HIO_c { +class daRfHole_HIO_c : public mDoHIO_entry_c { public: /* 80CB8E6C */ daRfHole_HIO_c(); - /* 80CB99D8 */ ~daRfHole_HIO_c(); -}; + /* 80CB99D8 */ virtual ~daRfHole_HIO_c() {} + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0c; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ u8 field_0x14; + /* 0x15 */ u8 field_0x15; +}; #endif /* D_A_OBJ_RFHOLE_H */ diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index 1b750cad1ff..f03e162e1d8 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -7,6 +7,7 @@ #include "JSystem/J2DGraph/J2DPictureEx.h" #include "JSystem/J2DGraph/J2DTextBoxEx.h" #include "JSystem/J2DGraph/J2DWindowEx.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSUMemoryStream.h" @@ -135,78 +136,7 @@ extern "C" extern void* __vt__20JSUMemoryInputStream[9 + 1 /* padding */]; extern "C" extern void* __vt__14J2DGrafContext[10]; extern "C" extern void* __vt__13J2DOrthoGraph[10]; -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803CD068-803CD108 02A188 009C+04 2/2 0/0 0/0 .data __vt__9J2DScreen */ -SECTION_DATA extern void* __vt__9J2DScreen[39 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9J2DScreenFv, - (void*)getTypeID__9J2DScreenCFv, - (void*)move__7J2DPaneFff, - (void*)add__7J2DPaneFff, - (void*)resize__7J2DPaneFff, - (void*)setCullBack__7J2DPaneFb, - (void*)setCullBack__7J2DPaneF11_GXCullMode, - (void*)setAlpha__7J2DPaneFUc, - (void*)setConnectParent__7J2DPaneFb, - (void*)calcMtx__9J2DScreenFv, - (void*)update__7J2DPaneFv, - (void*)drawSelf__7J2DPaneFff, - (void*)drawSelf__9J2DScreenFffPA3_A4_f, - (void*)search__9J2DScreenFUx, - (void*)searchUserInfo__9J2DScreenFUx, - (void*)makeMatrix__7J2DPaneFff, - (void*)makeMatrix__7J2DPaneFffff, - (void*)isUsed__9J2DScreenFPC7ResTIMG, - (void*)isUsed__9J2DScreenFPC7ResFONT, - (void*)clearAnmTransform__9J2DScreenFv, - (void*)rewriteAlpha__7J2DPaneFv, - (void*)setAnimation__9J2DScreenFP10J2DAnmBase, - (void*)setAnimation__9J2DScreenFP15J2DAnmTransform, - (void*)setAnimation__9J2DScreenFP11J2DAnmColor, - (void*)setAnimation__9J2DScreenFP16J2DAnmTexPattern, - (void*)setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey, - (void*)setAnimation__9J2DScreenFP15J2DAnmTevRegKey, - (void*)setAnimation__9J2DScreenFP20J2DAnmVisibilityFull, - (void*)setAnimation__9J2DScreenFP14J2DAnmVtxColor, - (void*)animationTransform__7J2DPaneFPC15J2DAnmTransform, - (void*)setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull, - (void*)setAnimationVF__9J2DScreenFP20J2DAnmVisibilityFull, - (void*)setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor, - (void*)setAnimationVC__9J2DScreenFP14J2DAnmVtxColor, - (void*)animationPane__7J2DPaneFPC15J2DAnmTransform, - (void*)createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl, - (void*) - createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUlP10JKRArchive, - /* padding */ - NULL, -}; - -/* 80456220-80456224 004820 0004+00 4/4 0/0 0/0 .sdata2 @1561 */ -SECTION_SDATA2 static u8 lit_1561[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80456224-80456228 004824 0004+00 2/2 0/0 0/0 .sdata2 @1562 */ -SECTION_SDATA2 static f32 lit_1562 = 640.0f; - -/* 80456228-80456230 004828 0004+04 2/2 0/0 0/0 .sdata2 @1563 */ -SECTION_SDATA2 static f32 lit_1563[1 + 1 /* padding */] = { - 480.0f, - /* padding */ - 0.0f, -}; - /* 802F8498-802F8540 2F2DD8 00A8+00 0/0 59/59 4/4 .text __ct__9J2DScreenFv */ -// Matches with literals -#ifdef NONMATCHING J2DScreen::J2DScreen() : J2DPane(NULL, true, 'root', JGeometry::TBox2(JGeometry::TVec2(0.0f, 0.0f), JGeometry::TVec2(640.0f, 480.0f))), mColor() { field_0x4 = -1; @@ -217,16 +147,6 @@ J2DScreen::J2DScreen() mFontRes = NULL; mNameTable = NULL; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DScreen::J2DScreen() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/__ct__9J2DScreenFv.s" -} -#pragma pop -#endif /* 802F8540-802F85A8 2F2E80 0068+00 1/0 0/0 0/0 .text __dt__9J2DScreenFv */ J2DScreen::~J2DScreen() { @@ -326,8 +246,7 @@ bool J2DScreen::getScreenInformation(JSURandomInputStream* p_stream) { return false; } - f32 tmp_0 = FLOAT_LABEL(lit_1561); - JGeometry::TBox2 dimensions(tmp_0, tmp_0, info.mWidth, info.mHeight); + JGeometry::TBox2 dimensions(0.0f, 0.0f, info.mWidth, info.mHeight); place(dimensions); JUtility::TColor color(info.mColor); @@ -457,16 +376,7 @@ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputS return newPane; } -/* ############################################################################################## */ -/* 80456238-8045623C 004838 0004+00 1/1 0/0 0/0 .sdata2 @1829 */ -SECTION_SDATA2 static f32 lit_1829 = -1.0f; - -/* 8045623C-80456240 00483C 0004+00 1/1 0/0 0/0 .sdata2 @1830 */ -SECTION_SDATA2 static f32 lit_1830 = 1.0f; - /* 802F8ED4-802F90A0 2F3814 01CC+00 0/0 51/51 4/4 .text draw__9J2DScreenFffPC14J2DGrafContext */ -// matches with literals -#ifdef NONMATCHING void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) { u32 l_x, l_y, width, height; @@ -502,16 +412,6 @@ void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) { GXSetTevSwapModeTable((GXTevSwapSel)i, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::draw(f32 param_0, f32 param_1, J2DGrafContext const* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/draw__9J2DScreenFffPC14J2DGrafContext.s" -} -#pragma pop -#endif /* 802F90A0-802F90E0 2F39E0 0040+00 1/0 0/0 0/0 .text search__9J2DScreenFUx */ J2DPane* J2DScreen::search(u64 tag) { @@ -532,8 +432,6 @@ J2DPane* J2DScreen::searchUserInfo(u64 tag) { } /* 802F9120-802F9280 2F3A60 0160+00 1/0 0/0 0/0 .text drawSelf__9J2DScreenFffPA3_A4_f */ -// matches with literals -#ifdef NONMATCHING void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { JUtility::TColor color(mColor); u8 alpha = (color.a * mAlpha) / 255; @@ -562,16 +460,6 @@ void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { GXEnd(); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/drawSelf__9J2DScreenFffPA3_A4_f.s" -} -#pragma pop -#endif /* 802F9280-802F937C 2F3BC0 00FC+00 1/1 0/0 0/0 .text * getResReference__9J2DScreenFP20JSURandomInputStreamUl */ diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp index df18b838910..06d20148a84 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -3,6 +3,8 @@ // Translation Unit: J3DModelLoader // +#define NON_VIRTUAL_J3DModelLoader + #include "JSystem/J3DGraphLoader/J3DModelLoader.h" #include "JSystem/J3DGraphLoader/J3DJointFactory.h" #include "JSystem/J3DGraphLoader/J3DMaterialFactory.h" diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index 80824e84f4c..82d09698225 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -4,66 +4,15 @@ // #include "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h" +#include "JSystem/J3DGraphLoader/J3DModelLoader.h" +#include "JSystem/J3DGraphLoader/J3DShapeFactory.h" +#include "JSystem/J3DGraphLoader/J3DMaterialFactory.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/J3DGraphAnimator/J3DModelData.h" +#include "JSystem/JSupport/JSupport.h" +#include "dolphin/os.h" #include "dol2asm.h" -// -// Types: -// - -struct J3DTextureBlock {}; - -struct J3DShapeBlock {}; - -struct J3DShapeFactory { - /* 80337350 */ J3DShapeFactory(J3DShapeBlock const&); - /* 80337944 */ void calcSize(int, u32); - /* 803379D8 */ void calcSizeVcdVatCmdBuffer(u32); -}; - -struct J3DMaterialBlock {}; - -struct J3DModelLoader_v26 { - /* 80336DB4 */ void calcSizeMaterial(J3DMaterialBlock const*, u32); - /* 80336F60 */ void calcSizeMaterialTable(J3DMaterialBlock const*, u32); -}; - -struct J3DDrawBlock {}; - -struct J3DMaterialDLBlock {}; - -struct J3DJointBlock {}; - -struct J3DEnvelopeBlock {}; - -struct J3DModelInfoBlock {}; - -struct J3DModelLoader { - /* 80336794 */ void countMaterialNum(void const*); - /* 803367D4 */ void calcLoadSize(void const*, u32); - /* 803369A0 */ void calcLoadMaterialTableSize(void const*); - /* 80336A98 */ void calcLoadBinaryDisplayListSize(void const*, u32); - /* 80336CD8 */ void calcSizeInformation(J3DModelInfoBlock const*, u32); - /* 80336D64 */ void calcSizeJoint(J3DJointBlock const*); - /* 80336D90 */ void calcSizeEnvelope(J3DEnvelopeBlock const*); - /* 80336DA0 */ void calcSizeDraw(J3DDrawBlock const*); - /* 80336EA0 */ void calcSizeShape(J3DShapeBlock const*, u32); - /* 80336F44 */ void calcSizeTexture(J3DTextureBlock const*); - /* 80336FF0 */ void calcSizeTextureTable(J3DTextureBlock const*); - /* 80337010 */ void calcSizePatchedMaterial(J3DMaterialBlock const*, u32); - /* 803370A0 */ void calcSizeMaterialDL(J3DMaterialDLBlock const*, u32); -}; - -struct J3DMaterial {}; - -struct J3DMaterialFactory { - struct MaterialType {}; - - /* 8032FFEC */ J3DMaterialFactory(J3DMaterialBlock const&); - /* 80330234 */ J3DMaterialFactory(J3DMaterialDLBlock const&); - /* 803302BC */ void countUniqueMaterials(); - /* 80331A7C */ void calcSize(J3DMaterial*, J3DMaterialFactory::MaterialType, int, u32) const; -}; - // // Forward References: // @@ -89,7 +38,6 @@ extern "C" extern char const* const J3DModelLoaderCalcSize__stringBase0; // External References: // -extern "C" void OSReport(); extern "C" void __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock(); extern "C" void __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock(); extern "C" void countUniqueMaterials__18J3DMaterialFactoryFv(); @@ -113,14 +61,17 @@ extern "C" void _restgpr_28(); // /* 80336794-803367D4 3310D4 0040+00 0/0 3/0 0/0 .text countMaterialNum__14J3DModelLoaderFPCv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::countMaterialNum(void const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/countMaterialNum__14J3DModelLoaderFPCv.s" +u16 J3DModelLoader::countMaterialNum(const void* stream) { + const J3DModelFileData* header = (const J3DModelFileData*)stream; + const J3DModelBlock* block = header->mBlocks; + for (int i = 0; i < header->mBlockNum; block = (const J3DModelBlock*)((u8*)block + block->mBlockSize), i++) + { + if (block->mBlockType == 'MAT3') { + return ((const J3DMaterialBlock*)block)->mMaterialNum; + } + } + return 0; } -#pragma pop /* ############################################################################################## */ /* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -132,156 +83,346 @@ SECTION_DEAD static char const* const pad_803A20FC = "\0\0\0"; #pragma pop /* 803367D4-803369A0 331114 01CC+00 0/0 3/0 0/0 .text calcLoadSize__14J3DModelLoaderFPCvUl */ +// size load issue. +#ifdef NONMATCHING +u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) { + int flags = flags_; + const J3DModelFileData* header = static_cast(stream); + size_t size; + const J3DModelBlock* nextBlock = header->mBlocks; + u32 i = 0; + // TODO: What sizeof will get us a size of 0xE4? + size = 0xE4; + for (; i < header->mBlockNum; i++) { + switch (nextBlock->mBlockType) { + case 'INF1': + size += calcSizeInformation((const J3DModelInfoBlock*)nextBlock, flags); + break; + case 'JNT1': + size += calcSizeJoint((const J3DJointBlock*)nextBlock); + break; + case 'MAT2': + break; + case 'MAT3': + size += calcSizeMaterial((const J3DMaterialBlock*)nextBlock, flags); + break; + case 'SHP1': + size += calcSizeShape((const J3DShapeBlock*)nextBlock, flags); + break; + case 'TEX1': + size += calcSizeTexture((const J3DTextureBlock*)nextBlock); + break; + case 'EVP1': + size += calcSizeEnvelope((const J3DEnvelopeBlock*)nextBlock); + break; + case 'DRW1': + size += calcSizeDraw((const J3DDrawBlock*)nextBlock); + break; + case 'VTX1': + break; + default: + OSReport("Unknown data block\n"); + break; + } + nextBlock = (const J3DModelBlock*)((u8*)nextBlock + nextBlock->mBlockSize); + } + return size; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DModelLoader::calcLoadSize(void const* param_0, u32 param_1) { +asm u32 J3DModelLoader::calcLoadSize(void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcLoadSize__14J3DModelLoaderFPCvUl.s" } #pragma pop +#endif /* 803369A0-80336A98 3312E0 00F8+00 0/0 3/0 0/0 .text * calcLoadMaterialTableSize__14J3DModelLoaderFPCv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::calcLoadMaterialTableSize(void const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcLoadMaterialTableSize__14J3DModelLoaderFPCv.s" +u32 J3DModelLoader::calcLoadMaterialTableSize(const void* stream) { + size_t size; + const J3DModelBlock* nextBlock; + bool hasTextureTable; + u32 i; + const J3DModelFileData* header = reinterpret_cast(stream); + nextBlock = header->mBlocks; + hasTextureTable = false; + i = 0; + // TODO: What sizeof will get us a size of 0x20? Is this just the file header??? + size = 0x20; + for (; i < header->mBlockNum; i++) { + switch (nextBlock->mBlockType) { + case 'MAT2': + break; + case 'MAT3': + size += + calcSizeMaterialTable((const J3DMaterialBlock*)nextBlock, + J3DMLF_21 | J3DMLF_Material_UseIndirect | + J3DMLF_Material_PE_Full | J3DMLF_Material_Color_LightOn); + break; + case 'TEX1': + size += calcSizeTextureTable((const J3DTextureBlock*)nextBlock); + hasTextureTable = true; + break; + default: + OSReport("Unknown data block\n"); + break; + } + nextBlock = (const J3DModelBlock*)((u8*)nextBlock + nextBlock->mBlockSize); + } + + if (!hasTextureTable) { + size += 12; + } + return size; } -#pragma pop /* 80336A98-80336CD8 3313D8 0240+00 0/0 3/0 0/0 .text * calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl */ +// flags issue +#ifdef NONMATCHING +u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags) { + const J3DModelFileData* header = (const J3DModelFileData*)stream; + const J3DModelBlock* nextBlock = header->mBlocks; + u32 i = 0; + u32 matFlags = flags & (J3DMLF_Material_UseIndirect | J3DMLF_26); + int size = sizeof(J3DModelData); + for (; i < header->mBlockNum; i++) { + switch (nextBlock->mBlockType) { + case 'INF1': + size += calcSizeInformation((const J3DModelInfoBlock*)nextBlock, flags); + break; + case 'JNT1': + size += calcSizeJoint((const J3DJointBlock*)nextBlock); + break; + case 'SHP1': + size += calcSizeShape((const J3DShapeBlock*)nextBlock, flags); + break; + case 'TEX1': + size += calcSizeTexture((const J3DTextureBlock*)nextBlock); + break; + case 'MDL3': + size += calcSizeMaterialDL((const J3DMaterialDLBlock*)nextBlock, flags); + break; + case 'MAT2': + break; + case 'MAT3': + u32 flags2 = (J3DMLF_21 | J3DMLF_Material_PE_Full | J3DMLF_Material_Color_LightOn); + flags2 |= matFlags; + mpMaterialBlock = (const J3DMaterialBlock*)nextBlock; + if ((flags & (J3DMLF_13 | J3DMLF_DoBdlMaterialCalc)) == 0) { + field_0x18 = 1; + size += calcSizeMaterial((const J3DMaterialBlock*)nextBlock, flags2); + } else if ((flags & (J3DMLF_13 | J3DMLF_DoBdlMaterialCalc)) == J3DMLF_DoBdlMaterialCalc) { + field_0x18 = 1; + size += calcSizePatchedMaterial((const J3DMaterialBlock*)nextBlock, matFlags); + } + break; + case 'EVP1': + size += calcSizeEnvelope((const J3DEnvelopeBlock*)nextBlock); + break; + case 'DRW1': + size += calcSizeDraw((const J3DDrawBlock*)nextBlock); + break; + case 'VTX1': + break; + default: + OSReport("Unknown data block\n"); + break; + } + nextBlock = (const J3DModelBlock*)((u8*)nextBlock + nextBlock->mBlockSize); + } + return size; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DModelLoader::calcLoadBinaryDisplayListSize(void const* param_0, u32 param_1) { +asm u32 J3DModelLoader::calcLoadBinaryDisplayListSize(void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl.s" } #pragma pop +#endif /* 80336CD8-80336D64 331618 008C+00 2/2 0/0 0/0 .text * calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl */ +// Matches with JSUConvertOffsetToPtr +#ifdef NONMATCHING +u32 J3DModelLoader::calcSizeInformation(const J3DModelInfoBlock* block, u32 flags) { + int size = 0; + switch ((flags | block->mFlags) & J3DMLF_MtxTypeMask) { + case J3DMLF_None: // Basic + size = 4; + break; + case J3DMLF_MtxSoftImageCalc: + size = 4; + break; + case J3DMLF_MtxMayaCalc: + size = 4; + break; + default: + break; + } + mpModelHierarchy = JSUConvertOffsetToPtr(block, block->mpHierarchy); + return size; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DModelLoader::calcSizeInformation(J3DModelInfoBlock const* param_0, u32 param_1) { +asm u32 J3DModelLoader::calcSizeInformation(J3DModelInfoBlock const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl.s" } #pragma pop +#endif /* 80336D64-80336D90 3316A4 002C+00 2/2 0/0 0/0 .text * calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::calcSizeJoint(J3DJointBlock const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock.s" +u32 J3DModelLoader::calcSizeJoint(const J3DJointBlock* block) { + int size = 0; + if (block->mpNameTable) { + size = 0x10; + } + size += (block->mJointNum * sizeof(J3DJoint*)); + size += (block->mJointNum * sizeof(J3DJoint)); + return size; } -#pragma pop /* 80336D90-80336DA0 3316D0 0010+00 2/2 0/0 0/0 .text * calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::calcSizeEnvelope(J3DEnvelopeBlock const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock.s" +u32 J3DModelLoader::calcSizeEnvelope(const J3DEnvelopeBlock* block) { + mEnvelopeSize = block->mWEvlpMtxNum; + return 0; } -#pragma pop /* 80336DA0-80336DB4 3316E0 0014+00 2/2 0/0 0/0 .text * calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::calcSizeDraw(J3DDrawBlock const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock.s" +u32 J3DModelLoader::calcSizeDraw(const J3DDrawBlock* block) { + return (block->mMtxNum - mEnvelopeSize) * 2; } -#pragma pop /* 80336DB4-80336EA0 3316F4 00EC+00 0/0 1/0 0/0 .text * calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader_v26::calcSizeMaterial(J3DMaterialBlock const* param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s" +u32 J3DModelLoader_v26::calcSizeMaterial(const J3DMaterialBlock* block, u32 flags) { + int padding = 0; + J3DMaterialFactory factory(*block); + u32 count = block->mMaterialNum; + int uniqueCount = factory.countUniqueMaterials(); + if (block->mpNameTable != NULL) { + padding = 0x10; + } + size_t size = padding + (count * sizeof(J3DMaterial*)); + + if ((flags & J3DMLF_UseUniqueMaterials) != 0) { + // calc for allocated materials as well + size += ALIGN_NEXT((u16)uniqueCount * sizeof(J3DMaterial), 0x20); + } + if ((flags & J3DMLF_UseUniqueMaterials) != 0) { + for (u32 i = 0; i < uniqueCount; i++) { + size += factory.calcSize(NULL, J3DMaterialFactory::MATERIAL_TYPE_NORMAL, i, flags); + } + } + for (u32 i = 0; i < count; i++) { + size += factory.calcSize(NULL, J3DMaterialFactory::MATERIAL_TYPE_NORMAL, i, flags); + } + return size; } -#pragma pop /* 80336EA0-80336F44 3317E0 00A4+00 2/2 0/0 0/0 .text * calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::calcSizeShape(J3DShapeBlock const* param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl.s" +u32 J3DModelLoader::calcSizeShape(const J3DShapeBlock* block, u32 flags) { + int size = 0; + J3DShapeFactory factory(*block); + int count = block->mShapeNum; + if (block->mpNameTable) { + size = 0x10; + } + size += count * sizeof(J3DShape*); + size += factory.calcSizeVcdVatCmdBuffer(count); + for (J3DModelHierarchy* hierarchy = mpModelHierarchy; hierarchy->mType != 0; hierarchy++) { + if (hierarchy->mType == 0x12) { + size += factory.calcSize(hierarchy->mValue, flags); + } + } + return size; } -#pragma pop /* 80336F44-80336F60 331884 001C+00 3/3 0/0 0/0 .text * calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::calcSizeTexture(J3DTextureBlock const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock.s" +u32 J3DModelLoader::calcSizeTexture(const J3DTextureBlock* block) { + // TODO: use sizeofs here. + int padding = 0; + if (block->mpNameTable) { + padding = 0x10; + } + return padding + 0xC; } -#pragma pop /* 80336F60-80336FF0 3318A0 0090+00 0/0 1/0 0/0 .text * calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader_v26::calcSizeMaterialTable(J3DMaterialBlock const* param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s" +u32 J3DModelLoader_v26::calcSizeMaterialTable(const J3DMaterialBlock* block, u32 flags) { + int size = 0; + u32 count = block->mMaterialNum; + J3DMaterialFactory factory(*block); + if (block->mpNameTable) { + size = 0x10; + } + size += (count * sizeof(J3DMaterial*)); + for (u16 i = 0; i < count; i++) { + size += factory.calcSize(NULL, J3DMaterialFactory::MATERIAL_TYPE_NORMAL, i, flags); + } + return size; } -#pragma pop /* 80336FF0-80337010 331930 0020+00 1/1 0/0 0/0 .text * calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::calcSizeTextureTable(J3DTextureBlock const* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock.s" +u32 J3DModelLoader::calcSizeTextureTable(const J3DTextureBlock* block) { + return calcSizeTexture(block); } -#pragma pop /* 80337010-803370A0 331950 0090+00 1/1 0/0 0/0 .text * calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::calcSizePatchedMaterial(J3DMaterialBlock const* param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl.s" +u32 J3DModelLoader::calcSizePatchedMaterial(const J3DMaterialBlock* block, u32 flags) { + int padding = 0; + u32 count = block->mMaterialNum; + J3DMaterialFactory factory(*block); + if (block->mpNameTable) { + padding = 0x10; + } + u32 size = padding + (count * sizeof(J3DMaterial*)); + for (u16 i = 0; i < count; i++) { + size += factory.calcSize(NULL, J3DMaterialFactory::MATERIAL_TYPE_PATCHED, i, flags); + } + return size; } -#pragma pop /* 803370A0-80337178 3319E0 00D8+00 1/1 0/0 0/0 .text * calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModelLoader::calcSizeMaterialDL(J3DMaterialDLBlock const* param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl.s" +u32 J3DModelLoader::calcSizeMaterialDL(const J3DMaterialDLBlock* block, u32 flags_) { + int flags = flags_; + size_t size = 0; + J3DMaterialFactory factory(*block); + ; + if (!field_0x18) { + u32 count = block->mMaterialNum; + if (block->mpNameTable) { + size = 0x10; + } + size += count * sizeof(J3DLockedMaterial*); + for (u16 i = 0; i < count; i++) { + size += factory.calcSize(NULL, J3DMaterialFactory::MATERIAL_TYPE_LOCKED, i, flags); + } + } else { + u32 count = block->mMaterialNum; + for (u16 i = 0; i < count; i++) { + size += factory.calcSize((J3DMaterial*)this, J3DMaterialFactory::MATERIAL_TYPE_LOCKED, i, flags); + } + } + return size; } -#pragma pop /* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp index 7dccec3d596..bc559afe8c3 100644 --- a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp +++ b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp @@ -7,6 +7,8 @@ #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "d/kankyo/d_kankyo_rain.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "SSystem/SComponent/c_math.h" #include "dol2asm.h" @@ -222,7 +224,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { fogInfo_p = material_p->getFog()->getFogInfo(); } - fogInfo_p->field_0x0 = 2; + fogInfo_p->mType = 2; } // these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData? @@ -234,7 +236,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { fogInfo_p = material_p->getFog()->getFogInfo(); } - fogInfo_p->field_0x0 = 2; + fogInfo_p->mType = 2; } // these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData? @@ -246,7 +248,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { fogInfo_p = material_p->getFog()->getFogInfo(); } - fogInfo_p->field_0x0 = 2; + fogInfo_p->mType = 2; } if ((g_env_light.mVrKasumiCol.r + g_env_light.mVrKasumiCol.g + @@ -429,7 +431,7 @@ SECTION_DEAD static char const* const stringBase_80499AD4 = "R_SP30"; #pragma pop /* 804990DC-804997E8 0006DC 070C+00 1/1 0/0 0/0 .text daVrbox2_color_set__FP12vrbox2_class */ -// one small weird block and some regalloc at the end +// some regalloc at the end #ifdef NONMATCHING static int daVrbox2_color_set(vrbox2_class* i_this) { dKankyo_sun_Packet* sun_p = g_env_light.mpSunPacket; @@ -492,8 +494,6 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { J3DMaterial* material_1 = modelData->getMaterialNodePointer(1); if (material_1 != NULL) { - material_1->setCullMode(0); - if (material_1->getTexMtx(0) != NULL) { J3DTexMtxInfo& mtx_info = material_1->getTexMtx(0)->getTexMtxInfo(); mtx_info.mSRT.mTranslationX += var_f29 * 4.4f; diff --git a/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp b/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp index 123ab53014c..76d9078b311 100644 --- a/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp +++ b/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp @@ -4,129 +4,18 @@ */ #include "rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h" -#include "dol2asm.h" - - - -// -// Forward References: -// - -extern "C" void __ct__14daRfHole_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__10daRfHole_cFv(); -extern "C" void CreateHeap__10daRfHole_cFv(); -extern "C" void create__10daRfHole_cFv(); -extern "C" void rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" void playerAreaCheck__10daRfHole_cFv(); -extern "C" void Execute__10daRfHole_cFPPA3_A4_f(); -extern "C" void holeProc__10daRfHole_cFv(); -extern "C" void init_modeWait__10daRfHole_cFv(); -extern "C" void modeWait__10daRfHole_cFv(); -extern "C" void init_modeBreak__10daRfHole_cFv(); -extern "C" void modeBreak__10daRfHole_cFv(); -extern "C" void init_modeBreakEff__10daRfHole_cFv(); -extern "C" void modeBreakEff__10daRfHole_cFv(); -extern "C" void init_modeEnd__10daRfHole_cFv(); -extern "C" void modeEnd__10daRfHole_cFv(); -extern "C" void setBreakEffect__10daRfHole_cFv(); -extern "C" void Draw__10daRfHole_cFv(); -extern "C" void Delete__10daRfHole_cFv(); -extern "C" static void daRfHole_Draw__FP10daRfHole_c(); -extern "C" static void daRfHole_Execute__FP10daRfHole_c(); -extern "C" static void daRfHole_Delete__FP10daRfHole_c(); -extern "C" static void daRfHole_Create__FP10fopAc_ac_c(); -extern "C" void __dt__14daRfHole_HIO_cFv(); -extern "C" void __sinit_d_a_obj_rfHole_cpp(); -extern "C" extern char const* const d_a_obj_rfHole__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -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 dComIfGp_getReverb__Fi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__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 __pl__4cXyzCFRC3Vec(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80CB9A84-80CB9A88 000000 0004+00 4/4 0/0 0/0 .rodata @3649 */ -SECTION_RODATA static f32 const lit_3649 = 130.0f; -COMPILER_STRIP_GATE(0x80CB9A84, &lit_3649); - -/* 80CB9A88-80CB9A8C 000004 0004+00 0/1 0/0 0/0 .rodata @3650 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3650 = 200.0f; -COMPILER_STRIP_GATE(0x80CB9A88, &lit_3650); -#pragma pop - -/* 80CB9A8C-80CB9A94 000008 0004+04 0/4 0/0 0/0 .rodata @3651 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3651[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CB9A8C, &lit_3651); -#pragma pop +#include "d/com/d_com_inf_game.h" +#include "d/bg/d_bg_w.h" /* 80CB9ACC-80CB9AD8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80CB9AD8-80CB9AEC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -136,458 +25,241 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80CB9AEC-80CB9AF8 -00001 000C+00 0/1 0/0 0/0 .data @3835 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3835[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__10daRfHole_cFv, -}; -#pragma pop - -/* 80CB9AF8-80CB9B04 -00001 000C+00 0/1 0/0 0/0 .data @3836 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3836[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreak__10daRfHole_cFv, -}; -#pragma pop - -/* 80CB9B04-80CB9B10 -00001 000C+00 0/1 0/0 0/0 .data @3837 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3837[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreakEff__10daRfHole_cFv, -}; -#pragma pop - -/* 80CB9B10-80CB9B1C -00001 000C+00 0/1 0/0 0/0 .data @3838 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3838[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeEnd__10daRfHole_cFv, -}; -#pragma pop - -/* 80CB9B1C-80CB9B4C 000050 0030+00 0/1 0/0 0/0 .data mode_proc$3834 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80CB9B4C-80CB9B6C -00001 0020+00 1/0 0/0 0/0 .data l_daRfHole_Method */ -static actor_method_class l_daRfHole_Method = { - (process_method_func)daRfHole_Create__FP10fopAc_ac_c, - (process_method_func)daRfHole_Delete__FP10daRfHole_c, - (process_method_func)daRfHole_Execute__FP10daRfHole_c, - 0, - (process_method_func)daRfHole_Draw__FP10daRfHole_c, -}; - -/* 80CB9B6C-80CB9B9C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RfHole */ -extern actor_process_profile_definition g_profile_Obj_RfHole = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RfHole, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daRfHole_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 514, // mPriority - &l_daRfHole_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80CB9B9C-80CB9BC4 0000D0 0028+00 1/1 0/0 0/0 .data __vt__10daRfHole_c */ -SECTION_DATA extern void* __vt__10daRfHole_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__10daRfHole_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__10daRfHole_cFPPA3_A4_f, - (void*)Draw__10daRfHole_cFv, - (void*)Delete__10daRfHole_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80CB9BC4-80CB9BD0 0000F8 000C+00 2/2 0/0 0/0 .data __vt__14daRfHole_HIO_c */ -SECTION_DATA extern void* __vt__14daRfHole_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daRfHole_HIO_cFv, -}; - -/* 80CB9BD0-80CB9BDC 000104 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; - /* 80CB8E6C-80CB8EBC 0000EC 0050+00 1/1 0/0 0/0 .text __ct__14daRfHole_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daRfHole_HIO_c::daRfHole_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__ct__14daRfHole_HIO_cFv.s" -} -#pragma pop - -/* 80CB8EBC-80CB8F04 00013C 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// 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_rfHole/d_a_obj_rfHole/__dt__14mDoHIO_entry_cFv.s" +daRfHole_HIO_c::daRfHole_HIO_c() { + field_0x04 = 130.0f; + field_0x08 = 200.0f; + field_0x10 = 0.0f; + field_0x0c = 200.0f; + field_0x14 = 10; + field_0x15 = 4; } -#pragma pop /* 80CB8F04-80CB8F8C 000184 0088+00 2/2 0/0 0/0 .text setBaseMtx__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/setBaseMtx__10daRfHole_cFv.s" +void daRfHole_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mModel->setBaseScale(scale); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80CB9AC0-80CB9AC0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CB9AC0 = "Otosiana"; -#pragma pop /* 80CB8F8C-80CB8FF8 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/CreateHeap__10daRfHole_cFv.s" +int daRfHole_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Otosiana", 4); + JUT_ASSERT(167, modelData!=0); + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + return mModel != NULL ? 1 : 0; } -#pragma pop /* 80CB8FF8-80CB9148 000278 0150+00 1/1 0/0 0/0 .text create__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/create__10daRfHole_cFv.s" +int daRfHole_c::create() { + fopAcM_SetupActor(this, daRfHole_c); + int rv = dComIfG_resLoad(&mPhase, "Otosiana"); + if (rv == cPhs_COMPLEATE_e) { + if (MoveBGCreate("Otosiana", 7, dBgS_MoveBGProc_TypicalRotY, 0xb40, NULL) == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mModel->getModelData()); + if (fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this))) { + init_modeEnd(); + } else { + field_0x5ad = (fopAcM_GetParam(this) >> 8) & 0xff; + if (field_0x5ad != 1) { + mpBgW->SetRideCallback(rideCallBack); + init_modeWait(); + } else { + init_modeBreakEff(); + } + } + field_0x5ae = 0; + mRoofSoundOn = 0; + setBaseMtx(); + } + return rv; } -#pragma pop /* 80CB9148-80CB9194 0003C8 004C+00 1/1 0/0 0/0 .text * rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s" +void daRfHole_c::rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { + if (fopAcM_GetName(param_3) == PROC_ALINK && static_cast(param_2)->playerAreaCheck()) { + static_cast(param_2)->field_0x5ae = 1; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80CB9A94-80CB9A9C 000010 0008+00 0/1 0/0 0/0 .rodata @3817 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3817[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CB9A94, &lit_3817); -#pragma pop - -/* 80CB9A9C-80CB9AA4 000018 0008+00 0/1 0/0 0/0 .rodata @3818 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3818[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CB9A9C, &lit_3818); -#pragma pop - -/* 80CB9AA4-80CB9AAC 000020 0008+00 0/1 0/0 0/0 .rodata @3819 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3819[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CB9AA4, &lit_3819); -#pragma pop - -/* 80CB9AAC-80CB9AB0 000028 0004+00 0/3 0/0 0/0 .rodata @3820 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3820 = 1.0f; -COMPILER_STRIP_GATE(0x80CB9AAC, &lit_3820); -#pragma pop - -/* 80CB9AB0-80CB9AB4 00002C 0004+00 0/2 0/0 0/0 .rodata @3821 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3821 = -1.0f; -COMPILER_STRIP_GATE(0x80CB9AB0, &lit_3821); -#pragma pop - -/* 80CB9BE8-80CB9BF4 000008 000C+00 1/1 0/0 0/0 .bss @3643 */ -static u8 lit_3643[12]; /* 80CB9BF4-80CB9C0C 000014 0018+00 4/4 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[24]; +static daRfHole_HIO_c l_HIO; /* 80CB9194-80CB940C 000414 0278+00 1/1 0/0 0/0 .text playerAreaCheck__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::playerAreaCheck() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/playerAreaCheck__10daRfHole_cFv.s" +int daRfHole_c::playerAreaCheck() { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz cStack_30(l_HIO.field_0x0c, 0.0f, 0.0f); + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::multVec(&cStack_30, &cStack_30); + cXyz cStack_3c = current.pos + cStack_30; + cXyz cStack_48 = cStack_3c - player->current.pos; + f32 dVar8 = cStack_48.absXZ(); + int rv = 0; + if (dVar8 <= l_HIO.field_0x04) { + rv = 1; + } + u8 soundOn = 0; + if (dVar8 <= l_HIO.field_0x08) { + soundOn = 1; + if (mRoofSoundOn != 1) { + mDoAud_seStart(Z2SE_OBJ_ROOF_ANA, &cStack_3c, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + } + mRoofSoundOn = soundOn; + return rv; } -#pragma pop /* 80CB940C-80CB9464 00068C 0058+00 1/0 0/0 0/0 .text Execute__10daRfHole_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Execute__10daRfHole_cFPPA3_A4_f.s" +int daRfHole_c::Execute(f32 (**param_1)[3][4]) { + holeProc(); + *param_1 = &mModel->getBaseTRMtx(); + setBaseMtx(); + field_0x5ae = 0; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CB9C0C-80CB9C10 00002C 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80CB9C0C[4]; /* 80CB9464-80CB9520 0006E4 00BC+00 1/1 0/0 0/0 .text holeProc__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::holeProc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/holeProc__10daRfHole_cFv.s" +void daRfHole_c::holeProc() { + static ModeFunc mode_proc[] = {&daRfHole_c::modeWait, &daRfHole_c::modeBreak, + &daRfHole_c::modeBreakEff, &daRfHole_c::modeEnd}; + (this->*(mode_proc[mMode]))(); } -#pragma pop /* 80CB9520-80CB952C 0007A0 000C+00 1/1 0/0 0/0 .text init_modeWait__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::init_modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeWait__10daRfHole_cFv.s" +void daRfHole_c::init_modeWait() { + mMode = MODE_WAIT; } -#pragma pop /* 80CB952C-80CB9558 0007AC 002C+00 1/0 0/0 0/0 .text modeWait__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeWait__10daRfHole_cFv.s" +void daRfHole_c::modeWait() { + if (field_0x5ae != 0) { + init_modeBreak(); + } } -#pragma pop /* 80CB9558-80CB96AC 0007D8 0154+00 1/1 0/0 0/0 .text init_modeBreak__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::init_modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeBreak__10daRfHole_cFv.s" +void daRfHole_c::init_modeBreak() { + setBreakEffect(); + dComIfGp_getVibration().StartShock(l_HIO.field_0x15, 15, cXyz(0.0f, 1.0f, 0.0f)); + cXyz acStack_20(l_HIO.field_0x0c, 0.0f, 0.0f); + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::multVec(&acStack_20, &acStack_20); + cXyz cStack_2c = current.pos + acStack_20; + mDoAud_seStart(Z2SE_OBJ_WOODROOF_BREAK, &cStack_2c, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + fopAcM_onSwitch(this, (u8)fopAcM_GetParam(this)); + mMode = MODE_BREAK; } -#pragma pop /* 80CB96AC-80CB96CC 00092C 0020+00 1/0 0/0 0/0 .text modeBreak__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeBreak__10daRfHole_cFv.s" +void daRfHole_c::modeBreak() { + fopAcM_delete(this); } -#pragma pop /* 80CB96CC-80CB971C 00094C 0050+00 1/1 0/0 0/0 .text init_modeBreakEff__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::init_modeBreakEff() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeBreakEff__10daRfHole_cFv.s" +void daRfHole_c::init_modeBreakEff() { + setBreakEffect(); + fopAcM_onSwitch(this, (u8)fopAcM_GetParam(this)); + mMode = MODE_BREAK_EFF; } -#pragma pop /* 80CB971C-80CB973C 00099C 0020+00 1/0 0/0 0/0 .text modeBreakEff__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::modeBreakEff() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeBreakEff__10daRfHole_cFv.s" +void daRfHole_c::modeBreakEff() { + fopAcM_delete(this); } -#pragma pop /* 80CB973C-80CB9748 0009BC 000C+00 1/1 0/0 0/0 .text init_modeEnd__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::init_modeEnd() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/init_modeEnd__10daRfHole_cFv.s" +void daRfHole_c::init_modeEnd() { + mMode = MODE_END; } -#pragma pop /* 80CB9748-80CB9768 0009C8 0020+00 1/0 0/0 0/0 .text modeEnd__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::modeEnd() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/modeEnd__10daRfHole_cFv.s" +void daRfHole_c::modeEnd() { + fopAcM_delete(this); } -#pragma pop - -/* ############################################################################################## */ -/* 80CB9AB4-80CB9AC0 000030 000A+02 0/1 0/0 0/0 .rodata particle_id$3917 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const particle_id[10 + 2 /* padding */] = { - 0x83, - 0xB0, - 0x83, - 0xB1, - 0x83, - 0xB2, - 0x83, - 0xB3, - 0x83, - 0xB4, - /* padding */ - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CB9AB4, &particle_id); -#pragma pop /* 80CB9768-80CB9878 0009E8 0110+00 2/2 0/0 0/0 .text setBreakEffect__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::setBreakEffect() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/setBreakEffect__10daRfHole_cFv.s" +void daRfHole_c::setBreakEffect() { + static u16 const particle_id[5] = { + 0x83B0, 0x83B1, 0x83B2, 0x83B3, 0x83B4, + }; + cXyz acStack_24(l_HIO.field_0x0c, 0.0f, 0.0f); + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::multVec(&acStack_24, &acStack_24); + cXyz cStack_30 = current.pos + acStack_24; + for (int i = 0; i < 5; i++) { + dComIfGp_particle_set(particle_id[i], &cStack_30, NULL, &scale, 0xff, 0, 0xffffffff, NULL, + NULL, NULL); + } } -#pragma pop /* 80CB9878-80CB991C 000AF8 00A4+00 1/0 0/0 0/0 .text Draw__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Draw__10daRfHole_cFv.s" +int daRfHole_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80CB991C-80CB994C 000B9C 0030+00 1/0 0/0 0/0 .text Delete__10daRfHole_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daRfHole_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/Delete__10daRfHole_cFv.s" +int daRfHole_c::Delete() { + dComIfG_resDelete(&mPhase, "Otosiana"); + return 1; } -#pragma pop /* 80CB994C-80CB9978 000BCC 002C+00 1/0 0/0 0/0 .text daRfHole_Draw__FP10daRfHole_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daRfHole_Draw(daRfHole_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Draw__FP10daRfHole_c.s" +static int daRfHole_Draw(daRfHole_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80CB9978-80CB9998 000BF8 0020+00 1/0 0/0 0/0 .text daRfHole_Execute__FP10daRfHole_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daRfHole_Execute(daRfHole_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Execute__FP10daRfHole_c.s" +static int daRfHole_Execute(daRfHole_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80CB9998-80CB99B8 000C18 0020+00 1/0 0/0 0/0 .text daRfHole_Delete__FP10daRfHole_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daRfHole_Delete(daRfHole_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Delete__FP10daRfHole_c.s" +static int daRfHole_Delete(daRfHole_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80CB99B8-80CB99D8 000C38 0020+00 1/0 0/0 0/0 .text daRfHole_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daRfHole_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/daRfHole_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80CB99D8-80CB9A34 000C58 005C+00 2/1 0/0 0/0 .text __dt__14daRfHole_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daRfHole_HIO_c::~daRfHole_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__dt__14daRfHole_HIO_cFv.s" +static int daRfHole_Create(fopAc_ac_c* i_this) { + fopAcM_GetID(i_this); + return static_cast(i_this)->create(); } -#pragma pop -/* 80CB9A34-80CB9A70 000CB4 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_rfHole_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_rfHole_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole/__sinit_d_a_obj_rfHole_cpp.s" -} -#pragma pop +/* 80CB9B4C-80CB9B6C -00001 0020+00 1/0 0/0 0/0 .data l_daRfHole_Method */ +static actor_method_class l_daRfHole_Method = { + (process_method_func)daRfHole_Create, + (process_method_func)daRfHole_Delete, + (process_method_func)daRfHole_Execute, + 0, + (process_method_func)daRfHole_Draw, +}; -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80CB9A34, __sinit_d_a_obj_rfHole_cpp); -#pragma pop +/* 80CB9B6C-80CB9B9C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RfHole */ +extern actor_process_profile_definition g_profile_Obj_RfHole = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_RfHole, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daRfHole_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 514, // mPriority + &l_daRfHole_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; /* 80CB9AC0-80CB9AC0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */