diff --git a/asm/d/bg/d_bg_w/RwgLineCheck__4cBgWFUsP11cBgS_LinChk.s b/asm/d/bg/d_bg_w/RwgLineCheck__4cBgWFUsP11cBgS_LinChk.s deleted file mode 100644 index 47ca40b663..0000000000 --- a/asm/d/bg/d_bg_w/RwgLineCheck__4cBgWFUsP11cBgS_LinChk.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_8007A200: -/* 8007A200 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8007A204 7C 08 02 A6 */ mflr r0 -/* 8007A208 90 01 00 74 */ stw r0, 0x74(r1) -/* 8007A20C 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007A210 48 2E 7F C1 */ bl _savegpr_26 -/* 8007A214 7C 7A 1B 78 */ mr r26, r3 -/* 8007A218 7C 9B 23 78 */ mr r27, r4 -/* 8007A21C 7C BC 2B 78 */ mr r28, r5 -/* 8007A220 3B A0 00 00 */ li r29, 0 -/* 8007A224 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8007A228 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8007A22C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007A230 3C 60 80 3B */ lis r3, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 8007A234 38 03 BB 84 */ addi r0, r3, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 8007A238 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007A23C 3B FC 00 24 */ addi r31, r28, 0x24 -lbl_8007A240: -/* 8007A240 80 7A 00 A0 */ lwz r3, 0xa0(r26) -/* 8007A244 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8007A248 57 7E 04 3E */ clrlwi r30, r27, 0x10 -/* 8007A24C 1C 1E 00 0A */ mulli r0, r30, 0xa -/* 8007A250 7C E3 02 14 */ add r7, r3, r0 -/* 8007A254 80 DA 00 9C */ lwz r6, 0x9c(r26) -/* 8007A258 38 61 00 14 */ addi r3, r1, 0x14 -/* 8007A25C A0 07 00 00 */ lhz r0, 0(r7) -/* 8007A260 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8007A264 7C 86 02 14 */ add r4, r6, r0 -/* 8007A268 A0 07 00 02 */ lhz r0, 2(r7) -/* 8007A26C 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8007A270 7C A6 02 14 */ add r5, r6, r0 -/* 8007A274 A0 07 00 04 */ lhz r0, 4(r7) -/* 8007A278 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8007A27C 7C C6 02 14 */ add r6, r6, r0 -/* 8007A280 80 FA 00 94 */ lwz r7, 0x94(r26) -/* 8007A284 1C 1E 00 18 */ mulli r0, r30, 0x18 -/* 8007A288 7C E7 02 14 */ add r7, r7, r0 -/* 8007A28C 48 1F 55 D1 */ bl setBg__8cM3dGTriFPC3VecPC3VecPC3VecPC8cM3dGPla -/* 8007A290 88 FC 00 54 */ lbz r7, 0x54(r28) -/* 8007A294 88 DC 00 53 */ lbz r6, 0x53(r28) -/* 8007A298 7F E3 FB 78 */ mr r3, r31 -/* 8007A29C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8007A2A0 38 A1 00 08 */ addi r5, r1, 8 -/* 8007A2A4 48 1F 0E 01 */ bl cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb -/* 8007A2A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007A2AC 41 82 00 48 */ beq lbl_8007A2F4 -/* 8007A2B0 7F 43 D3 78 */ mr r3, r26 -/* 8007A2B4 57 7B 04 3E */ clrlwi r27, r27, 0x10 -/* 8007A2B8 7F 64 DB 78 */ mr r4, r27 -/* 8007A2BC 80 BC 00 00 */ lwz r5, 0(r28) -/* 8007A2C0 81 9A 00 04 */ lwz r12, 4(r26) -/* 8007A2C4 81 8C 00 F8 */ lwz r12, 0xf8(r12) -/* 8007A2C8 7D 89 03 A6 */ mtctr r12 -/* 8007A2CC 4E 80 04 21 */ bctrl -/* 8007A2D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007A2D4 40 82 00 20 */ bne lbl_8007A2F4 -/* 8007A2D8 38 7C 00 24 */ addi r3, r28, 0x24 -/* 8007A2DC 38 81 00 08 */ addi r4, r1, 8 -/* 8007A2E0 48 1F 50 E1 */ bl SetEnd__8cM3dGLinFRC4cXyz -/* 8007A2E4 38 7C 00 14 */ addi r3, r28, 0x14 -/* 8007A2E8 7F 64 DB 78 */ mr r4, r27 -/* 8007A2EC 48 1E DE B9 */ bl SetPolyIndex__13cBgS_PolyInfoFi -/* 8007A2F0 3B A0 00 01 */ li r29, 1 -lbl_8007A2F4: -/* 8007A2F4 80 7A 00 98 */ lwz r3, 0x98(r26) -/* 8007A2F8 57 C0 18 38 */ slwi r0, r30, 3 -/* 8007A2FC 7C 03 02 2E */ lhzx r0, r3, r0 -/* 8007A300 28 00 FF FF */ cmplwi r0, 0xffff -/* 8007A304 41 82 00 0C */ beq lbl_8007A310 -/* 8007A308 7C 1B 03 78 */ mr r27, r0 -/* 8007A30C 4B FF FF 34 */ b lbl_8007A240 -lbl_8007A310: -/* 8007A310 3C 60 80 3B */ lis r3, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 8007A314 38 03 BB 84 */ addi r0, r3, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 8007A318 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007A31C 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8007A320 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8007A324 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007A328 7F A3 EB 78 */ mr r3, r29 -/* 8007A32C 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007A330 48 2E 7E ED */ bl _restgpr_26 -/* 8007A334 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8007A338 7C 08 03 A6 */ mtlr r0 -/* 8007A33C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8007A340 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/RwgSphChk__4dBgWFUsP11dBgS_SphChkPv.s b/asm/d/bg/d_bg_w/RwgSphChk__4dBgWFUsP11dBgS_SphChkPv.s deleted file mode 100644 index 869bada261..0000000000 --- a/asm/d/bg/d_bg_w/RwgSphChk__4dBgWFUsP11dBgS_SphChkPv.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_8007DB20: -/* 8007DB20 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8007DB24 7C 08 02 A6 */ mflr r0 -/* 8007DB28 90 01 00 74 */ stw r0, 0x74(r1) -/* 8007DB2C 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007DB30 48 2E 46 95 */ bl _savegpr_23 -/* 8007DB34 7C 78 1B 78 */ mr r24, r3 -/* 8007DB38 7C B9 2B 78 */ mr r25, r5 -/* 8007DB3C 7C DA 33 78 */ mr r26, r6 -/* 8007DB40 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8007DB44 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8007DB48 90 01 00 18 */ stw r0, 0x18(r1) -/* 8007DB4C 3C 60 80 3B */ lis r3, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 8007DB50 38 03 BB 84 */ addi r0, r3, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 8007DB54 90 01 00 18 */ stw r0, 0x18(r1) -/* 8007DB58 3B 60 00 00 */ li r27, 0 -lbl_8007DB5C: -/* 8007DB5C 83 D8 00 98 */ lwz r30, 0x98(r24) -/* 8007DB60 54 9D 04 3E */ clrlwi r29, r4, 0x10 -/* 8007DB64 54 9F 1B 78 */ rlwinm r31, r4, 3, 0xd, 0x1c -/* 8007DB68 7F 03 C3 78 */ mr r3, r24 -/* 8007DB6C 7F A4 EB 78 */ mr r4, r29 -/* 8007DB70 80 B9 00 24 */ lwz r5, 0x24(r25) -/* 8007DB74 81 98 00 04 */ lwz r12, 4(r24) -/* 8007DB78 81 8C 00 F8 */ lwz r12, 0xf8(r12) -/* 8007DB7C 7D 89 03 A6 */ mtctr r12 -/* 8007DB80 4E 80 04 21 */ bctrl -/* 8007DB84 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007DB88 40 82 00 A4 */ bne lbl_8007DC2C -/* 8007DB8C 80 78 00 A0 */ lwz r3, 0xa0(r24) -/* 8007DB90 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8007DB94 1C 1D 00 0A */ mulli r0, r29, 0xa -/* 8007DB98 7F 83 02 14 */ add r28, r3, r0 -/* 8007DB9C 80 D8 00 9C */ lwz r6, 0x9c(r24) -/* 8007DBA0 38 61 00 08 */ addi r3, r1, 8 -/* 8007DBA4 A0 1C 00 00 */ lhz r0, 0(r28) -/* 8007DBA8 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8007DBAC 7C 86 02 14 */ add r4, r6, r0 -/* 8007DBB0 A0 1C 00 02 */ lhz r0, 2(r28) -/* 8007DBB4 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8007DBB8 7C A6 02 14 */ add r5, r6, r0 -/* 8007DBBC A0 1C 00 04 */ lhz r0, 4(r28) -/* 8007DBC0 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8007DBC4 7C C6 02 14 */ add r6, r6, r0 -/* 8007DBC8 80 18 00 94 */ lwz r0, 0x94(r24) -/* 8007DBCC 1E FD 00 18 */ mulli r23, r29, 0x18 -/* 8007DBD0 7C E0 BA 14 */ add r7, r0, r23 -/* 8007DBD4 48 1F 1C 89 */ bl setBg__8cM3dGTriFPC3VecPC3VecPC3VecPC8cM3dGPla -/* 8007DBD8 7F 23 CB 78 */ mr r3, r25 -/* 8007DBDC 38 81 00 08 */ addi r4, r1, 8 -/* 8007DBE0 38 A0 00 00 */ li r5, 0 -/* 8007DBE4 48 1E E3 21 */ bl cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec -/* 8007DBE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007DBEC 41 82 00 40 */ beq lbl_8007DC2C -/* 8007DBF0 7F 23 CB 78 */ mr r3, r25 -/* 8007DBF4 80 98 00 9C */ lwz r4, 0x9c(r24) -/* 8007DBF8 A0 BC 00 00 */ lhz r5, 0(r28) -/* 8007DBFC A0 DC 00 02 */ lhz r6, 2(r28) -/* 8007DC00 A0 FC 00 04 */ lhz r7, 4(r28) -/* 8007DC04 80 18 00 94 */ lwz r0, 0x94(r24) -/* 8007DC08 7D 00 BA 14 */ add r8, r0, r23 -/* 8007DC0C 7F 49 D3 78 */ mr r9, r26 -/* 8007DC10 81 99 00 50 */ lwz r12, 0x50(r25) -/* 8007DC14 7D 89 03 A6 */ mtctr r12 -/* 8007DC18 4E 80 04 21 */ bctrl -/* 8007DC1C 38 79 00 14 */ addi r3, r25, 0x14 -/* 8007DC20 7F A4 EB 78 */ mr r4, r29 -/* 8007DC24 48 1E A5 81 */ bl SetPolyIndex__13cBgS_PolyInfoFi -/* 8007DC28 3B 60 00 01 */ li r27, 1 -lbl_8007DC2C: -/* 8007DC2C 7C 9E FA 2E */ lhzx r4, r30, r31 -/* 8007DC30 28 04 FF FF */ cmplwi r4, 0xffff -/* 8007DC34 41 82 00 08 */ beq lbl_8007DC3C -/* 8007DC38 4B FF FF 24 */ b lbl_8007DB5C -lbl_8007DC3C: -/* 8007DC3C 3C 60 80 3B */ lis r3, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 8007DC40 38 03 BB 84 */ addi r0, r3, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 8007DC44 90 01 00 18 */ stw r0, 0x18(r1) -/* 8007DC48 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8007DC4C 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8007DC50 90 01 00 18 */ stw r0, 0x18(r1) -/* 8007DC54 7F 63 DB 78 */ mr r3, r27 -/* 8007DC58 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007DC5C 48 2E 45 B5 */ bl _restgpr_23 -/* 8007DC60 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8007DC64 7C 08 03 A6 */ mtlr r0 -/* 8007DC68 38 21 00 70 */ addi r1, r1, 0x70 -/* 8007DC6C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__dt__11cBgW_GrpElmFv.s b/asm/d/bg/d_bg_w/__dt__11cBgW_GrpElmFv.s deleted file mode 100644 index 8705e72c08..0000000000 --- a/asm/d/bg/d_bg_w/__dt__11cBgW_GrpElmFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8007A184: -/* 8007A184 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007A188 7C 08 02 A6 */ mflr r0 -/* 8007A18C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007A190 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007A194 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8007A198 41 82 00 34 */ beq lbl_8007A1CC -/* 8007A19C 3C 60 80 3B */ lis r3, __vt__11cBgW_GrpElm@ha /* 0x803ABB90@ha */ -/* 8007A1A0 38 03 BB 90 */ addi r0, r3, __vt__11cBgW_GrpElm@l /* 0x803ABB90@l */ -/* 8007A1A4 90 1F 00 00 */ stw r0, 0(r31) -/* 8007A1A8 34 1F 00 04 */ addic. r0, r31, 4 -/* 8007A1AC 41 82 00 10 */ beq lbl_8007A1BC -/* 8007A1B0 3C 60 80 3A */ lis r3, __vt__8cM3dGAab@ha /* 0x803A7218@ha */ -/* 8007A1B4 38 03 72 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x803A7218@l */ -/* 8007A1B8 90 1F 00 1C */ stw r0, 0x1c(r31) -lbl_8007A1BC: -/* 8007A1BC 7C 80 07 35 */ extsh. r0, r4 -/* 8007A1C0 40 81 00 0C */ ble lbl_8007A1CC -/* 8007A1C4 7F E3 FB 78 */ mr r3, r31 -/* 8007A1C8 48 25 4B 75 */ bl __dl__FPv -lbl_8007A1CC: -/* 8007A1CC 7F E3 FB 78 */ mr r3, r31 -/* 8007A1D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007A1D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007A1D8 7C 08 03 A6 */ mtlr r0 -/* 8007A1DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007A1E0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__dt__11cBgW_TriElmFv.s b/asm/d/bg/d_bg_w/__dt__11cBgW_TriElmFv.s deleted file mode 100644 index e5bce89613..0000000000 --- a/asm/d/bg/d_bg_w/__dt__11cBgW_TriElmFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800796F8: -/* 800796F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800796FC 7C 08 02 A6 */ mflr r0 -/* 80079700 90 01 00 14 */ stw r0, 0x14(r1) -/* 80079704 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80079708 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8007970C 41 82 00 30 */ beq lbl_8007973C -/* 80079710 3C 60 80 3B */ lis r3, __vt__11cBgW_TriElm@ha /* 0x803ABB9C@ha */ -/* 80079714 38 03 BB 9C */ addi r0, r3, __vt__11cBgW_TriElm@l /* 0x803ABB9C@l */ -/* 80079718 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8007971C 41 82 00 10 */ beq lbl_8007972C -/* 80079720 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80079724 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80079728 90 1F 00 10 */ stw r0, 0x10(r31) -lbl_8007972C: -/* 8007972C 7C 80 07 35 */ extsh. r0, r4 -/* 80079730 40 81 00 0C */ ble lbl_8007973C -/* 80079734 7F E3 FB 78 */ mr r3, r31 -/* 80079738 48 25 56 05 */ bl __dl__FPv -lbl_8007973C: -/* 8007973C 7F E3 FB 78 */ mr r3, r31 -/* 80079740 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80079744 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80079748 7C 08 03 A6 */ mtlr r0 -/* 8007974C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80079750 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__dt__4cBgWFv.s b/asm/d/bg/d_bg_w/__dt__4cBgWFv.s deleted file mode 100644 index be806f1f5b..0000000000 --- a/asm/d/bg/d_bg_w/__dt__4cBgWFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8007933C: -/* 8007933C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80079340 7C 08 02 A6 */ mflr r0 -/* 80079344 90 01 00 14 */ stw r0, 0x14(r1) -/* 80079348 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007934C 93 C1 00 08 */ stw r30, 8(r1) -/* 80079350 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80079354 7C 9F 23 78 */ mr r31, r4 -/* 80079358 41 82 00 30 */ beq lbl_80079388 -/* 8007935C 3C 80 80 3B */ lis r4, __vt__4cBgW@ha /* 0x803ABBA8@ha */ -/* 80079360 38 04 BB A8 */ addi r0, r4, __vt__4cBgW@l /* 0x803ABBA8@l */ -/* 80079364 90 1E 00 04 */ stw r0, 4(r30) -/* 80079368 48 00 00 3D */ bl FreeArea__4cBgWFv -/* 8007936C 7F C3 F3 78 */ mr r3, r30 -/* 80079370 38 80 00 00 */ li r4, 0 -/* 80079374 48 00 52 CD */ bl __dt__9dBgW_BaseFv -/* 80079378 7F E0 07 35 */ extsh. r0, r31 -/* 8007937C 40 81 00 0C */ ble lbl_80079388 -/* 80079380 7F C3 F3 78 */ mr r3, r30 -/* 80079384 48 25 59 B9 */ bl __dl__FPv -lbl_80079388: -/* 80079388 7F C3 F3 78 */ mr r3, r30 -/* 8007938C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80079390 83 C1 00 08 */ lwz r30, 8(r1) -/* 80079394 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80079398 7C 08 03 A6 */ mtlr r0 -/* 8007939C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800793A0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__dt__4dBgWFv.s b/asm/d/bg/d_bg_w/__dt__4dBgWFv.s deleted file mode 100644 index efc6229600..0000000000 --- a/asm/d/bg/d_bg_w/__dt__4dBgWFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8007E548: -/* 8007E548 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007E54C 7C 08 02 A6 */ mflr r0 -/* 8007E550 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007E554 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007E558 93 C1 00 08 */ stw r30, 8(r1) -/* 8007E55C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8007E560 7C 9F 23 78 */ mr r31, r4 -/* 8007E564 41 82 00 28 */ beq lbl_8007E58C -/* 8007E568 3C 80 80 3B */ lis r4, __vt__4dBgW@ha /* 0x803ABA80@ha */ -/* 8007E56C 38 04 BA 80 */ addi r0, r4, __vt__4dBgW@l /* 0x803ABA80@l */ -/* 8007E570 90 1E 00 04 */ stw r0, 4(r30) -/* 8007E574 38 80 00 00 */ li r4, 0 -/* 8007E578 4B FF AD C5 */ bl __dt__4cBgWFv -/* 8007E57C 7F E0 07 35 */ extsh. r0, r31 -/* 8007E580 40 81 00 0C */ ble lbl_8007E58C -/* 8007E584 7F C3 F3 78 */ mr r3, r30 -/* 8007E588 48 25 07 B5 */ bl __dl__FPv -lbl_8007E58C: -/* 8007E58C 7F C3 F3 78 */ mr r3, r30 -/* 8007E590 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007E594 83 C1 00 08 */ lwz r30, 8(r1) -/* 8007E598 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007E59C 7C 08 03 A6 */ mtlr r0 -/* 8007E5A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007E5A4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w/__dt__8cM3dGTriFv.s b/asm/d/bg/d_bg_w/__dt__8cM3dGTriFv.s deleted file mode 100644 index 560f60c7fb..0000000000 --- a/asm/d/bg/d_bg_w/__dt__8cM3dGTriFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8007A344: -/* 8007A344 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8007A348 7C 08 02 A6 */ mflr r0 -/* 8007A34C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8007A350 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8007A354 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8007A358 41 82 00 30 */ beq lbl_8007A388 -/* 8007A35C 3C 60 80 3B */ lis r3, __vt__8cM3dGTri@ha /* 0x803ABB84@ha */ -/* 8007A360 38 03 BB 84 */ addi r0, r3, __vt__8cM3dGTri@l /* 0x803ABB84@l */ -/* 8007A364 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8007A368 41 82 00 10 */ beq lbl_8007A378 -/* 8007A36C 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8007A370 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8007A374 90 1F 00 10 */ stw r0, 0x10(r31) -lbl_8007A378: -/* 8007A378 7C 80 07 35 */ extsh. r0, r4 -/* 8007A37C 40 81 00 0C */ ble lbl_8007A388 -/* 8007A380 7F E3 FB 78 */ mr r3, r31 -/* 8007A384 48 25 49 B9 */ bl __dl__FPv -lbl_8007A388: -/* 8007A388 7F E3 FB 78 */ mr r3, r31 -/* 8007A38C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8007A390 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007A394 7C 08 03 A6 */ mtlr r0 -/* 8007A398 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007A39C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w_sv/CrrPosWork__6dBgWSvFP4cXyziii.s b/asm/d/bg/d_bg_w_sv/CrrPosWork__6dBgWSvFP4cXyziii.s deleted file mode 100644 index 39955bd037..0000000000 --- a/asm/d/bg/d_bg_w_sv/CrrPosWork__6dBgWSvFP4cXyziii.s +++ /dev/null @@ -1,116 +0,0 @@ -lbl_8008308C: -/* 8008308C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80083090 81 03 00 C0 */ lwz r8, 0xc0(r3) -/* 80083094 1D 26 00 0C */ mulli r9, r6, 0xc -/* 80083098 7C 08 4C 2E */ lfsx f0, r8, r9 -/* 8008309C 1C C5 00 0C */ mulli r6, r5, 0xc -/* 800830A0 7C E8 34 2E */ lfsx f7, r8, r6 -/* 800830A4 EC C0 38 28 */ fsubs f6, f0, f7 -/* 800830A8 D0 C1 00 2C */ stfs f6, 0x2c(r1) -/* 800830AC 38 A8 00 04 */ addi r5, r8, 4 -/* 800830B0 7C 05 4C 2E */ lfsx f0, r5, r9 -/* 800830B4 7C 65 34 2E */ lfsx f3, r5, r6 -/* 800830B8 EC 00 18 28 */ fsubs f0, f0, f3 -/* 800830BC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 800830C0 39 48 00 08 */ addi r10, r8, 8 -/* 800830C4 7C 0A 4C 2E */ lfsx f0, r10, r9 -/* 800830C8 7C 2A 34 2E */ lfsx f1, r10, r6 -/* 800830CC EC 40 08 28 */ fsubs f2, f0, f1 -/* 800830D0 D0 41 00 34 */ stfs f2, 0x34(r1) -/* 800830D4 1C E7 00 0C */ mulli r7, r7, 0xc -/* 800830D8 7C 08 3C 2E */ lfsx f0, r8, r7 -/* 800830DC EC A0 38 28 */ fsubs f5, f0, f7 -/* 800830E0 D0 A1 00 20 */ stfs f5, 0x20(r1) -/* 800830E4 7C 05 3C 2E */ lfsx f0, r5, r7 -/* 800830E8 EC 00 18 28 */ fsubs f0, f0, f3 -/* 800830EC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 800830F0 7C 0A 3C 2E */ lfsx f0, r10, r7 -/* 800830F4 EC 80 08 28 */ fsubs f4, f0, f1 -/* 800830F8 D0 81 00 28 */ stfs f4, 0x28(r1) -/* 800830FC FC 00 12 10 */ fabs f0, f2 -/* 80083100 FC 00 00 18 */ frsp f0, f0 -/* 80083104 C0 2D 8C 00 */ lfs f1, G_CM3D_F_ABS_MIN(r13) -/* 80083108 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8008310C 41 80 00 14 */ blt lbl_80083120 -/* 80083110 FC 00 22 10 */ fabs f0, f4 -/* 80083114 FC 00 00 18 */ frsp f0, f0 -/* 80083118 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8008311C 40 80 00 0C */ bge lbl_80083128 -lbl_80083120: -/* 80083120 38 60 00 01 */ li r3, 1 -/* 80083124 48 00 01 18 */ b lbl_8008323C -lbl_80083128: -/* 80083128 EC 65 20 24 */ fdivs f3, f5, f4 -/* 8008312C EC 02 00 F2 */ fmuls f0, f2, f3 -/* 80083130 ED 06 00 28 */ fsubs f8, f6, f0 -/* 80083134 EC 46 10 24 */ fdivs f2, f6, f2 -/* 80083138 EC 04 00 B2 */ fmuls f0, f4, f2 -/* 8008313C EC A5 00 28 */ fsubs f5, f5, f0 -/* 80083140 FC 00 42 10 */ fabs f0, f8 -/* 80083144 FC 00 00 18 */ frsp f0, f0 -/* 80083148 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8008314C 41 80 00 14 */ blt lbl_80083160 -/* 80083150 FC 00 2A 10 */ fabs f0, f5 -/* 80083154 FC 00 00 18 */ frsp f0, f0 -/* 80083158 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8008315C 40 80 00 0C */ bge lbl_80083168 -lbl_80083160: -/* 80083160 38 60 00 01 */ li r3, 1 -/* 80083164 48 00 00 D8 */ b lbl_8008323C -lbl_80083168: -/* 80083168 C0 04 00 00 */ lfs f0, 0(r4) -/* 8008316C EC 00 38 28 */ fsubs f0, f0, f7 -/* 80083170 D0 04 00 00 */ stfs f0, 0(r4) -/* 80083174 C0 24 00 08 */ lfs f1, 8(r4) -/* 80083178 80 03 00 C0 */ lwz r0, 0xc0(r3) -/* 8008317C 7C A0 32 14 */ add r5, r0, r6 -/* 80083180 C0 05 00 08 */ lfs f0, 8(r5) -/* 80083184 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80083188 D0 04 00 08 */ stfs f0, 8(r4) -/* 8008318C C0 84 00 00 */ lfs f4, 0(r4) -/* 80083190 C0 24 00 08 */ lfs f1, 8(r4) -/* 80083194 EC 01 00 F2 */ fmuls f0, f1, f3 -/* 80083198 EC 04 00 28 */ fsubs f0, f4, f0 -/* 8008319C EC C0 40 24 */ fdivs f6, f0, f8 -/* 800831A0 EC 01 00 B2 */ fmuls f0, f1, f2 -/* 800831A4 EC 04 00 28 */ fsubs f0, f4, f0 -/* 800831A8 EC E0 28 24 */ fdivs f7, f0, f5 -/* 800831AC 80 A3 00 9C */ lwz r5, 0x9c(r3) -/* 800831B0 7C 05 4C 2E */ lfsx f0, r5, r9 -/* 800831B4 7C 45 34 2E */ lfsx f2, r5, r6 -/* 800831B8 EC 20 10 28 */ fsubs f1, f0, f2 -/* 800831BC D0 21 00 14 */ stfs f1, 0x14(r1) -/* 800831C0 39 05 00 08 */ addi r8, r5, 8 -/* 800831C4 7C 08 4C 2E */ lfsx f0, r8, r9 -/* 800831C8 7C A8 34 2E */ lfsx f5, r8, r6 -/* 800831CC EC 80 28 28 */ fsubs f4, f0, f5 -/* 800831D0 D0 81 00 1C */ stfs f4, 0x1c(r1) -/* 800831D4 7C 05 3C 2E */ lfsx f0, r5, r7 -/* 800831D8 EC 60 10 28 */ fsubs f3, f0, f2 -/* 800831DC D0 61 00 08 */ stfs f3, 8(r1) -/* 800831E0 7C 08 3C 2E */ lfsx f0, r8, r7 -/* 800831E4 EC 40 28 28 */ fsubs f2, f0, f5 -/* 800831E8 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 800831EC EC 26 00 72 */ fmuls f1, f6, f1 -/* 800831F0 EC 07 00 F2 */ fmuls f0, f7, f3 -/* 800831F4 EC 01 00 2A */ fadds f0, f1, f0 -/* 800831F8 D0 04 00 00 */ stfs f0, 0(r4) -/* 800831FC EC 26 01 32 */ fmuls f1, f6, f4 -/* 80083200 EC 07 00 B2 */ fmuls f0, f7, f2 -/* 80083204 EC 01 00 2A */ fadds f0, f1, f0 -/* 80083208 D0 04 00 08 */ stfs f0, 8(r4) -/* 8008320C C0 24 00 00 */ lfs f1, 0(r4) -/* 80083210 80 A3 00 9C */ lwz r5, 0x9c(r3) -/* 80083214 7C 05 34 2E */ lfsx f0, r5, r6 -/* 80083218 EC 01 00 2A */ fadds f0, f1, f0 -/* 8008321C D0 04 00 00 */ stfs f0, 0(r4) -/* 80083220 C0 24 00 08 */ lfs f1, 8(r4) -/* 80083224 80 03 00 9C */ lwz r0, 0x9c(r3) -/* 80083228 7C 60 32 14 */ add r3, r0, r6 -/* 8008322C C0 03 00 08 */ lfs f0, 8(r3) -/* 80083230 EC 01 00 2A */ fadds f0, f1, f0 -/* 80083234 D0 04 00 08 */ stfs f0, 8(r4) -/* 80083238 38 60 00 00 */ li r3, 0 -lbl_8008323C: -/* 8008323C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80083240 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w_sv/CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz.s b/asm/d/bg/d_bg_w_sv/CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz.s deleted file mode 100644 index 9ceb67f5c4..0000000000 --- a/asm/d/bg/d_bg_w_sv/CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80083244: -/* 80083244 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80083248 7C 08 02 A6 */ mflr r0 -/* 8008324C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80083250 39 61 00 20 */ addi r11, r1, 0x20 -/* 80083254 48 2D EF 81 */ bl _savegpr_27 -/* 80083258 7C 7B 1B 78 */ mr r27, r3 -/* 8008325C 7C FC 3B 78 */ mr r28, r7 -/* 80083260 88 03 00 C4 */ lbz r0, 0xc4(r3) -/* 80083264 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80083268 40 82 00 80 */ bne lbl_800832E8 -/* 8008326C 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 80083270 41 82 00 78 */ beq lbl_800832E8 -/* 80083274 A0 04 00 00 */ lhz r0, 0(r4) -/* 80083278 80 9B 00 A0 */ lwz r4, 0xa0(r27) -/* 8008327C 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80083280 1C 00 00 0A */ mulli r0, r0, 0xa -/* 80083284 7F E4 02 2E */ lhzx r31, r4, r0 -/* 80083288 7C 84 02 14 */ add r4, r4, r0 -/* 8008328C A3 C4 00 02 */ lhz r30, 2(r4) -/* 80083290 A3 A4 00 04 */ lhz r29, 4(r4) -/* 80083294 7F 84 E3 78 */ mr r4, r28 -/* 80083298 7F E5 FB 78 */ mr r5, r31 -/* 8008329C 7F C6 F3 78 */ mr r6, r30 -/* 800832A0 7F A7 EB 78 */ mr r7, r29 -/* 800832A4 4B FF FD E9 */ bl CrrPosWork__6dBgWSvFP4cXyziii -/* 800832A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800832AC 41 82 00 3C */ beq lbl_800832E8 -/* 800832B0 7F 63 DB 78 */ mr r3, r27 -/* 800832B4 7F 84 E3 78 */ mr r4, r28 -/* 800832B8 7F C5 F3 78 */ mr r5, r30 -/* 800832BC 7F A6 EB 78 */ mr r6, r29 -/* 800832C0 7F E7 FB 78 */ mr r7, r31 -/* 800832C4 4B FF FD C9 */ bl CrrPosWork__6dBgWSvFP4cXyziii -/* 800832C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800832CC 41 82 00 1C */ beq lbl_800832E8 -/* 800832D0 7F 63 DB 78 */ mr r3, r27 -/* 800832D4 7F 84 E3 78 */ mr r4, r28 -/* 800832D8 7F A5 EB 78 */ mr r5, r29 -/* 800832DC 7F E6 FB 78 */ mr r6, r31 -/* 800832E0 7F C7 F3 78 */ mr r7, r30 -/* 800832E4 4B FF FD A9 */ bl CrrPosWork__6dBgWSvFP4cXyziii -lbl_800832E8: -/* 800832E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800832EC 48 2D EF 35 */ bl _restgpr_27 -/* 800832F0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800832F4 7C 08 03 A6 */ mtlr r0 -/* 800832F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800832FC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w_sv/TransPosWork__6dBgWSvFP4cXyziii.s b/asm/d/bg/d_bg_w_sv/TransPosWork__6dBgWSvFP4cXyziii.s deleted file mode 100644 index 2f4b829d8b..0000000000 --- a/asm/d/bg/d_bg_w_sv/TransPosWork__6dBgWSvFP4cXyziii.s +++ /dev/null @@ -1,143 +0,0 @@ -lbl_80083300: -/* 80083300 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80083304 81 03 00 C0 */ lwz r8, 0xc0(r3) -/* 80083308 1C 06 00 0C */ mulli r0, r6, 0xc -/* 8008330C 7C 08 04 2E */ lfsx f0, r8, r0 -/* 80083310 1C C5 00 0C */ mulli r6, r5, 0xc -/* 80083314 7C E8 34 2E */ lfsx f7, r8, r6 -/* 80083318 EC C0 38 28 */ fsubs f6, f0, f7 -/* 8008331C D0 C1 00 2C */ stfs f6, 0x2c(r1) -/* 80083320 38 A8 00 04 */ addi r5, r8, 4 -/* 80083324 7C 05 04 2E */ lfsx f0, r5, r0 -/* 80083328 7C 65 34 2E */ lfsx f3, r5, r6 -/* 8008332C EC 00 18 28 */ fsubs f0, f0, f3 -/* 80083330 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80083334 39 28 00 08 */ addi r9, r8, 8 -/* 80083338 7C 09 04 2E */ lfsx f0, r9, r0 -/* 8008333C 7C 29 34 2E */ lfsx f1, r9, r6 -/* 80083340 EC 40 08 28 */ fsubs f2, f0, f1 -/* 80083344 D0 41 00 34 */ stfs f2, 0x34(r1) -/* 80083348 1C E7 00 0C */ mulli r7, r7, 0xc -/* 8008334C 7C 08 3C 2E */ lfsx f0, r8, r7 -/* 80083350 EC A0 38 28 */ fsubs f5, f0, f7 -/* 80083354 D0 A1 00 20 */ stfs f5, 0x20(r1) -/* 80083358 7C 05 3C 2E */ lfsx f0, r5, r7 -/* 8008335C EC 00 18 28 */ fsubs f0, f0, f3 -/* 80083360 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80083364 7C 09 3C 2E */ lfsx f0, r9, r7 -/* 80083368 EC 80 08 28 */ fsubs f4, f0, f1 -/* 8008336C D0 81 00 28 */ stfs f4, 0x28(r1) -/* 80083370 FC 00 12 10 */ fabs f0, f2 -/* 80083374 FC 00 00 18 */ frsp f0, f0 -/* 80083378 C0 2D 8C 00 */ lfs f1, G_CM3D_F_ABS_MIN(r13) -/* 8008337C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80083380 41 80 00 14 */ blt lbl_80083394 -/* 80083384 FC 00 22 10 */ fabs f0, f4 -/* 80083388 FC 00 00 18 */ frsp f0, f0 -/* 8008338C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80083390 40 80 00 0C */ bge lbl_8008339C -lbl_80083394: -/* 80083394 38 60 00 01 */ li r3, 1 -/* 80083398 48 00 01 7C */ b lbl_80083514 -lbl_8008339C: -/* 8008339C EC 65 20 24 */ fdivs f3, f5, f4 -/* 800833A0 EC 02 00 F2 */ fmuls f0, f2, f3 -/* 800833A4 ED 06 00 28 */ fsubs f8, f6, f0 -/* 800833A8 EC 46 10 24 */ fdivs f2, f6, f2 -/* 800833AC EC 04 00 B2 */ fmuls f0, f4, f2 -/* 800833B0 EC 85 00 28 */ fsubs f4, f5, f0 -/* 800833B4 FC 00 42 10 */ fabs f0, f8 -/* 800833B8 FC 00 00 18 */ frsp f0, f0 -/* 800833BC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 800833C0 41 80 00 14 */ blt lbl_800833D4 -/* 800833C4 FC 00 22 10 */ fabs f0, f4 -/* 800833C8 FC 00 00 18 */ frsp f0, f0 -/* 800833CC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 800833D0 40 80 00 0C */ bge lbl_800833DC -lbl_800833D4: -/* 800833D4 38 60 00 01 */ li r3, 1 -/* 800833D8 48 00 01 3C */ b lbl_80083514 -lbl_800833DC: -/* 800833DC C0 04 00 00 */ lfs f0, 0(r4) -/* 800833E0 EC A0 38 28 */ fsubs f5, f0, f7 -/* 800833E4 C0 24 00 08 */ lfs f1, 8(r4) -/* 800833E8 7C A8 32 14 */ add r5, r8, r6 -/* 800833EC C0 05 00 08 */ lfs f0, 8(r5) -/* 800833F0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 800833F4 EC 01 00 F2 */ fmuls f0, f1, f3 -/* 800833F8 EC 05 00 28 */ fsubs f0, f5, f0 -/* 800833FC ED 00 40 24 */ fdivs f8, f0, f8 -/* 80083400 EC 01 00 B2 */ fmuls f0, f1, f2 -/* 80083404 EC 05 00 28 */ fsubs f0, f5, f0 -/* 80083408 ED 20 20 24 */ fdivs f9, f0, f4 -/* 8008340C C0 22 8D 58 */ lfs f1, lit_3807(r2) -/* 80083410 FC 08 08 40 */ fcmpo cr0, f8, f1 -/* 80083414 41 80 00 20 */ blt lbl_80083434 -/* 80083418 C0 02 8D 5C */ lfs f0, lit_3808(r2) -/* 8008341C FC 08 00 40 */ fcmpo cr0, f8, f0 -/* 80083420 41 81 00 14 */ bgt lbl_80083434 -/* 80083424 FC 09 08 40 */ fcmpo cr0, f9, f1 -/* 80083428 41 80 00 0C */ blt lbl_80083434 -/* 8008342C FC 09 00 40 */ fcmpo cr0, f9, f0 -/* 80083430 40 81 00 0C */ ble lbl_8008343C -lbl_80083434: -/* 80083434 38 60 00 01 */ li r3, 1 -/* 80083438 48 00 00 DC */ b lbl_80083514 -lbl_8008343C: -/* 8008343C 80 A3 00 9C */ lwz r5, 0x9c(r3) -/* 80083440 7C 05 04 2E */ lfsx f0, r5, r0 -/* 80083444 7C 45 34 2E */ lfsx f2, r5, r6 -/* 80083448 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8008344C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80083450 39 05 00 04 */ addi r8, r5, 4 -/* 80083454 7C 08 04 2E */ lfsx f0, r8, r0 -/* 80083458 7C 68 34 2E */ lfsx f3, r8, r6 -/* 8008345C EC C0 18 28 */ fsubs f6, f0, f3 -/* 80083460 D0 C1 00 18 */ stfs f6, 0x18(r1) -/* 80083464 39 25 00 08 */ addi r9, r5, 8 -/* 80083468 7C 09 04 2E */ lfsx f0, r9, r0 -/* 8008346C 7C E9 34 2E */ lfsx f7, r9, r6 -/* 80083470 EC A0 38 28 */ fsubs f5, f0, f7 -/* 80083474 D0 A1 00 1C */ stfs f5, 0x1c(r1) -/* 80083478 7C 05 3C 2E */ lfsx f0, r5, r7 -/* 8008347C EC 80 10 28 */ fsubs f4, f0, f2 -/* 80083480 D0 81 00 08 */ stfs f4, 8(r1) -/* 80083484 7C 08 3C 2E */ lfsx f0, r8, r7 -/* 80083488 EC 60 18 28 */ fsubs f3, f0, f3 -/* 8008348C D0 61 00 0C */ stfs f3, 0xc(r1) -/* 80083490 7C 09 3C 2E */ lfsx f0, r9, r7 -/* 80083494 EC 40 38 28 */ fsubs f2, f0, f7 -/* 80083498 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 8008349C EC 28 00 72 */ fmuls f1, f8, f1 -/* 800834A0 EC 09 01 32 */ fmuls f0, f9, f4 -/* 800834A4 EC 01 00 2A */ fadds f0, f1, f0 -/* 800834A8 D0 04 00 00 */ stfs f0, 0(r4) -/* 800834AC EC 28 01 B2 */ fmuls f1, f8, f6 -/* 800834B0 EC 09 00 F2 */ fmuls f0, f9, f3 -/* 800834B4 EC 01 00 2A */ fadds f0, f1, f0 -/* 800834B8 D0 04 00 04 */ stfs f0, 4(r4) -/* 800834BC EC 28 01 72 */ fmuls f1, f8, f5 -/* 800834C0 EC 09 00 B2 */ fmuls f0, f9, f2 -/* 800834C4 EC 01 00 2A */ fadds f0, f1, f0 -/* 800834C8 D0 04 00 08 */ stfs f0, 8(r4) -/* 800834CC C0 24 00 00 */ lfs f1, 0(r4) -/* 800834D0 80 A3 00 9C */ lwz r5, 0x9c(r3) -/* 800834D4 7C 05 34 2E */ lfsx f0, r5, r6 -/* 800834D8 EC 01 00 2A */ fadds f0, f1, f0 -/* 800834DC D0 04 00 00 */ stfs f0, 0(r4) -/* 800834E0 C0 24 00 04 */ lfs f1, 4(r4) -/* 800834E4 80 03 00 9C */ lwz r0, 0x9c(r3) -/* 800834E8 7C A0 32 14 */ add r5, r0, r6 -/* 800834EC C0 05 00 04 */ lfs f0, 4(r5) -/* 800834F0 EC 01 00 2A */ fadds f0, f1, f0 -/* 800834F4 D0 04 00 04 */ stfs f0, 4(r4) -/* 800834F8 C0 24 00 08 */ lfs f1, 8(r4) -/* 800834FC 80 03 00 9C */ lwz r0, 0x9c(r3) -/* 80083500 7C 60 32 14 */ add r3, r0, r6 -/* 80083504 C0 03 00 08 */ lfs f0, 8(r3) -/* 80083508 EC 01 00 2A */ fadds f0, f1, f0 -/* 8008350C D0 04 00 08 */ stfs f0, 8(r4) -/* 80083510 38 60 00 00 */ li r3, 0 -lbl_80083514: -/* 80083514 38 21 00 40 */ addi r1, r1, 0x40 -/* 80083518 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w_sv/TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz.s b/asm/d/bg/d_bg_w_sv/TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz.s deleted file mode 100644 index 1cb8098417..0000000000 --- a/asm/d/bg/d_bg_w_sv/TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8008351C: -/* 8008351C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80083520 7C 08 02 A6 */ mflr r0 -/* 80083524 90 01 00 24 */ stw r0, 0x24(r1) -/* 80083528 39 61 00 20 */ addi r11, r1, 0x20 -/* 8008352C 48 2D EC A9 */ bl _savegpr_27 -/* 80083530 7C 7B 1B 78 */ mr r27, r3 -/* 80083534 7C FC 3B 78 */ mr r28, r7 -/* 80083538 88 03 00 C4 */ lbz r0, 0xc4(r3) -/* 8008353C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80083540 40 82 00 80 */ bne lbl_800835C0 -/* 80083544 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 80083548 41 82 00 78 */ beq lbl_800835C0 -/* 8008354C A0 04 00 00 */ lhz r0, 0(r4) -/* 80083550 80 9B 00 A0 */ lwz r4, 0xa0(r27) -/* 80083554 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80083558 1C 00 00 0A */ mulli r0, r0, 0xa -/* 8008355C 7F E4 02 2E */ lhzx r31, r4, r0 -/* 80083560 7C 84 02 14 */ add r4, r4, r0 -/* 80083564 A3 C4 00 02 */ lhz r30, 2(r4) -/* 80083568 A3 A4 00 04 */ lhz r29, 4(r4) -/* 8008356C 7F 84 E3 78 */ mr r4, r28 -/* 80083570 7F E5 FB 78 */ mr r5, r31 -/* 80083574 7F C6 F3 78 */ mr r6, r30 -/* 80083578 7F A7 EB 78 */ mr r7, r29 -/* 8008357C 4B FF FD 85 */ bl TransPosWork__6dBgWSvFP4cXyziii -/* 80083580 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80083584 41 82 00 3C */ beq lbl_800835C0 -/* 80083588 7F 63 DB 78 */ mr r3, r27 -/* 8008358C 7F 84 E3 78 */ mr r4, r28 -/* 80083590 7F C5 F3 78 */ mr r5, r30 -/* 80083594 7F A6 EB 78 */ mr r6, r29 -/* 80083598 7F E7 FB 78 */ mr r7, r31 -/* 8008359C 4B FF FD 65 */ bl TransPosWork__6dBgWSvFP4cXyziii -/* 800835A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800835A4 41 82 00 1C */ beq lbl_800835C0 -/* 800835A8 7F 63 DB 78 */ mr r3, r27 -/* 800835AC 7F 84 E3 78 */ mr r4, r28 -/* 800835B0 7F A5 EB 78 */ mr r5, r29 -/* 800835B4 7F E6 FB 78 */ mr r6, r31 -/* 800835B8 7F C7 F3 78 */ mr r7, r30 -/* 800835BC 4B FF FD 45 */ bl TransPosWork__6dBgWSvFP4cXyziii -lbl_800835C0: -/* 800835C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800835C4 48 2D EC 5D */ bl _restgpr_27 -/* 800835C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800835CC 7C 08 03 A6 */ mtlr r0 -/* 800835D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800835D4 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_w_sv/__dt__6dBgWSvFv.s b/asm/d/bg/d_bg_w_sv/__dt__6dBgWSvFv.s deleted file mode 100644 index 9f0041f8c2..0000000000 --- a/asm/d/bg/d_bg_w_sv/__dt__6dBgWSvFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800835DC: -/* 800835DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800835E0 7C 08 02 A6 */ mflr r0 -/* 800835E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800835E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800835EC 93 C1 00 08 */ stw r30, 8(r1) -/* 800835F0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 800835F4 7C 9F 23 78 */ mr r31, r4 -/* 800835F8 41 82 00 38 */ beq lbl_80083630 -/* 800835FC 3C 80 80 3B */ lis r4, __vt__6dBgWSv@ha /* 0x803ABEB8@ha */ -/* 80083600 38 04 BE B8 */ addi r0, r4, __vt__6dBgWSv@l /* 0x803ABEB8@l */ -/* 80083604 90 1E 00 04 */ stw r0, 4(r30) -/* 80083608 41 82 00 18 */ beq lbl_80083620 -/* 8008360C 3C 80 80 3B */ lis r4, __vt__4dBgW@ha /* 0x803ABA80@ha */ -/* 80083610 38 04 BA 80 */ addi r0, r4, __vt__4dBgW@l /* 0x803ABA80@l */ -/* 80083614 90 1E 00 04 */ stw r0, 4(r30) -/* 80083618 38 80 00 00 */ li r4, 0 -/* 8008361C 4B FF 5D 21 */ bl __dt__4cBgWFv -lbl_80083620: -/* 80083620 7F E0 07 35 */ extsh. r0, r31 -/* 80083624 40 81 00 0C */ ble lbl_80083630 -/* 80083628 7F C3 F3 78 */ mr r3, r30 -/* 8008362C 48 24 B7 11 */ bl __dl__FPv -lbl_80083630: -/* 80083630 7F C3 F3 78 */ mr r3, r30 -/* 80083634 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80083638 83 C1 00 08 */ lwz r30, 8(r1) -/* 8008363C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80083640 7C 08 03 A6 */ mtlr r0 -/* 80083644 38 21 00 10 */ addi r1, r1, 0x10 -/* 80083648 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/CreateHeap__16daObjHBombkoya_cFv.s b/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/CreateHeap__16daObjHBombkoya_cFv.s deleted file mode 100644 index 0c47620b12..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/CreateHeap__16daObjHBombkoya_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80C1B938: -/* 80C1B938 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C1B93C 7C 08 02 A6 */ mflr r0 -/* 80C1B940 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C1B944 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80C1B948 7C 7F 1B 78 */ mr r31, r3 -/* 80C1B94C 3C 60 80 C2 */ lis r3, l_arcName@ha /* 0x80C1C734@ha */ -/* 80C1B950 38 63 C7 34 */ addi r3, r3, l_arcName@l /* 0x80C1C734@l */ -/* 80C1B954 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1B958 38 80 00 04 */ li r4, 4 -/* 80C1B95C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1B960 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1B964 3C A5 00 02 */ addis r5, r5, 2 -/* 80C1B968 38 C0 00 80 */ li r6, 0x80 -/* 80C1B96C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C1B970 4B 42 09 7D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C1B974 3C 80 00 08 */ lis r4, 8 -/* 80C1B978 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C1B97C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C1B980 4B 3F 92 D5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C1B984 90 7F 06 18 */ stw r3, 0x618(r31) -/* 80C1B988 80 1F 06 18 */ lwz r0, 0x618(r31) -/* 80C1B98C 28 00 00 00 */ cmplwi r0, 0 -/* 80C1B990 40 82 00 0C */ bne lbl_80C1B99C -/* 80C1B994 38 60 00 00 */ li r3, 0 -/* 80C1B998 48 00 00 20 */ b lbl_80C1B9B8 -lbl_80C1B99C: -/* 80C1B99C 38 61 00 08 */ addi r3, r1, 8 -/* 80C1B9A0 4B 72 AA E5 */ bl PSMTXIdentity -/* 80C1B9A4 38 61 00 08 */ addi r3, r1, 8 -/* 80C1B9A8 80 9F 06 18 */ lwz r4, 0x618(r31) -/* 80C1B9AC 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C1B9B0 4B 72 AB 01 */ bl PSMTXCopy -/* 80C1B9B4 38 60 00 01 */ li r3, 1 -lbl_80C1B9B8: -/* 80C1B9B8 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80C1B9BC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C1B9C0 7C 08 03 A6 */ mtlr r0 -/* 80C1B9C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C1B9C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/Delete__16daObjHBombkoya_cFv.s b/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/Delete__16daObjHBombkoya_cFv.s deleted file mode 100644 index 57a031baab..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/Delete__16daObjHBombkoya_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C1C16C: -/* 80C1C16C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1C170 7C 08 02 A6 */ mflr r0 -/* 80C1C174 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1C178 28 03 00 00 */ cmplwi r3, 0 -/* 80C1C17C 41 82 00 08 */ beq lbl_80C1C184 -/* 80C1C180 38 63 05 A0 */ addi r3, r3, 0x5a0 -lbl_80C1C184: -/* 80C1C184 3C 80 80 C2 */ lis r4, l_arcName@ha /* 0x80C1C734@ha */ -/* 80C1C188 38 84 C7 34 */ addi r4, r4, l_arcName@l /* 0x80C1C734@l */ -/* 80C1C18C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C1C190 4B 41 0E 79 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C1C194 38 60 00 01 */ li r3, 1 -/* 80C1C198 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1C19C 7C 08 03 A6 */ mtlr r0 -/* 80C1C1A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1C1A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/Draw__16daObjHBombkoya_cFv.s b/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/Draw__16daObjHBombkoya_cFv.s deleted file mode 100644 index bc9920a848..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/Draw__16daObjHBombkoya_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80C1C098: -/* 80C1C098 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1C09C 7C 08 02 A6 */ mflr r0 -/* 80C1C0A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1C0A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1C0A8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C1C0AC 7C 7F 1B 78 */ mr r31, r3 -/* 80C1C0B0 88 03 06 20 */ lbz r0, 0x620(r3) -/* 80C1C0B4 28 00 00 00 */ cmplwi r0, 0 -/* 80C1C0B8 41 82 00 98 */ beq lbl_80C1C150 -/* 80C1C0BC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C1C0C0 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80C1C0C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1C0C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1C0CC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C1C0D0 7C 05 07 74 */ extsb r5, r0 -/* 80C1C0D4 4B 41 92 8D */ bl isSwitch__10dSv_info_cCFii -/* 80C1C0D8 2C 03 00 00 */ cmpwi r3, 0 -/* 80C1C0DC 40 82 00 74 */ bne lbl_80C1C150 -/* 80C1C0E0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C1C0E4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C1C0E8 38 80 00 10 */ li r4, 0x10 -/* 80C1C0EC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C1C0F0 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C1C0F4 4B 58 76 D1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C1C0F8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C1C0FC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C1C100 80 9F 06 18 */ lwz r4, 0x618(r31) -/* 80C1C104 80 84 00 04 */ lwz r4, 4(r4) -/* 80C1C108 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C1C10C 4B 58 8C 95 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C1C110 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1C114 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1C118 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C1C11C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C1C120 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C1C124 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C1C128 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C1C12C 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C1C130 80 7F 06 18 */ lwz r3, 0x618(r31) -/* 80C1C134 4B 3F 1B 91 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C1C138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1C13C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1C140 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C1C144 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C1C148 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C1C14C 90 1E 00 4C */ stw r0, 0x4c(r30) -lbl_80C1C150: -/* 80C1C150 38 60 00 01 */ li r3, 1 -/* 80C1C154 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1C158 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C1C15C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1C160 7C 08 03 A6 */ mtlr r0 -/* 80C1C164 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1C168 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/Execute__16daObjHBombkoya_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/Execute__16daObjHBombkoya_cFPPA3_A4_f.s deleted file mode 100644 index b1db216f0b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/Execute__16daObjHBombkoya_cFPPA3_A4_f.s +++ /dev/null @@ -1,267 +0,0 @@ -lbl_80C1BCA0: -/* 80C1BCA0 94 21 FE 50 */ stwu r1, -0x1b0(r1) -/* 80C1BCA4 7C 08 02 A6 */ mflr r0 -/* 80C1BCA8 90 01 01 B4 */ stw r0, 0x1b4(r1) -/* 80C1BCAC 39 61 01 B0 */ addi r11, r1, 0x1b0 -/* 80C1BCB0 4B 74 65 19 */ bl _savegpr_24 -/* 80C1BCB4 7C 7E 1B 78 */ mr r30, r3 -/* 80C1BCB8 3C 60 80 C2 */ lis r3, lit_3699@ha /* 0x80C1C5F8@ha */ -/* 80C1BCBC 3B E3 C5 F8 */ addi r31, r3, lit_3699@l /* 0x80C1C5F8@l */ -/* 80C1BCC0 38 1E 05 B8 */ addi r0, r30, 0x5b8 -/* 80C1BCC4 90 04 00 00 */ stw r0, 0(r4) -/* 80C1BCC8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C1BCCC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C1BCD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1BCD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1BCD8 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C1BCDC 7C 05 07 74 */ extsb r5, r0 -/* 80C1BCE0 4B 41 96 81 */ bl isSwitch__10dSv_info_cCFii -/* 80C1BCE4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C1BCE8 41 82 03 94 */ beq lbl_80C1C07C -/* 80C1BCEC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C1BCF0 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80C1BCF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1BCF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1BCFC 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C1BD00 7C 05 07 74 */ extsb r5, r0 -/* 80C1BD04 4B 41 96 5D */ bl isSwitch__10dSv_info_cCFii -/* 80C1BD08 2C 03 00 00 */ cmpwi r3, 0 -/* 80C1BD0C 41 82 00 18 */ beq lbl_80C1BD24 -/* 80C1BD10 38 00 00 00 */ li r0, 0 -/* 80C1BD14 98 1E 06 20 */ stb r0, 0x620(r30) -/* 80C1BD18 7F C3 F3 78 */ mr r3, r30 -/* 80C1BD1C 4B 3F DF 61 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80C1BD20 48 00 03 5C */ b lbl_80C1C07C -lbl_80C1BD24: -/* 80C1BD24 80 1E 06 1C */ lwz r0, 0x61c(r30) -/* 80C1BD28 2C 00 00 B4 */ cmpwi r0, 0xb4 -/* 80C1BD2C 40 82 00 0C */ bne lbl_80C1BD38 -/* 80C1BD30 38 00 00 00 */ li r0, 0 -/* 80C1BD34 98 1E 06 20 */ stb r0, 0x620(r30) -lbl_80C1BD38: -/* 80C1BD38 80 7F 00 08 */ lwz r3, 8(r31) -/* 80C1BD3C 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 80C1BD40 90 61 00 70 */ stw r3, 0x70(r1) -/* 80C1BD44 90 01 00 74 */ stw r0, 0x74(r1) -/* 80C1BD48 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 80C1BD4C 80 1F 00 14 */ lwz r0, 0x14(r31) -/* 80C1BD50 90 61 00 78 */ stw r3, 0x78(r1) -/* 80C1BD54 90 01 00 7C */ stw r0, 0x7c(r1) -/* 80C1BD58 38 A1 00 E0 */ addi r5, r1, 0xe0 -/* 80C1BD5C 38 9F 00 14 */ addi r4, r31, 0x14 -/* 80C1BD60 38 00 00 14 */ li r0, 0x14 -/* 80C1BD64 7C 09 03 A6 */ mtctr r0 -lbl_80C1BD68: -/* 80C1BD68 80 64 00 04 */ lwz r3, 4(r4) -/* 80C1BD6C 84 04 00 08 */ lwzu r0, 8(r4) -/* 80C1BD70 90 65 00 04 */ stw r3, 4(r5) -/* 80C1BD74 94 05 00 08 */ stwu r0, 8(r5) -/* 80C1BD78 42 00 FF F0 */ bdnz lbl_80C1BD68 -/* 80C1BD7C 7F C3 F3 78 */ mr r3, r30 -/* 80C1BD80 38 81 00 70 */ addi r4, r1, 0x70 -/* 80C1BD84 38 A0 00 08 */ li r5, 8 -/* 80C1BD88 38 C1 00 E4 */ addi r6, r1, 0xe4 -/* 80C1BD8C 38 E0 00 08 */ li r7, 8 -/* 80C1BD90 81 1E 06 1C */ lwz r8, 0x61c(r30) -/* 80C1BD94 4B FF FD E9 */ bl setParticle__16daObjHBombkoya_cFPUsiPQ216daObjHBombkoya_c7PSetTblii -/* 80C1BD98 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C1BD9C 41 82 00 44 */ beq lbl_80C1BDE0 -/* 80C1BDA0 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008000B@ha */ -/* 80C1BDA4 38 03 00 0B */ addi r0, r3, 0x000B /* 0x0008000B@l */ -/* 80C1BDA8 90 01 00 28 */ stw r0, 0x28(r1) -/* 80C1BDAC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C1BDB0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C1BDB4 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1BDB8 38 81 00 28 */ addi r4, r1, 0x28 -/* 80C1BDBC 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C1BDC0 38 C0 00 00 */ li r6, 0 -/* 80C1BDC4 38 E0 00 00 */ li r7, 0 -/* 80C1BDC8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80C1BDCC FC 40 08 90 */ fmr f2, f1 -/* 80C1BDD0 C0 7F 01 24 */ lfs f3, 0x124(r31) -/* 80C1BDD4 FC 80 18 90 */ fmr f4, f3 -/* 80C1BDD8 39 00 00 00 */ li r8, 0 -/* 80C1BDDC 4B 68 FB A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C1BDE0: -/* 80C1BDE0 80 1F 00 B8 */ lwz r0, 0xb8(r31) -/* 80C1BDE4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80C1BDE8 A0 1F 00 BC */ lhz r0, 0xbc(r31) -/* 80C1BDEC B0 01 00 30 */ sth r0, 0x30(r1) -/* 80C1BDF0 38 A1 00 7C */ addi r5, r1, 0x7c -/* 80C1BDF4 38 9F 00 BC */ addi r4, r31, 0xbc -/* 80C1BDF8 38 00 00 0C */ li r0, 0xc -/* 80C1BDFC 7C 09 03 A6 */ mtctr r0 -lbl_80C1BE00: -/* 80C1BE00 80 64 00 04 */ lwz r3, 4(r4) -/* 80C1BE04 84 04 00 08 */ lwzu r0, 8(r4) -/* 80C1BE08 90 65 00 04 */ stw r3, 4(r5) -/* 80C1BE0C 94 05 00 08 */ stwu r0, 8(r5) -/* 80C1BE10 42 00 FF F0 */ bdnz lbl_80C1BE00 -/* 80C1BE14 80 04 00 04 */ lwz r0, 4(r4) -/* 80C1BE18 90 05 00 04 */ stw r0, 4(r5) -/* 80C1BE1C 7F C3 F3 78 */ mr r3, r30 -/* 80C1BE20 38 81 00 2C */ addi r4, r1, 0x2c -/* 80C1BE24 38 A0 00 03 */ li r5, 3 -/* 80C1BE28 38 C1 00 80 */ addi r6, r1, 0x80 -/* 80C1BE2C 38 E0 00 05 */ li r7, 5 -/* 80C1BE30 81 1E 06 1C */ lwz r8, 0x61c(r30) -/* 80C1BE34 4B FF FD 49 */ bl setParticle__16daObjHBombkoya_cFPUsiPQ216daObjHBombkoya_c7PSetTblii -/* 80C1BE38 80 1E 06 1C */ lwz r0, 0x61c(r30) -/* 80C1BE3C 2C 00 00 AA */ cmpwi r0, 0xaa -/* 80C1BE40 40 80 00 CC */ bge lbl_80C1BF0C -/* 80C1BE44 3B 00 00 00 */ li r24, 0 -/* 80C1BE48 3B A0 00 00 */ li r29, 0 -/* 80C1BE4C 3B 80 00 00 */ li r28, 0 -/* 80C1BE50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1BE54 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1BE58 3C 60 80 C2 */ lis r3, id@ha /* 0x80C1C77C@ha */ -/* 80C1BE5C 3B 63 C7 7C */ addi r27, r3, id@l /* 0x80C1C77C@l */ -lbl_80C1BE60: -/* 80C1BE60 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 80C1BE64 38 00 00 FF */ li r0, 0xff -/* 80C1BE68 90 01 00 08 */ stw r0, 8(r1) -/* 80C1BE6C 38 80 00 00 */ li r4, 0 -/* 80C1BE70 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C1BE74 38 00 FF FF */ li r0, -1 -/* 80C1BE78 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C1BE7C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C1BE80 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C1BE84 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C1BE88 3B 3C 06 24 */ addi r25, r28, 0x624 -/* 80C1BE8C 7C 9E C8 2E */ lwzx r4, r30, r25 -/* 80C1BE90 38 A0 00 00 */ li r5, 0 -/* 80C1BE94 7C DB EA 2E */ lhzx r6, r27, r29 -/* 80C1BE98 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80C1BE9C 39 00 00 00 */ li r8, 0 -/* 80C1BEA0 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 80C1BEA4 39 40 00 00 */ li r10, 0 -/* 80C1BEA8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80C1BEAC 4B 43 16 21 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C1BEB0 7C 7E C9 2E */ stwx r3, r30, r25 -/* 80C1BEB4 3B 18 00 01 */ addi r24, r24, 1 -/* 80C1BEB8 2C 18 00 09 */ cmpwi r24, 9 -/* 80C1BEBC 3B BD 00 02 */ addi r29, r29, 2 -/* 80C1BEC0 3B 9C 00 04 */ addi r28, r28, 4 -/* 80C1BEC4 41 80 FF 9C */ blt lbl_80C1BE60 -/* 80C1BEC8 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080175@ha */ -/* 80C1BECC 38 03 01 75 */ addi r0, r3, 0x0175 /* 0x00080175@l */ -/* 80C1BED0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C1BED4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C1BED8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C1BEDC 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1BEE0 38 81 00 24 */ addi r4, r1, 0x24 -/* 80C1BEE4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C1BEE8 38 C0 03 84 */ li r6, 0x384 -/* 80C1BEEC 38 E0 00 00 */ li r7, 0 -/* 80C1BEF0 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80C1BEF4 FC 40 08 90 */ fmr f2, f1 -/* 80C1BEF8 C0 7F 01 24 */ lfs f3, 0x124(r31) -/* 80C1BEFC FC 80 18 90 */ fmr f4, f3 -/* 80C1BF00 39 00 00 00 */ li r8, 0 -/* 80C1BF04 4B 69 06 09 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C1BF08 48 00 00 B0 */ b lbl_80C1BFB8 -lbl_80C1BF0C: -/* 80C1BF0C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C1BF10 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80C1BF14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1BF18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1BF1C 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C1BF20 7C 05 07 74 */ extsb r5, r0 -/* 80C1BF24 4B 41 92 DD */ bl onSwitch__10dSv_info_cFii -/* 80C1BF28 80 1E 06 1C */ lwz r0, 0x61c(r30) -/* 80C1BF2C 2C 00 00 AA */ cmpwi r0, 0xaa -/* 80C1BF30 40 82 00 44 */ bne lbl_80C1BF74 -/* 80C1BF34 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080177@ha */ -/* 80C1BF38 38 03 01 77 */ addi r0, r3, 0x0177 /* 0x00080177@l */ -/* 80C1BF3C 90 01 00 20 */ stw r0, 0x20(r1) -/* 80C1BF40 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C1BF44 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C1BF48 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1BF4C 38 81 00 20 */ addi r4, r1, 0x20 -/* 80C1BF50 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C1BF54 38 C0 00 00 */ li r6, 0 -/* 80C1BF58 38 E0 00 00 */ li r7, 0 -/* 80C1BF5C C0 3F 00 04 */ lfs f1, 4(r31) -/* 80C1BF60 FC 40 08 90 */ fmr f2, f1 -/* 80C1BF64 C0 7F 01 24 */ lfs f3, 0x124(r31) -/* 80C1BF68 FC 80 18 90 */ fmr f4, f3 -/* 80C1BF6C 39 00 00 00 */ li r8, 0 -/* 80C1BF70 4B 68 FA 15 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C1BF74: -/* 80C1BF74 C0 3F 01 28 */ lfs f1, 0x128(r31) -/* 80C1BF78 D0 21 00 64 */ stfs f1, 0x64(r1) -/* 80C1BF7C C0 1F 01 2C */ lfs f0, 0x12c(r31) -/* 80C1BF80 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 80C1BF84 D0 21 00 6C */ stfs f1, 0x6c(r1) -/* 80C1BF88 38 7E 05 E8 */ addi r3, r30, 0x5e8 -/* 80C1BF8C 38 81 00 64 */ addi r4, r1, 0x64 -/* 80C1BF90 38 A1 00 58 */ addi r5, r1, 0x58 -/* 80C1BF94 4B 72 AD D9 */ bl PSMTXMultVec -/* 80C1BF98 38 7E 07 A8 */ addi r3, r30, 0x7a8 -/* 80C1BF9C 38 81 00 58 */ addi r4, r1, 0x58 -/* 80C1BFA0 4B 65 32 3D */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C1BFA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1BFA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1BFAC 38 63 23 3C */ addi r3, r3, 0x233c -/* 80C1BFB0 38 9E 06 84 */ addi r4, r30, 0x684 -/* 80C1BFB4 4B 64 8B F5 */ bl Set__4cCcSFP8cCcD_Obj -lbl_80C1BFB8: -/* 80C1BFB8 3B 00 00 00 */ li r24, 0 -/* 80C1BFBC 3B A0 00 00 */ li r29, 0 -/* 80C1BFC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1BFC4 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1BFC8 3C 60 80 C2 */ lis r3, ptable@ha /* 0x80C1C790@ha */ -/* 80C1BFCC 3B 83 C7 90 */ addi r28, r3, ptable@l /* 0x80C1C790@l */ -lbl_80C1BFD0: -/* 80C1BFD0 80 7E 06 1C */ lwz r3, 0x61c(r30) -/* 80C1BFD4 7F 3C EA 14 */ add r25, r28, r29 -/* 80C1BFD8 80 19 00 10 */ lwz r0, 0x10(r25) -/* 80C1BFDC 7C 03 00 00 */ cmpw r3, r0 -/* 80C1BFE0 40 82 00 80 */ bne lbl_80C1C060 -/* 80C1BFE4 C0 19 00 04 */ lfs f0, 4(r25) -/* 80C1BFE8 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80C1BFEC C0 19 00 08 */ lfs f0, 8(r25) -/* 80C1BFF0 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80C1BFF4 C0 19 00 0C */ lfs f0, 0xc(r25) -/* 80C1BFF8 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80C1BFFC 38 7E 05 E8 */ addi r3, r30, 0x5e8 -/* 80C1C000 38 81 00 40 */ addi r4, r1, 0x40 -/* 80C1C004 38 A1 00 4C */ addi r5, r1, 0x4c -/* 80C1C008 4B 72 AD 65 */ bl PSMTXMultVec -/* 80C1C00C C0 19 00 14 */ lfs f0, 0x14(r25) -/* 80C1C010 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80C1C014 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80C1C018 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80C1C01C 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 80C1C020 38 80 00 00 */ li r4, 0 -/* 80C1C024 90 81 00 08 */ stw r4, 8(r1) -/* 80C1C028 38 00 FF FF */ li r0, -1 -/* 80C1C02C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C1C030 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C1C034 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C1C038 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C1C03C 38 80 00 00 */ li r4, 0 -/* 80C1C040 A0 B9 00 00 */ lhz r5, 0(r25) -/* 80C1C044 38 C1 00 4C */ addi r6, r1, 0x4c -/* 80C1C048 38 E0 00 00 */ li r7, 0 -/* 80C1C04C 39 1E 04 DC */ addi r8, r30, 0x4dc -/* 80C1C050 39 21 00 34 */ addi r9, r1, 0x34 -/* 80C1C054 39 40 00 FF */ li r10, 0xff -/* 80C1C058 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80C1C05C 4B 43 0A 35 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -lbl_80C1C060: -/* 80C1C060 3B 18 00 01 */ addi r24, r24, 1 -/* 80C1C064 28 18 00 10 */ cmplwi r24, 0x10 -/* 80C1C068 3B BD 00 18 */ addi r29, r29, 0x18 -/* 80C1C06C 41 80 FF 64 */ blt lbl_80C1BFD0 -/* 80C1C070 80 7E 06 1C */ lwz r3, 0x61c(r30) -/* 80C1C074 38 03 00 01 */ addi r0, r3, 1 -/* 80C1C078 90 1E 06 1C */ stw r0, 0x61c(r30) -lbl_80C1C07C: -/* 80C1C07C 38 60 00 01 */ li r3, 1 -/* 80C1C080 39 61 01 B0 */ addi r11, r1, 0x1b0 -/* 80C1C084 4B 74 61 91 */ bl _restgpr_24 -/* 80C1C088 80 01 01 B4 */ lwz r0, 0x1b4(r1) -/* 80C1C08C 7C 08 03 A6 */ mtlr r0 -/* 80C1C090 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 80C1C094 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/create1st__16daObjHBombkoya_cFv.s b/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/create1st__16daObjHBombkoya_cFv.s deleted file mode 100644 index ca5cd42970..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/create1st__16daObjHBombkoya_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80C1B878: -/* 80C1B878 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1B87C 7C 08 02 A6 */ mflr r0 -/* 80C1B880 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1B884 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1B888 7C 7F 1B 78 */ mr r31, r3 -/* 80C1B88C 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80C1B890 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80C1B894 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1B898 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1B89C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C1B8A0 7C 05 07 74 */ extsb r5, r0 -/* 80C1B8A4 4B 41 9A BD */ bl isSwitch__10dSv_info_cCFii -/* 80C1B8A8 2C 03 00 00 */ cmpwi r3, 0 -/* 80C1B8AC 41 82 00 0C */ beq lbl_80C1B8B8 -/* 80C1B8B0 38 60 00 05 */ li r3, 5 -/* 80C1B8B4 48 00 00 70 */ b lbl_80C1B924 -lbl_80C1B8B8: -/* 80C1B8B8 7F E3 FB 78 */ mr r3, r31 -/* 80C1B8BC 28 1F 00 00 */ cmplwi r31, 0 -/* 80C1B8C0 41 82 00 08 */ beq lbl_80C1B8C8 -/* 80C1B8C4 38 7F 05 A0 */ addi r3, r31, 0x5a0 -lbl_80C1B8C8: -/* 80C1B8C8 3C 80 80 C2 */ lis r4, l_arcName@ha /* 0x80C1C734@ha */ -/* 80C1B8CC 38 84 C7 34 */ addi r4, r4, l_arcName@l /* 0x80C1C734@l */ -/* 80C1B8D0 80 84 00 00 */ lwz r4, 0(r4) -/* 80C1B8D4 4B 41 15 E9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C1B8D8 7C 60 1B 78 */ mr r0, r3 -/* 80C1B8DC 2C 00 00 04 */ cmpwi r0, 4 -/* 80C1B8E0 40 82 00 40 */ bne lbl_80C1B920 -/* 80C1B8E4 38 7F 05 B8 */ addi r3, r31, 0x5b8 -/* 80C1B8E8 4B 72 AB 9D */ bl PSMTXIdentity -/* 80C1B8EC 7F E3 FB 78 */ mr r3, r31 -/* 80C1B8F0 3C 80 80 C2 */ lis r4, l_arcName@ha /* 0x80C1C734@ha */ -/* 80C1B8F4 38 84 C7 34 */ addi r4, r4, l_arcName@l /* 0x80C1C734@l */ -/* 80C1B8F8 80 84 00 00 */ lwz r4, 0(r4) -/* 80C1B8FC 38 A0 00 07 */ li r5, 7 -/* 80C1B900 38 C0 00 00 */ li r6, 0 -/* 80C1B904 38 E0 28 60 */ li r7, 0x2860 -/* 80C1B908 39 1F 05 B8 */ addi r8, r31, 0x5b8 -/* 80C1B90C 4B 45 CE B1 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C1B910 7C 60 1B 78 */ mr r0, r3 -/* 80C1B914 2C 00 00 05 */ cmpwi r0, 5 -/* 80C1B918 40 82 00 08 */ bne lbl_80C1B920 -/* 80C1B91C 48 00 00 08 */ b lbl_80C1B924 -lbl_80C1B920: -/* 80C1B920 7C 03 03 78 */ mr r3, r0 -lbl_80C1B924: -/* 80C1B924 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1B928 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1B92C 7C 08 03 A6 */ mtlr r0 -/* 80C1B930 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1B934 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/daObjHBombkoya_MoveBGDelete__FP16daObjHBombkoya_c.s b/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/daObjHBombkoya_MoveBGDelete__FP16daObjHBombkoya_c.s deleted file mode 100644 index 005602e514..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/daObjHBombkoya_MoveBGDelete__FP16daObjHBombkoya_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1C360: -/* 80C1C360 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1C364 7C 08 02 A6 */ mflr r0 -/* 80C1C368 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1C36C 4B 45 C5 71 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C1C370 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1C374 7C 08 03 A6 */ mtlr r0 -/* 80C1C378 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1C37C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/daObjHBombkoya_MoveBGDraw__FP16daObjHBombkoya_c.s b/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/daObjHBombkoya_MoveBGDraw__FP16daObjHBombkoya_c.s deleted file mode 100644 index b45878bb4b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/daObjHBombkoya_MoveBGDraw__FP16daObjHBombkoya_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C1C3A0: -/* 80C1C3A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1C3A4 7C 08 02 A6 */ mflr r0 -/* 80C1C3A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1C3AC 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C1C3B0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C1C3B4 7D 89 03 A6 */ mtctr r12 -/* 80C1C3B8 4E 80 04 21 */ bctrl -/* 80C1C3BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1C3C0 7C 08 03 A6 */ mtlr r0 -/* 80C1C3C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1C3C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/daObjHBombkoya_MoveBGExecute__FP16daObjHBombkoya_c.s b/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/daObjHBombkoya_MoveBGExecute__FP16daObjHBombkoya_c.s deleted file mode 100644 index b149984777..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/daObjHBombkoya_MoveBGExecute__FP16daObjHBombkoya_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1C380: -/* 80C1C380 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1C384 7C 08 02 A6 */ mflr r0 -/* 80C1C388 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1C38C 4B 45 C5 C5 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C1C390 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1C394 7C 08 03 A6 */ mtlr r0 -/* 80C1C398 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1C39C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/func_80C1BB7C.s b/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/func_80C1BB7C.s deleted file mode 100644 index 110541c7af..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya/func_80C1BB7C.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_80C1BB7C: -/* 80C1BB7C 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80C1BB80 7C 08 02 A6 */ mflr r0 -/* 80C1BB84 90 01 00 84 */ stw r0, 0x84(r1) -/* 80C1BB88 39 61 00 80 */ addi r11, r1, 0x80 -/* 80C1BB8C 4B 74 66 29 */ bl _savegpr_19 -/* 80C1BB90 7C 79 1B 78 */ mr r25, r3 -/* 80C1BB94 7C 9A 23 78 */ mr r26, r4 -/* 80C1BB98 7C BB 2B 78 */ mr r27, r5 -/* 80C1BB9C 7C DC 33 78 */ mr r28, r6 -/* 80C1BBA0 7C FD 3B 78 */ mr r29, r7 -/* 80C1BBA4 7D 1E 43 78 */ mr r30, r8 -/* 80C1BBA8 3A 80 00 00 */ li r20, 0 -/* 80C1BBAC 3B E0 00 00 */ li r31, 0 -/* 80C1BBB0 3B 00 00 00 */ li r24, 0 -/* 80C1BBB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1BBB8 3A A3 61 C0 */ addi r21, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1BBBC 48 00 00 C0 */ b lbl_80C1BC7C -lbl_80C1BBC0: -/* 80C1BBC0 7E DC C2 14 */ add r22, r28, r24 -/* 80C1BBC4 80 16 00 0C */ lwz r0, 0xc(r22) -/* 80C1BBC8 7C 1E 00 00 */ cmpw r30, r0 -/* 80C1BBCC 40 82 00 A8 */ bne lbl_80C1BC74 -/* 80C1BBD0 C0 16 00 00 */ lfs f0, 0(r22) -/* 80C1BBD4 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80C1BBD8 C0 16 00 04 */ lfs f0, 4(r22) -/* 80C1BBDC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80C1BBE0 C0 16 00 08 */ lfs f0, 8(r22) -/* 80C1BBE4 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80C1BBE8 38 79 05 E8 */ addi r3, r25, 0x5e8 -/* 80C1BBEC 38 81 00 2C */ addi r4, r1, 0x2c -/* 80C1BBF0 38 A1 00 38 */ addi r5, r1, 0x38 -/* 80C1BBF4 4B 72 B1 79 */ bl PSMTXMultVec -/* 80C1BBF8 C0 16 00 10 */ lfs f0, 0x10(r22) -/* 80C1BBFC D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80C1BC00 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80C1BC04 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80C1BC08 3A 60 00 00 */ li r19, 0 -/* 80C1BC0C 3A E0 00 00 */ li r23, 0 -/* 80C1BC10 3C 60 80 C2 */ lis r3, lit_3747@ha /* 0x80C1C5FC@ha */ -/* 80C1BC14 3A C3 C5 FC */ addi r22, r3, lit_3747@l /* 0x80C1C5FC@l */ -/* 80C1BC18 48 00 00 54 */ b lbl_80C1BC6C -lbl_80C1BC1C: -/* 80C1BC1C 80 75 5D 3C */ lwz r3, 0x5d3c(r21) -/* 80C1BC20 38 80 00 00 */ li r4, 0 -/* 80C1BC24 90 81 00 08 */ stw r4, 8(r1) -/* 80C1BC28 38 00 FF FF */ li r0, -1 -/* 80C1BC2C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C1BC30 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C1BC34 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C1BC38 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C1BC3C 38 80 00 00 */ li r4, 0 -/* 80C1BC40 7C BA BA 2E */ lhzx r5, r26, r23 -/* 80C1BC44 38 C1 00 38 */ addi r6, r1, 0x38 -/* 80C1BC48 38 E0 00 00 */ li r7, 0 -/* 80C1BC4C 39 00 00 00 */ li r8, 0 -/* 80C1BC50 39 21 00 20 */ addi r9, r1, 0x20 -/* 80C1BC54 39 40 00 FF */ li r10, 0xff -/* 80C1BC58 C0 36 00 00 */ lfs f1, 0(r22) -/* 80C1BC5C 4B 43 0E 35 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C1BC60 3A 80 00 01 */ li r20, 1 -/* 80C1BC64 3A 73 00 01 */ addi r19, r19, 1 -/* 80C1BC68 3A F7 00 02 */ addi r23, r23, 2 -lbl_80C1BC6C: -/* 80C1BC6C 7C 13 D8 00 */ cmpw r19, r27 -/* 80C1BC70 41 80 FF AC */ blt lbl_80C1BC1C -lbl_80C1BC74: -/* 80C1BC74 3B FF 00 01 */ addi r31, r31, 1 -/* 80C1BC78 3B 18 00 14 */ addi r24, r24, 0x14 -lbl_80C1BC7C: -/* 80C1BC7C 7C 1F E8 00 */ cmpw r31, r29 -/* 80C1BC80 41 80 FF 40 */ blt lbl_80C1BBC0 -/* 80C1BC84 7E 83 A3 78 */ mr r3, r20 -/* 80C1BC88 39 61 00 80 */ addi r11, r1, 0x80 -/* 80C1BC8C 4B 74 65 75 */ bl _restgpr_19 -/* 80C1BC90 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80C1BC94 7C 08 03 A6 */ mtlr r0 -/* 80C1BC98 38 21 00 80 */ addi r1, r1, 0x80 -/* 80C1BC9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__ct__18daObj_Myogan_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__ct__18daObj_Myogan_HIO_cFv.s deleted file mode 100644 index f2c262067d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__ct__18daObj_Myogan_HIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C9EBAC: -/* 80C9EBAC 3C 80 80 CA */ lis r4, __vt__18daObj_Myogan_HIO_c@ha /* 0x80C9F304@ha */ -/* 80C9EBB0 38 04 F3 04 */ addi r0, r4, __vt__18daObj_Myogan_HIO_c@l /* 0x80C9F304@l */ -/* 80C9EBB4 90 03 00 00 */ stw r0, 0(r3) -/* 80C9EBB8 38 00 FF FF */ li r0, -1 -/* 80C9EBBC 98 03 00 04 */ stb r0, 4(r3) -/* 80C9EBC0 3C 80 80 CA */ lis r4, lit_3762@ha /* 0x80C9F288@ha */ -/* 80C9EBC4 C0 04 F2 88 */ lfs f0, lit_3762@l(r4) /* 0x80C9F288@l */ -/* 80C9EBC8 D0 03 00 08 */ stfs f0, 8(r3) -/* 80C9EBCC 3C 80 80 CA */ lis r4, lit_3763@ha /* 0x80C9F28C@ha */ -/* 80C9EBD0 C0 04 F2 8C */ lfs f0, lit_3763@l(r4) /* 0x80C9F28C@l */ -/* 80C9EBD4 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80C9EBD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 0587d5ffea..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C9F064: -/* 80C9F064 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9F068 7C 08 02 A6 */ mflr r0 -/* 80C9F06C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C9F070 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C9F074 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C9F078 41 82 00 1C */ beq lbl_80C9F094 -/* 80C9F07C 3C A0 80 CA */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80C9F2F8@ha */ -/* 80C9F080 38 05 F2 F8 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80C9F2F8@l */ -/* 80C9F084 90 1F 00 00 */ stw r0, 0(r31) -/* 80C9F088 7C 80 07 35 */ extsh. r0, r4 -/* 80C9F08C 40 81 00 08 */ ble lbl_80C9F094 -/* 80C9F090 4B 62 FC AD */ bl __dl__FPv -lbl_80C9F094: -/* 80C9F094 7F E3 FB 78 */ mr r3, r31 -/* 80C9F098 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C9F09C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9F0A0 7C 08 03 A6 */ mtlr r0 -/* 80C9F0A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C9F0A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__dt__18daObj_Myogan_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__dt__18daObj_Myogan_HIO_cFv.s deleted file mode 100644 index 9993b9d15b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__dt__18daObj_Myogan_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C9F1F0: -/* 80C9F1F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9F1F4 7C 08 02 A6 */ mflr r0 -/* 80C9F1F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C9F1FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C9F200 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C9F204 41 82 00 1C */ beq lbl_80C9F220 -/* 80C9F208 3C A0 80 CA */ lis r5, __vt__18daObj_Myogan_HIO_c@ha /* 0x80C9F304@ha */ -/* 80C9F20C 38 05 F3 04 */ addi r0, r5, __vt__18daObj_Myogan_HIO_c@l /* 0x80C9F304@l */ -/* 80C9F210 90 1F 00 00 */ stw r0, 0(r31) -/* 80C9F214 7C 80 07 35 */ extsh. r0, r4 -/* 80C9F218 40 81 00 08 */ ble lbl_80C9F220 -/* 80C9F21C 4B 62 FB 21 */ bl __dl__FPv -lbl_80C9F220: -/* 80C9F220 7F E3 FB 78 */ mr r3, r31 -/* 80C9F224 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C9F228 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9F22C 7C 08 03 A6 */ mtlr r0 -/* 80C9F230 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C9F234 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__sinit_d_a_obj_myogan_cpp.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__sinit_d_a_obj_myogan_cpp.s deleted file mode 100644 index 3762e5aaaf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/__sinit_d_a_obj_myogan_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C9F238: -/* 80C9F238 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9F23C 7C 08 02 A6 */ mflr r0 -/* 80C9F240 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C9F244 3C 60 80 CA */ lis r3, l_HIO@ha /* 0x80C9F328@ha */ -/* 80C9F248 38 63 F3 28 */ addi r3, r3, l_HIO@l /* 0x80C9F328@l */ -/* 80C9F24C 4B FF F9 61 */ bl __ct__18daObj_Myogan_HIO_cFv -/* 80C9F250 3C 80 80 CA */ lis r4, __dt__18daObj_Myogan_HIO_cFv@ha /* 0x80C9F1F0@ha */ -/* 80C9F254 38 84 F1 F0 */ addi r4, r4, __dt__18daObj_Myogan_HIO_cFv@l /* 0x80C9F1F0@l */ -/* 80C9F258 3C A0 80 CA */ lis r5, lit_3757@ha /* 0x80C9F31C@ha */ -/* 80C9F25C 38 A5 F3 1C */ addi r5, r5, lit_3757@l /* 0x80C9F31C@l */ -/* 80C9F260 4B FF F8 D9 */ bl __register_global_object -/* 80C9F264 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9F268 7C 08 03 A6 */ mtlr r0 -/* 80C9F26C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C9F270 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/action__FP16obj_myogan_class.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/action__FP16obj_myogan_class.s deleted file mode 100644 index c37fff05d0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/action__FP16obj_myogan_class.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_80C9EC70: -/* 80C9EC70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9EC74 7C 08 02 A6 */ mflr r0 -/* 80C9EC78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C9EC7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C9EC80 7C 7F 1B 78 */ mr r31, r3 -/* 80C9EC84 A8 03 05 7E */ lha r0, 0x57e(r3) -/* 80C9EC88 2C 00 00 01 */ cmpwi r0, 1 -/* 80C9EC8C 41 82 00 40 */ beq lbl_80C9ECCC -/* 80C9EC90 40 80 00 3C */ bge lbl_80C9ECCC -/* 80C9EC94 2C 00 00 00 */ cmpwi r0, 0 -/* 80C9EC98 40 80 00 08 */ bge lbl_80C9ECA0 -/* 80C9EC9C 48 00 00 30 */ b lbl_80C9ECCC -lbl_80C9ECA0: -/* 80C9ECA0 38 7F 04 D4 */ addi r3, r31, 0x4d4 -/* 80C9ECA4 C0 3F 04 AC */ lfs f1, 0x4ac(r31) -/* 80C9ECA8 3C 80 80 CA */ lis r4, l_HIO@ha /* 0x80C9F328@ha */ -/* 80C9ECAC 38 84 F3 28 */ addi r4, r4, l_HIO@l /* 0x80C9F328@l */ -/* 80C9ECB0 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 80C9ECB4 EC 21 00 2A */ fadds f1, f1, f0 -/* 80C9ECB8 3C 80 80 CA */ lis r4, lit_3823@ha /* 0x80C9F290@ha */ -/* 80C9ECBC C0 44 F2 90 */ lfs f2, lit_3823@l(r4) /* 0x80C9F290@l */ -/* 80C9ECC0 3C 80 80 CA */ lis r4, lit_3824@ha /* 0x80C9F294@ha */ -/* 80C9ECC4 C0 64 F2 94 */ lfs f3, lit_3824@l(r4) /* 0x80C9F294@l */ -/* 80C9ECC8 4B 5D 0D 75 */ bl cLib_addCalc2__FPffff -lbl_80C9ECCC: -/* 80C9ECCC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C9ECD0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C9ECD4 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C9ECD8 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C9ECDC C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C9ECE0 4B 6A 7C 09 */ bl PSMTXTrans -/* 80C9ECE4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C9ECE8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C9ECEC A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80C9ECF0 4B 36 D7 45 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C9ECF4 3C 60 80 CA */ lis r3, l_HIO@ha /* 0x80C9F328@ha */ -/* 80C9ECF8 38 63 F3 28 */ addi r3, r3, l_HIO@l /* 0x80C9F328@l */ -/* 80C9ECFC C0 23 00 08 */ lfs f1, 8(r3) -/* 80C9ED00 FC 40 08 90 */ fmr f2, f1 -/* 80C9ED04 FC 60 08 90 */ fmr f3, f1 -/* 80C9ED08 4B 36 E1 31 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80C9ED0C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C9ED10 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C9ED14 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80C9ED18 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C9ED1C 4B 6A 77 95 */ bl PSMTXCopy -/* 80C9ED20 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C9ED24 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C9ED28 38 9F 05 8C */ addi r4, r31, 0x58c -/* 80C9ED2C 4B 6A 77 85 */ bl PSMTXCopy -/* 80C9ED30 80 7F 05 BC */ lwz r3, 0x5bc(r31) -/* 80C9ED34 4B 3D CC 8D */ bl Move__4dBgWFv -/* 80C9ED38 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80C9ED3C 4B 36 E6 ED */ bl play__14mDoExt_baseAnmFv -/* 80C9ED40 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80C9ED44 4B 36 E6 E5 */ bl play__14mDoExt_baseAnmFv -/* 80C9ED48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C9ED4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9ED50 7C 08 03 A6 */ mtlr r0 -/* 80C9ED54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C9ED58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 03a4a4a219..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_80C9F0AC: -/* 80C9F0AC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C9F0B0 7C 08 02 A6 */ mflr r0 -/* 80C9F0B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C9F0B8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C9F0BC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C9F0C0 7C 7F 1B 78 */ mr r31, r3 -/* 80C9F0C4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C9F0C8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C9F0CC 40 82 00 1C */ bne lbl_80C9F0E8 -/* 80C9F0D0 28 1F 00 00 */ cmplwi r31, 0 -/* 80C9F0D4 41 82 00 08 */ beq lbl_80C9F0DC -/* 80C9F0D8 4B 37 9A 8D */ bl __ct__10fopAc_ac_cFv -lbl_80C9F0DC: -/* 80C9F0DC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C9F0E0 60 00 00 08 */ ori r0, r0, 8 -/* 80C9F0E4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C9F0E8: -/* 80C9F0E8 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80C9F0EC 3C 80 80 CA */ lis r4, d_a_obj_myogan__stringBase0@ha /* 0x80C9F2A0@ha */ -/* 80C9F0F0 38 84 F2 A0 */ addi r4, r4, d_a_obj_myogan__stringBase0@l /* 0x80C9F2A0@l */ -/* 80C9F0F4 4B 38 DD C9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C9F0F8 7C 7E 1B 78 */ mr r30, r3 -/* 80C9F0FC 2C 1E 00 04 */ cmpwi r30, 4 -/* 80C9F100 40 82 00 D4 */ bne lbl_80C9F1D4 -/* 80C9F104 7F E3 FB 78 */ mr r3, r31 -/* 80C9F108 3C 80 80 CA */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80C9EE28@ha */ -/* 80C9F10C 38 84 EE 28 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80C9EE28@l */ -/* 80C9F110 3C A0 00 05 */ lis r5, 0x0005 /* 0x0004B000@ha */ -/* 80C9F114 38 A5 B0 00 */ addi r5, r5, 0xB000 /* 0x0004B000@l */ -/* 80C9F118 4B 37 B3 99 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80C9F11C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C9F120 40 82 00 0C */ bne lbl_80C9F12C -/* 80C9F124 38 60 00 05 */ li r3, 5 -/* 80C9F128 48 00 00 B0 */ b lbl_80C9F1D8 -lbl_80C9F12C: -/* 80C9F12C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C9F130 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9F134 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C9F138 80 9F 05 BC */ lwz r4, 0x5bc(r31) -/* 80C9F13C 7F E5 FB 78 */ mr r5, r31 -/* 80C9F140 4B 3D 58 C9 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80C9F144 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C9F148 41 82 00 0C */ beq lbl_80C9F154 -/* 80C9F14C 38 60 00 05 */ li r3, 5 -/* 80C9F150 48 00 00 88 */ b lbl_80C9F1D8 -lbl_80C9F154: -/* 80C9F154 3C 60 80 CA */ lis r3, data_80C9F318@ha /* 0x80C9F318@ha */ -/* 80C9F158 8C 03 F3 18 */ lbzu r0, data_80C9F318@l(r3) /* 0x80C9F318@l */ -/* 80C9F15C 28 00 00 00 */ cmplwi r0, 0 -/* 80C9F160 40 82 00 20 */ bne lbl_80C9F180 -/* 80C9F164 38 00 00 01 */ li r0, 1 -/* 80C9F168 98 1F 05 C0 */ stb r0, 0x5c0(r31) -/* 80C9F16C 98 03 00 00 */ stb r0, 0(r3) -/* 80C9F170 38 00 FF FF */ li r0, -1 -/* 80C9F174 3C 60 80 CA */ lis r3, l_HIO@ha /* 0x80C9F328@ha */ -/* 80C9F178 38 63 F3 28 */ addi r3, r3, l_HIO@l /* 0x80C9F328@l */ -/* 80C9F17C 98 03 00 04 */ stb r0, 4(r3) -lbl_80C9F180: -/* 80C9F180 3C 60 80 CA */ lis r3, lit_3966@ha /* 0x80C9F298@ha */ -/* 80C9F184 C0 23 F2 98 */ lfs f1, lit_3966@l(r3) /* 0x80C9F298@l */ -/* 80C9F188 4B 5C 87 CD */ bl cM_rndF__Ff -/* 80C9F18C FC 00 08 1E */ fctiwz f0, f1 -/* 80C9F190 D8 01 00 08 */ stfd f0, 8(r1) -/* 80C9F194 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80C9F198 B0 1F 05 7C */ sth r0, 0x57c(r31) -/* 80C9F19C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C9F1A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9F1A4 38 63 09 58 */ addi r3, r3, 0x958 -/* 80C9F1A8 38 80 00 07 */ li r4, 7 -/* 80C9F1AC 4B 39 57 89 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 80C9F1B0 2C 03 00 00 */ cmpwi r3, 0 -/* 80C9F1B4 41 82 00 18 */ beq lbl_80C9F1CC -/* 80C9F1B8 38 00 00 01 */ li r0, 1 -/* 80C9F1BC B0 1F 05 7E */ sth r0, 0x57e(r31) -/* 80C9F1C0 3C 60 80 CA */ lis r3, lit_3967@ha /* 0x80C9F29C@ha */ -/* 80C9F1C4 C0 03 F2 9C */ lfs f0, lit_3967@l(r3) /* 0x80C9F29C@l */ -/* 80C9F1C8 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -lbl_80C9F1CC: -/* 80C9F1CC 7F E3 FB 78 */ mr r3, r31 -/* 80C9F1D0 4B FF FB 8D */ bl daObj_Myogan_Execute__FP16obj_myogan_class -lbl_80C9F1D4: -/* 80C9F1D4 7F C3 F3 78 */ mr r3, r30 -lbl_80C9F1D8: -/* 80C9F1D8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C9F1DC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C9F1E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C9F1E4 7C 08 03 A6 */ mtlr r0 -/* 80C9F1E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C9F1EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Delete__FP16obj_myogan_class.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Delete__FP16obj_myogan_class.s deleted file mode 100644 index 30a71de5a3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Delete__FP16obj_myogan_class.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C9EDC0: -/* 80C9EDC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9EDC4 7C 08 02 A6 */ mflr r0 -/* 80C9EDC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C9EDCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C9EDD0 7C 7F 1B 78 */ mr r31, r3 -/* 80C9EDD4 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80C9EDD8 3C 80 80 CA */ lis r4, d_a_obj_myogan__stringBase0@ha /* 0x80C9F2A0@ha */ -/* 80C9EDDC 38 84 F2 A0 */ addi r4, r4, d_a_obj_myogan__stringBase0@l /* 0x80C9F2A0@l */ -/* 80C9EDE0 4B 38 E2 29 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C9EDE4 88 1F 05 C0 */ lbz r0, 0x5c0(r31) -/* 80C9EDE8 28 00 00 00 */ cmplwi r0, 0 -/* 80C9EDEC 41 82 00 10 */ beq lbl_80C9EDFC -/* 80C9EDF0 38 00 00 00 */ li r0, 0 -/* 80C9EDF4 3C 60 80 CA */ lis r3, data_80C9F318@ha /* 0x80C9F318@ha */ -/* 80C9EDF8 98 03 F3 18 */ stb r0, data_80C9F318@l(r3) /* 0x80C9F318@l */ -lbl_80C9EDFC: -/* 80C9EDFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C9EE00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9EE04 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C9EE08 80 9F 05 BC */ lwz r4, 0x5bc(r31) -/* 80C9EE0C 4B 3D 54 45 */ bl Release__4cBgSFP9dBgW_Base -/* 80C9EE10 38 60 00 01 */ li r3, 1 -/* 80C9EE14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C9EE18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9EE1C 7C 08 03 A6 */ mtlr r0 -/* 80C9EE20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C9EE24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Draw__FP16obj_myogan_class.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Draw__FP16obj_myogan_class.s deleted file mode 100644 index 710cdcaf3f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Draw__FP16obj_myogan_class.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80C9EBDC: -/* 80C9EBDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9EBE0 7C 08 02 A6 */ mflr r0 -/* 80C9EBE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C9EBE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C9EBEC 7C 7F 1B 78 */ mr r31, r3 -/* 80C9EBF0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C9EBF4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C9EBF8 38 80 00 10 */ li r4, 0x10 -/* 80C9EBFC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C9EC00 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C9EC04 4B 50 4B C1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C9EC08 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C9EC0C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C9EC10 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80C9EC14 80 84 00 04 */ lwz r4, 4(r4) -/* 80C9EC18 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C9EC1C 4B 50 61 85 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C9EC20 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80C9EC24 80 83 00 04 */ lwz r4, 4(r3) -/* 80C9EC28 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80C9EC2C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80C9EC30 38 84 00 58 */ addi r4, r4, 0x58 -/* 80C9EC34 4B 36 EB 75 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80C9EC38 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80C9EC3C 80 83 00 04 */ lwz r4, 4(r3) -/* 80C9EC40 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80C9EC44 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80C9EC48 38 84 00 58 */ addi r4, r4, 0x58 -/* 80C9EC4C 4B 36 EA 8D */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80C9EC50 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80C9EC54 4B 36 F0 71 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C9EC58 38 60 00 01 */ li r3, 1 -/* 80C9EC5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C9EC60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9EC64 7C 08 03 A6 */ mtlr r0 -/* 80C9EC68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C9EC6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Execute__FP16obj_myogan_class.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Execute__FP16obj_myogan_class.s deleted file mode 100644 index 31d6e37cfc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/daObj_Myogan_Execute__FP16obj_myogan_class.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C9ED5C: -/* 80C9ED5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9ED60 7C 08 02 A6 */ mflr r0 -/* 80C9ED64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C9ED68 A8 83 05 7C */ lha r4, 0x57c(r3) -/* 80C9ED6C 38 04 00 01 */ addi r0, r4, 1 -/* 80C9ED70 B0 03 05 7C */ sth r0, 0x57c(r3) -/* 80C9ED74 38 80 00 00 */ li r4, 0 -/* 80C9ED78 38 00 00 02 */ li r0, 2 -/* 80C9ED7C 7C 09 03 A6 */ mtctr r0 -lbl_80C9ED80: -/* 80C9ED80 38 C4 05 82 */ addi r6, r4, 0x582 -/* 80C9ED84 7C A3 32 AE */ lhax r5, r3, r6 -/* 80C9ED88 2C 05 00 00 */ cmpwi r5, 0 -/* 80C9ED8C 41 82 00 0C */ beq lbl_80C9ED98 -/* 80C9ED90 38 05 FF FF */ addi r0, r5, -1 -/* 80C9ED94 7C 03 33 2E */ sthx r0, r3, r6 -lbl_80C9ED98: -/* 80C9ED98 38 84 00 02 */ addi r4, r4, 2 -/* 80C9ED9C 42 00 FF E4 */ bdnz lbl_80C9ED80 -/* 80C9EDA0 4B FF FE D1 */ bl action__FP16obj_myogan_class -/* 80C9EDA4 38 60 00 01 */ li r3, 1 -/* 80C9EDA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9EDAC 7C 08 03 A6 */ mtlr r0 -/* 80C9EDB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C9EDB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 0427ffff76..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,155 +0,0 @@ -lbl_80C9EE28: -/* 80C9EE28 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C9EE2C 7C 08 02 A6 */ mflr r0 -/* 80C9EE30 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C9EE34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C9EE38 4B 6C 33 A5 */ bl _savegpr_29 -/* 80C9EE3C 7C 7E 1B 78 */ mr r30, r3 -/* 80C9EE40 3C 60 80 CA */ lis r3, d_a_obj_myogan__stringBase0@ha /* 0x80C9F2A0@ha */ -/* 80C9EE44 38 63 F2 A0 */ addi r3, r3, d_a_obj_myogan__stringBase0@l /* 0x80C9F2A0@l */ -/* 80C9EE48 38 80 00 06 */ li r4, 6 -/* 80C9EE4C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C9EE50 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9EE54 3F E5 00 02 */ addis r31, r5, 2 -/* 80C9EE58 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80C9EE5C 7F E5 FB 78 */ mr r5, r31 -/* 80C9EE60 38 C0 00 80 */ li r6, 0x80 -/* 80C9EE64 4B 39 D4 89 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C9EE68 3C 80 00 08 */ lis r4, 8 -/* 80C9EE6C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 80C9EE70 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 80C9EE74 4B 37 5D E1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C9EE78 90 7E 05 70 */ stw r3, 0x570(r30) -/* 80C9EE7C 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 80C9EE80 28 00 00 00 */ cmplwi r0, 0 -/* 80C9EE84 40 82 00 0C */ bne lbl_80C9EE90 -/* 80C9EE88 38 60 00 00 */ li r3, 0 -/* 80C9EE8C 48 00 01 C0 */ b lbl_80C9F04C -lbl_80C9EE90: -/* 80C9EE90 38 60 00 18 */ li r3, 0x18 -/* 80C9EE94 4B 62 FD B9 */ bl __nw__FUl -/* 80C9EE98 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80C9EE9C 41 82 00 20 */ beq lbl_80C9EEBC -/* 80C9EEA0 3C 80 80 CA */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80C9F2F8@ha */ -/* 80C9EEA4 38 04 F2 F8 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80C9F2F8@l */ -/* 80C9EEA8 90 1D 00 00 */ stw r0, 0(r29) -/* 80C9EEAC 38 80 00 00 */ li r4, 0 -/* 80C9EEB0 4B 68 95 4D */ bl init__12J3DFrameCtrlFs -/* 80C9EEB4 38 00 00 00 */ li r0, 0 -/* 80C9EEB8 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80C9EEBC: -/* 80C9EEBC 93 BE 05 78 */ stw r29, 0x578(r30) -/* 80C9EEC0 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 80C9EEC4 28 00 00 00 */ cmplwi r0, 0 -/* 80C9EEC8 40 82 00 0C */ bne lbl_80C9EED4 -/* 80C9EECC 38 60 00 00 */ li r3, 0 -/* 80C9EED0 48 00 01 7C */ b lbl_80C9F04C -lbl_80C9EED4: -/* 80C9EED4 3C 60 80 CA */ lis r3, d_a_obj_myogan__stringBase0@ha /* 0x80C9F2A0@ha */ -/* 80C9EED8 38 63 F2 A0 */ addi r3, r3, d_a_obj_myogan__stringBase0@l /* 0x80C9F2A0@l */ -/* 80C9EEDC 38 80 00 09 */ li r4, 9 -/* 80C9EEE0 7F E5 FB 78 */ mr r5, r31 -/* 80C9EEE4 38 C0 00 80 */ li r6, 0x80 -/* 80C9EEE8 4B 39 D4 05 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C9EEEC 7C 65 1B 78 */ mr r5, r3 -/* 80C9EEF0 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80C9EEF4 80 83 00 04 */ lwz r4, 4(r3) -/* 80C9EEF8 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80C9EEFC 38 84 00 58 */ addi r4, r4, 0x58 -/* 80C9EF00 38 C0 00 01 */ li r6, 1 -/* 80C9EF04 38 E0 00 02 */ li r7, 2 -/* 80C9EF08 3D 00 80 CA */ lis r8, lit_3762@ha /* 0x80C9F288@ha */ -/* 80C9EF0C C0 28 F2 88 */ lfs f1, lit_3762@l(r8) /* 0x80C9F288@l */ -/* 80C9EF10 39 00 00 00 */ li r8, 0 -/* 80C9EF14 39 20 FF FF */ li r9, -1 -/* 80C9EF18 4B 36 E7 F5 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80C9EF1C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C9EF20 40 82 00 0C */ bne lbl_80C9EF2C -/* 80C9EF24 38 60 00 00 */ li r3, 0 -/* 80C9EF28 48 00 01 24 */ b lbl_80C9F04C -lbl_80C9EF2C: -/* 80C9EF2C 38 60 00 18 */ li r3, 0x18 -/* 80C9EF30 4B 62 FD 1D */ bl __nw__FUl -/* 80C9EF34 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80C9EF38 41 82 00 20 */ beq lbl_80C9EF58 -/* 80C9EF3C 3C 80 80 CA */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80C9F2F8@ha */ -/* 80C9EF40 38 04 F2 F8 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80C9F2F8@l */ -/* 80C9EF44 90 1D 00 00 */ stw r0, 0(r29) -/* 80C9EF48 38 80 00 00 */ li r4, 0 -/* 80C9EF4C 4B 68 94 B1 */ bl init__12J3DFrameCtrlFs -/* 80C9EF50 38 00 00 00 */ li r0, 0 -/* 80C9EF54 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80C9EF58: -/* 80C9EF58 93 BE 05 74 */ stw r29, 0x574(r30) -/* 80C9EF5C 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 80C9EF60 28 00 00 00 */ cmplwi r0, 0 -/* 80C9EF64 40 82 00 0C */ bne lbl_80C9EF70 -/* 80C9EF68 38 60 00 00 */ li r3, 0 -/* 80C9EF6C 48 00 00 E0 */ b lbl_80C9F04C -lbl_80C9EF70: -/* 80C9EF70 3C 60 80 CA */ lis r3, d_a_obj_myogan__stringBase0@ha /* 0x80C9F2A0@ha */ -/* 80C9EF74 38 63 F2 A0 */ addi r3, r3, d_a_obj_myogan__stringBase0@l /* 0x80C9F2A0@l */ -/* 80C9EF78 38 80 00 0C */ li r4, 0xc -/* 80C9EF7C 7F E5 FB 78 */ mr r5, r31 -/* 80C9EF80 38 C0 00 80 */ li r6, 0x80 -/* 80C9EF84 4B 39 D3 69 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C9EF88 7C 65 1B 78 */ mr r5, r3 -/* 80C9EF8C 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80C9EF90 80 83 00 04 */ lwz r4, 4(r3) -/* 80C9EF94 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80C9EF98 38 84 00 58 */ addi r4, r4, 0x58 -/* 80C9EF9C 38 C0 00 01 */ li r6, 1 -/* 80C9EFA0 38 E0 00 02 */ li r7, 2 -/* 80C9EFA4 3D 00 80 CA */ lis r8, lit_3762@ha /* 0x80C9F288@ha */ -/* 80C9EFA8 C0 28 F2 88 */ lfs f1, lit_3762@l(r8) /* 0x80C9F288@l */ -/* 80C9EFAC 39 00 00 00 */ li r8, 0 -/* 80C9EFB0 39 20 FF FF */ li r9, -1 -/* 80C9EFB4 4B 36 E6 89 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80C9EFB8 2C 03 00 00 */ cmpwi r3, 0 -/* 80C9EFBC 40 82 00 0C */ bne lbl_80C9EFC8 -/* 80C9EFC0 38 60 00 00 */ li r3, 0 -/* 80C9EFC4 48 00 00 88 */ b lbl_80C9F04C -lbl_80C9EFC8: -/* 80C9EFC8 38 60 00 C0 */ li r3, 0xc0 -/* 80C9EFCC 4B 62 FC 81 */ bl __nw__FUl -/* 80C9EFD0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80C9EFD4 41 82 00 0C */ beq lbl_80C9EFE0 -/* 80C9EFD8 4B 3D C9 99 */ bl __ct__4dBgWFv -/* 80C9EFDC 7C 60 1B 78 */ mr r0, r3 -lbl_80C9EFE0: -/* 80C9EFE0 90 1E 05 BC */ stw r0, 0x5bc(r30) -/* 80C9EFE4 80 1E 05 BC */ lwz r0, 0x5bc(r30) -/* 80C9EFE8 28 00 00 00 */ cmplwi r0, 0 -/* 80C9EFEC 40 82 00 0C */ bne lbl_80C9EFF8 -/* 80C9EFF0 38 60 00 00 */ li r3, 0 -/* 80C9EFF4 48 00 00 58 */ b lbl_80C9F04C -lbl_80C9EFF8: -/* 80C9EFF8 3C 60 80 CA */ lis r3, d_a_obj_myogan__stringBase0@ha /* 0x80C9F2A0@ha */ -/* 80C9EFFC 38 63 F2 A0 */ addi r3, r3, d_a_obj_myogan__stringBase0@l /* 0x80C9F2A0@l */ -/* 80C9F000 38 80 00 0F */ li r4, 0xf -/* 80C9F004 7F E5 FB 78 */ mr r5, r31 -/* 80C9F008 38 C0 00 80 */ li r6, 0x80 -/* 80C9F00C 4B 39 D2 E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C9F010 7C 64 1B 78 */ mr r4, r3 -/* 80C9F014 80 7E 05 BC */ lwz r3, 0x5bc(r30) -/* 80C9F018 38 A0 00 01 */ li r5, 1 -/* 80C9F01C 38 DE 05 8C */ addi r6, r30, 0x58c -/* 80C9F020 4B 3D AF 19 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80C9F024 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80C9F028 28 00 00 01 */ cmplwi r0, 1 -/* 80C9F02C 40 82 00 0C */ bne lbl_80C9F038 -/* 80C9F030 38 60 00 00 */ li r3, 0 -/* 80C9F034 48 00 00 18 */ b lbl_80C9F04C -lbl_80C9F038: -/* 80C9F038 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075A24@ha */ -/* 80C9F03C 38 03 5A 24 */ addi r0, r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075A24@l */ -/* 80C9F040 80 7E 05 BC */ lwz r3, 0x5bc(r30) -/* 80C9F044 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80C9F048 38 60 00 01 */ li r3, 1 -lbl_80C9F04C: -/* 80C9F04C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C9F050 4B 6C 31 D9 */ bl _restgpr_29 -/* 80C9F054 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C9F058 7C 08 03 A6 */ mtlr r0 -/* 80C9F05C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C9F060 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/CreateHeap__18daObjMirror6Pole_cFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/CreateHeap__18daObjMirror6Pole_cFv.s deleted file mode 100644 index c90e51436d..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/CreateHeap__18daObjMirror6Pole_cFv.s +++ /dev/null @@ -1,167 +0,0 @@ -lbl_80C95F70: -/* 80C95F70 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C95F74 7C 08 02 A6 */ mflr r0 -/* 80C95F78 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C95F7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C95F80 4B 6C C2 59 */ bl _savegpr_28 -/* 80C95F84 7C 7D 1B 78 */ mr r29, r3 -/* 80C95F88 3C 60 80 C9 */ lis r3, l_arcName@ha /* 0x80C9654C@ha */ -/* 80C95F8C 38 63 65 4C */ addi r3, r3, l_arcName@l /* 0x80C9654C@l */ -/* 80C95F90 80 63 00 00 */ lwz r3, 0(r3) -/* 80C95F94 38 80 00 07 */ li r4, 7 -/* 80C95F98 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C95F9C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C95FA0 3F 85 00 02 */ addis r28, r5, 2 -/* 80C95FA4 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 80C95FA8 7F 85 E3 78 */ mr r5, r28 -/* 80C95FAC 38 C0 00 80 */ li r6, 0x80 -/* 80C95FB0 4B 3A 63 3D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C95FB4 3C 80 00 08 */ lis r4, 8 -/* 80C95FB8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C95FBC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C95FC0 4B 37 EC 95 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C95FC4 90 7D 05 68 */ stw r3, 0x568(r29) -/* 80C95FC8 80 1D 05 68 */ lwz r0, 0x568(r29) -/* 80C95FCC 28 00 00 00 */ cmplwi r0, 0 -/* 80C95FD0 40 82 00 0C */ bne lbl_80C95FDC -/* 80C95FD4 38 60 00 00 */ li r3, 0 -/* 80C95FD8 48 00 01 E8 */ b lbl_80C961C0 -lbl_80C95FDC: -/* 80C95FDC 3C 60 80 C9 */ lis r3, l_arcName@ha /* 0x80C9654C@ha */ -/* 80C95FE0 38 63 65 4C */ addi r3, r3, l_arcName@l /* 0x80C9654C@l */ -/* 80C95FE4 80 63 00 00 */ lwz r3, 0(r3) -/* 80C95FE8 38 80 00 04 */ li r4, 4 -/* 80C95FEC 7F 85 E3 78 */ mr r5, r28 -/* 80C95FF0 38 C0 00 80 */ li r6, 0x80 -/* 80C95FF4 4B 3A 62 F9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C95FF8 7C 7E 1B 78 */ mr r30, r3 -/* 80C95FFC 38 60 00 1C */ li r3, 0x1c -/* 80C96000 4B 63 8C 4D */ bl __nw__FUl -/* 80C96004 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C96008 41 82 00 20 */ beq lbl_80C96028 -/* 80C9600C 3C 80 80 C9 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80C96600@ha */ -/* 80C96010 38 04 66 00 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80C96600@l */ -/* 80C96014 90 1F 00 00 */ stw r0, 0(r31) -/* 80C96018 38 80 00 00 */ li r4, 0 -/* 80C9601C 4B 69 23 E1 */ bl init__12J3DFrameCtrlFs -/* 80C96020 38 00 00 00 */ li r0, 0 -/* 80C96024 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_80C96028: -/* 80C96028 93 FD 05 6C */ stw r31, 0x56c(r29) -/* 80C9602C 3B E0 00 01 */ li r31, 1 -/* 80C96030 7F FC FB 78 */ mr r28, r31 -/* 80C96034 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C96038 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9603C 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80C96040 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80C96044 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80C96048 7C 05 07 74 */ extsb r5, r0 -/* 80C9604C 4B 39 F3 15 */ bl isSwitch__10dSv_info_cCFii -/* 80C96050 2C 03 00 00 */ cmpwi r3, 0 -/* 80C96054 40 82 00 2C */ bne lbl_80C96080 -/* 80C96058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C9605C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C96060 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C96064 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C96068 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C9606C A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 80C96070 4B 39 E9 4D */ bl isEventBit__11dSv_event_cCFUs -/* 80C96074 2C 03 00 00 */ cmpwi r3, 0 -/* 80C96078 40 82 00 08 */ bne lbl_80C96080 -/* 80C9607C 3B 80 00 00 */ li r28, 0 -lbl_80C96080: -/* 80C96080 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80C96084 40 82 00 2C */ bne lbl_80C960B0 -/* 80C96088 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C9608C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C96090 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C96094 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C96098 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C9609C A0 84 02 C4 */ lhz r4, 0x2c4(r4) -/* 80C960A0 4B 39 E9 1D */ bl isEventBit__11dSv_event_cCFUs -/* 80C960A4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C960A8 40 82 00 08 */ bne lbl_80C960B0 -/* 80C960AC 3B E0 00 00 */ li r31, 0 -lbl_80C960B0: -/* 80C960B0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80C960B4 41 82 00 10 */ beq lbl_80C960C4 -/* 80C960B8 3C 60 80 C9 */ lis r3, lit_3755@ha /* 0x80C96514@ha */ -/* 80C960BC C0 23 65 14 */ lfs f1, lit_3755@l(r3) /* 0x80C96514@l */ -/* 80C960C0 48 00 00 0C */ b lbl_80C960CC -lbl_80C960C4: -/* 80C960C4 3C 60 80 C9 */ lis r3, lit_3630@ha /* 0x80C96510@ha */ -/* 80C960C8 C0 23 65 10 */ lfs f1, lit_3630@l(r3) /* 0x80C96510@l */ -lbl_80C960CC: -/* 80C960CC 80 7D 05 6C */ lwz r3, 0x56c(r29) -/* 80C960D0 28 03 00 00 */ cmplwi r3, 0 -/* 80C960D4 41 82 00 28 */ beq lbl_80C960FC -/* 80C960D8 7F C4 F3 78 */ mr r4, r30 -/* 80C960DC 38 A0 00 00 */ li r5, 0 -/* 80C960E0 38 C0 00 00 */ li r6, 0 -/* 80C960E4 38 E0 00 00 */ li r7, 0 -/* 80C960E8 39 00 FF FF */ li r8, -1 -/* 80C960EC 39 20 00 00 */ li r9, 0 -/* 80C960F0 4B 37 76 ED */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80C960F4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C960F8 40 82 00 0C */ bne lbl_80C96104 -lbl_80C960FC: -/* 80C960FC 38 60 00 00 */ li r3, 0 -/* 80C96100 48 00 00 C0 */ b lbl_80C961C0 -lbl_80C96104: -/* 80C96104 3B E0 00 01 */ li r31, 1 -/* 80C96108 7F FC FB 78 */ mr r28, r31 -/* 80C9610C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C96110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C96114 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80C96118 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80C9611C 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80C96120 7C 05 07 74 */ extsb r5, r0 -/* 80C96124 4B 39 F2 3D */ bl isSwitch__10dSv_info_cCFii -/* 80C96128 2C 03 00 00 */ cmpwi r3, 0 -/* 80C9612C 40 82 00 2C */ bne lbl_80C96158 -/* 80C96130 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C96134 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C96138 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C9613C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C96140 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C96144 A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 80C96148 4B 39 E8 75 */ bl isEventBit__11dSv_event_cCFUs -/* 80C9614C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C96150 40 82 00 08 */ bne lbl_80C96158 -/* 80C96154 3B 80 00 00 */ li r28, 0 -lbl_80C96158: -/* 80C96158 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80C9615C 40 82 00 2C */ bne lbl_80C96188 -/* 80C96160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C96164 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C96168 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C9616C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C96170 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C96174 A0 84 02 C4 */ lhz r4, 0x2c4(r4) -/* 80C96178 4B 39 E8 45 */ bl isEventBit__11dSv_event_cCFUs -/* 80C9617C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C96180 40 82 00 08 */ bne lbl_80C96188 -/* 80C96184 3B E0 00 00 */ li r31, 0 -lbl_80C96188: -/* 80C96188 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80C9618C 41 82 00 30 */ beq lbl_80C961BC -/* 80C96190 A8 1E 00 06 */ lha r0, 6(r30) -/* 80C96194 3C 60 80 C9 */ lis r3, lit_3757@ha /* 0x80C96518@ha */ -/* 80C96198 C8 23 65 18 */ lfd f1, lit_3757@l(r3) /* 0x80C96518@l */ -/* 80C9619C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C961A0 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C961A4 3C 00 43 30 */ lis r0, 0x4330 -/* 80C961A8 90 01 00 08 */ stw r0, 8(r1) -/* 80C961AC C8 01 00 08 */ lfd f0, 8(r1) -/* 80C961B0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C961B4 80 7D 05 6C */ lwz r3, 0x56c(r29) -/* 80C961B8 D0 03 00 10 */ stfs f0, 0x10(r3) -lbl_80C961BC: -/* 80C961BC 38 60 00 01 */ li r3, 1 -lbl_80C961C0: -/* 80C961C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C961C4 4B 6C C0 61 */ bl _restgpr_28 -/* 80C961C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C961CC 7C 08 03 A6 */ mtlr r0 -/* 80C961D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C961D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 931d89e7ce..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C961D8: -/* 80C961D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C961DC 7C 08 02 A6 */ mflr r0 -/* 80C961E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C961E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C961E8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C961EC 41 82 00 1C */ beq lbl_80C96208 -/* 80C961F0 3C A0 80 C9 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80C96600@ha */ -/* 80C961F4 38 05 66 00 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80C96600@l */ -/* 80C961F8 90 1F 00 00 */ stw r0, 0(r31) -/* 80C961FC 7C 80 07 35 */ extsh. r0, r4 -/* 80C96200 40 81 00 08 */ ble lbl_80C96208 -/* 80C96204 4B 63 8B 39 */ bl __dl__FPv -lbl_80C96208: -/* 80C96208 7F E3 FB 78 */ mr r3, r31 -/* 80C9620C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C96210 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C96214 7C 08 03 A6 */ mtlr r0 -/* 80C96218 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C9621C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/__sinit_d_a_obj_mirror_6pole_cpp.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/__sinit_d_a_obj_mirror_6pole_cpp.s deleted file mode 100644 index d5c6dac14a..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/__sinit_d_a_obj_mirror_6pole_cpp.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80C96494: -/* 80C96494 3C 60 80 C9 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80C9652C@ha */ -/* 80C96498 38 A3 65 2C */ addi r5, r3, cNullVec__6Z2Calc@l /* 0x80C9652C@l */ -/* 80C9649C 80 65 00 24 */ lwz r3, 0x24(r5) -/* 80C964A0 80 05 00 28 */ lwz r0, 0x28(r5) -/* 80C964A4 90 65 00 54 */ stw r3, 0x54(r5) -/* 80C964A8 90 05 00 58 */ stw r0, 0x58(r5) -/* 80C964AC 80 05 00 2C */ lwz r0, 0x2c(r5) -/* 80C964B0 90 05 00 5C */ stw r0, 0x5c(r5) -/* 80C964B4 38 85 00 54 */ addi r4, r5, 0x54 -/* 80C964B8 80 65 00 30 */ lwz r3, 0x30(r5) -/* 80C964BC 80 05 00 34 */ lwz r0, 0x34(r5) -/* 80C964C0 90 64 00 0C */ stw r3, 0xc(r4) -/* 80C964C4 90 04 00 10 */ stw r0, 0x10(r4) -/* 80C964C8 80 05 00 38 */ lwz r0, 0x38(r5) -/* 80C964CC 90 04 00 14 */ stw r0, 0x14(r4) -/* 80C964D0 80 65 00 3C */ lwz r3, 0x3c(r5) -/* 80C964D4 80 05 00 40 */ lwz r0, 0x40(r5) -/* 80C964D8 90 64 00 18 */ stw r3, 0x18(r4) -/* 80C964DC 90 04 00 1C */ stw r0, 0x1c(r4) -/* 80C964E0 80 05 00 44 */ lwz r0, 0x44(r5) -/* 80C964E4 90 04 00 20 */ stw r0, 0x20(r4) -/* 80C964E8 80 65 00 48 */ lwz r3, 0x48(r5) -/* 80C964EC 80 05 00 4C */ lwz r0, 0x4c(r5) -/* 80C964F0 90 64 00 24 */ stw r3, 0x24(r4) -/* 80C964F4 90 04 00 28 */ stw r0, 0x28(r4) -/* 80C964F8 80 05 00 50 */ lwz r0, 0x50(r5) -/* 80C964FC 90 04 00 2C */ stw r0, 0x2c(r4) -/* 80C96500 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 3e30966f93..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_80C96220: -/* 80C96220 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C96224 7C 08 02 A6 */ mflr r0 -/* 80C96228 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C9622C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C96230 93 C1 00 08 */ stw r30, 8(r1) -/* 80C96234 7C 7F 1B 78 */ mr r31, r3 -/* 80C96238 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C9623C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C96240 40 82 00 1C */ bne lbl_80C9625C -/* 80C96244 28 1F 00 00 */ cmplwi r31, 0 -/* 80C96248 41 82 00 08 */ beq lbl_80C96250 -/* 80C9624C 4B 38 29 19 */ bl __ct__10fopAc_ac_cFv -lbl_80C96250: -/* 80C96250 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C96254 60 00 00 08 */ ori r0, r0, 8 -/* 80C96258 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C9625C: -/* 80C9625C 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80C96260 3C 80 80 C9 */ lis r4, l_arcName@ha /* 0x80C9654C@ha */ -/* 80C96264 38 84 65 4C */ addi r4, r4, l_arcName@l /* 0x80C9654C@l */ -/* 80C96268 80 84 00 00 */ lwz r4, 0(r4) -/* 80C9626C 4B 39 6C 51 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C96270 7C 7E 1B 78 */ mr r30, r3 -/* 80C96274 2C 1E 00 04 */ cmpwi r30, 4 -/* 80C96278 40 82 00 94 */ bne lbl_80C9630C -/* 80C9627C 7F E3 FB 78 */ mr r3, r31 -/* 80C96280 3C 80 80 C9 */ lis r4, createHeapCallBack__18daObjMirror6Pole_cFP10fopAc_ac_c@ha /* 0x80C95F50@ha */ -/* 80C96284 38 84 5F 50 */ addi r4, r4, createHeapCallBack__18daObjMirror6Pole_cFP10fopAc_ac_c@l /* 0x80C95F50@l */ -/* 80C96288 38 A0 1C 00 */ li r5, 0x1c00 -/* 80C9628C 4B 38 42 25 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80C96290 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C96294 40 82 00 0C */ bne lbl_80C962A0 -/* 80C96298 3B C0 00 05 */ li r30, 5 -/* 80C9629C 48 00 00 70 */ b lbl_80C9630C -lbl_80C962A0: -/* 80C962A0 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C962A4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C962A8 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80C962AC 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80C962B0 4B 37 6A B5 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80C962B4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C962B8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C962BC A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80C962C0 4B 37 61 75 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C962C4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C962C8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C962CC 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C962D0 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C962D4 4B 6B 01 DD */ bl PSMTXCopy -/* 80C962D8 38 00 00 00 */ li r0, 0 -/* 80C962DC 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80C962E0 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 80C962E4 80 1F 05 7C */ lwz r0, 0x57c(r31) -/* 80C962E8 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 80C962EC 3C 60 80 C9 */ lis r3, ActionTable__18daObjMirror6Pole_c@ha /* 0x80C96580@ha */ -/* 80C962F0 38 03 65 80 */ addi r0, r3, ActionTable__18daObjMirror6Pole_c@l /* 0x80C96580@l */ -/* 80C962F4 7C 00 22 14 */ add r0, r0, r4 -/* 80C962F8 90 1F 05 78 */ stw r0, 0x578(r31) -/* 80C962FC 7F E3 FB 78 */ mr r3, r31 -/* 80C96300 81 9F 05 78 */ lwz r12, 0x578(r31) -/* 80C96304 4B 6C BD 81 */ bl __ptmf_scall -/* 80C96308 60 00 00 00 */ nop -lbl_80C9630C: -/* 80C9630C 7F C3 F3 78 */ mr r3, r30 -/* 80C96310 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C96314 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C96318 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9631C 7C 08 03 A6 */ mtlr r0 -/* 80C96320 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C96324 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Delete__FP18daObjMirror6Pole_c.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Delete__FP18daObjMirror6Pole_c.s deleted file mode 100644 index 25846a904d..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Delete__FP18daObjMirror6Pole_c.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80C96328: -/* 80C96328 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9632C 7C 08 02 A6 */ mflr r0 -/* 80C96330 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C96334 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C96338 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C9633C 41 82 00 24 */ beq lbl_80C96360 -/* 80C96340 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80C96344 3C 80 80 C9 */ lis r4, l_arcName@ha /* 0x80C9654C@ha */ -/* 80C96348 38 84 65 4C */ addi r4, r4, l_arcName@l /* 0x80C9654C@l */ -/* 80C9634C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C96350 4B 39 6C B9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C96354 7F E3 FB 78 */ mr r3, r31 -/* 80C96358 38 80 00 00 */ li r4, 0 -/* 80C9635C 4B 38 29 31 */ bl __dt__10fopAc_ac_cFv -lbl_80C96360: -/* 80C96360 38 60 00 01 */ li r3, 1 -/* 80C96364 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C96368 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9636C 7C 08 03 A6 */ mtlr r0 -/* 80C96370 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C96374 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Draw__FP18daObjMirror6Pole_c.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Draw__FP18daObjMirror6Pole_c.s deleted file mode 100644 index 22515a6654..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Draw__FP18daObjMirror6Pole_c.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80C963BC: -/* 80C963BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C963C0 7C 08 02 A6 */ mflr r0 -/* 80C963C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C963C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C963CC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C963D0 7C 7F 1B 78 */ mr r31, r3 -/* 80C963D4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C963D8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C963DC 38 80 00 10 */ li r4, 0x10 -/* 80C963E0 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C963E4 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C963E8 4B 50 D3 DD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C963EC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C963F0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C963F4 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C963F8 80 84 00 04 */ lwz r4, 4(r4) -/* 80C963FC 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C96400 4B 50 E9 A1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C96404 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C96408 80 83 00 04 */ lwz r4, 4(r3) -/* 80C9640C 80 7F 05 6C */ lwz r3, 0x56c(r31) -/* 80C96410 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80C96414 4B 37 75 B9 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80C96418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C9641C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C96420 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C96424 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C96428 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C9642C 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C96430 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C96434 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C96438 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C9643C 4B 37 78 89 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C96440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C96444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C96448 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C9644C 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C96450 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C96454 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C96458 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C9645C 80 63 00 04 */ lwz r3, 4(r3) -/* 80C96460 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80C96464 80 63 00 00 */ lwz r3, 0(r3) -/* 80C96468 38 00 00 00 */ li r0, 0 -/* 80C9646C 90 03 00 54 */ stw r0, 0x54(r3) -/* 80C96470 38 60 00 01 */ li r3, 1 -/* 80C96474 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C96478 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C9647C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C96480 7C 08 03 A6 */ mtlr r0 -/* 80C96484 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C96488 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Execute__FP18daObjMirror6Pole_c.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Execute__FP18daObjMirror6Pole_c.s deleted file mode 100644 index 6f24ce3d62..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/daObjMirror6Pole_Execute__FP18daObjMirror6Pole_c.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80C96378: -/* 80C96378 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9637C 7C 08 02 A6 */ mflr r0 -/* 80C96380 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C96384 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C96388 7C 7F 1B 78 */ mr r31, r3 -/* 80C9638C 80 83 05 78 */ lwz r4, 0x578(r3) -/* 80C96390 39 84 00 0C */ addi r12, r4, 0xc -/* 80C96394 4B 6C BC F1 */ bl __ptmf_scall -/* 80C96398 60 00 00 00 */ nop -/* 80C9639C 80 7F 05 6C */ lwz r3, 0x56c(r31) -/* 80C963A0 4B 37 70 89 */ bl play__14mDoExt_baseAnmFv -/* 80C963A4 38 60 00 01 */ li r3, 1 -/* 80C963A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C963AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C963B0 7C 08 03 A6 */ mtlr r0 -/* 80C963B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C963B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/executeDemo__18daObjMirror6Pole_cFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/executeDemo__18daObjMirror6Pole_cFv.s deleted file mode 100644 index 89dbb0e06b..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/executeDemo__18daObjMirror6Pole_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C95E8C: -/* 80C95E8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C95E90 7C 08 02 A6 */ mflr r0 -/* 80C95E94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C95E98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C95E9C 7C 7F 1B 78 */ mr r31, r3 -/* 80C95EA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C95EA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C95EA8 88 04 4F AD */ lbz r0, 0x4fad(r4) -/* 80C95EAC 28 00 00 00 */ cmplwi r0, 0 -/* 80C95EB0 40 82 00 30 */ bne lbl_80C95EE0 -/* 80C95EB4 38 00 00 00 */ li r0, 0 -/* 80C95EB8 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 80C95EBC 80 1F 05 7C */ lwz r0, 0x57c(r31) -/* 80C95EC0 1C A0 00 18 */ mulli r5, r0, 0x18 -/* 80C95EC4 3C 80 80 C9 */ lis r4, ActionTable__18daObjMirror6Pole_c@ha /* 0x80C96580@ha */ -/* 80C95EC8 38 04 65 80 */ addi r0, r4, ActionTable__18daObjMirror6Pole_c@l /* 0x80C96580@l */ -/* 80C95ECC 7C 00 2A 14 */ add r0, r0, r5 -/* 80C95ED0 90 1F 05 78 */ stw r0, 0x578(r31) -/* 80C95ED4 81 9F 05 78 */ lwz r12, 0x578(r31) -/* 80C95ED8 4B 6C C1 AD */ bl __ptmf_scall -/* 80C95EDC 60 00 00 00 */ nop -lbl_80C95EE0: -/* 80C95EE0 7F E3 FB 78 */ mr r3, r31 -/* 80C95EE4 48 00 00 19 */ bl setBaseMtx__18daObjMirror6Pole_cFv -/* 80C95EE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C95EEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C95EF0 7C 08 03 A6 */ mtlr r0 -/* 80C95EF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C95EF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/executeWait__18daObjMirror6Pole_cFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/executeWait__18daObjMirror6Pole_cFv.s deleted file mode 100644 index 9403cb8e65..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/executeWait__18daObjMirror6Pole_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80C95E2C: -/* 80C95E2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C95E30 7C 08 02 A6 */ mflr r0 -/* 80C95E34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C95E38 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C95E3C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C95E40 88 04 4F AD */ lbz r0, 0x4fad(r4) -/* 80C95E44 28 00 00 00 */ cmplwi r0, 0 -/* 80C95E48 41 82 00 30 */ beq lbl_80C95E78 -/* 80C95E4C 38 00 00 01 */ li r0, 1 -/* 80C95E50 90 03 05 7C */ stw r0, 0x57c(r3) -/* 80C95E54 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 80C95E58 1C A0 00 18 */ mulli r5, r0, 0x18 -/* 80C95E5C 3C 80 80 C9 */ lis r4, ActionTable__18daObjMirror6Pole_c@ha /* 0x80C96580@ha */ -/* 80C95E60 38 04 65 80 */ addi r0, r4, ActionTable__18daObjMirror6Pole_c@l /* 0x80C96580@l */ -/* 80C95E64 7C 00 2A 14 */ add r0, r0, r5 -/* 80C95E68 90 03 05 78 */ stw r0, 0x578(r3) -/* 80C95E6C 81 83 05 78 */ lwz r12, 0x578(r3) -/* 80C95E70 4B 6C C2 15 */ bl __ptmf_scall -/* 80C95E74 60 00 00 00 */ nop -lbl_80C95E78: -/* 80C95E78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C95E7C 7C 08 03 A6 */ mtlr r0 -/* 80C95E80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C95E84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/func_80C95F50.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/func_80C95F50.s deleted file mode 100644 index d9be4a35bf..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/func_80C95F50.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C95F50: -/* 80C95F50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C95F54 7C 08 02 A6 */ mflr r0 -/* 80C95F58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C95F5C 48 00 00 15 */ bl CreateHeap__18daObjMirror6Pole_cFv -/* 80C95F60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C95F64 7C 08 03 A6 */ mtlr r0 -/* 80C95F68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C95F6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/initWait__18daObjMirror6Pole_cFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/initWait__18daObjMirror6Pole_cFv.s deleted file mode 100644 index 960a188536..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/initWait__18daObjMirror6Pole_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80C95E18: -/* 80C95E18 3C 80 80 C9 */ lis r4, lit_3630@ha /* 0x80C96510@ha */ -/* 80C95E1C C0 04 65 10 */ lfs f0, lit_3630@l(r4) /* 0x80C96510@l */ -/* 80C95E20 80 63 05 6C */ lwz r3, 0x56c(r3) -/* 80C95E24 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80C95E28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/setBaseMtx__18daObjMirror6Pole_cFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/setBaseMtx__18daObjMirror6Pole_cFv.s deleted file mode 100644 index 9ec1e55672..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole/setBaseMtx__18daObjMirror6Pole_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80C95EFC: -/* 80C95EFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C95F00 7C 08 02 A6 */ mflr r0 -/* 80C95F04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C95F08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C95F0C 7C 7F 1B 78 */ mr r31, r3 -/* 80C95F10 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80C95F14 4B 37 6E 51 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80C95F18 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C95F1C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C95F20 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80C95F24 4B 37 65 11 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C95F28 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C95F2C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C95F30 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C95F34 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C95F38 4B 6B 05 79 */ bl PSMTXCopy -/* 80C95F3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C95F40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C95F44 7C 08 03 A6 */ mtlr r0 -/* 80C95F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C95F4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 10c1b48072..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C984C0: -/* 80C984C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C984C4 7C 08 02 A6 */ mflr r0 -/* 80C984C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C984CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C984D0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C984D4 41 82 00 1C */ beq lbl_80C984F0 -/* 80C984D8 3C A0 80 CA */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80C98A44@ha */ -/* 80C984DC 38 05 8A 44 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80C98A44@l */ -/* 80C984E0 90 1F 00 00 */ stw r0, 0(r31) -/* 80C984E4 7C 80 07 35 */ extsh. r0, r4 -/* 80C984E8 40 81 00 08 */ ble lbl_80C984F0 -/* 80C984EC 4B 63 68 51 */ bl __dl__FPv -lbl_80C984F0: -/* 80C984F0 7F E3 FB 78 */ mr r3, r31 -/* 80C984F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C984F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C984FC 7C 08 03 A6 */ mtlr r0 -/* 80C98500 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C98504 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/__dt__4dBgWFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/__dt__4dBgWFv.s deleted file mode 100644 index 6a2970bb6f..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/__dt__4dBgWFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C987B8: -/* 80C987B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C987BC 7C 08 02 A6 */ mflr r0 -/* 80C987C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C987C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C987C8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C987CC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C987D0 7C 9F 23 78 */ mr r31, r4 -/* 80C987D4 41 82 00 28 */ beq lbl_80C987FC -/* 80C987D8 3C 80 80 3B */ lis r4, __vt__4dBgW@ha /* 0x803ABA80@ha */ -/* 80C987DC 38 04 BA 80 */ addi r0, r4, __vt__4dBgW@l /* 0x803ABA80@l */ -/* 80C987E0 90 1E 00 04 */ stw r0, 4(r30) -/* 80C987E4 38 80 00 00 */ li r4, 0 -/* 80C987E8 4B 3E 0B 55 */ bl __dt__4cBgWFv -/* 80C987EC 7F E0 07 35 */ extsh. r0, r31 -/* 80C987F0 40 81 00 0C */ ble lbl_80C987FC -/* 80C987F4 7F C3 F3 78 */ mr r3, r30 -/* 80C987F8 4B 63 65 45 */ bl __dl__FPv -lbl_80C987FC: -/* 80C987FC 7F C3 F3 78 */ mr r3, r30 -/* 80C98800 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C98804 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C98808 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9880C 7C 08 03 A6 */ mtlr r0 -/* 80C98810 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C98814 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/createSolidHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/createSolidHeap__FP10fopAc_ac_c.s deleted file mode 100644 index c6a8d47769..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/createSolidHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,201 +0,0 @@ -lbl_80C981D8: -/* 80C981D8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C981DC 7C 08 02 A6 */ mflr r0 -/* 80C981E0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C981E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C981E8 4B 6C 9F ED */ bl _savegpr_27 -/* 80C981EC 7C 7F 1B 78 */ mr r31, r3 -/* 80C981F0 3C 60 80 CA */ lis r3, l_arcName@ha /* 0x80C989F0@ha */ -/* 80C981F4 38 63 89 F0 */ addi r3, r3, l_arcName@l /* 0x80C989F0@l */ -/* 80C981F8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C981FC 38 80 00 08 */ li r4, 8 -/* 80C98200 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C98204 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C98208 3F C5 00 02 */ addis r30, r5, 2 -/* 80C9820C 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80C98210 7F C5 F3 78 */ mr r5, r30 -/* 80C98214 38 C0 00 80 */ li r6, 0x80 -/* 80C98218 4B 3A 40 D5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C9821C 3C 80 00 08 */ lis r4, 8 -/* 80C98220 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C98224 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C98228 4B 37 CA 2D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C9822C 90 7F 05 68 */ stw r3, 0x568(r31) -/* 80C98230 80 1F 05 68 */ lwz r0, 0x568(r31) -/* 80C98234 28 00 00 00 */ cmplwi r0, 0 -/* 80C98238 40 82 00 0C */ bne lbl_80C98244 -/* 80C9823C 38 60 00 00 */ li r3, 0 -/* 80C98240 48 00 02 68 */ b lbl_80C984A8 -lbl_80C98244: -/* 80C98244 3C 60 80 CA */ lis r3, l_arcName@ha /* 0x80C989F0@ha */ -/* 80C98248 38 63 89 F0 */ addi r3, r3, l_arcName@l /* 0x80C989F0@l */ -/* 80C9824C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C98250 38 80 00 05 */ li r4, 5 -/* 80C98254 7F C5 F3 78 */ mr r5, r30 -/* 80C98258 38 C0 00 80 */ li r6, 0x80 -/* 80C9825C 4B 3A 40 91 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C98260 7C 7D 1B 78 */ mr r29, r3 -/* 80C98264 38 60 00 1C */ li r3, 0x1c -/* 80C98268 4B 63 69 E5 */ bl __nw__FUl -/* 80C9826C 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80C98270 41 82 00 20 */ beq lbl_80C98290 -/* 80C98274 3C 80 80 CA */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80C98A44@ha */ -/* 80C98278 38 04 8A 44 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80C98A44@l */ -/* 80C9827C 90 1C 00 00 */ stw r0, 0(r28) -/* 80C98280 38 80 00 00 */ li r4, 0 -/* 80C98284 4B 69 01 79 */ bl init__12J3DFrameCtrlFs -/* 80C98288 38 00 00 00 */ li r0, 0 -/* 80C9828C 90 1C 00 18 */ stw r0, 0x18(r28) -lbl_80C98290: -/* 80C98290 93 9F 05 6C */ stw r28, 0x56c(r31) -/* 80C98294 3B 80 00 01 */ li r28, 1 -/* 80C98298 7F 9B E3 78 */ mr r27, r28 -/* 80C9829C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C982A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C982A4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C982A8 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80C982AC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C982B0 7C 05 07 74 */ extsb r5, r0 -/* 80C982B4 4B 39 D0 AD */ bl isSwitch__10dSv_info_cCFii -/* 80C982B8 2C 03 00 00 */ cmpwi r3, 0 -/* 80C982BC 40 82 00 2C */ bne lbl_80C982E8 -/* 80C982C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C982C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C982C8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C982CC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C982D0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C982D4 A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 80C982D8 4B 39 C6 E5 */ bl isEventBit__11dSv_event_cCFUs -/* 80C982DC 2C 03 00 00 */ cmpwi r3, 0 -/* 80C982E0 40 82 00 08 */ bne lbl_80C982E8 -/* 80C982E4 3B 60 00 00 */ li r27, 0 -lbl_80C982E8: -/* 80C982E8 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80C982EC 40 82 00 2C */ bne lbl_80C98318 -/* 80C982F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C982F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C982F8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C982FC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C98300 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C98304 A0 84 02 C4 */ lhz r4, 0x2c4(r4) -/* 80C98308 4B 39 C6 B5 */ bl isEventBit__11dSv_event_cCFUs -/* 80C9830C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C98310 40 82 00 08 */ bne lbl_80C98318 -/* 80C98314 3B 80 00 00 */ li r28, 0 -lbl_80C98318: -/* 80C98318 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80C9831C 41 82 00 10 */ beq lbl_80C9832C -/* 80C98320 3C 60 80 CA */ lis r3, lit_3729@ha /* 0x80C989D8@ha */ -/* 80C98324 C0 23 89 D8 */ lfs f1, lit_3729@l(r3) /* 0x80C989D8@l */ -/* 80C98328 48 00 00 0C */ b lbl_80C98334 -lbl_80C9832C: -/* 80C9832C 3C 60 80 CA */ lis r3, lit_3730@ha /* 0x80C989DC@ha */ -/* 80C98330 C0 23 89 DC */ lfs f1, lit_3730@l(r3) /* 0x80C989DC@l */ -lbl_80C98334: -/* 80C98334 80 7F 05 6C */ lwz r3, 0x56c(r31) -/* 80C98338 28 03 00 00 */ cmplwi r3, 0 -/* 80C9833C 41 82 00 28 */ beq lbl_80C98364 -/* 80C98340 7F A4 EB 78 */ mr r4, r29 -/* 80C98344 38 A0 00 00 */ li r5, 0 -/* 80C98348 38 C0 00 00 */ li r6, 0 -/* 80C9834C 38 E0 00 00 */ li r7, 0 -/* 80C98350 39 00 FF FF */ li r8, -1 -/* 80C98354 39 20 00 00 */ li r9, 0 -/* 80C98358 4B 37 54 85 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80C9835C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C98360 40 82 00 0C */ bne lbl_80C9836C -lbl_80C98364: -/* 80C98364 38 60 00 00 */ li r3, 0 -/* 80C98368 48 00 01 40 */ b lbl_80C984A8 -lbl_80C9836C: -/* 80C9836C 3B 80 00 01 */ li r28, 1 -/* 80C98370 7F 9B E3 78 */ mr r27, r28 -/* 80C98374 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C98378 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9837C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C98380 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80C98384 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C98388 7C 05 07 74 */ extsb r5, r0 -/* 80C9838C 4B 39 CF D5 */ bl isSwitch__10dSv_info_cCFii -/* 80C98390 2C 03 00 00 */ cmpwi r3, 0 -/* 80C98394 40 82 00 2C */ bne lbl_80C983C0 -/* 80C98398 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C9839C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C983A0 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C983A4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C983A8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C983AC A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 80C983B0 4B 39 C6 0D */ bl isEventBit__11dSv_event_cCFUs -/* 80C983B4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C983B8 40 82 00 08 */ bne lbl_80C983C0 -/* 80C983BC 3B 60 00 00 */ li r27, 0 -lbl_80C983C0: -/* 80C983C0 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80C983C4 40 82 00 2C */ bne lbl_80C983F0 -/* 80C983C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C983CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C983D0 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C983D4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C983D8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C983DC A0 84 02 C4 */ lhz r4, 0x2c4(r4) -/* 80C983E0 4B 39 C5 DD */ bl isEventBit__11dSv_event_cCFUs -/* 80C983E4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C983E8 40 82 00 08 */ bne lbl_80C983F0 -/* 80C983EC 3B 80 00 00 */ li r28, 0 -lbl_80C983F0: -/* 80C983F0 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80C983F4 41 82 00 30 */ beq lbl_80C98424 -/* 80C983F8 A8 1D 00 06 */ lha r0, 6(r29) -/* 80C983FC 3C 60 80 CA */ lis r3, lit_3732@ha /* 0x80C989E0@ha */ -/* 80C98400 C8 23 89 E0 */ lfd f1, lit_3732@l(r3) /* 0x80C989E0@l */ -/* 80C98404 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C98408 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C9840C 3C 00 43 30 */ lis r0, 0x4330 -/* 80C98410 90 01 00 08 */ stw r0, 8(r1) -/* 80C98414 C8 01 00 08 */ lfd f0, 8(r1) -/* 80C98418 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C9841C 80 7F 05 6C */ lwz r3, 0x56c(r31) -/* 80C98420 D0 03 00 10 */ stfs f0, 0x10(r3) -lbl_80C98424: -/* 80C98424 3C 60 80 CA */ lis r3, l_arcName@ha /* 0x80C989F0@ha */ -/* 80C98428 38 63 89 F0 */ addi r3, r3, l_arcName@l /* 0x80C989F0@l */ -/* 80C9842C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C98430 38 80 00 0B */ li r4, 0xb -/* 80C98434 7F C5 F3 78 */ mr r5, r30 -/* 80C98438 38 C0 00 80 */ li r6, 0x80 -/* 80C9843C 4B 3A 3E B1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C98440 7C 64 1B 78 */ mr r4, r3 -/* 80C98444 38 7F 05 7C */ addi r3, r31, 0x57c -/* 80C98448 38 A0 00 01 */ li r5, 1 -/* 80C9844C 38 DF 06 FC */ addi r6, r31, 0x6fc -/* 80C98450 4B 3E 1A E9 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80C98454 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C98458 41 82 00 0C */ beq lbl_80C98464 -/* 80C9845C 38 60 00 00 */ li r3, 0 -/* 80C98460 48 00 00 48 */ b lbl_80C984A8 -lbl_80C98464: -/* 80C98464 3C 60 80 CA */ lis r3, l_arcName@ha /* 0x80C989F0@ha */ -/* 80C98468 38 63 89 F0 */ addi r3, r3, l_arcName@l /* 0x80C989F0@l */ -/* 80C9846C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C98470 38 80 00 0C */ li r4, 0xc -/* 80C98474 7F C5 F3 78 */ mr r5, r30 -/* 80C98478 38 C0 00 80 */ li r6, 0x80 -/* 80C9847C 4B 3A 3E 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C98480 7C 64 1B 78 */ mr r4, r3 -/* 80C98484 38 7F 06 3C */ addi r3, r31, 0x63c -/* 80C98488 38 A0 00 01 */ li r5, 1 -/* 80C9848C 38 DF 06 FC */ addi r6, r31, 0x6fc -/* 80C98490 4B 3E 1A A9 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80C98494 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C98498 41 82 00 0C */ beq lbl_80C984A4 -/* 80C9849C 38 60 00 00 */ li r3, 0 -/* 80C984A0 48 00 00 08 */ b lbl_80C984A8 -lbl_80C984A4: -/* 80C984A4 38 60 00 01 */ li r3, 1 -lbl_80C984A8: -/* 80C984A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C984AC 4B 6C 9D 75 */ bl _restgpr_27 -/* 80C984B0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C984B4 7C 08 03 A6 */ mtlr r0 -/* 80C984B8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C984BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 511f71ac7e..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,119 +0,0 @@ -lbl_80C98818: -/* 80C98818 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C9881C 7C 08 02 A6 */ mflr r0 -/* 80C98820 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C98824 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C98828 4B 6C 99 B1 */ bl _savegpr_28 -/* 80C9882C 7C 7D 1B 78 */ mr r29, r3 -/* 80C98830 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C98834 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C98838 40 82 00 40 */ bne lbl_80C98878 -/* 80C9883C 7F A0 EB 79 */ or. r0, r29, r29 -/* 80C98840 41 82 00 2C */ beq lbl_80C9886C -/* 80C98844 7C 1C 03 78 */ mr r28, r0 -/* 80C98848 4B 38 03 1D */ bl __ct__10fopAc_ac_cFv -/* 80C9884C 38 7C 05 7C */ addi r3, r28, 0x57c -/* 80C98850 3C 80 80 08 */ lis r4, __ct__4dBgWFv@ha /* 0x8007B970@ha */ -/* 80C98854 38 84 B9 70 */ addi r4, r4, __ct__4dBgWFv@l /* 0x8007B970@l */ -/* 80C98858 3C A0 80 CA */ lis r5, __dt__4dBgWFv@ha /* 0x80C987B8@ha */ -/* 80C9885C 38 A5 87 B8 */ addi r5, r5, __dt__4dBgWFv@l /* 0x80C987B8@l */ -/* 80C98860 38 C0 00 C0 */ li r6, 0xc0 -/* 80C98864 38 E0 00 02 */ li r7, 2 -/* 80C98868 4B 6C 94 F9 */ bl __construct_array -lbl_80C9886C: -/* 80C9886C 80 1D 04 A0 */ lwz r0, 0x4a0(r29) -/* 80C98870 60 00 00 08 */ ori r0, r0, 8 -/* 80C98874 90 1D 04 A0 */ stw r0, 0x4a0(r29) -lbl_80C98878: -/* 80C98878 38 7D 05 70 */ addi r3, r29, 0x570 -/* 80C9887C 3C 80 80 CA */ lis r4, l_arcName@ha /* 0x80C989F0@ha */ -/* 80C98880 38 84 89 F0 */ addi r4, r4, l_arcName@l /* 0x80C989F0@l */ -/* 80C98884 80 84 00 00 */ lwz r4, 0(r4) -/* 80C98888 4B 39 46 35 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C9888C 7C 7F 1B 78 */ mr r31, r3 -/* 80C98890 2C 1F 00 04 */ cmpwi r31, 4 -/* 80C98894 40 82 01 20 */ bne lbl_80C989B4 -/* 80C98898 7F A3 EB 78 */ mr r3, r29 -/* 80C9889C 3C 80 80 CA */ lis r4, createSolidHeap__FP10fopAc_ac_c@ha /* 0x80C981D8@ha */ -/* 80C988A0 38 84 81 D8 */ addi r4, r4, createSolidHeap__FP10fopAc_ac_c@l /* 0x80C981D8@l */ -/* 80C988A4 38 A0 1A D0 */ li r5, 0x1ad0 -/* 80C988A8 4B 38 1C 09 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80C988AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C988B0 40 82 00 0C */ bne lbl_80C988BC -/* 80C988B4 3B E0 00 05 */ li r31, 5 -/* 80C988B8 48 00 00 FC */ b lbl_80C989B4 -lbl_80C988BC: -/* 80C988BC 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 80C988C0 80 83 00 04 */ lwz r4, 4(r3) -/* 80C988C4 7F A3 EB 78 */ mr r3, r29 -/* 80C988C8 4B 38 1C B1 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C988CC 3C 60 80 CA */ lis r3, lit_3730@ha /* 0x80C989DC@ha */ -/* 80C988D0 C0 03 89 DC */ lfs f0, lit_3730@l(r3) /* 0x80C989DC@l */ -/* 80C988D4 80 7D 05 6C */ lwz r3, 0x56c(r29) -/* 80C988D8 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80C988DC 38 60 00 00 */ li r3, 0 -/* 80C988E0 90 7D 06 2C */ stw r3, 0x62c(r29) -/* 80C988E4 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80C988E8 98 1D 05 85 */ stb r0, 0x585(r29) -/* 80C988EC 90 7D 06 EC */ stw r3, 0x6ec(r29) -/* 80C988F0 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80C988F4 98 1D 06 45 */ stb r0, 0x645(r29) -/* 80C988F8 3B C0 00 01 */ li r30, 1 -/* 80C988FC 7F DC F3 78 */ mr r28, r30 -/* 80C98900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C98904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C98908 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80C9890C 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80C98910 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80C98914 7C 05 07 74 */ extsb r5, r0 -/* 80C98918 4B 39 CA 49 */ bl isSwitch__10dSv_info_cCFii -/* 80C9891C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C98920 40 82 00 2C */ bne lbl_80C9894C -/* 80C98924 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C98928 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9892C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C98930 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C98934 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C98938 A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 80C9893C 4B 39 C0 81 */ bl isEventBit__11dSv_event_cCFUs -/* 80C98940 2C 03 00 00 */ cmpwi r3, 0 -/* 80C98944 40 82 00 08 */ bne lbl_80C9894C -/* 80C98948 3B 80 00 00 */ li r28, 0 -lbl_80C9894C: -/* 80C9894C 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 80C98950 40 82 00 2C */ bne lbl_80C9897C -/* 80C98954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C98958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9895C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C98960 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C98964 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C98968 A0 84 02 C4 */ lhz r4, 0x2c4(r4) -/* 80C9896C 4B 39 C0 51 */ bl isEventBit__11dSv_event_cCFUs -/* 80C98970 2C 03 00 00 */ cmpwi r3, 0 -/* 80C98974 40 82 00 08 */ bne lbl_80C9897C -/* 80C98978 3B C0 00 00 */ li r30, 0 -lbl_80C9897C: -/* 80C9897C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80C98980 41 82 00 0C */ beq lbl_80C9898C -/* 80C98984 38 1D 06 3C */ addi r0, r29, 0x63c -/* 80C98988 48 00 00 08 */ b lbl_80C98990 -lbl_80C9898C: -/* 80C9898C 38 1D 05 7C */ addi r0, r29, 0x57c -lbl_80C98990: -/* 80C98990 90 1D 05 78 */ stw r0, 0x578(r29) -/* 80C98994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C98998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9899C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C989A0 80 9D 05 78 */ lwz r4, 0x578(r29) -/* 80C989A4 7F A5 EB 78 */ mr r5, r29 -/* 80C989A8 4B 3D C0 61 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80C989AC 7F A3 EB 78 */ mr r3, r29 -/* 80C989B0 4B FF FB 59 */ bl initBaseMtx__17daObjMirrorSand_cFv -lbl_80C989B4: -/* 80C989B4 7F E3 FB 78 */ mr r3, r31 -/* 80C989B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C989BC 4B 6C 98 69 */ bl _restgpr_28 -/* 80C989C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C989C4 7C 08 03 A6 */ mtlr r0 -/* 80C989C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C989CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Delete__FP17daObjMirrorSand_c.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Delete__FP17daObjMirrorSand_c.s deleted file mode 100644 index 265a28ee4a..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Delete__FP17daObjMirrorSand_c.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80C98708: -/* 80C98708 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9870C 7C 08 02 A6 */ mflr r0 -/* 80C98710 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C98714 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C98718 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C9871C 41 82 00 84 */ beq lbl_80C987A0 -/* 80C98720 38 7F 05 7C */ addi r3, r31, 0x57c -/* 80C98724 4B 5C FA B1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C98728 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C9872C 41 82 00 18 */ beq lbl_80C98744 -/* 80C98730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C98734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C98738 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C9873C 38 9F 05 7C */ addi r4, r31, 0x57c -/* 80C98740 4B 3D BB 11 */ bl Release__4cBgSFP9dBgW_Base -lbl_80C98744: -/* 80C98744 38 7F 06 3C */ addi r3, r31, 0x63c -/* 80C98748 4B 5C FA 8D */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C9874C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C98750 41 82 00 18 */ beq lbl_80C98768 -/* 80C98754 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C98758 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C9875C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C98760 38 9F 06 3C */ addi r4, r31, 0x63c -/* 80C98764 4B 3D BA ED */ bl Release__4cBgSFP9dBgW_Base -lbl_80C98768: -/* 80C98768 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80C9876C 3C 80 80 CA */ lis r4, l_arcName@ha /* 0x80C989F0@ha */ -/* 80C98770 38 84 89 F0 */ addi r4, r4, l_arcName@l /* 0x80C989F0@l */ -/* 80C98774 80 84 00 00 */ lwz r4, 0(r4) -/* 80C98778 4B 39 48 91 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C9877C 38 7F 05 7C */ addi r3, r31, 0x57c -/* 80C98780 3C 80 80 CA */ lis r4, __dt__4dBgWFv@ha /* 0x80C987B8@ha */ -/* 80C98784 38 84 87 B8 */ addi r4, r4, __dt__4dBgWFv@l /* 0x80C987B8@l */ -/* 80C98788 38 A0 00 C0 */ li r5, 0xc0 -/* 80C9878C 38 C0 00 02 */ li r6, 2 -/* 80C98790 4B 6C 95 59 */ bl __destroy_arr -/* 80C98794 7F E3 FB 78 */ mr r3, r31 -/* 80C98798 38 80 00 00 */ li r4, 0 -/* 80C9879C 4B 38 04 F1 */ bl __dt__10fopAc_ac_cFv -lbl_80C987A0: -/* 80C987A0 38 60 00 01 */ li r3, 1 -/* 80C987A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C987A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C987AC 7C 08 03 A6 */ mtlr r0 -/* 80C987B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C987B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Draw__FP17daObjMirrorSand_c.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Draw__FP17daObjMirrorSand_c.s deleted file mode 100644 index e29543105e..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Draw__FP17daObjMirrorSand_c.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80C98598: -/* 80C98598 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9859C 7C 08 02 A6 */ mflr r0 -/* 80C985A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C985A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C985A8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C985AC 7C 7F 1B 78 */ mr r31, r3 -/* 80C985B0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C985B4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C985B8 38 80 00 10 */ li r4, 0x10 -/* 80C985BC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C985C0 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C985C4 4B 50 B2 01 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C985C8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C985CC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C985D0 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C985D4 80 84 00 04 */ lwz r4, 4(r4) -/* 80C985D8 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C985DC 4B 50 C7 C5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C985E0 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C985E4 80 83 00 04 */ lwz r4, 4(r3) -/* 80C985E8 80 7F 05 6C */ lwz r3, 0x56c(r31) -/* 80C985EC C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80C985F0 4B 37 53 DD */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80C985F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C985F8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C985FC 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C98600 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C98604 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C98608 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C9860C 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C98610 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C98614 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C98618 4B 37 56 AD */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C9861C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C98620 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C98624 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C98628 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C9862C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C98630 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C98634 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C98638 80 63 00 04 */ lwz r3, 4(r3) -/* 80C9863C 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80C98640 80 63 00 00 */ lwz r3, 0(r3) -/* 80C98644 38 00 00 00 */ li r0, 0 -/* 80C98648 90 03 00 54 */ stw r0, 0x54(r3) -/* 80C9864C 38 60 00 01 */ li r3, 1 -/* 80C98650 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C98654 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C98658 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9865C 7C 08 03 A6 */ mtlr r0 -/* 80C98660 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C98664 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Execute__FP17daObjMirrorSand_c.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Execute__FP17daObjMirrorSand_c.s deleted file mode 100644 index 316b611d10..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/daObjMirrorSand_Execute__FP17daObjMirrorSand_c.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80C98668: -/* 80C98668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9866C 7C 08 02 A6 */ mflr r0 -/* 80C98670 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C98674 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C98678 93 C1 00 08 */ stw r30, 8(r1) -/* 80C9867C 7C 7E 1B 78 */ mr r30, r3 -/* 80C98680 80 63 05 6C */ lwz r3, 0x56c(r3) -/* 80C98684 4B 37 4D A5 */ bl play__14mDoExt_baseAnmFv -/* 80C98688 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 80C9868C 38 9E 05 7C */ addi r4, r30, 0x57c -/* 80C98690 7C 00 20 40 */ cmplw r0, r4 -/* 80C98694 40 82 00 50 */ bne lbl_80C986E4 -/* 80C98698 80 7E 05 6C */ lwz r3, 0x56c(r30) -/* 80C9869C C0 23 00 0C */ lfs f1, 0xc(r3) -/* 80C986A0 3C 60 80 CA */ lis r3, lit_3730@ha /* 0x80C989DC@ha */ -/* 80C986A4 C0 03 89 DC */ lfs f0, lit_3730@l(r3) /* 0x80C989DC@l */ -/* 80C986A8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C986AC 40 81 00 38 */ ble lbl_80C986E4 -/* 80C986B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C986B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C986B8 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80C986BC 7F E3 FB 78 */ mr r3, r31 -/* 80C986C0 4B 3D BB 91 */ bl Release__4cBgSFP9dBgW_Base -/* 80C986C4 7F E3 FB 78 */ mr r3, r31 -/* 80C986C8 38 9E 06 3C */ addi r4, r30, 0x63c -/* 80C986CC 7F C5 F3 78 */ mr r5, r30 -/* 80C986D0 4B 3D C3 39 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80C986D4 38 1E 06 3C */ addi r0, r30, 0x63c -/* 80C986D8 90 1E 05 78 */ stw r0, 0x578(r30) -/* 80C986DC 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80C986E0 4B 3E 32 E1 */ bl Move__4dBgWFv -lbl_80C986E4: -/* 80C986E4 38 60 00 01 */ li r3, 1 -/* 80C986E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C986EC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C986F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C986F4 7C 08 03 A6 */ mtlr r0 -/* 80C986F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C986FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/initBaseMtx__17daObjMirrorSand_cFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/initBaseMtx__17daObjMirrorSand_cFv.s deleted file mode 100644 index 64029b0b69..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/initBaseMtx__17daObjMirrorSand_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C98508: -/* 80C98508 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C9850C 7C 08 02 A6 */ mflr r0 -/* 80C98510 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C98514 80 83 05 68 */ lwz r4, 0x568(r3) -/* 80C98518 38 04 00 24 */ addi r0, r4, 0x24 -/* 80C9851C 90 03 05 04 */ stw r0, 0x504(r3) -/* 80C98520 48 00 00 15 */ bl setBaseMtx__17daObjMirrorSand_cFv -/* 80C98524 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C98528 7C 08 03 A6 */ mtlr r0 -/* 80C9852C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C98530 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/setBaseMtx__17daObjMirrorSand_cFv.s b/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/setBaseMtx__17daObjMirrorSand_cFv.s deleted file mode 100644 index 54118595ff..0000000000 --- a/asm/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand/setBaseMtx__17daObjMirrorSand_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C98534: -/* 80C98534 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C98538 7C 08 02 A6 */ mflr r0 -/* 80C9853C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C98540 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C98544 7C 7F 1B 78 */ mr r31, r3 -/* 80C98548 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80C9854C 4B 37 48 19 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80C98550 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80C98554 4B 37 49 F1 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80C98558 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C9855C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C98560 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C98564 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C98568 4B 6A DF 49 */ bl PSMTXCopy -/* 80C9856C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C98570 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C98574 38 9F 06 FC */ addi r4, r31, 0x6fc -/* 80C98578 4B 6A DF 39 */ bl PSMTXCopy -/* 80C9857C 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80C98580 4B 3E 34 41 */ bl Move__4dBgWFv -/* 80C98584 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C98588 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C9858C 7C 08 03 A6 */ mtlr r0 -/* 80C98590 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C98594 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/ECut_talk__14daTag_EvtMsg_cFi.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/ECut_talk__14daTag_EvtMsg_cFi.s deleted file mode 100644 index 718b2d25b6..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/ECut_talk__14daTag_EvtMsg_cFi.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8048D54C: -/* 8048D54C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048D550 7C 08 02 A6 */ mflr r0 -/* 8048D554 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048D558 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048D55C 7C 7F 1B 78 */ mr r31, r3 -/* 8048D560 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048D564 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048D568 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8048D56C 4B BB A7 E1 */ bl getIsAddvance__16dEvent_manager_cFi -/* 8048D570 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D574 41 82 00 1C */ beq lbl_8048D590 -/* 8048D578 38 7F 05 74 */ addi r3, r31, 0x574 -/* 8048D57C 7F E4 FB 78 */ mr r4, r31 -/* 8048D580 80 BF 05 6C */ lwz r5, 0x56c(r31) -/* 8048D584 38 C0 00 00 */ li r6, 0 -/* 8048D588 38 E0 00 00 */ li r7, 0 -/* 8048D58C 4B DB CA 05 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -lbl_8048D590: -/* 8048D590 38 7F 05 74 */ addi r3, r31, 0x574 -/* 8048D594 7F E4 FB 78 */ mr r4, r31 -/* 8048D598 38 A0 00 00 */ li r5, 0 -/* 8048D59C 38 C0 00 00 */ li r6, 0 -/* 8048D5A0 4B DB CD 39 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 8048D5A4 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D5A8 41 82 00 0C */ beq lbl_8048D5B4 -/* 8048D5AC 38 60 00 01 */ li r3, 1 -/* 8048D5B0 48 00 00 08 */ b lbl_8048D5B8 -lbl_8048D5B4: -/* 8048D5B4 38 60 00 00 */ li r3, 0 -lbl_8048D5B8: -/* 8048D5B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048D5BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048D5C0 7C 08 03 A6 */ mtlr r0 -/* 8048D5C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048D5C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/ECut_wait__14daTag_EvtMsg_cFi.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/ECut_wait__14daTag_EvtMsg_cFi.s deleted file mode 100644 index 33762b598a..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/ECut_wait__14daTag_EvtMsg_cFi.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8048D5CC: -/* 8048D5CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048D5D0 7C 08 02 A6 */ mflr r0 -/* 8048D5D4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048D5D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048D5DC 4B ED 4B FD */ bl _savegpr_28 -/* 8048D5E0 7C 7C 1B 78 */ mr r28, r3 -/* 8048D5E4 7C 9D 23 78 */ mr r29, r4 -/* 8048D5E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048D5EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048D5F0 3B E3 4F F8 */ addi r31, r3, 0x4ff8 -/* 8048D5F4 3B C0 00 00 */ li r30, 0 -/* 8048D5F8 7F E3 FB 78 */ mr r3, r31 -/* 8048D5FC 3C A0 80 49 */ lis r5, d_a_tag_evtmsg__stringBase0@ha /* 0x8048D7EC@ha */ -/* 8048D600 38 A5 D7 EC */ addi r5, r5, d_a_tag_evtmsg__stringBase0@l /* 0x8048D7EC@l */ -/* 8048D604 38 A5 00 23 */ addi r5, r5, 0x23 -/* 8048D608 38 C0 00 03 */ li r6, 3 -/* 8048D60C 4B BB AA E1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 8048D610 28 03 00 00 */ cmplwi r3, 0 -/* 8048D614 41 82 00 08 */ beq lbl_8048D61C -/* 8048D618 83 C3 00 00 */ lwz r30, 0(r3) -lbl_8048D61C: -/* 8048D61C 7F E3 FB 78 */ mr r3, r31 -/* 8048D620 7F A4 EB 78 */ mr r4, r29 -/* 8048D624 4B BB A7 29 */ bl getIsAddvance__16dEvent_manager_cFi -/* 8048D628 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D62C 41 82 00 08 */ beq lbl_8048D634 -/* 8048D630 93 DC 05 68 */ stw r30, 0x568(r28) -lbl_8048D634: -/* 8048D634 38 7C 05 68 */ addi r3, r28, 0x568 -/* 8048D638 48 00 01 29 */ bl func_8048D760 -/* 8048D63C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D640 40 82 00 0C */ bne lbl_8048D64C -/* 8048D644 38 60 00 01 */ li r3, 1 -/* 8048D648 48 00 00 08 */ b lbl_8048D650 -lbl_8048D64C: -/* 8048D64C 38 60 00 00 */ li r3, 0 -lbl_8048D650: -/* 8048D650 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048D654 4B ED 4B D1 */ bl _restgpr_28 -/* 8048D658 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048D65C 7C 08 03 A6 */ mtlr r0 -/* 8048D660 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048D664 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/Execute__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/Execute__14daTag_EvtMsg_cFv.s deleted file mode 100644 index 6365b1532c..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/Execute__14daTag_EvtMsg_cFv.s +++ /dev/null @@ -1,205 +0,0 @@ -lbl_8048D01C: -/* 8048D01C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8048D020 7C 08 02 A6 */ mflr r0 -/* 8048D024 90 01 00 34 */ stw r0, 0x34(r1) -/* 8048D028 39 61 00 30 */ addi r11, r1, 0x30 -/* 8048D02C 4B ED 51 A5 */ bl _savegpr_26 -/* 8048D030 7C 7D 1B 78 */ mr r29, r3 -/* 8048D034 3C 80 80 49 */ lis r4, cNullVec__6Z2Calc@ha /* 0x8048D818@ha */ -/* 8048D038 3B 84 D8 18 */ addi r28, r4, cNullVec__6Z2Calc@l /* 0x8048D818@l */ -/* 8048D03C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048D040 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048D044 3B DF 4F F8 */ addi r30, r31, 0x4ff8 -/* 8048D048 88 03 04 BA */ lbz r0, 0x4ba(r3) -/* 8048D04C 7C 05 07 74 */ extsb r5, r0 -/* 8048D050 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8048D054 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ -/* 8048D058 7C 00 07 74 */ extsb r0, r0 -/* 8048D05C 7C 05 00 00 */ cmpw r5, r0 -/* 8048D060 40 82 02 A0 */ bne lbl_8048D300 -/* 8048D064 88 1F 4F AD */ lbz r0, 0x4fad(r31) -/* 8048D068 28 00 00 00 */ cmplwi r0, 0 -/* 8048D06C 41 82 01 4C */ beq lbl_8048D1B8 -/* 8048D070 3B 40 00 00 */ li r26, 0 -/* 8048D074 A0 1D 00 F8 */ lhz r0, 0xf8(r29) -/* 8048D078 28 00 00 01 */ cmplwi r0, 1 -/* 8048D07C 40 82 00 4C */ bne lbl_8048D0C8 -/* 8048D080 88 1D 05 72 */ lbz r0, 0x572(r29) -/* 8048D084 28 00 00 00 */ cmplwi r0, 0 -/* 8048D088 41 82 00 1C */ beq lbl_8048D0A4 -/* 8048D08C 38 7D 05 74 */ addi r3, r29, 0x574 -/* 8048D090 7F A4 EB 78 */ mr r4, r29 -/* 8048D094 80 BD 05 6C */ lwz r5, 0x56c(r29) -/* 8048D098 38 C0 00 00 */ li r6, 0 -/* 8048D09C 38 E0 00 00 */ li r7, 0 -/* 8048D0A0 4B DB CE F1 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -lbl_8048D0A4: -/* 8048D0A4 38 7D 05 74 */ addi r3, r29, 0x574 -/* 8048D0A8 7F A4 EB 78 */ mr r4, r29 -/* 8048D0AC 38 A0 00 00 */ li r5, 0 -/* 8048D0B0 38 C0 00 00 */ li r6, 0 -/* 8048D0B4 4B DB D2 25 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 8048D0B8 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D0BC 41 82 00 B0 */ beq lbl_8048D16C -/* 8048D0C0 3B 40 00 01 */ li r26, 1 -/* 8048D0C4 48 00 00 A8 */ b lbl_8048D16C -lbl_8048D0C8: -/* 8048D0C8 28 00 00 02 */ cmplwi r0, 2 -/* 8048D0CC 40 82 00 30 */ bne lbl_8048D0FC -/* 8048D0D0 A8 9D 05 70 */ lha r4, 0x570(r29) -/* 8048D0D4 2C 04 FF FF */ cmpwi r4, -1 -/* 8048D0D8 41 82 00 24 */ beq lbl_8048D0FC -/* 8048D0DC 7F C3 F3 78 */ mr r3, r30 -/* 8048D0E0 4B BB A9 99 */ bl endCheck__16dEvent_manager_cFs -/* 8048D0E4 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D0E8 41 82 00 14 */ beq lbl_8048D0FC -/* 8048D0EC 38 00 FF FF */ li r0, -1 -/* 8048D0F0 B0 1D 05 70 */ sth r0, 0x570(r29) -/* 8048D0F4 3B 40 00 01 */ li r26, 1 -/* 8048D0F8 48 00 00 74 */ b lbl_8048D16C -lbl_8048D0FC: -/* 8048D0FC 7F C3 F3 78 */ mr r3, r30 -/* 8048D100 80 9C 00 68 */ lwz r4, 0x68(r28) -/* 8048D104 7F A5 EB 78 */ mr r5, r29 -/* 8048D108 38 C0 FF FF */ li r6, -1 -/* 8048D10C 4B BB AA 11 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 8048D110 7C 7B 1B 78 */ mr r27, r3 -/* 8048D114 2C 1B FF FF */ cmpwi r27, -1 -/* 8048D118 41 82 00 54 */ beq lbl_8048D16C -/* 8048D11C 7F C3 F3 78 */ mr r3, r30 -/* 8048D120 7F 64 DB 78 */ mr r4, r27 -/* 8048D124 38 BC 00 20 */ addi r5, r28, 0x20 -/* 8048D128 38 C0 00 03 */ li r6, 3 -/* 8048D12C 38 E0 00 00 */ li r7, 0 -/* 8048D130 39 00 00 00 */ li r8, 0 -/* 8048D134 4B BB AC DD */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 8048D138 7C 60 1B 78 */ mr r0, r3 -/* 8048D13C 7F A3 EB 78 */ mr r3, r29 -/* 8048D140 7F 64 DB 78 */ mr r4, r27 -/* 8048D144 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8048D148 39 9C 00 44 */ addi r12, r28, 0x44 -/* 8048D14C 7D 8C 02 14 */ add r12, r12, r0 -/* 8048D150 4B ED 4F 35 */ bl __ptmf_scall -/* 8048D154 60 00 00 00 */ nop -/* 8048D158 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D15C 41 82 00 10 */ beq lbl_8048D16C -/* 8048D160 7F C3 F3 78 */ mr r3, r30 -/* 8048D164 7F 64 DB 78 */ mr r4, r27 -/* 8048D168 4B BB B0 15 */ bl cutEnd__16dEvent_manager_cFi -lbl_8048D16C: -/* 8048D16C 2C 1A 00 00 */ cmpwi r26, 0 -/* 8048D170 41 82 01 50 */ beq lbl_8048D2C0 -/* 8048D174 7F A3 EB 78 */ mr r3, r29 -/* 8048D178 48 00 01 F1 */ bl getOffSwBit__14daTag_EvtMsg_cFv -/* 8048D17C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8048D180 28 00 00 FF */ cmplwi r0, 0xff -/* 8048D184 41 82 00 28 */ beq lbl_8048D1AC -/* 8048D188 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 8048D18C 7C 1C 07 74 */ extsb r28, r0 -/* 8048D190 7F A3 EB 78 */ mr r3, r29 -/* 8048D194 48 00 01 D5 */ bl getOffSwBit__14daTag_EvtMsg_cFv -/* 8048D198 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8048D19C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048D1A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048D1A4 7F 85 E3 78 */ mr r5, r28 -/* 8048D1A8 4B BA 80 59 */ bl onSwitch__10dSv_info_cFii -lbl_8048D1AC: -/* 8048D1AC 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8048D1B0 4B BB 52 B9 */ bl reset__14dEvt_control_cFv -/* 8048D1B4 48 00 01 0C */ b lbl_8048D2C0 -lbl_8048D1B8: -/* 8048D1B8 48 00 01 CD */ bl isDelete__14daTag_EvtMsg_cFv -/* 8048D1BC 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D1C0 41 82 00 10 */ beq lbl_8048D1D0 -/* 8048D1C4 7F A3 EB 78 */ mr r3, r29 -/* 8048D1C8 4B B8 CA B5 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 8048D1CC 48 00 00 F4 */ b lbl_8048D2C0 -lbl_8048D1D0: -/* 8048D1D0 80 1D 05 6C */ lwz r0, 0x56c(r29) -/* 8048D1D4 2C 00 FF FF */ cmpwi r0, -1 -/* 8048D1D8 41 82 00 E8 */ beq lbl_8048D2C0 -/* 8048D1DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048D1E0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048D1E4 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 8048D1E8 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 8048D1EC D0 01 00 08 */ stfs f0, 8(r1) -/* 8048D1F0 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 8048D1F4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8048D1F8 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 8048D1FC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8048D200 7F A3 EB 78 */ mr r3, r29 -/* 8048D204 38 81 00 08 */ addi r4, r1, 8 -/* 8048D208 48 00 02 21 */ bl chkPointInArea__14daTag_EvtMsg_cF4cXyz -/* 8048D20C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D210 41 82 00 B0 */ beq lbl_8048D2C0 -/* 8048D214 7F A3 EB 78 */ mr r3, r29 -/* 8048D218 48 00 01 5D */ bl getProcType__14daTag_EvtMsg_cFv -/* 8048D21C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8048D220 40 82 00 84 */ bne lbl_8048D2A4 -/* 8048D224 7F A3 EB 78 */ mr r3, r29 -/* 8048D228 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 8048D22C 4B B8 D4 E5 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8048D230 38 03 7F FF */ addi r0, r3, 0x7fff -/* 8048D234 7C 04 07 34 */ extsh r4, r0 -/* 8048D238 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 8048D23C A8 03 04 DE */ lha r0, 0x4de(r3) -/* 8048D240 7C 00 20 50 */ subf r0, r0, r4 -/* 8048D244 7C 00 07 35 */ extsh. r0, r0 -/* 8048D248 40 80 00 0C */ bge lbl_8048D254 -/* 8048D24C 7C 00 00 D0 */ neg r0, r0 -/* 8048D250 7C 00 07 34 */ extsh r0, r0 -lbl_8048D254: -/* 8048D254 7C 00 07 34 */ extsh r0, r0 -/* 8048D258 2C 00 10 00 */ cmpwi r0, 0x1000 -/* 8048D25C 41 81 00 64 */ bgt lbl_8048D2C0 -/* 8048D260 7F C3 F3 78 */ mr r3, r30 -/* 8048D264 7F A4 EB 78 */ mr r4, r29 -/* 8048D268 3C A0 80 49 */ lis r5, d_a_tag_evtmsg__stringBase0@ha /* 0x8048D7EC@ha */ -/* 8048D26C 38 A5 D7 EC */ addi r5, r5, d_a_tag_evtmsg__stringBase0@l /* 0x8048D7EC@l */ -/* 8048D270 38 A5 00 12 */ addi r5, r5, 0x12 -/* 8048D274 38 C0 00 FF */ li r6, 0xff -/* 8048D278 4B BB A4 E1 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 8048D27C B0 7D 05 70 */ sth r3, 0x570(r29) -/* 8048D280 7F A3 EB 78 */ mr r3, r29 -/* 8048D284 A8 9D 05 70 */ lha r4, 0x570(r29) -/* 8048D288 38 A0 00 FF */ li r5, 0xff -/* 8048D28C 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8048D290 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8048D294 38 E0 00 00 */ li r7, 0 -/* 8048D298 39 00 00 01 */ li r8, 1 -/* 8048D29C 4B B8 E3 E1 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8048D2A0 48 00 00 20 */ b lbl_8048D2C0 -lbl_8048D2A4: -/* 8048D2A4 A0 1D 00 FA */ lhz r0, 0xfa(r29) -/* 8048D2A8 60 00 00 01 */ ori r0, r0, 1 -/* 8048D2AC B0 1D 00 FA */ sth r0, 0xfa(r29) -/* 8048D2B0 7F A3 EB 78 */ mr r3, r29 -/* 8048D2B4 38 80 00 00 */ li r4, 0 -/* 8048D2B8 38 A0 00 00 */ li r5, 0 -/* 8048D2BC 4B B8 DE E1 */ bl fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs -lbl_8048D2C0: -/* 8048D2C0 38 00 00 00 */ li r0, 0 -/* 8048D2C4 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 8048D2C8 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8048D2CC D0 1D 05 50 */ stfs f0, 0x550(r29) -/* 8048D2D0 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8048D2D4 D0 1D 05 54 */ stfs f0, 0x554(r29) -/* 8048D2D8 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8048D2DC D0 1D 05 58 */ stfs f0, 0x558(r29) -/* 8048D2E0 C0 1D 05 50 */ lfs f0, 0x550(r29) -/* 8048D2E4 D0 1D 05 38 */ stfs f0, 0x538(r29) -/* 8048D2E8 C0 1D 05 54 */ lfs f0, 0x554(r29) -/* 8048D2EC D0 1D 05 3C */ stfs f0, 0x53c(r29) -/* 8048D2F0 C0 1D 05 58 */ lfs f0, 0x558(r29) -/* 8048D2F4 D0 1D 05 40 */ stfs f0, 0x540(r29) -/* 8048D2F8 38 60 00 01 */ li r3, 1 -/* 8048D2FC 48 00 00 08 */ b lbl_8048D304 -lbl_8048D300: -/* 8048D300 38 60 00 00 */ li r3, 0 -lbl_8048D304: -/* 8048D304 39 61 00 30 */ addi r11, r1, 0x30 -/* 8048D308 4B ED 4F 15 */ bl _restgpr_26 -/* 8048D30C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8048D310 7C 08 03 A6 */ mtlr r0 -/* 8048D314 38 21 00 30 */ addi r1, r1, 0x30 -/* 8048D318 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/__dt__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/__dt__14daTag_EvtMsg_cFv.s deleted file mode 100644 index 3cf45c67c0..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/__dt__14daTag_EvtMsg_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8048D6F0: -/* 8048D6F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048D6F4 7C 08 02 A6 */ mflr r0 -/* 8048D6F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048D6FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048D700 93 C1 00 08 */ stw r30, 8(r1) -/* 8048D704 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8048D708 7C 9F 23 78 */ mr r31, r4 -/* 8048D70C 41 82 00 38 */ beq lbl_8048D744 -/* 8048D710 3C 60 80 49 */ lis r3, __vt__14daTag_EvtMsg_c@ha /* 0x8048D8D4@ha */ -/* 8048D714 38 03 D8 D4 */ addi r0, r3, __vt__14daTag_EvtMsg_c@l /* 0x8048D8D4@l */ -/* 8048D718 90 1E 05 C0 */ stw r0, 0x5c0(r30) -/* 8048D71C 38 7E 05 74 */ addi r3, r30, 0x574 -/* 8048D720 38 80 FF FF */ li r4, -1 -/* 8048D724 4B DB C8 25 */ bl __dt__10dMsgFlow_cFv -/* 8048D728 7F C3 F3 78 */ mr r3, r30 -/* 8048D72C 38 80 00 00 */ li r4, 0 -/* 8048D730 4B B8 B5 5D */ bl __dt__10fopAc_ac_cFv -/* 8048D734 7F E0 07 35 */ extsh. r0, r31 -/* 8048D738 40 81 00 0C */ ble lbl_8048D744 -/* 8048D73C 7F C3 F3 78 */ mr r3, r30 -/* 8048D740 4B E4 15 FD */ bl __dl__FPv -lbl_8048D744: -/* 8048D744 7F C3 F3 78 */ mr r3, r30 -/* 8048D748 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048D74C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048D750 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048D754 7C 08 03 A6 */ mtlr r0 -/* 8048D758 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048D75C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/__sinit_d_a_tag_evtmsg_cpp.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/__sinit_d_a_tag_evtmsg_cpp.s deleted file mode 100644 index e2371580bc..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/__sinit_d_a_tag_evtmsg_cpp.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8048D77C: -/* 8048D77C 3C 60 80 49 */ lis r3, cNullVec__6Z2Calc@ha /* 0x8048D818@ha */ -/* 8048D780 38 A3 D8 18 */ addi r5, r3, cNullVec__6Z2Calc@l /* 0x8048D818@l */ -/* 8048D784 3C 60 80 3A */ lis r3, __ptmf_null@ha /* 0x803A2180@ha */ -/* 8048D788 38 83 21 80 */ addi r4, r3, __ptmf_null@l /* 0x803A2180@l */ -/* 8048D78C 80 64 00 00 */ lwz r3, 0(r4) -/* 8048D790 80 04 00 04 */ lwz r0, 4(r4) -/* 8048D794 90 65 00 44 */ stw r3, 0x44(r5) -/* 8048D798 90 05 00 48 */ stw r0, 0x48(r5) -/* 8048D79C 80 04 00 08 */ lwz r0, 8(r4) -/* 8048D7A0 90 05 00 4C */ stw r0, 0x4c(r5) -/* 8048D7A4 38 85 00 44 */ addi r4, r5, 0x44 -/* 8048D7A8 80 65 00 2C */ lwz r3, 0x2c(r5) -/* 8048D7AC 80 05 00 30 */ lwz r0, 0x30(r5) -/* 8048D7B0 90 64 00 0C */ stw r3, 0xc(r4) -/* 8048D7B4 90 04 00 10 */ stw r0, 0x10(r4) -/* 8048D7B8 80 05 00 34 */ lwz r0, 0x34(r5) -/* 8048D7BC 90 04 00 14 */ stw r0, 0x14(r4) -/* 8048D7C0 80 65 00 38 */ lwz r3, 0x38(r5) -/* 8048D7C4 80 05 00 3C */ lwz r0, 0x3c(r5) -/* 8048D7C8 90 64 00 18 */ stw r3, 0x18(r4) -/* 8048D7CC 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8048D7D0 80 05 00 40 */ lwz r0, 0x40(r5) -/* 8048D7D4 90 04 00 20 */ stw r0, 0x20(r4) -/* 8048D7D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/chkPointInArea__14daTag_EvtMsg_cF4cXyz.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/chkPointInArea__14daTag_EvtMsg_cF4cXyz.s deleted file mode 100644 index 8b5db634c3..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/chkPointInArea__14daTag_EvtMsg_cF4cXyz.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_8048D428: -/* 8048D428 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8048D42C 7C 08 02 A6 */ mflr r0 -/* 8048D430 90 01 00 44 */ stw r0, 0x44(r1) -/* 8048D434 39 61 00 40 */ addi r11, r1, 0x40 -/* 8048D438 4B ED 4D A5 */ bl _savegpr_29 -/* 8048D43C 7C 7D 1B 78 */ mr r29, r3 -/* 8048D440 7C 9E 23 78 */ mr r30, r4 -/* 8048D444 4B FF FE E1 */ bl getOnEvtBit__14daTag_EvtMsg_cFv -/* 8048D448 3C 03 00 01 */ addis r0, r3, 1 -/* 8048D44C 28 00 FF FF */ cmplwi r0, 0xffff -/* 8048D450 41 82 00 80 */ beq lbl_8048D4D0 -/* 8048D454 7F A3 EB 78 */ mr r3, r29 -/* 8048D458 4B FF FE CD */ bl getOnEvtBit__14daTag_EvtMsg_cFv -/* 8048D45C 3C 03 00 01 */ addis r0, r3, 1 -/* 8048D460 28 00 FF FF */ cmplwi r0, 0xffff -/* 8048D464 41 82 00 18 */ beq lbl_8048D47C -/* 8048D468 7F A3 EB 78 */ mr r3, r29 -/* 8048D46C 4B FF FE B9 */ bl getOnEvtBit__14daTag_EvtMsg_cFv -/* 8048D470 4B CC 81 C5 */ bl daNpcF_chkEvtBit__FUl -/* 8048D474 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D478 41 82 00 58 */ beq lbl_8048D4D0 -lbl_8048D47C: -/* 8048D47C 7F A3 EB 78 */ mr r3, r29 -/* 8048D480 4B FF FE DD */ bl getOnSwBit__14daTag_EvtMsg_cFv -/* 8048D484 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8048D488 28 00 00 FF */ cmplwi r0, 0xff -/* 8048D48C 41 82 00 44 */ beq lbl_8048D4D0 -/* 8048D490 7F A3 EB 78 */ mr r3, r29 -/* 8048D494 4B FF FE C9 */ bl getOnSwBit__14daTag_EvtMsg_cFv -/* 8048D498 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8048D49C 28 00 00 FF */ cmplwi r0, 0xff -/* 8048D4A0 41 82 00 90 */ beq lbl_8048D530 -/* 8048D4A4 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 8048D4A8 7C 1F 07 74 */ extsb r31, r0 -/* 8048D4AC 7F A3 EB 78 */ mr r3, r29 -/* 8048D4B0 4B FF FE AD */ bl getOnSwBit__14daTag_EvtMsg_cFv -/* 8048D4B4 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8048D4B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048D4BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048D4C0 7F E5 FB 78 */ mr r5, r31 -/* 8048D4C4 4B BA 7E 9D */ bl isSwitch__10dSv_info_cCFii -/* 8048D4C8 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D4CC 40 82 00 64 */ bne lbl_8048D530 -lbl_8048D4D0: -/* 8048D4D0 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8048D4D4 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8048D4D8 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8048D4DC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8048D4E0 C0 1E 00 08 */ lfs f0, 8(r30) -/* 8048D4E4 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8048D4E8 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8048D4EC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8048D4F0 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8048D4F4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8048D4F8 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8048D4FC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8048D500 C0 1D 04 EC */ lfs f0, 0x4ec(r29) -/* 8048D504 D0 01 00 08 */ stfs f0, 8(r1) -/* 8048D508 C0 1D 04 F0 */ lfs f0, 0x4f0(r29) -/* 8048D50C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8048D510 C0 1D 04 F4 */ lfs f0, 0x4f4(r29) -/* 8048D514 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8048D518 38 61 00 20 */ addi r3, r1, 0x20 -/* 8048D51C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8048D520 38 A1 00 08 */ addi r5, r1, 8 -/* 8048D524 A8 DD 04 E6 */ lha r6, 0x4e6(r29) -/* 8048D528 4B CC 84 41 */ bl daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs -/* 8048D52C 48 00 00 08 */ b lbl_8048D534 -lbl_8048D530: -/* 8048D530 38 60 00 00 */ li r3, 0 -lbl_8048D534: -/* 8048D534 39 61 00 40 */ addi r11, r1, 0x40 -/* 8048D538 4B ED 4C F1 */ bl _restgpr_29 -/* 8048D53C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8048D540 7C 08 03 A6 */ mtlr r0 -/* 8048D544 38 21 00 40 */ addi r1, r1, 0x40 -/* 8048D548 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/create__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/create__14daTag_EvtMsg_cFv.s deleted file mode 100644 index 8d38d55de5..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/create__14daTag_EvtMsg_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_8048CF38: -/* 8048CF38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048CF3C 7C 08 02 A6 */ mflr r0 -/* 8048CF40 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048CF44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048CF48 93 C1 00 08 */ stw r30, 8(r1) -/* 8048CF4C 7C 7F 1B 78 */ mr r31, r3 -/* 8048CF50 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8048CF54 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8048CF58 40 82 00 34 */ bne lbl_8048CF8C -/* 8048CF5C 7F E0 FB 79 */ or. r0, r31, r31 -/* 8048CF60 41 82 00 20 */ beq lbl_8048CF80 -/* 8048CF64 7C 1E 03 78 */ mr r30, r0 -/* 8048CF68 4B B8 BB FD */ bl __ct__10fopAc_ac_cFv -/* 8048CF6C 3C 60 80 49 */ lis r3, __vt__14daTag_EvtMsg_c@ha /* 0x8048D8D4@ha */ -/* 8048CF70 38 03 D8 D4 */ addi r0, r3, __vt__14daTag_EvtMsg_c@l /* 0x8048D8D4@l */ -/* 8048CF74 90 1E 05 C0 */ stw r0, 0x5c0(r30) -/* 8048CF78 38 7E 05 74 */ addi r3, r30, 0x574 -/* 8048CF7C 4B DB CF 85 */ bl __ct__10dMsgFlow_cFv -lbl_8048CF80: -/* 8048CF80 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8048CF84 60 00 00 08 */ ori r0, r0, 8 -/* 8048CF88 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8048CF8C: -/* 8048CF8C C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048CF90 3C 60 80 49 */ lis r3, lit_3826@ha /* 0x8048D7E8@ha */ -/* 8048CF94 C0 23 D7 E8 */ lfs f1, lit_3826@l(r3) /* 0x8048D7E8@l */ -/* 8048CF98 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048CF9C D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048CFA0 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048CFA4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048CFA8 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048CFAC C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048CFB0 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048CFB4 A8 7F 04 B8 */ lha r3, 0x4b8(r31) -/* 8048CFB8 3C 03 00 00 */ addis r0, r3, 0 -/* 8048CFBC 28 00 FF FF */ cmplwi r0, 0xffff -/* 8048CFC0 41 82 00 0C */ beq lbl_8048CFCC -/* 8048CFC4 90 7F 05 6C */ stw r3, 0x56c(r31) -/* 8048CFC8 48 00 00 0C */ b lbl_8048CFD4 -lbl_8048CFCC: -/* 8048CFCC 38 00 FF FF */ li r0, -1 -/* 8048CFD0 90 1F 05 6C */ stw r0, 0x56c(r31) -lbl_8048CFD4: -/* 8048CFD4 38 00 FF FF */ li r0, -1 -/* 8048CFD8 B0 1F 05 70 */ sth r0, 0x570(r31) -/* 8048CFDC 38 00 00 00 */ li r0, 0 -/* 8048CFE0 98 1F 05 72 */ stb r0, 0x572(r31) -/* 8048CFE4 7F E3 FB 78 */ mr r3, r31 -/* 8048CFE8 48 00 03 9D */ bl isDelete__14daTag_EvtMsg_cFv -/* 8048CFEC 2C 03 00 01 */ cmpwi r3, 1 -/* 8048CFF0 38 60 00 04 */ li r3, 4 -/* 8048CFF4 40 82 00 08 */ bne lbl_8048CFFC -/* 8048CFF8 38 60 00 05 */ li r3, 5 -lbl_8048CFFC: -/* 8048CFFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048D000 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048D004 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048D008 7C 08 03 A6 */ mtlr r0 -/* 8048D00C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048D010 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Create__FPv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Create__FPv.s deleted file mode 100644 index 726204ed5a..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Create__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048D668: -/* 8048D668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048D66C 7C 08 02 A6 */ mflr r0 -/* 8048D670 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048D674 4B FF F8 C5 */ bl create__14daTag_EvtMsg_cFv -/* 8048D678 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048D67C 7C 08 03 A6 */ mtlr r0 -/* 8048D680 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048D684 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Delete__FPv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Delete__FPv.s deleted file mode 100644 index 315fa157c1..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Delete__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048D688: -/* 8048D688 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048D68C 7C 08 02 A6 */ mflr r0 -/* 8048D690 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048D694 4B FF F9 81 */ bl Delete__14daTag_EvtMsg_cFv -/* 8048D698 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048D69C 7C 08 03 A6 */ mtlr r0 -/* 8048D6A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048D6A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Draw__FPv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Draw__FPv.s deleted file mode 100644 index 482c792141..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Draw__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048D6C8: -/* 8048D6C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048D6CC 7C 08 02 A6 */ mflr r0 -/* 8048D6D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048D6D4 4B FF FC 49 */ bl Draw__14daTag_EvtMsg_cFv -/* 8048D6D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048D6DC 7C 08 03 A6 */ mtlr r0 -/* 8048D6E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048D6E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Execute__FPv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Execute__FPv.s deleted file mode 100644 index 930e35c8d2..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Execute__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048D6A8: -/* 8048D6A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048D6AC 7C 08 02 A6 */ mflr r0 -/* 8048D6B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048D6B4 4B FF F9 69 */ bl Execute__14daTag_EvtMsg_cFv -/* 8048D6B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048D6BC 7C 08 03 A6 */ mtlr r0 -/* 8048D6C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048D6C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOffEvtBit__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOffEvtBit__14daTag_EvtMsg_cFv.s deleted file mode 100644 index df894212b1..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOffEvtBit__14daTag_EvtMsg_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8048D340: -/* 8048D340 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048D344 54 00 A5 3E */ rlwinm r0, r0, 0x14, 0x14, 0x1f -/* 8048D348 28 00 0F FF */ cmplwi r0, 0xfff -/* 8048D34C 38 60 FF FF */ li r3, -1 -/* 8048D350 4D 82 00 20 */ beqlr -/* 8048D354 7C 03 03 78 */ mr r3, r0 -/* 8048D358 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOffSwBit__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOffSwBit__14daTag_EvtMsg_cFv.s deleted file mode 100644 index 2e9e538c28..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOffSwBit__14daTag_EvtMsg_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048D368: -/* 8048D368 A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 8048D36C 54 03 C6 3E */ rlwinm r3, r0, 0x18, 0x18, 0x1f -/* 8048D370 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOnEvtBit__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOnEvtBit__14daTag_EvtMsg_cFv.s deleted file mode 100644 index d133120651..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOnEvtBit__14daTag_EvtMsg_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8048D324: -/* 8048D324 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048D328 54 00 05 3E */ clrlwi r0, r0, 0x14 -/* 8048D32C 28 00 0F FF */ cmplwi r0, 0xfff -/* 8048D330 38 60 FF FF */ li r3, -1 -/* 8048D334 4D 82 00 20 */ beqlr -/* 8048D338 7C 03 03 78 */ mr r3, r0 -/* 8048D33C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOnSwBit__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOnSwBit__14daTag_EvtMsg_cFv.s deleted file mode 100644 index b8e4c9594d..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOnSwBit__14daTag_EvtMsg_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048D35C: -/* 8048D35C A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 8048D360 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8048D364 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getProcType__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getProcType__14daTag_EvtMsg_cFv.s deleted file mode 100644 index 3c7cb12346..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getProcType__14daTag_EvtMsg_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8048D374: -/* 8048D374 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048D378 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6 -/* 8048D37C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8048D380 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/isDelete__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/isDelete__14daTag_EvtMsg_cFv.s deleted file mode 100644 index dce26d27eb..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/isDelete__14daTag_EvtMsg_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8048D384: -/* 8048D384 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048D388 7C 08 02 A6 */ mflr r0 -/* 8048D38C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048D390 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048D394 4B ED 4E 49 */ bl _savegpr_29 -/* 8048D398 7C 7D 1B 78 */ mr r29, r3 -/* 8048D39C 3B C0 00 00 */ li r30, 0 -/* 8048D3A0 4B FF FF A1 */ bl getOffEvtBit__14daTag_EvtMsg_cFv -/* 8048D3A4 3C 03 00 01 */ addis r0, r3, 1 -/* 8048D3A8 28 00 FF FF */ cmplwi r0, 0xffff -/* 8048D3AC 41 82 00 1C */ beq lbl_8048D3C8 -/* 8048D3B0 7F A3 EB 78 */ mr r3, r29 -/* 8048D3B4 4B FF FF 8D */ bl getOffEvtBit__14daTag_EvtMsg_cFv -/* 8048D3B8 4B CC 82 7D */ bl daNpcF_chkEvtBit__FUl -/* 8048D3BC 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D3C0 41 82 00 08 */ beq lbl_8048D3C8 -/* 8048D3C4 3B C0 00 01 */ li r30, 1 -lbl_8048D3C8: -/* 8048D3C8 7F A3 EB 78 */ mr r3, r29 -/* 8048D3CC 4B FF FF 9D */ bl getOffSwBit__14daTag_EvtMsg_cFv -/* 8048D3D0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8048D3D4 28 00 00 FF */ cmplwi r0, 0xff -/* 8048D3D8 41 82 00 34 */ beq lbl_8048D40C -/* 8048D3DC 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 8048D3E0 7C 1F 07 74 */ extsb r31, r0 -/* 8048D3E4 7F A3 EB 78 */ mr r3, r29 -/* 8048D3E8 4B FF FF 81 */ bl getOffSwBit__14daTag_EvtMsg_cFv -/* 8048D3EC 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8048D3F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048D3F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048D3F8 7F E5 FB 78 */ mr r5, r31 -/* 8048D3FC 4B BA 7F 65 */ bl isSwitch__10dSv_info_cCFii -/* 8048D400 2C 03 00 00 */ cmpwi r3, 0 -/* 8048D404 41 82 00 08 */ beq lbl_8048D40C -/* 8048D408 3B C0 00 01 */ li r30, 1 -lbl_8048D40C: -/* 8048D40C 7F C3 F3 78 */ mr r3, r30 -/* 8048D410 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048D414 4B ED 4E 15 */ bl _restgpr_29 -/* 8048D418 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048D41C 7C 08 03 A6 */ mtlr r0 -/* 8048D420 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048D424 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h index 3a0726ab72..f19d7bf4a4 100644 --- a/include/d/a/d_a_npc.h +++ b/include/d/a/d_a_npc.h @@ -433,6 +433,7 @@ STATIC_ASSERT(sizeof(daNpcT_c) == 0xE40); BOOL daNpcT_chkEvtBit(u32 i_idx); BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4); +BOOL daNpcF_chkPointInArea(cXyz, cXyz, cXyz, s16); class daNpcF_ActorMngr_c { private: diff --git a/include/d/bg/d_bg_w_sv.h b/include/d/bg/d_bg_w_sv.h index 251b604799..40a0f1e9ed 100644 --- a/include/d/bg/d_bg_w_sv.h +++ b/include/d/bg/d_bg_w_sv.h @@ -7,10 +7,10 @@ class dBgWSv : public dBgW { public: /* 80082F98 */ u8 Set(cBgD_t*, u32); /* 80083020 */ void CopyBackVtx(); - /* 8008308C */ void CrrPosWork(cXyz*, int, int, int); - /* 80083300 */ void TransPosWork(cXyz*, int, int, int); + /* 8008308C */ bool CrrPosWork(cXyz*, int, int, int); + /* 80083300 */ bool TransPosWork(cXyz*, int, int, int); - /* 800835DC */ virtual ~dBgWSv(); + /* 800835DC */ virtual ~dBgWSv() {} /* 80083244 */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); /* 8008351C */ virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); /* 800835D8 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); diff --git a/include/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.h b/include/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.h index a4a8d1c010..b404bd0234 100644 --- a/include/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.h +++ b/include/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.h @@ -1,6 +1,39 @@ #ifndef D_A_TAG_EVTMSG_H #define D_A_TAG_EVTMSG_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/msg/d_msg_flow.h" + +class daTag_EvtMsg_c; +typedef BOOL (daTag_EvtMsg_c::*EvtCutFunc)(int); + +class daTag_EvtMsg_c : public fopAc_ac_c { +public: + /* 0x568 */ int mTimer; + /* 0x56C */ int mFlowID; + /* 0x570 */ s16 mEventID; + /* 0x572 */ u8 field_0x572; + /* 0x574 */ dMsgFlow_c mMsgFlow; + +public: + /* 8048CF38 */ int create(); + /* 8048D014 */ int Delete(); + /* 8048D01C */ int Execute(); + /* 8048D31C */ int Draw(); + /* 8048D324 */ u32 getOnEvtBit(); + /* 8048D340 */ u32 getOffEvtBit(); + /* 8048D35C */ u8 getOnSwBit(); + /* 8048D368 */ u8 getOffSwBit(); + /* 8048D374 */ u8 getProcType(); + /* 8048D384 */ BOOL isDelete(); + /* 8048D428 */ BOOL chkPointInArea(cXyz); + /* 8048D54C */ BOOL ECut_talk(int); + /* 8048D5CC */ BOOL ECut_wait(int); + + /* 8048D6F0 */ virtual ~daTag_EvtMsg_c(); + + static char* mEvtCutNameList[]; + static EvtCutFunc mEvtCutList[]; +}; #endif /* D_A_TAG_EVTMSG_H */ diff --git a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp index 6cf10e32dc..fc6dabd9e7 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp +++ b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp @@ -1,164 +1,26 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_tag_evtmsg -// +/** + * d_a_tag_evtmsg.cpp + * + */ #include "rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.h" -#include "dol2asm.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_npc.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct cXyz {}; - -struct daTag_EvtMsg_c { - /* 8048CF38 */ void create(); - /* 8048D014 */ bool Delete(); - /* 8048D01C */ void Execute(); - /* 8048D31C */ bool Draw(); - /* 8048D324 */ void getOnEvtBit(); - /* 8048D340 */ void getOffEvtBit(); - /* 8048D35C */ void getOnSwBit(); - /* 8048D368 */ void getOffSwBit(); - /* 8048D374 */ void getProcType(); - /* 8048D384 */ void isDelete(); - /* 8048D428 */ void chkPointInArea(cXyz); - /* 8048D54C */ void ECut_talk(int); - /* 8048D5CC */ void ECut_wait(int); - /* 8048D6F0 */ ~daTag_EvtMsg_c(); - - static void* mEvtCutNameList[3]; - static u8 mEvtCutList[36]; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; - -// -// Forward References: -// - -extern "C" void create__14daTag_EvtMsg_cFv(); -extern "C" bool Delete__14daTag_EvtMsg_cFv(); -extern "C" void Execute__14daTag_EvtMsg_cFv(); -extern "C" bool Draw__14daTag_EvtMsg_cFv(); -extern "C" void getOnEvtBit__14daTag_EvtMsg_cFv(); -extern "C" void getOffEvtBit__14daTag_EvtMsg_cFv(); -extern "C" void getOnSwBit__14daTag_EvtMsg_cFv(); -extern "C" void getOffSwBit__14daTag_EvtMsg_cFv(); -extern "C" void getProcType__14daTag_EvtMsg_cFv(); -extern "C" void isDelete__14daTag_EvtMsg_cFv(); -extern "C" void chkPointInArea__14daTag_EvtMsg_cF4cXyz(); -extern "C" void ECut_talk__14daTag_EvtMsg_cFi(); -extern "C" void ECut_wait__14daTag_EvtMsg_cFi(); -extern "C" static void daTag_EvtMsg_Create__FPv(); -extern "C" static void daTag_EvtMsg_Delete__FPv(); -extern "C" static void daTag_EvtMsg_Execute__FPv(); -extern "C" static void daTag_EvtMsg_Draw__FPv(); -extern "C" static bool daTag_EvtMsg_IsDelete__FPv(); -extern "C" void __dt__14daTag_EvtMsg_cFv(); -extern "C" void func_8048D760(void* _this, int*); -extern "C" void __sinit_d_a_tag_evtmsg_cpp(); -extern "C" extern char const* const d_a_tag_evtmsg__stringBase0; -extern "C" void* mEvtCutNameList__14daTag_EvtMsg_c[3]; -extern "C" u8 mEvtCutList__14daTag_EvtMsg_c[36]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void daNpcF_chkEvtBit__FUl(); -extern "C" void daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void __dt__10dMsgFlow_cFv(); -extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(); -extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8048D7E8-8048D7EC 000000 0004+00 1/1 0/0 0/0 .rodata @3826 */ -SECTION_RODATA static f32 const lit_3826 = 100.0f; -COMPILER_STRIP_GATE(0x8048D7E8, &lit_3826); - -/* 8048D7EC-8048D7EC 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8048D7EC = ""; -SECTION_DEAD static char const* const stringBase_8048D7ED = "TALK"; -SECTION_DEAD static char const* const stringBase_8048D7F2 = "WAIT"; -SECTION_DEAD static char const* const stringBase_8048D7F7 = "EvtMsg"; -#pragma pop +extern "C" int func_8048D760(int*); /* 8048D818-8048D824 000000 000C+00 2/2 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, }; /* 8048D824-8048D838 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, @@ -170,292 +32,276 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { /* 8048D838-8048D844 -00001 000C+00 0/1 0/0 0/0 .data mEvtCutNameList__14daTag_EvtMsg_c */ -#pragma push -#pragma force_active on -SECTION_DATA void* daTag_EvtMsg_c::mEvtCutNameList[3] = { - (void*)&d_a_tag_evtmsg__stringBase0, - (void*)(((char*)&d_a_tag_evtmsg__stringBase0) + 0x1), - (void*)(((char*)&d_a_tag_evtmsg__stringBase0) + 0x6), -}; -#pragma pop - -/* 8048D844-8048D850 -00001 000C+00 0/1 0/0 0/0 .data @3802 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3802[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)ECut_talk__14daTag_EvtMsg_cFi, -}; -#pragma pop - -/* 8048D850-8048D85C -00001 000C+00 0/1 0/0 0/0 .data @3803 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3803[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)ECut_wait__14daTag_EvtMsg_cFi, -}; -#pragma pop +char* daTag_EvtMsg_c::mEvtCutNameList[] = {"", "TALK", "WAIT"}; /* 8048D85C-8048D880 000044 0024+00 0/2 0/0 0/0 .data mEvtCutList__14daTag_EvtMsg_c */ -#pragma push -#pragma force_active on -SECTION_DATA u8 daTag_EvtMsg_c::mEvtCutList[36] = { - 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, +EvtCutFunc daTag_EvtMsg_c::mEvtCutList[] = { + NULL, + &daTag_EvtMsg_c::ECut_talk, + &daTag_EvtMsg_c::ECut_wait, }; -#pragma pop /* 8048D880-8048D884 -00001 0004+00 0/1 0/0 0/0 .data l_myName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_myName = (void*)(((char*)&d_a_tag_evtmsg__stringBase0) + 0xB); -#pragma pop - -/* 8048D884-8048D8A4 -00001 0020+00 1/0 0/0 0/0 .data daTag_EvtMsg_MethodTable */ -SECTION_DATA static void* daTag_EvtMsg_MethodTable[8] = { - (void*)daTag_EvtMsg_Create__FPv, - (void*)daTag_EvtMsg_Delete__FPv, - (void*)daTag_EvtMsg_Execute__FPv, - (void*)daTag_EvtMsg_IsDelete__FPv, - (void*)daTag_EvtMsg_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8048D8A4-8048D8D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVTMSG */ -SECTION_DATA extern void* g_profile_TAG_EVTMSG[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02D50000, (void*)&g_fpcLf_Method, - (void*)0x000005C4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x011D0000, (void*)&daTag_EvtMsg_MethodTable, - (void*)0x00044000, (void*)0x000E0000, -}; - -/* 8048D8D4-8048D8E0 0000BC 000C+00 2/2 0/0 0/0 .data __vt__14daTag_EvtMsg_c */ -SECTION_DATA extern void* __vt__14daTag_EvtMsg_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daTag_EvtMsg_cFv, -}; +static char* l_myName = "EvtMsg"; /* 8048CF38-8048D014 000078 00DC+00 1/1 0/0 0/0 .text create__14daTag_EvtMsg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/create__14daTag_EvtMsg_cFv.s" +int daTag_EvtMsg_c::create() { + fopAcM_SetupActor(this, daTag_EvtMsg_c); + + mScale.x *= 100.0f; + mScale.y *= 100.0f; + mScale.z = mScale.x; + + if (orig.angle.z != 0xFFFF) { + mFlowID = orig.angle.z; + } else { + mFlowID = -1; + } + + mEventID = -1; + field_0x572 = 0; + + return isDelete() == TRUE ? cPhs_ERROR_e : cPhs_COMPLEATE_e; } -#pragma pop /* 8048D014-8048D01C 000154 0008+00 1/1 0/0 0/0 .text Delete__14daTag_EvtMsg_cFv */ -bool daTag_EvtMsg_c::Delete() { - return true; +int daTag_EvtMsg_c::Delete() { + return 1; } -/* ############################################################################################## */ -/* 8048D7EC-8048D7EC 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8048D7FE = "DEFAULT_EVT_TALK"; -#pragma pop - /* 8048D01C-8048D31C 00015C 0300+00 1/1 0/0 0/0 .text Execute__14daTag_EvtMsg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::Execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/Execute__14daTag_EvtMsg_cFv.s" +int daTag_EvtMsg_c::Execute() { + dEvent_manager_c& evt_mng = i_dComIfGp_getEventManager(); + + if (orig.roomNo == dComIfGp_roomControl_getStayNo()) { + if (i_dComIfGp_event_runCheck()) { + int staff_id; + BOOL reset = false; + if (mEvtInfo.checkCommandTalk()) { + if (field_0x572 != 0) { + mMsgFlow.init(this, mFlowID, 0, NULL); + } + + if (mMsgFlow.doFlow(this, NULL, 0)) { + reset = true; + } + } else if (mEvtInfo.checkCommandDemoAccrpt() && mEventID != -1 && + evt_mng.endCheck(mEventID)) + { + mEventID = -1; + reset = true; + } else { + staff_id = evt_mng.getMyStaffId(l_myName, this, -1); + if (staff_id != -1) { + int evtCutNo = evt_mng.getMyActIdx(staff_id, mEvtCutNameList, 3, 0, 0); + if ((this->*mEvtCutList[evtCutNo])(staff_id) != 0) { + evt_mng.cutEnd(staff_id); + } + } + } + + if (reset) { + if (getOffSwBit() != 0xFF) { + dComIfGs_onSwitch(getOffSwBit(), fopAcM_GetRoomNo(this)); + } + + i_dComIfGp_event_reset(); + } + } else if (isDelete()) { + fopAcM_delete(this); + } else if (mFlowID != -1) { + if (chkPointInArea(daPy_getPlayerActorClass()->current.pos)) { + if (getProcType() == 0) { + s16 var_r0 = (s16)(fopAcM_searchPlayerAngleY(this) + 0x7FFF); + var_r0 = var_r0 - daPy_getPlayerActorClass()->current.angle.y; + + if (var_r0 < 0) { + var_r0 = -var_r0; + } + + if (var_r0 <= 0x1000) { + mEventID = evt_mng.getEventIdx(this, "DEFAULT_EVT_TALK", 0xFF); + fopAcM_orderOtherEventId(this, mEventID, 0xFF, 0xFFFF, 0, 1); + } + } else { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + } + } + } + mAttentionInfo.mFlags = 0; + mAttentionInfo.mPosition = current.pos; + mEyePos = mAttentionInfo.mPosition; + return 1; + } + + return 0; } -#pragma pop /* 8048D31C-8048D324 00045C 0008+00 1/1 0/0 0/0 .text Draw__14daTag_EvtMsg_cFv */ -bool daTag_EvtMsg_c::Draw() { - return true; +int daTag_EvtMsg_c::Draw() { + return 1; } /* 8048D324-8048D340 000464 001C+00 1/1 0/0 0/0 .text getOnEvtBit__14daTag_EvtMsg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::getOnEvtBit() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOnEvtBit__14daTag_EvtMsg_cFv.s" +u32 daTag_EvtMsg_c::getOnEvtBit() { + u32 bit = fopAcM_GetParam(this) & 0xFFF; + if (bit != 0xFFF) { + return bit; + } + + return -1; } -#pragma pop /* 8048D340-8048D35C 000480 001C+00 1/1 0/0 0/0 .text getOffEvtBit__14daTag_EvtMsg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::getOffEvtBit() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOffEvtBit__14daTag_EvtMsg_cFv.s" +u32 daTag_EvtMsg_c::getOffEvtBit() { + u32 bit = (fopAcM_GetParam(this) >> 0xC) & 0xFFF; + if (bit != 0xFFF) { + return bit; + } + + return -1; } -#pragma pop /* 8048D35C-8048D368 00049C 000C+00 1/1 0/0 0/0 .text getOnSwBit__14daTag_EvtMsg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::getOnSwBit() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOnSwBit__14daTag_EvtMsg_cFv.s" +u8 daTag_EvtMsg_c::getOnSwBit() { + return orig.angle.x & 0xFF; } -#pragma pop /* 8048D368-8048D374 0004A8 000C+00 2/2 0/0 0/0 .text getOffSwBit__14daTag_EvtMsg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::getOffSwBit() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getOffSwBit__14daTag_EvtMsg_cFv.s" +u8 daTag_EvtMsg_c::getOffSwBit() { + return (orig.angle.x >> 8) & 0xFF; } -#pragma pop /* 8048D374-8048D384 0004B4 0010+00 1/1 0/0 0/0 .text getProcType__14daTag_EvtMsg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::getProcType() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/getProcType__14daTag_EvtMsg_cFv.s" +u8 daTag_EvtMsg_c::getProcType() { + return fopAcM_GetParam(this) & 0x2000000; } -#pragma pop /* 8048D384-8048D428 0004C4 00A4+00 2/2 0/0 0/0 .text isDelete__14daTag_EvtMsg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::isDelete() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/isDelete__14daTag_EvtMsg_cFv.s" +BOOL daTag_EvtMsg_c::isDelete() { + BOOL ret = false; + + if (getOffEvtBit() != -1) { + if (daNpcF_chkEvtBit(getOffEvtBit())) { + ret = true; + } + } + + if (getOffSwBit() != 0xFF) { + if (dComIfGs_isSwitch(getOffSwBit(), fopAcM_GetRoomNo(this))) { + ret = true; + } + } + + return ret; } -#pragma pop /* 8048D428-8048D54C 000568 0124+00 1/1 0/0 0/0 .text chkPointInArea__14daTag_EvtMsg_cF4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::chkPointInArea(cXyz param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/chkPointInArea__14daTag_EvtMsg_cF4cXyz.s" +BOOL daTag_EvtMsg_c::chkPointInArea(cXyz param_0) { + if (getOnEvtBit() == -1 || (getOnEvtBit() != -1 && !daNpcF_chkEvtBit(getOnEvtBit())) || + getOnSwBit() == 0xFF || + (getOnSwBit() != 0xFF && !dComIfGs_isSwitch(getOnSwBit(), fopAcM_GetRoomNo(this)))) + { + return daNpcF_chkPointInArea(param_0, current.pos, mScale, shape_angle.y); + } + + return 0; } -#pragma pop /* 8048D54C-8048D5CC 00068C 0080+00 1/0 0/0 0/0 .text ECut_talk__14daTag_EvtMsg_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::ECut_talk(int param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/ECut_talk__14daTag_EvtMsg_cFi.s" -} -#pragma pop +BOOL daTag_EvtMsg_c::ECut_talk(int i_staffID) { + if (i_dComIfGp_getEventManager().getIsAddvance(i_staffID)) { + mMsgFlow.init(this, mFlowID, 0, NULL); + } -/* ############################################################################################## */ -/* 8048D7EC-8048D7EC 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8048D80F = "timer"; -#pragma pop + if (mMsgFlow.doFlow(this, NULL, 0)) { + return true; + } + + return false; +} /* 8048D5CC-8048D668 00070C 009C+00 1/0 0/0 0/0 .text ECut_wait__14daTag_EvtMsg_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtMsg_c::ECut_wait(int param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/ECut_wait__14daTag_EvtMsg_cFi.s" +BOOL daTag_EvtMsg_c::ECut_wait(int i_staffID) { + dEvent_manager_c& evt_mng = i_dComIfGp_getEventManager(); + int timer = 0; + + int* data_p = dComIfGp_evmng_getMyIntegerP(i_staffID, "timer"); + if (data_p != NULL) { + timer = *data_p; + } + + if (evt_mng.getIsAddvance(i_staffID)) { + mTimer = timer; + } + + if (func_8048D760(&mTimer) == 0) { + return 1; + } + + return 0; } -#pragma pop /* 8048D668-8048D688 0007A8 0020+00 1/0 0/0 0/0 .text daTag_EvtMsg_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_EvtMsg_Create(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Create__FPv.s" +static int daTag_EvtMsg_Create(void* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 8048D688-8048D6A8 0007C8 0020+00 1/0 0/0 0/0 .text daTag_EvtMsg_Delete__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_EvtMsg_Delete(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Delete__FPv.s" +static int daTag_EvtMsg_Delete(void* i_this) { + return static_cast(i_this)->Delete(); } -#pragma pop /* 8048D6A8-8048D6C8 0007E8 0020+00 1/0 0/0 0/0 .text daTag_EvtMsg_Execute__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_EvtMsg_Execute(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Execute__FPv.s" +static int daTag_EvtMsg_Execute(void* i_this) { + return static_cast(i_this)->Execute(); } -#pragma pop /* 8048D6C8-8048D6E8 000808 0020+00 1/0 0/0 0/0 .text daTag_EvtMsg_Draw__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_EvtMsg_Draw(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/daTag_EvtMsg_Draw__FPv.s" +static int daTag_EvtMsg_Draw(void* i_this) { + return static_cast(i_this)->Draw(); } -#pragma pop /* 8048D6E8-8048D6F0 000828 0008+00 1/0 0/0 0/0 .text daTag_EvtMsg_IsDelete__FPv */ -static bool daTag_EvtMsg_IsDelete(void* param_0) { - return true; +static int daTag_EvtMsg_IsDelete(void* i_this) { + return 1; } /* 8048D6F0-8048D760 000830 0070+00 1/0 0/0 0/0 .text __dt__14daTag_EvtMsg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTag_EvtMsg_c::~daTag_EvtMsg_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/__dt__14daTag_EvtMsg_cFv.s" -} -#pragma pop +daTag_EvtMsg_c::~daTag_EvtMsg_c() {} /* 8048D760-8048D77C 0008A0 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8048D760(void* _this, int* param_0) { +extern "C" asm int func_8048D760(int* param_0) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/func_8048D760.s" } #pragma pop -/* 8048D77C-8048D7DC 0008BC 0060+00 0/0 1/0 0/0 .text __sinit_d_a_tag_evtmsg_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_tag_evtmsg_cpp() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/__sinit_d_a_tag_evtmsg_cpp.s" -} -#pragma pop +/* 8048D884-8048D8A4 -00001 0020+00 1/0 0/0 0/0 .data daTag_EvtMsg_MethodTable */ +static actor_method_class daTag_EvtMsg_MethodTable = { + (process_method_func)daTag_EvtMsg_Create, (process_method_func)daTag_EvtMsg_Delete, + (process_method_func)daTag_EvtMsg_Execute, (process_method_func)daTag_EvtMsg_IsDelete, + (process_method_func)daTag_EvtMsg_Draw, +}; -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8048D77C, __sinit_d_a_tag_evtmsg_cpp); -#pragma pop - -/* 8048D7EC-8048D7EC 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 8048D8A4-8048D8D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVTMSG */ +extern actor_process_profile_definition g_profile_TAG_EVTMSG = { + -3, + 7, + -3, + PROC_TAG_MSG, + &g_fpcLf_Method.mBase, + sizeof(daTag_EvtMsg_c), + 0, + 0, + &g_fopAc_Method.base, + 285, + &daTag_EvtMsg_MethodTable, + 0x44000, + 0, + 14, +}; diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index f8e0aeecf0..56f59ac6df 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -5483,8 +5483,6 @@ asm BOOL daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, f32 param_2, f32 p /* 801548F4-8015496C 14F234 0078+00 1/1 0/0 0/0 .text chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs */ -BOOL daNpcF_chkPointInArea(cXyz,cXyz,cXyz,s16); // fwd reference - BOOL daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3) { return daNpcF_chkPointInArea(param_0,param_1,param_2,param_3); } diff --git a/src/d/bg/d_bg_w_sv.cpp b/src/d/bg/d_bg_w_sv.cpp index 584d8644ed..207d5193d3 100644 --- a/src/d/bg/d_bg_w_sv.cpp +++ b/src/d/bg/d_bg_w_sv.cpp @@ -1,99 +1,10 @@ -// -// Generated By: dol2asm -// Translation Unit: d/bg/d_bg_w_sv -// +/** + * d_bg_w_sv.cpp + * + */ #include "d/bg/d_bg_w_sv.h" #include "SSystem/SComponent/c_bg_s_chk.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void Set__6dBgWSvFP6cBgD_tUl(); -extern "C" void CopyBackVtx__6dBgWSvFv(); -extern "C" void CrrPosWork__6dBgWSvFP4cXyziii(); -extern "C" void CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz(); -extern "C" void TransPosWork__6dBgWSvFP4cXyziii(); -extern "C" void TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz(); -extern "C" void MatrixCrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz(); -extern "C" void __dt__6dBgWSvFv(); - -// -// External References: -// - -extern "C" void SetOldShapeAngleY__9dBgW_BaseFs(); -extern "C" void __dt__4cBgWFv(); -extern "C" void CalcPlane__4cBgWFv(); -extern "C" void ClassifyPlane__4cBgWFv(); -extern "C" void ChkMemoryError__4cBgWFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void LineCheck__4cBgWFP11cBgS_LinChk(); -extern "C" void GroundCross__4cBgWFP11cBgS_GndChk(); -extern "C" void ShdwDraw__4cBgWFP13cBgS_ShdwDraw(); -extern "C" void GetGrpRoomIndex__4cBgWCFRC13cBgS_PolyInfo(); -extern "C" void GetBnd__4cBgWCFv(); -extern "C" void GetTriPnt__4cBgWCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz(); -extern "C" void GetTopUnder__4cBgWCFPfPf(); -extern "C" void GetTriPla__4cBgWCFRC13cBgS_PolyInfo(); -extern "C" void GetGrpInf__4cBgWCFRC13cBgS_PolyInfo(); -extern "C" void GetExitId__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetPolyColor__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetHorseNoEntry__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetSpecialCode__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetSpecialCode__4dBgWFi(); -extern "C" void GetMagnetCode__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetMonkeyBarsCode__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetPolyObjThrough__4dBgWFi(); -extern "C" void GetPolyCamThrough__4dBgWFi(); -extern "C" void GetPolyLinkThrough__4dBgWFi(); -extern "C" void GetPolyArrowThrough__4dBgWFi(); -extern "C" void GetPolyHSStick__4dBgWFi(); -extern "C" void GetPolyBoomerangThrough__4dBgWFi(); -extern "C" void GetPolyRopeThrough__4dBgWFi(); -extern "C" void GetPolyBombThrough__4dBgWFi(); -extern "C" void GetShdwThrough__4dBgWFi(); -extern "C" void GetUnderwaterRoofCode__4dBgWFi(); -extern "C" void GetLinkNo__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetWallCode__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetPolyAtt0__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetPolyAtt1__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetGroundCode__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetIronBallThrough__4dBgWFi(); -extern "C" void GetAttackThrough__4dBgWFi(); -extern "C" void GetCamMoveBG__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetRoomCamId__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetRoomPathId__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetRoomPathPntNo__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void ChkNotReady__4cBgWCFv(); -extern "C" void ChkLock__4cBgWCFv(); -extern "C" void ChkMoveBg__4cBgWCFv(); -extern "C" void WallCorrect__4dBgWFP9dBgS_Acch(); -extern "C" void WallCorrectSort__4dBgWFP9dBgS_Acch(); -extern "C" void RoofChk__4dBgWFP12dBgS_RoofChk(); -extern "C" void SplGrpChk__4dBgWFP14dBgS_SplGrpChk(); -extern "C" void CaptPoly__4dBgWFR13dBgS_CaptPoly(); -extern "C" void SphChk__4dBgWFP11dBgS_SphChkPv(); -extern "C" void GetPolyGrpRoomInfId__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void GetGrpSoundId__4dBgWFRC13cBgS_PolyInfo(); -extern "C" void ChkPolyThrough__4dBgWFiP16cBgS_PolyPassChk(); -extern "C" void ChkShdwDrawThrough__4dBgWFiP16cBgS_PolyPassChk(); -extern "C" void ChkGrpThrough__4dBgWFiP15cBgS_GrpPassChki(); -extern "C" void CallRideCallBack__4dBgWFP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" void CallArrowStickCallBack__4dBgWFP10fopAc_ac_cP10fopAc_ac_cR4cXyz(); -extern "C" void OffMoveFlag__4dBgWFv(); -extern "C" void ChkMoveFlag__4dBgWCFv(); -extern "C" void* __nwa__FUl(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_27(); -extern "C" void _restgpr_27(); -extern "C" extern void* __vt__4dBgW[65]; - -// -// Declarations: -// /* 80082F98-80083020 07D8D8 0088+00 0/0 0/0 2/2 .text Set__6dBgWSvFP6cBgD_tUl */ u8 dBgWSv::Set(cBgD_t* pbgd, u32 param_1) { @@ -122,147 +33,142 @@ void dBgWSv::CopyBackVtx() { } /* 8008308C-80083244 07D9CC 01B8+00 1/1 0/0 0/0 .text CrrPosWork__6dBgWSvFP4cXyziii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgWSv::CrrPosWork(cXyz* param_0, int param_1, int param_2, int param_3) { - nofralloc -#include "asm/d/bg/d_bg_w_sv/CrrPosWork__6dBgWSvFP4cXyziii.s" +bool dBgWSv::CrrPosWork(cXyz* i_pos, int i_vtx0, int i_vtx1, int i_vtx2) { + cXyz sp34; + cXyz sp28; + + sp34.x = field_0xc0[i_vtx1].x - field_0xc0[i_vtx0].x; + sp34.y = field_0xc0[i_vtx1].y - field_0xc0[i_vtx0].y; + sp34.z = field_0xc0[i_vtx1].z - field_0xc0[i_vtx0].z; + + sp28.x = field_0xc0[i_vtx2].x - field_0xc0[i_vtx0].x; + sp28.y = field_0xc0[i_vtx2].y - field_0xc0[i_vtx0].y; + sp28.z = field_0xc0[i_vtx2].z - field_0xc0[i_vtx0].z; + + if (cM3d_IsZero(sp34.z) || cM3d_IsZero(sp28.z)) { + return 1; + } + + f32 temp_f8 = sp34.x - (sp34.z * (sp28.x / sp28.z)); + f32 temp_f5_2 = sp28.x - (sp28.z * (sp34.x / sp34.z)); + + if (cM3d_IsZero(temp_f8) || cM3d_IsZero(temp_f5_2)) { + return 1; + } + + i_pos->x -= field_0xc0[i_vtx0].x; + i_pos->z -= field_0xc0[i_vtx0].z; + + cXyz sp14; + cXyz sp8; + + f32 temp_f6_2 = (i_pos->x - (i_pos->z * (sp28.x / sp28.z))) / temp_f8; + f32 temp_f7_2 = (i_pos->x - (i_pos->z * (sp34.x / sp34.z))) / temp_f5_2; + + sp14.x = pm_vtx_tbl[i_vtx1].x - pm_vtx_tbl[i_vtx0].x; + sp14.z = pm_vtx_tbl[i_vtx1].z - pm_vtx_tbl[i_vtx0].z; + + sp8.x = pm_vtx_tbl[i_vtx2].x - pm_vtx_tbl[i_vtx0].x; + sp8.z = pm_vtx_tbl[i_vtx2].z - pm_vtx_tbl[i_vtx0].z; + + i_pos->x = (temp_f6_2 * sp14.x) + (temp_f7_2 * sp8.x); + i_pos->z = (temp_f6_2 * sp14.z) + (temp_f7_2 * sp8.z); + + i_pos->x += pm_vtx_tbl[i_vtx0].x; + i_pos->z += pm_vtx_tbl[i_vtx0].z; + + return 0; } -#pragma pop /* 80083244-80083300 07DB84 00BC+00 1/0 0/0 0/0 .text * CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgWSv::CrrPos(cBgS_PolyInfo const& param_0, void* param_1, bool param_2, cXyz* param_3, - csXyz* param_4, csXyz* param_5) { - nofralloc -#include "asm/d/bg/d_bg_w_sv/CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz.s" +void dBgWSv::CrrPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos, + csXyz* i_angle, csXyz* i_shapeAngle) { + if (!(field_0xc4 & 1) && param_2) { + int poly_idx = i_poly.GetPolyIndex(); + int vtx0 = pm_bgd->m_t_tbl[poly_idx].m_vtx_idx0; + int vtx1 = pm_bgd->m_t_tbl[poly_idx].m_vtx_idx1; + int vtx2 = pm_bgd->m_t_tbl[poly_idx].m_vtx_idx2; + + if (CrrPosWork(i_pos, vtx0, vtx1, vtx2) && CrrPosWork(i_pos, vtx1, vtx2, vtx0)) { + CrrPosWork(i_pos, vtx2, vtx0, vtx1); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80452758-8045275C 000D58 0004+00 1/1 0/0 0/0 .sdata2 @3807 */ -SECTION_SDATA2 static u8 lit_3807[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 8045275C-80452760 000D5C 0004+00 1/1 0/0 0/0 .sdata2 @3808 */ -SECTION_SDATA2 static f32 lit_3808 = 1.0f; /* 80083300-8008351C 07DC40 021C+00 1/1 0/0 0/0 .text TransPosWork__6dBgWSvFP4cXyziii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgWSv::TransPosWork(cXyz* param_0, int param_1, int param_2, int param_3) { - nofralloc -#include "asm/d/bg/d_bg_w_sv/TransPosWork__6dBgWSvFP4cXyziii.s" +bool dBgWSv::TransPosWork(cXyz* i_pos, int i_vtx0, int i_vtx1, int i_vtx2) { + cXyz sp34; + cXyz sp28; + + sp34.x = field_0xc0[i_vtx1].x - field_0xc0[i_vtx0].x; + sp34.y = field_0xc0[i_vtx1].y - field_0xc0[i_vtx0].y; + sp34.z = field_0xc0[i_vtx1].z - field_0xc0[i_vtx0].z; + + sp28.x = field_0xc0[i_vtx2].x - field_0xc0[i_vtx0].x; + sp28.y = field_0xc0[i_vtx2].y - field_0xc0[i_vtx0].y; + sp28.z = field_0xc0[i_vtx2].z - field_0xc0[i_vtx0].z; + + if (cM3d_IsZero(sp34.z) || cM3d_IsZero(sp28.z)) { + return 1; + } + + f32 temp_f8 = sp34.x - (sp34.z * (sp28.x / sp28.z)); + f32 temp_f5_2 = sp28.x - (sp28.z * (sp34.x / sp34.z)); + + if (cM3d_IsZero(temp_f8) || cM3d_IsZero(temp_f5_2)) { + return 1; + } + + f32 temp_f3 = i_pos->x - field_0xc0[i_vtx0].x; + f32 temp_f4 = i_pos->z - field_0xc0[i_vtx0].z; + + f32 temp_f6_2 = (temp_f3 - (temp_f4 * (sp28.x / sp28.z))) / temp_f8; + f32 temp_f7_2 = (temp_f3 - (temp_f4 * (sp34.x / sp34.z))) / temp_f5_2; + + if (temp_f6_2 < 0.0f || temp_f6_2 > 1.0f || temp_f7_2 < 0.0f || temp_f7_2 > 1.0f) { + return 1; + } + + cXyz sp14; + cXyz sp8; + + sp14.x = pm_vtx_tbl[i_vtx1].x - pm_vtx_tbl[i_vtx0].x; + sp14.y = pm_vtx_tbl[i_vtx1].y - pm_vtx_tbl[i_vtx0].y; + sp14.z = pm_vtx_tbl[i_vtx1].z - pm_vtx_tbl[i_vtx0].z; + + sp8.x = pm_vtx_tbl[i_vtx2].x - pm_vtx_tbl[i_vtx0].x; + sp8.y = pm_vtx_tbl[i_vtx2].y - pm_vtx_tbl[i_vtx0].y; + sp8.z = pm_vtx_tbl[i_vtx2].z - pm_vtx_tbl[i_vtx0].z; + + i_pos->x = (temp_f6_2 * sp14.x) + (temp_f7_2 * sp8.x); + i_pos->y = (temp_f6_2 * sp14.y) + (temp_f7_2 * sp8.y); + i_pos->z = (temp_f6_2 * sp14.z) + (temp_f7_2 * sp8.z); + + i_pos->x += pm_vtx_tbl[i_vtx0].x; + i_pos->y += pm_vtx_tbl[i_vtx0].y; + i_pos->z += pm_vtx_tbl[i_vtx0].z; + + return 0; } -#pragma pop /* 8008351C-800835D8 07DE5C 00BC+00 1/0 0/0 0/0 .text * TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgWSv::TransPos(cBgS_PolyInfo const& param_0, void* param_1, bool param_2, cXyz* param_3, - csXyz* param_4, csXyz* param_5) { - nofralloc -#include "asm/d/bg/d_bg_w_sv/TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz.s" +void dBgWSv::TransPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos, + csXyz* i_angle, csXyz* i_shapeAngle) { + if (!(field_0xc4 & 1) && param_2) { + int poly_idx = i_poly.GetPolyIndex(); + int vtx0 = pm_bgd->m_t_tbl[poly_idx].m_vtx_idx0; + int vtx1 = pm_bgd->m_t_tbl[poly_idx].m_vtx_idx1; + int vtx2 = pm_bgd->m_t_tbl[poly_idx].m_vtx_idx2; + + if (TransPosWork(i_pos, vtx0, vtx1, vtx2) && TransPosWork(i_pos, vtx1, vtx2, vtx0)) { + TransPosWork(i_pos, vtx2, vtx0, vtx1); + } + } } -#pragma pop /* 800835D8-800835DC 07DF18 0004+00 1/0 0/0 0/0 .text * MatrixCrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */ -void dBgWSv::MatrixCrrPos(cBgS_PolyInfo const& param_0, void* param_1, bool param_2, cXyz* param_3, - csXyz* param_4, csXyz* param_5) { - /* empty function */ -} - -/* ############################################################################################## */ -/* 803ABEB8-803ABFC0 008FD8 0104+04 1/1 0/0 2/2 .data __vt__6dBgWSv */ -SECTION_DATA extern void* __vt__6dBgWSv[65 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__6dBgWSvFv, - (void*)ChkMemoryError__4cBgWFv, - (void*)ChkNotReady__4cBgWCFv, - (void*)ChkLock__4cBgWCFv, - (void*)ChkMoveBg__4cBgWCFv, - (void*)ChkMoveFlag__4dBgWCFv, - (void*)GetTriPla__4cBgWCFRC13cBgS_PolyInfo, - (void*)GetTriPnt__4cBgWCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz, - (void*)GetBnd__4cBgWCFv, - (void*)GetGrpInf__4cBgWCFRC13cBgS_PolyInfo, - (void*)OffMoveFlag__4dBgWFv, - (void*)GetTopUnder__4cBgWCFPfPf, - (void*)SetOldShapeAngleY__9dBgW_BaseFs, - (void*)LineCheck__4cBgWFP11cBgS_LinChk, - (void*)GroundCross__4cBgWFP11cBgS_GndChk, - (void*)ShdwDraw__4cBgWFP13cBgS_ShdwDraw, - (void*)CaptPoly__4dBgWFR13dBgS_CaptPoly, - (void*)WallCorrect__4dBgWFP9dBgS_Acch, - (void*)WallCorrectSort__4dBgWFP9dBgS_Acch, - (void*)RoofChk__4dBgWFP12dBgS_RoofChk, - (void*)SplGrpChk__4dBgWFP14dBgS_SplGrpChk, - (void*)SphChk__4dBgWFP11dBgS_SphChkPv, - (void*)GetGrpRoomIndex__4cBgWCFRC13cBgS_PolyInfo, - (void*)GetExitId__4dBgWFRC13cBgS_PolyInfo, - (void*)GetPolyColor__4dBgWFRC13cBgS_PolyInfo, - (void*)GetHorseNoEntry__4dBgWFRC13cBgS_PolyInfo, - (void*)GetSpecialCode__4dBgWFRC13cBgS_PolyInfo, - (void*)GetSpecialCode__4dBgWFi, - (void*)GetMagnetCode__4dBgWFRC13cBgS_PolyInfo, - (void*)GetPolyObjThrough__4dBgWFi, - (void*)GetPolyCamThrough__4dBgWFi, - (void*)GetPolyLinkThrough__4dBgWFi, - (void*)GetPolyArrowThrough__4dBgWFi, - (void*)GetPolyHSStick__4dBgWFi, - (void*)GetPolyBoomerangThrough__4dBgWFi, - (void*)GetPolyRopeThrough__4dBgWFi, - (void*)GetPolyBombThrough__4dBgWFi, - (void*)GetShdwThrough__4dBgWFi, - (void*)GetUnderwaterRoofCode__4dBgWFi, - (void*)GetMonkeyBarsCode__4dBgWFRC13cBgS_PolyInfo, - (void*)GetLinkNo__4dBgWFRC13cBgS_PolyInfo, - (void*)GetWallCode__4dBgWFRC13cBgS_PolyInfo, - (void*)GetPolyAtt0__4dBgWFRC13cBgS_PolyInfo, - (void*)GetPolyAtt1__4dBgWFRC13cBgS_PolyInfo, - (void*)GetGroundCode__4dBgWFRC13cBgS_PolyInfo, - (void*)GetIronBallThrough__4dBgWFi, - (void*)GetAttackThrough__4dBgWFi, - (void*)GetCamMoveBG__4dBgWFRC13cBgS_PolyInfo, - (void*)GetRoomCamId__4dBgWFRC13cBgS_PolyInfo, - (void*)GetRoomPathId__4dBgWFRC13cBgS_PolyInfo, - (void*)GetRoomPathPntNo__4dBgWFRC13cBgS_PolyInfo, - (void*)GetPolyGrpRoomInfId__4dBgWFRC13cBgS_PolyInfo, - (void*)GetGrpSoundId__4dBgWFRC13cBgS_PolyInfo, - (void*)CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz, - (void*)TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz, - (void*)MatrixCrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz, - (void*)CallRideCallBack__4dBgWFP10fopAc_ac_cP10fopAc_ac_c, - (void*)CallArrowStickCallBack__4dBgWFP10fopAc_ac_cP10fopAc_ac_cR4cXyz, - (void*)CalcPlane__4cBgWFv, - (void*)ClassifyPlane__4cBgWFv, - (void*)ChkPolyThrough__4dBgWFiP16cBgS_PolyPassChk, - (void*)ChkShdwDrawThrough__4dBgWFiP16cBgS_PolyPassChk, - (void*)ChkGrpThrough__4dBgWFiP15cBgS_GrpPassChki, - /* padding */ - NULL, -}; - -/* 800835DC-8008364C 07DF1C 0070+00 1/0 0/0 0/0 .text __dt__6dBgWSvFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgWSv::~dBgWSv() { -extern "C" asm void __dt__6dBgWSvFv() { - nofralloc -#include "asm/d/bg/d_bg_w_sv/__dt__6dBgWSvFv.s" -} -#pragma pop +void dBgWSv::MatrixCrrPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos, + csXyz* i_angle, csXyz* i_shapeAngle) {}