From 202e3c51c091c9b77060711995ce329de00b39c4 Mon Sep 17 00:00:00 2001 From: lepelog <25211966+lepelog@users.noreply.github.com> Date: Sat, 11 Dec 2021 23:39:53 +0100 Subject: [PATCH] J2DPane (#168) * most of J2DPane * finish j2dpane * cleanup * use J2DBlendInfo --- .../J2DCast_F32_to_S16__7J2DPaneFfUc.s | 53 - ...DPaneFP7J2DPaneP20JSURandomInputStreamUc.s | 77 -- .../J2DGraph/J2DPane/__dt__7J2DPaneFv.s | 63 -- .../J2DGraph/J2DPane/__sinit_J2DPane_cpp.s | 8 - .../changeUseTrans__7J2DPaneFP7J2DPane.s | 109 -- .../draw__7J2DPaneFffPC14J2DGrafContextbb.s | 356 ------- asm/JSystem/J2DGraph/J2DPane/func_802F5D40.s | 37 - asm/JSystem/J2DGraph/J2DPane/func_802F5DD0.s | 49 - asm/JSystem/J2DGraph/J2DPane/func_802F5E88.s | 33 - asm/JSystem/J2DGraph/J2DPane/func_802F5F08.s | 38 - asm/JSystem/J2DGraph/J2DPane/func_802F6D18.s | 158 --- asm/JSystem/J2DGraph/J2DPane/func_802F7264.s | 35 - .../J2DGraph/J2DPane/getBounds__7J2DPaneFv.s | 57 -- .../J2DPane/getFirstChildPane__7J2DPaneFv.s | 18 - .../J2DPane/getGlbVtx__7J2DPaneCFUc.s | 64 -- ...eFP20JSURandomInputStreamUlP10JKRArchive.s | 84 -- ...insertChild__7J2DPaneFP7J2DPaneP7J2DPane.s | 59 -- .../J2DPane/makeMatrix__7J2DPaneFffff.s | 81 -- ...J2DPaneFP7J2DPaneP20JSURandomInputStream.s | 131 --- ...J2DPaneFP7J2DPaneP20JSURandomInputStream.s | 213 ---- .../J2DGraph/J2DPane/move__7J2DPaneFff.s | 22 - .../J2DGraph/J2DPane/resize__7J2DPaneFff.s | 68 -- .../setAnimation__7J2DPaneFP10J2DAnmBase.s | 54 - .../J2DPane/setInfluencedAlpha__7J2DPaneFbb.s | 128 --- ...eTransform__7J2DPaneFPC15J2DAnmTransform.s | 68 -- include/JSystem/J2DGraph/J2DAnimation.h | 1 + include/JSystem/J2DGraph/J2DGrafContext.h | 15 +- include/JSystem/J2DGraph/J2DManage.h | 4 +- include/JSystem/J2DGraph/J2DMatBlock.h | 2 +- include/JSystem/J2DGraph/J2DPane.h | 18 +- include/JSystem/J2DGraph/J2DScreen.h | 2 + include/JSystem/JGeometry.h | 6 +- include/JSystem/JSupport/JSUInputStream.h | 24 + include/JSystem/JSupport/JSUList.h | 58 +- include/JSystem/JUtility/JUTResource.h | 14 + libs/JSystem/J2DGraph/J2DGrafContext.cpp | 48 +- libs/JSystem/J2DGraph/J2DManage.cpp | 4 +- libs/JSystem/J2DGraph/J2DPane.cpp | 960 +++++++++--------- libs/JSystem/JUtility/JUTResource.cpp | 22 +- src/d/a/d_a_alink.cpp | 6 +- src/d/d_drawlist.cpp | 3 +- 41 files changed, 583 insertions(+), 2667 deletions(-) delete mode 100644 asm/JSystem/J2DGraph/J2DPane/J2DCast_F32_to_S16__7J2DPaneFfUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/__ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/__dt__7J2DPaneFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/__sinit_J2DPane_cpp.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/changeUseTrans__7J2DPaneFP7J2DPane.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/draw__7J2DPaneFffPC14J2DGrafContextbb.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/func_802F5D40.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/func_802F5DD0.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/func_802F5E88.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/func_802F5F08.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/func_802F6D18.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/func_802F7264.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/getBounds__7J2DPaneFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/getFirstChildPane__7J2DPaneFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/getGlbVtx__7J2DPaneCFUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/insertChild__7J2DPaneFP7J2DPaneP7J2DPane.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/makeMatrix__7J2DPaneFffff.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/move__7J2DPaneFff.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/resize__7J2DPaneFff.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP10J2DAnmBase.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/setInfluencedAlpha__7J2DPaneFbb.s delete mode 100644 asm/JSystem/J2DGraph/J2DPane/updateTransform__7J2DPaneFPC15J2DAnmTransform.s diff --git a/asm/JSystem/J2DGraph/J2DPane/J2DCast_F32_to_S16__7J2DPaneFfUc.s b/asm/JSystem/J2DGraph/J2DPane/J2DCast_F32_to_S16__7J2DPaneFfUc.s deleted file mode 100644 index 3d6cad987ff..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/J2DCast_F32_to_S16__7J2DPaneFfUc.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_802F7D00: -/* 802F7D00 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F7D04 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802F7D08 28 00 00 0F */ cmplwi r0, 0xf -/* 802F7D0C 41 80 00 0C */ blt lbl_802F7D18 -/* 802F7D10 38 60 00 00 */ li r3, 0 -/* 802F7D14 48 00 00 9C */ b lbl_802F7DB0 -lbl_802F7D18: -/* 802F7D18 FC 60 08 90 */ fmr f3, f1 -/* 802F7D1C C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F7D20 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802F7D24 40 80 00 08 */ bge lbl_802F7D2C -/* 802F7D28 FC 60 08 50 */ fneg f3, f1 -lbl_802F7D2C: -/* 802F7D2C 38 80 00 01 */ li r4, 1 -/* 802F7D30 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802F7D34 7C 80 00 30 */ slw r0, r4, r0 -/* 802F7D38 C8 42 C7 F8 */ lfd f2, lit_1651(r2) -/* 802F7D3C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F7D40 90 01 00 0C */ stw r0, 0xc(r1) -/* 802F7D44 3C 00 43 30 */ lis r0, 0x4330 -/* 802F7D48 90 01 00 08 */ stw r0, 8(r1) -/* 802F7D4C C8 01 00 08 */ lfd f0, 8(r1) -/* 802F7D50 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F7D54 EC 03 00 32 */ fmuls f0, f3, f0 -/* 802F7D58 FC 00 00 1E */ fctiwz f0, f0 -/* 802F7D5C D8 01 00 10 */ stfd f0, 0x10(r1) -/* 802F7D60 80 81 00 14 */ lwz r4, 0x14(r1) -/* 802F7D64 3C 60 00 01 */ lis r3, 0x0001 /* 0x00008000@ha */ -/* 802F7D68 38 03 80 00 */ addi r0, r3, 0x8000 /* 0x00008000@l */ -/* 802F7D6C 7C 04 00 00 */ cmpw r4, r0 -/* 802F7D70 41 80 00 20 */ blt lbl_802F7D90 -/* 802F7D74 C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F7D78 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802F7D7C 40 80 00 0C */ bge lbl_802F7D88 -/* 802F7D80 38 60 80 00 */ li r3, -32768 -/* 802F7D84 48 00 00 2C */ b lbl_802F7DB0 -lbl_802F7D88: -/* 802F7D88 38 60 7F FF */ li r3, 0x7fff -/* 802F7D8C 48 00 00 24 */ b lbl_802F7DB0 -lbl_802F7D90: -/* 802F7D90 C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F7D94 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802F7D98 40 80 00 14 */ bge lbl_802F7DAC -/* 802F7D9C 7C 83 20 F8 */ nor r3, r4, r4 -/* 802F7DA0 38 03 00 01 */ addi r0, r3, 1 -/* 802F7DA4 7C 03 07 34 */ extsh r3, r0 -/* 802F7DA8 48 00 00 08 */ b lbl_802F7DB0 -lbl_802F7DAC: -/* 802F7DAC 7C 83 07 34 */ extsh r3, r4 -lbl_802F7DB0: -/* 802F7DB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F7DB4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/__ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc.s b/asm/JSystem/J2DGraph/J2DPane/__ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc.s deleted file mode 100644 index be710b45944..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/__ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_802F5F9C: -/* 802F5F9C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802F5FA0 7C 08 02 A6 */ mflr r0 -/* 802F5FA4 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F5FA8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F5FAC 48 06 C2 29 */ bl _savegpr_27 -/* 802F5FB0 7C 7B 1B 78 */ mr r27, r3 -/* 802F5FB4 7C 9D 23 78 */ mr r29, r4 -/* 802F5FB8 7C BE 2B 78 */ mr r30, r5 -/* 802F5FBC 7C DF 33 78 */ mr r31, r6 -/* 802F5FC0 3C 60 80 3D */ lis r3, __vt__7J2DPane@ha /* 0x803CCFD0@ha */ -/* 802F5FC4 38 03 CF D0 */ addi r0, r3, __vt__7J2DPane@l /* 0x803CCFD0@l */ -/* 802F5FC8 90 1B 00 00 */ stw r0, 0(r27) -/* 802F5FCC 3B 9B 00 DC */ addi r28, r27, 0xdc -/* 802F5FD0 7F 83 E3 78 */ mr r3, r28 -/* 802F5FD4 4B FE 5F 41 */ bl initiate__10JSUPtrListFv -/* 802F5FD8 38 7C 00 0C */ addi r3, r28, 0xc -/* 802F5FDC 7F 64 DB 78 */ mr r4, r27 -/* 802F5FE0 4B FE 5E 1D */ bl __ct__10JSUPtrLinkFPv -/* 802F5FE4 38 00 00 00 */ li r0, 0 -/* 802F5FE8 90 1B 00 F8 */ stw r0, 0xf8(r27) -/* 802F5FEC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802F5FF0 40 82 00 60 */ bne lbl_802F6050 -/* 802F5FF4 7F C3 F3 78 */ mr r3, r30 -/* 802F5FF8 81 9E 00 00 */ lwz r12, 0(r30) -/* 802F5FFC 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F6000 7D 89 03 A6 */ mtctr r12 -/* 802F6004 4E 80 04 21 */ bctrl -/* 802F6008 7C 7F 1B 78 */ mr r31, r3 -/* 802F600C 7F C3 F3 78 */ mr r3, r30 -/* 802F6010 38 81 00 10 */ addi r4, r1, 0x10 -/* 802F6014 38 A0 00 08 */ li r5, 8 -/* 802F6018 4B FE 62 81 */ bl read__14JSUInputStreamFPvl -/* 802F601C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 802F6020 90 1B 00 08 */ stw r0, 8(r27) -/* 802F6024 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F6028 7F FF 02 14 */ add r31, r31, r0 -/* 802F602C 7F 63 DB 78 */ mr r3, r27 -/* 802F6030 7F A4 EB 78 */ mr r4, r29 -/* 802F6034 7F C5 F3 78 */ mr r5, r30 -/* 802F6038 48 00 00 8D */ bl makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream -/* 802F603C 7F C3 F3 78 */ mr r3, r30 -/* 802F6040 7F E4 FB 78 */ mr r4, r31 -/* 802F6044 38 A0 00 00 */ li r5, 0 -/* 802F6048 4B FE 64 95 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F604C 48 00 00 5C */ b lbl_802F60A8 -lbl_802F6050: -/* 802F6050 7F C3 F3 78 */ mr r3, r30 -/* 802F6054 81 9E 00 00 */ lwz r12, 0(r30) -/* 802F6058 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F605C 7D 89 03 A6 */ mtctr r12 -/* 802F6060 4E 80 04 21 */ bctrl -/* 802F6064 7C 7F 1B 78 */ mr r31, r3 -/* 802F6068 7F C3 F3 78 */ mr r3, r30 -/* 802F606C 38 81 00 08 */ addi r4, r1, 8 -/* 802F6070 38 A0 00 08 */ li r5, 8 -/* 802F6074 4B FE 63 E5 */ bl peek__20JSURandomInputStreamFPvl -/* 802F6078 80 01 00 08 */ lwz r0, 8(r1) -/* 802F607C 90 1B 00 08 */ stw r0, 8(r27) -/* 802F6080 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802F6084 7F FF 02 14 */ add r31, r31, r0 -/* 802F6088 7F 63 DB 78 */ mr r3, r27 -/* 802F608C 7F A4 EB 78 */ mr r4, r29 -/* 802F6090 7F C5 F3 78 */ mr r5, r30 -/* 802F6094 48 00 1A 85 */ bl makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream -/* 802F6098 7F C3 F3 78 */ mr r3, r30 -/* 802F609C 7F E4 FB 78 */ mr r4, r31 -/* 802F60A0 38 A0 00 00 */ li r5, 0 -/* 802F60A4 4B FE 64 39 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -lbl_802F60A8: -/* 802F60A8 7F 63 DB 78 */ mr r3, r27 -/* 802F60AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F60B0 48 06 C1 71 */ bl _restgpr_27 -/* 802F60B4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802F60B8 7C 08 03 A6 */ mtlr r0 -/* 802F60BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F60C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/__dt__7J2DPaneFv.s b/asm/JSystem/J2DGraph/J2DPane/__dt__7J2DPaneFv.s deleted file mode 100644 index 20a774b0d78..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/__dt__7J2DPaneFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_802F658C: -/* 802F658C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F6590 7C 08 02 A6 */ mflr r0 -/* 802F6594 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F6598 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F659C 48 06 BC 41 */ bl _savegpr_29 -/* 802F65A0 7C 7D 1B 79 */ or. r29, r3, r3 -/* 802F65A4 7C 9E 23 78 */ mr r30, r4 -/* 802F65A8 41 82 00 A8 */ beq lbl_802F6650 -/* 802F65AC 3C 60 80 3D */ lis r3, __vt__7J2DPane@ha /* 0x803CCFD0@ha */ -/* 802F65B0 38 03 CF D0 */ addi r0, r3, __vt__7J2DPane@l /* 0x803CCFD0@l */ -/* 802F65B4 90 1D 00 00 */ stw r0, 0(r29) -/* 802F65B8 83 FD 00 DC */ lwz r31, 0xdc(r29) -/* 802F65BC 28 1F 00 00 */ cmplwi r31, 0 -/* 802F65C0 41 82 00 48 */ beq lbl_802F6608 -/* 802F65C4 3B FF FF F4 */ addi r31, r31, -12 -/* 802F65C8 48 00 00 40 */ b lbl_802F6608 -lbl_802F65CC: -/* 802F65CC 93 E1 00 08 */ stw r31, 8(r1) -/* 802F65D0 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F65D4 28 1F 00 00 */ cmplwi r31, 0 -/* 802F65D8 41 82 00 08 */ beq lbl_802F65E0 -/* 802F65DC 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F65E0: -/* 802F65E0 80 61 00 08 */ lwz r3, 8(r1) -/* 802F65E4 90 61 00 0C */ stw r3, 0xc(r1) -/* 802F65E8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802F65EC 28 03 00 00 */ cmplwi r3, 0 -/* 802F65F0 41 82 00 18 */ beq lbl_802F6608 -/* 802F65F4 38 80 00 01 */ li r4, 1 -/* 802F65F8 81 83 00 00 */ lwz r12, 0(r3) -/* 802F65FC 81 8C 00 08 */ lwz r12, 8(r12) -/* 802F6600 7D 89 03 A6 */ mtctr r12 -/* 802F6604 4E 80 04 21 */ bctrl -lbl_802F6608: -/* 802F6608 28 1F 00 00 */ cmplwi r31, 0 -/* 802F660C 40 82 FF C0 */ bne lbl_802F65CC -/* 802F6610 34 1D 00 DC */ addic. r0, r29, 0xdc -/* 802F6614 41 82 00 2C */ beq lbl_802F6640 -/* 802F6618 34 1D 00 E8 */ addic. r0, r29, 0xe8 -/* 802F661C 41 82 00 10 */ beq lbl_802F662C -/* 802F6620 38 7D 00 E8 */ addi r3, r29, 0xe8 -/* 802F6624 38 80 00 00 */ li r4, 0 -/* 802F6628 4B FE 57 ED */ bl __dt__10JSUPtrLinkFv -lbl_802F662C: -/* 802F662C 34 1D 00 DC */ addic. r0, r29, 0xdc -/* 802F6630 41 82 00 10 */ beq lbl_802F6640 -/* 802F6634 38 7D 00 DC */ addi r3, r29, 0xdc -/* 802F6638 38 80 00 00 */ li r4, 0 -/* 802F663C 4B FE 58 71 */ bl __dt__10JSUPtrListFv -lbl_802F6640: -/* 802F6640 7F C0 07 35 */ extsh. r0, r30 -/* 802F6644 40 81 00 0C */ ble lbl_802F6650 -/* 802F6648 7F A3 EB 78 */ mr r3, r29 -/* 802F664C 4B FD 86 F1 */ bl __dl__FPv -lbl_802F6650: -/* 802F6650 7F A3 EB 78 */ mr r3, r29 -/* 802F6654 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F6658 48 06 BB D1 */ bl _restgpr_29 -/* 802F665C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F6660 7C 08 03 A6 */ mtlr r0 -/* 802F6664 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F6668 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/__sinit_J2DPane_cpp.s b/asm/JSystem/J2DGraph/J2DPane/__sinit_J2DPane_cpp.s deleted file mode 100644 index 0c52e67f1c9..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/__sinit_J2DPane_cpp.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_802F847C: -/* 802F847C C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F8480 3C 60 80 43 */ lis r3, static_mBounds__7J2DPane@ha /* 0x804349B0@ha */ -/* 802F8484 D4 03 49 B0 */ stfsu f0, static_mBounds__7J2DPane@l(r3) /* 0x804349B0@l */ -/* 802F8488 D0 03 00 04 */ stfs f0, 4(r3) -/* 802F848C D0 03 00 08 */ stfs f0, 8(r3) -/* 802F8490 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 802F8494 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/changeUseTrans__7J2DPaneFP7J2DPane.s b/asm/JSystem/J2DGraph/J2DPane/changeUseTrans__7J2DPaneFP7J2DPane.s deleted file mode 100644 index eeea07eba84..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/changeUseTrans__7J2DPaneFP7J2DPane.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_802F63F8: -/* 802F63F8 C0 42 C7 F0 */ lfs f2, lit_1469(r2) -/* 802F63FC FC 60 10 90 */ fmr f3, f2 -/* 802F6400 88 C3 00 B7 */ lbz r6, 0xb7(r3) -/* 802F6404 38 A0 00 03 */ li r5, 3 -/* 802F6408 7C 06 2B D6 */ divw r0, r6, r5 -/* 802F640C 7C 00 29 D6 */ mullw r0, r0, r5 -/* 802F6410 7C 00 30 50 */ subf r0, r0, r6 -/* 802F6414 2C 00 00 01 */ cmpwi r0, 1 -/* 802F6418 40 82 00 1C */ bne lbl_802F6434 -/* 802F641C C0 23 00 28 */ lfs f1, 0x28(r3) -/* 802F6420 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F6424 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802F6428 C0 02 C8 08 */ lfs f0, lit_1725(r2) -/* 802F642C EC 41 00 32 */ fmuls f2, f1, f0 -/* 802F6430 48 00 00 18 */ b lbl_802F6448 -lbl_802F6434: -/* 802F6434 2C 00 00 02 */ cmpwi r0, 2 -/* 802F6438 40 82 00 10 */ bne lbl_802F6448 -/* 802F643C C0 23 00 28 */ lfs f1, 0x28(r3) -/* 802F6440 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F6444 EC 41 00 28 */ fsubs f2, f1, f0 -lbl_802F6448: -/* 802F6448 38 00 00 03 */ li r0, 3 -/* 802F644C 7C 06 03 D6 */ divw r0, r6, r0 -/* 802F6450 2C 00 00 01 */ cmpwi r0, 1 -/* 802F6454 40 82 00 1C */ bne lbl_802F6470 -/* 802F6458 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802F645C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F6460 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802F6464 C0 02 C8 08 */ lfs f0, lit_1725(r2) -/* 802F6468 EC 61 00 32 */ fmuls f3, f1, f0 -/* 802F646C 48 00 00 18 */ b lbl_802F6484 -lbl_802F6470: -/* 802F6470 2C 00 00 02 */ cmpwi r0, 2 -/* 802F6474 40 82 00 10 */ bne lbl_802F6484 -/* 802F6478 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802F647C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F6480 EC 61 00 28 */ fsubs f3, f1, f0 -lbl_802F6484: -/* 802F6484 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F6488 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F648C D0 03 00 D4 */ stfs f0, 0xd4(r3) -/* 802F6490 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F6494 EC 00 18 2A */ fadds f0, f0, f3 -/* 802F6498 D0 03 00 D8 */ stfs f0, 0xd8(r3) -/* 802F649C D0 43 00 C4 */ stfs f2, 0xc4(r3) -/* 802F64A0 D0 63 00 C8 */ stfs f3, 0xc8(r3) -/* 802F64A4 C0 03 00 D4 */ lfs f0, 0xd4(r3) -/* 802F64A8 FC 20 00 50 */ fneg f1, f0 -/* 802F64AC C0 03 00 D8 */ lfs f0, 0xd8(r3) -/* 802F64B0 FC 40 00 50 */ fneg f2, f0 -/* 802F64B4 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F64B8 EC 00 08 2A */ fadds f0, f0, f1 -/* 802F64BC D0 03 00 20 */ stfs f0, 0x20(r3) -/* 802F64C0 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F64C4 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F64C8 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 802F64CC C0 03 00 28 */ lfs f0, 0x28(r3) -/* 802F64D0 EC 00 08 2A */ fadds f0, f0, f1 -/* 802F64D4 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 802F64D8 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 802F64DC EC 00 10 2A */ fadds f0, f0, f2 -/* 802F64E0 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 802F64E4 28 04 00 00 */ cmplwi r4, 0 -/* 802F64E8 4D 82 00 20 */ beqlr -/* 802F64EC 88 A4 00 B7 */ lbz r5, 0xb7(r4) -/* 802F64F0 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 802F64F4 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 802F64F8 EC 41 00 28 */ fsubs f2, f1, f0 -/* 802F64FC C0 24 00 2C */ lfs f1, 0x2c(r4) -/* 802F6500 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 802F6504 EC 61 00 28 */ fsubs f3, f1, f0 -/* 802F6508 38 80 00 03 */ li r4, 3 -/* 802F650C 7C 05 23 D6 */ divw r0, r5, r4 -/* 802F6510 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802F6514 7C 00 28 50 */ subf r0, r0, r5 -/* 802F6518 2C 00 00 01 */ cmpwi r0, 1 -/* 802F651C 40 82 00 1C */ bne lbl_802F6538 -/* 802F6520 C0 23 00 D4 */ lfs f1, 0xd4(r3) -/* 802F6524 C0 02 C8 08 */ lfs f0, lit_1725(r2) -/* 802F6528 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802F652C EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F6530 D0 03 00 D4 */ stfs f0, 0xd4(r3) -/* 802F6534 48 00 00 18 */ b lbl_802F654C -lbl_802F6538: -/* 802F6538 2C 00 00 02 */ cmpwi r0, 2 -/* 802F653C 40 82 00 10 */ bne lbl_802F654C -/* 802F6540 C0 03 00 D4 */ lfs f0, 0xd4(r3) -/* 802F6544 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F6548 D0 03 00 D4 */ stfs f0, 0xd4(r3) -lbl_802F654C: -/* 802F654C 38 00 00 03 */ li r0, 3 -/* 802F6550 7C 05 03 D6 */ divw r0, r5, r0 -/* 802F6554 2C 00 00 01 */ cmpwi r0, 1 -/* 802F6558 40 82 00 1C */ bne lbl_802F6574 -/* 802F655C C0 23 00 D8 */ lfs f1, 0xd8(r3) -/* 802F6560 C0 02 C8 08 */ lfs f0, lit_1725(r2) -/* 802F6564 EC 03 00 32 */ fmuls f0, f3, f0 -/* 802F6568 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F656C D0 03 00 D8 */ stfs f0, 0xd8(r3) -/* 802F6570 4E 80 00 20 */ blr -lbl_802F6574: -/* 802F6574 2C 00 00 02 */ cmpwi r0, 2 -/* 802F6578 4C 82 00 20 */ bnelr -/* 802F657C C0 03 00 D8 */ lfs f0, 0xd8(r3) -/* 802F6580 EC 00 18 28 */ fsubs f0, f0, f3 -/* 802F6584 D0 03 00 D8 */ stfs f0, 0xd8(r3) -/* 802F6588 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/draw__7J2DPaneFffPC14J2DGrafContextbb.s b/asm/JSystem/J2DGraph/J2DPane/draw__7J2DPaneFffPC14J2DGrafContextbb.s deleted file mode 100644 index 239630a514a..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/draw__7J2DPaneFffPC14J2DGrafContextbb.s +++ /dev/null @@ -1,356 +0,0 @@ -lbl_802F67E0: -/* 802F67E0 94 21 FE F0 */ stwu r1, -0x110(r1) -/* 802F67E4 7C 08 02 A6 */ mflr r0 -/* 802F67E8 90 01 01 14 */ stw r0, 0x114(r1) -/* 802F67EC DB E1 01 00 */ stfd f31, 0x100(r1) -/* 802F67F0 F3 E1 01 08 */ psq_st f31, 264(r1), 0, 0 /* qr0 */ -/* 802F67F4 DB C1 00 F0 */ stfd f30, 0xf0(r1) -/* 802F67F8 F3 C1 00 F8 */ psq_st f30, 248(r1), 0, 0 /* qr0 */ -/* 802F67FC 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 802F6800 48 06 B9 D5 */ bl _savegpr_27 -/* 802F6804 7C 7B 1B 78 */ mr r27, r3 -/* 802F6808 FF C0 08 90 */ fmr f30, f1 -/* 802F680C FF E0 10 90 */ fmr f31, f2 -/* 802F6810 7C 9C 23 78 */ mr r28, r4 -/* 802F6814 7C BD 2B 78 */ mr r29, r5 -/* 802F6818 3B E0 00 00 */ li r31, 0 -/* 802F681C 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 802F6820 41 82 00 14 */ beq lbl_802F6834 -/* 802F6824 88 1B 00 B0 */ lbz r0, 0xb0(r27) -/* 802F6828 28 00 00 00 */ cmplwi r0, 0 -/* 802F682C 41 82 00 08 */ beq lbl_802F6834 -/* 802F6830 3B E0 00 01 */ li r31, 1 -lbl_802F6834: -/* 802F6834 7F 83 E3 78 */ mr r3, r28 -/* 802F6838 81 9C 00 00 */ lwz r12, 0(r28) -/* 802F683C 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802F6840 7D 89 03 A6 */ mtctr r12 -/* 802F6844 4E 80 04 21 */ bctrl -/* 802F6848 2C 03 00 01 */ cmpwi r3, 1 -/* 802F684C 41 82 00 08 */ beq lbl_802F6854 -/* 802F6850 3B A0 00 00 */ li r29, 0 -lbl_802F6854: -/* 802F6854 80 7B 00 EC */ lwz r3, 0xec(r27) -/* 802F6858 3B C0 00 00 */ li r30, 0 -/* 802F685C 28 03 00 00 */ cmplwi r3, 0 -/* 802F6860 41 82 00 08 */ beq lbl_802F6868 -/* 802F6864 83 C3 00 0C */ lwz r30, 0xc(r3) -lbl_802F6868: -/* 802F6868 38 00 00 00 */ li r0, 0 -/* 802F686C C0 3B 00 28 */ lfs f1, 0x28(r27) -/* 802F6870 C0 1B 00 20 */ lfs f0, 0x20(r27) -/* 802F6874 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802F6878 4C 41 13 82 */ cror 2, 1, 2 -/* 802F687C 40 82 00 1C */ bne lbl_802F6898 -/* 802F6880 C0 3B 00 2C */ lfs f1, 0x2c(r27) -/* 802F6884 C0 1B 00 24 */ lfs f0, 0x24(r27) -/* 802F6888 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802F688C 4C 41 13 82 */ cror 2, 1, 2 -/* 802F6890 40 82 00 08 */ bne lbl_802F6898 -/* 802F6894 38 00 00 01 */ li r0, 1 -lbl_802F6898: -/* 802F6898 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802F689C 41 82 04 54 */ beq lbl_802F6CF0 -/* 802F68A0 80 7B 00 20 */ lwz r3, 0x20(r27) -/* 802F68A4 80 1B 00 24 */ lwz r0, 0x24(r27) -/* 802F68A8 90 7B 00 30 */ stw r3, 0x30(r27) -/* 802F68AC 90 1B 00 34 */ stw r0, 0x34(r27) -/* 802F68B0 80 7B 00 28 */ lwz r3, 0x28(r27) -/* 802F68B4 80 1B 00 2C */ lwz r0, 0x2c(r27) -/* 802F68B8 90 7B 00 38 */ stw r3, 0x38(r27) -/* 802F68BC 90 1B 00 3C */ stw r0, 0x3c(r27) -/* 802F68C0 C0 3B 00 D4 */ lfs f1, 0xd4(r27) -/* 802F68C4 C0 5B 00 D8 */ lfs f2, 0xd8(r27) -/* 802F68C8 C0 1B 00 30 */ lfs f0, 0x30(r27) -/* 802F68CC EC 00 08 2A */ fadds f0, f0, f1 -/* 802F68D0 D0 1B 00 30 */ stfs f0, 0x30(r27) -/* 802F68D4 C0 1B 00 34 */ lfs f0, 0x34(r27) -/* 802F68D8 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F68DC D0 1B 00 34 */ stfs f0, 0x34(r27) -/* 802F68E0 C0 1B 00 38 */ lfs f0, 0x38(r27) -/* 802F68E4 EC 00 08 2A */ fadds f0, f0, f1 -/* 802F68E8 D0 1B 00 38 */ stfs f0, 0x38(r27) -/* 802F68EC C0 1B 00 3C */ lfs f0, 0x3c(r27) -/* 802F68F0 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F68F4 D0 1B 00 3C */ stfs f0, 0x3c(r27) -/* 802F68F8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802F68FC 41 82 00 38 */ beq lbl_802F6934 -/* 802F6900 80 7B 00 20 */ lwz r3, 0x20(r27) -/* 802F6904 80 1B 00 24 */ lwz r0, 0x24(r27) -/* 802F6908 90 7B 00 40 */ stw r3, 0x40(r27) -/* 802F690C 90 1B 00 44 */ stw r0, 0x44(r27) -/* 802F6910 80 7B 00 28 */ lwz r3, 0x28(r27) -/* 802F6914 80 1B 00 2C */ lwz r0, 0x2c(r27) -/* 802F6918 90 7B 00 48 */ stw r3, 0x48(r27) -/* 802F691C 90 1B 00 4C */ stw r0, 0x4c(r27) -/* 802F6920 7F 63 DB 78 */ mr r3, r27 -/* 802F6924 81 9B 00 00 */ lwz r12, 0(r27) -/* 802F6928 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 802F692C 7D 89 03 A6 */ mtctr r12 -/* 802F6930 4E 80 04 21 */ bctrl -lbl_802F6934: -/* 802F6934 28 1E 00 00 */ cmplwi r30, 0 -/* 802F6938 41 82 01 1C */ beq lbl_802F6A54 -/* 802F693C C0 3E 00 30 */ lfs f1, 0x30(r30) -/* 802F6940 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 802F6944 EC 41 00 28 */ fsubs f2, f1, f0 -/* 802F6948 C0 3E 00 34 */ lfs f1, 0x34(r30) -/* 802F694C C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 802F6950 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802F6954 C0 1B 00 30 */ lfs f0, 0x30(r27) -/* 802F6958 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F695C D0 1B 00 30 */ stfs f0, 0x30(r27) -/* 802F6960 C0 1B 00 34 */ lfs f0, 0x34(r27) -/* 802F6964 EC 00 08 2A */ fadds f0, f0, f1 -/* 802F6968 D0 1B 00 34 */ stfs f0, 0x34(r27) -/* 802F696C C0 1B 00 38 */ lfs f0, 0x38(r27) -/* 802F6970 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F6974 D0 1B 00 38 */ stfs f0, 0x38(r27) -/* 802F6978 C0 1B 00 3C */ lfs f0, 0x3c(r27) -/* 802F697C EC 00 08 2A */ fadds f0, f0, f1 -/* 802F6980 D0 1B 00 3C */ stfs f0, 0x3c(r27) -/* 802F6984 38 7E 00 80 */ addi r3, r30, 0x80 -/* 802F6988 38 9B 00 50 */ addi r4, r27, 0x50 -/* 802F698C 38 BB 00 80 */ addi r5, r27, 0x80 -/* 802F6990 48 04 FB 55 */ bl PSMTXConcat -/* 802F6994 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802F6998 41 82 01 44 */ beq lbl_802F6ADC -/* 802F699C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 802F69A0 41 82 00 84 */ beq lbl_802F6A24 -/* 802F69A4 80 7B 00 30 */ lwz r3, 0x30(r27) -/* 802F69A8 80 1B 00 34 */ lwz r0, 0x34(r27) -/* 802F69AC 90 7B 00 40 */ stw r3, 0x40(r27) -/* 802F69B0 90 1B 00 44 */ stw r0, 0x44(r27) -/* 802F69B4 80 7B 00 38 */ lwz r3, 0x38(r27) -/* 802F69B8 80 1B 00 3C */ lwz r0, 0x3c(r27) -/* 802F69BC 90 7B 00 48 */ stw r3, 0x48(r27) -/* 802F69C0 90 1B 00 4C */ stw r0, 0x4c(r27) -/* 802F69C4 C0 1B 00 40 */ lfs f0, 0x40(r27) -/* 802F69C8 C0 3E 00 40 */ lfs f1, 0x40(r30) -/* 802F69CC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 802F69D0 4C 40 13 82 */ cror 2, 0, 2 -/* 802F69D4 40 82 00 08 */ bne lbl_802F69DC -/* 802F69D8 D0 3B 00 40 */ stfs f1, 0x40(r27) -lbl_802F69DC: -/* 802F69DC C0 1B 00 44 */ lfs f0, 0x44(r27) -/* 802F69E0 C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 802F69E4 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 802F69E8 4C 40 13 82 */ cror 2, 0, 2 -/* 802F69EC 40 82 00 08 */ bne lbl_802F69F4 -/* 802F69F0 D0 3B 00 44 */ stfs f1, 0x44(r27) -lbl_802F69F4: -/* 802F69F4 C0 1B 00 48 */ lfs f0, 0x48(r27) -/* 802F69F8 C0 3E 00 48 */ lfs f1, 0x48(r30) -/* 802F69FC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 802F6A00 4C 41 13 82 */ cror 2, 1, 2 -/* 802F6A04 40 82 00 08 */ bne lbl_802F6A0C -/* 802F6A08 D0 3B 00 48 */ stfs f1, 0x48(r27) -lbl_802F6A0C: -/* 802F6A0C C0 1B 00 4C */ lfs f0, 0x4c(r27) -/* 802F6A10 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 802F6A14 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 802F6A18 4C 41 13 82 */ cror 2, 1, 2 -/* 802F6A1C 40 82 00 08 */ bne lbl_802F6A24 -/* 802F6A20 D0 3B 00 4C */ stfs f1, 0x4c(r27) -lbl_802F6A24: -/* 802F6A24 88 1B 00 B2 */ lbz r0, 0xb2(r27) -/* 802F6A28 98 1B 00 B3 */ stb r0, 0xb3(r27) -/* 802F6A2C 88 1B 00 B4 */ lbz r0, 0xb4(r27) -/* 802F6A30 28 00 00 00 */ cmplwi r0, 0 -/* 802F6A34 41 82 00 A8 */ beq lbl_802F6ADC -/* 802F6A38 88 7B 00 B2 */ lbz r3, 0xb2(r27) -/* 802F6A3C 88 1E 00 B3 */ lbz r0, 0xb3(r30) -/* 802F6A40 7C 63 01 D6 */ mullw r3, r3, r0 -/* 802F6A44 38 00 00 FF */ li r0, 0xff -/* 802F6A48 7C 03 03 D6 */ divw r0, r3, r0 -/* 802F6A4C 98 1B 00 B3 */ stb r0, 0xb3(r27) -/* 802F6A50 48 00 00 8C */ b lbl_802F6ADC -lbl_802F6A54: -/* 802F6A54 C0 1B 00 30 */ lfs f0, 0x30(r27) -/* 802F6A58 EC 00 F0 2A */ fadds f0, f0, f30 -/* 802F6A5C D0 1B 00 30 */ stfs f0, 0x30(r27) -/* 802F6A60 C0 1B 00 34 */ lfs f0, 0x34(r27) -/* 802F6A64 EC 00 F8 2A */ fadds f0, f0, f31 -/* 802F6A68 D0 1B 00 34 */ stfs f0, 0x34(r27) -/* 802F6A6C C0 1B 00 38 */ lfs f0, 0x38(r27) -/* 802F6A70 EC 00 F0 2A */ fadds f0, f0, f30 -/* 802F6A74 D0 1B 00 38 */ stfs f0, 0x38(r27) -/* 802F6A78 C0 1B 00 3C */ lfs f0, 0x3c(r27) -/* 802F6A7C EC 00 F8 2A */ fadds f0, f0, f31 -/* 802F6A80 D0 1B 00 3C */ stfs f0, 0x3c(r27) -/* 802F6A84 7F 63 DB 78 */ mr r3, r27 -/* 802F6A88 C0 1B 00 D4 */ lfs f0, 0xd4(r27) -/* 802F6A8C EC 20 F0 2A */ fadds f1, f0, f30 -/* 802F6A90 C0 1B 00 D8 */ lfs f0, 0xd8(r27) -/* 802F6A94 EC 40 F8 2A */ fadds f2, f0, f31 -/* 802F6A98 81 9B 00 00 */ lwz r12, 0(r27) -/* 802F6A9C 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 802F6AA0 7D 89 03 A6 */ mtctr r12 -/* 802F6AA4 4E 80 04 21 */ bctrl -/* 802F6AA8 38 7B 00 50 */ addi r3, r27, 0x50 -/* 802F6AAC 38 9B 00 80 */ addi r4, r27, 0x80 -/* 802F6AB0 48 04 FA 01 */ bl PSMTXCopy -/* 802F6AB4 80 7B 00 30 */ lwz r3, 0x30(r27) -/* 802F6AB8 80 1B 00 34 */ lwz r0, 0x34(r27) -/* 802F6ABC 90 7B 00 40 */ stw r3, 0x40(r27) -/* 802F6AC0 90 1B 00 44 */ stw r0, 0x44(r27) -/* 802F6AC4 80 7B 00 38 */ lwz r3, 0x38(r27) -/* 802F6AC8 80 1B 00 3C */ lwz r0, 0x3c(r27) -/* 802F6ACC 90 7B 00 48 */ stw r3, 0x48(r27) -/* 802F6AD0 90 1B 00 4C */ stw r0, 0x4c(r27) -/* 802F6AD4 88 1B 00 B2 */ lbz r0, 0xb2(r27) -/* 802F6AD8 98 1B 00 B3 */ stb r0, 0xb3(r27) -lbl_802F6ADC: -/* 802F6ADC C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F6AE0 D0 01 00 08 */ stfs f0, 8(r1) -/* 802F6AE4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802F6AE8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F6AEC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802F6AF0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802F6AF4 41 82 00 1C */ beq lbl_802F6B10 -/* 802F6AF8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 802F6AFC 41 82 00 14 */ beq lbl_802F6B10 -/* 802F6B00 7F 83 E3 78 */ mr r3, r28 -/* 802F6B04 38 81 00 08 */ addi r4, r1, 8 -/* 802F6B08 38 BB 00 40 */ addi r5, r27, 0x40 -/* 802F6B0C 4B FF 2D 71 */ bl func_802E987C -lbl_802F6B10: -/* 802F6B10 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802F6B14 41 82 01 94 */ beq lbl_802F6CA8 -/* 802F6B18 38 00 00 00 */ li r0, 0 -/* 802F6B1C C0 3B 00 48 */ lfs f1, 0x48(r27) -/* 802F6B20 C0 1B 00 40 */ lfs f0, 0x40(r27) -/* 802F6B24 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802F6B28 4C 41 13 82 */ cror 2, 1, 2 -/* 802F6B2C 40 82 00 1C */ bne lbl_802F6B48 -/* 802F6B30 C0 3B 00 4C */ lfs f1, 0x4c(r27) -/* 802F6B34 C0 1B 00 44 */ lfs f0, 0x44(r27) -/* 802F6B38 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802F6B3C 4C 41 13 82 */ cror 2, 1, 2 -/* 802F6B40 40 82 00 08 */ bne lbl_802F6B48 -/* 802F6B44 38 00 00 01 */ li r0, 1 -lbl_802F6B48: -/* 802F6B48 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802F6B4C 40 82 00 0C */ bne lbl_802F6B58 -/* 802F6B50 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 802F6B54 40 82 01 54 */ bne lbl_802F6CA8 -lbl_802F6B58: -/* 802F6B58 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802F6B5C 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802F6B60 90 01 00 18 */ stw r0, 0x18(r1) -/* 802F6B64 C0 1C 00 04 */ lfs f0, 4(r28) -/* 802F6B68 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 802F6B6C C0 1C 00 08 */ lfs f0, 8(r28) -/* 802F6B70 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 802F6B74 C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 802F6B78 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 802F6B7C C0 1C 00 10 */ lfs f0, 0x10(r28) -/* 802F6B80 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 802F6B84 C0 1C 00 14 */ lfs f0, 0x14(r28) -/* 802F6B88 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 802F6B8C C0 1C 00 18 */ lfs f0, 0x18(r28) -/* 802F6B90 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 802F6B94 C0 1C 00 1C */ lfs f0, 0x1c(r28) -/* 802F6B98 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 802F6B9C C0 1C 00 20 */ lfs f0, 0x20(r28) -/* 802F6BA0 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 802F6BA4 80 1C 00 24 */ lwz r0, 0x24(r28) -/* 802F6BA8 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802F6BAC 80 1C 00 28 */ lwz r0, 0x28(r28) -/* 802F6BB0 90 01 00 40 */ stw r0, 0x40(r1) -/* 802F6BB4 80 1C 00 2C */ lwz r0, 0x2c(r28) -/* 802F6BB8 90 01 00 44 */ stw r0, 0x44(r1) -/* 802F6BBC 80 1C 00 30 */ lwz r0, 0x30(r28) -/* 802F6BC0 90 01 00 48 */ stw r0, 0x48(r1) -/* 802F6BC4 88 1C 00 34 */ lbz r0, 0x34(r28) -/* 802F6BC8 98 01 00 4C */ stb r0, 0x4c(r1) -/* 802F6BCC C0 1C 00 38 */ lfs f0, 0x38(r28) -/* 802F6BD0 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 802F6BD4 C0 1C 00 3C */ lfs f0, 0x3c(r28) -/* 802F6BD8 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 802F6BDC 38 A1 00 54 */ addi r5, r1, 0x54 -/* 802F6BE0 38 9C 00 3C */ addi r4, r28, 0x3c -/* 802F6BE4 38 00 00 08 */ li r0, 8 -/* 802F6BE8 7C 09 03 A6 */ mtctr r0 -lbl_802F6BEC: -/* 802F6BEC 80 64 00 04 */ lwz r3, 4(r4) -/* 802F6BF0 84 04 00 08 */ lwzu r0, 8(r4) -/* 802F6BF4 90 65 00 04 */ stw r3, 4(r5) -/* 802F6BF8 94 05 00 08 */ stwu r0, 8(r5) -/* 802F6BFC 42 00 FF F0 */ bdnz lbl_802F6BEC -/* 802F6C00 3B C1 00 98 */ addi r30, r1, 0x98 -/* 802F6C04 38 BE FF FC */ addi r5, r30, -4 -/* 802F6C08 38 9C 00 7C */ addi r4, r28, 0x7c -/* 802F6C0C 38 00 00 06 */ li r0, 6 -/* 802F6C10 7C 09 03 A6 */ mtctr r0 -lbl_802F6C14: -/* 802F6C14 80 64 00 04 */ lwz r3, 4(r4) -/* 802F6C18 84 04 00 08 */ lwzu r0, 8(r4) -/* 802F6C1C 90 65 00 04 */ stw r3, 4(r5) -/* 802F6C20 94 05 00 08 */ stwu r0, 8(r5) -/* 802F6C24 42 00 FF F0 */ bdnz lbl_802F6C14 -/* 802F6C28 A0 1C 00 B0 */ lhz r0, 0xb0(r28) -/* 802F6C2C B0 01 00 C8 */ sth r0, 0xc8(r1) -/* 802F6C30 88 1C 00 B2 */ lbz r0, 0xb2(r28) -/* 802F6C34 98 01 00 CA */ stb r0, 0xca(r1) -/* 802F6C38 A0 1C 00 B3 */ lhz r0, 0xb3(r28) -/* 802F6C3C B0 01 00 CB */ sth r0, 0xcb(r1) -/* 802F6C40 88 1C 00 B5 */ lbz r0, 0xb5(r28) -/* 802F6C44 98 01 00 CD */ stb r0, 0xcd(r1) -/* 802F6C48 A0 1C 00 B6 */ lhz r0, 0xb6(r28) -/* 802F6C4C B0 01 00 CE */ sth r0, 0xce(r1) -/* 802F6C50 88 1C 00 B8 */ lbz r0, 0xb8(r28) -/* 802F6C54 98 01 00 D0 */ stb r0, 0xd0(r1) -/* 802F6C58 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 802F6C5C 41 82 00 18 */ beq lbl_802F6C74 -/* 802F6C60 38 61 00 18 */ addi r3, r1, 0x18 -/* 802F6C64 38 81 00 08 */ addi r4, r1, 8 -/* 802F6C68 4B FF 24 59 */ bl func_802E90C0 -/* 802F6C6C 38 61 00 18 */ addi r3, r1, 0x18 -/* 802F6C70 4B FF 21 B1 */ bl setScissor__14J2DGrafContextFv -lbl_802F6C74: -/* 802F6C74 88 7B 00 B1 */ lbz r3, 0xb1(r27) -/* 802F6C78 48 06 5D 0D */ bl GXSetCullMode -/* 802F6C7C 7F 63 DB 78 */ mr r3, r27 -/* 802F6C80 FC 20 F0 90 */ fmr f1, f30 -/* 802F6C84 FC 40 F8 90 */ fmr f2, f31 -/* 802F6C88 7F C4 F3 78 */ mr r4, r30 -/* 802F6C8C 81 9B 00 00 */ lwz r12, 0(r27) -/* 802F6C90 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 802F6C94 7D 89 03 A6 */ mtctr r12 -/* 802F6C98 4E 80 04 21 */ bctrl -/* 802F6C9C 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802F6CA0 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802F6CA4 90 01 00 18 */ stw r0, 0x18(r1) -lbl_802F6CA8: -/* 802F6CA8 83 7B 00 DC */ lwz r27, 0xdc(r27) -/* 802F6CAC 28 1B 00 00 */ cmplwi r27, 0 -/* 802F6CB0 41 82 00 38 */ beq lbl_802F6CE8 -/* 802F6CB4 3B 7B FF F4 */ addi r27, r27, -12 -/* 802F6CB8 48 00 00 30 */ b lbl_802F6CE8 -lbl_802F6CBC: -/* 802F6CBC 80 7B 00 0C */ lwz r3, 0xc(r27) -/* 802F6CC0 C0 22 C7 F0 */ lfs f1, lit_1469(r2) -/* 802F6CC4 FC 40 08 90 */ fmr f2, f1 -/* 802F6CC8 7F 84 E3 78 */ mr r4, r28 -/* 802F6CCC 7F A5 EB 78 */ mr r5, r29 -/* 802F6CD0 7F E6 FB 78 */ mr r6, r31 -/* 802F6CD4 4B FF FB 0D */ bl draw__7J2DPaneFffPC14J2DGrafContextbb -/* 802F6CD8 83 7B 00 18 */ lwz r27, 0x18(r27) -/* 802F6CDC 28 1B 00 00 */ cmplwi r27, 0 -/* 802F6CE0 41 82 00 08 */ beq lbl_802F6CE8 -/* 802F6CE4 3B 7B FF F4 */ addi r27, r27, -12 -lbl_802F6CE8: -/* 802F6CE8 28 1B 00 00 */ cmplwi r27, 0 -/* 802F6CEC 40 82 FF D0 */ bne lbl_802F6CBC -lbl_802F6CF0: -/* 802F6CF0 E3 E1 01 08 */ psq_l f31, 264(r1), 0, 0 /* qr0 */ -/* 802F6CF4 CB E1 01 00 */ lfd f31, 0x100(r1) -/* 802F6CF8 E3 C1 00 F8 */ psq_l f30, 248(r1), 0, 0 /* qr0 */ -/* 802F6CFC CB C1 00 F0 */ lfd f30, 0xf0(r1) -/* 802F6D00 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 802F6D04 48 06 B5 1D */ bl _restgpr_27 -/* 802F6D08 80 01 01 14 */ lwz r0, 0x114(r1) -/* 802F6D0C 7C 08 03 A6 */ mtlr r0 -/* 802F6D10 38 21 01 10 */ addi r1, r1, 0x110 -/* 802F6D14 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/func_802F5D40.s b/asm/JSystem/J2DGraph/J2DPane/func_802F5D40.s deleted file mode 100644 index 625bdf35eda..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/func_802F5D40.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_802F5D40: -/* 802F5D40 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802F5D44 7C 08 02 A6 */ mflr r0 -/* 802F5D48 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F5D4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F5D50 48 06 C4 7D */ bl _savegpr_25 -/* 802F5D54 7C 79 1B 78 */ mr r25, r3 -/* 802F5D58 7C 9B 23 78 */ mr r27, r4 -/* 802F5D5C 7C BC 2B 78 */ mr r28, r5 -/* 802F5D60 7C FE 3B 78 */ mr r30, r7 -/* 802F5D64 7D 1D 43 78 */ mr r29, r8 -/* 802F5D68 7D 3F 4B 78 */ mr r31, r9 -/* 802F5D6C 3C 60 80 3D */ lis r3, __vt__7J2DPane@ha /* 0x803CCFD0@ha */ -/* 802F5D70 38 03 CF D0 */ addi r0, r3, __vt__7J2DPane@l /* 0x803CCFD0@l */ -/* 802F5D74 90 19 00 00 */ stw r0, 0(r25) -/* 802F5D78 3B 59 00 DC */ addi r26, r25, 0xdc -/* 802F5D7C 7F 43 D3 78 */ mr r3, r26 -/* 802F5D80 4B FE 61 95 */ bl initiate__10JSUPtrListFv -/* 802F5D84 38 7A 00 0C */ addi r3, r26, 0xc -/* 802F5D88 7F 24 CB 78 */ mr r4, r25 -/* 802F5D8C 4B FE 60 71 */ bl __ct__10JSUPtrLinkFPv -/* 802F5D90 38 00 00 00 */ li r0, 0 -/* 802F5D94 90 19 00 F8 */ stw r0, 0xf8(r25) -/* 802F5D98 7F 23 CB 78 */ mr r3, r25 -/* 802F5D9C 7F 64 DB 78 */ mr r4, r27 -/* 802F5DA0 7F 85 E3 78 */ mr r5, r28 -/* 802F5DA4 7F A8 EB 78 */ mr r8, r29 -/* 802F5DA8 7F C7 F3 78 */ mr r7, r30 -/* 802F5DAC 7F E9 FB 78 */ mr r9, r31 -/* 802F5DB0 48 00 00 21 */ bl func_802F5DD0 -/* 802F5DB4 7F 23 CB 78 */ mr r3, r25 -/* 802F5DB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F5DBC 48 06 C4 5D */ bl _restgpr_25 -/* 802F5DC0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802F5DC4 7C 08 03 A6 */ mtlr r0 -/* 802F5DC8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F5DCC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/func_802F5DD0.s b/asm/JSystem/J2DGraph/J2DPane/func_802F5DD0.s deleted file mode 100644 index 6aa474c0d6f..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/func_802F5DD0.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_802F5DD0: -/* 802F5DD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F5DD4 7C 08 02 A6 */ mflr r0 -/* 802F5DD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F5DDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F5DE0 93 C1 00 08 */ stw r30, 8(r1) -/* 802F5DE4 7C 7E 1B 78 */ mr r30, r3 -/* 802F5DE8 7C 9F 23 79 */ or. r31, r4, r4 -/* 802F5DEC 3C 60 50 41 */ lis r3, 0x5041 /* 0x50414E31@ha */ -/* 802F5DF0 38 03 4E 31 */ addi r0, r3, 0x4E31 /* 0x50414E31@l */ -/* 802F5DF4 90 1E 00 08 */ stw r0, 8(r30) -/* 802F5DF8 98 BE 00 B0 */ stb r5, 0xb0(r30) -/* 802F5DFC 91 1E 00 14 */ stw r8, 0x14(r30) -/* 802F5E00 90 FE 00 10 */ stw r7, 0x10(r30) -/* 802F5E04 38 00 00 00 */ li r0, 0 -/* 802F5E08 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 802F5E0C 90 1E 00 18 */ stw r0, 0x18(r30) -/* 802F5E10 C0 09 00 00 */ lfs f0, 0(r9) -/* 802F5E14 D0 1E 00 20 */ stfs f0, 0x20(r30) -/* 802F5E18 C0 09 00 04 */ lfs f0, 4(r9) -/* 802F5E1C D0 1E 00 24 */ stfs f0, 0x24(r30) -/* 802F5E20 C0 09 00 08 */ lfs f0, 8(r9) -/* 802F5E24 D0 1E 00 28 */ stfs f0, 0x28(r30) -/* 802F5E28 C0 09 00 0C */ lfs f0, 0xc(r9) -/* 802F5E2C D0 1E 00 2C */ stfs f0, 0x2c(r30) -/* 802F5E30 41 82 00 18 */ beq lbl_802F5E48 -/* 802F5E34 34 9E 00 DC */ addic. r4, r30, 0xdc -/* 802F5E38 41 82 00 08 */ beq lbl_802F5E40 -/* 802F5E3C 38 84 00 0C */ addi r4, r4, 0xc -lbl_802F5E40: -/* 802F5E40 38 7F 00 DC */ addi r3, r31, 0xdc -/* 802F5E44 4B FE 61 09 */ bl append__10JSUPtrListFP10JSUPtrLink -lbl_802F5E48: -/* 802F5E48 7F C3 F3 78 */ mr r3, r30 -/* 802F5E4C 4B FF FE 6D */ bl initiate__7J2DPaneFv -/* 802F5E50 7F C3 F3 78 */ mr r3, r30 -/* 802F5E54 7F E4 FB 78 */ mr r4, r31 -/* 802F5E58 48 00 05 A1 */ bl changeUseTrans__7J2DPaneFP7J2DPane -/* 802F5E5C 7F C3 F3 78 */ mr r3, r30 -/* 802F5E60 81 9E 00 00 */ lwz r12, 0(r30) -/* 802F5E64 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F5E68 7D 89 03 A6 */ mtctr r12 -/* 802F5E6C 4E 80 04 21 */ bctrl -/* 802F5E70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F5E74 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F5E78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F5E7C 7C 08 03 A6 */ mtlr r0 -/* 802F5E80 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F5E84 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/func_802F5E88.s b/asm/JSystem/J2DGraph/J2DPane/func_802F5E88.s deleted file mode 100644 index 23a0c97c95d..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/func_802F5E88.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802F5E88: -/* 802F5E88 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F5E8C 7C 08 02 A6 */ mflr r0 -/* 802F5E90 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F5E94 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F5E98 48 06 C3 3D */ bl _savegpr_27 -/* 802F5E9C 7C 7B 1B 78 */ mr r27, r3 -/* 802F5EA0 7C BE 2B 78 */ mr r30, r5 -/* 802F5EA4 7C DD 33 78 */ mr r29, r6 -/* 802F5EA8 7C FF 3B 78 */ mr r31, r7 -/* 802F5EAC 3C 60 80 3D */ lis r3, __vt__7J2DPane@ha /* 0x803CCFD0@ha */ -/* 802F5EB0 38 03 CF D0 */ addi r0, r3, __vt__7J2DPane@l /* 0x803CCFD0@l */ -/* 802F5EB4 90 1B 00 00 */ stw r0, 0(r27) -/* 802F5EB8 3B 9B 00 DC */ addi r28, r27, 0xdc -/* 802F5EBC 7F 83 E3 78 */ mr r3, r28 -/* 802F5EC0 4B FE 60 55 */ bl initiate__10JSUPtrListFv -/* 802F5EC4 38 7C 00 0C */ addi r3, r28, 0xc -/* 802F5EC8 7F 64 DB 78 */ mr r4, r27 -/* 802F5ECC 4B FE 5F 31 */ bl __ct__10JSUPtrLinkFPv -/* 802F5ED0 38 00 00 00 */ li r0, 0 -/* 802F5ED4 90 1B 00 F8 */ stw r0, 0xf8(r27) -/* 802F5ED8 7F 63 DB 78 */ mr r3, r27 -/* 802F5EDC 7F A6 EB 78 */ mr r6, r29 -/* 802F5EE0 7F C5 F3 78 */ mr r5, r30 -/* 802F5EE4 7F E7 FB 78 */ mr r7, r31 -/* 802F5EE8 48 00 00 21 */ bl func_802F5F08 -/* 802F5EEC 7F 63 DB 78 */ mr r3, r27 -/* 802F5EF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F5EF4 48 06 C3 2D */ bl _restgpr_27 -/* 802F5EF8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F5EFC 7C 08 03 A6 */ mtlr r0 -/* 802F5F00 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F5F04 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/func_802F5F08.s b/asm/JSystem/J2DGraph/J2DPane/func_802F5F08.s deleted file mode 100644 index a70dd923d9b..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/func_802F5F08.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_802F5F08: -/* 802F5F08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F5F0C 7C 08 02 A6 */ mflr r0 -/* 802F5F10 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F5F14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F5F18 7C 7F 1B 78 */ mr r31, r3 -/* 802F5F1C 3C 80 50 41 */ lis r4, 0x5041 /* 0x50414E31@ha */ -/* 802F5F20 38 04 4E 31 */ addi r0, r4, 0x4E31 /* 0x50414E31@l */ -/* 802F5F24 90 03 00 08 */ stw r0, 8(r3) -/* 802F5F28 38 00 00 01 */ li r0, 1 -/* 802F5F2C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802F5F30 90 C3 00 14 */ stw r6, 0x14(r3) -/* 802F5F34 90 A3 00 10 */ stw r5, 0x10(r3) -/* 802F5F38 38 00 00 00 */ li r0, 0 -/* 802F5F3C 90 03 00 1C */ stw r0, 0x1c(r3) -/* 802F5F40 90 03 00 18 */ stw r0, 0x18(r3) -/* 802F5F44 C0 07 00 00 */ lfs f0, 0(r7) -/* 802F5F48 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 802F5F4C C0 07 00 04 */ lfs f0, 4(r7) -/* 802F5F50 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 802F5F54 C0 07 00 08 */ lfs f0, 8(r7) -/* 802F5F58 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 802F5F5C C0 07 00 0C */ lfs f0, 0xc(r7) -/* 802F5F60 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 802F5F64 4B FF FD 55 */ bl initiate__7J2DPaneFv -/* 802F5F68 7F E3 FB 78 */ mr r3, r31 -/* 802F5F6C 38 80 00 00 */ li r4, 0 -/* 802F5F70 48 00 04 89 */ bl changeUseTrans__7J2DPaneFP7J2DPane -/* 802F5F74 7F E3 FB 78 */ mr r3, r31 -/* 802F5F78 81 9F 00 00 */ lwz r12, 0(r31) -/* 802F5F7C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F5F80 7D 89 03 A6 */ mtctr r12 -/* 802F5F84 4E 80 04 21 */ bctrl -/* 802F5F88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F5F8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F5F90 7C 08 03 A6 */ mtlr r0 -/* 802F5F94 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F5F98 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/func_802F6D18.s b/asm/JSystem/J2DGraph/J2DPane/func_802F6D18.s deleted file mode 100644 index 56bb49fe429..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/func_802F6D18.s +++ /dev/null @@ -1,158 +0,0 @@ -lbl_802F6D18: -/* 802F6D18 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802F6D1C 7C 08 02 A6 */ mflr r0 -/* 802F6D20 90 01 00 54 */ stw r0, 0x54(r1) -/* 802F6D24 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 802F6D28 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 802F6D2C DB C1 00 30 */ stfd f30, 0x30(r1) -/* 802F6D30 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 802F6D34 DB A1 00 20 */ stfd f29, 0x20(r1) -/* 802F6D38 F3 A1 00 28 */ psq_st f29, 40(r1), 0, 0 /* qr0 */ -/* 802F6D3C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802F6D40 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802F6D44 7C 7E 1B 78 */ mr r30, r3 -/* 802F6D48 C0 22 C7 F0 */ lfs f1, lit_1469(r2) -/* 802F6D4C C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F6D50 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 802F6D54 40 82 00 20 */ bne lbl_802F6D74 -/* 802F6D58 D0 21 00 08 */ stfs f1, 8(r1) -/* 802F6D5C C0 04 00 08 */ lfs f0, 8(r4) -/* 802F6D60 C0 24 00 00 */ lfs f1, 0(r4) -/* 802F6D64 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F6D68 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F6D6C D0 3E 00 D4 */ stfs f1, 0xd4(r30) -/* 802F6D70 48 00 00 5C */ b lbl_802F6DCC -lbl_802F6D74: -/* 802F6D74 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 802F6D78 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 802F6D7C 40 82 00 24 */ bne lbl_802F6DA0 -/* 802F6D80 C0 44 00 08 */ lfs f2, 8(r4) -/* 802F6D84 C0 04 00 00 */ lfs f0, 0(r4) -/* 802F6D88 EC 02 00 28 */ fsubs f0, f2, f0 -/* 802F6D8C FC 00 00 50 */ fneg f0, f0 -/* 802F6D90 D0 01 00 08 */ stfs f0, 8(r1) -/* 802F6D94 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 802F6D98 D0 5E 00 D4 */ stfs f2, 0xd4(r30) -/* 802F6D9C 48 00 00 30 */ b lbl_802F6DCC -lbl_802F6DA0: -/* 802F6DA0 C0 64 00 08 */ lfs f3, 8(r4) -/* 802F6DA4 C0 84 00 00 */ lfs f4, 0(r4) -/* 802F6DA8 EC 03 20 28 */ fsubs f0, f3, f4 -/* 802F6DAC C0 22 C8 08 */ lfs f1, lit_1725(r2) -/* 802F6DB0 EC 40 00 72 */ fmuls f2, f0, f1 -/* 802F6DB4 FC 00 10 50 */ fneg f0, f2 -/* 802F6DB8 D0 01 00 08 */ stfs f0, 8(r1) -/* 802F6DBC D0 41 00 10 */ stfs f2, 0x10(r1) -/* 802F6DC0 EC 04 18 2A */ fadds f0, f4, f3 -/* 802F6DC4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 802F6DC8 D0 1E 00 D4 */ stfs f0, 0xd4(r30) -lbl_802F6DCC: -/* 802F6DCC C0 22 C7 F0 */ lfs f1, lit_1469(r2) -/* 802F6DD0 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 802F6DD4 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 802F6DD8 40 82 00 20 */ bne lbl_802F6DF8 -/* 802F6DDC D0 21 00 0C */ stfs f1, 0xc(r1) -/* 802F6DE0 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 802F6DE4 C0 24 00 04 */ lfs f1, 4(r4) -/* 802F6DE8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F6DEC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802F6DF0 D0 3E 00 D8 */ stfs f1, 0xd8(r30) -/* 802F6DF4 48 00 00 5C */ b lbl_802F6E50 -lbl_802F6DF8: -/* 802F6DF8 C0 1E 00 2C */ lfs f0, 0x2c(r30) -/* 802F6DFC FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 802F6E00 40 82 00 24 */ bne lbl_802F6E24 -/* 802F6E04 C0 44 00 0C */ lfs f2, 0xc(r4) -/* 802F6E08 C0 04 00 04 */ lfs f0, 4(r4) -/* 802F6E0C EC 02 00 28 */ fsubs f0, f2, f0 -/* 802F6E10 FC 00 00 50 */ fneg f0, f0 -/* 802F6E14 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802F6E18 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 802F6E1C D0 5E 00 D8 */ stfs f2, 0xd8(r30) -/* 802F6E20 48 00 00 30 */ b lbl_802F6E50 -lbl_802F6E24: -/* 802F6E24 C0 64 00 0C */ lfs f3, 0xc(r4) -/* 802F6E28 C0 84 00 04 */ lfs f4, 4(r4) -/* 802F6E2C EC 03 20 28 */ fsubs f0, f3, f4 -/* 802F6E30 C0 22 C8 08 */ lfs f1, lit_1725(r2) -/* 802F6E34 EC 40 00 72 */ fmuls f2, f0, f1 -/* 802F6E38 FC 00 10 50 */ fneg f0, f2 -/* 802F6E3C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802F6E40 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 802F6E44 EC 04 18 2A */ fadds f0, f4, f3 -/* 802F6E48 EC 00 00 72 */ fmuls f0, f0, f1 -/* 802F6E4C D0 1E 00 D8 */ stfs f0, 0xd8(r30) -lbl_802F6E50: -/* 802F6E50 C0 21 00 08 */ lfs f1, 8(r1) -/* 802F6E54 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 802F6E58 EF C1 00 28 */ fsubs f30, f1, f0 -/* 802F6E5C C0 21 00 0C */ lfs f1, 0xc(r1) -/* 802F6E60 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 802F6E64 EF A1 00 28 */ fsubs f29, f1, f0 -/* 802F6E68 7F C3 F3 78 */ mr r3, r30 -/* 802F6E6C 48 00 0C 21 */ bl getFirstChildPane__7J2DPaneFv -/* 802F6E70 7C 7F 1B 78 */ mr r31, r3 -/* 802F6E74 C3 E2 C7 F0 */ lfs f31, lit_1469(r2) -/* 802F6E78 48 00 00 4C */ b lbl_802F6EC4 -lbl_802F6E7C: -/* 802F6E7C C0 1F 00 D4 */ lfs f0, 0xd4(r31) -/* 802F6E80 EC 00 F0 2A */ fadds f0, f0, f30 -/* 802F6E84 D0 1F 00 D4 */ stfs f0, 0xd4(r31) -/* 802F6E88 C0 1F 00 D8 */ lfs f0, 0xd8(r31) -/* 802F6E8C EC 00 E8 2A */ fadds f0, f0, f29 -/* 802F6E90 D0 1F 00 D8 */ stfs f0, 0xd8(r31) -/* 802F6E94 FC 1F F0 00 */ fcmpu cr0, f31, f30 -/* 802F6E98 40 82 00 0C */ bne lbl_802F6EA4 -/* 802F6E9C FC 1F E8 00 */ fcmpu cr0, f31, f29 -/* 802F6EA0 41 82 00 18 */ beq lbl_802F6EB8 -lbl_802F6EA4: -/* 802F6EA4 7F E3 FB 78 */ mr r3, r31 -/* 802F6EA8 81 9F 00 00 */ lwz r12, 0(r31) -/* 802F6EAC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F6EB0 7D 89 03 A6 */ mtctr r12 -/* 802F6EB4 4E 80 04 21 */ bctrl -lbl_802F6EB8: -/* 802F6EB8 7F E3 FB 78 */ mr r3, r31 -/* 802F6EBC 48 00 0C 09 */ bl getNextChildPane__7J2DPaneFv -/* 802F6EC0 7C 7F 1B 78 */ mr r31, r3 -lbl_802F6EC4: -/* 802F6EC4 28 1F 00 00 */ cmplwi r31, 0 -/* 802F6EC8 40 82 FF B4 */ bne lbl_802F6E7C -/* 802F6ECC 80 61 00 08 */ lwz r3, 8(r1) -/* 802F6ED0 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802F6ED4 90 7E 00 20 */ stw r3, 0x20(r30) -/* 802F6ED8 90 1E 00 24 */ stw r0, 0x24(r30) -/* 802F6EDC 80 61 00 10 */ lwz r3, 0x10(r1) -/* 802F6EE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F6EE4 90 7E 00 28 */ stw r3, 0x28(r30) -/* 802F6EE8 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 802F6EEC 7F C3 F3 78 */ mr r3, r30 -/* 802F6EF0 48 00 0C 0D */ bl getParentPane__7J2DPaneFv -/* 802F6EF4 28 03 00 00 */ cmplwi r3, 0 -/* 802F6EF8 41 82 00 24 */ beq lbl_802F6F1C -/* 802F6EFC C0 3E 00 D4 */ lfs f1, 0xd4(r30) -/* 802F6F00 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F6F04 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F6F08 D0 1E 00 D4 */ stfs f0, 0xd4(r30) -/* 802F6F0C C0 3E 00 D8 */ lfs f1, 0xd8(r30) -/* 802F6F10 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F6F14 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F6F18 D0 1E 00 D8 */ stfs f0, 0xd8(r30) -lbl_802F6F1C: -/* 802F6F1C 7F C3 F3 78 */ mr r3, r30 -/* 802F6F20 81 9E 00 00 */ lwz r12, 0(r30) -/* 802F6F24 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F6F28 7D 89 03 A6 */ mtctr r12 -/* 802F6F2C 4E 80 04 21 */ bctrl -/* 802F6F30 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 802F6F34 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 802F6F38 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 802F6F3C CB C1 00 30 */ lfd f30, 0x30(r1) -/* 802F6F40 E3 A1 00 28 */ psq_l f29, 40(r1), 0, 0 /* qr0 */ -/* 802F6F44 CB A1 00 20 */ lfd f29, 0x20(r1) -/* 802F6F48 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802F6F4C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802F6F50 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802F6F54 7C 08 03 A6 */ mtlr r0 -/* 802F6F58 38 21 00 50 */ addi r1, r1, 0x50 -/* 802F6F5C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/func_802F7264.s b/asm/JSystem/J2DGraph/J2DPane/func_802F7264.s deleted file mode 100644 index 0ebeede3194..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/func_802F7264.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802F7264: -/* 802F7264 C0 24 00 00 */ lfs f1, 0(r4) -/* 802F7268 C0 44 00 04 */ lfs f2, 4(r4) -/* 802F726C C0 64 00 08 */ lfs f3, 8(r4) -/* 802F7270 C0 84 00 0C */ lfs f4, 0xc(r4) -/* 802F7274 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 802F7278 C0 A3 00 34 */ lfs f5, 0x34(r3) -/* 802F727C EC 21 00 2A */ fadds f1, f1, f0 -/* 802F7280 EC 42 28 2A */ fadds f2, f2, f5 -/* 802F7284 EC 63 00 2A */ fadds f3, f3, f0 -/* 802F7288 EC 84 28 2A */ fadds f4, f4, f5 -/* 802F728C C0 03 00 40 */ lfs f0, 0x40(r3) -/* 802F7290 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 802F7294 4C 40 13 82 */ cror 2, 0, 2 -/* 802F7298 40 82 00 08 */ bne lbl_802F72A0 -/* 802F729C D0 23 00 40 */ stfs f1, 0x40(r3) -lbl_802F72A0: -/* 802F72A0 C0 03 00 44 */ lfs f0, 0x44(r3) -/* 802F72A4 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 802F72A8 4C 40 13 82 */ cror 2, 0, 2 -/* 802F72AC 40 82 00 08 */ bne lbl_802F72B4 -/* 802F72B0 D0 43 00 44 */ stfs f2, 0x44(r3) -lbl_802F72B4: -/* 802F72B4 C0 03 00 48 */ lfs f0, 0x48(r3) -/* 802F72B8 FC 00 18 40 */ fcmpo cr0, f0, f3 -/* 802F72BC 4C 41 13 82 */ cror 2, 1, 2 -/* 802F72C0 40 82 00 08 */ bne lbl_802F72C8 -/* 802F72C4 D0 63 00 48 */ stfs f3, 0x48(r3) -lbl_802F72C8: -/* 802F72C8 C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 802F72CC FC 00 20 40 */ fcmpo cr0, f0, f4 -/* 802F72D0 4C 41 13 82 */ cror 2, 1, 2 -/* 802F72D4 4C 82 00 20 */ bnelr -/* 802F72D8 D0 83 00 4C */ stfs f4, 0x4c(r3) -/* 802F72DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/getBounds__7J2DPaneFv.s b/asm/JSystem/J2DGraph/J2DPane/getBounds__7J2DPaneFv.s deleted file mode 100644 index eab1f1a1ca0..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/getBounds__7J2DPaneFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_802F7100: -/* 802F7100 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F7104 7C 08 02 A6 */ mflr r0 -/* 802F7108 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F710C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F7110 3C 80 80 43 */ lis r4, static_mBounds__7J2DPane@ha /* 0x804349B0@ha */ -/* 802F7114 3B E4 49 B0 */ addi r31, r4, static_mBounds__7J2DPane@l /* 0x804349B0@l */ -/* 802F7118 80 83 00 20 */ lwz r4, 0x20(r3) -/* 802F711C 80 03 00 24 */ lwz r0, 0x24(r3) -/* 802F7120 90 9F 00 00 */ stw r4, 0(r31) -/* 802F7124 90 1F 00 04 */ stw r0, 4(r31) -/* 802F7128 80 83 00 28 */ lwz r4, 0x28(r3) -/* 802F712C 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 802F7130 90 9F 00 08 */ stw r4, 8(r31) -/* 802F7134 90 1F 00 0C */ stw r0, 0xc(r31) -/* 802F7138 C0 23 00 D4 */ lfs f1, 0xd4(r3) -/* 802F713C C0 43 00 D8 */ lfs f2, 0xd8(r3) -/* 802F7140 C0 1F 00 00 */ lfs f0, 0(r31) -/* 802F7144 EC 00 08 2A */ fadds f0, f0, f1 -/* 802F7148 D0 1F 00 00 */ stfs f0, 0(r31) -/* 802F714C C0 1F 00 04 */ lfs f0, 4(r31) -/* 802F7150 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F7154 D0 1F 00 04 */ stfs f0, 4(r31) -/* 802F7158 C0 1F 00 08 */ lfs f0, 8(r31) -/* 802F715C EC 00 08 2A */ fadds f0, f0, f1 -/* 802F7160 D0 1F 00 08 */ stfs f0, 8(r31) -/* 802F7164 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 802F7168 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F716C D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 802F7170 48 00 09 8D */ bl getParentPane__7J2DPaneFv -/* 802F7174 28 03 00 00 */ cmplwi r3, 0 -/* 802F7178 41 82 00 48 */ beq lbl_802F71C0 -/* 802F717C C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F7180 FC 20 00 50 */ fneg f1, f0 -/* 802F7184 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F7188 FC 40 00 50 */ fneg f2, f0 -/* 802F718C 3C 60 80 43 */ lis r3, static_mBounds__7J2DPane@ha /* 0x804349B0@ha */ -/* 802F7190 C4 03 49 B0 */ lfsu f0, static_mBounds__7J2DPane@l(r3) /* 0x804349B0@l */ -/* 802F7194 EC 00 08 2A */ fadds f0, f0, f1 -/* 802F7198 D0 03 00 00 */ stfs f0, 0(r3) -/* 802F719C C0 1F 00 04 */ lfs f0, 4(r31) -/* 802F71A0 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F71A4 D0 1F 00 04 */ stfs f0, 4(r31) -/* 802F71A8 C0 1F 00 08 */ lfs f0, 8(r31) -/* 802F71AC EC 00 08 2A */ fadds f0, f0, f1 -/* 802F71B0 D0 1F 00 08 */ stfs f0, 8(r31) -/* 802F71B4 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 802F71B8 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F71BC D0 1F 00 0C */ stfs f0, 0xc(r31) -lbl_802F71C0: -/* 802F71C0 3C 60 80 43 */ lis r3, static_mBounds__7J2DPane@ha /* 0x804349B0@ha */ -/* 802F71C4 38 63 49 B0 */ addi r3, r3, static_mBounds__7J2DPane@l /* 0x804349B0@l */ -/* 802F71C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F71CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F71D0 7C 08 03 A6 */ mtlr r0 -/* 802F71D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F71D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/getFirstChildPane__7J2DPaneFv.s b/asm/JSystem/J2DGraph/J2DPane/getFirstChildPane__7J2DPaneFv.s deleted file mode 100644 index ac89b31581b..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/getFirstChildPane__7J2DPaneFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_802F7A8C: -/* 802F7A8C 80 63 00 DC */ lwz r3, 0xdc(r3) -/* 802F7A90 7C 60 1B 78 */ mr r0, r3 -/* 802F7A94 28 03 00 00 */ cmplwi r3, 0 -/* 802F7A98 41 82 00 08 */ beq lbl_802F7AA0 -/* 802F7A9C 38 03 FF F4 */ addi r0, r3, -12 -lbl_802F7AA0: -/* 802F7AA0 28 00 00 00 */ cmplwi r0, 0 -/* 802F7AA4 40 82 00 0C */ bne lbl_802F7AB0 -/* 802F7AA8 38 60 00 00 */ li r3, 0 -/* 802F7AAC 4E 80 00 20 */ blr -lbl_802F7AB0: -/* 802F7AB0 28 03 00 00 */ cmplwi r3, 0 -/* 802F7AB4 41 82 00 08 */ beq lbl_802F7ABC -/* 802F7AB8 38 63 FF F4 */ addi r3, r3, -12 -lbl_802F7ABC: -/* 802F7ABC 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802F7AC0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/getGlbVtx__7J2DPaneCFUc.s b/asm/JSystem/J2DGraph/J2DPane/getGlbVtx__7J2DPaneCFUc.s deleted file mode 100644 index 56ed9263480..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/getGlbVtx__7J2DPaneCFUc.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_802F79A8: -/* 802F79A8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F79AC 54 A6 06 3E */ clrlwi r6, r5, 0x18 -/* 802F79B0 28 06 00 04 */ cmplwi r6, 4 -/* 802F79B4 41 80 00 30 */ blt lbl_802F79E4 -/* 802F79B8 C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F79BC D0 01 00 08 */ stfs f0, 8(r1) -/* 802F79C0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802F79C4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F79C8 80 81 00 08 */ lwz r4, 8(r1) -/* 802F79CC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802F79D0 90 83 00 00 */ stw r4, 0(r3) -/* 802F79D4 90 03 00 04 */ stw r0, 4(r3) -/* 802F79D8 80 01 00 10 */ lwz r0, 0x10(r1) -/* 802F79DC 90 03 00 08 */ stw r0, 8(r3) -/* 802F79E0 48 00 00 A4 */ b lbl_802F7A84 -lbl_802F79E4: -/* 802F79E4 54 A0 07 FF */ clrlwi. r0, r5, 0x1f -/* 802F79E8 41 82 00 0C */ beq lbl_802F79F4 -/* 802F79EC C0 64 00 28 */ lfs f3, 0x28(r4) -/* 802F79F0 48 00 00 08 */ b lbl_802F79F8 -lbl_802F79F4: -/* 802F79F4 C0 64 00 20 */ lfs f3, 0x20(r4) -lbl_802F79F8: -/* 802F79F8 54 C0 07 BD */ rlwinm. r0, r6, 0, 0x1e, 0x1e -/* 802F79FC 41 82 00 0C */ beq lbl_802F7A08 -/* 802F7A00 C0 84 00 2C */ lfs f4, 0x2c(r4) -/* 802F7A04 48 00 00 08 */ b lbl_802F7A0C -lbl_802F7A08: -/* 802F7A08 C0 84 00 24 */ lfs f4, 0x24(r4) -lbl_802F7A0C: -/* 802F7A0C C0 44 00 8C */ lfs f2, 0x8c(r4) -/* 802F7A10 C0 04 00 80 */ lfs f0, 0x80(r4) -/* 802F7A14 EC 23 00 32 */ fmuls f1, f3, f0 -/* 802F7A18 C0 04 00 84 */ lfs f0, 0x84(r4) -/* 802F7A1C EC 04 00 32 */ fmuls f0, f4, f0 -/* 802F7A20 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F7A24 EC 02 00 2A */ fadds f0, f2, f0 -/* 802F7A28 D0 01 00 08 */ stfs f0, 8(r1) -/* 802F7A2C C0 44 00 9C */ lfs f2, 0x9c(r4) -/* 802F7A30 C0 04 00 90 */ lfs f0, 0x90(r4) -/* 802F7A34 EC 23 00 32 */ fmuls f1, f3, f0 -/* 802F7A38 C0 04 00 94 */ lfs f0, 0x94(r4) -/* 802F7A3C EC 04 00 32 */ fmuls f0, f4, f0 -/* 802F7A40 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F7A44 EC 02 00 2A */ fadds f0, f2, f0 -/* 802F7A48 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802F7A4C C0 44 00 AC */ lfs f2, 0xac(r4) -/* 802F7A50 C0 04 00 A0 */ lfs f0, 0xa0(r4) -/* 802F7A54 EC 23 00 32 */ fmuls f1, f3, f0 -/* 802F7A58 C0 04 00 A4 */ lfs f0, 0xa4(r4) -/* 802F7A5C EC 04 00 32 */ fmuls f0, f4, f0 -/* 802F7A60 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F7A64 EC 02 00 2A */ fadds f0, f2, f0 -/* 802F7A68 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F7A6C 80 81 00 08 */ lwz r4, 8(r1) -/* 802F7A70 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802F7A74 90 83 00 00 */ stw r4, 0(r3) -/* 802F7A78 90 03 00 04 */ stw r0, 4(r3) -/* 802F7A7C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 802F7A80 90 03 00 08 */ stw r0, 8(r3) -lbl_802F7A84: -/* 802F7A84 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F7A88 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive.s b/asm/JSystem/J2DGraph/J2DPane/getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive.s deleted file mode 100644 index 7944b8f8b31..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_802F7DB8: -/* 802F7DB8 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 802F7DBC 7C 08 02 A6 */ mflr r0 -/* 802F7DC0 90 01 01 24 */ stw r0, 0x124(r1) -/* 802F7DC4 39 61 01 20 */ addi r11, r1, 0x120 -/* 802F7DC8 48 06 A4 11 */ bl _savegpr_28 -/* 802F7DCC 7C 9C 23 78 */ mr r28, r4 -/* 802F7DD0 7C BD 2B 78 */ mr r29, r5 -/* 802F7DD4 7C DE 33 79 */ or. r30, r6, r6 -/* 802F7DD8 38 00 00 00 */ li r0, 0 -/* 802F7DDC 98 01 00 08 */ stb r0, 8(r1) -/* 802F7DE0 40 82 00 74 */ bne lbl_802F7E54 -/* 802F7DE4 80 0D 90 10 */ lwz r0, mDataManage__9J2DScreen(r13) -/* 802F7DE8 28 00 00 00 */ cmplwi r0, 0 -/* 802F7DEC 40 82 00 14 */ bne lbl_802F7E00 -/* 802F7DF0 38 61 00 08 */ addi r3, r1, 8 -/* 802F7DF4 38 C0 00 00 */ li r6, 0 -/* 802F7DF8 4B FE 62 81 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive -/* 802F7DFC 48 00 00 E0 */ b lbl_802F7EDC -lbl_802F7E00: -/* 802F7E00 7F 83 E3 78 */ mr r3, r28 -/* 802F7E04 81 9C 00 00 */ lwz r12, 0(r28) -/* 802F7E08 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F7E0C 7D 89 03 A6 */ mtctr r12 -/* 802F7E10 4E 80 04 21 */ bctrl -/* 802F7E14 7C 7F 1B 78 */ mr r31, r3 -/* 802F7E18 38 61 00 08 */ addi r3, r1, 8 -/* 802F7E1C 7F 84 E3 78 */ mr r4, r28 -/* 802F7E20 7F A5 EB 78 */ mr r5, r29 -/* 802F7E24 38 C0 00 00 */ li r6, 0 -/* 802F7E28 4B FE 62 51 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive -/* 802F7E2C 28 03 00 00 */ cmplwi r3, 0 -/* 802F7E30 40 82 00 AC */ bne lbl_802F7EDC -/* 802F7E34 7F 83 E3 78 */ mr r3, r28 -/* 802F7E38 7F E4 FB 78 */ mr r4, r31 -/* 802F7E3C 38 A0 00 00 */ li r5, 0 -/* 802F7E40 4B FE 46 9D */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F7E44 80 6D 90 10 */ lwz r3, mDataManage__9J2DScreen(r13) -/* 802F7E48 7F 84 E3 78 */ mr r4, r28 -/* 802F7E4C 48 01 50 31 */ bl get__13J2DDataManageFP14JSUInputStream -/* 802F7E50 48 00 00 8C */ b lbl_802F7EDC -lbl_802F7E54: -/* 802F7E54 7F 83 E3 78 */ mr r3, r28 -/* 802F7E58 81 9C 00 00 */ lwz r12, 0(r28) -/* 802F7E5C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F7E60 7D 89 03 A6 */ mtctr r12 -/* 802F7E64 4E 80 04 21 */ bctrl -/* 802F7E68 7C 7F 1B 78 */ mr r31, r3 -/* 802F7E6C 38 61 00 08 */ addi r3, r1, 8 -/* 802F7E70 7F 84 E3 78 */ mr r4, r28 -/* 802F7E74 7F A5 EB 78 */ mr r5, r29 -/* 802F7E78 7F C6 F3 78 */ mr r6, r30 -/* 802F7E7C 4B FE 61 FD */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive -/* 802F7E80 28 03 00 00 */ cmplwi r3, 0 -/* 802F7E84 40 82 00 28 */ bne lbl_802F7EAC -/* 802F7E88 7F 83 E3 78 */ mr r3, r28 -/* 802F7E8C 7F E4 FB 78 */ mr r4, r31 -/* 802F7E90 38 A0 00 00 */ li r5, 0 -/* 802F7E94 4B FE 46 49 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F7E98 38 61 00 08 */ addi r3, r1, 8 -/* 802F7E9C 7F 84 E3 78 */ mr r4, r28 -/* 802F7EA0 7F A5 EB 78 */ mr r5, r29 -/* 802F7EA4 38 C0 00 00 */ li r6, 0 -/* 802F7EA8 4B FE 61 D1 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive -lbl_802F7EAC: -/* 802F7EAC 28 03 00 00 */ cmplwi r3, 0 -/* 802F7EB0 40 82 00 2C */ bne lbl_802F7EDC -/* 802F7EB4 80 0D 90 10 */ lwz r0, mDataManage__9J2DScreen(r13) -/* 802F7EB8 28 00 00 00 */ cmplwi r0, 0 -/* 802F7EBC 41 82 00 20 */ beq lbl_802F7EDC -/* 802F7EC0 7F 83 E3 78 */ mr r3, r28 -/* 802F7EC4 7F E4 FB 78 */ mr r4, r31 -/* 802F7EC8 38 A0 00 00 */ li r5, 0 -/* 802F7ECC 4B FE 46 11 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802F7ED0 80 6D 90 10 */ lwz r3, mDataManage__9J2DScreen(r13) -/* 802F7ED4 7F 84 E3 78 */ mr r4, r28 -/* 802F7ED8 48 01 4F A5 */ bl get__13J2DDataManageFP14JSUInputStream -lbl_802F7EDC: -/* 802F7EDC 39 61 01 20 */ addi r11, r1, 0x120 -/* 802F7EE0 48 06 A3 45 */ bl _restgpr_28 -/* 802F7EE4 80 01 01 24 */ lwz r0, 0x124(r1) -/* 802F7EE8 7C 08 03 A6 */ mtlr r0 -/* 802F7EEC 38 21 01 20 */ addi r1, r1, 0x120 -/* 802F7EF0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/insertChild__7J2DPaneFP7J2DPaneP7J2DPane.s b/asm/JSystem/J2DGraph/J2DPane/insertChild__7J2DPaneFP7J2DPaneP7J2DPane.s deleted file mode 100644 index a4f5762973b..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/insertChild__7J2DPaneFP7J2DPaneP7J2DPane.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_802F6714: -/* 802F6714 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F6718 7C 08 02 A6 */ mflr r0 -/* 802F671C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F6720 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F6724 48 06 BA B5 */ bl _savegpr_28 -/* 802F6728 7C 7C 1B 78 */ mr r28, r3 -/* 802F672C 7C 9E 23 78 */ mr r30, r4 -/* 802F6730 7C BD 2B 79 */ or. r29, r5, r5 -/* 802F6734 40 82 00 0C */ bne lbl_802F6740 -/* 802F6738 38 60 00 00 */ li r3, 0 -/* 802F673C 48 00 00 8C */ b lbl_802F67C8 -lbl_802F6740: -/* 802F6740 7F A3 EB 78 */ mr r3, r29 -/* 802F6744 48 00 13 B9 */ bl getParentPane__7J2DPaneFv -/* 802F6748 7C 7F 1B 78 */ mr r31, r3 -/* 802F674C 34 BD 00 DC */ addic. r5, r29, 0xdc -/* 802F6750 41 82 00 08 */ beq lbl_802F6758 -/* 802F6754 38 A5 00 0C */ addi r5, r5, 0xc -lbl_802F6758: -/* 802F6758 28 1E 00 00 */ cmplwi r30, 0 -/* 802F675C 41 82 00 0C */ beq lbl_802F6768 -/* 802F6760 38 9E 00 DC */ addi r4, r30, 0xdc -/* 802F6764 48 00 00 08 */ b lbl_802F676C -lbl_802F6768: -/* 802F6768 38 80 00 00 */ li r4, 0 -lbl_802F676C: -/* 802F676C 28 04 00 00 */ cmplwi r4, 0 -/* 802F6770 41 82 00 08 */ beq lbl_802F6778 -/* 802F6774 38 84 00 0C */ addi r4, r4, 0xc -lbl_802F6778: -/* 802F6778 38 7C 00 DC */ addi r3, r28, 0xdc -/* 802F677C 4B FE 59 19 */ bl insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink -/* 802F6780 7C 7E 1B 78 */ mr r30, r3 -/* 802F6784 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802F6788 41 82 00 3C */ beq lbl_802F67C4 -/* 802F678C 28 1F 00 00 */ cmplwi r31, 0 -/* 802F6790 40 82 00 34 */ bne lbl_802F67C4 -/* 802F6794 7F A3 EB 78 */ mr r3, r29 -/* 802F6798 C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 802F679C C0 5C 00 24 */ lfs f2, 0x24(r28) -/* 802F67A0 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F67A4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802F67A8 7D 89 03 A6 */ mtctr r12 -/* 802F67AC 4E 80 04 21 */ bctrl -/* 802F67B0 7F A3 EB 78 */ mr r3, r29 -/* 802F67B4 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F67B8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F67BC 7D 89 03 A6 */ mtctr r12 -/* 802F67C0 4E 80 04 21 */ bctrl -lbl_802F67C4: -/* 802F67C4 7F C3 F3 78 */ mr r3, r30 -lbl_802F67C8: -/* 802F67C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F67CC 48 06 BA 59 */ bl _restgpr_28 -/* 802F67D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F67D4 7C 08 03 A6 */ mtlr r0 -/* 802F67D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F67DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/makeMatrix__7J2DPaneFffff.s b/asm/JSystem/J2DGraph/J2DPane/makeMatrix__7J2DPaneFffff.s deleted file mode 100644 index cf8ebf6c847..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/makeMatrix__7J2DPaneFffff.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_802F7540: -/* 802F7540 94 21 FE 90 */ stwu r1, -0x170(r1) -/* 802F7544 7C 08 02 A6 */ mflr r0 -/* 802F7548 90 01 01 74 */ stw r0, 0x174(r1) -/* 802F754C DB E1 01 60 */ stfd f31, 0x160(r1) -/* 802F7550 F3 E1 01 68 */ psq_st f31, 360(r1), 0, 0 /* qr0 */ -/* 802F7554 DB C1 01 50 */ stfd f30, 0x150(r1) -/* 802F7558 F3 C1 01 58 */ psq_st f30, 344(r1), 0, 0 /* qr0 */ -/* 802F755C DB A1 01 40 */ stfd f29, 0x140(r1) -/* 802F7560 F3 A1 01 48 */ psq_st f29, 328(r1), 0, 0 /* qr0 */ -/* 802F7564 DB 81 01 30 */ stfd f28, 0x130(r1) -/* 802F7568 F3 81 01 38 */ psq_st f28, 312(r1), 0, 0 /* qr0 */ -/* 802F756C 93 E1 01 2C */ stw r31, 0x12c(r1) -/* 802F7570 7C 7F 1B 78 */ mr r31, r3 -/* 802F7574 FF 80 08 90 */ fmr f28, f1 -/* 802F7578 FF A0 10 90 */ fmr f29, f2 -/* 802F757C C0 03 00 C4 */ lfs f0, 0xc4(r3) -/* 802F7580 EF E0 18 28 */ fsubs f31, f0, f3 -/* 802F7584 C0 03 00 C8 */ lfs f0, 0xc8(r3) -/* 802F7588 EF C0 20 28 */ fsubs f30, f0, f4 -/* 802F758C 38 61 00 38 */ addi r3, r1, 0x38 -/* 802F7590 FC 20 F8 50 */ fneg f1, f31 -/* 802F7594 FC 40 F0 50 */ fneg f2, f30 -/* 802F7598 C0 62 C7 F0 */ lfs f3, lit_1469(r2) -/* 802F759C 48 04 F3 4D */ bl PSMTXTrans -/* 802F75A0 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 802F75A4 38 80 00 78 */ li r4, 0x78 -/* 802F75A8 C0 22 C8 0C */ lfs f1, lit_2466(r2) -/* 802F75AC C0 1F 00 B8 */ lfs f0, 0xb8(r31) -/* 802F75B0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802F75B4 48 04 F0 F5 */ bl PSMTXRotRad -/* 802F75B8 38 61 00 C8 */ addi r3, r1, 0xc8 -/* 802F75BC 38 80 00 79 */ li r4, 0x79 -/* 802F75C0 C0 22 C8 0C */ lfs f1, lit_2466(r2) -/* 802F75C4 C0 1F 00 BC */ lfs f0, 0xbc(r31) -/* 802F75C8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802F75CC 48 04 F0 DD */ bl PSMTXRotRad -/* 802F75D0 38 61 00 98 */ addi r3, r1, 0x98 -/* 802F75D4 38 80 00 7A */ li r4, 0x7a -/* 802F75D8 C0 22 C8 0C */ lfs f1, lit_2466(r2) -/* 802F75DC C0 1F 00 C0 */ lfs f0, 0xc0(r31) -/* 802F75E0 FC 00 00 50 */ fneg f0, f0 -/* 802F75E4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802F75E8 48 04 F0 C1 */ bl PSMTXRotRad -/* 802F75EC 38 61 00 98 */ addi r3, r1, 0x98 -/* 802F75F0 38 81 00 F8 */ addi r4, r1, 0xf8 -/* 802F75F4 38 A1 00 08 */ addi r5, r1, 8 -/* 802F75F8 48 04 EE ED */ bl PSMTXConcat -/* 802F75FC 38 61 00 C8 */ addi r3, r1, 0xc8 -/* 802F7600 38 81 00 08 */ addi r4, r1, 8 -/* 802F7604 38 A1 00 68 */ addi r5, r1, 0x68 -/* 802F7608 48 04 EE DD */ bl PSMTXConcat -/* 802F760C 38 61 00 38 */ addi r3, r1, 0x38 -/* 802F7610 38 9F 00 50 */ addi r4, r31, 0x50 -/* 802F7614 C0 3F 00 CC */ lfs f1, 0xcc(r31) -/* 802F7618 C0 5F 00 D0 */ lfs f2, 0xd0(r31) -/* 802F761C C0 62 C7 F4 */ lfs f3, lit_1489(r2) -/* 802F7620 48 04 F3 71 */ bl PSMTXScaleApply -/* 802F7624 38 61 00 68 */ addi r3, r1, 0x68 -/* 802F7628 38 9F 00 50 */ addi r4, r31, 0x50 -/* 802F762C 38 A1 00 08 */ addi r5, r1, 8 -/* 802F7630 48 04 EE B5 */ bl PSMTXConcat -/* 802F7634 38 61 00 08 */ addi r3, r1, 8 -/* 802F7638 38 9F 00 50 */ addi r4, r31, 0x50 -/* 802F763C EC 3C F8 2A */ fadds f1, f28, f31 -/* 802F7640 EC 5D F0 2A */ fadds f2, f29, f30 -/* 802F7644 C0 62 C7 F0 */ lfs f3, lit_1469(r2) -/* 802F7648 48 04 F2 D5 */ bl PSMTXTransApply -/* 802F764C E3 E1 01 68 */ psq_l f31, 360(r1), 0, 0 /* qr0 */ -/* 802F7650 CB E1 01 60 */ lfd f31, 0x160(r1) -/* 802F7654 E3 C1 01 58 */ psq_l f30, 344(r1), 0, 0 /* qr0 */ -/* 802F7658 CB C1 01 50 */ lfd f30, 0x150(r1) -/* 802F765C E3 A1 01 48 */ psq_l f29, 328(r1), 0, 0 /* qr0 */ -/* 802F7660 CB A1 01 40 */ lfd f29, 0x140(r1) -/* 802F7664 E3 81 01 38 */ psq_l f28, 312(r1), 0, 0 /* qr0 */ -/* 802F7668 CB 81 01 30 */ lfd f28, 0x130(r1) -/* 802F766C 83 E1 01 2C */ lwz r31, 0x12c(r1) -/* 802F7670 80 01 01 74 */ lwz r0, 0x174(r1) -/* 802F7674 7C 08 03 A6 */ mtlr r0 -/* 802F7678 38 21 01 70 */ addi r1, r1, 0x170 -/* 802F767C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s b/asm/JSystem/J2DGraph/J2DPane/makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s deleted file mode 100644 index 7b0987fc2f0..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s +++ /dev/null @@ -1,131 +0,0 @@ -lbl_802F7B18: -/* 802F7B18 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802F7B1C 7C 08 02 A6 */ mflr r0 -/* 802F7B20 90 01 00 64 */ stw r0, 0x64(r1) -/* 802F7B24 39 61 00 60 */ addi r11, r1, 0x60 -/* 802F7B28 48 06 A6 B5 */ bl _savegpr_29 -/* 802F7B2C 7C 7E 1B 78 */ mr r30, r3 -/* 802F7B30 7C 9F 23 78 */ mr r31, r4 -/* 802F7B34 7C BD 2B 78 */ mr r29, r5 -/* 802F7B38 7F A3 EB 78 */ mr r3, r29 -/* 802F7B3C 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F7B40 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F7B44 7D 89 03 A6 */ mtctr r12 -/* 802F7B48 4E 80 04 21 */ bctrl -/* 802F7B4C 7F A3 EB 78 */ mr r3, r29 -/* 802F7B50 38 81 00 08 */ addi r4, r1, 8 -/* 802F7B54 38 A0 00 48 */ li r5, 0x48 -/* 802F7B58 4B FE 47 41 */ bl read__14JSUInputStreamFPvl -/* 802F7B5C A0 01 00 12 */ lhz r0, 0x12(r1) -/* 802F7B60 B0 1E 00 04 */ sth r0, 4(r30) -/* 802F7B64 88 61 00 14 */ lbz r3, 0x14(r1) -/* 802F7B68 30 03 FF FF */ addic r0, r3, -1 -/* 802F7B6C 7C 00 19 10 */ subfe r0, r0, r3 -/* 802F7B70 98 1E 00 B0 */ stb r0, 0xb0(r30) -/* 802F7B74 80 01 00 18 */ lwz r0, 0x18(r1) -/* 802F7B78 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 802F7B7C 90 7E 00 14 */ stw r3, 0x14(r30) -/* 802F7B80 90 1E 00 10 */ stw r0, 0x10(r30) -/* 802F7B84 80 01 00 20 */ lwz r0, 0x20(r1) -/* 802F7B88 80 61 00 24 */ lwz r3, 0x24(r1) -/* 802F7B8C 90 7E 00 1C */ stw r3, 0x1c(r30) -/* 802F7B90 90 1E 00 18 */ stw r0, 0x18(r30) -/* 802F7B94 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 802F7B98 D0 1E 00 CC */ stfs f0, 0xcc(r30) -/* 802F7B9C C0 01 00 34 */ lfs f0, 0x34(r1) -/* 802F7BA0 D0 1E 00 D0 */ stfs f0, 0xd0(r30) -/* 802F7BA4 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 802F7BA8 D0 1E 00 B8 */ stfs f0, 0xb8(r30) -/* 802F7BAC C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 802F7BB0 D0 1E 00 BC */ stfs f0, 0xbc(r30) -/* 802F7BB4 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 802F7BB8 D0 1E 00 C0 */ stfs f0, 0xc0(r30) -/* 802F7BBC C0 01 00 44 */ lfs f0, 0x44(r1) -/* 802F7BC0 D0 1E 00 D4 */ stfs f0, 0xd4(r30) -/* 802F7BC4 C0 01 00 48 */ lfs f0, 0x48(r1) -/* 802F7BC8 D0 1E 00 D8 */ stfs f0, 0xd8(r30) -/* 802F7BCC 38 00 00 7A */ li r0, 0x7a -/* 802F7BD0 98 1E 00 B6 */ stb r0, 0xb6(r30) -/* 802F7BD4 88 81 00 15 */ lbz r4, 0x15(r1) -/* 802F7BD8 38 60 00 03 */ li r3, 3 -/* 802F7BDC 7C 04 1B D6 */ divw r0, r4, r3 -/* 802F7BE0 7C 00 19 D6 */ mullw r0, r0, r3 -/* 802F7BE4 7C 00 20 51 */ subf. r0, r0, r4 -/* 802F7BE8 40 82 00 10 */ bne lbl_802F7BF8 -/* 802F7BEC C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F7BF0 D0 1E 00 C4 */ stfs f0, 0xc4(r30) -/* 802F7BF4 48 00 00 28 */ b lbl_802F7C1C -lbl_802F7BF8: -/* 802F7BF8 2C 00 00 01 */ cmpwi r0, 1 -/* 802F7BFC 40 82 00 18 */ bne lbl_802F7C14 -/* 802F7C00 C0 21 00 28 */ lfs f1, 0x28(r1) -/* 802F7C04 C0 02 C8 08 */ lfs f0, lit_1725(r2) -/* 802F7C08 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802F7C0C D0 1E 00 C4 */ stfs f0, 0xc4(r30) -/* 802F7C10 48 00 00 0C */ b lbl_802F7C1C -lbl_802F7C14: -/* 802F7C14 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 802F7C18 D0 1E 00 C4 */ stfs f0, 0xc4(r30) -lbl_802F7C1C: -/* 802F7C1C 88 61 00 15 */ lbz r3, 0x15(r1) -/* 802F7C20 38 00 00 03 */ li r0, 3 -/* 802F7C24 7C 03 03 D7 */ divw. r0, r3, r0 -/* 802F7C28 40 82 00 10 */ bne lbl_802F7C38 -/* 802F7C2C C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F7C30 D0 1E 00 C8 */ stfs f0, 0xc8(r30) -/* 802F7C34 48 00 00 28 */ b lbl_802F7C5C -lbl_802F7C38: -/* 802F7C38 2C 00 00 01 */ cmpwi r0, 1 -/* 802F7C3C 40 82 00 18 */ bne lbl_802F7C54 -/* 802F7C40 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 802F7C44 C0 02 C8 08 */ lfs f0, lit_1725(r2) -/* 802F7C48 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802F7C4C D0 1E 00 C8 */ stfs f0, 0xc8(r30) -/* 802F7C50 48 00 00 0C */ b lbl_802F7C5C -lbl_802F7C54: -/* 802F7C54 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 802F7C58 D0 1E 00 C8 */ stfs f0, 0xc8(r30) -lbl_802F7C5C: -/* 802F7C5C C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 802F7C60 C0 3E 00 C8 */ lfs f1, 0xc8(r30) -/* 802F7C64 EC 60 08 28 */ fsubs f3, f0, f1 -/* 802F7C68 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 802F7C6C C0 9E 00 C4 */ lfs f4, 0xc4(r30) -/* 802F7C70 EC 40 20 28 */ fsubs f2, f0, f4 -/* 802F7C74 FC 20 08 50 */ fneg f1, f1 -/* 802F7C78 FC 00 20 50 */ fneg f0, f4 -/* 802F7C7C D0 1E 00 20 */ stfs f0, 0x20(r30) -/* 802F7C80 D0 3E 00 24 */ stfs f1, 0x24(r30) -/* 802F7C84 D0 5E 00 28 */ stfs f2, 0x28(r30) -/* 802F7C88 D0 7E 00 2C */ stfs f3, 0x2c(r30) -/* 802F7C8C 88 01 00 15 */ lbz r0, 0x15(r1) -/* 802F7C90 98 1E 00 B7 */ stb r0, 0xb7(r30) -/* 802F7C94 38 00 00 FF */ li r0, 0xff -/* 802F7C98 98 1E 00 B2 */ stb r0, 0xb2(r30) -/* 802F7C9C 38 00 00 00 */ li r0, 0 -/* 802F7CA0 98 1E 00 B4 */ stb r0, 0xb4(r30) -/* 802F7CA4 28 1F 00 00 */ cmplwi r31, 0 -/* 802F7CA8 41 82 00 18 */ beq lbl_802F7CC0 -/* 802F7CAC 34 9E 00 DC */ addic. r4, r30, 0xdc -/* 802F7CB0 41 82 00 08 */ beq lbl_802F7CB8 -/* 802F7CB4 38 84 00 0C */ addi r4, r4, 0xc -lbl_802F7CB8: -/* 802F7CB8 38 7F 00 DC */ addi r3, r31, 0xdc -/* 802F7CBC 4B FE 42 91 */ bl append__10JSUPtrListFP10JSUPtrLink -lbl_802F7CC0: -/* 802F7CC0 38 60 00 00 */ li r3, 0 -/* 802F7CC4 98 7E 00 B1 */ stb r3, 0xb1(r30) -/* 802F7CC8 38 00 00 FF */ li r0, 0xff -/* 802F7CCC 98 1E 00 B3 */ stb r0, 0xb3(r30) -/* 802F7CD0 98 7E 00 B5 */ stb r3, 0xb5(r30) -/* 802F7CD4 7F C3 F3 78 */ mr r3, r30 -/* 802F7CD8 81 9E 00 00 */ lwz r12, 0(r30) -/* 802F7CDC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F7CE0 7D 89 03 A6 */ mtctr r12 -/* 802F7CE4 4E 80 04 21 */ bctrl -/* 802F7CE8 39 61 00 60 */ addi r11, r1, 0x60 -/* 802F7CEC 48 06 A5 3D */ bl _restgpr_29 -/* 802F7CF0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 802F7CF4 7C 08 03 A6 */ mtlr r0 -/* 802F7CF8 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F7CFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s b/asm/JSystem/J2DGraph/J2DPane/makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s deleted file mode 100644 index fc60bb6184d..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s +++ /dev/null @@ -1,213 +0,0 @@ -lbl_802F60C4: -/* 802F60C4 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 802F60C8 7C 08 02 A6 */ mflr r0 -/* 802F60CC 90 01 00 84 */ stw r0, 0x84(r1) -/* 802F60D0 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 802F60D4 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 802F60D8 DB C1 00 60 */ stfd f30, 0x60(r1) -/* 802F60DC F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 802F60E0 DB A1 00 50 */ stfd f29, 0x50(r1) -/* 802F60E4 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */ -/* 802F60E8 39 61 00 50 */ addi r11, r1, 0x50 -/* 802F60EC 48 06 C0 F1 */ bl _savegpr_29 -/* 802F60F0 7C 7D 1B 78 */ mr r29, r3 -/* 802F60F4 7C 9E 23 78 */ mr r30, r4 -/* 802F60F8 7C BF 2B 78 */ mr r31, r5 -/* 802F60FC 7F E3 FB 78 */ mr r3, r31 -/* 802F6100 38 81 00 0B */ addi r4, r1, 0xb -/* 802F6104 38 A0 00 01 */ li r5, 1 -/* 802F6108 4B FE 61 91 */ bl read__14JSUInputStreamFPvl -/* 802F610C 7F E3 FB 78 */ mr r3, r31 -/* 802F6110 38 9D 00 B0 */ addi r4, r29, 0xb0 -/* 802F6114 38 A0 00 01 */ li r5, 1 -/* 802F6118 4B FE 61 81 */ bl read__14JSUInputStreamFPvl -/* 802F611C 7F E3 FB 78 */ mr r3, r31 -/* 802F6120 38 80 00 02 */ li r4, 2 -/* 802F6124 81 9F 00 00 */ lwz r12, 0(r31) -/* 802F6128 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802F612C 7D 89 03 A6 */ mtctr r12 -/* 802F6130 4E 80 04 21 */ bctrl -/* 802F6134 7F E3 FB 78 */ mr r3, r31 -/* 802F6138 38 81 00 18 */ addi r4, r1, 0x18 -/* 802F613C 38 A0 00 04 */ li r5, 4 -/* 802F6140 4B FE 61 59 */ bl read__14JSUInputStreamFPvl -/* 802F6144 80 61 00 18 */ lwz r3, 0x18(r1) -/* 802F6148 38 00 00 00 */ li r0, 0 -/* 802F614C 90 7D 00 14 */ stw r3, 0x14(r29) -/* 802F6150 90 1D 00 10 */ stw r0, 0x10(r29) -/* 802F6154 7F E3 FB 78 */ mr r3, r31 -/* 802F6158 38 81 00 14 */ addi r4, r1, 0x14 -/* 802F615C 38 A0 00 02 */ li r5, 2 -/* 802F6160 4B FE 61 39 */ bl read__14JSUInputStreamFPvl -/* 802F6164 A8 01 00 14 */ lha r0, 0x14(r1) -/* 802F6168 C8 22 C7 F8 */ lfd f1, lit_1651(r2) -/* 802F616C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F6170 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F6174 3C 00 43 30 */ lis r0, 0x4330 -/* 802F6178 90 01 00 20 */ stw r0, 0x20(r1) -/* 802F617C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802F6180 EF E0 08 28 */ fsubs f31, f0, f1 -/* 802F6184 7F E3 FB 78 */ mr r3, r31 -/* 802F6188 38 81 00 12 */ addi r4, r1, 0x12 -/* 802F618C 38 A0 00 02 */ li r5, 2 -/* 802F6190 4B FE 61 09 */ bl read__14JSUInputStreamFPvl -/* 802F6194 A8 01 00 12 */ lha r0, 0x12(r1) -/* 802F6198 C8 22 C7 F8 */ lfd f1, lit_1651(r2) -/* 802F619C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F61A0 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802F61A4 3C 00 43 30 */ lis r0, 0x4330 -/* 802F61A8 90 01 00 28 */ stw r0, 0x28(r1) -/* 802F61AC C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802F61B0 EF C0 08 28 */ fsubs f30, f0, f1 -/* 802F61B4 7F E3 FB 78 */ mr r3, r31 -/* 802F61B8 38 81 00 10 */ addi r4, r1, 0x10 -/* 802F61BC 38 A0 00 02 */ li r5, 2 -/* 802F61C0 4B FE 60 D9 */ bl read__14JSUInputStreamFPvl -/* 802F61C4 A8 01 00 10 */ lha r0, 0x10(r1) -/* 802F61C8 C8 22 C7 F8 */ lfd f1, lit_1651(r2) -/* 802F61CC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F61D0 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F61D4 3C 00 43 30 */ lis r0, 0x4330 -/* 802F61D8 90 01 00 30 */ stw r0, 0x30(r1) -/* 802F61DC C8 01 00 30 */ lfd f0, 0x30(r1) -/* 802F61E0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F61E4 EF BF 00 2A */ fadds f29, f31, f0 -/* 802F61E8 7F E3 FB 78 */ mr r3, r31 -/* 802F61EC 38 81 00 0E */ addi r4, r1, 0xe -/* 802F61F0 38 A0 00 02 */ li r5, 2 -/* 802F61F4 4B FE 60 A5 */ bl read__14JSUInputStreamFPvl -/* 802F61F8 A8 01 00 0E */ lha r0, 0xe(r1) -/* 802F61FC C8 22 C7 F8 */ lfd f1, lit_1651(r2) -/* 802F6200 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F6204 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802F6208 3C 00 43 30 */ lis r0, 0x4330 -/* 802F620C 90 01 00 38 */ stw r0, 0x38(r1) -/* 802F6210 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802F6214 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F6218 EC 1E 00 2A */ fadds f0, f30, f0 -/* 802F621C D3 FD 00 20 */ stfs f31, 0x20(r29) -/* 802F6220 D3 DD 00 24 */ stfs f30, 0x24(r29) -/* 802F6224 D3 BD 00 28 */ stfs f29, 0x28(r29) -/* 802F6228 D0 1D 00 2C */ stfs f0, 0x2c(r29) -/* 802F622C 88 61 00 0B */ lbz r3, 0xb(r1) -/* 802F6230 38 03 FF FA */ addi r0, r3, -6 -/* 802F6234 98 01 00 0B */ stb r0, 0xb(r1) -/* 802F6238 C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F623C D0 1D 00 B8 */ stfs f0, 0xb8(r29) -/* 802F6240 D0 1D 00 BC */ stfs f0, 0xbc(r29) -/* 802F6244 D0 1D 00 C0 */ stfs f0, 0xc0(r29) -/* 802F6248 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802F624C 28 00 00 00 */ cmplwi r0, 0 -/* 802F6250 41 82 00 40 */ beq lbl_802F6290 -/* 802F6254 7F E3 FB 78 */ mr r3, r31 -/* 802F6258 38 81 00 0C */ addi r4, r1, 0xc -/* 802F625C 38 A0 00 02 */ li r5, 2 -/* 802F6260 4B FE 60 39 */ bl read__14JSUInputStreamFPvl -/* 802F6264 A0 01 00 0C */ lhz r0, 0xc(r1) -/* 802F6268 C8 22 C8 00 */ lfd f1, lit_1655(r2) -/* 802F626C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802F6270 3C 00 43 30 */ lis r0, 0x4330 -/* 802F6274 90 01 00 38 */ stw r0, 0x38(r1) -/* 802F6278 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802F627C EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F6280 D0 1D 00 C0 */ stfs f0, 0xc0(r29) -/* 802F6284 88 61 00 0B */ lbz r3, 0xb(r1) -/* 802F6288 38 03 FF FF */ addi r0, r3, -1 -/* 802F628C 98 01 00 0B */ stb r0, 0xb(r1) -lbl_802F6290: -/* 802F6290 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802F6294 28 00 00 00 */ cmplwi r0, 0 -/* 802F6298 41 82 00 2C */ beq lbl_802F62C4 -/* 802F629C 7F E3 FB 78 */ mr r3, r31 -/* 802F62A0 38 81 00 0A */ addi r4, r1, 0xa -/* 802F62A4 38 A0 00 01 */ li r5, 1 -/* 802F62A8 4B FE 5F F1 */ bl read__14JSUInputStreamFPvl -/* 802F62AC 88 01 00 0A */ lbz r0, 0xa(r1) -/* 802F62B0 98 1D 00 B7 */ stb r0, 0xb7(r29) -/* 802F62B4 88 61 00 0B */ lbz r3, 0xb(r1) -/* 802F62B8 38 03 FF FF */ addi r0, r3, -1 -/* 802F62BC 98 01 00 0B */ stb r0, 0xb(r1) -/* 802F62C0 48 00 00 0C */ b lbl_802F62CC -lbl_802F62C4: -/* 802F62C4 38 00 00 00 */ li r0, 0 -/* 802F62C8 98 1D 00 B7 */ stb r0, 0xb7(r29) -lbl_802F62CC: -/* 802F62CC 38 00 00 7A */ li r0, 0x7a -/* 802F62D0 98 1D 00 B6 */ stb r0, 0xb6(r29) -/* 802F62D4 38 00 00 FF */ li r0, 0xff -/* 802F62D8 98 1D 00 B2 */ stb r0, 0xb2(r29) -/* 802F62DC 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802F62E0 28 00 00 00 */ cmplwi r0, 0 -/* 802F62E4 41 82 00 28 */ beq lbl_802F630C -/* 802F62E8 7F E3 FB 78 */ mr r3, r31 -/* 802F62EC 38 81 00 09 */ addi r4, r1, 9 -/* 802F62F0 38 A0 00 01 */ li r5, 1 -/* 802F62F4 4B FE 5F A5 */ bl read__14JSUInputStreamFPvl -/* 802F62F8 88 01 00 09 */ lbz r0, 9(r1) -/* 802F62FC 98 1D 00 B2 */ stb r0, 0xb2(r29) -/* 802F6300 88 61 00 0B */ lbz r3, 0xb(r1) -/* 802F6304 38 03 FF FF */ addi r0, r3, -1 -/* 802F6308 98 01 00 0B */ stb r0, 0xb(r1) -lbl_802F630C: -/* 802F630C 38 00 00 01 */ li r0, 1 -/* 802F6310 98 1D 00 B4 */ stb r0, 0xb4(r29) -/* 802F6314 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802F6318 28 00 00 00 */ cmplwi r0, 0 -/* 802F631C 41 82 00 30 */ beq lbl_802F634C -/* 802F6320 7F E3 FB 78 */ mr r3, r31 -/* 802F6324 38 81 00 08 */ addi r4, r1, 8 -/* 802F6328 38 A0 00 01 */ li r5, 1 -/* 802F632C 4B FE 5F 6D */ bl read__14JSUInputStreamFPvl -/* 802F6330 88 61 00 08 */ lbz r3, 8(r1) -/* 802F6334 30 03 FF FF */ addic r0, r3, -1 -/* 802F6338 7C 00 19 10 */ subfe r0, r0, r3 -/* 802F633C 98 1D 00 B4 */ stb r0, 0xb4(r29) -/* 802F6340 88 61 00 0B */ lbz r3, 0xb(r1) -/* 802F6344 38 03 FF FF */ addi r0, r3, -1 -/* 802F6348 98 01 00 0B */ stb r0, 0xb(r1) -lbl_802F634C: -/* 802F634C 7F E3 FB 78 */ mr r3, r31 -/* 802F6350 38 80 00 04 */ li r4, 4 -/* 802F6354 4B FE 60 1D */ bl align__20JSURandomInputStreamFl -/* 802F6358 28 1E 00 00 */ cmplwi r30, 0 -/* 802F635C 41 82 00 18 */ beq lbl_802F6374 -/* 802F6360 34 9D 00 DC */ addic. r4, r29, 0xdc -/* 802F6364 41 82 00 08 */ beq lbl_802F636C -/* 802F6368 38 84 00 0C */ addi r4, r4, 0xc -lbl_802F636C: -/* 802F636C 38 7E 00 DC */ addi r3, r30, 0xdc -/* 802F6370 4B FE 5B DD */ bl append__10JSUPtrListFP10JSUPtrLink -lbl_802F6374: -/* 802F6374 38 80 00 00 */ li r4, 0 -/* 802F6378 98 9D 00 B1 */ stb r4, 0xb1(r29) -/* 802F637C 38 00 00 FF */ li r0, 0xff -/* 802F6380 98 1D 00 B3 */ stb r0, 0xb3(r29) -/* 802F6384 98 9D 00 B5 */ stb r4, 0xb5(r29) -/* 802F6388 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802F638C 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802F6390 B0 1D 00 04 */ sth r0, 4(r29) -/* 802F6394 C0 02 C7 F4 */ lfs f0, lit_1489(r2) -/* 802F6398 D0 1D 00 CC */ stfs f0, 0xcc(r29) -/* 802F639C D0 1D 00 D0 */ stfs f0, 0xd0(r29) -/* 802F63A0 90 9D 00 1C */ stw r4, 0x1c(r29) -/* 802F63A4 90 9D 00 18 */ stw r4, 0x18(r29) -/* 802F63A8 7F A3 EB 78 */ mr r3, r29 -/* 802F63AC 7F C4 F3 78 */ mr r4, r30 -/* 802F63B0 48 00 00 49 */ bl changeUseTrans__7J2DPaneFP7J2DPane -/* 802F63B4 7F A3 EB 78 */ mr r3, r29 -/* 802F63B8 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F63BC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F63C0 7D 89 03 A6 */ mtctr r12 -/* 802F63C4 4E 80 04 21 */ bctrl -/* 802F63C8 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 802F63CC CB E1 00 70 */ lfd f31, 0x70(r1) -/* 802F63D0 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 802F63D4 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 802F63D8 E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */ -/* 802F63DC CB A1 00 50 */ lfd f29, 0x50(r1) -/* 802F63E0 39 61 00 50 */ addi r11, r1, 0x50 -/* 802F63E4 48 06 BE 45 */ bl _restgpr_29 -/* 802F63E8 80 01 00 84 */ lwz r0, 0x84(r1) -/* 802F63EC 7C 08 03 A6 */ mtlr r0 -/* 802F63F0 38 21 00 80 */ addi r1, r1, 0x80 -/* 802F63F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/move__7J2DPaneFff.s b/asm/JSystem/J2DGraph/J2DPane/move__7J2DPaneFff.s deleted file mode 100644 index 4db53130976..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/move__7J2DPaneFff.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_802F6F60: -/* 802F6F60 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F6F64 7C 08 02 A6 */ mflr r0 -/* 802F6F68 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F6F6C C0 63 00 28 */ lfs f3, 0x28(r3) -/* 802F6F70 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F6F74 EC 83 00 28 */ fsubs f4, f3, f0 -/* 802F6F78 C0 63 00 2C */ lfs f3, 0x2c(r3) -/* 802F6F7C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F6F80 EC 63 00 28 */ fsubs f3, f3, f0 -/* 802F6F84 D0 21 00 08 */ stfs f1, 8(r1) -/* 802F6F88 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 802F6F8C EC 01 20 2A */ fadds f0, f1, f4 -/* 802F6F90 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F6F94 EC 02 18 2A */ fadds f0, f2, f3 -/* 802F6F98 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802F6F9C 38 81 00 08 */ addi r4, r1, 8 -/* 802F6FA0 4B FF FD 79 */ bl func_802F6D18 -/* 802F6FA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F6FA8 7C 08 03 A6 */ mtlr r0 -/* 802F6FAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F6FB0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/resize__7J2DPaneFff.s b/asm/JSystem/J2DGraph/J2DPane/resize__7J2DPaneFff.s deleted file mode 100644 index 00d0770db06..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/resize__7J2DPaneFff.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_802F6FF8: -/* 802F6FF8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802F6FFC 7C 08 02 A6 */ mflr r0 -/* 802F7000 90 01 00 44 */ stw r0, 0x44(r1) -/* 802F7004 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 802F7008 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 802F700C DB C1 00 20 */ stfd f30, 0x20(r1) -/* 802F7010 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 802F7014 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802F7018 7C 7F 1B 78 */ mr r31, r3 -/* 802F701C FF C0 08 90 */ fmr f30, f1 -/* 802F7020 FF E0 10 90 */ fmr f31, f2 -/* 802F7024 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F7028 D0 01 00 08 */ stfs f0, 8(r1) -/* 802F702C C0 63 00 24 */ lfs f3, 0x24(r3) -/* 802F7030 D0 61 00 0C */ stfs f3, 0xc(r1) -/* 802F7034 C0 43 00 28 */ lfs f2, 0x28(r3) -/* 802F7038 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 802F703C C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802F7040 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 802F7044 C0 83 00 D4 */ lfs f4, 0xd4(r3) -/* 802F7048 C0 A3 00 D8 */ lfs f5, 0xd8(r3) -/* 802F704C EC 00 20 2A */ fadds f0, f0, f4 -/* 802F7050 D0 01 00 08 */ stfs f0, 8(r1) -/* 802F7054 EC 03 28 2A */ fadds f0, f3, f5 -/* 802F7058 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802F705C EC 02 20 2A */ fadds f0, f2, f4 -/* 802F7060 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F7064 EC 01 28 2A */ fadds f0, f1, f5 -/* 802F7068 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802F706C 48 00 0A 91 */ bl getParentPane__7J2DPaneFv -/* 802F7070 28 03 00 00 */ cmplwi r3, 0 -/* 802F7074 41 82 00 44 */ beq lbl_802F70B8 -/* 802F7078 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F707C FC 20 00 50 */ fneg f1, f0 -/* 802F7080 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F7084 FC 40 00 50 */ fneg f2, f0 -/* 802F7088 C0 01 00 08 */ lfs f0, 8(r1) -/* 802F708C EC 00 08 2A */ fadds f0, f0, f1 -/* 802F7090 D0 01 00 08 */ stfs f0, 8(r1) -/* 802F7094 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 802F7098 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F709C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802F70A0 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 802F70A4 EC 00 08 2A */ fadds f0, f0, f1 -/* 802F70A8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F70AC C0 01 00 14 */ lfs f0, 0x14(r1) -/* 802F70B0 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F70B4 D0 01 00 14 */ stfs f0, 0x14(r1) -lbl_802F70B8: -/* 802F70B8 C0 01 00 08 */ lfs f0, 8(r1) -/* 802F70BC EC 00 F0 2A */ fadds f0, f0, f30 -/* 802F70C0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802F70C4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 802F70C8 EC 00 F8 2A */ fadds f0, f0, f31 -/* 802F70CC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802F70D0 7F E3 FB 78 */ mr r3, r31 -/* 802F70D4 38 81 00 08 */ addi r4, r1, 8 -/* 802F70D8 4B FF FC 41 */ bl func_802F6D18 -/* 802F70DC E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 802F70E0 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 802F70E4 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 802F70E8 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 802F70EC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802F70F0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802F70F4 7C 08 03 A6 */ mtlr r0 -/* 802F70F8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802F70FC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP10J2DAnmBase.s b/asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP10J2DAnmBase.s deleted file mode 100644 index dfa5139432b..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP10J2DAnmBase.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_802F7EF4: -/* 802F7EF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F7EF8 7C 08 02 A6 */ mflr r0 -/* 802F7EFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F7F00 28 04 00 00 */ cmplwi r4, 0 -/* 802F7F04 41 82 00 B0 */ beq lbl_802F7FB4 -/* 802F7F08 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802F7F0C 28 00 00 07 */ cmplwi r0, 7 -/* 802F7F10 41 81 00 A4 */ bgt lbl_802F7FB4 -/* 802F7F14 3C A0 80 3D */ lis r5, lit_2709@ha /* 0x803CCFB0@ha */ -/* 802F7F18 38 A5 CF B0 */ addi r5, r5, lit_2709@l /* 0x803CCFB0@l */ -/* 802F7F1C 54 00 10 3A */ slwi r0, r0, 2 -/* 802F7F20 7C 05 00 2E */ lwzx r0, r5, r0 -/* 802F7F24 7C 09 03 A6 */ mtctr r0 -/* 802F7F28 4E 80 04 20 */ bctr -/* 802F7F2C 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7F30 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 802F7F34 7D 89 03 A6 */ mtctr r12 -/* 802F7F38 4E 80 04 21 */ bctrl -/* 802F7F3C 48 00 00 78 */ b lbl_802F7FB4 -/* 802F7F40 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7F44 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 802F7F48 7D 89 03 A6 */ mtctr r12 -/* 802F7F4C 4E 80 04 21 */ bctrl -/* 802F7F50 48 00 00 64 */ b lbl_802F7FB4 -/* 802F7F54 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7F58 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 802F7F5C 7D 89 03 A6 */ mtctr r12 -/* 802F7F60 4E 80 04 21 */ bctrl -/* 802F7F64 48 00 00 50 */ b lbl_802F7FB4 -/* 802F7F68 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7F6C 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 802F7F70 7D 89 03 A6 */ mtctr r12 -/* 802F7F74 4E 80 04 21 */ bctrl -/* 802F7F78 48 00 00 3C */ b lbl_802F7FB4 -/* 802F7F7C 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7F80 81 8C 00 68 */ lwz r12, 0x68(r12) -/* 802F7F84 7D 89 03 A6 */ mtctr r12 -/* 802F7F88 4E 80 04 21 */ bctrl -/* 802F7F8C 48 00 00 28 */ b lbl_802F7FB4 -/* 802F7F90 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7F94 81 8C 00 74 */ lwz r12, 0x74(r12) -/* 802F7F98 7D 89 03 A6 */ mtctr r12 -/* 802F7F9C 4E 80 04 21 */ bctrl -/* 802F7FA0 48 00 00 14 */ b lbl_802F7FB4 -/* 802F7FA4 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7FA8 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 802F7FAC 7D 89 03 A6 */ mtctr r12 -/* 802F7FB0 4E 80 04 21 */ bctrl -lbl_802F7FB4: -/* 802F7FB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F7FB8 7C 08 03 A6 */ mtlr r0 -/* 802F7FBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F7FC0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setInfluencedAlpha__7J2DPaneFbb.s b/asm/JSystem/J2DGraph/J2DPane/setInfluencedAlpha__7J2DPaneFbb.s deleted file mode 100644 index cc6112bab09..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setInfluencedAlpha__7J2DPaneFbb.s +++ /dev/null @@ -1,128 +0,0 @@ -lbl_802F77D0: -/* 802F77D0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802F77D4 7C 08 02 A6 */ mflr r0 -/* 802F77D8 90 01 00 54 */ stw r0, 0x54(r1) -/* 802F77DC DB E1 00 40 */ stfd f31, 0x40(r1) -/* 802F77E0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 802F77E4 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 802F77E8 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 802F77EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F77F0 48 06 A9 E9 */ bl _savegpr_28 -/* 802F77F4 7C 7E 1B 78 */ mr r30, r3 -/* 802F77F8 7C 9F 23 78 */ mr r31, r4 -/* 802F77FC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 802F7800 41 82 01 7C */ beq lbl_802F797C -/* 802F7804 88 9E 00 B4 */ lbz r4, 0xb4(r30) -/* 802F7808 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 802F780C 7C 04 00 40 */ cmplw r4, r0 -/* 802F7810 41 82 01 6C */ beq lbl_802F797C -/* 802F7814 48 00 02 E9 */ bl getParentPane__7J2DPaneFv -/* 802F7818 3B 80 00 FF */ li r28, 0xff -/* 802F781C CB C2 C8 00 */ lfd f30, lit_1655(r2) -/* 802F7820 3F A0 43 30 */ lis r29, 0x4330 -/* 802F7824 C3 E2 C8 10 */ lfs f31, lit_2547(r2) -/* 802F7828 48 00 00 64 */ b lbl_802F788C -lbl_802F782C: -/* 802F782C 88 83 00 B2 */ lbz r4, 0xb2(r3) -/* 802F7830 28 04 00 00 */ cmplwi r4, 0 -/* 802F7834 40 82 00 0C */ bne lbl_802F7840 -/* 802F7838 3B 80 00 00 */ li r28, 0 -/* 802F783C 48 00 00 58 */ b lbl_802F7894 -lbl_802F7840: -/* 802F7840 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 802F7844 90 01 00 0C */ stw r0, 0xc(r1) -/* 802F7848 93 A1 00 08 */ stw r29, 8(r1) -/* 802F784C C8 01 00 08 */ lfd f0, 8(r1) -/* 802F7850 EC 20 F0 28 */ fsubs f1, f0, f30 -/* 802F7854 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802F7858 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F785C 93 A1 00 10 */ stw r29, 0x10(r1) -/* 802F7860 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802F7864 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 802F7868 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802F786C EC 00 F8 24 */ fdivs f0, f0, f31 -/* 802F7870 FC 00 00 1E */ fctiwz f0, f0 -/* 802F7874 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 802F7878 83 81 00 1C */ lwz r28, 0x1c(r1) -/* 802F787C 88 03 00 B4 */ lbz r0, 0xb4(r3) -/* 802F7880 28 00 00 00 */ cmplwi r0, 0 -/* 802F7884 41 82 00 10 */ beq lbl_802F7894 -/* 802F7888 48 00 02 75 */ bl getParentPane__7J2DPaneFv -lbl_802F788C: -/* 802F788C 28 03 00 00 */ cmplwi r3, 0 -/* 802F7890 40 82 FF 9C */ bne lbl_802F782C -lbl_802F7894: -/* 802F7894 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802F7898 41 82 00 94 */ beq lbl_802F792C -/* 802F789C 57 83 06 3F */ clrlwi. r3, r28, 0x18 -/* 802F78A0 40 82 00 20 */ bne lbl_802F78C0 -/* 802F78A4 7F C3 F3 78 */ mr r3, r30 -/* 802F78A8 38 80 00 00 */ li r4, 0 -/* 802F78AC 81 9E 00 00 */ lwz r12, 0(r30) -/* 802F78B0 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802F78B4 7D 89 03 A6 */ mtctr r12 -/* 802F78B8 4E 80 04 21 */ bctrl -/* 802F78BC 48 00 00 C0 */ b lbl_802F797C -lbl_802F78C0: -/* 802F78C0 C0 62 C8 10 */ lfs f3, lit_2547(r2) -/* 802F78C4 88 1E 00 B2 */ lbz r0, 0xb2(r30) -/* 802F78C8 C8 42 C8 00 */ lfd f2, lit_1655(r2) -/* 802F78CC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802F78D0 3C 00 43 30 */ lis r0, 0x4330 -/* 802F78D4 90 01 00 18 */ stw r0, 0x18(r1) -/* 802F78D8 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802F78DC EC 20 10 28 */ fsubs f1, f0, f2 -/* 802F78E0 90 61 00 14 */ stw r3, 0x14(r1) -/* 802F78E4 90 01 00 10 */ stw r0, 0x10(r1) -/* 802F78E8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802F78EC EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F78F0 EC 01 00 24 */ fdivs f0, f1, f0 -/* 802F78F4 EC 03 00 32 */ fmuls f0, f3, f0 -/* 802F78F8 7F C3 F3 78 */ mr r3, r30 -/* 802F78FC FC 00 18 40 */ fcmpo cr0, f0, f3 -/* 802F7900 40 81 00 0C */ ble lbl_802F790C -/* 802F7904 38 80 00 FF */ li r4, 0xff -/* 802F7908 48 00 00 10 */ b lbl_802F7918 -lbl_802F790C: -/* 802F790C FC 00 00 1E */ fctiwz f0, f0 -/* 802F7910 D8 01 00 08 */ stfd f0, 8(r1) -/* 802F7914 80 81 00 0C */ lwz r4, 0xc(r1) -lbl_802F7918: -/* 802F7918 81 83 00 00 */ lwz r12, 0(r3) -/* 802F791C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802F7920 7D 89 03 A6 */ mtctr r12 -/* 802F7924 4E 80 04 21 */ bctrl -/* 802F7928 48 00 00 54 */ b lbl_802F797C -lbl_802F792C: -/* 802F792C 7F C3 F3 78 */ mr r3, r30 -/* 802F7930 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 802F7934 88 1E 00 B2 */ lbz r0, 0xb2(r30) -/* 802F7938 7C 04 01 D6 */ mullw r0, r4, r0 -/* 802F793C C8 22 C7 F8 */ lfd f1, lit_1651(r2) -/* 802F7940 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F7944 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802F7948 3C 00 43 30 */ lis r0, 0x4330 -/* 802F794C 90 01 00 18 */ stw r0, 0x18(r1) -/* 802F7950 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802F7954 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802F7958 C0 02 C8 10 */ lfs f0, lit_2547(r2) -/* 802F795C EC 01 00 24 */ fdivs f0, f1, f0 -/* 802F7960 FC 00 00 1E */ fctiwz f0, f0 -/* 802F7964 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 802F7968 80 81 00 14 */ lwz r4, 0x14(r1) -/* 802F796C 81 9E 00 00 */ lwz r12, 0(r30) -/* 802F7970 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802F7974 7D 89 03 A6 */ mtctr r12 -/* 802F7978 4E 80 04 21 */ bctrl -lbl_802F797C: -/* 802F797C 9B FE 00 B4 */ stb r31, 0xb4(r30) -/* 802F7980 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 802F7984 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 802F7988 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 802F798C CB C1 00 30 */ lfd f30, 0x30(r1) -/* 802F7990 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F7994 48 06 A8 91 */ bl _restgpr_28 -/* 802F7998 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802F799C 7C 08 03 A6 */ mtlr r0 -/* 802F79A0 38 21 00 50 */ addi r1, r1, 0x50 -/* 802F79A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/updateTransform__7J2DPaneFPC15J2DAnmTransform.s b/asm/JSystem/J2DGraph/J2DPane/updateTransform__7J2DPaneFPC15J2DAnmTransform.s deleted file mode 100644 index a6a5bc0d241..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/updateTransform__7J2DPaneFPC15J2DAnmTransform.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_802F82C0: -/* 802F82C0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802F82C4 7C 08 02 A6 */ mflr r0 -/* 802F82C8 90 01 00 54 */ stw r0, 0x54(r1) -/* 802F82CC 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 802F82D0 7C 7F 1B 78 */ mr r31, r3 -/* 802F82D4 A0 03 00 04 */ lhz r0, 4(r3) -/* 802F82D8 28 00 FF FF */ cmplwi r0, 0xffff -/* 802F82DC 41 82 00 D8 */ beq lbl_802F83B4 -/* 802F82E0 28 04 00 00 */ cmplwi r4, 0 -/* 802F82E4 41 82 00 D0 */ beq lbl_802F83B4 -/* 802F82E8 7C 83 23 78 */ mr r3, r4 -/* 802F82EC 7C 04 03 78 */ mr r4, r0 -/* 802F82F0 38 A1 00 08 */ addi r5, r1, 8 -/* 802F82F4 81 83 00 00 */ lwz r12, 0(r3) -/* 802F82F8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802F82FC 7D 89 03 A6 */ mtctr r12 -/* 802F8300 4E 80 04 21 */ bctrl -/* 802F8304 C0 01 00 08 */ lfs f0, 8(r1) -/* 802F8308 D0 1F 00 CC */ stfs f0, 0xcc(r31) -/* 802F830C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 802F8310 D0 1F 00 D0 */ stfs f0, 0xd0(r31) -/* 802F8314 C0 62 C8 14 */ lfs f3, lit_2890(r2) -/* 802F8318 A8 01 00 14 */ lha r0, 0x14(r1) -/* 802F831C 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 802F8320 C8 42 C8 00 */ lfd f2, lit_1655(r2) -/* 802F8324 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802F8328 3C 60 43 30 */ lis r3, 0x4330 -/* 802F832C 90 61 00 28 */ stw r3, 0x28(r1) -/* 802F8330 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802F8334 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F8338 EC 03 00 32 */ fmuls f0, f3, f0 -/* 802F833C C0 22 C8 18 */ lfs f1, lit_2891(r2) -/* 802F8340 EC 00 08 24 */ fdivs f0, f0, f1 -/* 802F8344 D0 1F 00 B8 */ stfs f0, 0xb8(r31) -/* 802F8348 A8 01 00 18 */ lha r0, 0x18(r1) -/* 802F834C 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 802F8350 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F8354 90 61 00 30 */ stw r3, 0x30(r1) -/* 802F8358 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 802F835C EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F8360 EC 03 00 32 */ fmuls f0, f3, f0 -/* 802F8364 EC 00 08 24 */ fdivs f0, f0, f1 -/* 802F8368 D0 1F 00 BC */ stfs f0, 0xbc(r31) -/* 802F836C A8 01 00 16 */ lha r0, 0x16(r1) -/* 802F8370 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 802F8374 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802F8378 90 61 00 38 */ stw r3, 0x38(r1) -/* 802F837C C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802F8380 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F8384 EC 03 00 32 */ fmuls f0, f3, f0 -/* 802F8388 EC 00 08 24 */ fdivs f0, f0, f1 -/* 802F838C D0 1F 00 C0 */ stfs f0, 0xc0(r31) -/* 802F8390 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 802F8394 D0 1F 00 D4 */ stfs f0, 0xd4(r31) -/* 802F8398 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 802F839C D0 1F 00 D8 */ stfs f0, 0xd8(r31) -/* 802F83A0 7F E3 FB 78 */ mr r3, r31 -/* 802F83A4 81 9F 00 00 */ lwz r12, 0(r31) -/* 802F83A8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F83AC 7D 89 03 A6 */ mtctr r12 -/* 802F83B0 4E 80 04 21 */ bctrl -lbl_802F83B4: -/* 802F83B4 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 802F83B8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802F83BC 7C 08 03 A6 */ mtlr r0 -/* 802F83C0 38 21 00 50 */ addi r1, r1, 0x50 -/* 802F83C4 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index 41e7f7f92c2..e97c5be8c6d 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -15,6 +15,7 @@ public: s16 getFrameMax() const { return mFrameMax; } void setFrame(f32 frame) { mFrame = frame; } + s32 getKind() const { return mKind; } private: /* 0x0 */ // vtable diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/include/JSystem/J2DGraph/J2DGrafContext.h index 7d7efa7a65b..be64fcc38fb 100644 --- a/include/JSystem/J2DGraph/J2DGrafContext.h +++ b/include/JSystem/J2DGraph/J2DGrafContext.h @@ -1,6 +1,7 @@ #ifndef J2DGRAFCONTEXT_H #define J2DGRAFCONTEXT_H +#include "JSystem/J2DGraph/J2DMatBlock.h" #include "JSystem/JGeometry.h" #include "JSystem/JUtility/TColor.h" #include "dolphin/mtx/mtx.h" @@ -35,7 +36,7 @@ public: /* 802E9664 */ virtual s32 getGrafType() const { return 0; } /* 802E966C */ virtual void setLookat() {} -protected: +public: /* 0x04 */ JGeometry::TBox2 mBounds; /* 0x14 */ JGeometry::TBox2 mScissorBounds; /* 0x24 */ JUtility::TColor mColorTL; @@ -46,15 +47,9 @@ protected: /* 0x38 */ JGeometry::TVec2 mPrevPos; /* 0x40 */ Mtx44 mMtx44; /* 0x80 */ Mtx mPosMtx; - /* 0xB0 */ u8 field_0xb0; - /* 0xB1 */ u8 field_0xb1; - /* 0xB2 */ u8 field_0xb2; - /* 0xB3 */ u8 mLineBlendMode; - /* 0xB4 */ u8 mLineSrcBlendFactor; - /* 0xB5 */ u8 mLineDstBlendFactor; - /* 0xB6 */ u8 mBoxBlendMode; - /* 0xB7 */ u8 mBoxSrcBlendFactor; - /* 0xB8 */ u8 mBoxDstBlendFactor; + /* 0xB0 */ J2DBlendInfo field_0xb0; + /* 0xB3 */ J2DBlendInfo mLinePart; + /* 0xB6 */ J2DBlendInfo mBoxPart; }; #endif /* J2DGRAFCONTEXT_H */ diff --git a/include/JSystem/J2DGraph/J2DManage.h b/include/JSystem/J2DGraph/J2DManage.h index 6222e2139be..769b9cc0e1b 100644 --- a/include/JSystem/J2DGraph/J2DManage.h +++ b/include/JSystem/J2DGraph/J2DManage.h @@ -11,8 +11,8 @@ struct J2DResReference { class J2DDataManage { public: - /* 8030CE18 */ void get(char const*); - /* 8030CE7C */ void get(JSUInputStream*); + /* 8030CE18 */ void* get(char const*); + /* 8030CE7C */ void* get(JSUInputStream*); }; #endif /* J2DMANAGE_H */ diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h index 0333028fb56..810fccc0919 100644 --- a/include/JSystem/J2DGraph/J2DMatBlock.h +++ b/include/JSystem/J2DGraph/J2DMatBlock.h @@ -414,11 +414,11 @@ struct J2DBlendInfo { /* 0x0 */ u8 mType; /* 0x1 */ u8 mSrcFactor; /* 0x2 */ u8 mDstFactor; - /* 0x3 */ u8 mOp; }; struct J2DBlend { /* 0x0 */ J2DBlendInfo mBlendInfo; + /* 0x3 */ u8 mOp; }; class J2DPEBlock { diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index a58858aa85d..73a920ee42d 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -31,7 +31,7 @@ public: J2DPane(J2DPane* other, JSURandomInputStream* stream, u8 arg3); virtual ~J2DPane(); - /* 0x0c */ virtual s32 getTypeID() const; + /* 0x0c */ virtual s32 getTypeID() const { return 16; } /* 0x10 */ virtual void move(f32 x, f32 y); /* 0x14 */ virtual void add(f32 x, f32 y); /* 0x18 */ virtual void resize(f32 x, f32 y); @@ -53,12 +53,12 @@ public: /* 0x58 */ virtual void rewriteAlpha(); /* 0x5c */ virtual void setAnimation(J2DAnmBase* anm); /* 0x60 */ virtual void setAnimation(J2DAnmTransform* anm); - /* 0x64 */ virtual void setAnimation(J2DAnmColor* anm); - /* 0x68 */ virtual void setAnimation(J2DAnmTexPattern* anm); - /* 0x6c */ virtual void setAnimation(J2DAnmTextureSRTKey* anm); - /* 0x70 */ virtual void setAnimation(J2DAnmTevRegKey* anm); - /* 0x74 */ virtual void setAnimation(J2DAnmVisibilityFull* anm); - /* 0x78 */ virtual void setAnimation(J2DAnmVtxColor* anm); + /* 0x64 */ virtual void setAnimation(J2DAnmColor* anm) {} + /* 0x68 */ virtual void setAnimation(J2DAnmTexPattern* anm) {} + /* 0x6c */ virtual void setAnimation(J2DAnmTextureSRTKey* anm) {} + /* 0x70 */ virtual void setAnimation(J2DAnmTevRegKey* anm) {} + /* 0x74 */ virtual void setAnimation(J2DAnmVisibilityFull* anm) {} + /* 0x78 */ virtual void setAnimation(J2DAnmVtxColor* anm) {} /* 0x7c */ virtual const J2DAnmTransform* animationTransform(const J2DAnmTransform* transform); /* 0x80 */ virtual void setVisibileAnimation(J2DAnmVisibilityFull* visibility); /* 0x84 */ virtual void setAnimationVF(J2DAnmVisibilityFull* visibility); @@ -119,7 +119,7 @@ public: void clip(const JGeometry::TBox2& bounds); void setBasePosition(J2DBasePosition position); void setInfluencedAlpha(bool arg1, bool arg2); - void getGlbVtx(u8 arg1) const; + JGeometry::TVec3 getGlbVtx(u8 arg1) const; J2DPane* getFirstChildPane(); J2DPane* getNextChildPane(); J2DPane* getParentPane(); @@ -130,7 +130,7 @@ public: void updateTransform(const J2DAnmTransform* transform); void setUserInfo(u64 info) { mUserInfoTag = info; } - static f32 static_mBounds[4]; + static JGeometry::TBox2 static_mBounds; public: /* 0x04 */ u16 _4; diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h index 1e6527babf3..67470e2d839 100644 --- a/include/JSystem/J2DGraph/J2DScreen.h +++ b/include/JSystem/J2DGraph/J2DScreen.h @@ -49,6 +49,8 @@ public: /* 802F9640 */ static void* getNameResource(char const*); /* 802F9690 */ void animation(); + static J2DDataManage* getDataManage() { return mDataManage; } + static J2DDataManage* mDataManage; private: diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 0da0a2718b2..fc2d86cd9ba 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -92,6 +92,10 @@ template<> struct TBox > { bool isValid() const { return f.isAbove(i); } + void addPos(f32 x, f32 y) { + addPos(TVec2(x, y)); + } + void addPos(const TVec2& pos) { i.add(pos); f.add(pos); @@ -123,7 +127,7 @@ struct TBox2 : TBox > { } void set(const TBox2& other) { set(other.i, other.f); } - void set(const TVec2& i, const TVec2 f) { this->i.set(i), this->f.set(f); } + void set(const TVec2& i, const TVec2& f) { this->i.set(i), this->f.set(f); } void set(f32 x0, f32 y0, f32 x1, f32 y1) { i.set(x0, y0); f.set(x1, y1); } }; diff --git a/include/JSystem/JSupport/JSUInputStream.h b/include/JSystem/JSupport/JSUInputStream.h index f4a3ed3af3b..3c4968b66aa 100644 --- a/include/JSystem/JSupport/JSUInputStream.h +++ b/include/JSystem/JSupport/JSUInputStream.h @@ -19,6 +19,30 @@ public: /* vt[4] */ virtual s32 skip(s32); /* vt[5] */ virtual u32 readData(void*, s32) = 0; + u32 read32b() { + u32 val; + this->read(&val, sizeof(val)); + return val; + } + + s16 readS16() { + s16 val; + this->read(&val, sizeof(val)); + return val; + } + + u16 readU16() { + u16 val; + this->read(&val, sizeof(val)); + return val; + } + + u8 readU8() { + u8 val; + this->read(&val, sizeof(val)); + return val; + } + // TODO: return value probably wrong /* 802DC298 */ s32 read(void*, s32); }; // Size = 0x8 diff --git a/include/JSystem/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h index f204f239ee1..b0bbdd4fb96 100644 --- a/include/JSystem/JSupport/JSUList.h +++ b/include/JSystem/JSupport/JSUList.h @@ -157,67 +157,33 @@ private: // Tree // -#define JSU_TREE_FROM_LINK(T, LINK) (JSUTree*)(((u8*)(LINK)) - 12) -#define JSU_TREE_LINK_IF_NOT_NULL(TREE) \ - if (TREE) { \ - TREE = (JSUTree*)(&(TREE)->mLink); \ - } - -#define _JSU_TREE_AS_LINK(TREE) ((JSULink*)(TREE)) - template -class JSUTree { +class JSUTree : public JSUList, public JSULink { public: - JSUTree(T* owner) : mList(), mLink(owner) {} + JSUTree(T* owner) : JSUList(), JSULink(owner) {} ~JSUTree() {} - bool appendChild(JSUTree* child) { - JSU_TREE_LINK_IF_NOT_NULL(child); - return this->mList.append(_JSU_TREE_AS_LINK(child)); - } + bool appendChild(JSUTree* child) { return this->append(child); } - bool removeChild(JSUTree* child) { - JSU_TREE_LINK_IF_NOT_NULL(child); - return this->mList.remove(_JSU_TREE_AS_LINK(child)); - } + bool removeChild(JSUTree* child) { return this->remove(child); } - bool insertChild(JSUTree* before, JSUTree* child) { - JSU_TREE_LINK_IF_NOT_NULL(before); - JSU_TREE_LINK_IF_NOT_NULL(child); - return this->mList.insert(_JSU_TREE_AS_LINK(before), _JSU_TREE_AS_LINK(child)); - } + bool insertChild(JSUTree* before, JSUTree* child) { return this->insert(before, child); } JSUTree* getEndChild() const { return NULL; } - JSUTree* getFirstChild() const { - JSULink* link = this->mList.getFirst(); - return link ? JSU_TREE_FROM_LINK(T, link) : (JSUTree*)link; - } + JSUTree* getFirstChild() const { return (JSUTree*)this->getFirst(); } - JSUTree* getLastChild() const { - JSULink* link = this->mList.getLast(); - return link ? JSU_TREE_FROM_LINK(T, link) : (JSUTree*)link; - } + JSUTree* getLastChild() const { return (JSUTree*)this->getLast(); } - JSUTree* getNextChild() const { - JSULink* link = this->mLink.getNext(); - return link ? JSU_TREE_FROM_LINK(T, link) : (JSUTree*)link; - } + JSUTree* getNextChild() const { return (JSUTree*)this->getNext(); } - JSUTree* getPrevChild() const { - JSULink* link = this->mLink.getPrev(); - return link ? JSU_TREE_FROM_LINK(T, link) : (JSUTree*)link; - } + JSUTree* getPrevChild() const { return (JSUTree*)this->getPrev(); } - u32 getNumChildren() const { return this->mList.getNumLinks(); } + u32 getNumChildren() const { return this->getNumLinks(); } - T* getObject() const { return this->mLink.getObject(); } + T* getObject() const { return (T*)this->getObjectPtr(); } - JSUTree* getParent() const { return (JSUTree*)this->mLink.getList(); } - -private: - JSUList mList; - JSULink mLink; + JSUTree* getParent() const { return (JSUTree*)this->getList(); } }; template diff --git a/include/JSystem/JUtility/JUTResource.h b/include/JSystem/JUtility/JUTResource.h index 9101795e68f..9f6cdb775ea 100644 --- a/include/JSystem/JUtility/JUTResource.h +++ b/include/JSystem/JUtility/JUTResource.h @@ -1,6 +1,20 @@ #ifndef JUTRESOURCE_H #define JUTRESOURCE_H +#include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/JSupport/JSUInputStream.h" #include "dolphin/types.h" +class JUTResReference { +private: + u8 unk_0x0[0x100]; + +public: + JUTResReference() { unk_0x0[0] = 0; } + /* 802DE078 */ void* getResource(JSUInputStream*, u32, JKRArchive*); + /* 802DE120 */ void getResource(void const*, u32, JKRArchive*); + /* 802DE1BC */ void getResource(u32, JKRArchive*); +}; +// only rough size known due to getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive + #endif /* JUTRESOURCE_H */ diff --git a/libs/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp index 8c949073184..fcf21a7b487 100644 --- a/libs/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/libs/JSystem/J2DGraph/J2DGrafContext.cpp @@ -116,36 +116,36 @@ void J2DGrafContext::setColor(JUtility::TColor colorTL, JUtility::TColor colorTR mColorTR = colorTR; mColorBR = colorBR; mColorBL = colorBL; - field_0xb0 = GX_BM_BLEND; - field_0xb1 = GX_BL_SRC_ALPHA; - field_0xb2 = GX_BL_INV_SRC_ALPHA; - mLineBlendMode = GX_BM_BLEND; - mLineSrcBlendFactor = GX_BL_SRC_ALPHA; - mLineDstBlendFactor = GX_BL_INV_SRC_ALPHA; - mBoxBlendMode = GX_BM_BLEND; - mBoxSrcBlendFactor = GX_BL_SRC_ALPHA; - mBoxDstBlendFactor = GX_BL_INV_SRC_ALPHA; + field_0xb0.mType = GX_BM_BLEND; + field_0xb0.mSrcFactor = GX_BL_SRC_ALPHA; + field_0xb0.mDstFactor = GX_BL_INV_SRC_ALPHA; + mLinePart.mType = GX_BM_BLEND; + mLinePart.mSrcFactor = GX_BL_SRC_ALPHA; + mLinePart.mDstFactor = GX_BL_INV_SRC_ALPHA; + mBoxPart.mType = GX_BM_BLEND; + mBoxPart.mSrcFactor = GX_BL_SRC_ALPHA; + mBoxPart.mDstFactor = GX_BL_INV_SRC_ALPHA; if ((mColorTL & 0xFF) != 0xFF) { return; } - field_0xb0 = GX_BM_NONE; - field_0xb1 = GX_BL_ONE; - field_0xb2 = GX_BL_ZERO; + field_0xb0.mType = GX_BM_NONE; + field_0xb0.mSrcFactor = GX_BL_ONE; + field_0xb0.mDstFactor = GX_BL_ZERO; if ((mColorBR & 0xFF) != 0xFF) { return; } - mLineBlendMode = GX_BM_NONE; - mLineSrcBlendFactor = GX_BL_ONE; - mLineDstBlendFactor = GX_BL_ZERO; + mLinePart.mType = GX_BM_NONE; + mLinePart.mSrcFactor = GX_BL_ONE; + mLinePart.mDstFactor = GX_BL_ZERO; if ((mColorTR & 0xFF) != 0xFF) { return; } if ((mColorBL & 0xFF) != 0xFF) { return; } - mBoxBlendMode = GX_BM_NONE; - mBoxSrcBlendFactor = GX_BL_ONE; - mBoxDstBlendFactor = GX_BL_ZERO; + mBoxPart.mType = GX_BM_NONE; + mBoxPart.mSrcFactor = GX_BL_ONE; + mBoxPart.mDstFactor = GX_BL_ZERO; } /* 802E9234-802E9260 2E3B74 002C+00 1/1 2/2 0/0 .text setLineWidth__14J2DGrafContextFUc @@ -158,8 +158,8 @@ void J2DGrafContext::setLineWidth(u8 lineWidth) { /* 802E9260-802E9368 2E3BA0 0108+00 0/0 2/2 0/0 .text * fillBox__14J2DGrafContextFRCQ29JGeometry8TBox2 */ void J2DGrafContext::fillBox(JGeometry::TBox2 const& box) { - GXSetBlendMode((GXBlendMode)mBoxBlendMode, (GXBlendFactor)mBoxSrcBlendFactor, - (GXBlendFactor)mBoxDstBlendFactor, GX_LO_SET); + GXSetBlendMode((GXBlendMode)mBoxPart.mType, (GXBlendFactor)mBoxPart.mSrcFactor, + (GXBlendFactor)mBoxPart.mDstFactor, GX_LO_SET); GXLoadPosMtxImm(mPosMtx, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); GXBegin(GX_QUADS, GX_VTXFMT0, 4); @@ -178,8 +178,8 @@ void J2DGrafContext::fillBox(JGeometry::TBox2 const& box) { /* 802E9368-802E9488 2E3CA8 0120+00 0/0 1/1 0/0 .text * drawFrame__14J2DGrafContextFRCQ29JGeometry8TBox2 */ void J2DGrafContext::drawFrame(JGeometry::TBox2 const& box) { - GXSetBlendMode((GXBlendMode)mBoxBlendMode, (GXBlendFactor)mBoxSrcBlendFactor, - (GXBlendFactor)mBoxDstBlendFactor, GX_LO_SET); + GXSetBlendMode((GXBlendMode)mBoxPart.mType, (GXBlendFactor)mBoxPart.mSrcFactor, + (GXBlendFactor)mBoxPart.mDstFactor, GX_LO_SET); GXLoadPosMtxImm(mPosMtx, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); GXBegin(GX_LINESTRIP, GX_VTXFMT0, 5); @@ -200,8 +200,8 @@ void J2DGrafContext::drawFrame(JGeometry::TBox2 const& box) { /* 802E9488-802E9564 2E3DC8 00DC+00 1/1 0/0 0/0 .text * line__14J2DGrafContextFQ29JGeometry8TVec2Q29JGeometry8TVec2 */ void J2DGrafContext::line(JGeometry::TVec2 start, JGeometry::TVec2 end) { - GXSetBlendMode((GXBlendMode)mLineBlendMode, (GXBlendFactor)mLineSrcBlendFactor, - (GXBlendFactor)mLineDstBlendFactor, GX_LO_SET); + GXSetBlendMode((GXBlendMode)mLinePart.mType, (GXBlendFactor)mLinePart.mSrcFactor, + (GXBlendFactor)mLinePart.mDstFactor, GX_LO_SET); GXLoadPosMtxImm(mPosMtx, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); GXBegin(GX_LINES, GX_VTXFMT0, 2); diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp index fa9b518c618..039bc10e3eb 100644 --- a/libs/JSystem/J2DGraph/J2DManage.cpp +++ b/libs/JSystem/J2DGraph/J2DManage.cpp @@ -33,7 +33,7 @@ extern "C" void strcmp(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DDataManage::get(char const* param_0) { +asm void* J2DDataManage::get(char const* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DManage/get__13J2DDataManageFPCc.s" } @@ -43,7 +43,7 @@ asm void J2DDataManage::get(char const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DDataManage::get(JSUInputStream* param_0) { +asm void* J2DDataManage::get(JSUInputStream* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DManage/get__13J2DDataManageFP14JSUInputStream.s" } diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index 8f625f3db3b..c0705539b34 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -4,194 +4,18 @@ // #include "JSystem/J2DGraph/J2DPane.h" +#include "JSystem/J2DGraph/J2DManage.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J3DGraphBase/J3DTransform.h" +#include "JSystem/JUtility/JUTResource.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JUTResReference { - /* 802DE078 */ void getResource(JSUInputStream*, u32, JKRArchive*); -}; - -struct J2DOrthoGraph { - /* 802E987C */ void scissorBounds(JGeometry::TBox2*, JGeometry::TBox2 const*); -}; - -struct J2DDataManage { - /* 8030CE7C */ void get(JSUInputStream*); -}; - -// -// Forward References: -// - -extern "C" void __ct__7J2DPaneFv(); -extern "C" void initiate__7J2DPaneFv(); -extern "C" void func_802F5D40(); -extern "C" void func_802F5DD0(); -extern "C" void func_802F5E88(); -extern "C" void func_802F5F08(); -extern "C" void __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc(); -extern "C" void makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream(); -extern "C" void changeUseTrans__7J2DPaneFP7J2DPane(); -extern "C" void __dt__7J2DPaneFv(); -extern "C" void appendChild__7J2DPaneFP7J2DPane(); -extern "C" void insertChild__7J2DPaneFP7J2DPaneP7J2DPane(); -extern "C" void draw__7J2DPaneFffPC14J2DGrafContextbb(); -extern "C" void func_802F6D18(); -extern "C" void move__7J2DPaneFff(); -extern "C" void add__7J2DPaneFff(); -extern "C" void resize__7J2DPaneFff(); -extern "C" void getBounds__7J2DPaneFv(); -extern "C" void rotate__7J2DPaneFff13J2DRotateAxisf(); -extern "C" void rotate__7J2DPaneFf(); -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 setBasePosition__7J2DPaneF15J2DBasePosition(); -extern "C" void setInfluencedAlpha__7J2DPaneFbb(); -extern "C" void getGlbVtx__7J2DPaneCFUc(); -extern "C" void getFirstChildPane__7J2DPaneFv(); -extern "C" void getNextChildPane__7J2DPaneFv(); -extern "C" void getParentPane__7J2DPaneFv(); -extern "C" void makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream(); -extern "C" void J2DCast_F32_to_S16__7J2DPaneFfUc(); -extern "C" void getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive(); -extern "C" void setAnimation__7J2DPaneFP10J2DAnmBase(); -extern "C" void setAnimation__7J2DPaneFP15J2DAnmTransform(); -extern "C" void animationTransform__7J2DPaneFv(); -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 updateTransform__7J2DPaneFPC15J2DAnmTransform(); -extern "C" void drawSelf__7J2DPaneFffPA3_A4_f(); -extern "C" void rewriteAlpha__7J2DPaneFv(); -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 drawSelf__7J2DPaneFff(); -extern "C" void __sinit_J2DPane_cpp(); -extern "C" f32 static_mBounds__7J2DPane[4]; - -// -// External References: -// - -extern "C" void setAlpha__7J2DPaneFUc(); -extern "C" void calcMtx__7J2DPaneFv(); -extern "C" void makeMatrix__7J2DPaneFff(); -extern "C" s32 getTypeID__7J2DPaneCFv(); -extern "C" void setAnimation__7J2DPaneFP15J2DAnmTevRegKey(); -extern "C" void setAnimation__7J2DPaneFP11J2DAnmColor(); -extern "C" void setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey(); -extern "C" void setAnimation__7J2DPaneFP14J2DAnmVtxColor(); -extern "C" void setAnimation__7J2DPaneFP20J2DAnmVisibilityFull(); -extern "C" void setAnimation__7J2DPaneFP16J2DAnmTexPattern(); -extern "C" void __dl__FPv(); -extern "C" void __ct__10JSUPtrLinkFPv(); -extern "C" void __dt__10JSUPtrLinkFv(); -extern "C" void __dt__10JSUPtrListFv(); -extern "C" void initiate__10JSUPtrListFv(); -extern "C" void append__10JSUPtrListFP10JSUPtrLink(); -extern "C" void insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink(); -extern "C" void read__14JSUInputStreamFPvl(); -extern "C" void align__20JSURandomInputStreamFl(); -extern "C" void peek__20JSURandomInputStreamFPvl(); -extern "C" void seek__20JSURandomInputStreamFl17JSUStreamSeekFrom(); -extern "C" void getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive(); -extern "C" void setScissor__14J2DGrafContextFv(); -extern "C" void func_802E90C0(); -extern "C" void func_802E987C(); -extern "C" void get__13J2DDataManageFP14JSUInputStream(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */]; - // // Declarations: // -/* ############################################################################################## */ -/* 803CCFB0-803CCFD0 -00001 0020+00 1/1 0/0 0/0 .data @2709 */ -SECTION_DATA static void* lit_2709[8] = { - (void*)(((char*)setAnimation__7J2DPaneFP10J2DAnmBase) + 0x38), - (void*)(((char*)setAnimation__7J2DPaneFP10J2DAnmBase) + 0x4C), - (void*)(((char*)setAnimation__7J2DPaneFP10J2DAnmBase) + 0x88), - (void*)(((char*)setAnimation__7J2DPaneFP10J2DAnmBase) + 0xC0), - (void*)(((char*)setAnimation__7J2DPaneFP10J2DAnmBase) + 0x74), - (void*)(((char*)setAnimation__7J2DPaneFP10J2DAnmBase) + 0xB0), - (void*)(((char*)setAnimation__7J2DPaneFP10J2DAnmBase) + 0x9C), - (void*)(((char*)setAnimation__7J2DPaneFP10J2DAnmBase) + 0x60), -}; - -/* 803CCFD0-803CD068 02A0F0 0094+04 5/5 0/0 0/0 .data __vt__7J2DPane */ -SECTION_DATA extern void* __vt__7J2DPane[37 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__7J2DPaneFv, - (void*)getTypeID__7J2DPaneCFv, - (void*)move__7J2DPaneFff, - (void*)add__7J2DPaneFff, - (void*)resize__7J2DPaneFff, - (void*)setCullBack__7J2DPaneFb, - (void*)setCullBack__7J2DPaneF11_GXCullMode, - (void*)setAlpha__7J2DPaneFUc, - (void*)setConnectParent__7J2DPaneFb, - (void*)calcMtx__7J2DPaneFv, - (void*)update__7J2DPaneFv, - (void*)drawSelf__7J2DPaneFff, - (void*)drawSelf__7J2DPaneFffPA3_A4_f, - (void*)search__7J2DPaneFUx, - (void*)searchUserInfo__7J2DPaneFUx, - (void*)makeMatrix__7J2DPaneFff, - (void*)makeMatrix__7J2DPaneFffff, - (void*)isUsed__7J2DPaneFPC7ResTIMG, - (void*)isUsed__7J2DPaneFPC7ResFONT, - (void*)clearAnmTransform__7J2DPaneFv, - (void*)rewriteAlpha__7J2DPaneFv, - (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, - /* padding */ - NULL, -}; - -/* 804561F0-804561F4 0047F0 0004+00 12/12 0/0 0/0 .sdata2 @1469 */ -SECTION_SDATA2 static u8 lit_1469[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 802F5BF8-802F5CB8 2F0538 00C0+00 0/0 10/10 0/0 .text __ct__7J2DPaneFv */ J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { mTransform = NULL; @@ -199,24 +23,19 @@ J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { mVisible = true; mInfoTag = 0; mUserInfoTag = 0; - mBounds.set(FLOAT_LABEL(lit_1469), FLOAT_LABEL(lit_1469), FLOAT_LABEL(lit_1469), - FLOAT_LABEL(lit_1469)); + mBounds.set(0, 0, 0, 0); initiate(); changeUseTrans(NULL); calcMtx(); } -/* ############################################################################################## */ -/* 804561F4-804561F8 0047F4 0004+00 3/3 0/0 0/0 .sdata2 @1489 */ -SECTION_SDATA2 static f32 lit_1489 = 1.0f; - /* 802F5CB8-802F5D40 2F05F8 0088+00 3/3 0/0 0/0 .text initiate__7J2DPaneFv */ void J2DPane::initiate() { _4 = -1; - mRotateOffsetY = mRotateOffsetX = mRotateZ = mRotateY = mRotateX = FLOAT_LABEL(lit_1469); + mRotateOffsetY = mRotateOffsetX = mRotateZ = mRotateY = mRotateX = 0; mBasePosition = 0; mRotAxis = ROTATE_Z; - mScaleY = mScaleX = lit_1489; + mScaleY = mScaleX = 1; mCullMode = GX_CULL_NONE; mAlpha = 0xFF; mIsInfluencedAlpha = true; @@ -228,116 +47,172 @@ void J2DPane::initiate() { /* 802F5D40-802F5DD0 2F0680 0090+00 0/0 1/1 0/0 .text * __ct__7J2DPaneFP7J2DPanebUxRCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DPane::J2DPane(J2DPane* param_0, bool param_1, u64 param_2, - JGeometry::TBox2 const& param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/func_802F5D40.s" +J2DPane::J2DPane(J2DPane* param_0, bool param_1, u64 tag, JGeometry::TBox2 const& box) + : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { + mTransform = NULL; + this->initialize(param_0, param_1, tag, box); } -#pragma pop /* 802F5DD0-802F5E88 2F0710 00B8+00 1/1 0/0 0/0 .text * initialize__7J2DPaneFP7J2DPanebUxRCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::initialize(J2DPane* param_0, bool param_1, u64 param_2, - JGeometry::TBox2 const& param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/func_802F5DD0.s" +void J2DPane::initialize(J2DPane* pane, bool visible, u64 infoTag, + JGeometry::TBox2 const& box) { + id = 'PAN1'; + mVisible = visible; + mInfoTag = infoTag; + mUserInfoTag = 0; + mBounds.set(box); + if (pane != NULL) { + pane->mPaneTree.appendChild(&this->mPaneTree); + } + this->initiate(); + this->changeUseTrans(pane); + this->calcMtx(); } -#pragma pop /* 802F5E88-802F5F08 2F07C8 0080+00 0/0 3/3 0/0 .text __ct__7J2DPaneFUxRCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DPane::J2DPane(u64 param_0, JGeometry::TBox2 const& param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/func_802F5E88.s" +J2DPane::J2DPane(u64 infoTag, JGeometry::TBox2 const& box) + : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { + mTransform = NULL; + this->initialize(infoTag, box); } -#pragma pop /* 802F5F08-802F5F9C 2F0848 0094+00 1/1 0/0 0/0 .text * initialize__7J2DPaneFUxRCQ29JGeometry8TBox2 */ -#ifdef NONMATCHING // templating..... again -void J2DPane::initialize(u64 tag, const TBox2& dim) { +void J2DPane::initialize(u64 tag, const JGeometry::TBox2& dim) { id = 'PAN1'; mVisible = true; mInfoTag = tag; - mUserInfoTag = tag; + mUserInfoTag = 0; mBounds.set(dim); initiate(); changeUseTrans(NULL); calcMtx(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::initialize(u64 param_0, JGeometry::TBox2 const& param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/func_802F5F08.s" -} -#pragma pop -#endif /* 802F5F9C-802F60C4 2F08DC 0128+00 0/0 1/1 0/0 .text * __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DPane::J2DPane(J2DPane* param_0, JSURandomInputStream* param_1, u8 param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/__ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc.s" +J2DPane::J2DPane(J2DPane* pane, JSURandomInputStream* inputStream, u8 isEx) : mPaneTree(this) { + mTransform = NULL; + if (isEx == 0) { + s32 position = inputStream->getPosition(); + s32 buf[2]; + inputStream->read(&buf, sizeof(buf)); + id = buf[0]; + position += buf[1]; + this->makePaneStream(pane, inputStream); + inputStream->seek(position, JSUStreamSeekFrom_SET); + } else { + s32 position = inputStream->getPosition(); + s32 buf[2]; + inputStream->peek(&buf, sizeof(buf)); + id = buf[0]; + position += buf[1]; + this->makePaneExStream(pane, inputStream); + inputStream->seek(position, JSUStreamSeekFrom_SET); + } } -#pragma pop - -/* ############################################################################################## */ -/* 804561F8-80456200 0047F8 0008+00 3/3 0/0 0/0 .sdata2 @1651 */ -SECTION_SDATA2 static f64 lit_1651 = 4503601774854144.0 /* cast s32 to float */; - -/* 80456200-80456208 004800 0008+00 3/3 0/0 0/0 .sdata2 @1655 */ -SECTION_SDATA2 static f64 lit_1655 = 4503599627370496.0 /* cast u32 to float */; /* 802F60C4-802F63F8 2F0A04 0334+00 1/1 3/3 0/0 .text * makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::makePaneStream(J2DPane* param_0, JSURandomInputStream* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s" +void J2DPane::makePaneStream(J2DPane* pane, JSURandomInputStream* inputStream) { + u8 unk; + inputStream->read(&unk, 1); + inputStream->read(&mVisible, 1); + inputStream->skip(2); + mInfoTag = inputStream->read32b(); + f32 x0 = inputStream->readS16(); + f32 y0 = inputStream->readS16(); + f32 x1 = x0 + inputStream->readS16(); + f32 y1 = y0 + inputStream->readS16(); + mBounds.set(x0, y0, x1, y1); + unk -= 6; + mRotateX = 0; + mRotateY = 0; + mRotateZ = 0; + if (unk != 0) { + mRotateZ = inputStream->readU16(); + unk--; + } + if (unk != 0) { + mBasePosition = inputStream->readU8(); + unk--; + } else { + mBasePosition = 0; + } + mRotAxis = ROTATE_Z; + mAlpha = 0xFF; + if (unk != 0) { + mAlpha = inputStream->readU8(); + unk--; + } + mIsInfluencedAlpha = true; + if (unk != 0) { + mIsInfluencedAlpha = inputStream->readU8(); + unk--; + } + inputStream->align(4); + if (pane != NULL) { + pane->mPaneTree.appendChild(&this->mPaneTree); + } + mCullMode = GX_CULL_NONE; + mColorAlpha = 0xFF; + mConnected = false; + _4 = 0xFFFF; + mScaleX = 1; + mScaleY = 1; + mUserInfoTag = 0; + this->changeUseTrans(pane); + this->calcMtx(); } -#pragma pop - -/* ############################################################################################## */ -/* 80456208-8045620C 004808 0004+00 4/4 0/0 0/0 .sdata2 @1725 */ -SECTION_SDATA2 static f32 lit_1725 = 0.5f; /* 802F63F8-802F658C 2F0D38 0194+00 4/4 0/0 0/0 .text changeUseTrans__7J2DPaneFP7J2DPane */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::changeUseTrans(J2DPane* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/changeUseTrans__7J2DPaneFP7J2DPane.s" +void J2DPane::changeUseTrans(J2DPane* pane) { + f32 xOffset = 0; + f32 yOffset = 0; + if (mBasePosition % 3 == 1) { + xOffset = mBounds.getWidth() / 2; + } else if (mBasePosition % 3 == 2) { + xOffset = mBounds.getWidth(); + } + if (mBasePosition / 3 == 1) { + yOffset = mBounds.getHeight() / 2; + } else if (mBasePosition / 3 == 2) { + yOffset = mBounds.getHeight(); + } + mTranslateX = mBounds.i.x + xOffset; + mTranslateY = mBounds.i.y + yOffset; + mRotateOffsetX = xOffset; + mRotateOffsetY = yOffset; + f32 f1 = -mTranslateX; + f32 f2 = -mTranslateY; + mBounds.addPos(f1, f2); + if (pane != NULL) { + u8 otherBasePos = pane->mBasePosition; + f32 width = pane->getWidth(); + f32 height = pane->getHeight(); + if (otherBasePos % 3 == 1) { + mTranslateX -= width / 2; + } else if (otherBasePos % 3 == 2) { + mTranslateX -= width; + } + if (otherBasePos / 3 == 1) { + mTranslateY -= height / 2; + } else if (otherBasePos / 3 == 2) { + mTranslateY -= height; + } + } } -#pragma pop /* 802F658C-802F666C 2F0ECC 00E0+00 1/0 4/4 0/0 .text __dt__7J2DPaneFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm J2DPane::~J2DPane() { -extern "C" asm void __dt__7J2DPaneFv() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/__dt__7J2DPaneFv.s" +J2DPane::~J2DPane() { + JSUTreeIterator iterator; + for (iterator = mPaneTree.getFirstChild(); iterator != mPaneTree.getEndChild();) { + J2DPane* child = (iterator++).getObject(); + delete child; + } } -#pragma pop /* 802F666C-802F6714 2F0FAC 00A8+00 0/0 2/2 0/0 .text appendChild__7J2DPaneFP7J2DPane */ bool J2DPane::appendChild(J2DPane* pChild) { @@ -356,14 +231,14 @@ bool J2DPane::appendChild(J2DPane* pChild) { } /* 802F6714-802F67E0 2F1054 00CC+00 0/0 1/1 0/0 .text insertChild__7J2DPaneFP7J2DPaneP7J2DPane */ -#ifdef NONMATCHING bool J2DPane::insertChild(J2DPane* before, J2DPane* child) { if (child == NULL) return false; const J2DPane* parent = child->getParentPane(); - bool result = mPaneTree.insertChild(&before->mPaneTree, &child->mPaneTree); + bool result = + mPaneTree.insertChild(before != NULL ? &before->mPaneTree : NULL, &child->mPaneTree); if (result && parent == NULL) { child->add(mBounds.i.x, mBounds.i.y); @@ -372,53 +247,123 @@ bool J2DPane::insertChild(J2DPane* before, J2DPane* child) { return result; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DPane::insertChild(J2DPane* param_0, J2DPane* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/insertChild__7J2DPaneFP7J2DPaneP7J2DPane.s" -} -#pragma pop -#endif /* 802F67E0-802F6D18 2F1120 0538+00 0/0 1/1 0/0 .text draw__7J2DPaneFffPC14J2DGrafContextbb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::draw(f32 param_0, f32 param_1, J2DGrafContext const* param_2, bool param_3, - bool param_4) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/draw__7J2DPaneFffPC14J2DGrafContextbb.s" +void J2DPane::draw(f32 x, f32 y, J2DGrafContext const* grafCtx, bool isOrthoGraf, bool param_4) { + bool unkBool = param_4 && mVisible; + if (grafCtx->getGrafType() != 1) { + isOrthoGraf = false; + } + JSUTree* parentTree = mPaneTree.getParent(); + J2DPane* parent = NULL; + if (parentTree != NULL) { + parent = parentTree->getObject(); + } + if (mBounds.isValid()) { + mGlobalBounds = mBounds; + f32 tX = mTranslateX; + f32 tY = mTranslateY; + mGlobalBounds.addPos(tX, tY); + if (unkBool) { + mClipRect = mBounds; + this->rewriteAlpha(); + } + if (parent != NULL) { + f32 width = parent->mGlobalBounds.i.x - parent->mBounds.i.x; + f32 height = parent->mGlobalBounds.i.y - parent->mBounds.i.y; + mGlobalBounds.addPos(width, height); + PSMTXConcat(parent->mGlobalMtx, this->mPositionMtx, this->mGlobalMtx); + if (unkBool) { + if (isOrthoGraf) { + mClipRect = mGlobalBounds; + mClipRect.intersect(parent->mClipRect); + } + mColorAlpha = mAlpha; + if (mIsInfluencedAlpha) { + mColorAlpha = (mAlpha * parent->mColorAlpha) / 0xFF; + } + } + } else { + mGlobalBounds.addPos(x, y); + this->makeMatrix(mTranslateX + x, mTranslateY + y); + PSMTXCopy(mPositionMtx, mGlobalMtx); + mClipRect = mGlobalBounds; + mColorAlpha = mAlpha; + } + JGeometry::TBox2 scissorBounds(0, 0, 0, 0); + if (unkBool && isOrthoGraf) { + ((J2DOrthoGraph*)grafCtx)->scissorBounds(&scissorBounds, &mClipRect); + } + if (unkBool && (mClipRect.isValid() || !isOrthoGraf)) { + J2DGrafContext tmpGraf(*grafCtx); + if (isOrthoGraf) { + tmpGraf.scissor(scissorBounds); + tmpGraf.setScissor(); + } + GXSetCullMode((GXCullMode)mCullMode); + this->drawSelf(x, y, &tmpGraf.mPosMtx); + } + JSUTreeIterator iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + iter.getObject()->draw(0, 0, grafCtx, isOrthoGraf, unkBool); + } + } } -#pragma pop /* 802F6D18-802F6F60 2F1658 0248+00 2/2 4/4 0/0 .text place__7J2DPaneFRCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::place(JGeometry::TBox2 const& param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/func_802F6D18.s" +void J2DPane::place(JGeometry::TBox2 const& box) { + JGeometry::TBox2 tmpBox; + if (mBounds.i.x == 0) { + tmpBox.i.x = 0; + tmpBox.f.x = box.getWidth(); + mTranslateX = box.i.x; + } else if (mBounds.f.x == 0) { + tmpBox.i.x = -box.getWidth(); + tmpBox.f.x = 0; + mTranslateX = box.f.x; + } else { + tmpBox.i.x = -(box.getWidth() / 2); + tmpBox.f.x = box.getWidth() / 2; + mTranslateX = (box.i.x + box.f.x) / 2; + } + if (mBounds.i.y == 0) { + tmpBox.i.y = 0; + tmpBox.f.y = box.getHeight(); + mTranslateY = box.i.y; + } else if (mBounds.f.y == 0) { + tmpBox.i.y = -box.getHeight(); + tmpBox.f.y = 0; + mTranslateY = box.f.y; + } else { + tmpBox.i.y = -(box.getHeight() / 2); + tmpBox.f.y = box.getHeight() / 2; + mTranslateY = (box.i.y + box.f.y) / 2; + } + f32 xOff = tmpBox.i.x - mBounds.i.x; + f32 yOff = tmpBox.i.y - mBounds.i.y; + for (J2DPane* childPane = this->getFirstChildPane(); childPane != NULL; + childPane = childPane->getNextChildPane()) { + childPane->mTranslateX += xOff; + childPane->mTranslateY += yOff; + if (xOff != 0 || yOff != 0) { + childPane->calcMtx(); + } + } + mBounds = tmpBox; + J2DPane* parent = this->getParentPane(); + if (parent != NULL) { + mTranslateX += parent->mBounds.i.x; + mTranslateY += parent->mBounds.i.y; + } + this->calcMtx(); } -#pragma pop /* 802F6F60-802F6FB4 2F18A0 0054+00 1/0 7/0 0/0 .text move__7J2DPaneFff */ -#ifdef NONMATCHING void J2DPane::move(f32 x, f32 y) { - place(TBox2(x, y, x + getWidth(), y + getHeight())); + f32 width = getWidth(); + f32 height = getHeight(); + place(JGeometry::TBox2(x, y, x + width, y + height)); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::move(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/move__7J2DPaneFff.s" -} -#pragma pop -#endif /* 802F6FB4-802F6FF8 2F18F4 0044+00 1/0 7/0 0/0 .text add__7J2DPaneFff */ void J2DPane::add(f32 x, f32 y) { @@ -428,59 +373,48 @@ void J2DPane::add(f32 x, f32 y) { } /* 802F6FF8-802F7100 2F1938 0108+00 1/0 5/2 0/0 .text resize__7J2DPaneFff */ -#ifdef NONMATCHING void J2DPane::resize(f32 x, f32 y) { - TBox2 box = mBounds; + JGeometry::TBox2 box = mBounds; - box.addPos(TVec2(mTranslateX, mTranslateY)); + f32 tX = mTranslateX; + f32 tY = mTranslateY; + + box.addPos(tX, tY); const J2DPane* parent = getParentPane(); if (parent != NULL) { - box.addPos(TVec2(-parent->mBounds.i.x, -parent->mBounds.i.y)); + f32 xAdd = -parent->mBounds.i.x; + f32 yAdd = -parent->mBounds.i.y; + box.addPos(xAdd, yAdd); } box.f.x = box.i.x + x; box.f.y = box.i.y + y; place(box); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::resize(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/resize__7J2DPaneFff.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 804349B0-804349C0 0616D0 0010+00 2/2 0/0 0/0 .bss static_mBounds__7J2DPane */ -f32 J2DPane::static_mBounds[4]; +JGeometry::TBox2 J2DPane::static_mBounds(0, 0, 0, 0); /* 802F7100-802F71DC 2F1A40 00DC+00 0/0 25/25 1/1 .text getBounds__7J2DPaneFv */ -#ifdef NONMATCHING // close ish -TBox2& J2DPane::getBounds() { - lbl_804349B0 = mBounds; - lbl_804349B0.addPos(TVec2(mTranslateX, mTranslateY)); +JGeometry::TBox2& J2DPane::getBounds() { + static_mBounds = mBounds; + + f32 tX = mTranslateX; + f32 tY = mTranslateY; + + static_mBounds.addPos(tX, tY); const J2DPane* parent = getParentPane(); if (parent != NULL) { - lbl_804349B0.addPos(TVec2(-parent->mBounds.i.x, -parent->mBounds.i.y)); + f32 xAdd = -parent->mBounds.i.x; + f32 yAdd = -parent->mBounds.i.y; + static_mBounds.addPos(xAdd, yAdd); } - return lbl_804349B0; + return static_mBounds; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JGeometry::TBox2& J2DPane::getBounds() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/getBounds__7J2DPaneFv.s" -} -#pragma pop -#endif /* 802F71DC-802F720C 2F1B1C 0030+00 0/0 12/12 0/0 .text rotate__7J2DPaneFff13J2DRotateAxisf */ void J2DPane::rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle) { @@ -504,14 +438,12 @@ void J2DPane::rotate(f32 angle) { } /* 802F7264-802F72E0 2F1BA4 007C+00 0/0 2/2 0/0 .text clip__7J2DPaneFRCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::clip(JGeometry::TBox2 const& param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/func_802F7264.s" +void J2DPane::clip(JGeometry::TBox2 const& box) { + JGeometry::TBox2 boxA(box); + JGeometry::TBox2 boxB(mGlobalBounds); + boxA.addPos(boxB.i); + mClipRect.intersect(boxA); } -#pragma pop /* 802F72E0-802F7388 2F1C20 00A8+00 1/0 7/1 0/0 .text search__7J2DPaneFUx */ J2DPane* J2DPane::search(u64 tag) { @@ -563,19 +495,21 @@ bool J2DPane::isUsed(const ResFONT* font) { return false; } -/* ############################################################################################## */ -/* 8045620C-80456210 00480C 0004+00 1/1 0/0 0/0 .sdata2 @2466 */ -SECTION_SDATA2 static f32 lit_2466 = 0.01745329238474369f; - /* 802F7540-802F7680 2F1E80 0140+00 1/0 7/0 0/0 .text makeMatrix__7J2DPaneFffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::makeMatrix(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/makeMatrix__7J2DPaneFffff.s" +void J2DPane::makeMatrix(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { + f32 tmpX = mRotateOffsetX - param_2; + f32 tmpY = mRotateOffsetY - param_3; + Mtx rotX, rotY, rotZ, rotMtx, mtx, tmp; + PSMTXTrans(mtx, -tmpX, -tmpY, 0); + PSMTXRotRad(rotX, 'x', 0.01745329238474369f * mRotateX); + PSMTXRotRad(rotY, 'y', 0.01745329238474369f * mRotateY); + PSMTXRotRad(rotZ, 'z', 0.01745329238474369f * -mRotateZ); + PSMTXConcat(rotZ, rotX, tmp); + PSMTXConcat(rotY, tmp, rotMtx); + PSMTXScaleApply(mtx, mPositionMtx, mScaleX, mScaleY, 1); + PSMTXConcat(rotMtx, mPositionMtx, tmp); + PSMTXTransApply(tmp, mPositionMtx, param_0 + tmpX, param_1 + tmpY, 0); } -#pragma pop /* 802F7680-802F76F8 2F1FC0 0078+00 1/0 7/3 0/0 .text setCullBack__7J2DPaneF11_GXCullMode */ @@ -594,20 +528,20 @@ void J2DPane::setBasePosition(J2DBasePosition position) { mBasePosition = position; mRotAxis = ROTATE_Z; - mRotateOffsetX = FLOAT_LABEL(lit_1469); + mRotateOffsetX = 0; if (position % 3 == 1) { f32 width = getWidth(); - mRotateOffsetX = width * lit_1725; + mRotateOffsetX = width / 2; } else if (position % 3 == 2) { f32 width = getWidth(); mRotateOffsetX = width; } - mRotateOffsetY = FLOAT_LABEL(lit_1469); + mRotateOffsetY = 0; if (position / 3 == 1) { f32 height = getHeight(); - mRotateOffsetY = height * lit_1725; + mRotateOffsetY = height / 2; } else if (position / 3 == 2) { f32 height = getHeight(); mRotateOffsetY = height; @@ -616,48 +550,75 @@ void J2DPane::setBasePosition(J2DBasePosition position) { calcMtx(); } -/* ############################################################################################## */ -/* 80456210-80456214 004810 0004+00 1/1 0/0 0/0 .sdata2 @2547 */ -SECTION_SDATA2 static f32 lit_2547 = 255.0f; - /* 802F77D0-802F79A8 2F2110 01D8+00 0/0 1/1 0/0 .text setInfluencedAlpha__7J2DPaneFbb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setInfluencedAlpha(bool param_0, bool param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setInfluencedAlpha__7J2DPaneFbb.s" +void J2DPane::setInfluencedAlpha(bool param_0, bool param_1) { + if (param_1 && mIsInfluencedAlpha != param_0) { + J2DPane* parent = this->getParentPane(); + u8 alpha = 255; + for (; parent != NULL; parent = parent->getParentPane()) { + if (parent->getAlpha() == 0) { + alpha = 0; + break; + } + alpha = (((f32)alpha) * parent->getAlpha() / 255); + if (!parent->mIsInfluencedAlpha) { + break; + } + } + if (param_0) { + if (alpha == 0) { + this->setAlpha(0); + } else { + f32 fAlpha = ((f32)mAlpha) / alpha * 255; + u8 alpha; + if (fAlpha > 255) { + alpha = 255; + } else { + alpha = fAlpha; + } + this->setAlpha(alpha); + } + } else { + this->setAlpha((f32)(alpha * mAlpha) / 255); + } + } + mIsInfluencedAlpha = param_0; } -#pragma pop /* 802F79A8-802F7A8C 2F22E8 00E4+00 0/0 3/3 0/0 .text getGlbVtx__7J2DPaneCFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::getGlbVtx(u8 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/getGlbVtx__7J2DPaneCFUc.s" +JGeometry::TVec3 J2DPane::getGlbVtx(u8 param_0) const { + JGeometry::TVec3 out; + if (param_0 >= 4) { + out.x = 0; + out.y = 0; + out.z = 0; + return out; + } else { + f32 x, y; + if (param_0 & 1) { + x = mBounds.f.x; + } else { + x = mBounds.i.x; + } + if (param_0 & 2) { + y = mBounds.f.y; + } else { + y = mBounds.i.y; + } + out.x = x * mGlobalMtx[0][0] + y * mGlobalMtx[0][1] + mGlobalMtx[0][3]; + out.y = x * mGlobalMtx[1][0] + y * mGlobalMtx[1][1] + mGlobalMtx[1][3]; + out.z = x * mGlobalMtx[2][0] + y * mGlobalMtx[2][1] + mGlobalMtx[2][3]; + return out; + } } -#pragma pop /* 802F7A8C-802F7AC4 2F23CC 0038+00 1/1 15/15 0/0 .text getFirstChildPane__7J2DPaneFv */ -#ifdef NONMATCHING // probably an issue with JSUTree -const J2DPane* J2DPane::getFirstChildPane() { +J2DPane* J2DPane::getFirstChildPane() { if (!getFirstChild()) return NULL; return getFirstChild()->getObject(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DPane* J2DPane::getFirstChildPane() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/getFirstChildPane__7J2DPaneFv.s" -} -#pragma pop -#endif /* 802F7AC4-802F7AFC 2F2404 0038+00 1/1 8/8 0/0 .text getNextChildPane__7J2DPaneFv */ J2DPane* J2DPane::getNextChildPane() { @@ -675,74 +636,131 @@ J2DPane* J2DPane::getParentPane() { return getPaneTree()->getParent()->getObject(); } +struct J2DPaneInit { /* name unknown */ + u8 field_0x0[10]; + u16 field_0xa; + u8 isVisible; + u8 mBasePosition; + // padding + u64 mInfoTag; + u64 mUserInfoTag; + f32 rotationOffsetX; + f32 rotationOffsetY; + f32 scaleX; + f32 scaleY; + f32 rotXDegrees; + f32 rotYDegrees; + f32 rotZDegrees; + f32 translateX; + f32 translateY; + u8 field_0x44[4]; +}; + /* 802F7B18-802F7D00 2F2458 01E8+00 1/1 6/6 0/0 .text * makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::makePaneExStream(J2DPane* param_0, JSURandomInputStream* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream.s" +void J2DPane::makePaneExStream(J2DPane* parent, JSURandomInputStream* stream) { + stream->getPosition(); + J2DPaneInit data; + stream->read(&data, sizeof(data)); + _4 = data.field_0xa; + mVisible = !!data.isVisible; + mInfoTag = data.mInfoTag; + mUserInfoTag = data.mUserInfoTag; + mScaleX = data.scaleX; + mScaleY = data.scaleY; + mRotateX = data.rotXDegrees; + mRotateY = data.rotYDegrees; + mRotateZ = data.rotZDegrees; + mTranslateX = data.translateX; + mTranslateY = data.translateY; + mRotAxis = ROTATE_Z; + if (data.mBasePosition % 3 == 0) { + mRotateOffsetX = 0; + } else if (data.mBasePosition % 3 == 1) { + mRotateOffsetX = data.rotationOffsetX / 2; + } else { + mRotateOffsetX = data.rotationOffsetX; + } + if (data.mBasePosition / 3 == 0) { + mRotateOffsetY = 0; + } else if (data.mBasePosition / 3 == 1) { + mRotateOffsetY = data.rotationOffsetY / 2; + } else { + mRotateOffsetY = data.rotationOffsetY; + } + mBounds.set(-mRotateOffsetX, -mRotateOffsetY, data.rotationOffsetX - mRotateOffsetX, + data.rotationOffsetY - mRotateOffsetY); + mBasePosition = data.mBasePosition; + mAlpha = 255; + mIsInfluencedAlpha = false; + if (parent != NULL) { + parent->mPaneTree.appendChild(&this->mPaneTree); + } + mCullMode = GX_CULL_NONE; + mColorAlpha = 255; + mConnected = false; + this->calcMtx(); } -#pragma pop /* 802F7D00-802F7DB8 2F2640 00B8+00 0/0 1/1 0/0 .text J2DCast_F32_to_S16__7J2DPaneFfUc */ -#ifdef NONMATCHING // not happening s16 J2DPane::J2DCast_F32_to_S16(f32 value, u8 arg2) { - f32 temp; - s32 temp2; - s16 result; - - if (arg2 < 0xf) { - temp = value; - if (temp < lbl_804561F0) - temp = -value; - - temp2 = value; - - if (temp2 < 0x8000) { - if (value >= lbl_804561F0) { - result = temp2; - } else { - result = ~temp2 + 1; - } - } else { - if (value >= lbl_804561F0) { - result = 0x7fff; - } else { - result = -0x8000; - } - } + if (arg2 >= 0xF) { + return 0; } else { - result = 0; + f32 tmpF; + tmpF = value; + if (value < 0) { + tmpF = -value; + } + int tmp = tmpF * (1 << arg2); + if (tmp >= 0x8000) { + if (value < 0) { + return 0x8000; + } else { + return 0x7FFF; + } + } else if (value < 0) { + return ~tmp + 1; + } else { + return tmp; + } } - - return result; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s16 J2DPane::J2DCast_F32_to_S16(f32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/J2DCast_F32_to_S16__7J2DPaneFfUc.s" -} -#pragma pop -#endif /* 802F7DB8-802F7EF4 2F26F8 013C+00 0/0 3/3 0/0 .text * getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* J2DPane::getPointer(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive.s" +void* J2DPane::getPointer(JSURandomInputStream* inputStream, u32 param_1, JKRArchive* archive) { + JUTResReference resRef; + void* result; + if (archive == NULL) { + if (J2DScreen::getDataManage() == NULL) { + result = resRef.getResource(inputStream, param_1, NULL); + } else { + s32 prevPos = inputStream->getPosition(); + result = resRef.getResource(inputStream, param_1, NULL); + if (result == 0) { + inputStream->seek(prevPos, JSUStreamSeekFrom_SET); + result = J2DScreen::getDataManage()->get(inputStream); + } + } + } else { + s32 prevPos = inputStream->getPosition(); + result = resRef.getResource(inputStream, param_1, archive); + if (result == NULL) { + inputStream->seek(prevPos, JSUStreamSeekFrom_SET); + result = resRef.getResource(inputStream, param_1, NULL); + } + if (result == NULL) { + if (J2DScreen::getDataManage() != NULL) { + inputStream->seek(prevPos, JSUStreamSeekFrom_SET); + result = J2DScreen::getDataManage()->get(inputStream); + } + } + } + return result; } -#pragma pop /* 802F7EF4-802F7FC4 2F2834 00D0+00 2/0 7/4 0/0 .text setAnimation__7J2DPaneFP10J2DAnmBase */ -#ifdef NONMATCHING // matching in diff.py, what gives? void J2DPane::setAnimation(J2DAnmBase* anm) { if (anm != NULL) { switch (anm->getKind()) { @@ -754,34 +772,24 @@ void J2DPane::setAnimation(J2DAnmBase* anm) { case 1: setAnimation(static_cast(anm)); break; - case 2: + case 7: setAnimation(static_cast(anm)); break; case 4: setAnimation(static_cast(anm)); break; - case 5: + case 2: setAnimation(static_cast(anm)); break; case 6: setAnimation(static_cast(anm)); break; - case 7: + case 5: setAnimation(static_cast(anm)); break; } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setAnimation(J2DAnmBase* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP10J2DAnmBase.s" -} -#pragma pop -#endif /* 802F7FC4-802F7FCC -00001 0008+00 0/0 0/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTransform */ void J2DPane::setAnimation(J2DAnmTransform* anm) { @@ -859,27 +867,22 @@ const J2DAnmTransform* J2DPane::animationPane(const J2DAnmTransform* transform) return p; } -/* ############################################################################################## */ -/* 80456214-80456218 004814 0004+00 1/1 0/0 0/0 .sdata2 @2890 */ -SECTION_SDATA2 static f32 lit_2890 = 360.0f; - -/* 80456218-80456220 004818 0004+04 1/1 0/0 0/0 .sdata2 @2891 */ -SECTION_SDATA2 static f32 lit_2891[1 + 1 /* padding */] = { - 65535.0f, - /* padding */ - 0.0f, -}; - /* 802F82C0-802F83C8 2F2C00 0108+00 2/2 0/0 0/0 .text * updateTransform__7J2DPaneFPC15J2DAnmTransform */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::updateTransform(J2DAnmTransform const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/updateTransform__7J2DPaneFPC15J2DAnmTransform.s" +void J2DPane::updateTransform(J2DAnmTransform const* anmTransform) { + if (_4 != 0xFFFF && anmTransform != NULL) { + J3DTransformInfo info; + anmTransform->getTransform(_4, &info); + mScaleX = info.mScale.x; + mScaleY = info.mScale.z; + mRotateX = (u16)info.mRotation.x * 360.0f / 65535.0f; + mRotateY = (u16)info.mRotation.z * 360.0f / 65535.0f; + mRotateZ = (u16)info.mRotation.y * 360.0f / 65535.0f; + mTranslateX = info.mTranslate.x; + mTranslateY = info.mTranslate.z; + this->calcMtx(); + } } -#pragma pop /* 802F83C8-802F83CC 2F2D08 0004+00 1/0 0/0 0/0 .text drawSelf__7J2DPaneFffPA3_A4_f */ void J2DPane::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) { @@ -930,18 +933,3 @@ void J2DPane::update() { void J2DPane::drawSelf(f32 param_0, f32 param_1) { /* empty function */ } - -/* 802F847C-802F8498 2F2DBC 001C+00 0/0 1/0 0/0 .text __sinit_J2DPane_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_J2DPane_cpp() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/__sinit_J2DPane_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x802F847C, __sinit_J2DPane_cpp); -#pragma pop diff --git a/libs/JSystem/JUtility/JUTResource.cpp b/libs/JSystem/JUtility/JUTResource.cpp index 2ad3eeb3133..646fc83d5ff 100644 --- a/libs/JSystem/JUtility/JUTResource.cpp +++ b/libs/JSystem/JUtility/JUTResource.cpp @@ -4,6 +4,7 @@ // #include "JSystem/JUtility/JUTResource.h" +#include "JSystem/JKernel/JKRFileLoader.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,25 +12,6 @@ // Types: // -struct JSUInputStream { - /* 802DC298 */ void read(void*, s32); -}; - -struct JKRArchive { - /* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*); -}; - -struct JUTResReference { - /* 802DE078 */ void getResource(JSUInputStream*, u32, JKRArchive*); - /* 802DE120 */ void getResource(void const*, u32, JKRArchive*); - /* 802DE1BC */ void getResource(u32, JKRArchive*); -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); - /* 802D4224 */ void getGlbResource(char const*); -}; - // // Forward References: // @@ -61,7 +43,7 @@ extern "C" void _restgpr_29(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTResReference::getResource(JSUInputStream* param_0, u32 param_1, JKRArchive* param_2) { +asm void* JUTResReference::getResource(JSUInputStream* param_0, u32 param_1, JKRArchive* param_2) { nofralloc #include "asm/JSystem/JUtility/JUTResource/getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive.s" } diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index dc78fc43d9e..153c21af875 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -31624,12 +31624,14 @@ BOOL daAlink_lockCursor_c::create() { } /* 80126350-80126354 120C90 0004+00 0/0 4/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTevRegKey */ -void J2DPane::setAnimation(J2DAnmTevRegKey* param_0) { +// void J2DPane::setAnimation(J2DAnmTevRegKey* param_0) { +extern "C" void setAnimation__7J2DPaneFP15J2DAnmTevRegKey() { /* empty function */ } /* 80126354-80126358 120C94 0004+00 0/0 4/0 0/0 .text setAnimation__7J2DPaneFP11J2DAnmColor */ -void J2DPane::setAnimation(J2DAnmColor* param_0) { +// void J2DPane::setAnimation(J2DAnmColor* param_0) { +extern "C" void setAnimation__7J2DPaneFP11J2DAnmColor() { /* empty function */ } diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 441c99ea922..29b49913b42 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -2216,7 +2216,8 @@ asm void J2DPane::makeMatrix(f32 param_0, f32 param_1) { #pragma pop /* 80053C3C-80053C44 04E57C 0008+00 0/0 1/0 0/0 .text getTypeID__7J2DPaneCFv */ -s32 J2DPane::getTypeID() const { +// s32 J2DPane::getTypeID() const { +extern "C" s32 getTypeID__7J2DPaneCFv() { return 16; }