diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor.s deleted file mode 100644 index e9d241e4a15..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_803084CC: -/* 803084CC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 803084D0 7C 08 02 A6 */ mflr r0 -/* 803084D4 90 01 00 44 */ stw r0, 0x44(r1) -/* 803084D8 39 61 00 40 */ addi r11, r1, 0x40 -/* 803084DC 48 05 9C F1 */ bl _savegpr_25 -/* 803084E0 7C 7D 1B 78 */ mr r29, r3 -/* 803084E4 7C 9E 23 78 */ mr r30, r4 -/* 803084E8 7C BF 2B 78 */ mr r31, r5 -/* 803084EC 80 63 01 38 */ lwz r3, 0x138(r3) -/* 803084F0 28 03 00 00 */ cmplwi r3, 0 -/* 803084F4 40 82 00 0C */ bne lbl_80308500 -/* 803084F8 38 60 00 00 */ li r3, 0 -/* 803084FC 48 00 01 54 */ b lbl_80308650 -lbl_80308500: -/* 80308500 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80308504 28 03 00 00 */ cmplwi r3, 0 -/* 80308508 40 82 00 0C */ bne lbl_80308514 -/* 8030850C 38 60 00 00 */ li r3, 0 -/* 80308510 48 00 01 40 */ b lbl_80308650 -lbl_80308514: -/* 80308514 81 83 00 00 */ lwz r12, 0(r3) -/* 80308518 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 8030851C 7D 89 03 A6 */ mtctr r12 -/* 80308520 4E 80 04 21 */ bctrl -/* 80308524 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80308528 20 60 00 01 */ subfic r3, r0, 1 -/* 8030852C 30 03 FF FF */ addic r0, r3, -1 -/* 80308530 7C 60 19 10 */ subfe r3, r0, r3 -/* 80308534 38 00 00 00 */ li r0, 0 -/* 80308538 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030853C 88 01 00 14 */ lbz r0, 0x14(r1) -/* 80308540 98 1E 00 00 */ stb r0, 0(r30) -/* 80308544 88 01 00 15 */ lbz r0, 0x15(r1) -/* 80308548 98 1E 00 01 */ stb r0, 1(r30) -/* 8030854C 88 01 00 16 */ lbz r0, 0x16(r1) -/* 80308550 98 1E 00 02 */ stb r0, 2(r30) -/* 80308554 88 01 00 17 */ lbz r0, 0x17(r1) -/* 80308558 98 1E 00 03 */ stb r0, 3(r30) -/* 8030855C 38 00 FF FF */ li r0, -1 -/* 80308560 90 01 00 10 */ stw r0, 0x10(r1) -/* 80308564 88 01 00 10 */ lbz r0, 0x10(r1) -/* 80308568 98 1F 00 00 */ stb r0, 0(r31) -/* 8030856C 88 01 00 11 */ lbz r0, 0x11(r1) -/* 80308570 98 1F 00 01 */ stb r0, 1(r31) -/* 80308574 88 01 00 12 */ lbz r0, 0x12(r1) -/* 80308578 98 1F 00 02 */ stb r0, 2(r31) -/* 8030857C 88 01 00 13 */ lbz r0, 0x13(r1) -/* 80308580 98 1F 00 03 */ stb r0, 3(r31) -/* 80308584 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80308588 41 82 00 C4 */ beq lbl_8030864C -/* 8030858C 80 7D 01 38 */ lwz r3, 0x138(r29) -/* 80308590 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80308594 38 80 00 00 */ li r4, 0 -/* 80308598 81 83 00 00 */ lwz r12, 0(r3) -/* 8030859C 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 803085A0 7D 89 03 A6 */ mtctr r12 -/* 803085A4 4E 80 04 21 */ bctrl -/* 803085A8 AB 83 00 00 */ lha r28, 0(r3) -/* 803085AC AB 63 00 02 */ lha r27, 2(r3) -/* 803085B0 AB 43 00 04 */ lha r26, 4(r3) -/* 803085B4 AB 23 00 06 */ lha r25, 6(r3) -/* 803085B8 80 7D 01 38 */ lwz r3, 0x138(r29) -/* 803085BC 80 63 00 70 */ lwz r3, 0x70(r3) -/* 803085C0 38 80 00 01 */ li r4, 1 -/* 803085C4 81 83 00 00 */ lwz r12, 0(r3) -/* 803085C8 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 803085CC 7D 89 03 A6 */ mtctr r12 -/* 803085D0 4E 80 04 21 */ bctrl -/* 803085D4 A8 83 00 00 */ lha r4, 0(r3) -/* 803085D8 A8 A3 00 02 */ lha r5, 2(r3) -/* 803085DC A8 C3 00 04 */ lha r6, 4(r3) -/* 803085E0 A8 63 00 06 */ lha r3, 6(r3) -/* 803085E4 57 60 82 1E */ rlwinm r0, r27, 0x10, 8, 0xf -/* 803085E8 53 80 C0 0E */ rlwimi r0, r28, 0x18, 0, 7 -/* 803085EC 53 40 44 2E */ rlwimi r0, r26, 8, 0x10, 0x17 -/* 803085F0 53 20 06 3E */ rlwimi r0, r25, 0, 0x18, 0x1f -/* 803085F4 90 01 00 0C */ stw r0, 0xc(r1) -/* 803085F8 88 01 00 0C */ lbz r0, 0xc(r1) -/* 803085FC 98 1E 00 00 */ stb r0, 0(r30) -/* 80308600 88 01 00 0D */ lbz r0, 0xd(r1) -/* 80308604 98 1E 00 01 */ stb r0, 1(r30) -/* 80308608 88 01 00 0E */ lbz r0, 0xe(r1) -/* 8030860C 98 1E 00 02 */ stb r0, 2(r30) -/* 80308610 88 01 00 0F */ lbz r0, 0xf(r1) -/* 80308614 98 1E 00 03 */ stb r0, 3(r30) -/* 80308618 54 A0 82 1E */ rlwinm r0, r5, 0x10, 8, 0xf -/* 8030861C 50 80 C0 0E */ rlwimi r0, r4, 0x18, 0, 7 -/* 80308620 50 C0 44 2E */ rlwimi r0, r6, 8, 0x10, 0x17 -/* 80308624 50 60 06 3E */ rlwimi r0, r3, 0, 0x18, 0x1f -/* 80308628 90 01 00 08 */ stw r0, 8(r1) -/* 8030862C 88 01 00 08 */ lbz r0, 8(r1) -/* 80308630 98 1F 00 00 */ stb r0, 0(r31) -/* 80308634 88 01 00 09 */ lbz r0, 9(r1) -/* 80308638 98 1F 00 01 */ stb r0, 1(r31) -/* 8030863C 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80308640 98 1F 00 02 */ stb r0, 2(r31) -/* 80308644 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80308648 98 1F 00 03 */ stb r0, 3(r31) -lbl_8030864C: -/* 8030864C 38 60 00 01 */ li r3, 1 -lbl_80308650: -/* 80308650 39 61 00 40 */ addi r11, r1, 0x40 -/* 80308654 48 05 9B C5 */ bl _restgpr_25 -/* 80308658 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8030865C 7C 08 03 A6 */ mtlr r0 -/* 80308660 38 21 00 40 */ addi r1, r1, 0x40 -/* 80308664 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/__ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial.s b/asm/JSystem/J2DGraph/J2DWindow/__ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial.s deleted file mode 100644 index 043587ded32..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/__ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial.s +++ /dev/null @@ -1,331 +0,0 @@ -lbl_802F9C10: -/* 802F9C10 94 21 FF 20 */ stwu r1, -0xe0(r1) -/* 802F9C14 7C 08 02 A6 */ mflr r0 -/* 802F9C18 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 802F9C1C 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 802F9C20 48 06 85 B1 */ bl _savegpr_26 -/* 802F9C24 7C 7B 1B 78 */ mr r27, r3 -/* 802F9C28 7C 9A 23 78 */ mr r26, r4 -/* 802F9C2C 7C BC 2B 78 */ mr r28, r5 -/* 802F9C30 7C DD 33 78 */ mr r29, r6 -/* 802F9C34 4B FF BF C5 */ bl __ct__7J2DPaneFv -/* 802F9C38 3C 60 80 3D */ lis r3, __vt__9J2DWindow@ha /* 0x803CD108@ha */ -/* 802F9C3C 38 03 D1 08 */ addi r0, r3, __vt__9J2DWindow@l /* 0x803CD108@l */ -/* 802F9C40 90 1B 00 00 */ stw r0, 0(r27) -/* 802F9C44 38 00 00 00 */ li r0, 0 -/* 802F9C48 90 1B 01 00 */ stw r0, 0x100(r27) -/* 802F9C4C 90 1B 01 04 */ stw r0, 0x104(r27) -/* 802F9C50 90 1B 01 08 */ stw r0, 0x108(r27) -/* 802F9C54 90 1B 01 0C */ stw r0, 0x10c(r27) -/* 802F9C58 90 1B 01 10 */ stw r0, 0x110(r27) -/* 802F9C5C 90 1B 01 24 */ stw r0, 0x124(r27) -/* 802F9C60 38 00 FF FF */ li r0, -1 -/* 802F9C64 90 1B 01 28 */ stw r0, 0x128(r27) -/* 802F9C68 90 1B 01 2C */ stw r0, 0x12c(r27) -/* 802F9C6C 90 1B 01 30 */ stw r0, 0x130(r27) -/* 802F9C70 90 1B 01 34 */ stw r0, 0x134(r27) -/* 802F9C74 90 1B 01 38 */ stw r0, 0x138(r27) -/* 802F9C78 90 1B 01 3C */ stw r0, 0x13c(r27) -/* 802F9C7C 7F 83 E3 78 */ mr r3, r28 -/* 802F9C80 81 9C 00 00 */ lwz r12, 0(r28) -/* 802F9C84 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F9C88 7D 89 03 A6 */ mtctr r12 -/* 802F9C8C 4E 80 04 21 */ bctrl -/* 802F9C90 7C 7F 1B 78 */ mr r31, r3 -/* 802F9C94 7F 83 E3 78 */ mr r3, r28 -/* 802F9C98 38 81 00 2C */ addi r4, r1, 0x2c -/* 802F9C9C 38 A0 00 08 */ li r5, 8 -/* 802F9CA0 4B FE 25 F9 */ bl read__14JSUInputStreamFPvl -/* 802F9CA4 3C 60 57 49 */ lis r3, 0x5749 /* 0x57494E31@ha */ -/* 802F9CA8 38 03 4E 31 */ addi r0, r3, 0x4E31 /* 0x57494E31@l */ -/* 802F9CAC 90 1B 00 08 */ stw r0, 8(r27) -/* 802F9CB0 7F 83 E3 78 */ mr r3, r28 -/* 802F9CB4 81 9C 00 00 */ lwz r12, 0(r28) -/* 802F9CB8 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F9CBC 7D 89 03 A6 */ mtctr r12 -/* 802F9CC0 4E 80 04 21 */ bctrl -/* 802F9CC4 7C 7E 1B 78 */ mr r30, r3 -/* 802F9CC8 7F 83 E3 78 */ mr r3, r28 -/* 802F9CCC 38 81 00 24 */ addi r4, r1, 0x24 -/* 802F9CD0 38 A0 00 08 */ li r5, 8 -/* 802F9CD4 4B FE 27 85 */ bl peek__20JSURandomInputStreamFPvl -/* 802F9CD8 7F 63 DB 78 */ mr r3, r27 -/* 802F9CDC 7F 44 D3 78 */ mr r4, r26 -/* 802F9CE0 7F 85 E3 78 */ mr r5, r28 -/* 802F9CE4 4B FF DE 35 */ bl makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream -/* 802F9CE8 7F 83 E3 78 */ mr r3, r28 -/* 802F9CEC 80 01 00 28 */ lwz r0, 0x28(r1) -/* 802F9CF0 7C 9E 02 14 */ add r4, r30, r0 -/* 802F9CF4 38 A0 00 00 */ li r5, 0 -/* 802F9CF8 4B FE 27 E5 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F9CFC 7F 83 E3 78 */ mr r3, r28 -/* 802F9D00 38 81 00 64 */ addi r4, r1, 0x64 -/* 802F9D04 38 A0 00 40 */ li r5, 0x40 -/* 802F9D08 4B FE 25 91 */ bl read__14JSUInputStreamFPvl -/* 802F9D0C 3C 60 80 3A */ lis r3, lit_1831@ha /* 0x803A1C10@ha */ -/* 802F9D10 38 83 1C 10 */ addi r4, r3, lit_1831@l /* 0x803A1C10@l */ -/* 802F9D14 80 64 00 00 */ lwz r3, 0(r4) -/* 802F9D18 80 04 00 04 */ lwz r0, 4(r4) -/* 802F9D1C 90 61 00 54 */ stw r3, 0x54(r1) -/* 802F9D20 90 01 00 58 */ stw r0, 0x58(r1) -/* 802F9D24 80 64 00 08 */ lwz r3, 8(r4) -/* 802F9D28 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802F9D2C 90 61 00 5C */ stw r3, 0x5c(r1) -/* 802F9D30 90 01 00 60 */ stw r0, 0x60(r1) -/* 802F9D34 38 1B 01 28 */ addi r0, r27, 0x128 -/* 802F9D38 90 01 00 54 */ stw r0, 0x54(r1) -/* 802F9D3C 38 1B 01 2C */ addi r0, r27, 0x12c -/* 802F9D40 90 01 00 58 */ stw r0, 0x58(r1) -/* 802F9D44 38 1B 01 30 */ addi r0, r27, 0x130 -/* 802F9D48 90 01 00 5C */ stw r0, 0x5c(r1) -/* 802F9D4C 38 1B 01 34 */ addi r0, r27, 0x134 -/* 802F9D50 90 01 00 60 */ stw r0, 0x60(r1) -/* 802F9D54 38 60 00 00 */ li r3, 0 -/* 802F9D58 38 80 00 00 */ li r4, 0 -/* 802F9D5C 38 C1 00 64 */ addi r6, r1, 0x64 -/* 802F9D60 39 01 00 1C */ addi r8, r1, 0x1c -/* 802F9D64 39 21 00 44 */ addi r9, r1, 0x44 -/* 802F9D68 38 A1 00 54 */ addi r5, r1, 0x54 -/* 802F9D6C 38 00 00 04 */ li r0, 4 -/* 802F9D70 7C 09 03 A6 */ mtctr r0 -lbl_802F9D74: -/* 802F9D74 38 04 00 10 */ addi r0, r4, 0x10 -/* 802F9D78 7C 06 02 2E */ lhzx r0, r6, r0 -/* 802F9D7C 7C 08 23 2E */ sthx r0, r8, r4 -/* 802F9D80 38 00 00 00 */ li r0, 0 -/* 802F9D84 7C 09 19 2E */ stwx r0, r9, r3 -/* 802F9D88 7C 08 22 2E */ lhzx r0, r8, r4 -/* 802F9D8C 28 00 FF FF */ cmplwi r0, 0xffff -/* 802F9D90 41 82 00 10 */ beq lbl_802F9DA0 -/* 802F9D94 1C 00 00 88 */ mulli r0, r0, 0x88 -/* 802F9D98 7C 1D 02 14 */ add r0, r29, r0 -/* 802F9D9C 7C 09 19 2E */ stwx r0, r9, r3 -lbl_802F9DA0: -/* 802F9DA0 38 03 00 30 */ addi r0, r3, 0x30 -/* 802F9DA4 7C 06 00 2E */ lwzx r0, r6, r0 -/* 802F9DA8 90 01 00 18 */ stw r0, 0x18(r1) -/* 802F9DAC 7C E5 18 2E */ lwzx r7, r5, r3 -/* 802F9DB0 88 01 00 18 */ lbz r0, 0x18(r1) -/* 802F9DB4 98 07 00 00 */ stb r0, 0(r7) -/* 802F9DB8 88 01 00 19 */ lbz r0, 0x19(r1) -/* 802F9DBC 98 07 00 01 */ stb r0, 1(r7) -/* 802F9DC0 88 01 00 1A */ lbz r0, 0x1a(r1) -/* 802F9DC4 98 07 00 02 */ stb r0, 2(r7) -/* 802F9DC8 88 01 00 1B */ lbz r0, 0x1b(r1) -/* 802F9DCC 98 07 00 03 */ stb r0, 3(r7) -/* 802F9DD0 38 63 00 04 */ addi r3, r3, 4 -/* 802F9DD4 38 84 00 02 */ addi r4, r4, 2 -/* 802F9DD8 42 00 FF 9C */ bdnz lbl_802F9D74 -/* 802F9DDC 88 01 00 7C */ lbz r0, 0x7c(r1) -/* 802F9DE0 98 1B 01 44 */ stb r0, 0x144(r27) -/* 802F9DE4 A0 81 00 80 */ lhz r4, 0x80(r1) -/* 802F9DE8 A0 01 00 84 */ lhz r0, 0x84(r1) -/* 802F9DEC 7C 04 02 14 */ add r0, r4, r0 -/* 802F9DF0 C8 22 C8 40 */ lfd f1, lit_1971(r2) -/* 802F9DF4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F9DF8 90 01 00 AC */ stw r0, 0xac(r1) -/* 802F9DFC 3C 60 43 30 */ lis r3, 0x4330 -/* 802F9E00 90 61 00 A8 */ stw r3, 0xa8(r1) -/* 802F9E04 C8 01 00 A8 */ lfd f0, 0xa8(r1) -/* 802F9E08 EC 80 08 28 */ fsubs f4, f0, f1 -/* 802F9E0C A0 A1 00 7E */ lhz r5, 0x7e(r1) -/* 802F9E10 A0 01 00 82 */ lhz r0, 0x82(r1) -/* 802F9E14 7C 05 02 14 */ add r0, r5, r0 -/* 802F9E18 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F9E1C 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 802F9E20 90 61 00 B0 */ stw r3, 0xb0(r1) -/* 802F9E24 C8 01 00 B0 */ lfd f0, 0xb0(r1) -/* 802F9E28 EC 60 08 28 */ fsubs f3, f0, f1 -/* 802F9E2C C8 22 C8 48 */ lfd f1, lit_1974(r2) -/* 802F9E30 90 81 00 BC */ stw r4, 0xbc(r1) -/* 802F9E34 90 61 00 B8 */ stw r3, 0xb8(r1) -/* 802F9E38 C8 01 00 B8 */ lfd f0, 0xb8(r1) -/* 802F9E3C EC 40 08 28 */ fsubs f2, f0, f1 -/* 802F9E40 90 A1 00 C4 */ stw r5, 0xc4(r1) -/* 802F9E44 90 61 00 C0 */ stw r3, 0xc0(r1) -/* 802F9E48 C8 01 00 C0 */ lfd f0, 0xc0(r1) -/* 802F9E4C EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F9E50 D0 1B 01 14 */ stfs f0, 0x114(r27) -/* 802F9E54 D0 5B 01 18 */ stfs f2, 0x118(r27) -/* 802F9E58 D0 7B 01 1C */ stfs f3, 0x11c(r27) -/* 802F9E5C D0 9B 01 20 */ stfs f4, 0x120(r27) -/* 802F9E60 A0 01 00 88 */ lhz r0, 0x88(r1) -/* 802F9E64 3B C0 00 00 */ li r30, 0 -/* 802F9E68 28 00 FF FF */ cmplwi r0, 0xffff -/* 802F9E6C 41 82 00 0C */ beq lbl_802F9E78 -/* 802F9E70 1C 00 00 88 */ mulli r0, r0, 0x88 -/* 802F9E74 7F DD 02 14 */ add r30, r29, r0 -lbl_802F9E78: -/* 802F9E78 7F 83 E3 78 */ mr r3, r28 -/* 802F9E7C 80 01 00 30 */ lwz r0, 0x30(r1) -/* 802F9E80 7C 9F 02 14 */ add r4, r31, r0 -/* 802F9E84 38 A0 00 00 */ li r5, 0 -/* 802F9E88 4B FE 26 55 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F9E8C 80 61 00 44 */ lwz r3, 0x44(r1) -/* 802F9E90 28 03 00 00 */ cmplwi r3, 0 -/* 802F9E94 41 82 00 0C */ beq lbl_802F9EA0 -/* 802F9E98 88 03 00 13 */ lbz r0, 0x13(r3) -/* 802F9E9C 98 1B 00 B2 */ stb r0, 0xb2(r27) -lbl_802F9EA0: -/* 802F9EA0 38 00 00 00 */ li r0, 0 -/* 802F9EA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F9EA8 88 01 00 14 */ lbz r0, 0x14(r1) -/* 802F9EAC 98 1B 01 3C */ stb r0, 0x13c(r27) -/* 802F9EB0 88 01 00 15 */ lbz r0, 0x15(r1) -/* 802F9EB4 98 1B 01 3D */ stb r0, 0x13d(r27) -/* 802F9EB8 88 01 00 16 */ lbz r0, 0x16(r1) -/* 802F9EBC 98 1B 01 3E */ stb r0, 0x13e(r27) -/* 802F9EC0 88 01 00 17 */ lbz r0, 0x17(r1) -/* 802F9EC4 98 1B 01 3F */ stb r0, 0x13f(r27) -/* 802F9EC8 38 00 FF FF */ li r0, -1 -/* 802F9ECC 90 01 00 10 */ stw r0, 0x10(r1) -/* 802F9ED0 88 01 00 10 */ lbz r0, 0x10(r1) -/* 802F9ED4 98 1B 01 38 */ stb r0, 0x138(r27) -/* 802F9ED8 88 01 00 11 */ lbz r0, 0x11(r1) -/* 802F9EDC 98 1B 01 39 */ stb r0, 0x139(r27) -/* 802F9EE0 88 01 00 12 */ lbz r0, 0x12(r1) -/* 802F9EE4 98 1B 01 3A */ stb r0, 0x13a(r27) -/* 802F9EE8 88 01 00 13 */ lbz r0, 0x13(r1) -/* 802F9EEC 98 1B 01 3B */ stb r0, 0x13b(r27) -/* 802F9EF0 80 61 00 44 */ lwz r3, 0x44(r1) -/* 802F9EF4 28 03 00 00 */ cmplwi r3, 0 -/* 802F9EF8 41 82 00 EC */ beq lbl_802F9FE4 -/* 802F9EFC 80 63 00 70 */ lwz r3, 0x70(r3) -/* 802F9F00 28 03 00 00 */ cmplwi r3, 0 -/* 802F9F04 41 82 00 E0 */ beq lbl_802F9FE4 -/* 802F9F08 81 83 00 00 */ lwz r12, 0(r3) -/* 802F9F0C 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 802F9F10 7D 89 03 A6 */ mtctr r12 -/* 802F9F14 4E 80 04 21 */ bctrl -/* 802F9F18 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802F9F1C 28 00 00 01 */ cmplwi r0, 1 -/* 802F9F20 41 82 00 C4 */ beq lbl_802F9FE4 -/* 802F9F24 80 61 00 44 */ lwz r3, 0x44(r1) -/* 802F9F28 80 63 00 70 */ lwz r3, 0x70(r3) -/* 802F9F2C 38 80 00 00 */ li r4, 0 -/* 802F9F30 81 83 00 00 */ lwz r12, 0(r3) -/* 802F9F34 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 802F9F38 7D 89 03 A6 */ mtctr r12 -/* 802F9F3C 4E 80 04 21 */ bctrl -/* 802F9F40 AB 83 00 00 */ lha r28, 0(r3) -/* 802F9F44 AB A3 00 02 */ lha r29, 2(r3) -/* 802F9F48 AB E3 00 04 */ lha r31, 4(r3) -/* 802F9F4C AB 43 00 06 */ lha r26, 6(r3) -/* 802F9F50 80 61 00 44 */ lwz r3, 0x44(r1) -/* 802F9F54 80 63 00 70 */ lwz r3, 0x70(r3) -/* 802F9F58 38 80 00 01 */ li r4, 1 -/* 802F9F5C 81 83 00 00 */ lwz r12, 0(r3) -/* 802F9F60 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 802F9F64 7D 89 03 A6 */ mtctr r12 -/* 802F9F68 4E 80 04 21 */ bctrl -/* 802F9F6C A8 83 00 00 */ lha r4, 0(r3) -/* 802F9F70 A8 A3 00 02 */ lha r5, 2(r3) -/* 802F9F74 A8 C3 00 04 */ lha r6, 4(r3) -/* 802F9F78 A8 63 00 06 */ lha r3, 6(r3) -/* 802F9F7C 57 A0 82 1E */ rlwinm r0, r29, 0x10, 8, 0xf -/* 802F9F80 53 80 C0 0E */ rlwimi r0, r28, 0x18, 0, 7 -/* 802F9F84 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 -/* 802F9F88 53 40 06 3E */ rlwimi r0, r26, 0, 0x18, 0x1f -/* 802F9F8C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802F9F90 88 01 00 0C */ lbz r0, 0xc(r1) -/* 802F9F94 98 1B 01 3C */ stb r0, 0x13c(r27) -/* 802F9F98 88 01 00 0D */ lbz r0, 0xd(r1) -/* 802F9F9C 98 1B 01 3D */ stb r0, 0x13d(r27) -/* 802F9FA0 88 01 00 0E */ lbz r0, 0xe(r1) -/* 802F9FA4 98 1B 01 3E */ stb r0, 0x13e(r27) -/* 802F9FA8 88 01 00 0F */ lbz r0, 0xf(r1) -/* 802F9FAC 98 1B 01 3F */ stb r0, 0x13f(r27) -/* 802F9FB0 54 A0 82 1E */ rlwinm r0, r5, 0x10, 8, 0xf -/* 802F9FB4 50 80 C0 0E */ rlwimi r0, r4, 0x18, 0, 7 -/* 802F9FB8 50 C0 44 2E */ rlwimi r0, r6, 8, 0x10, 0x17 -/* 802F9FBC 50 60 06 3E */ rlwimi r0, r3, 0, 0x18, 0x1f -/* 802F9FC0 90 01 00 08 */ stw r0, 8(r1) -/* 802F9FC4 88 01 00 08 */ lbz r0, 8(r1) -/* 802F9FC8 98 1B 01 38 */ stb r0, 0x138(r27) -/* 802F9FCC 88 01 00 09 */ lbz r0, 9(r1) -/* 802F9FD0 98 1B 01 39 */ stb r0, 0x139(r27) -/* 802F9FD4 88 01 00 0A */ lbz r0, 0xa(r1) -/* 802F9FD8 98 1B 01 3A */ stb r0, 0x13a(r27) -/* 802F9FDC 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802F9FE0 98 1B 01 3B */ stb r0, 0x13b(r27) -lbl_802F9FE4: -/* 802F9FE4 3C 60 80 3A */ lis r3, lit_1849@ha /* 0x803A1C20@ha */ -/* 802F9FE8 38 83 1C 20 */ addi r4, r3, lit_1849@l /* 0x803A1C20@l */ -/* 802F9FEC 80 64 00 00 */ lwz r3, 0(r4) -/* 802F9FF0 80 04 00 04 */ lwz r0, 4(r4) -/* 802F9FF4 90 61 00 34 */ stw r3, 0x34(r1) -/* 802F9FF8 90 01 00 38 */ stw r0, 0x38(r1) -/* 802F9FFC 80 64 00 08 */ lwz r3, 8(r4) -/* 802FA000 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802FA004 90 61 00 3C */ stw r3, 0x3c(r1) -/* 802FA008 90 01 00 40 */ stw r0, 0x40(r1) -/* 802FA00C 38 1B 01 00 */ addi r0, r27, 0x100 -/* 802FA010 90 01 00 34 */ stw r0, 0x34(r1) -/* 802FA014 38 1B 01 04 */ addi r0, r27, 0x104 -/* 802FA018 90 01 00 38 */ stw r0, 0x38(r1) -/* 802FA01C 38 1B 01 08 */ addi r0, r27, 0x108 -/* 802FA020 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802FA024 38 1B 01 0C */ addi r0, r27, 0x10c -/* 802FA028 90 01 00 40 */ stw r0, 0x40(r1) -/* 802FA02C 3B E0 00 00 */ li r31, 0 -/* 802FA030 3B 80 00 00 */ li r28, 0 -/* 802FA034 3B A1 00 44 */ addi r29, r1, 0x44 -lbl_802FA038: -/* 802FA038 7F 5D E0 2E */ lwzx r26, r29, r28 -/* 802FA03C 28 1A 00 00 */ cmplwi r26, 0 -/* 802FA040 41 82 00 50 */ beq lbl_802FA090 -/* 802FA044 80 7A 00 70 */ lwz r3, 0x70(r26) -/* 802FA048 28 03 00 00 */ cmplwi r3, 0 -/* 802FA04C 41 82 00 44 */ beq lbl_802FA090 -/* 802FA050 38 80 00 00 */ li r4, 0 -/* 802FA054 81 83 00 00 */ lwz r12, 0(r3) -/* 802FA058 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 802FA05C 7D 89 03 A6 */ mtctr r12 -/* 802FA060 4E 80 04 21 */ bctrl -/* 802FA064 28 03 00 00 */ cmplwi r3, 0 -/* 802FA068 41 82 00 28 */ beq lbl_802FA090 -/* 802FA06C 38 81 00 34 */ addi r4, r1, 0x34 -/* 802FA070 7C 84 E0 2E */ lwzx r4, r4, r28 -/* 802FA074 90 64 00 00 */ stw r3, 0(r4) -/* 802FA078 80 7A 00 70 */ lwz r3, 0x70(r26) -/* 802FA07C 38 80 00 FE */ li r4, 0xfe -/* 802FA080 81 83 00 00 */ lwz r12, 0(r3) -/* 802FA084 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 802FA088 7D 89 03 A6 */ mtctr r12 -/* 802FA08C 4E 80 04 21 */ bctrl -lbl_802FA090: -/* 802FA090 3B FF 00 01 */ addi r31, r31, 1 -/* 802FA094 28 1F 00 04 */ cmplwi r31, 4 -/* 802FA098 3B 9C 00 04 */ addi r28, r28, 4 -/* 802FA09C 41 80 FF 9C */ blt lbl_802FA038 -/* 802FA0A0 38 00 00 00 */ li r0, 0 -/* 802FA0A4 90 1B 01 10 */ stw r0, 0x110(r27) -/* 802FA0A8 28 1E 00 00 */ cmplwi r30, 0 -/* 802FA0AC 41 82 00 48 */ beq lbl_802FA0F4 -/* 802FA0B0 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 802FA0B4 28 03 00 00 */ cmplwi r3, 0 -/* 802FA0B8 41 82 00 3C */ beq lbl_802FA0F4 -/* 802FA0BC 38 80 00 00 */ li r4, 0 -/* 802FA0C0 81 83 00 00 */ lwz r12, 0(r3) -/* 802FA0C4 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 802FA0C8 7D 89 03 A6 */ mtctr r12 -/* 802FA0CC 4E 80 04 21 */ bctrl -/* 802FA0D0 28 03 00 00 */ cmplwi r3, 0 -/* 802FA0D4 41 82 00 20 */ beq lbl_802FA0F4 -/* 802FA0D8 90 7B 01 10 */ stw r3, 0x110(r27) -/* 802FA0DC 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 802FA0E0 38 80 00 FE */ li r4, 0xfe -/* 802FA0E4 81 83 00 00 */ lwz r12, 0(r3) -/* 802FA0E8 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 802FA0EC 7D 89 03 A6 */ mtctr r12 -/* 802FA0F0 4E 80 04 21 */ bctrl -lbl_802FA0F4: -/* 802FA0F4 7F 63 DB 78 */ mr r3, r27 -/* 802FA0F8 48 00 05 0D */ bl initinfo2__9J2DWindowFv -/* 802FA0FC 7F 63 DB 78 */ mr r3, r27 -/* 802FA100 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 802FA104 48 06 81 19 */ bl _restgpr_26 -/* 802FA108 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 802FA10C 7C 08 03 A6 */ mtlr r0 -/* 802FA110 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802FA114 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/drawContentsTexture__9J2DWindowFffff.s b/asm/JSystem/J2DGraph/J2DWindow/drawContentsTexture__9J2DWindowFffff.s deleted file mode 100644 index 46c57610611..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/drawContentsTexture__9J2DWindowFffff.s +++ /dev/null @@ -1,204 +0,0 @@ -lbl_802FB868: -/* 802FB868 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 802FB86C 7C 08 02 A6 */ mflr r0 -/* 802FB870 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 802FB874 DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 802FB878 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 802FB87C DB C1 00 A0 */ stfd f30, 0xa0(r1) -/* 802FB880 F3 C1 00 A8 */ psq_st f30, 168(r1), 0, 0 /* qr0 */ -/* 802FB884 DB A1 00 90 */ stfd f29, 0x90(r1) -/* 802FB888 F3 A1 00 98 */ psq_st f29, 152(r1), 0, 0 /* qr0 */ -/* 802FB88C DB 81 00 80 */ stfd f28, 0x80(r1) -/* 802FB890 F3 81 00 88 */ psq_st f28, 136(r1), 0, 0 /* qr0 */ -/* 802FB894 DB 61 00 70 */ stfd f27, 0x70(r1) -/* 802FB898 F3 61 00 78 */ psq_st f27, 120(r1), 0, 0 /* qr0 */ -/* 802FB89C DB 41 00 60 */ stfd f26, 0x60(r1) -/* 802FB8A0 F3 41 00 68 */ psq_st f26, 104(r1), 0, 0 /* qr0 */ -/* 802FB8A4 DB 21 00 50 */ stfd f25, 0x50(r1) -/* 802FB8A8 F3 21 00 58 */ psq_st f25, 88(r1), 0, 0 /* qr0 */ -/* 802FB8AC DB 01 00 40 */ stfd f24, 0x40(r1) -/* 802FB8B0 F3 01 00 48 */ psq_st f24, 72(r1), 0, 0 /* qr0 */ -/* 802FB8B4 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 802FB8B8 7C 7F 1B 78 */ mr r31, r3 -/* 802FB8BC FF C0 08 90 */ fmr f30, f1 -/* 802FB8C0 FF E0 10 90 */ fmr f31, f2 -/* 802FB8C4 EF BE 18 2A */ fadds f29, f30, f3 -/* 802FB8C8 EF 9F 20 2A */ fadds f28, f31, f4 -/* 802FB8CC 80 63 01 10 */ lwz r3, 0x110(r3) -/* 802FB8D0 80 83 00 20 */ lwz r4, 0x20(r3) -/* 802FB8D4 A0 04 00 02 */ lhz r0, 2(r4) -/* 802FB8D8 C8 22 C8 40 */ lfd f1, lit_1971(r2) -/* 802FB8DC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FB8E0 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802FB8E4 3C 60 43 30 */ lis r3, 0x4330 -/* 802FB8E8 90 61 00 28 */ stw r3, 0x28(r1) -/* 802FB8EC C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802FB8F0 EC 40 08 28 */ fsubs f2, f0, f1 -/* 802FB8F4 A0 04 00 04 */ lhz r0, 4(r4) -/* 802FB8F8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FB8FC 90 01 00 34 */ stw r0, 0x34(r1) -/* 802FB900 90 61 00 30 */ stw r3, 0x30(r1) -/* 802FB904 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 802FB908 EC A0 08 28 */ fsubs f5, f0, f1 -/* 802FB90C EC 63 10 24 */ fdivs f3, f3, f2 -/* 802FB910 C0 42 C8 54 */ lfs f2, lit_2984(r2) -/* 802FB914 EC 03 10 28 */ fsubs f0, f3, f2 -/* 802FB918 FC 00 00 50 */ fneg f0, f0 -/* 802FB91C C0 22 C8 58 */ lfs f1, lit_2985(r2) -/* 802FB920 EF 60 00 72 */ fmuls f27, f0, f1 -/* 802FB924 EC 84 28 24 */ fdivs f4, f4, f5 -/* 802FB928 EC 04 10 28 */ fsubs f0, f4, f2 -/* 802FB92C FC 00 00 50 */ fneg f0, f0 -/* 802FB930 EF 40 00 72 */ fmuls f26, f0, f1 -/* 802FB934 EF 3B 18 2A */ fadds f25, f27, f3 -/* 802FB938 EF 1A 20 2A */ fadds f24, f26, f4 -/* 802FB93C 38 00 FF FF */ li r0, -1 -/* 802FB940 90 01 00 18 */ stw r0, 0x18(r1) -/* 802FB944 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802FB948 90 01 00 20 */ stw r0, 0x20(r1) -/* 802FB94C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FB950 88 1F 01 28 */ lbz r0, 0x128(r31) -/* 802FB954 98 01 00 18 */ stb r0, 0x18(r1) -/* 802FB958 88 1F 01 29 */ lbz r0, 0x129(r31) -/* 802FB95C 98 01 00 19 */ stb r0, 0x19(r1) -/* 802FB960 88 1F 01 2A */ lbz r0, 0x12a(r31) -/* 802FB964 98 01 00 1A */ stb r0, 0x1a(r1) -/* 802FB968 88 7F 01 2B */ lbz r3, 0x12b(r31) -/* 802FB96C 98 61 00 1B */ stb r3, 0x1b(r1) -/* 802FB970 88 1F 01 2C */ lbz r0, 0x12c(r31) -/* 802FB974 98 01 00 1C */ stb r0, 0x1c(r1) -/* 802FB978 88 1F 01 2D */ lbz r0, 0x12d(r31) -/* 802FB97C 98 01 00 1D */ stb r0, 0x1d(r1) -/* 802FB980 88 1F 01 2E */ lbz r0, 0x12e(r31) -/* 802FB984 98 01 00 1E */ stb r0, 0x1e(r1) -/* 802FB988 88 DF 01 2F */ lbz r6, 0x12f(r31) -/* 802FB98C 98 C1 00 1F */ stb r6, 0x1f(r1) -/* 802FB990 88 1F 01 30 */ lbz r0, 0x130(r31) -/* 802FB994 98 01 00 20 */ stb r0, 0x20(r1) -/* 802FB998 88 1F 01 31 */ lbz r0, 0x131(r31) -/* 802FB99C 98 01 00 21 */ stb r0, 0x21(r1) -/* 802FB9A0 88 1F 01 32 */ lbz r0, 0x132(r31) -/* 802FB9A4 98 01 00 22 */ stb r0, 0x22(r1) -/* 802FB9A8 88 BF 01 33 */ lbz r5, 0x133(r31) -/* 802FB9AC 98 A1 00 23 */ stb r5, 0x23(r1) -/* 802FB9B0 88 1F 01 34 */ lbz r0, 0x134(r31) -/* 802FB9B4 98 01 00 24 */ stb r0, 0x24(r1) -/* 802FB9B8 88 1F 01 35 */ lbz r0, 0x135(r31) -/* 802FB9BC 98 01 00 25 */ stb r0, 0x25(r1) -/* 802FB9C0 88 1F 01 36 */ lbz r0, 0x136(r31) -/* 802FB9C4 98 01 00 26 */ stb r0, 0x26(r1) -/* 802FB9C8 88 9F 01 37 */ lbz r4, 0x137(r31) -/* 802FB9CC 98 81 00 27 */ stb r4, 0x27(r1) -/* 802FB9D0 88 FF 00 B3 */ lbz r7, 0xb3(r31) -/* 802FB9D4 28 07 00 FF */ cmplwi r7, 0xff -/* 802FB9D8 41 82 00 38 */ beq lbl_802FBA10 -/* 802FB9DC 7C 03 39 D6 */ mullw r0, r3, r7 -/* 802FB9E0 38 60 00 FF */ li r3, 0xff -/* 802FB9E4 7C 00 1B D6 */ divw r0, r0, r3 -/* 802FB9E8 98 01 00 1B */ stb r0, 0x1b(r1) -/* 802FB9EC 7C 06 39 D6 */ mullw r0, r6, r7 -/* 802FB9F0 7C 00 1B D6 */ divw r0, r0, r3 -/* 802FB9F4 98 01 00 1F */ stb r0, 0x1f(r1) -/* 802FB9F8 7C 05 39 D6 */ mullw r0, r5, r7 -/* 802FB9FC 7C 00 1B D6 */ divw r0, r0, r3 -/* 802FBA00 98 01 00 23 */ stb r0, 0x23(r1) -/* 802FBA04 7C 04 39 D6 */ mullw r0, r4, r7 -/* 802FBA08 7C 00 1B D6 */ divw r0, r0, r3 -/* 802FBA0C 98 01 00 27 */ stb r0, 0x27(r1) -lbl_802FBA10: -/* 802FBA10 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 802FBA14 38 80 00 00 */ li r4, 0 -/* 802FBA18 4B FE 2E 29 */ bl load__10JUTTextureF11_GXTexMapID -/* 802FBA1C 38 00 FF FF */ li r0, -1 -/* 802FBA20 90 01 00 08 */ stw r0, 8(r1) -/* 802FBA24 90 01 00 0C */ stw r0, 0xc(r1) -/* 802FBA28 38 00 00 00 */ li r0, 0 -/* 802FBA2C 90 01 00 10 */ stw r0, 0x10(r1) -/* 802FBA30 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FBA34 7F E3 FB 78 */ mr r3, r31 -/* 802FBA38 80 9F 01 10 */ lwz r4, 0x110(r31) -/* 802FBA3C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 802FBA40 38 C1 00 0C */ addi r6, r1, 0xc -/* 802FBA44 48 00 01 4D */ bl setTevMode__9J2DWindowFP10JUTTextureQ28JUtility6TColorQ28JUtility6TColor -/* 802FBA48 38 60 00 00 */ li r3, 0 -/* 802FBA4C 38 80 00 0D */ li r4, 0xd -/* 802FBA50 38 A0 00 01 */ li r5, 1 -/* 802FBA54 38 C0 00 04 */ li r6, 4 -/* 802FBA58 38 E0 00 00 */ li r7, 0 -/* 802FBA5C 48 05 FB 69 */ bl GXSetVtxAttrFmt -/* 802FBA60 38 60 00 00 */ li r3, 0 -/* 802FBA64 38 80 00 09 */ li r4, 9 -/* 802FBA68 38 A0 00 01 */ li r5, 1 -/* 802FBA6C 38 C0 00 04 */ li r6, 4 -/* 802FBA70 38 E0 00 00 */ li r7, 0 -/* 802FBA74 48 05 FB 51 */ bl GXSetVtxAttrFmt -/* 802FBA78 38 60 00 80 */ li r3, 0x80 -/* 802FBA7C 38 80 00 00 */ li r4, 0 -/* 802FBA80 38 A0 00 04 */ li r5, 4 -/* 802FBA84 48 06 0C E1 */ bl GXBegin -/* 802FBA88 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 802FBA8C D3 C3 80 00 */ stfs f30, 0x8000(r3) /* 0xCC008000@l */ -/* 802FBA90 D3 E3 80 00 */ stfs f31, -0x8000(r3) -/* 802FBA94 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FBA98 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FBA9C 80 01 00 18 */ lwz r0, 0x18(r1) -/* 802FBAA0 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FBAA4 D3 63 80 00 */ stfs f27, -0x8000(r3) -/* 802FBAA8 D3 43 80 00 */ stfs f26, -0x8000(r3) -/* 802FBAAC D3 A3 80 00 */ stfs f29, -0x8000(r3) -/* 802FBAB0 D3 E3 80 00 */ stfs f31, -0x8000(r3) -/* 802FBAB4 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FBAB8 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FBABC 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 802FBAC0 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FBAC4 D3 23 80 00 */ stfs f25, -0x8000(r3) -/* 802FBAC8 D3 43 80 00 */ stfs f26, -0x8000(r3) -/* 802FBACC D3 A3 80 00 */ stfs f29, -0x8000(r3) -/* 802FBAD0 D3 83 80 00 */ stfs f28, -0x8000(r3) -/* 802FBAD4 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FBAD8 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FBADC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FBAE0 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FBAE4 D3 23 80 00 */ stfs f25, -0x8000(r3) -/* 802FBAE8 D3 03 80 00 */ stfs f24, -0x8000(r3) -/* 802FBAEC D3 C3 80 00 */ stfs f30, -0x8000(r3) -/* 802FBAF0 D3 83 80 00 */ stfs f28, -0x8000(r3) -/* 802FBAF4 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FBAF8 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FBAFC 80 01 00 20 */ lwz r0, 0x20(r1) -/* 802FBB00 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FBB04 D3 63 80 00 */ stfs f27, -0x8000(r3) -/* 802FBB08 D3 03 80 00 */ stfs f24, -0x8000(r3) -/* 802FBB0C 38 60 00 00 */ li r3, 0 -/* 802FBB10 38 80 00 0D */ li r4, 0xd -/* 802FBB14 38 A0 00 01 */ li r5, 1 -/* 802FBB18 38 C0 00 02 */ li r6, 2 -/* 802FBB1C 38 E0 00 0F */ li r7, 0xf -/* 802FBB20 48 05 FA A5 */ bl GXSetVtxAttrFmt -/* 802FBB24 38 60 00 00 */ li r3, 0 -/* 802FBB28 38 80 00 09 */ li r4, 9 -/* 802FBB2C 38 A0 00 01 */ li r5, 1 -/* 802FBB30 38 C0 00 03 */ li r6, 3 -/* 802FBB34 38 E0 00 00 */ li r7, 0 -/* 802FBB38 48 05 FA 8D */ bl GXSetVtxAttrFmt -/* 802FBB3C E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 802FBB40 CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 802FBB44 E3 C1 00 A8 */ psq_l f30, 168(r1), 0, 0 /* qr0 */ -/* 802FBB48 CB C1 00 A0 */ lfd f30, 0xa0(r1) -/* 802FBB4C E3 A1 00 98 */ psq_l f29, 152(r1), 0, 0 /* qr0 */ -/* 802FBB50 CB A1 00 90 */ lfd f29, 0x90(r1) -/* 802FBB54 E3 81 00 88 */ psq_l f28, 136(r1), 0, 0 /* qr0 */ -/* 802FBB58 CB 81 00 80 */ lfd f28, 0x80(r1) -/* 802FBB5C E3 61 00 78 */ psq_l f27, 120(r1), 0, 0 /* qr0 */ -/* 802FBB60 CB 61 00 70 */ lfd f27, 0x70(r1) -/* 802FBB64 E3 41 00 68 */ psq_l f26, 104(r1), 0, 0 /* qr0 */ -/* 802FBB68 CB 41 00 60 */ lfd f26, 0x60(r1) -/* 802FBB6C E3 21 00 58 */ psq_l f25, 88(r1), 0, 0 /* qr0 */ -/* 802FBB70 CB 21 00 50 */ lfd f25, 0x50(r1) -/* 802FBB74 E3 01 00 48 */ psq_l f24, 72(r1), 0, 0 /* qr0 */ -/* 802FBB78 CB 01 00 40 */ lfd f24, 0x40(r1) -/* 802FBB7C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 802FBB80 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 802FBB84 7C 08 03 A6 */ mtlr r0 -/* 802FBB88 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802FBB8C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/drawFrameTexture__9J2DWindowFP10JUTTextureffbbb.s b/asm/JSystem/J2DGraph/J2DWindow/drawFrameTexture__9J2DWindowFP10JUTTextureffbbb.s deleted file mode 100644 index a3c0e699f1e..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/drawFrameTexture__9J2DWindowFP10JUTTextureffbbb.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_802FB7C8: -/* 802FB7C8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802FB7CC 7C 08 02 A6 */ mflr r0 -/* 802FB7D0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FB7D4 7C E9 3B 78 */ mr r9, r7 -/* 802FB7D8 54 CB 06 3E */ clrlwi r11, r6, 0x18 -/* 802FB7DC 20 0B 00 00 */ subfic r0, r11, 0 -/* 802FB7E0 7C 00 01 10 */ subfe r0, r0, r0 -/* 802FB7E4 3C C0 00 01 */ lis r6, 0x0001 /* 0x00008000@ha */ -/* 802FB7E8 39 46 80 00 */ addi r10, r6, 0x8000 /* 0x00008000@l */ -/* 802FB7EC 7D 48 00 38 */ and r8, r10, r0 -/* 802FB7F0 54 A5 06 3E */ clrlwi r5, r5, 0x18 -/* 802FB7F4 20 05 00 00 */ subfic r0, r5, 0 -/* 802FB7F8 7C 00 01 10 */ subfe r0, r0, r0 -/* 802FB7FC 7D 47 00 38 */ and r7, r10, r0 -/* 802FB800 20 0B 00 00 */ subfic r0, r11, 0 -/* 802FB804 7C 00 01 10 */ subfe r0, r0, r0 -/* 802FB808 7D 46 00 78 */ andc r6, r10, r0 -/* 802FB80C 20 05 00 00 */ subfic r0, r5, 0 -/* 802FB810 7C 00 01 10 */ subfe r0, r0, r0 -/* 802FB814 7D 45 00 78 */ andc r5, r10, r0 -/* 802FB818 81 64 00 20 */ lwz r11, 0x20(r4) -/* 802FB81C A0 0B 00 02 */ lhz r0, 2(r11) -/* 802FB820 C8 82 C8 40 */ lfd f4, lit_1971(r2) -/* 802FB824 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FB828 90 01 00 0C */ stw r0, 0xc(r1) -/* 802FB82C 3D 40 43 30 */ lis r10, 0x4330 -/* 802FB830 91 41 00 08 */ stw r10, 8(r1) -/* 802FB834 C8 01 00 08 */ lfd f0, 8(r1) -/* 802FB838 EC 60 20 28 */ fsubs f3, f0, f4 -/* 802FB83C A0 0B 00 04 */ lhz r0, 4(r11) -/* 802FB840 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FB844 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FB848 91 41 00 10 */ stw r10, 0x10(r1) -/* 802FB84C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802FB850 EC 80 20 28 */ fsubs f4, f0, f4 -/* 802FB854 4B FF FD E1 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb -/* 802FB858 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FB85C 7C 08 03 A6 */ mtlr r0 -/* 802FB860 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FB864 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb.s b/asm/JSystem/J2DGraph/J2DWindow/drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb.s deleted file mode 100644 index 0c899ee4555..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb.s +++ /dev/null @@ -1,103 +0,0 @@ -lbl_802FB634: -/* 802FB634 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802FB638 7C 08 02 A6 */ mflr r0 -/* 802FB63C 90 01 00 74 */ stw r0, 0x74(r1) -/* 802FB640 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 802FB644 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 802FB648 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 802FB64C F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 802FB650 DB A1 00 40 */ stfd f29, 0x40(r1) -/* 802FB654 F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 802FB658 DB 81 00 30 */ stfd f28, 0x30(r1) -/* 802FB65C F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* qr0 */ -/* 802FB660 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FB664 48 06 6B 6D */ bl _savegpr_26 -/* 802FB668 7C 7A 1B 78 */ mr r26, r3 -/* 802FB66C 7C 9B 23 78 */ mr r27, r4 -/* 802FB670 FF 80 08 90 */ fmr f28, f1 -/* 802FB674 FF A0 10 90 */ fmr f29, f2 -/* 802FB678 7C BC 2B 78 */ mr r28, r5 -/* 802FB67C 7C DD 33 78 */ mr r29, r6 -/* 802FB680 7C FE 3B 78 */ mr r30, r7 -/* 802FB684 7D 1F 43 78 */ mr r31, r8 -/* 802FB688 EF FC 18 2A */ fadds f31, f28, f3 -/* 802FB68C EF DD 20 2A */ fadds f30, f29, f4 -/* 802FB690 55 20 06 3F */ clrlwi. r0, r9, 0x18 -/* 802FB694 41 82 00 34 */ beq lbl_802FB6C8 -/* 802FB698 7F 63 DB 78 */ mr r3, r27 -/* 802FB69C 38 80 00 00 */ li r4, 0 -/* 802FB6A0 4B FE 31 A1 */ bl load__10JUTTextureF11_GXTexMapID -/* 802FB6A4 80 1A 01 38 */ lwz r0, 0x138(r26) -/* 802FB6A8 90 01 00 08 */ stw r0, 8(r1) -/* 802FB6AC 80 1A 01 3C */ lwz r0, 0x13c(r26) -/* 802FB6B0 90 01 00 0C */ stw r0, 0xc(r1) -/* 802FB6B4 7F 43 D3 78 */ mr r3, r26 -/* 802FB6B8 7F 64 DB 78 */ mr r4, r27 -/* 802FB6BC 38 A1 00 0C */ addi r5, r1, 0xc -/* 802FB6C0 38 C1 00 08 */ addi r6, r1, 8 -/* 802FB6C4 48 00 04 CD */ bl setTevMode__9J2DWindowFP10JUTTextureQ28JUtility6TColorQ28JUtility6TColor -lbl_802FB6C8: -/* 802FB6C8 88 7A 00 B3 */ lbz r3, 0xb3(r26) -/* 802FB6CC 38 00 FF 00 */ li r0, -256 -/* 802FB6D0 7C 60 03 78 */ or r0, r3, r0 -/* 802FB6D4 90 01 00 10 */ stw r0, 0x10(r1) -/* 802FB6D8 38 60 00 00 */ li r3, 0 -/* 802FB6DC 38 80 00 09 */ li r4, 9 -/* 802FB6E0 38 A0 00 01 */ li r5, 1 -/* 802FB6E4 38 C0 00 04 */ li r6, 4 -/* 802FB6E8 38 E0 00 00 */ li r7, 0 -/* 802FB6EC 48 05 FE D9 */ bl GXSetVtxAttrFmt -/* 802FB6F0 38 60 00 80 */ li r3, 0x80 -/* 802FB6F4 38 80 00 00 */ li r4, 0 -/* 802FB6F8 38 A0 00 04 */ li r5, 4 -/* 802FB6FC 48 06 10 69 */ bl GXBegin -/* 802FB700 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 802FB704 D3 83 80 00 */ stfs f28, 0x8000(r3) /* 0xCC008000@l */ -/* 802FB708 D3 A3 80 00 */ stfs f29, -0x8000(r3) -/* 802FB70C C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FB710 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FB714 80 01 00 10 */ lwz r0, 0x10(r1) -/* 802FB718 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FB71C B3 C3 80 00 */ sth r30, -0x8000(r3) -/* 802FB720 B3 E3 80 00 */ sth r31, -0x8000(r3) -/* 802FB724 D3 E3 80 00 */ stfs f31, -0x8000(r3) -/* 802FB728 D3 A3 80 00 */ stfs f29, -0x8000(r3) -/* 802FB72C C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FB730 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FB734 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FB738 B3 83 80 00 */ sth r28, -0x8000(r3) -/* 802FB73C B3 E3 80 00 */ sth r31, -0x8000(r3) -/* 802FB740 D3 E3 80 00 */ stfs f31, -0x8000(r3) -/* 802FB744 D3 C3 80 00 */ stfs f30, -0x8000(r3) -/* 802FB748 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FB74C D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FB750 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FB754 B3 83 80 00 */ sth r28, -0x8000(r3) -/* 802FB758 B3 A3 80 00 */ sth r29, -0x8000(r3) -/* 802FB75C D3 83 80 00 */ stfs f28, -0x8000(r3) -/* 802FB760 D3 C3 80 00 */ stfs f30, -0x8000(r3) -/* 802FB764 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FB768 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FB76C 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FB770 B3 C3 80 00 */ sth r30, -0x8000(r3) -/* 802FB774 B3 A3 80 00 */ sth r29, -0x8000(r3) -/* 802FB778 38 60 00 00 */ li r3, 0 -/* 802FB77C 38 80 00 09 */ li r4, 9 -/* 802FB780 38 A0 00 01 */ li r5, 1 -/* 802FB784 38 C0 00 03 */ li r6, 3 -/* 802FB788 38 E0 00 00 */ li r7, 0 -/* 802FB78C 48 05 FE 39 */ bl GXSetVtxAttrFmt -/* 802FB790 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 802FB794 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 802FB798 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 802FB79C CB C1 00 50 */ lfd f30, 0x50(r1) -/* 802FB7A0 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 802FB7A4 CB A1 00 40 */ lfd f29, 0x40(r1) -/* 802FB7A8 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* qr0 */ -/* 802FB7AC CB 81 00 30 */ lfd f28, 0x30(r1) -/* 802FB7B0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FB7B4 48 06 6A 69 */ bl _restgpr_26 -/* 802FB7B8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802FB7BC 7C 08 03 A6 */ mtlr r0 -/* 802FB7C0 38 21 00 70 */ addi r1, r1, 0x70 -/* 802FB7C4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/drawSelf__9J2DWindowFffPA3_A4_f.s b/asm/JSystem/J2DGraph/J2DWindow/drawSelf__9J2DWindowFffPA3_A4_f.s deleted file mode 100644 index fb4b1645fb2..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/drawSelf__9J2DWindowFffPA3_A4_f.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_802FB240: -/* 802FB240 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802FB244 7C 08 02 A6 */ mflr r0 -/* 802FB248 90 01 00 64 */ stw r0, 0x64(r1) -/* 802FB24C 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 802FB250 7C 7F 1B 78 */ mr r31, r3 -/* 802FB254 C0 A3 00 20 */ lfs f5, 0x20(r3) -/* 802FB258 D0 A1 00 08 */ stfs f5, 8(r1) -/* 802FB25C C0 83 00 24 */ lfs f4, 0x24(r3) -/* 802FB260 D0 81 00 0C */ stfs f4, 0xc(r1) -/* 802FB264 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 802FB268 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802FB26C C0 63 00 2C */ lfs f3, 0x2c(r3) -/* 802FB270 D0 61 00 14 */ stfs f3, 0x14(r1) -/* 802FB274 EC A5 08 2A */ fadds f5, f5, f1 -/* 802FB278 D0 A1 00 08 */ stfs f5, 8(r1) -/* 802FB27C EC 84 10 2A */ fadds f4, f4, f2 -/* 802FB280 D0 81 00 0C */ stfs f4, 0xc(r1) -/* 802FB284 EC 00 08 2A */ fadds f0, f0, f1 -/* 802FB288 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802FB28C EC 63 10 2A */ fadds f3, f3, f2 -/* 802FB290 D0 61 00 14 */ stfs f3, 0x14(r1) -/* 802FB294 EC 20 28 28 */ fsubs f1, f0, f5 -/* 802FB298 A8 03 01 40 */ lha r0, 0x140(r3) -/* 802FB29C C8 42 C8 40 */ lfd f2, lit_1971(r2) -/* 802FB2A0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FB2A4 90 01 00 4C */ stw r0, 0x4c(r1) -/* 802FB2A8 3C 60 43 30 */ lis r3, 0x4330 -/* 802FB2AC 90 61 00 48 */ stw r3, 0x48(r1) -/* 802FB2B0 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 802FB2B4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FB2B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802FB2BC 4C 41 13 82 */ cror 2, 1, 2 -/* 802FB2C0 40 82 00 58 */ bne lbl_802FB318 -/* 802FB2C4 EC 23 20 28 */ fsubs f1, f3, f4 -/* 802FB2C8 A8 1F 01 42 */ lha r0, 0x142(r31) -/* 802FB2CC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FB2D0 90 01 00 4C */ stw r0, 0x4c(r1) -/* 802FB2D4 90 61 00 48 */ stw r3, 0x48(r1) -/* 802FB2D8 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 802FB2DC EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FB2E0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802FB2E4 4C 41 13 82 */ cror 2, 1, 2 -/* 802FB2E8 40 82 00 30 */ bne lbl_802FB318 -/* 802FB2EC 7C 83 23 78 */ mr r3, r4 -/* 802FB2F0 38 9F 00 80 */ addi r4, r31, 0x80 -/* 802FB2F4 38 A1 00 18 */ addi r5, r1, 0x18 -/* 802FB2F8 48 04 B1 ED */ bl PSMTXConcat -/* 802FB2FC 38 61 00 18 */ addi r3, r1, 0x18 -/* 802FB300 38 80 00 00 */ li r4, 0 -/* 802FB304 48 06 4F 49 */ bl GXLoadPosMtxImm -/* 802FB308 7F E3 FB 78 */ mr r3, r31 -/* 802FB30C 38 81 00 08 */ addi r4, r1, 8 -/* 802FB310 38 BF 01 14 */ addi r5, r31, 0x114 -/* 802FB314 4B FF F7 49 */ bl func_802FAA5C -lbl_802FB318: -/* 802FB318 7F E3 FB 78 */ mr r3, r31 -/* 802FB31C 38 9F 01 14 */ addi r4, r31, 0x114 -/* 802FB320 4B FF BF 45 */ bl func_802F7264 -/* 802FB324 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 802FB328 80 01 00 64 */ lwz r0, 0x64(r1) -/* 802FB32C 7C 08 03 A6 */ mtlr r0 -/* 802FB330 38 21 00 60 */ addi r1, r1, 0x60 -/* 802FB334 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/func_802FA928.s b/asm/JSystem/J2DGraph/J2DWindow/func_802FA928.s deleted file mode 100644 index 031d19ba21e..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/func_802FA928.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_802FA928: -/* 802FA928 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802FA92C 7C 08 02 A6 */ mflr r0 -/* 802FA930 90 01 00 44 */ stw r0, 0x44(r1) -/* 802FA934 81 03 01 00 */ lwz r8, 0x100(r3) -/* 802FA938 28 08 00 00 */ cmplwi r8, 0 -/* 802FA93C 41 82 00 D0 */ beq lbl_802FAA0C -/* 802FA940 80 E3 01 04 */ lwz r7, 0x104(r3) -/* 802FA944 28 07 00 00 */ cmplwi r7, 0 -/* 802FA948 41 82 00 C4 */ beq lbl_802FAA0C -/* 802FA94C 80 A3 01 08 */ lwz r5, 0x108(r3) -/* 802FA950 28 05 00 00 */ cmplwi r5, 0 -/* 802FA954 41 82 00 B8 */ beq lbl_802FAA0C -/* 802FA958 80 03 01 0C */ lwz r0, 0x10c(r3) -/* 802FA95C 28 00 00 00 */ cmplwi r0, 0 -/* 802FA960 41 82 00 AC */ beq lbl_802FAA0C -/* 802FA964 80 A5 00 20 */ lwz r5, 0x20(r5) -/* 802FA968 A0 05 00 04 */ lhz r0, 4(r5) -/* 802FA96C C0 24 00 0C */ lfs f1, 0xc(r4) -/* 802FA970 C0 04 00 04 */ lfs f0, 4(r4) -/* 802FA974 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802FA978 C8 42 C8 40 */ lfd f2, lit_1971(r2) -/* 802FA97C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FA980 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802FA984 3C C0 43 30 */ lis r6, 0x4330 -/* 802FA988 90 C1 00 18 */ stw r6, 0x18(r1) -/* 802FA98C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802FA990 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FA994 EC 61 00 28 */ fsubs f3, f1, f0 -/* 802FA998 80 A7 00 20 */ lwz r5, 0x20(r7) -/* 802FA99C A0 05 00 02 */ lhz r0, 2(r5) -/* 802FA9A0 C0 24 00 08 */ lfs f1, 8(r4) -/* 802FA9A4 C0 04 00 00 */ lfs f0, 0(r4) -/* 802FA9A8 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802FA9AC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FA9B0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FA9B4 90 C1 00 20 */ stw r6, 0x20(r1) -/* 802FA9B8 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802FA9BC EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FA9C0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802FA9C4 80 E8 00 20 */ lwz r7, 0x20(r8) -/* 802FA9C8 A0 A7 00 04 */ lhz r5, 4(r7) -/* 802FA9CC A0 07 00 02 */ lhz r0, 2(r7) -/* 802FA9D0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FA9D4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802FA9D8 90 C1 00 28 */ stw r6, 0x28(r1) -/* 802FA9DC C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802FA9E0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FA9E4 D0 01 00 08 */ stfs f0, 8(r1) -/* 802FA9E8 6C A0 80 00 */ xoris r0, r5, 0x8000 -/* 802FA9EC 90 01 00 34 */ stw r0, 0x34(r1) -/* 802FA9F0 90 C1 00 30 */ stw r6, 0x30(r1) -/* 802FA9F4 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 802FA9F8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FA9FC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802FAA00 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 802FAA04 D0 61 00 14 */ stfs f3, 0x14(r1) -/* 802FAA08 48 00 00 30 */ b lbl_802FAA38 -lbl_802FAA0C: -/* 802FAA0C C0 24 00 0C */ lfs f1, 0xc(r4) -/* 802FAA10 C0 04 00 04 */ lfs f0, 4(r4) -/* 802FAA14 EC 41 00 28 */ fsubs f2, f1, f0 -/* 802FAA18 C0 24 00 08 */ lfs f1, 8(r4) -/* 802FAA1C C0 04 00 00 */ lfs f0, 0(r4) -/* 802FAA20 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802FAA24 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FAA28 D0 01 00 08 */ stfs f0, 8(r1) -/* 802FAA2C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802FAA30 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 802FAA34 D0 41 00 14 */ stfs f2, 0x14(r1) -lbl_802FAA38: -/* 802FAA38 38 A1 00 08 */ addi r5, r1, 8 -/* 802FAA3C 81 83 00 00 */ lwz r12, 0(r3) -/* 802FAA40 81 8C 00 98 */ lwz r12, 0x98(r12) -/* 802FAA44 7D 89 03 A6 */ mtctr r12 -/* 802FAA48 4E 80 04 21 */ bctrl -/* 802FAA4C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802FAA50 7C 08 03 A6 */ mtlr r0 -/* 802FAA54 38 21 00 40 */ addi r1, r1, 0x40 -/* 802FAA58 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/func_802FAA5C.s b/asm/JSystem/J2DGraph/J2DWindow/func_802FAA5C.s deleted file mode 100644 index d310bead9db..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/func_802FAA5C.s +++ /dev/null @@ -1,287 +0,0 @@ -lbl_802FAA5C: -/* 802FAA5C 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 802FAA60 7C 08 02 A6 */ mflr r0 -/* 802FAA64 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 802FAA68 DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 802FAA6C F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 802FAA70 DB C1 00 A0 */ stfd f30, 0xa0(r1) -/* 802FAA74 F3 C1 00 A8 */ psq_st f30, 168(r1), 0, 0 /* qr0 */ -/* 802FAA78 DB A1 00 90 */ stfd f29, 0x90(r1) -/* 802FAA7C F3 A1 00 98 */ psq_st f29, 152(r1), 0, 0 /* qr0 */ -/* 802FAA80 DB 81 00 80 */ stfd f28, 0x80(r1) -/* 802FAA84 F3 81 00 88 */ psq_st f28, 136(r1), 0, 0 /* qr0 */ -/* 802FAA88 DB 61 00 70 */ stfd f27, 0x70(r1) -/* 802FAA8C F3 61 00 78 */ psq_st f27, 120(r1), 0, 0 /* qr0 */ -/* 802FAA90 DB 41 00 60 */ stfd f26, 0x60(r1) -/* 802FAA94 F3 41 00 68 */ psq_st f26, 104(r1), 0, 0 /* qr0 */ -/* 802FAA98 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 802FAA9C 93 C1 00 58 */ stw r30, 0x58(r1) -/* 802FAAA0 7C 7F 1B 78 */ mr r31, r3 -/* 802FAAA4 7C 9E 23 78 */ mr r30, r4 -/* 802FAAA8 C0 05 00 00 */ lfs f0, 0(r5) -/* 802FAAAC D0 01 00 08 */ stfs f0, 8(r1) -/* 802FAAB0 C0 A5 00 04 */ lfs f5, 4(r5) -/* 802FAAB4 D0 A1 00 0C */ stfs f5, 0xc(r1) -/* 802FAAB8 C0 85 00 08 */ lfs f4, 8(r5) -/* 802FAABC D0 81 00 10 */ stfs f4, 0x10(r1) -/* 802FAAC0 C0 65 00 0C */ lfs f3, 0xc(r5) -/* 802FAAC4 D0 61 00 14 */ stfs f3, 0x14(r1) -/* 802FAAC8 C0 44 00 00 */ lfs f2, 0(r4) -/* 802FAACC EC 00 10 2A */ fadds f0, f0, f2 -/* 802FAAD0 D0 01 00 08 */ stfs f0, 8(r1) -/* 802FAAD4 C0 24 00 04 */ lfs f1, 4(r4) -/* 802FAAD8 EC 05 08 2A */ fadds f0, f5, f1 -/* 802FAADC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802FAAE0 EC 04 10 2A */ fadds f0, f4, f2 -/* 802FAAE4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802FAAE8 EC 03 08 2A */ fadds f0, f3, f1 -/* 802FAAEC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802FAAF0 38 81 00 08 */ addi r4, r1, 8 -/* 802FAAF4 81 83 00 00 */ lwz r12, 0(r3) -/* 802FAAF8 81 8C 00 C8 */ lwz r12, 0xc8(r12) -/* 802FAAFC 7D 89 03 A6 */ mtctr r12 -/* 802FAB00 4E 80 04 21 */ bctrl -/* 802FAB04 48 06 0A 89 */ bl GXClearVtxDesc -/* 802FAB08 38 60 00 09 */ li r3, 9 -/* 802FAB0C 38 80 00 01 */ li r4, 1 -/* 802FAB10 48 06 03 A9 */ bl GXSetVtxDesc -/* 802FAB14 38 60 00 0B */ li r3, 0xb -/* 802FAB18 38 80 00 01 */ li r4, 1 -/* 802FAB1C 48 06 03 9D */ bl GXSetVtxDesc -/* 802FAB20 38 60 00 0D */ li r3, 0xd -/* 802FAB24 38 80 00 01 */ li r4, 1 -/* 802FAB28 48 06 03 91 */ bl GXSetVtxDesc -/* 802FAB2C 38 60 00 01 */ li r3, 1 -/* 802FAB30 48 06 12 CD */ bl GXSetNumTexGens -/* 802FAB34 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 802FAB38 28 04 00 00 */ cmplwi r4, 0 -/* 802FAB3C 41 82 03 18 */ beq lbl_802FAE54 -/* 802FAB40 80 1F 01 04 */ lwz r0, 0x104(r31) -/* 802FAB44 28 00 00 00 */ cmplwi r0, 0 -/* 802FAB48 41 82 03 0C */ beq lbl_802FAE54 -/* 802FAB4C 80 1F 01 08 */ lwz r0, 0x108(r31) -/* 802FAB50 28 00 00 00 */ cmplwi r0, 0 -/* 802FAB54 41 82 03 00 */ beq lbl_802FAE54 -/* 802FAB58 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802FAB5C 28 03 00 00 */ cmplwi r3, 0 -/* 802FAB60 41 82 02 F4 */ beq lbl_802FAE54 -/* 802FAB64 C3 FE 00 00 */ lfs f31, 0(r30) -/* 802FAB68 C3 DE 00 04 */ lfs f30, 4(r30) -/* 802FAB6C 80 A3 00 20 */ lwz r5, 0x20(r3) -/* 802FAB70 A0 05 00 02 */ lhz r0, 2(r5) -/* 802FAB74 C0 3E 00 08 */ lfs f1, 8(r30) -/* 802FAB78 C8 42 C8 40 */ lfd f2, lit_1971(r2) -/* 802FAB7C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FAB80 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802FAB84 3C 60 43 30 */ lis r3, 0x4330 -/* 802FAB88 90 61 00 18 */ stw r3, 0x18(r1) -/* 802FAB8C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802FAB90 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FAB94 EF A1 00 28 */ fsubs f29, f1, f0 -/* 802FAB98 A0 05 00 04 */ lhz r0, 4(r5) -/* 802FAB9C C0 3E 00 0C */ lfs f1, 0xc(r30) -/* 802FABA0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FABA4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FABA8 90 61 00 20 */ stw r3, 0x20(r1) -/* 802FABAC C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802FABB0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FABB4 EF 81 00 28 */ fsubs f28, f1, f0 -/* 802FABB8 80 A4 00 20 */ lwz r5, 0x20(r4) -/* 802FABBC A0 05 00 02 */ lhz r0, 2(r5) -/* 802FABC0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FABC4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802FABC8 90 61 00 28 */ stw r3, 0x28(r1) -/* 802FABCC C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802FABD0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FABD4 EF 7F 00 2A */ fadds f27, f31, f0 -/* 802FABD8 A0 05 00 04 */ lhz r0, 4(r5) -/* 802FABDC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FABE0 90 01 00 34 */ stw r0, 0x34(r1) -/* 802FABE4 90 61 00 30 */ stw r3, 0x30(r1) -/* 802FABE8 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 802FABEC EC 00 10 28 */ fsubs f0, f0, f2 -/* 802FABF0 EF 5E 00 2A */ fadds f26, f30, f0 -/* 802FABF4 88 1F 01 44 */ lbz r0, 0x144(r31) -/* 802FABF8 7F E3 FB 78 */ mr r3, r31 -/* 802FABFC FC 20 F8 90 */ fmr f1, f31 -/* 802FAC00 FC 40 F0 90 */ fmr f2, f30 -/* 802FAC04 54 05 CF FE */ rlwinm r5, r0, 0x19, 0x1f, 0x1f -/* 802FAC08 54 06 D7 FE */ rlwinm r6, r0, 0x1a, 0x1f, 0x1f -/* 802FAC0C 38 E0 00 01 */ li r7, 1 -/* 802FAC10 48 00 0B B9 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffbbb -/* 802FAC14 88 1F 01 45 */ lbz r0, 0x145(r31) -/* 802FAC18 54 07 07 FE */ clrlwi r7, r0, 0x1f -/* 802FAC1C 88 1F 01 44 */ lbz r0, 0x144(r31) -/* 802FAC20 7F E3 FB 78 */ mr r3, r31 -/* 802FAC24 80 9F 01 04 */ lwz r4, 0x104(r31) -/* 802FAC28 FC 20 E8 90 */ fmr f1, f29 -/* 802FAC2C FC 40 F0 90 */ fmr f2, f30 -/* 802FAC30 54 05 DF FE */ rlwinm r5, r0, 0x1b, 0x1f, 0x1f -/* 802FAC34 54 06 E7 FE */ rlwinm r6, r0, 0x1c, 0x1f, 0x1f -/* 802FAC38 48 00 0B 91 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffbbb -/* 802FAC3C 88 9F 01 44 */ lbz r4, 0x144(r31) -/* 802FAC40 54 80 DF FE */ rlwinm r0, r4, 0x1b, 0x1f, 0x1f -/* 802FAC44 7C 00 00 D0 */ neg r0, r0 -/* 802FAC48 3C 60 00 01 */ lis r3, 0x0001 /* 0x00008000@ha */ -/* 802FAC4C 38 63 80 00 */ addi r3, r3, 0x8000 /* 0x00008000@l */ -/* 802FAC50 7C 65 00 38 */ and r5, r3, r0 -/* 802FAC54 54 80 E7 FE */ rlwinm r0, r4, 0x1c, 0x1f, 0x1f -/* 802FAC58 7C 00 00 D0 */ neg r0, r0 -/* 802FAC5C 7C 66 00 78 */ andc r6, r3, r0 -/* 802FAC60 68 C0 80 00 */ xori r0, r6, 0x8000 -/* 802FAC64 54 08 04 3E */ clrlwi r8, r0, 0x10 -/* 802FAC68 80 9F 01 04 */ lwz r4, 0x104(r31) -/* 802FAC6C 80 64 00 20 */ lwz r3, 0x20(r4) -/* 802FAC70 A0 03 00 04 */ lhz r0, 4(r3) -/* 802FAC74 7F E3 FB 78 */ mr r3, r31 -/* 802FAC78 FC 20 D8 90 */ fmr f1, f27 -/* 802FAC7C FC 40 F0 90 */ fmr f2, f30 -/* 802FAC80 EF DD D8 28 */ fsubs f30, f29, f27 -/* 802FAC84 FC 60 F0 90 */ fmr f3, f30 -/* 802FAC88 C8 82 C8 40 */ lfd f4, lit_1971(r2) -/* 802FAC8C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FAC90 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802FAC94 3C 00 43 30 */ lis r0, 0x4330 -/* 802FAC98 90 01 00 38 */ stw r0, 0x38(r1) -/* 802FAC9C C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802FACA0 EC 80 20 28 */ fsubs f4, f0, f4 -/* 802FACA4 7C A7 2B 78 */ mr r7, r5 -/* 802FACA8 39 20 00 00 */ li r9, 0 -/* 802FACAC 48 00 09 89 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb -/* 802FACB0 88 1F 01 45 */ lbz r0, 0x145(r31) -/* 802FACB4 54 07 FF FE */ rlwinm r7, r0, 0x1f, 0x1f, 0x1f -/* 802FACB8 88 1F 01 44 */ lbz r0, 0x144(r31) -/* 802FACBC 7F E3 FB 78 */ mr r3, r31 -/* 802FACC0 80 9F 01 0C */ lwz r4, 0x10c(r31) -/* 802FACC4 FC 20 E8 90 */ fmr f1, f29 -/* 802FACC8 FC 40 E0 90 */ fmr f2, f28 -/* 802FACCC 54 05 FF FE */ rlwinm r5, r0, 0x1f, 0x1f, 0x1f -/* 802FACD0 54 06 07 FE */ clrlwi r6, r0, 0x1f -/* 802FACD4 48 00 0A F5 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffbbb -/* 802FACD8 88 9F 01 44 */ lbz r4, 0x144(r31) -/* 802FACDC 54 80 FF FE */ rlwinm r0, r4, 0x1f, 0x1f, 0x1f -/* 802FACE0 7C 00 00 D0 */ neg r0, r0 -/* 802FACE4 3C 60 00 01 */ lis r3, 0x0001 /* 0x00008000@ha */ -/* 802FACE8 38 63 80 00 */ addi r3, r3, 0x8000 /* 0x00008000@l */ -/* 802FACEC 7C 65 00 38 */ and r5, r3, r0 -/* 802FACF0 54 80 07 FE */ clrlwi r0, r4, 0x1f -/* 802FACF4 7C 00 00 D0 */ neg r0, r0 -/* 802FACF8 7C 66 00 78 */ andc r6, r3, r0 -/* 802FACFC 68 C0 80 00 */ xori r0, r6, 0x8000 -/* 802FAD00 54 08 04 3E */ clrlwi r8, r0, 0x10 -/* 802FAD04 80 9F 01 0C */ lwz r4, 0x10c(r31) -/* 802FAD08 80 64 00 20 */ lwz r3, 0x20(r4) -/* 802FAD0C A0 03 00 04 */ lhz r0, 4(r3) -/* 802FAD10 7F E3 FB 78 */ mr r3, r31 -/* 802FAD14 FC 20 D8 90 */ fmr f1, f27 -/* 802FAD18 FC 40 E0 90 */ fmr f2, f28 -/* 802FAD1C FC 60 F0 90 */ fmr f3, f30 -/* 802FAD20 C8 82 C8 40 */ lfd f4, lit_1971(r2) -/* 802FAD24 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FAD28 90 01 00 44 */ stw r0, 0x44(r1) -/* 802FAD2C 3C 00 43 30 */ lis r0, 0x4330 -/* 802FAD30 90 01 00 40 */ stw r0, 0x40(r1) -/* 802FAD34 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 802FAD38 EC 80 20 28 */ fsubs f4, f0, f4 -/* 802FAD3C 7C A7 2B 78 */ mr r7, r5 -/* 802FAD40 39 20 00 00 */ li r9, 0 -/* 802FAD44 48 00 08 F1 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb -/* 802FAD48 88 9F 01 44 */ lbz r4, 0x144(r31) -/* 802FAD4C 54 80 FF FE */ rlwinm r0, r4, 0x1f, 0x1f, 0x1f -/* 802FAD50 7C 00 00 D0 */ neg r0, r0 -/* 802FAD54 3C 60 00 01 */ lis r3, 0x0001 /* 0x00008000@ha */ -/* 802FAD58 38 63 80 00 */ addi r3, r3, 0x8000 /* 0x00008000@l */ -/* 802FAD5C 7C 65 00 78 */ andc r5, r3, r0 -/* 802FAD60 68 A0 80 00 */ xori r0, r5, 0x8000 -/* 802FAD64 54 07 04 3E */ clrlwi r7, r0, 0x10 -/* 802FAD68 54 80 07 FE */ clrlwi r0, r4, 0x1f -/* 802FAD6C 7C 00 00 D0 */ neg r0, r0 -/* 802FAD70 7C 66 00 38 */ and r6, r3, r0 -/* 802FAD74 80 9F 01 0C */ lwz r4, 0x10c(r31) -/* 802FAD78 80 64 00 20 */ lwz r3, 0x20(r4) -/* 802FAD7C A0 03 00 02 */ lhz r0, 2(r3) -/* 802FAD80 7F E3 FB 78 */ mr r3, r31 -/* 802FAD84 FC 20 E8 90 */ fmr f1, f29 -/* 802FAD88 FC 40 D0 90 */ fmr f2, f26 -/* 802FAD8C C8 62 C8 40 */ lfd f3, lit_1971(r2) -/* 802FAD90 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FAD94 90 01 00 4C */ stw r0, 0x4c(r1) -/* 802FAD98 3C 00 43 30 */ lis r0, 0x4330 -/* 802FAD9C 90 01 00 48 */ stw r0, 0x48(r1) -/* 802FADA0 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 802FADA4 EC 60 18 28 */ fsubs f3, f0, f3 -/* 802FADA8 EF DC D0 28 */ fsubs f30, f28, f26 -/* 802FADAC FC 80 F0 90 */ fmr f4, f30 -/* 802FADB0 7C C8 33 78 */ mr r8, r6 -/* 802FADB4 39 20 00 00 */ li r9, 0 -/* 802FADB8 48 00 08 7D */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb -/* 802FADBC 88 1F 01 45 */ lbz r0, 0x145(r31) -/* 802FADC0 54 07 F7 FE */ rlwinm r7, r0, 0x1e, 0x1f, 0x1f -/* 802FADC4 88 1F 01 44 */ lbz r0, 0x144(r31) -/* 802FADC8 7F E3 FB 78 */ mr r3, r31 -/* 802FADCC 80 9F 01 08 */ lwz r4, 0x108(r31) -/* 802FADD0 FC 20 F8 90 */ fmr f1, f31 -/* 802FADD4 FC 40 E0 90 */ fmr f2, f28 -/* 802FADD8 54 05 EF FE */ rlwinm r5, r0, 0x1d, 0x1f, 0x1f -/* 802FADDC 54 06 F7 FE */ rlwinm r6, r0, 0x1e, 0x1f, 0x1f -/* 802FADE0 48 00 09 E9 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffbbb -/* 802FADE4 88 9F 01 44 */ lbz r4, 0x144(r31) -/* 802FADE8 54 80 EF FE */ rlwinm r0, r4, 0x1d, 0x1f, 0x1f -/* 802FADEC 7C 00 00 D0 */ neg r0, r0 -/* 802FADF0 3C 60 00 01 */ lis r3, 0x0001 /* 0x00008000@ha */ -/* 802FADF4 38 63 80 00 */ addi r3, r3, 0x8000 /* 0x00008000@l */ -/* 802FADF8 7C 65 00 78 */ andc r5, r3, r0 -/* 802FADFC 68 A0 80 00 */ xori r0, r5, 0x8000 -/* 802FAE00 54 07 04 3E */ clrlwi r7, r0, 0x10 -/* 802FAE04 54 80 F7 FE */ rlwinm r0, r4, 0x1e, 0x1f, 0x1f -/* 802FAE08 7C 00 00 D0 */ neg r0, r0 -/* 802FAE0C 7C 66 00 38 */ and r6, r3, r0 -/* 802FAE10 80 9F 01 08 */ lwz r4, 0x108(r31) -/* 802FAE14 80 64 00 20 */ lwz r3, 0x20(r4) -/* 802FAE18 A0 03 00 02 */ lhz r0, 2(r3) -/* 802FAE1C 7F E3 FB 78 */ mr r3, r31 -/* 802FAE20 FC 20 F8 90 */ fmr f1, f31 -/* 802FAE24 FC 40 D0 90 */ fmr f2, f26 -/* 802FAE28 C8 62 C8 40 */ lfd f3, lit_1971(r2) -/* 802FAE2C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FAE30 90 01 00 54 */ stw r0, 0x54(r1) -/* 802FAE34 3C 00 43 30 */ lis r0, 0x4330 -/* 802FAE38 90 01 00 50 */ stw r0, 0x50(r1) -/* 802FAE3C C8 01 00 50 */ lfd f0, 0x50(r1) -/* 802FAE40 EC 60 18 28 */ fsubs f3, f0, f3 -/* 802FAE44 FC 80 F0 90 */ fmr f4, f30 -/* 802FAE48 7C C8 33 78 */ mr r8, r6 -/* 802FAE4C 39 20 00 00 */ li r9, 0 -/* 802FAE50 48 00 07 E5 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb -lbl_802FAE54: -/* 802FAE54 38 60 00 00 */ li r3, 0 -/* 802FAE58 38 80 00 04 */ li r4, 4 -/* 802FAE5C 48 06 43 3D */ bl GXSetTevOp -/* 802FAE60 38 60 00 00 */ li r3, 0 -/* 802FAE64 38 80 00 FF */ li r4, 0xff -/* 802FAE68 38 A0 00 FF */ li r5, 0xff -/* 802FAE6C 38 C0 00 04 */ li r6, 4 -/* 802FAE70 48 06 48 85 */ bl GXSetTevOrder -/* 802FAE74 38 60 00 00 */ li r3, 0 -/* 802FAE78 48 06 0F 85 */ bl GXSetNumTexGens -/* 802FAE7C 38 60 00 0D */ li r3, 0xd -/* 802FAE80 38 80 00 00 */ li r4, 0 -/* 802FAE84 48 06 00 35 */ bl GXSetVtxDesc -/* 802FAE88 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 802FAE8C CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 802FAE90 E3 C1 00 A8 */ psq_l f30, 168(r1), 0, 0 /* qr0 */ -/* 802FAE94 CB C1 00 A0 */ lfd f30, 0xa0(r1) -/* 802FAE98 E3 A1 00 98 */ psq_l f29, 152(r1), 0, 0 /* qr0 */ -/* 802FAE9C CB A1 00 90 */ lfd f29, 0x90(r1) -/* 802FAEA0 E3 81 00 88 */ psq_l f28, 136(r1), 0, 0 /* qr0 */ -/* 802FAEA4 CB 81 00 80 */ lfd f28, 0x80(r1) -/* 802FAEA8 E3 61 00 78 */ psq_l f27, 120(r1), 0, 0 /* qr0 */ -/* 802FAEAC CB 61 00 70 */ lfd f27, 0x70(r1) -/* 802FAEB0 E3 41 00 68 */ psq_l f26, 104(r1), 0, 0 /* qr0 */ -/* 802FAEB4 CB 41 00 60 */ lfd f26, 0x60(r1) -/* 802FAEB8 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 802FAEBC 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 802FAEC0 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 802FAEC4 7C 08 03 A6 */ mtlr r0 -/* 802FAEC8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802FAECC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/func_802FAED0.s b/asm/JSystem/J2DGraph/J2DWindow/func_802FAED0.s deleted file mode 100644 index 12da04bbce8..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/func_802FAED0.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_802FAED0: -/* 802FAED0 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802FAED4 7C 08 02 A6 */ mflr r0 -/* 802FAED8 90 01 00 64 */ stw r0, 0x64(r1) -/* 802FAEDC 39 61 00 60 */ addi r11, r1, 0x60 -/* 802FAEE0 48 06 72 FD */ bl _savegpr_29 -/* 802FAEE4 7C 7D 1B 78 */ mr r29, r3 -/* 802FAEE8 7C 9E 23 78 */ mr r30, r4 -/* 802FAEEC 7C BF 2B 78 */ mr r31, r5 -/* 802FAEF0 C0 04 00 08 */ lfs f0, 8(r4) -/* 802FAEF4 C0 24 00 00 */ lfs f1, 0(r4) -/* 802FAEF8 EC 40 08 28 */ fsubs f2, f0, f1 -/* 802FAEFC A8 03 01 40 */ lha r0, 0x140(r3) -/* 802FAF00 C8 82 C8 40 */ lfd f4, lit_1971(r2) -/* 802FAF04 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FAF08 90 01 00 4C */ stw r0, 0x4c(r1) -/* 802FAF0C 3C 80 43 30 */ lis r4, 0x4330 -/* 802FAF10 90 81 00 48 */ stw r4, 0x48(r1) -/* 802FAF14 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 802FAF18 EC 00 20 28 */ fsubs f0, f0, f4 -/* 802FAF1C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802FAF20 4C 41 13 82 */ cror 2, 1, 2 -/* 802FAF24 40 82 00 C4 */ bne lbl_802FAFE8 -/* 802FAF28 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 802FAF2C C0 5E 00 04 */ lfs f2, 4(r30) -/* 802FAF30 EC 60 10 28 */ fsubs f3, f0, f2 -/* 802FAF34 A8 1D 01 42 */ lha r0, 0x142(r29) -/* 802FAF38 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FAF3C 90 01 00 4C */ stw r0, 0x4c(r1) -/* 802FAF40 90 81 00 48 */ stw r4, 0x48(r1) -/* 802FAF44 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 802FAF48 EC 00 20 28 */ fsubs f0, f0, f4 -/* 802FAF4C FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 802FAF50 4C 41 13 82 */ cror 2, 1, 2 -/* 802FAF54 40 82 00 94 */ bne lbl_802FAFE8 -/* 802FAF58 88 1D 00 B0 */ lbz r0, 0xb0(r29) -/* 802FAF5C 28 00 00 00 */ cmplwi r0, 0 -/* 802FAF60 41 82 00 88 */ beq lbl_802FAFE8 -/* 802FAF64 C0 62 C8 50 */ lfs f3, lit_2156(r2) -/* 802FAF68 FC 80 18 90 */ fmr f4, f3 -/* 802FAF6C 81 83 00 00 */ lwz r12, 0(r3) -/* 802FAF70 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 802FAF74 7D 89 03 A6 */ mtctr r12 -/* 802FAF78 4E 80 04 21 */ bctrl -/* 802FAF7C 38 7D 00 50 */ addi r3, r29, 0x50 -/* 802FAF80 38 80 00 00 */ li r4, 0 -/* 802FAF84 48 06 52 C9 */ bl GXLoadPosMtxImm -/* 802FAF88 38 60 00 00 */ li r3, 0 -/* 802FAF8C 48 06 53 61 */ bl GXSetCurrentMtx -/* 802FAF90 88 1D 00 B2 */ lbz r0, 0xb2(r29) -/* 802FAF94 98 1D 00 B3 */ stb r0, 0xb3(r29) -/* 802FAF98 C0 3E 00 0C */ lfs f1, 0xc(r30) -/* 802FAF9C C0 1E 00 04 */ lfs f0, 4(r30) -/* 802FAFA0 EC 41 00 28 */ fsubs f2, f1, f0 -/* 802FAFA4 C0 3E 00 08 */ lfs f1, 8(r30) -/* 802FAFA8 C0 1E 00 00 */ lfs f0, 0(r30) -/* 802FAFAC EC 21 00 28 */ fsubs f1, f1, f0 -/* 802FAFB0 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FAFB4 D0 01 00 08 */ stfs f0, 8(r1) -/* 802FAFB8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802FAFBC D0 21 00 10 */ stfs f1, 0x10(r1) -/* 802FAFC0 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 802FAFC4 7F A3 EB 78 */ mr r3, r29 -/* 802FAFC8 38 81 00 08 */ addi r4, r1, 8 -/* 802FAFCC 7F E5 FB 78 */ mr r5, r31 -/* 802FAFD0 4B FF FA 8D */ bl func_802FAA5C -/* 802FAFD4 38 61 00 18 */ addi r3, r1, 0x18 -/* 802FAFD8 48 04 B4 AD */ bl PSMTXIdentity -/* 802FAFDC 38 61 00 18 */ addi r3, r1, 0x18 -/* 802FAFE0 38 80 00 00 */ li r4, 0 -/* 802FAFE4 48 06 52 69 */ bl GXLoadPosMtxImm -lbl_802FAFE8: -/* 802FAFE8 39 61 00 60 */ addi r11, r1, 0x60 -/* 802FAFEC 48 06 72 3D */ bl _restgpr_29 -/* 802FAFF0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 802FAFF4 7C 08 03 A6 */ mtlr r0 -/* 802FAFF8 38 21 00 60 */ addi r1, r1, 0x60 -/* 802FAFFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/func_802FB338.s b/asm/JSystem/J2DGraph/J2DWindow/func_802FB338.s deleted file mode 100644 index 9fa1ea32e44..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/func_802FB338.s +++ /dev/null @@ -1,199 +0,0 @@ -lbl_802FB338: -/* 802FB338 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802FB33C 7C 08 02 A6 */ mflr r0 -/* 802FB340 90 01 00 34 */ stw r0, 0x34(r1) -/* 802FB344 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FB348 48 06 6E 95 */ bl _savegpr_29 -/* 802FB34C 7C 7E 1B 78 */ mr r30, r3 -/* 802FB350 7C 9F 23 78 */ mr r31, r4 -/* 802FB354 38 00 00 00 */ li r0, 0 -/* 802FB358 C0 24 00 08 */ lfs f1, 8(r4) -/* 802FB35C C0 04 00 00 */ lfs f0, 0(r4) -/* 802FB360 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802FB364 4C 41 13 82 */ cror 2, 1, 2 -/* 802FB368 40 82 00 1C */ bne lbl_802FB384 -/* 802FB36C C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 802FB370 C0 1F 00 04 */ lfs f0, 4(r31) -/* 802FB374 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802FB378 4C 41 13 82 */ cror 2, 1, 2 -/* 802FB37C 40 82 00 08 */ bne lbl_802FB384 -/* 802FB380 38 00 00 01 */ li r0, 1 -lbl_802FB384: -/* 802FB384 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802FB388 41 82 02 94 */ beq lbl_802FB61C -/* 802FB38C 38 60 00 01 */ li r3, 1 -/* 802FB390 48 06 27 A1 */ bl GXSetNumChans -/* 802FB394 38 60 00 00 */ li r3, 0 -/* 802FB398 48 06 0A 65 */ bl GXSetNumTexGens -/* 802FB39C 38 60 00 01 */ li r3, 1 -/* 802FB3A0 48 06 44 F1 */ bl GXSetNumTevStages -/* 802FB3A4 38 60 00 00 */ li r3, 0 -/* 802FB3A8 38 80 00 04 */ li r4, 4 -/* 802FB3AC 48 06 3D ED */ bl GXSetTevOp -/* 802FB3B0 38 60 00 00 */ li r3, 0 -/* 802FB3B4 38 80 00 FF */ li r4, 0xff -/* 802FB3B8 38 A0 00 FF */ li r5, 0xff -/* 802FB3BC 38 C0 00 04 */ li r6, 4 -/* 802FB3C0 48 06 43 35 */ bl GXSetTevOrder -/* 802FB3C4 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 802FB3C8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 802FB3CC 28 00 00 FF */ cmplwi r0, 0xff -/* 802FB3D0 40 82 00 58 */ bne lbl_802FB428 -/* 802FB3D4 80 1E 01 2C */ lwz r0, 0x12c(r30) -/* 802FB3D8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 802FB3DC 28 00 00 FF */ cmplwi r0, 0xff -/* 802FB3E0 40 82 00 48 */ bne lbl_802FB428 -/* 802FB3E4 80 1E 01 30 */ lwz r0, 0x130(r30) -/* 802FB3E8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 802FB3EC 28 00 00 FF */ cmplwi r0, 0xff -/* 802FB3F0 40 82 00 38 */ bne lbl_802FB428 -/* 802FB3F4 80 1E 01 34 */ lwz r0, 0x134(r30) -/* 802FB3F8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 802FB3FC 28 00 00 FF */ cmplwi r0, 0xff -/* 802FB400 40 82 00 28 */ bne lbl_802FB428 -/* 802FB404 88 1E 00 B3 */ lbz r0, 0xb3(r30) -/* 802FB408 28 00 00 FF */ cmplwi r0, 0xff -/* 802FB40C 40 82 00 1C */ bne lbl_802FB428 -/* 802FB410 38 60 00 00 */ li r3, 0 -/* 802FB414 38 80 00 01 */ li r4, 1 -/* 802FB418 38 A0 00 00 */ li r5, 0 -/* 802FB41C 38 C0 00 0F */ li r6, 0xf -/* 802FB420 48 06 47 D1 */ bl GXSetBlendMode -/* 802FB424 48 00 00 18 */ b lbl_802FB43C -lbl_802FB428: -/* 802FB428 38 60 00 01 */ li r3, 1 -/* 802FB42C 38 80 00 04 */ li r4, 4 -/* 802FB430 38 A0 00 05 */ li r5, 5 -/* 802FB434 38 C0 00 0F */ li r6, 0xf -/* 802FB438 48 06 47 B9 */ bl GXSetBlendMode -lbl_802FB43C: -/* 802FB43C 48 06 01 51 */ bl GXClearVtxDesc -/* 802FB440 38 60 00 09 */ li r3, 9 -/* 802FB444 38 80 00 01 */ li r4, 1 -/* 802FB448 48 05 FA 71 */ bl GXSetVtxDesc -/* 802FB44C 38 60 00 0B */ li r3, 0xb -/* 802FB450 38 80 00 01 */ li r4, 1 -/* 802FB454 48 05 FA 65 */ bl GXSetVtxDesc -/* 802FB458 38 60 00 04 */ li r3, 4 -/* 802FB45C 38 80 00 00 */ li r4, 0 -/* 802FB460 38 A0 00 00 */ li r5, 0 -/* 802FB464 38 C0 00 01 */ li r6, 1 -/* 802FB468 38 E0 00 00 */ li r7, 0 -/* 802FB46C 39 00 00 00 */ li r8, 0 -/* 802FB470 39 20 00 02 */ li r9, 2 -/* 802FB474 48 06 26 F9 */ bl GXSetChanCtrl -/* 802FB478 38 60 00 00 */ li r3, 0 -/* 802FB47C 48 06 3C 59 */ bl GXSetNumIndStages -/* 802FB480 3B A0 00 00 */ li r29, 0 -lbl_802FB484: -/* 802FB484 7F A3 EB 78 */ mr r3, r29 -/* 802FB488 48 06 3C 71 */ bl GXSetTevDirect -/* 802FB48C 3B BD 00 01 */ addi r29, r29, 1 -/* 802FB490 2C 1D 00 10 */ cmpwi r29, 0x10 -/* 802FB494 41 80 FF F0 */ blt lbl_802FB484 -/* 802FB498 80 1E 01 10 */ lwz r0, 0x110(r30) -/* 802FB49C 28 00 00 00 */ cmplwi r0, 0 -/* 802FB4A0 40 82 01 2C */ bne lbl_802FB5CC -/* 802FB4A4 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 802FB4A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FB4AC 80 1E 01 30 */ lwz r0, 0x130(r30) -/* 802FB4B0 90 01 00 10 */ stw r0, 0x10(r1) -/* 802FB4B4 80 1E 01 2C */ lwz r0, 0x12c(r30) -/* 802FB4B8 90 01 00 0C */ stw r0, 0xc(r1) -/* 802FB4BC 80 1E 01 34 */ lwz r0, 0x134(r30) -/* 802FB4C0 90 01 00 08 */ stw r0, 8(r1) -/* 802FB4C4 88 9E 00 B3 */ lbz r4, 0xb3(r30) -/* 802FB4C8 28 04 00 FF */ cmplwi r4, 0xff -/* 802FB4CC 41 82 00 48 */ beq lbl_802FB514 -/* 802FB4D0 88 01 00 17 */ lbz r0, 0x17(r1) -/* 802FB4D4 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802FB4D8 38 60 00 FF */ li r3, 0xff -/* 802FB4DC 7C 00 1B D6 */ divw r0, r0, r3 -/* 802FB4E0 98 01 00 17 */ stb r0, 0x17(r1) -/* 802FB4E4 88 01 00 13 */ lbz r0, 0x13(r1) -/* 802FB4E8 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802FB4EC 7C 00 1B D6 */ divw r0, r0, r3 -/* 802FB4F0 98 01 00 13 */ stb r0, 0x13(r1) -/* 802FB4F4 88 01 00 0F */ lbz r0, 0xf(r1) -/* 802FB4F8 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802FB4FC 7C 00 1B D6 */ divw r0, r0, r3 -/* 802FB500 98 01 00 0F */ stb r0, 0xf(r1) -/* 802FB504 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802FB508 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802FB50C 7C 00 1B D6 */ divw r0, r0, r3 -/* 802FB510 98 01 00 0B */ stb r0, 0xb(r1) -lbl_802FB514: -/* 802FB514 38 60 00 00 */ li r3, 0 -/* 802FB518 38 80 00 09 */ li r4, 9 -/* 802FB51C 38 A0 00 01 */ li r5, 1 -/* 802FB520 38 C0 00 04 */ li r6, 4 -/* 802FB524 38 E0 00 00 */ li r7, 0 -/* 802FB528 48 06 00 9D */ bl GXSetVtxAttrFmt -/* 802FB52C 38 60 00 80 */ li r3, 0x80 -/* 802FB530 38 80 00 00 */ li r4, 0 -/* 802FB534 38 A0 00 04 */ li r5, 4 -/* 802FB538 48 06 12 2D */ bl GXBegin -/* 802FB53C C0 7F 00 04 */ lfs f3, 4(r31) -/* 802FB540 C0 5F 00 00 */ lfs f2, 0(r31) -/* 802FB544 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 802FB548 D0 43 80 00 */ stfs f2, 0x8000(r3) /* 0xCC008000@l */ -/* 802FB54C D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802FB550 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FB554 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FB558 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FB55C 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FB560 C0 3F 00 08 */ lfs f1, 8(r31) -/* 802FB564 D0 23 80 00 */ stfs f1, -0x8000(r3) -/* 802FB568 D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802FB56C C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FB570 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FB574 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802FB578 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FB57C C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 802FB580 D0 23 80 00 */ stfs f1, -0x8000(r3) -/* 802FB584 D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802FB588 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FB58C D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FB590 80 01 00 08 */ lwz r0, 8(r1) -/* 802FB594 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FB598 D0 43 80 00 */ stfs f2, -0x8000(r3) -/* 802FB59C D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802FB5A0 C0 02 C8 50 */ lfs f0, lit_2156(r2) -/* 802FB5A4 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802FB5A8 80 01 00 10 */ lwz r0, 0x10(r1) -/* 802FB5AC 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802FB5B0 38 60 00 00 */ li r3, 0 -/* 802FB5B4 38 80 00 09 */ li r4, 9 -/* 802FB5B8 38 A0 00 01 */ li r5, 1 -/* 802FB5BC 38 C0 00 03 */ li r6, 3 -/* 802FB5C0 38 E0 00 00 */ li r7, 0 -/* 802FB5C4 48 06 00 01 */ bl GXSetVtxAttrFmt -/* 802FB5C8 48 00 00 54 */ b lbl_802FB61C -lbl_802FB5CC: -/* 802FB5CC 48 05 FF C1 */ bl GXClearVtxDesc -/* 802FB5D0 38 60 00 09 */ li r3, 9 -/* 802FB5D4 38 80 00 01 */ li r4, 1 -/* 802FB5D8 48 05 F8 E1 */ bl GXSetVtxDesc -/* 802FB5DC 38 60 00 0B */ li r3, 0xb -/* 802FB5E0 38 80 00 01 */ li r4, 1 -/* 802FB5E4 48 05 F8 D5 */ bl GXSetVtxDesc -/* 802FB5E8 38 60 00 0D */ li r3, 0xd -/* 802FB5EC 38 80 00 01 */ li r4, 1 -/* 802FB5F0 48 05 F8 C9 */ bl GXSetVtxDesc -/* 802FB5F4 38 60 00 01 */ li r3, 1 -/* 802FB5F8 48 06 08 05 */ bl GXSetNumTexGens -/* 802FB5FC C0 5F 00 04 */ lfs f2, 4(r31) -/* 802FB600 C0 3F 00 00 */ lfs f1, 0(r31) -/* 802FB604 7F C3 F3 78 */ mr r3, r30 -/* 802FB608 C0 1F 00 08 */ lfs f0, 8(r31) -/* 802FB60C EC 60 08 28 */ fsubs f3, f0, f1 -/* 802FB610 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 802FB614 EC 80 10 28 */ fsubs f4, f0, f2 -/* 802FB618 48 00 02 51 */ bl drawContentsTexture__9J2DWindowFffff -lbl_802FB61C: -/* 802FB61C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FB620 48 06 6C 09 */ bl _restgpr_29 -/* 802FB624 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802FB628 7C 08 03 A6 */ mtlr r0 -/* 802FB62C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802FB630 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/initinfo2__9J2DWindowFv.s b/asm/JSystem/J2DGraph/J2DWindow/initinfo2__9J2DWindowFv.s deleted file mode 100644 index 0a32b07dd4b..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/initinfo2__9J2DWindowFv.s +++ /dev/null @@ -1,167 +0,0 @@ -lbl_802FA604: -/* 802FA604 80 A3 01 00 */ lwz r5, 0x100(r3) -/* 802FA608 28 05 00 00 */ cmplwi r5, 0 -/* 802FA60C 41 82 00 64 */ beq lbl_802FA670 -/* 802FA610 80 83 01 04 */ lwz r4, 0x104(r3) -/* 802FA614 28 04 00 00 */ cmplwi r4, 0 -/* 802FA618 41 82 00 58 */ beq lbl_802FA670 -/* 802FA61C 80 03 01 08 */ lwz r0, 0x108(r3) -/* 802FA620 28 00 00 00 */ cmplwi r0, 0 -/* 802FA624 41 82 00 4C */ beq lbl_802FA670 -/* 802FA628 80 03 01 0C */ lwz r0, 0x10c(r3) -/* 802FA62C 28 00 00 00 */ cmplwi r0, 0 -/* 802FA630 41 82 00 40 */ beq lbl_802FA670 -/* 802FA634 80 84 00 20 */ lwz r4, 0x20(r4) -/* 802FA638 A0 04 00 02 */ lhz r0, 2(r4) -/* 802FA63C 80 85 00 20 */ lwz r4, 0x20(r5) -/* 802FA640 A0 84 00 02 */ lhz r4, 2(r4) -/* 802FA644 7C 04 02 14 */ add r0, r4, r0 -/* 802FA648 B0 03 01 40 */ sth r0, 0x140(r3) -/* 802FA64C 80 83 01 08 */ lwz r4, 0x108(r3) -/* 802FA650 80 84 00 20 */ lwz r4, 0x20(r4) -/* 802FA654 A0 04 00 04 */ lhz r0, 4(r4) -/* 802FA658 80 83 01 00 */ lwz r4, 0x100(r3) -/* 802FA65C 80 84 00 20 */ lwz r4, 0x20(r4) -/* 802FA660 A0 84 00 04 */ lhz r4, 4(r4) -/* 802FA664 7C 04 02 14 */ add r0, r4, r0 -/* 802FA668 B0 03 01 42 */ sth r0, 0x142(r3) -/* 802FA66C 48 00 00 14 */ b lbl_802FA680 -lbl_802FA670: -/* 802FA670 38 00 00 01 */ li r0, 1 -/* 802FA674 B0 03 01 40 */ sth r0, 0x140(r3) -/* 802FA678 B0 03 01 42 */ sth r0, 0x142(r3) -/* 802FA67C 4E 80 00 20 */ blr -lbl_802FA680: -/* 802FA680 38 C0 00 00 */ li r6, 0 -/* 802FA684 98 C3 01 45 */ stb r6, 0x145(r3) -/* 802FA688 80 83 01 00 */ lwz r4, 0x100(r3) -/* 802FA68C 80 E3 01 04 */ lwz r7, 0x104(r3) -/* 802FA690 80 A7 00 20 */ lwz r5, 0x20(r7) -/* 802FA694 80 04 00 20 */ lwz r0, 0x20(r4) -/* 802FA698 7C 05 00 40 */ cmplw r5, r0 -/* 802FA69C 40 82 00 7C */ bne lbl_802FA718 -/* 802FA6A0 80 A7 00 2C */ lwz r5, 0x2c(r7) -/* 802FA6A4 80 04 00 2C */ lwz r0, 0x2c(r4) -/* 802FA6A8 7C 05 00 40 */ cmplw r5, r0 -/* 802FA6AC 40 82 00 6C */ bne lbl_802FA718 -/* 802FA6B0 88 A7 00 30 */ lbz r5, 0x30(r7) -/* 802FA6B4 88 04 00 30 */ lbz r0, 0x30(r4) -/* 802FA6B8 7C 05 00 40 */ cmplw r5, r0 -/* 802FA6BC 40 82 00 5C */ bne lbl_802FA718 -/* 802FA6C0 88 A7 00 31 */ lbz r5, 0x31(r7) -/* 802FA6C4 88 04 00 31 */ lbz r0, 0x31(r4) -/* 802FA6C8 7C 05 00 40 */ cmplw r5, r0 -/* 802FA6CC 40 82 00 4C */ bne lbl_802FA718 -/* 802FA6D0 88 A7 00 32 */ lbz r5, 0x32(r7) -/* 802FA6D4 88 04 00 32 */ lbz r0, 0x32(r4) -/* 802FA6D8 7C 05 00 40 */ cmplw r5, r0 -/* 802FA6DC 40 82 00 3C */ bne lbl_802FA718 -/* 802FA6E0 88 A7 00 33 */ lbz r5, 0x33(r7) -/* 802FA6E4 88 04 00 33 */ lbz r0, 0x33(r4) -/* 802FA6E8 7C 05 00 40 */ cmplw r5, r0 -/* 802FA6EC 40 82 00 2C */ bne lbl_802FA718 -/* 802FA6F0 A0 A7 00 34 */ lhz r5, 0x34(r7) -/* 802FA6F4 A0 04 00 34 */ lhz r0, 0x34(r4) -/* 802FA6F8 7C 05 00 40 */ cmplw r5, r0 -/* 802FA6FC 40 82 00 1C */ bne lbl_802FA718 -/* 802FA700 40 82 00 18 */ bne lbl_802FA718 -/* 802FA704 A8 A7 00 38 */ lha r5, 0x38(r7) -/* 802FA708 A8 04 00 38 */ lha r0, 0x38(r4) -/* 802FA70C 7C 05 00 00 */ cmpw r5, r0 -/* 802FA710 40 82 00 08 */ bne lbl_802FA718 -/* 802FA714 38 C0 00 01 */ li r6, 1 -lbl_802FA718: -/* 802FA718 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 802FA71C 40 82 00 14 */ bne lbl_802FA730 -/* 802FA720 88 03 01 45 */ lbz r0, 0x145(r3) -/* 802FA724 60 00 00 01 */ ori r0, r0, 1 -/* 802FA728 98 03 01 45 */ stb r0, 0x145(r3) -/* 802FA72C 80 83 01 04 */ lwz r4, 0x104(r3) -lbl_802FA730: -/* 802FA730 80 E3 01 0C */ lwz r7, 0x10c(r3) -/* 802FA734 38 C0 00 00 */ li r6, 0 -/* 802FA738 80 A7 00 20 */ lwz r5, 0x20(r7) -/* 802FA73C 80 04 00 20 */ lwz r0, 0x20(r4) -/* 802FA740 7C 05 00 40 */ cmplw r5, r0 -/* 802FA744 40 82 00 7C */ bne lbl_802FA7C0 -/* 802FA748 80 A7 00 2C */ lwz r5, 0x2c(r7) -/* 802FA74C 80 04 00 2C */ lwz r0, 0x2c(r4) -/* 802FA750 7C 05 00 40 */ cmplw r5, r0 -/* 802FA754 40 82 00 6C */ bne lbl_802FA7C0 -/* 802FA758 88 A7 00 30 */ lbz r5, 0x30(r7) -/* 802FA75C 88 04 00 30 */ lbz r0, 0x30(r4) -/* 802FA760 7C 05 00 40 */ cmplw r5, r0 -/* 802FA764 40 82 00 5C */ bne lbl_802FA7C0 -/* 802FA768 88 A7 00 31 */ lbz r5, 0x31(r7) -/* 802FA76C 88 04 00 31 */ lbz r0, 0x31(r4) -/* 802FA770 7C 05 00 40 */ cmplw r5, r0 -/* 802FA774 40 82 00 4C */ bne lbl_802FA7C0 -/* 802FA778 88 A7 00 32 */ lbz r5, 0x32(r7) -/* 802FA77C 88 04 00 32 */ lbz r0, 0x32(r4) -/* 802FA780 7C 05 00 40 */ cmplw r5, r0 -/* 802FA784 40 82 00 3C */ bne lbl_802FA7C0 -/* 802FA788 88 A7 00 33 */ lbz r5, 0x33(r7) -/* 802FA78C 88 04 00 33 */ lbz r0, 0x33(r4) -/* 802FA790 7C 05 00 40 */ cmplw r5, r0 -/* 802FA794 40 82 00 2C */ bne lbl_802FA7C0 -/* 802FA798 A0 A7 00 34 */ lhz r5, 0x34(r7) -/* 802FA79C A0 04 00 34 */ lhz r0, 0x34(r4) -/* 802FA7A0 7C 05 00 40 */ cmplw r5, r0 -/* 802FA7A4 40 82 00 1C */ bne lbl_802FA7C0 -/* 802FA7A8 40 82 00 18 */ bne lbl_802FA7C0 -/* 802FA7AC A8 A7 00 38 */ lha r5, 0x38(r7) -/* 802FA7B0 A8 04 00 38 */ lha r0, 0x38(r4) -/* 802FA7B4 7C 05 00 00 */ cmpw r5, r0 -/* 802FA7B8 40 82 00 08 */ bne lbl_802FA7C0 -/* 802FA7BC 38 C0 00 01 */ li r6, 1 -lbl_802FA7C0: -/* 802FA7C0 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 802FA7C4 40 82 00 14 */ bne lbl_802FA7D8 -/* 802FA7C8 88 03 01 45 */ lbz r0, 0x145(r3) -/* 802FA7CC 60 00 00 02 */ ori r0, r0, 2 -/* 802FA7D0 98 03 01 45 */ stb r0, 0x145(r3) -/* 802FA7D4 80 83 01 0C */ lwz r4, 0x10c(r3) -lbl_802FA7D8: -/* 802FA7D8 80 E3 01 08 */ lwz r7, 0x108(r3) -/* 802FA7DC 38 C0 00 00 */ li r6, 0 -/* 802FA7E0 80 A7 00 20 */ lwz r5, 0x20(r7) -/* 802FA7E4 80 04 00 20 */ lwz r0, 0x20(r4) -/* 802FA7E8 7C 05 00 40 */ cmplw r5, r0 -/* 802FA7EC 40 82 00 7C */ bne lbl_802FA868 -/* 802FA7F0 80 A7 00 2C */ lwz r5, 0x2c(r7) -/* 802FA7F4 80 04 00 2C */ lwz r0, 0x2c(r4) -/* 802FA7F8 7C 05 00 40 */ cmplw r5, r0 -/* 802FA7FC 40 82 00 6C */ bne lbl_802FA868 -/* 802FA800 88 A7 00 30 */ lbz r5, 0x30(r7) -/* 802FA804 88 04 00 30 */ lbz r0, 0x30(r4) -/* 802FA808 7C 05 00 40 */ cmplw r5, r0 -/* 802FA80C 40 82 00 5C */ bne lbl_802FA868 -/* 802FA810 88 A7 00 31 */ lbz r5, 0x31(r7) -/* 802FA814 88 04 00 31 */ lbz r0, 0x31(r4) -/* 802FA818 7C 05 00 40 */ cmplw r5, r0 -/* 802FA81C 40 82 00 4C */ bne lbl_802FA868 -/* 802FA820 88 A7 00 32 */ lbz r5, 0x32(r7) -/* 802FA824 88 04 00 32 */ lbz r0, 0x32(r4) -/* 802FA828 7C 05 00 40 */ cmplw r5, r0 -/* 802FA82C 40 82 00 3C */ bne lbl_802FA868 -/* 802FA830 88 A7 00 33 */ lbz r5, 0x33(r7) -/* 802FA834 88 04 00 33 */ lbz r0, 0x33(r4) -/* 802FA838 7C 05 00 40 */ cmplw r5, r0 -/* 802FA83C 40 82 00 2C */ bne lbl_802FA868 -/* 802FA840 A0 A7 00 34 */ lhz r5, 0x34(r7) -/* 802FA844 A0 04 00 34 */ lhz r0, 0x34(r4) -/* 802FA848 7C 05 00 40 */ cmplw r5, r0 -/* 802FA84C 40 82 00 1C */ bne lbl_802FA868 -/* 802FA850 40 82 00 18 */ bne lbl_802FA868 -/* 802FA854 A8 A7 00 38 */ lha r5, 0x38(r7) -/* 802FA858 A8 04 00 38 */ lha r0, 0x38(r4) -/* 802FA85C 7C 05 00 00 */ cmpw r5, r0 -/* 802FA860 40 82 00 08 */ bne lbl_802FA868 -/* 802FA864 38 C0 00 01 */ li r6, 1 -lbl_802FA868: -/* 802FA868 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 802FA86C 4C 82 00 20 */ bnelr -/* 802FA870 88 03 01 45 */ lbz r0, 0x145(r3) -/* 802FA874 60 00 00 04 */ ori r0, r0, 4 -/* 802FA878 98 03 01 45 */ stb r0, 0x145(r3) -/* 802FA87C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindow/private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s b/asm/JSystem/J2DGraph/J2DWindow/private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s deleted file mode 100644 index 727ede659e0..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindow/private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s +++ /dev/null @@ -1,331 +0,0 @@ -lbl_802FA118: -/* 802FA118 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 802FA11C 7C 08 02 A6 */ mflr r0 -/* 802FA120 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 802FA124 DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 802FA128 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 802FA12C DB C1 00 A0 */ stfd f30, 0xa0(r1) -/* 802FA130 F3 C1 00 A8 */ psq_st f30, 168(r1), 0, 0 /* qr0 */ -/* 802FA134 DB A1 00 90 */ stfd f29, 0x90(r1) -/* 802FA138 F3 A1 00 98 */ psq_st f29, 152(r1), 0, 0 /* qr0 */ -/* 802FA13C 39 61 00 90 */ addi r11, r1, 0x90 -/* 802FA140 48 06 80 8D */ bl _savegpr_25 -/* 802FA144 7C 7B 1B 78 */ mr r27, r3 -/* 802FA148 7C 99 23 78 */ mr r25, r4 -/* 802FA14C 7C BC 2B 78 */ mr r28, r5 -/* 802FA150 7C DD 33 78 */ mr r29, r6 -/* 802FA154 7F 83 E3 78 */ mr r3, r28 -/* 802FA158 81 9C 00 00 */ lwz r12, 0(r28) -/* 802FA15C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802FA160 7D 89 03 A6 */ mtctr r12 -/* 802FA164 4E 80 04 21 */ bctrl -/* 802FA168 7C 7F 1B 78 */ mr r31, r3 -/* 802FA16C 7F 83 E3 78 */ mr r3, r28 -/* 802FA170 38 81 00 3C */ addi r4, r1, 0x3c -/* 802FA174 38 A0 00 08 */ li r5, 8 -/* 802FA178 4B FE 21 21 */ bl read__14JSUInputStreamFPvl -/* 802FA17C 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 802FA180 90 1B 00 08 */ stw r0, 8(r27) -/* 802FA184 7F 63 DB 78 */ mr r3, r27 -/* 802FA188 7F 24 CB 78 */ mr r4, r25 -/* 802FA18C 7F 85 E3 78 */ mr r5, r28 -/* 802FA190 4B FF BF 35 */ bl makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream -/* 802FA194 7F 83 E3 78 */ mr r3, r28 -/* 802FA198 38 81 00 09 */ addi r4, r1, 9 -/* 802FA19C 38 A0 00 01 */ li r5, 1 -/* 802FA1A0 4B FE 20 F9 */ bl read__14JSUInputStreamFPvl -/* 802FA1A4 8B C1 00 09 */ lbz r30, 9(r1) -/* 802FA1A8 7F 83 E3 78 */ mr r3, r28 -/* 802FA1AC 38 81 00 10 */ addi r4, r1, 0x10 -/* 802FA1B0 38 A0 00 02 */ li r5, 2 -/* 802FA1B4 4B FE 20 E5 */ bl read__14JSUInputStreamFPvl -/* 802FA1B8 A0 01 00 10 */ lhz r0, 0x10(r1) -/* 802FA1BC C8 22 C8 48 */ lfd f1, lit_1974(r2) -/* 802FA1C0 90 01 00 4C */ stw r0, 0x4c(r1) -/* 802FA1C4 3C 00 43 30 */ lis r0, 0x4330 -/* 802FA1C8 90 01 00 48 */ stw r0, 0x48(r1) -/* 802FA1CC C8 01 00 48 */ lfd f0, 0x48(r1) -/* 802FA1D0 EF E0 08 28 */ fsubs f31, f0, f1 -/* 802FA1D4 7F 83 E3 78 */ mr r3, r28 -/* 802FA1D8 38 81 00 0E */ addi r4, r1, 0xe -/* 802FA1DC 38 A0 00 02 */ li r5, 2 -/* 802FA1E0 4B FE 20 B9 */ bl read__14JSUInputStreamFPvl -/* 802FA1E4 A0 01 00 0E */ lhz r0, 0xe(r1) -/* 802FA1E8 C8 22 C8 48 */ lfd f1, lit_1974(r2) -/* 802FA1EC 90 01 00 54 */ stw r0, 0x54(r1) -/* 802FA1F0 3C 00 43 30 */ lis r0, 0x4330 -/* 802FA1F4 90 01 00 50 */ stw r0, 0x50(r1) -/* 802FA1F8 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 802FA1FC EF C0 08 28 */ fsubs f30, f0, f1 -/* 802FA200 7F 83 E3 78 */ mr r3, r28 -/* 802FA204 38 81 00 0C */ addi r4, r1, 0xc -/* 802FA208 38 A0 00 02 */ li r5, 2 -/* 802FA20C 4B FE 20 8D */ bl read__14JSUInputStreamFPvl -/* 802FA210 A0 01 00 0C */ lhz r0, 0xc(r1) -/* 802FA214 C8 22 C8 48 */ lfd f1, lit_1974(r2) -/* 802FA218 90 01 00 5C */ stw r0, 0x5c(r1) -/* 802FA21C 3C 00 43 30 */ lis r0, 0x4330 -/* 802FA220 90 01 00 58 */ stw r0, 0x58(r1) -/* 802FA224 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 802FA228 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FA22C EF BF 00 2A */ fadds f29, f31, f0 -/* 802FA230 7F 83 E3 78 */ mr r3, r28 -/* 802FA234 38 81 00 0A */ addi r4, r1, 0xa -/* 802FA238 38 A0 00 02 */ li r5, 2 -/* 802FA23C 4B FE 20 5D */ bl read__14JSUInputStreamFPvl -/* 802FA240 A0 01 00 0A */ lhz r0, 0xa(r1) -/* 802FA244 C8 22 C8 48 */ lfd f1, lit_1974(r2) -/* 802FA248 90 01 00 64 */ stw r0, 0x64(r1) -/* 802FA24C 3C 00 43 30 */ lis r0, 0x4330 -/* 802FA250 90 01 00 60 */ stw r0, 0x60(r1) -/* 802FA254 C8 01 00 60 */ lfd f0, 0x60(r1) -/* 802FA258 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FA25C EC 1E 00 2A */ fadds f0, f30, f0 -/* 802FA260 D3 FB 01 14 */ stfs f31, 0x114(r27) -/* 802FA264 D3 DB 01 18 */ stfs f30, 0x118(r27) -/* 802FA268 D3 BB 01 1C */ stfs f29, 0x11c(r27) -/* 802FA26C D0 1B 01 20 */ stfs f0, 0x120(r27) -/* 802FA270 7F 63 DB 78 */ mr r3, r27 -/* 802FA274 7F 84 E3 78 */ mr r4, r28 -/* 802FA278 3C A0 54 49 */ lis r5, 0x5449 /* 0x54494D47@ha */ -/* 802FA27C 38 A5 4D 47 */ addi r5, r5, 0x4D47 /* 0x54494D47@l */ -/* 802FA280 7F A6 EB 78 */ mr r6, r29 -/* 802FA284 4B FF DB 35 */ bl getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive -/* 802FA288 7C 79 1B 79 */ or. r25, r3, r3 -/* 802FA28C 41 82 00 38 */ beq lbl_802FA2C4 -/* 802FA290 38 60 00 40 */ li r3, 0x40 -/* 802FA294 4B FD 49 B9 */ bl __nw__FUl -/* 802FA298 7C 7A 1B 79 */ or. r26, r3, r3 -/* 802FA29C 41 82 00 24 */ beq lbl_802FA2C0 -/* 802FA2A0 38 00 00 00 */ li r0, 0 -/* 802FA2A4 90 1A 00 28 */ stw r0, 0x28(r26) -/* 802FA2A8 7F 24 CB 78 */ mr r4, r25 -/* 802FA2AC 38 A0 00 00 */ li r5, 0 -/* 802FA2B0 4B FE 3F F9 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802FA2B4 88 1A 00 3B */ lbz r0, 0x3b(r26) -/* 802FA2B8 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802FA2BC 98 1A 00 3B */ stb r0, 0x3b(r26) -lbl_802FA2C0: -/* 802FA2C0 93 5B 01 00 */ stw r26, 0x100(r27) -lbl_802FA2C4: -/* 802FA2C4 7F 63 DB 78 */ mr r3, r27 -/* 802FA2C8 7F 84 E3 78 */ mr r4, r28 -/* 802FA2CC 3C A0 54 49 */ lis r5, 0x5449 /* 0x54494D47@ha */ -/* 802FA2D0 38 A5 4D 47 */ addi r5, r5, 0x4D47 /* 0x54494D47@l */ -/* 802FA2D4 7F A6 EB 78 */ mr r6, r29 -/* 802FA2D8 4B FF DA E1 */ bl getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive -/* 802FA2DC 7C 79 1B 79 */ or. r25, r3, r3 -/* 802FA2E0 41 82 00 38 */ beq lbl_802FA318 -/* 802FA2E4 38 60 00 40 */ li r3, 0x40 -/* 802FA2E8 4B FD 49 65 */ bl __nw__FUl -/* 802FA2EC 7C 7A 1B 79 */ or. r26, r3, r3 -/* 802FA2F0 41 82 00 24 */ beq lbl_802FA314 -/* 802FA2F4 38 00 00 00 */ li r0, 0 -/* 802FA2F8 90 1A 00 28 */ stw r0, 0x28(r26) -/* 802FA2FC 7F 24 CB 78 */ mr r4, r25 -/* 802FA300 38 A0 00 00 */ li r5, 0 -/* 802FA304 4B FE 3F A5 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802FA308 88 1A 00 3B */ lbz r0, 0x3b(r26) -/* 802FA30C 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802FA310 98 1A 00 3B */ stb r0, 0x3b(r26) -lbl_802FA314: -/* 802FA314 93 5B 01 04 */ stw r26, 0x104(r27) -lbl_802FA318: -/* 802FA318 7F 63 DB 78 */ mr r3, r27 -/* 802FA31C 7F 84 E3 78 */ mr r4, r28 -/* 802FA320 3C A0 54 49 */ lis r5, 0x5449 /* 0x54494D47@ha */ -/* 802FA324 38 A5 4D 47 */ addi r5, r5, 0x4D47 /* 0x54494D47@l */ -/* 802FA328 7F A6 EB 78 */ mr r6, r29 -/* 802FA32C 4B FF DA 8D */ bl getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive -/* 802FA330 7C 79 1B 79 */ or. r25, r3, r3 -/* 802FA334 41 82 00 38 */ beq lbl_802FA36C -/* 802FA338 38 60 00 40 */ li r3, 0x40 -/* 802FA33C 4B FD 49 11 */ bl __nw__FUl -/* 802FA340 7C 7A 1B 79 */ or. r26, r3, r3 -/* 802FA344 41 82 00 24 */ beq lbl_802FA368 -/* 802FA348 38 00 00 00 */ li r0, 0 -/* 802FA34C 90 1A 00 28 */ stw r0, 0x28(r26) -/* 802FA350 7F 24 CB 78 */ mr r4, r25 -/* 802FA354 38 A0 00 00 */ li r5, 0 -/* 802FA358 4B FE 3F 51 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802FA35C 88 1A 00 3B */ lbz r0, 0x3b(r26) -/* 802FA360 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802FA364 98 1A 00 3B */ stb r0, 0x3b(r26) -lbl_802FA368: -/* 802FA368 93 5B 01 08 */ stw r26, 0x108(r27) -lbl_802FA36C: -/* 802FA36C 7F 63 DB 78 */ mr r3, r27 -/* 802FA370 7F 84 E3 78 */ mr r4, r28 -/* 802FA374 3C A0 54 49 */ lis r5, 0x5449 /* 0x54494D47@ha */ -/* 802FA378 38 A5 4D 47 */ addi r5, r5, 0x4D47 /* 0x54494D47@l */ -/* 802FA37C 7F A6 EB 78 */ mr r6, r29 -/* 802FA380 4B FF DA 39 */ bl getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive -/* 802FA384 7C 79 1B 79 */ or. r25, r3, r3 -/* 802FA388 41 82 00 38 */ beq lbl_802FA3C0 -/* 802FA38C 38 60 00 40 */ li r3, 0x40 -/* 802FA390 4B FD 48 BD */ bl __nw__FUl -/* 802FA394 7C 7A 1B 79 */ or. r26, r3, r3 -/* 802FA398 41 82 00 24 */ beq lbl_802FA3BC -/* 802FA39C 38 00 00 00 */ li r0, 0 -/* 802FA3A0 90 1A 00 28 */ stw r0, 0x28(r26) -/* 802FA3A4 7F 24 CB 78 */ mr r4, r25 -/* 802FA3A8 38 A0 00 00 */ li r5, 0 -/* 802FA3AC 4B FE 3E FD */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802FA3B0 88 1A 00 3B */ lbz r0, 0x3b(r26) -/* 802FA3B4 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802FA3B8 98 1A 00 3B */ stb r0, 0x3b(r26) -lbl_802FA3BC: -/* 802FA3BC 93 5B 01 0C */ stw r26, 0x10c(r27) -lbl_802FA3C0: -/* 802FA3C0 7F 63 DB 78 */ mr r3, r27 -/* 802FA3C4 7F 84 E3 78 */ mr r4, r28 -/* 802FA3C8 3C A0 54 4C */ lis r5, 0x544C /* 0x544C5554@ha */ -/* 802FA3CC 38 A5 55 54 */ addi r5, r5, 0x5554 /* 0x544C5554@l */ -/* 802FA3D0 7F A6 EB 78 */ mr r6, r29 -/* 802FA3D4 4B FF D9 E5 */ bl getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive -/* 802FA3D8 7C 79 1B 79 */ or. r25, r3, r3 -/* 802FA3DC 41 82 00 24 */ beq lbl_802FA400 -/* 802FA3E0 38 60 00 18 */ li r3, 0x18 -/* 802FA3E4 4B FD 48 69 */ bl __nw__FUl -/* 802FA3E8 7C 7A 1B 79 */ or. r26, r3, r3 -/* 802FA3EC 41 82 00 10 */ beq lbl_802FA3FC -/* 802FA3F0 38 80 00 00 */ li r4, 0 -/* 802FA3F4 7F 25 CB 78 */ mr r5, r25 -/* 802FA3F8 4B FE 44 99 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802FA3FC: -/* 802FA3FC 93 5B 01 24 */ stw r26, 0x124(r27) -lbl_802FA400: -/* 802FA400 7F 83 E3 78 */ mr r3, r28 -/* 802FA404 38 81 00 08 */ addi r4, r1, 8 -/* 802FA408 38 A0 00 01 */ li r5, 1 -/* 802FA40C 4B FE 1E 8D */ bl read__14JSUInputStreamFPvl -/* 802FA410 88 01 00 08 */ lbz r0, 8(r1) -/* 802FA414 98 1B 01 44 */ stb r0, 0x144(r27) -/* 802FA418 7F 83 E3 78 */ mr r3, r28 -/* 802FA41C 38 81 00 28 */ addi r4, r1, 0x28 -/* 802FA420 38 A0 00 04 */ li r5, 4 -/* 802FA424 4B FE 1E 75 */ bl read__14JSUInputStreamFPvl -/* 802FA428 80 01 00 28 */ lwz r0, 0x28(r1) -/* 802FA42C 90 1B 01 28 */ stw r0, 0x128(r27) -/* 802FA430 7F 83 E3 78 */ mr r3, r28 -/* 802FA434 38 81 00 24 */ addi r4, r1, 0x24 -/* 802FA438 38 A0 00 04 */ li r5, 4 -/* 802FA43C 4B FE 1E 5D */ bl read__14JSUInputStreamFPvl -/* 802FA440 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FA444 90 1B 01 2C */ stw r0, 0x12c(r27) -/* 802FA448 7F 83 E3 78 */ mr r3, r28 -/* 802FA44C 38 81 00 20 */ addi r4, r1, 0x20 -/* 802FA450 38 A0 00 04 */ li r5, 4 -/* 802FA454 4B FE 1E 45 */ bl read__14JSUInputStreamFPvl -/* 802FA458 80 01 00 20 */ lwz r0, 0x20(r1) -/* 802FA45C 90 1B 01 30 */ stw r0, 0x130(r27) -/* 802FA460 7F 83 E3 78 */ mr r3, r28 -/* 802FA464 38 81 00 1C */ addi r4, r1, 0x1c -/* 802FA468 38 A0 00 04 */ li r5, 4 -/* 802FA46C 4B FE 1E 2D */ bl read__14JSUInputStreamFPvl -/* 802FA470 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 802FA474 90 1B 01 34 */ stw r0, 0x134(r27) -/* 802FA478 38 00 00 00 */ li r0, 0 -/* 802FA47C 90 1B 01 10 */ stw r0, 0x110(r27) -/* 802FA480 3B DE FF F2 */ addi r30, r30, -14 -/* 802FA484 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802FA488 41 82 00 5C */ beq lbl_802FA4E4 -/* 802FA48C 7F 63 DB 78 */ mr r3, r27 -/* 802FA490 7F 84 E3 78 */ mr r4, r28 -/* 802FA494 3C A0 54 49 */ lis r5, 0x5449 /* 0x54494D47@ha */ -/* 802FA498 38 A5 4D 47 */ addi r5, r5, 0x4D47 /* 0x54494D47@l */ -/* 802FA49C 7F A6 EB 78 */ mr r6, r29 -/* 802FA4A0 4B FF D9 19 */ bl getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive -/* 802FA4A4 7C 7A 1B 79 */ or. r26, r3, r3 -/* 802FA4A8 41 82 00 38 */ beq lbl_802FA4E0 -/* 802FA4AC 38 60 00 40 */ li r3, 0x40 -/* 802FA4B0 4B FD 47 9D */ bl __nw__FUl -/* 802FA4B4 7C 7D 1B 79 */ or. r29, r3, r3 -/* 802FA4B8 41 82 00 24 */ beq lbl_802FA4DC -/* 802FA4BC 38 00 00 00 */ li r0, 0 -/* 802FA4C0 90 1D 00 28 */ stw r0, 0x28(r29) -/* 802FA4C4 7F 44 D3 78 */ mr r4, r26 -/* 802FA4C8 38 A0 00 00 */ li r5, 0 -/* 802FA4CC 4B FE 3D DD */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802FA4D0 88 1D 00 3B */ lbz r0, 0x3b(r29) -/* 802FA4D4 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802FA4D8 98 1D 00 3B */ stb r0, 0x3b(r29) -lbl_802FA4DC: -/* 802FA4DC 93 BB 01 10 */ stw r29, 0x110(r27) -lbl_802FA4E0: -/* 802FA4E0 3B DE FF FF */ addi r30, r30, -1 -lbl_802FA4E4: -/* 802FA4E4 38 00 00 00 */ li r0, 0 -/* 802FA4E8 90 01 00 38 */ stw r0, 0x38(r1) -/* 802FA4EC 88 01 00 38 */ lbz r0, 0x38(r1) -/* 802FA4F0 98 1B 01 3C */ stb r0, 0x13c(r27) -/* 802FA4F4 88 01 00 39 */ lbz r0, 0x39(r1) -/* 802FA4F8 98 1B 01 3D */ stb r0, 0x13d(r27) -/* 802FA4FC 88 01 00 3A */ lbz r0, 0x3a(r1) -/* 802FA500 98 1B 01 3E */ stb r0, 0x13e(r27) -/* 802FA504 88 01 00 3B */ lbz r0, 0x3b(r1) -/* 802FA508 98 1B 01 3F */ stb r0, 0x13f(r27) -/* 802FA50C 38 00 FF FF */ li r0, -1 -/* 802FA510 90 01 00 34 */ stw r0, 0x34(r1) -/* 802FA514 88 01 00 34 */ lbz r0, 0x34(r1) -/* 802FA518 98 1B 01 38 */ stb r0, 0x138(r27) -/* 802FA51C 88 01 00 35 */ lbz r0, 0x35(r1) -/* 802FA520 98 1B 01 39 */ stb r0, 0x139(r27) -/* 802FA524 88 01 00 36 */ lbz r0, 0x36(r1) -/* 802FA528 98 1B 01 3A */ stb r0, 0x13a(r27) -/* 802FA52C 88 01 00 37 */ lbz r0, 0x37(r1) -/* 802FA530 98 1B 01 3B */ stb r0, 0x13b(r27) -/* 802FA534 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802FA538 41 82 00 40 */ beq lbl_802FA578 -/* 802FA53C 7F 83 E3 78 */ mr r3, r28 -/* 802FA540 38 81 00 18 */ addi r4, r1, 0x18 -/* 802FA544 38 A0 00 04 */ li r5, 4 -/* 802FA548 4B FE 1D 51 */ bl read__14JSUInputStreamFPvl -/* 802FA54C 80 01 00 18 */ lwz r0, 0x18(r1) -/* 802FA550 90 01 00 30 */ stw r0, 0x30(r1) -/* 802FA554 88 01 00 30 */ lbz r0, 0x30(r1) -/* 802FA558 98 1B 01 3C */ stb r0, 0x13c(r27) -/* 802FA55C 88 01 00 31 */ lbz r0, 0x31(r1) -/* 802FA560 98 1B 01 3D */ stb r0, 0x13d(r27) -/* 802FA564 88 01 00 32 */ lbz r0, 0x32(r1) -/* 802FA568 98 1B 01 3E */ stb r0, 0x13e(r27) -/* 802FA56C 88 01 00 33 */ lbz r0, 0x33(r1) -/* 802FA570 98 1B 01 3F */ stb r0, 0x13f(r27) -/* 802FA574 3B DE FF FF */ addi r30, r30, -1 -lbl_802FA578: -/* 802FA578 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802FA57C 41 82 00 3C */ beq lbl_802FA5B8 -/* 802FA580 7F 83 E3 78 */ mr r3, r28 -/* 802FA584 38 81 00 14 */ addi r4, r1, 0x14 -/* 802FA588 38 A0 00 04 */ li r5, 4 -/* 802FA58C 4B FE 1D 0D */ bl read__14JSUInputStreamFPvl -/* 802FA590 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FA594 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802FA598 88 01 00 2C */ lbz r0, 0x2c(r1) -/* 802FA59C 98 1B 01 38 */ stb r0, 0x138(r27) -/* 802FA5A0 88 01 00 2D */ lbz r0, 0x2d(r1) -/* 802FA5A4 98 1B 01 39 */ stb r0, 0x139(r27) -/* 802FA5A8 88 01 00 2E */ lbz r0, 0x2e(r1) -/* 802FA5AC 98 1B 01 3A */ stb r0, 0x13a(r27) -/* 802FA5B0 88 01 00 2F */ lbz r0, 0x2f(r1) -/* 802FA5B4 98 1B 01 3B */ stb r0, 0x13b(r27) -lbl_802FA5B8: -/* 802FA5B8 7F 83 E3 78 */ mr r3, r28 -/* 802FA5BC 80 01 00 40 */ lwz r0, 0x40(r1) -/* 802FA5C0 7C 9F 02 14 */ add r4, r31, r0 -/* 802FA5C4 38 A0 00 00 */ li r5, 0 -/* 802FA5C8 4B FE 1F 15 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802FA5CC 7F 63 DB 78 */ mr r3, r27 -/* 802FA5D0 48 00 00 35 */ bl initinfo2__9J2DWindowFv -/* 802FA5D4 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 802FA5D8 CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 802FA5DC E3 C1 00 A8 */ psq_l f30, 168(r1), 0, 0 /* qr0 */ -/* 802FA5E0 CB C1 00 A0 */ lfd f30, 0xa0(r1) -/* 802FA5E4 E3 A1 00 98 */ psq_l f29, 152(r1), 0, 0 /* qr0 */ -/* 802FA5E8 CB A1 00 90 */ lfd f29, 0x90(r1) -/* 802FA5EC 39 61 00 90 */ addi r11, r1, 0x90 -/* 802FA5F0 48 06 7C 29 */ bl _restgpr_25 -/* 802FA5F4 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 802FA5F8 7C 08 03 A6 */ mtlr r0 -/* 802FA5FC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802FA600 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h index 90fb5776c08..2308ab5b89c 100644 --- a/include/JSystem/J2DGraph/J2DWindow.h +++ b/include/JSystem/J2DGraph/J2DWindow.h @@ -61,6 +61,8 @@ public: /* 802FC024 */ virtual J2DMaterial* getContentsMaterial() const; /* 802FB338 */ virtual void drawContents(JGeometry::TBox2 const&); + bool isField0x145Set(u8 flag) { return field_0x145 & flag; } + void getContentsColor(TContentsColor& param_0) const { param_0.field_0x0 = field_0x128; param_0.field_0x4 = field_0x12C; diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp index 51b86deddf4..c7244c8bd99 100644 --- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp @@ -562,8 +562,6 @@ bool J2DTextBoxEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor para /* 803084CC-80308668 302E0C 019C+00 4/4 0/0 0/0 .text * getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor */ -// regalloc -#ifdef NONMATCHING bool J2DTextBoxEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const { if (mMaterial == NULL) { return false; @@ -577,23 +575,25 @@ bool J2DTextBoxEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* pa *param_0 = JUtility::TColor(0); *param_1 = JUtility::TColor(0xffffffff); if (tevStageNum) { - J2DGXColorS10 local_30(*mMaterial->getTevBlock()->getTevColor(0)); - J2DGXColorS10 local_38(*mMaterial->getTevBlock()->getTevColor(1)); - *param_0 = JUtility::TColor((((u8)local_30.r) << 24) | (((u8)local_30.g) << 16) | (((u8)local_30.b) << 8) | ((u8)local_30.a)); - *param_1 = JUtility::TColor((((u8)local_38.r) << 24) | (((u8)local_38.g) << 16) | (((u8)local_38.b) << 8) | ((u8)local_38.a)); + J2DGXColorS10* local_30 = mMaterial->getTevBlock()->getTevColor(0); + s16 color0r = local_30->r; + s16 color0g = local_30->g; + s16 color0b = local_30->b; + s16 color0a = local_30->a; + J2DGXColorS10* local_38 = mMaterial->getTevBlock()->getTevColor(1); + s16 color1r = local_38->r; + s16 color1g = local_38->g; + s16 color1b = local_38->b; + s16 color1a = local_38->a; + *param_0 = JUtility::TColor( + (((u8)color0r) << 24) | (((u8)color0g) << 16) | (((u8)color0b) << 8) | + ((u8)color0a)); + *param_1 = JUtility::TColor( + (((u8)color1r) << 24) | (((u8)color1g) << 16) | (((u8)color1b) << 8) | + ((u8)color1a)); } return true; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTextBoxEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor.s" -} -#pragma pop -#endif /* 80308668-803086FC 302FA8 0094+00 1/1 0/0 0/0 .text * isSetBlackWhite__12J2DTextBoxExCFQ28JUtility6TColorQ28JUtility6TColor */ diff --git a/libs/JSystem/J2DGraph/J2DWindow.cpp b/libs/JSystem/J2DGraph/J2DWindow.cpp index 8885dda62ad..6b332cd3e66 100644 --- a/libs/JSystem/J2DGraph/J2DWindow.cpp +++ b/libs/JSystem/J2DGraph/J2DWindow.cpp @@ -8,166 +8,19 @@ #include "JSystem/JUtility/JUTPalette.h" #include "JSystem/JUtility/JUTResource.h" #include "JSystem/JUtility/JUTTexture.h" -#include "dol2asm.h" // // Forward References: // -extern "C" void __ct__9J2DWindowFv(); -extern "C" void __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive(); -extern "C" void __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial(); -extern "C" void private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive(); -extern "C" void initinfo2__9J2DWindowFv(); -extern "C" void __dt__9J2DWindowFv(); -extern "C" void func_802FA928(); -extern "C" void func_802FAA5C(); -extern "C" void func_802FAED0(); -extern "C" void resize__9J2DWindowFff(); -extern "C" void -setContentsColor__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void drawSelf__9J2DWindowFff(); -extern "C" void drawSelf__9J2DWindowFffPA3_A4_f(); -extern "C" void func_802FB338(); -extern "C" void drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb(); -extern "C" void drawFrameTexture__9J2DWindowFP10JUTTextureffbbb(); -extern "C" void drawContentsTexture__9J2DWindowFffff(); -extern "C" void setTevMode__9J2DWindowFP10JUTTextureQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void getFrameTexture__9J2DWindowCFUcUc(); -extern "C" void isUsed__9J2DWindowFPC7ResTIMG(); -extern "C" s32 getTypeID__9J2DWindowCFv(); -extern "C" void draw__9J2DWindowFffff(); -extern "C" void getContentsTexture__9J2DWindowCFUc(); -extern "C" void getMaterial__9J2DWindowCFRQ29J2DWindow9TMaterial(); -extern "C" bool getFrameMaterial__9J2DWindowCFUc(); -extern "C" bool getContentsMaterial__9J2DWindowCFv(); -extern "C" void isUsed__9J2DWindowFPC7ResFONT(); -extern "C" void rewriteAlpha__9J2DWindowFv(); - // // External References: // -extern "C" void setAlpha__7J2DPaneFUc(); -extern "C" void calcMtx__7J2DPaneFv(); -extern "C" void makeMatrix__7J2DPaneFff(); -extern "C" void setAnimation__7J2DPaneFP15J2DAnmTevRegKey(); -extern "C" void setAnimation__7J2DPaneFP11J2DAnmColor(); -extern "C" void setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey(); -extern "C" void getBlack__9J2DWindowCFv(); -extern "C" void getWhite__9J2DWindowCFv(); -extern "C" void setWhite__9J2DWindowFQ28JUtility6TColor(); -extern "C" void setBlack__9J2DWindowFQ28JUtility6TColor(); -extern "C" void setBlackWhite__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void setAnimation__7J2DPaneFP14J2DAnmVtxColor(); -extern "C" void setAnimation__7J2DPaneFP20J2DAnmVisibilityFull(); -extern "C" void setAnimation__7J2DPaneFP16J2DAnmTexPattern(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void read__14JSUInputStreamFPvl(); -extern "C" void peek__20JSURandomInputStreamFPvl(); -extern "C" void seek__20JSURandomInputStreamFl17JSUStreamSeekFrom(); -extern "C" void __dt__10JUTTextureFv(); -extern "C" void storeTIMG__10JUTTextureFPC7ResTIMGUc(); -extern "C" void load__10JUTTextureF11_GXTexMapID(); -extern "C" void storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT(); -extern "C" void __ct__7J2DPaneFv(); -extern "C" void makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream(); -extern "C" void __dt__7J2DPaneFv(); -extern "C" void move__7J2DPaneFff(); -extern "C" void add__7J2DPaneFff(); -extern "C" void resize__7J2DPaneFff(); -extern "C" void func_802F7264(); -extern "C" void search__7J2DPaneFUx(); -extern "C" void searchUserInfo__7J2DPaneFUx(); -extern "C" void isUsed__7J2DPaneFPC7ResTIMG(); -extern "C" void isUsed__7J2DPaneFPC7ResFONT(); -extern "C" void makeMatrix__7J2DPaneFffff(); -extern "C" void setCullBack__7J2DPaneF11_GXCullMode(); -extern "C" void makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream(); -extern "C" void getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive(); -extern "C" void setAnimation__7J2DPaneFP10J2DAnmBase(); -extern "C" void setAnimation__7J2DPaneFP15J2DAnmTransform(); -extern "C" void clearAnmTransform__7J2DPaneFv(); -extern "C" void animationTransform__7J2DPaneFPC15J2DAnmTransform(); -extern "C" void setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull(); -extern "C" void setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor(); -extern "C" void animationPane__7J2DPaneFPC15J2DAnmTransform(); -extern "C" void setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull(); -extern "C" void setAnimationVC__7J2DPaneFP14J2DAnmVtxColor(); -extern "C" void setCullBack__7J2DPaneFb(); -extern "C" void setConnectParent__7J2DPaneFb(); -extern "C" void update__7J2DPaneFv(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); - // // Declarations: // -/* ############################################################################################## */ -/* 803CD108-803CD1D8 02A228 00CC+04 4/4 0/0 0/0 .data __vt__9J2DWindow */ -SECTION_DATA extern void* __vt__9J2DWindow[51 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9J2DWindowFv, - (void*)getTypeID__9J2DWindowCFv, - (void*)move__7J2DPaneFff, - (void*)add__7J2DPaneFff, - (void*)resize__9J2DWindowFff, - (void*)setCullBack__7J2DPaneFb, - (void*)setCullBack__7J2DPaneF11_GXCullMode, - (void*)setAlpha__7J2DPaneFUc, - (void*)setConnectParent__7J2DPaneFb, - (void*)calcMtx__7J2DPaneFv, - (void*)update__7J2DPaneFv, - (void*)drawSelf__9J2DWindowFff, - (void*)drawSelf__9J2DWindowFffPA3_A4_f, - (void*)search__7J2DPaneFUx, - (void*)searchUserInfo__7J2DPaneFUx, - (void*)makeMatrix__7J2DPaneFff, - (void*)makeMatrix__7J2DPaneFffff, - (void*)isUsed__9J2DWindowFPC7ResTIMG, - (void*)isUsed__9J2DWindowFPC7ResFONT, - (void*)clearAnmTransform__7J2DPaneFv, - (void*)rewriteAlpha__9J2DWindowFv, - (void*)setAnimation__7J2DPaneFP10J2DAnmBase, - (void*)setAnimation__7J2DPaneFP15J2DAnmTransform, - (void*)setAnimation__7J2DPaneFP11J2DAnmColor, - (void*)setAnimation__7J2DPaneFP16J2DAnmTexPattern, - (void*)setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey, - (void*)setAnimation__7J2DPaneFP15J2DAnmTevRegKey, - (void*)setAnimation__7J2DPaneFP20J2DAnmVisibilityFull, - (void*)setAnimation__7J2DPaneFP14J2DAnmVtxColor, - (void*)animationTransform__7J2DPaneFPC15J2DAnmTransform, - (void*)setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull, - (void*)setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull, - (void*)setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor, - (void*)setAnimationVC__7J2DPaneFP14J2DAnmVtxColor, - (void*)animationPane__7J2DPaneFPC15J2DAnmTransform, - (void*)func_802FA928, - (void*)func_802FAED0, - (void*)draw__9J2DWindowFffff, - (void*)setBlack__9J2DWindowFQ28JUtility6TColor, - (void*)setWhite__9J2DWindowFQ28JUtility6TColor, - (void*)setBlackWhite__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColor, - (void*)getBlack__9J2DWindowCFv, - (void*)getWhite__9J2DWindowCFv, - (void*)getFrameTexture__9J2DWindowCFUcUc, - (void*)getContentsTexture__9J2DWindowCFUc, - (void*)getMaterial__9J2DWindowCFRQ29J2DWindow9TMaterial, - (void*)getFrameMaterial__9J2DWindowCFUc, - (void*)getContentsMaterial__9J2DWindowCFv, - (void*)func_802FB338, - /* padding */ - NULL, -}; /* 802F9A7C-802F9B74 2F43BC 00F8+00 0/0 1/1 0/0 .text __ct__9J2DWindowFv */ J2DWindow::J2DWindow() @@ -187,40 +40,133 @@ J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, JKRArchive private_readStream(param_0, param_1, param_2); } -/* ############################################################################################## */ -/* 803A1C10-803A1C20 02E270 0010+00 1/1 0/0 0/0 .rodata @1831 */ -SECTION_RODATA static u8 const lit_1831[16] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +struct J2DWindowData { + u8 field_0x0[0x10]; + u16 field_0x10[4]; + u8 field_0x18; + u8 field_0x19; + u16 field_0x1a; + u16 field_0x1c; + u16 field_0x1e; + u16 field_0x20; + u16 field_0x22; + u16 field_0x24; + u8 field_0x26[0xa]; + u32 field_0x30[4]; }; -COMPILER_STRIP_GATE(0x803A1C10, &lit_1831); - -/* 803A1C20-803A1C30 02E280 0010+00 1/1 0/0 0/0 .rodata @1849 */ -SECTION_RODATA static u8 const lit_1849[16] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x803A1C20, &lit_1849); - -/* 80456240-80456248 004840 0008+00 7/7 0/0 0/0 .sdata2 @1971 */ -SECTION_SDATA2 static f64 lit_1971 = 4503601774854144.0 /* cast s32 to float */; - -/* 80456248-80456250 004848 0008+00 2/2 0/0 0/0 .sdata2 @1974 */ -SECTION_SDATA2 static f64 lit_1974 = 4503599627370496.0 /* cast u32 to float */; /* 802F9C10-802FA118 2F4550 0508+00 0/0 1/1 0/0 .text * __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, J2DMaterial* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/__ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial.s" +J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, J2DMaterial* param_2) : + field_0x100(NULL), + field_0x104(NULL), + field_0x108(NULL), + field_0x10c(NULL), + field_0x110(NULL), + mPalette(NULL) { + u32 auStack_78[2]; + u32 position = param_1->getPosition(); + param_1->read(auStack_78, 8); + mKind = 'WIN1'; + u32 local_dc = param_1->getPosition(); + int auStack_b8[2]; + param_1->peek(auStack_b8, 8); + makePaneExStream(param_0, param_1); + param_1->seek(local_dc + auStack_b8[1], JSUStreamSeekFrom_SET); + J2DWindowData buffer; + param_1->read(&buffer, sizeof(J2DWindowData)); + + JUtility::TColor* colors[4] = { + &field_0x128, + &field_0x12C, + &field_0x130, + &field_0x134, + }; + + u16 local_c0[4]; + J2DMaterial *local_98[4]; + for (int iVar7 = 0; iVar7 < 4; iVar7++) { + local_c0[iVar7] = buffer.field_0x10[iVar7]; + local_98[iVar7] = NULL; + if (local_c0[iVar7] != 0xffff) { + local_98[iVar7] = param_2 + local_c0[iVar7]; + } + *colors[iVar7] = JUtility::TColor(buffer.field_0x30[iVar7]); + } + + field_0x144 = buffer.field_0x18; + field_0x114.set( + buffer.field_0x1a, + buffer.field_0x1c, + buffer.field_0x1a + buffer.field_0x1e, + buffer.field_0x1c + buffer.field_0x20); + u16 temp = buffer.field_0x24; + J2DMaterial* pJVar5 = NULL; + if (temp != 0xffff) { + pJVar5 = param_2 + temp; + } + + param_1->seek(position + auStack_78[1], JSUStreamSeekFrom_SET); + if (local_98[0] != NULL) { + mAlpha = local_98[0]->getColorBlock()->getMatColor(0)->a; + } + + mBlack = JUtility::TColor(0); + mWhite = JUtility::TColor(0xffffffff); + + if (local_98[0] != NULL && local_98[0]->getTevBlock() != NULL) { + if (local_98[0]->getTevBlock()->getTevStageNum() != 1) { + J2DGXColorS10* local_c8 = local_98[0]->getTevBlock()->getTevColor(0); + s16 blackr = local_c8->r; + s16 blackg = local_c8->g; + s16 blackb = local_c8->b; + s16 blacka = local_c8->a; + J2DGXColorS10* local_d0 = local_98[0]->getTevBlock()->getTevColor(1); + s16 whiter = local_d0->r; + s16 whiteg = local_d0->g; + s16 whiteb = local_d0->b; + s16 whitea = local_d0->a; + mBlack = JUtility::TColor( + (((u8)blackr) << 24) | (((u8)blackg) << 16) | (((u8)blackb) << 8) | + ((u8)blacka)); + mWhite = JUtility::TColor( + (((u8)whiter) << 24) | (((u8)whiteg) << 16) | (((u8)whiteb) << 8) | + ((u8)whitea)); + } + } + + JUTTexture** textures[4] = { + &field_0x100, + &field_0x104, + &field_0x108, + &field_0x10c, + }; + + J2DMaterial * mat; + for (u32 uVar6 = 0; uVar6 < 4; uVar6++) { + mat = local_98[uVar6]; + if (mat != NULL && mat->getTevBlock() != NULL) { + JUTTexture* local_e0 = mat->getTevBlock()->getTexture(0); + if (local_e0 != NULL) { + *textures[uVar6] = local_e0; + mat->getTevBlock()->setUndeleteFlag(0xfe); + } + } + } + + field_0x110 = NULL; + if (pJVar5 != NULL && pJVar5->getTevBlock() != NULL) { + JUTTexture* local_e0 = pJVar5->getTevBlock()->getTexture(0); + if (local_e0 != NULL) { + field_0x110 = local_e0; + pJVar5->getTevBlock()->setUndeleteFlag(0xfe); + } + } + initinfo2(); } -#pragma pop /* 802FA118-802FA604 2F4A58 04EC+00 1/1 0/0 0/0 .text * private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */ -// matches with literals -#ifdef NONMATCHING void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param_1, JKRArchive* param_2) { s32 local_188 = param_1->getPosition(); @@ -281,21 +227,8 @@ void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param param_1->seek(local_188 + local_180[1], JSUStreamSeekFrom_SET); initinfo2(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param_1, - JKRArchive* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s" -} -#pragma pop -#endif /* 802FA604-802FA880 2F4F44 027C+00 2/2 0/0 0/0 .text initinfo2__9J2DWindowFv */ -// regswap -#ifdef NOTIMPLEMENTED void J2DWindow::initinfo2() { if (field_0x100 && field_0x104 && field_0x108 && field_0x10c) { field_0x140 = field_0x100->getWidth() + field_0x104->getWidth(); @@ -319,16 +252,6 @@ void J2DWindow::initinfo2() { field_0x145 |= 4; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::initinfo2() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/initinfo2__9J2DWindowFv.s" -} -#pragma pop -#endif /* 802FA880-802FA928 2F51C0 00A8+00 1/0 1/1 0/0 .text __dt__9J2DWindowFv */ J2DWindow::~J2DWindow() { @@ -340,18 +263,7 @@ J2DWindow::~J2DWindow() { delete field_0x110; } -/* ############################################################################################## */ -/* 80456250-80456254 004850 0004+00 5/5 0/0 0/0 .sdata2 @2156 */ -SECTION_SDATA2 static u8 lit_2156[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 802FA928-802FAA5C 2F5268 0134+00 1/0 0/0 0/0 .text draw__9J2DWindowFRCQ29JGeometry8TBox2 */ -// matches with literals -#ifdef NONMATCHING void J2DWindow::draw(JGeometry::TBox2 const& param_0) { JGeometry::TBox2 stack_58; if (field_0x100 && field_0x104 && field_0x108 && field_0x10c) { @@ -363,21 +275,9 @@ void J2DWindow::draw(JGeometry::TBox2 const& param_0) { } draw(param_0, stack_58); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::draw(JGeometry::TBox2 const& param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/func_802FA928.s" -} -#pragma pop -#endif /* 802FAA5C-802FAED0 2F539C 0474+00 2/2 0/0 0/0 .text * draw_private__9J2DWindowFRCQ29JGeometry8TBox2RCQ29JGeometry8TBox2 */ -// instruction order -#ifdef NONMATCHING void J2DWindow::draw_private(JGeometry::TBox2 const& param_0, JGeometry::TBox2 const& param_1) { JGeometry::TBox2 stack_a0(param_1); @@ -396,48 +296,83 @@ void J2DWindow::draw_private(JGeometry::TBox2 const& param_0, f32 f27 = f29 + field_0x100->getWidth(); f32 f26 = f28 + field_0x100->getHeight(); drawFrameTexture(field_0x100, f29, f28, field_0x144 & 0x80, field_0x144 & 0x40, true); - bool r24 = field_0x145 & 1; + bool r24 = isField0x145Set(1); drawFrameTexture(field_0x104, f31, f28, field_0x144 & 0x20, field_0x144 & 0x10, r24); - u16 local_a6 = field_0x144 & 0x20 ? 0x8000 : 0; - u16 local_a8 = field_0x144 & 0x10 ? 0 : 0x8000; + u16 local_a6; + if (field_0x144 & 0x20) { + local_a6 = 0x8000; + } else { + local_a6 = 0; + } + u16 local_a8; + if (field_0x144 & 0x10) { + local_a8 = 0; + } else { + local_a8 = 0x8000; + } + u16 local_a82 = local_a8 ^ 0x8000; + drawFrameTexture(field_0x104, f27, f28, f31 - f27, field_0x104->getHeight(), local_a6, - local_a8, local_a6, local_a8, false); - drawFrameTexture(field_0x10c, f31, f30, field_0x144 & 2, field_0x144 & 1, field_0x145 & 2); - u16 local_aa = field_0x144 & 2 ? 0x8000 : 0; - u16 local_ac = field_0x144 & 1 ? 0 : 0x8000; + local_a8, local_a6, local_a82, false); + bool isset2 = isField0x145Set(2); + drawFrameTexture(field_0x10c, f31, f30, field_0x144 & 2, field_0x144 & 1, isset2); + u16 local_aa; + if (field_0x144 & 2) { + local_aa = 0x8000; + } else { + local_aa = 0; + } + u16 local_ac; + if (field_0x144 & 1) { + local_ac = 0; + } else { + local_ac = 0x8000; + } + local_a82 = local_ac ^ 0x8000; drawFrameTexture(field_0x10c, f27, f30, f31 - f27, field_0x10c->getHeight(), local_aa, - local_ac, local_aa, local_ac, false); - u16 local_ae = field_0x144 & 2 ? 0 : 0x8000; - u16 local_b0 = field_0x144 & 1 ? 0x8000 : 0; + local_ac, local_aa, local_a82, false); + u16 local_ae; + if (field_0x144 & 2) { + local_ae = 0; + } else { + local_ae = 0x8000; + } + u16 local_ae2 = local_ae ^ 0x8000; + u16 local_b0; + if (field_0x144 & 1) { + local_b0 = 0x8000; + } else { + local_b0 = 0; + } drawFrameTexture(field_0x10c, f31, f26, field_0x10c->getWidth(), f30 - f26, local_ae, - local_b0, local_ae, local_b0, false); - drawFrameTexture(field_0x108, f29, f30, field_0x144 & 8, field_0x144 & 4, field_0x145 & 4); - u16 local_b2 = field_0x144 & 8 ? 0 : 0x8000; - u16 local_b4 = field_0x144 & 4 ? 0x8000 : 0; + local_b0, local_ae2, local_b0, false); + bool isset4 = isField0x145Set(4); + drawFrameTexture(field_0x108, f29, f30, field_0x144 & 8, field_0x144 & 4, isset4); + + u16 local_b2; + if (field_0x144 & 8) { + local_b2 = 0; + } else { + local_b2 = 0x8000; + } + u16 local_b22 = local_b2 ^ 0x8000; + u16 local_b4; + if (field_0x144 & 4) { + local_b4 = 0x8000; + } else { + local_b4 = 0; + } drawFrameTexture(field_0x108, f29, f26, field_0x108->getWidth(), f30 - f26, local_b2, - local_b4, local_b2, local_b4, false); + local_b4, local_b22, local_b4, false); } GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR); GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); GXSetNumTexGens(0); GXSetVtxDesc(GX_VA_TEX0, GX_NONE); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::draw_private(JGeometry::TBox2 const& param_0, - JGeometry::TBox2 const& param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/func_802FAA5C.s" -} -#pragma pop -#endif /* 802FAED0-802FB000 2F5810 0130+00 1/0 0/0 0/0 .text * draw__9J2DWindowFRCQ29JGeometry8TBox2RCQ29JGeometry8TBox2 */ -// matches with literals -#ifdef NONMATCHING void J2DWindow::draw(JGeometry::TBox2 const& param_0, JGeometry::TBox2 const& param_1) { if (param_0.getWidth() >= field_0x140 && param_0.getHeight() >= field_0x142 && isVisible()) { makeMatrix(param_0.i.x, param_0.i.y, 0, 0); @@ -451,17 +386,6 @@ void J2DWindow::draw(JGeometry::TBox2 const& param_0, JGeometry::TBox2 GXLoadPosMtxImm(stack_60, GX_PNMTX0); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::draw(JGeometry::TBox2 const& param_0, - JGeometry::TBox2 const& param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/func_802FAED0.s" -} -#pragma pop -#endif /* 802FB000-802FB12C 2F5940 012C+00 1/0 1/0 0/0 .text resize__9J2DWindowFff */ void J2DWindow::resize(f32 param_0, f32 param_1) { @@ -498,8 +422,6 @@ void J2DWindow::drawSelf(f32 param_0, f32 param_1) { } /* 802FB240-802FB338 2F5B80 00F8+00 1/0 0/0 0/0 .text drawSelf__9J2DWindowFffPA3_A4_f */ -// matches with literals -#ifdef NONMATCHING void J2DWindow::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { JGeometry::TBox2 stack_50(mBounds); stack_50.addPos(JGeometry::TVec2(param_0, param_1)); @@ -511,21 +433,9 @@ void J2DWindow::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { } clip(field_0x114); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/drawSelf__9J2DWindowFffPA3_A4_f.s" -} -#pragma pop -#endif /* 802FB338-802FB634 2F5C78 02FC+00 1/0 0/0 0/0 .text * drawContents__9J2DWindowFRCQ29JGeometry8TBox2 */ -// matches with literals -#ifdef NONMATCHING void J2DWindow::drawContents(JGeometry::TBox2 const& param_0) { if (param_0.isValid()) { GXSetNumChans(1); @@ -582,21 +492,9 @@ void J2DWindow::drawContents(JGeometry::TBox2 const& param_0) { } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::drawContents(JGeometry::TBox2 const& param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/func_802FB338.s" -} -#pragma pop -#endif /* 802FB634-802FB7C8 2F5F74 0194+00 2/2 0/0 0/0 .text * drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb */ -// matches with literals -#ifdef NONMATCHING void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, u16 param_5, u16 param_6, u16 param_7, u16 param_8, bool param_9) { @@ -624,23 +522,9 @@ void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, i_GXEnd(); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, f32 param_3, - f32 param_4, u16 param_5, u16 param_6, u16 param_7, - u16 param_8, bool param_9) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb.s" -} -#pragma pop -#endif /* 802FB7C8-802FB868 2F6108 00A0+00 1/1 0/0 0/0 .text * drawFrameTexture__9J2DWindowFP10JUTTextureffbbb */ -// matches with literals -#ifdef NONMATCHING void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, bool param_3, bool param_4, bool param_5) { u16 r31 = param_4 ? u16(0x8000) : u16(0); @@ -650,41 +534,17 @@ void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, drawFrameTexture(param_0, param_1, param_2, param_0->getWidth(), param_0->getHeight(), r28, r29, r30, r31, param_5); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, bool param_3, - bool param_4, bool param_5) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/drawFrameTexture__9J2DWindowFP10JUTTextureffbbb.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80456254-80456258 004854 0004+00 1/1 0/0 0/0 .sdata2 @2984 */ -SECTION_SDATA2 static f32 lit_2984 = 1.0f; - -/* 80456258-80456260 004858 0004+04 1/1 0/0 0/0 .sdata2 @2985 */ -SECTION_SDATA2 static f32 lit_2985[1 + 1 /* padding */] = { - 0.5f, - /* padding */ - 0.0f, -}; /* 802FB868-802FBB90 2F61A8 0328+00 1/1 0/0 0/0 .text drawContentsTexture__9J2DWindowFffff */ -// instruction order -#ifdef NONMATCHING void J2DWindow::drawContentsTexture(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { f32 f29 = param_0 + param_2; f32 f28 = param_1 + param_3; - f32 f27 = field_0x110->getWidth(); - f32 f26 = field_0x110->getHeight(); - f32 f31 = -(param_2 / f27 - 1.0f) * 0.5f; - f32 f30 = -(param_3 / f26 - 1.0f) * 0.5f; - f32 f25 = f31 + param_2 / f27; - f32 f24 = f30 + param_3 / f26; + f32 width = field_0x110->getWidth(); + f32 height = field_0x110->getHeight(); + f32 f27 = -(param_2 / width - 1.0f) / 2.0f; + f32 f26 = -(param_3 / height - 1.0f) / 2.0f; + f32 f25 = f27 + param_2 / width; + f32 f24 = f26 + param_3 / height; TContentsColor stack_f0; getContentsColor(stack_f0); if (mColorAlpha != 0xff) { @@ -700,30 +560,20 @@ void J2DWindow::drawContentsTexture(f32 param_0, f32 param_1, f32 param_2, f32 p GXBegin(GX_QUADS, GX_VTXFMT0, 4); GXPosition3f32(param_0, param_1, 0.0f); GXColor1u32(stack_f0.field_0x0); - GXTexCoord2f32(f31, f30); + GXTexCoord2f32(f27, f26); GXPosition3f32(f29, param_1, 0.0f); GXColor1u32(stack_f0.field_0x4); - GXTexCoord2f32(f25, f30); + GXTexCoord2f32(f25, f26); GXPosition3f32(f29, f28, 0.0f); GXColor1u32(stack_f0.field_0xc); GXTexCoord2f32(f25, f24); GXPosition3f32(param_0, f28, 0.0f); GXColor1u32(stack_f0.field_0x8); - GXTexCoord2f32(f31, f24); + GXTexCoord2f32(f27, f24); i_GXEnd(); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBX8, 0xf); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindow::drawContentsTexture(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindow/drawContentsTexture__9J2DWindowFffff.s" -} -#pragma pop -#endif static inline void GXSetTexCoordGen(GXTexCoordID dst, GXTexGenType type, GXTexGenSrc src, u32 mtx) { GXSetTexCoordGen2(dst, type, src, mtx, GX_FALSE, GX_PTIDENTITY);