diff --git a/Progress.md b/Progress.md index b0ce2567dbb..30bb0aedf06 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 25.117001% | 903344 | 3596544 +.text | 25.173611% | 905380 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 33.011397% | 1327280 | 4020672 +Total | 33.062035% | 1329316 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 32.747461% | 1316668 | 4020672 +main.dol | 33.062035% | 1329316 | 4020672 RELs | 33.385425% | 3839432 | 11500324 -Total | 33.220162% | 5156100 | 15520996 +Total | 33.301652% | 5168748 | 15520996 ## RELs diff --git a/asm/JSystem/JKernel/JKRExpHeap/dump__10JKRExpHeapFv.s b/asm/JSystem/JKernel/JKRExpHeap/dump__10JKRExpHeapFv.s deleted file mode 100644 index a0b52801df7..00000000000 --- a/asm/JSystem/JKernel/JKRExpHeap/dump__10JKRExpHeapFv.s +++ /dev/null @@ -1,143 +0,0 @@ -lbl_802D03B8: -/* 802D03B8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802D03BC 7C 08 02 A6 */ mflr r0 -/* 802D03C0 90 01 00 44 */ stw r0, 0x44(r1) -/* 802D03C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D03C8 48 09 1E 05 */ bl _savegpr_25 -/* 802D03CC 7C 7A 1B 78 */ mr r26, r3 -/* 802D03D0 38 7A 00 18 */ addi r3, r26, 0x18 -/* 802D03D4 48 06 EC 6D */ bl OSLockMutex -/* 802D03D8 7F 43 D3 78 */ mr r3, r26 -/* 802D03DC 81 9A 00 00 */ lwz r12, 0(r26) -/* 802D03E0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802D03E4 7D 89 03 A6 */ mtctr r12 -/* 802D03E8 4E 80 04 21 */ bctrl -/* 802D03EC 7C 7F 1B 78 */ mr r31, r3 -/* 802D03F0 3B C0 00 00 */ li r30, 0 -/* 802D03F4 3B A0 00 00 */ li r29, 0 -/* 802D03F8 3B 80 00 00 */ li r28, 0 -/* 802D03FC 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0400 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0404 38 63 01 9D */ addi r3, r3, 0x19d -/* 802D0408 48 01 82 41 */ bl JUTReportConsole -/* 802D040C 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0410 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0414 38 63 01 D4 */ addi r3, r3, 0x1d4 -/* 802D0418 48 01 82 31 */ bl JUTReportConsole -/* 802D041C 80 1A 00 80 */ lwz r0, 0x80(r26) -/* 802D0420 28 00 00 00 */ cmplwi r0, 0 -/* 802D0424 40 82 00 14 */ bne lbl_802D0438 -/* 802D0428 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D042C 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0430 38 63 01 E3 */ addi r3, r3, 0x1e3 -/* 802D0434 48 01 82 15 */ bl JUTReportConsole -lbl_802D0438: -/* 802D0438 83 7A 00 80 */ lwz r27, 0x80(r26) -/* 802D043C 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0440 3B 23 CA F0 */ addi r25, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0444 48 00 00 8C */ b lbl_802D04D0 -lbl_802D0448: -/* 802D0448 A0 1B 00 00 */ lhz r0, 0(r27) -/* 802D044C 28 00 48 4D */ cmplwi r0, 0x484d -/* 802D0450 41 82 00 20 */ beq lbl_802D0470 -/* 802D0454 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0458 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D045C 38 63 01 EA */ addi r3, r3, 0x1ea -/* 802D0460 7F 64 DB 78 */ mr r4, r27 -/* 802D0464 4C C6 31 82 */ crclr 6 -/* 802D0468 48 01 81 61 */ bl JUTReportConsole_f -/* 802D046C 48 00 00 6C */ b lbl_802D04D8 -lbl_802D0470: -/* 802D0470 88 1B 00 02 */ lbz r0, 2(r27) -/* 802D0474 54 08 06 7E */ clrlwi r8, r0, 0x19 -/* 802D0478 38 BB 00 10 */ addi r5, r27, 0x10 -/* 802D047C 38 79 02 24 */ addi r3, r25, 0x224 -/* 802D0480 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802D0484 38 99 02 4F */ addi r4, r25, 0x24f -/* 802D0488 41 82 00 10 */ beq lbl_802D0498 -/* 802D048C 3C 80 80 3A */ lis r4, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0490 38 84 CA F0 */ addi r4, r4, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0494 38 84 02 49 */ addi r4, r4, 0x249 -lbl_802D0498: -/* 802D0498 80 DB 00 04 */ lwz r6, 4(r27) -/* 802D049C 88 FB 00 03 */ lbz r7, 3(r27) -/* 802D04A0 81 3B 00 08 */ lwz r9, 8(r27) -/* 802D04A4 81 5B 00 0C */ lwz r10, 0xc(r27) -/* 802D04A8 4C C6 31 82 */ crclr 6 -/* 802D04AC 48 01 81 1D */ bl JUTReportConsole_f -/* 802D04B0 80 7B 00 04 */ lwz r3, 4(r27) -/* 802D04B4 88 1B 00 02 */ lbz r0, 2(r27) -/* 802D04B8 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802D04BC 7C 03 02 14 */ add r0, r3, r0 -/* 802D04C0 7F C0 F2 14 */ add r30, r0, r30 -/* 802D04C4 83 7B 00 0C */ lwz r27, 0xc(r27) -/* 802D04C8 3B DE 00 10 */ addi r30, r30, 0x10 -/* 802D04CC 3B BD 00 01 */ addi r29, r29, 1 -lbl_802D04D0: -/* 802D04D0 28 1B 00 00 */ cmplwi r27, 0 -/* 802D04D4 40 82 FF 74 */ bne lbl_802D0448 -lbl_802D04D8: -/* 802D04D8 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D04DC 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D04E0 38 63 02 55 */ addi r3, r3, 0x255 -/* 802D04E4 48 01 81 65 */ bl JUTReportConsole -/* 802D04E8 80 1A 00 78 */ lwz r0, 0x78(r26) -/* 802D04EC 28 00 00 00 */ cmplwi r0, 0 -/* 802D04F0 40 82 00 14 */ bne lbl_802D0504 -/* 802D04F4 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D04F8 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D04FC 38 63 01 E3 */ addi r3, r3, 0x1e3 -/* 802D0500 48 01 81 49 */ bl JUTReportConsole -lbl_802D0504: -/* 802D0504 83 3A 00 78 */ lwz r25, 0x78(r26) -/* 802D0508 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D050C 3B 63 CA F0 */ addi r27, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0510 48 00 00 38 */ b lbl_802D0548 -lbl_802D0514: -/* 802D0514 38 7B 02 24 */ addi r3, r27, 0x224 -/* 802D0518 38 9B 02 64 */ addi r4, r27, 0x264 -/* 802D051C 38 B9 00 10 */ addi r5, r25, 0x10 -/* 802D0520 80 D9 00 04 */ lwz r6, 4(r25) -/* 802D0524 88 F9 00 03 */ lbz r7, 3(r25) -/* 802D0528 88 19 00 02 */ lbz r0, 2(r25) -/* 802D052C 54 08 06 7E */ clrlwi r8, r0, 0x19 -/* 802D0530 81 39 00 08 */ lwz r9, 8(r25) -/* 802D0534 81 59 00 0C */ lwz r10, 0xc(r25) -/* 802D0538 4C C6 31 82 */ crclr 6 -/* 802D053C 48 01 80 8D */ bl JUTReportConsole_f -/* 802D0540 83 39 00 0C */ lwz r25, 0xc(r25) -/* 802D0544 3B 9C 00 01 */ addi r28, r28, 1 -lbl_802D0548: -/* 802D0548 28 19 00 00 */ cmplwi r25, 0 -/* 802D054C 40 82 FF C8 */ bne lbl_802D0514 -/* 802D0550 80 BA 00 38 */ lwz r5, 0x38(r26) -/* 802D0554 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0558 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D055C 38 63 02 6A */ addi r3, r3, 0x26a -/* 802D0560 7F C4 F3 78 */ mr r4, r30 -/* 802D0564 C0 62 C5 98 */ lfs f3, lit_1121(r2) -/* 802D0568 C8 42 C5 A0 */ lfd f2, lit_1123(r2) -/* 802D056C 93 C1 00 0C */ stw r30, 0xc(r1) -/* 802D0570 3C 00 43 30 */ lis r0, 0x4330 -/* 802D0574 90 01 00 08 */ stw r0, 8(r1) -/* 802D0578 C8 01 00 08 */ lfd f0, 8(r1) -/* 802D057C EC 20 10 28 */ fsubs f1, f0, f2 -/* 802D0580 90 A1 00 14 */ stw r5, 0x14(r1) -/* 802D0584 90 01 00 10 */ stw r0, 0x10(r1) -/* 802D0588 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802D058C EC 00 10 28 */ fsubs f0, f0, f2 -/* 802D0590 EC 01 00 24 */ fdivs f0, f1, f0 -/* 802D0594 EC 23 00 32 */ fmuls f1, f3, f0 -/* 802D0598 7F A6 EB 78 */ mr r6, r29 -/* 802D059C 7F 87 E3 78 */ mr r7, r28 -/* 802D05A0 4C C6 32 42 */ crset 6 -/* 802D05A4 48 01 80 25 */ bl JUTReportConsole_f -/* 802D05A8 38 7A 00 18 */ addi r3, r26, 0x18 -/* 802D05AC 48 06 EB 71 */ bl OSUnlockMutex -/* 802D05B0 7F E3 FB 78 */ mr r3, r31 -/* 802D05B4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D05B8 48 09 1C 61 */ bl _restgpr_25 -/* 802D05BC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802D05C0 7C 08 03 A6 */ mtlr r0 -/* 802D05C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 802D05C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JKernel/JKRExpHeap/dump_sort__10JKRExpHeapFv.s b/asm/JSystem/JKernel/JKRExpHeap/dump_sort__10JKRExpHeapFv.s deleted file mode 100644 index 96f04d66de6..00000000000 --- a/asm/JSystem/JKernel/JKRExpHeap/dump_sort__10JKRExpHeapFv.s +++ /dev/null @@ -1,157 +0,0 @@ -lbl_802D05CC: -/* 802D05CC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802D05D0 7C 08 02 A6 */ mflr r0 -/* 802D05D4 90 01 00 44 */ stw r0, 0x44(r1) -/* 802D05D8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D05DC 48 09 1B F1 */ bl _savegpr_25 -/* 802D05E0 7C 79 1B 78 */ mr r25, r3 -/* 802D05E4 38 79 00 18 */ addi r3, r25, 0x18 -/* 802D05E8 48 06 EA 59 */ bl OSLockMutex -/* 802D05EC 7F 23 CB 78 */ mr r3, r25 -/* 802D05F0 81 99 00 00 */ lwz r12, 0(r25) -/* 802D05F4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802D05F8 7D 89 03 A6 */ mtctr r12 -/* 802D05FC 4E 80 04 21 */ bctrl -/* 802D0600 7C 7E 1B 78 */ mr r30, r3 -/* 802D0604 3B A0 00 00 */ li r29, 0 -/* 802D0608 3B 80 00 00 */ li r28, 0 -/* 802D060C 3B 60 00 00 */ li r27, 0 -/* 802D0610 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0614 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0618 38 63 01 9D */ addi r3, r3, 0x19d -/* 802D061C 48 01 80 2D */ bl JUTReportConsole -/* 802D0620 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0624 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0628 38 63 01 D4 */ addi r3, r3, 0x1d4 -/* 802D062C 48 01 80 1D */ bl JUTReportConsole -/* 802D0630 80 19 00 80 */ lwz r0, 0x80(r25) -/* 802D0634 28 00 00 00 */ cmplwi r0, 0 -/* 802D0638 40 82 00 18 */ bne lbl_802D0650 -/* 802D063C 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0640 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0644 38 63 01 E3 */ addi r3, r3, 0x1e3 -/* 802D0648 48 01 80 01 */ bl JUTReportConsole -/* 802D064C 48 00 00 D0 */ b lbl_802D071C -lbl_802D0650: -/* 802D0650 38 80 00 00 */ li r4, 0 -/* 802D0654 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0658 3B E3 CA F0 */ addi r31, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -lbl_802D065C: -/* 802D065C 3B 40 FF FF */ li r26, -1 -/* 802D0660 80 79 00 80 */ lwz r3, 0x80(r25) -/* 802D0664 48 00 00 1C */ b lbl_802D0680 -lbl_802D0668: -/* 802D0668 7C 04 18 40 */ cmplw r4, r3 -/* 802D066C 40 80 00 10 */ bge lbl_802D067C -/* 802D0670 7C 03 D0 40 */ cmplw r3, r26 -/* 802D0674 40 80 00 08 */ bge lbl_802D067C -/* 802D0678 7C 7A 1B 78 */ mr r26, r3 -lbl_802D067C: -/* 802D067C 80 63 00 0C */ lwz r3, 0xc(r3) -lbl_802D0680: -/* 802D0680 28 03 00 00 */ cmplwi r3, 0 -/* 802D0684 40 82 FF E4 */ bne lbl_802D0668 -/* 802D0688 3C 1A 00 01 */ addis r0, r26, 1 -/* 802D068C 28 00 FF FF */ cmplwi r0, 0xffff -/* 802D0690 41 82 00 8C */ beq lbl_802D071C -/* 802D0694 A0 1A 00 00 */ lhz r0, 0(r26) -/* 802D0698 28 00 48 4D */ cmplwi r0, 0x484d -/* 802D069C 41 82 00 1C */ beq lbl_802D06B8 -/* 802D06A0 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D06A4 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D06A8 38 63 01 EA */ addi r3, r3, 0x1ea -/* 802D06AC 4C C6 31 82 */ crclr 6 -/* 802D06B0 48 01 7F 19 */ bl JUTReportConsole_f -/* 802D06B4 48 00 00 68 */ b lbl_802D071C -lbl_802D06B8: -/* 802D06B8 88 1A 00 02 */ lbz r0, 2(r26) -/* 802D06BC 54 08 06 7E */ clrlwi r8, r0, 0x19 -/* 802D06C0 38 BA 00 10 */ addi r5, r26, 0x10 -/* 802D06C4 38 7F 02 24 */ addi r3, r31, 0x224 -/* 802D06C8 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802D06CC 38 9F 02 4F */ addi r4, r31, 0x24f -/* 802D06D0 41 82 00 10 */ beq lbl_802D06E0 -/* 802D06D4 3C 80 80 3A */ lis r4, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D06D8 38 84 CA F0 */ addi r4, r4, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D06DC 38 84 02 49 */ addi r4, r4, 0x249 -lbl_802D06E0: -/* 802D06E0 80 DA 00 04 */ lwz r6, 4(r26) -/* 802D06E4 88 FA 00 03 */ lbz r7, 3(r26) -/* 802D06E8 81 3A 00 08 */ lwz r9, 8(r26) -/* 802D06EC 81 5A 00 0C */ lwz r10, 0xc(r26) -/* 802D06F0 4C C6 31 82 */ crclr 6 -/* 802D06F4 48 01 7E D5 */ bl JUTReportConsole_f -/* 802D06F8 80 7A 00 04 */ lwz r3, 4(r26) -/* 802D06FC 88 1A 00 02 */ lbz r0, 2(r26) -/* 802D0700 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802D0704 7C 03 02 14 */ add r0, r3, r0 -/* 802D0708 7F A0 EA 14 */ add r29, r0, r29 -/* 802D070C 7F 44 D3 78 */ mr r4, r26 -/* 802D0710 3B BD 00 10 */ addi r29, r29, 0x10 -/* 802D0714 3B 9C 00 01 */ addi r28, r28, 1 -/* 802D0718 4B FF FF 44 */ b lbl_802D065C -lbl_802D071C: -/* 802D071C 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0720 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0724 38 63 02 55 */ addi r3, r3, 0x255 -/* 802D0728 48 01 7F 21 */ bl JUTReportConsole -/* 802D072C 80 19 00 78 */ lwz r0, 0x78(r25) -/* 802D0730 28 00 00 00 */ cmplwi r0, 0 -/* 802D0734 40 82 00 14 */ bne lbl_802D0748 -/* 802D0738 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D073C 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0740 38 63 01 E3 */ addi r3, r3, 0x1e3 -/* 802D0744 48 01 7F 05 */ bl JUTReportConsole -lbl_802D0748: -/* 802D0748 83 F9 00 78 */ lwz r31, 0x78(r25) -/* 802D074C 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D0750 3B 43 CA F0 */ addi r26, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D0754 48 00 00 38 */ b lbl_802D078C -lbl_802D0758: -/* 802D0758 38 7A 02 24 */ addi r3, r26, 0x224 -/* 802D075C 38 9A 02 64 */ addi r4, r26, 0x264 -/* 802D0760 38 BF 00 10 */ addi r5, r31, 0x10 -/* 802D0764 80 DF 00 04 */ lwz r6, 4(r31) -/* 802D0768 88 FF 00 03 */ lbz r7, 3(r31) -/* 802D076C 88 1F 00 02 */ lbz r0, 2(r31) -/* 802D0770 54 08 06 7E */ clrlwi r8, r0, 0x19 -/* 802D0774 81 3F 00 08 */ lwz r9, 8(r31) -/* 802D0778 81 5F 00 0C */ lwz r10, 0xc(r31) -/* 802D077C 4C C6 31 82 */ crclr 6 -/* 802D0780 48 01 7E 49 */ bl JUTReportConsole_f -/* 802D0784 83 FF 00 0C */ lwz r31, 0xc(r31) -/* 802D0788 3B 7B 00 01 */ addi r27, r27, 1 -lbl_802D078C: -/* 802D078C 28 1F 00 00 */ cmplwi r31, 0 -/* 802D0790 40 82 FF C8 */ bne lbl_802D0758 -/* 802D0794 80 B9 00 38 */ lwz r5, 0x38(r25) -/* 802D0798 3C 60 80 3A */ lis r3, JKRExpHeap__stringBase0@ha /* 0x8039CAF0@ha */ -/* 802D079C 38 63 CA F0 */ addi r3, r3, JKRExpHeap__stringBase0@l /* 0x8039CAF0@l */ -/* 802D07A0 38 63 02 6A */ addi r3, r3, 0x26a -/* 802D07A4 7F A4 EB 78 */ mr r4, r29 -/* 802D07A8 C0 62 C5 98 */ lfs f3, lit_1121(r2) -/* 802D07AC C8 42 C5 A0 */ lfd f2, lit_1123(r2) -/* 802D07B0 93 A1 00 0C */ stw r29, 0xc(r1) -/* 802D07B4 3C 00 43 30 */ lis r0, 0x4330 -/* 802D07B8 90 01 00 08 */ stw r0, 8(r1) -/* 802D07BC C8 01 00 08 */ lfd f0, 8(r1) -/* 802D07C0 EC 20 10 28 */ fsubs f1, f0, f2 -/* 802D07C4 90 A1 00 14 */ stw r5, 0x14(r1) -/* 802D07C8 90 01 00 10 */ stw r0, 0x10(r1) -/* 802D07CC C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802D07D0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802D07D4 EC 01 00 24 */ fdivs f0, f1, f0 -/* 802D07D8 EC 23 00 32 */ fmuls f1, f3, f0 -/* 802D07DC 7F 86 E3 78 */ mr r6, r28 -/* 802D07E0 7F 67 DB 78 */ mr r7, r27 -/* 802D07E4 4C C6 32 42 */ crset 6 -/* 802D07E8 48 01 7D E1 */ bl JUTReportConsole_f -/* 802D07EC 38 79 00 18 */ addi r3, r25, 0x18 -/* 802D07F0 48 06 E9 2D */ bl OSUnlockMutex -/* 802D07F4 7F C3 F3 78 */ mr r3, r30 -/* 802D07F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D07FC 48 09 1A 1D */ bl _restgpr_25 -/* 802D0800 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802D0804 7C 08 03 A6 */ mtlr r0 -/* 802D0808 38 21 00 40 */ addi r1, r1, 0x40 -/* 802D080C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getHangPos__13daObjSwHang_cFv.s b/asm/d/a/d_a_alink/getHangPos__13daObjSwHang_cFv.s deleted file mode 100644 index b5006e55aa4..00000000000 --- a/asm/d/a/d_a_alink/getHangPos__13daObjSwHang_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80101874: -/* 80101874 C0 04 07 70 */ lfs f0, 0x770(r4) -/* 80101878 D0 03 00 00 */ stfs f0, 0(r3) -/* 8010187C C0 04 07 74 */ lfs f0, 0x774(r4) -/* 80101880 D0 03 00 04 */ stfs f0, 4(r3) -/* 80101884 C0 04 07 78 */ lfs f0, 0x778(r4) -/* 80101888 D0 03 00 08 */ stfs f0, 8(r3) -/* 8010188C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procRoofHangTurnInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procRoofHangTurnInit__9daAlink_cFv.s deleted file mode 100644 index dd5af7d6b93..00000000000 --- a/asm/d/a/d_a_alink/procRoofHangTurnInit__9daAlink_cFv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_801013B8: -/* 801013B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801013BC 7C 08 02 A6 */ mflr r0 -/* 801013C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801013C4 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 801013C8 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 801013CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801013D0 7C 7F 1B 78 */ mr r31, r3 -/* 801013D4 38 80 00 8A */ li r4, 0x8a -/* 801013D8 4B FC 0B 95 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 801013DC A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 801013E0 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 801013E4 7C 03 00 50 */ subf r0, r3, r0 -/* 801013E8 7C 00 07 35 */ extsh. r0, r0 -/* 801013EC 40 80 00 6C */ bge lbl_80101458 -/* 801013F0 3C 60 80 39 */ lis r3, m__22daAlinkHIO_roofHang_c0@ha /* 0x8038EBFC@ha */ -/* 801013F4 38 63 EB FC */ addi r3, r3, m__22daAlinkHIO_roofHang_c0@l /* 0x8038EBFC@l */ -/* 801013F8 C0 03 00 44 */ lfs f0, 0x44(r3) -/* 801013FC FF E0 00 50 */ fneg f31, f0 -/* 80101400 38 00 00 01 */ li r0, 1 -/* 80101404 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 80101408 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 8010140C 3C 63 00 01 */ addis r3, r3, 1 -/* 80101410 38 03 80 00 */ addi r0, r3, -32768 -/* 80101414 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 80101418 7F E3 FB 78 */ mr r3, r31 -/* 8010141C 38 80 00 00 */ li r4, 0 -/* 80101420 38 A0 80 00 */ li r5, -32768 -/* 80101424 38 C0 00 00 */ li r6, 0 -/* 80101428 4B FA C7 51 */ bl setOldRootQuaternion__9daAlink_cFsss -/* 8010142C 80 7F 20 60 */ lwz r3, 0x2060(r31) -/* 80101430 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80101434 C0 02 95 B4 */ lfs f0, lit_26275(r2) -/* 80101438 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 8010143C A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 80101440 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 80101444 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80101448 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 8010144C C0 02 93 30 */ lfs f0, lit_7625(r2) -/* 80101450 D0 1F 34 7C */ stfs f0, 0x347c(r31) -/* 80101454 48 00 00 38 */ b lbl_8010148C -lbl_80101458: -/* 80101458 3C 60 80 39 */ lis r3, m__22daAlinkHIO_roofHang_c0@ha /* 0x8038EBFC@ha */ -/* 8010145C 38 63 EB FC */ addi r3, r3, m__22daAlinkHIO_roofHang_c0@l /* 0x8038EBFC@l */ -/* 80101460 C3 E3 00 44 */ lfs f31, 0x44(r3) -/* 80101464 38 00 00 00 */ li r0, 0 -/* 80101468 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 8010146C A8 7F 2F E2 */ lha r3, 0x2fe2(r31) -/* 80101470 3C 63 00 01 */ addis r3, r3, 1 -/* 80101474 38 03 80 00 */ addi r0, r3, -32768 -/* 80101478 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8010147C C0 02 93 30 */ lfs f0, lit_7625(r2) -/* 80101480 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 80101484 C0 02 95 B8 */ lfs f0, lit_26276(r2) -/* 80101488 D0 1F 34 7C */ stfs f0, 0x347c(r31) -lbl_8010148C: -/* 8010148C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80101490 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 80101494 7F E3 FB 78 */ mr r3, r31 -/* 80101498 38 80 00 AD */ li r4, 0xad -/* 8010149C FC 20 F8 90 */ fmr f1, f31 -/* 801014A0 3C A0 80 39 */ lis r5, m__22daAlinkHIO_roofHang_c0@ha /* 0x8038EBFC@ha */ -/* 801014A4 38 A5 EB FC */ addi r5, r5, m__22daAlinkHIO_roofHang_c0@l /* 0x8038EBFC@l */ -/* 801014A8 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 801014AC 4B FA BB 35 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 801014B0 A8 1F 30 08 */ lha r0, 0x3008(r31) -/* 801014B4 2C 00 00 00 */ cmpwi r0, 0 -/* 801014B8 41 82 00 14 */ beq lbl_801014CC -/* 801014BC 7F E3 FB 78 */ mr r3, r31 -/* 801014C0 38 80 00 04 */ li r4, 4 -/* 801014C4 4B FA E3 DD */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 801014C8 48 00 00 10 */ b lbl_801014D8 -lbl_801014CC: -/* 801014CC 7F E3 FB 78 */ mr r3, r31 -/* 801014D0 38 80 00 03 */ li r4, 3 -/* 801014D4 4B FA E3 CD */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -lbl_801014D8: -/* 801014D8 38 00 00 04 */ li r0, 4 -/* 801014DC 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 801014E0 7F E3 FB 78 */ mr r3, r31 -/* 801014E4 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801014E8 C0 5F 05 34 */ lfs f2, 0x534(r31) -/* 801014EC 38 80 00 00 */ li r4, 0 -/* 801014F0 4B FB A2 81 */ bl setSpecialGravity__9daAlink_cFffi -/* 801014F4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 801014F8 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 801014FC D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80101500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80101504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80101508 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8010150C 64 00 00 10 */ oris r0, r0, 0x10 -/* 80101510 90 03 5F 1C */ stw r0, 0x5f1c(r3) -/* 80101514 38 60 00 01 */ li r3, 1 -/* 80101518 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 8010151C CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80101520 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80101524 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80101528 7C 08 03 A6 */ mtlr r0 -/* 8010152C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80101530 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 78d1ee83aed..00000000000 --- a/asm/d/a/d_a_alink/procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_801016AC: -/* 801016AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801016B0 7C 08 02 A6 */ mflr r0 -/* 801016B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801016B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801016BC 93 C1 00 08 */ stw r30, 8(r1) -/* 801016C0 7C 7E 1B 78 */ mr r30, r3 -/* 801016C4 7C 9F 23 78 */ mr r31, r4 -/* 801016C8 38 80 00 8B */ li r4, 0x8b -/* 801016CC 4B FC 08 A1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 801016D0 7F C3 F3 78 */ mr r3, r30 -/* 801016D4 38 80 00 01 */ li r4, 1 -/* 801016D8 38 A0 00 00 */ li r5, 0 -/* 801016DC 4B FB FC 01 */ bl deleteEquipItem__9daAlink_cFii -/* 801016E0 7F C3 F3 78 */ mr r3, r30 -/* 801016E4 38 80 00 AE */ li r4, 0xae -/* 801016E8 3C A0 80 39 */ lis r5, m__22daAlinkHIO_roofHang_c0@ha /* 0x8038EBFC@ha */ -/* 801016EC 38 A5 EB FC */ addi r5, r5, m__22daAlinkHIO_roofHang_c0@l /* 0x8038EBFC@l */ -/* 801016F0 4B FA BA 05 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 801016F4 7F C3 F3 78 */ mr r3, r30 -/* 801016F8 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801016FC C0 5E 05 34 */ lfs f2, 0x534(r30) -/* 80101700 38 80 00 00 */ li r4, 0 -/* 80101704 4B FB A0 6D */ bl setSpecialGravity__9daAlink_cFffi -/* 80101708 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8010170C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80101710 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 80101714 38 7E 28 0C */ addi r3, r30, 0x280c -/* 80101718 7F E4 FB 78 */ mr r4, r31 -/* 8010171C 48 05 D5 9D */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 80101720 7F C3 F3 78 */ mr r3, r30 -/* 80101724 4B FF FF 19 */ bl setRoofHangSwitch__9daAlink_cFv -/* 80101728 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 8010172C A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80101730 48 16 F6 F5 */ bl cLib_distanceAngleS__Fss -/* 80101734 2C 03 40 00 */ cmpwi r3, 0x4000 -/* 80101738 40 81 00 18 */ ble lbl_80101750 -/* 8010173C A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 80101740 3C 63 00 01 */ addis r3, r3, 1 -/* 80101744 38 03 80 00 */ addi r0, r3, -32768 -/* 80101748 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 8010174C 48 00 00 0C */ b lbl_80101758 -lbl_80101750: -/* 80101750 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80101754 B0 1E 04 DE */ sth r0, 0x4de(r30) -lbl_80101758: -/* 80101758 7F C3 F3 78 */ mr r3, r30 -/* 8010175C 38 80 00 00 */ li r4, 0 -/* 80101760 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 80101764 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80101768 7C 05 00 50 */ subf r0, r5, r0 -/* 8010176C 7C 05 07 34 */ extsh r5, r0 -/* 80101770 38 C0 00 00 */ li r6, 0 -/* 80101774 4B FA C4 05 */ bl setOldRootQuaternion__9daAlink_cFsss -/* 80101778 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 8010177C B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 80101780 38 00 00 50 */ li r0, 0x50 -/* 80101784 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 80101788 38 00 00 00 */ li r0, 0 -/* 8010178C B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 80101790 38 60 00 01 */ li r3, 1 -/* 80101794 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80101798 83 C1 00 08 */ lwz r30, 8(r1) -/* 8010179C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801017A0 7C 08 03 A6 */ mtlr r0 -/* 801017A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801017A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setOctaIealHangPos__9daAlink_cFv.s b/asm/d/a/d_a_alink/setOctaIealHangPos__9daAlink_cFv.s deleted file mode 100644 index 8dfb2566ea7..00000000000 --- a/asm/d/a/d_a_alink/setOctaIealHangPos__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800FC6B4: -/* 800FC6B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800FC6B8 7C 08 02 A6 */ mflr r0 -/* 800FC6BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800FC6C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800FC6C4 7C 7F 1B 78 */ mr r31, r3 -/* 800FC6C8 80 63 28 10 */ lwz r3, 0x2810(r3) -/* 800FC6CC 28 03 00 00 */ cmplwi r3, 0 -/* 800FC6D0 40 82 00 0C */ bne lbl_800FC6DC -/* 800FC6D4 38 60 00 00 */ li r3, 0 -/* 800FC6D8 48 00 00 5C */ b lbl_800FC734 -lbl_800FC6DC: -/* 800FC6DC 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 800FC6E0 80 63 00 04 */ lwz r3, 4(r3) -/* 800FC6E4 80 63 00 84 */ lwz r3, 0x84(r3) -/* 800FC6E8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800FC6EC 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800FC6F0 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800FC6F4 48 24 9D BD */ bl PSMTXCopy -/* 800FC6F8 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800FC6FC C0 42 95 5C */ lfs f2, lit_24400(r2) -/* 800FC700 C0 62 95 60 */ lfs f3, lit_24401(r2) -/* 800FC704 4B F1 06 99 */ bl transM__14mDoMtx_stack_cFfff -/* 800FC708 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800FC70C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800FC710 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 800FC714 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 800FC718 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 800FC71C D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 800FC720 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800FC724 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 800FC728 38 9F 04 E4 */ addi r4, r31, 0x4e4 -/* 800FC72C 4B F1 04 D5 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz -/* 800FC730 38 60 00 01 */ li r3, 1 -lbl_800FC734: -/* 800FC734 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800FC738 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800FC73C 7C 08 03 A6 */ mtlr r0 -/* 800FC740 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FC744 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setRoofHangSwitch__9daAlink_cFv.s b/asm/d/a/d_a_alink/setRoofHangSwitch__9daAlink_cFv.s deleted file mode 100644 index bcbb0ff1d60..00000000000 --- a/asm/d/a/d_a_alink/setRoofHangSwitch__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8010163C: -/* 8010163C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80101640 7C 08 02 A6 */ mflr r0 -/* 80101644 90 01 00 24 */ stw r0, 0x24(r1) -/* 80101648 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8010164C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80101650 7C 7E 1B 78 */ mr r30, r3 -/* 80101654 83 E3 28 10 */ lwz r31, 0x2810(r3) -/* 80101658 38 61 00 08 */ addi r3, r1, 8 -/* 8010165C 7F E4 FB 78 */ mr r4, r31 -/* 80101660 48 00 02 15 */ bl getHangPos__13daObjSwHang_cFv -/* 80101664 C0 01 00 08 */ lfs f0, 8(r1) -/* 80101668 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 8010166C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80101670 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80101674 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80101678 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 8010167C C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80101680 C0 02 95 A4 */ lfs f0, lit_25916(r2) -/* 80101684 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80101688 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 8010168C 38 00 00 01 */ li r0, 1 -/* 80101690 98 1F 07 7C */ stb r0, 0x77c(r31) -/* 80101694 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80101698 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8010169C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801016A0 7C 08 03 A6 */ mtlr r0 -/* 801016A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801016A8 4E 80 00 20 */ blr