From c6b47d83e112a38780ada9ab31f7bfe3b24bee02 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Wed, 8 Nov 2023 13:58:56 +0200 Subject: [PATCH] Work on J2DWindowEx (#1979) --- .../J2DWindowEx/__dt__11J2DWindowExFv.s | 64 -- ...nPane__11J2DWindowExFPC15J2DAnmTransform.s | 116 --- .../drawSelf__11J2DWindowExFffPA3_A4_f.s | 41 - .../J2DWindowEx/draw__11J2DWindowExFffff.s | 23 - ...CFPQ28JUtility6TColorPQ28JUtility6TColor.s | 108 --- .../J2DWindowEx/getBlack__11J2DWindowExCFv.s | 27 - .../getContentsMaterial__11J2DWindowExCFv.s | 3 - .../getContentsTexture__11J2DWindowExCFUc.s | 29 - .../getFrameMaterial__11J2DWindowExCFUc.s | 11 - .../getFrameTexture__11J2DWindowExCFUcUc.s | 29 - ...__11J2DWindowExCFRQ29J2DWindow9TMaterial.s | 12 - .../J2DWindowEx/getWhite__11J2DWindowExCFv.s | 27 - .../isNeedSetAnm__11J2DWindowExFUc.s | 26 - ...ExCFQ28JUtility6TColorQ28JUtility6TColor.s | 45 - .../isUsed__11J2DWindowExFPC7ResFONT.s | 9 - .../isUsed__11J2DWindowExFPC7ResTIMG.s | 82 -- .../rewriteAlpha__11J2DWindowExFv.s | 7 - .../J2DWindowEx/setAlpha__11J2DWindowExFUc.s | 23 - ...etAnimation__11J2DWindowExFP10J2DAnmBase.s | 9 - ...tAnimation__11J2DWindowExFP11J2DAnmColor.s | 39 - ...imation__11J2DWindowExFP14J2DAnmVtxColor.s | 72 -- ...mation__11J2DWindowExFP15J2DAnmTevRegKey.s | 39 - ...ation__11J2DWindowExFP16J2DAnmTexPattern.s | 39 - ...on__11J2DWindowExFP19J2DAnmTextureSRTKey.s | 39 - ...tBlack__11J2DWindowExFQ28JUtility6TColor.s | 37 - ...setCullBack__11J2DWindowExF11_GXCullMode.s | 27 - .../setCullBack__11J2DWindowExFb.s | 17 - .../J2DWindowEx/setMinSize__11J2DWindowExFv.s | 115 --- .../setTevOrder__11J2DWindowExFb.s | 72 -- ...tWhite__11J2DWindowExFQ28JUtility6TColor.s | 37 - include/JSystem/J2DGraph/J2DAnimation.h | 3 + include/JSystem/J2DGraph/J2DWindow.h | 2 +- include/JSystem/J2DGraph/J2DWindowEx.h | 9 +- .../JSystem/J3DGraphAnimator/J3DAnimation.h | 9 +- include/JSystem/JGeometry.h | 2 +- libs/JSystem/J2DGraph/J2DWindowEx.cpp | 884 +++++++++++++----- 36 files changed, 684 insertions(+), 1449 deletions(-) delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/__dt__11J2DWindowExFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/animationPane__11J2DWindowExFPC15J2DAnmTransform.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/drawSelf__11J2DWindowExFffPA3_A4_f.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/draw__11J2DWindowExFffff.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/getBlack__11J2DWindowExCFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/getContentsMaterial__11J2DWindowExCFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/getContentsTexture__11J2DWindowExCFUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/getFrameMaterial__11J2DWindowExCFUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/getFrameTexture__11J2DWindowExCFUcUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/getMaterial__11J2DWindowExCFRQ29J2DWindow9TMaterial.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/getWhite__11J2DWindowExCFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/isNeedSetAnm__11J2DWindowExFUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResFONT.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResTIMG.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/rewriteAlpha__11J2DWindowExFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setAlpha__11J2DWindowExFUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP10J2DAnmBase.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP11J2DAnmColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP14J2DAnmVtxColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP15J2DAnmTevRegKey.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP16J2DAnmTexPattern.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP19J2DAnmTextureSRTKey.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setBlack__11J2DWindowExFQ28JUtility6TColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExF11_GXCullMode.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExFb.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setMinSize__11J2DWindowExFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setTevOrder__11J2DWindowExFb.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setWhite__11J2DWindowExFQ28JUtility6TColor.s diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/__dt__11J2DWindowExFv.s b/asm/JSystem/J2DGraph/J2DWindowEx/__dt__11J2DWindowExFv.s deleted file mode 100644 index 12dfbb8fc1b..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/__dt__11J2DWindowExFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80301144: -/* 80301144 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80301148 7C 08 02 A6 */ mflr r0 -/* 8030114C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80301150 39 61 00 20 */ addi r11, r1, 0x20 -/* 80301154 48 06 10 85 */ bl _savegpr_28 -/* 80301158 7C 7C 1B 79 */ or. r28, r3, r3 -/* 8030115C 7C 9D 23 78 */ mr r29, r4 -/* 80301160 41 82 00 B0 */ beq lbl_80301210 -/* 80301164 3C 60 80 3D */ lis r3, __vt__11J2DWindowEx@ha /* 0x803CD3E8@ha */ -/* 80301168 38 03 D3 E8 */ addi r0, r3, __vt__11J2DWindowEx@l /* 0x803CD3E8@l */ -/* 8030116C 90 1C 00 00 */ stw r0, 0(r28) -/* 80301170 3B C0 00 00 */ li r30, 0 -/* 80301174 3B E0 00 01 */ li r31, 1 -/* 80301178 48 00 00 44 */ b lbl_803011BC -lbl_8030117C: -/* 8030117C 88 7C 01 70 */ lbz r3, 0x170(r28) -/* 80301180 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80301184 7F E0 00 30 */ slw r0, r31, r0 -/* 80301188 7C 60 00 39 */ and. r0, r3, r0 -/* 8030118C 41 82 00 2C */ beq lbl_803011B8 -/* 80301190 57 C3 15 BA */ rlwinm r3, r30, 2, 0x16, 0x1d -/* 80301194 38 03 01 48 */ addi r0, r3, 0x148 -/* 80301198 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8030119C 28 03 00 00 */ cmplwi r3, 0 -/* 803011A0 41 82 00 18 */ beq lbl_803011B8 -/* 803011A4 38 80 00 01 */ li r4, 1 -/* 803011A8 81 83 00 00 */ lwz r12, 0(r3) -/* 803011AC 81 8C 00 08 */ lwz r12, 8(r12) -/* 803011B0 7D 89 03 A6 */ mtctr r12 -/* 803011B4 4E 80 04 21 */ bctrl -lbl_803011B8: -/* 803011B8 3B DE 00 01 */ addi r30, r30, 1 -lbl_803011BC: -/* 803011BC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 803011C0 28 00 00 04 */ cmplwi r0, 4 -/* 803011C4 41 80 FF B8 */ blt lbl_8030117C -/* 803011C8 88 1C 01 70 */ lbz r0, 0x170(r28) -/* 803011CC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 803011D0 41 82 00 24 */ beq lbl_803011F4 -/* 803011D4 80 7C 01 60 */ lwz r3, 0x160(r28) -/* 803011D8 28 03 00 00 */ cmplwi r3, 0 -/* 803011DC 41 82 00 18 */ beq lbl_803011F4 -/* 803011E0 38 80 00 01 */ li r4, 1 -/* 803011E4 81 83 00 00 */ lwz r12, 0(r3) -/* 803011E8 81 8C 00 08 */ lwz r12, 8(r12) -/* 803011EC 7D 89 03 A6 */ mtctr r12 -/* 803011F0 4E 80 04 21 */ bctrl -lbl_803011F4: -/* 803011F4 7F 83 E3 78 */ mr r3, r28 -/* 803011F8 38 80 00 00 */ li r4, 0 -/* 803011FC 4B FF 96 85 */ bl __dt__9J2DWindowFv -/* 80301200 7F A0 07 35 */ extsh. r0, r29 -/* 80301204 40 81 00 0C */ ble lbl_80301210 -/* 80301208 7F 83 E3 78 */ mr r3, r28 -/* 8030120C 4B FC DB 31 */ bl __dl__FPv -lbl_80301210: -/* 80301210 7F 83 E3 78 */ mr r3, r28 -/* 80301214 39 61 00 20 */ addi r11, r1, 0x20 -/* 80301218 48 06 10 0D */ bl _restgpr_28 -/* 8030121C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80301220 7C 08 03 A6 */ mtlr r0 -/* 80301224 38 21 00 20 */ addi r1, r1, 0x20 -/* 80301228 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/animationPane__11J2DWindowExFPC15J2DAnmTransform.s b/asm/JSystem/J2DGraph/J2DWindowEx/animationPane__11J2DWindowExFPC15J2DAnmTransform.s deleted file mode 100644 index b61046a35c2..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/animationPane__11J2DWindowExFPC15J2DAnmTransform.s +++ /dev/null @@ -1,116 +0,0 @@ -lbl_80303370: -/* 80303370 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80303374 7C 08 02 A6 */ mflr r0 -/* 80303378 90 01 00 34 */ stw r0, 0x34(r1) -/* 8030337C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80303380 48 05 EE 59 */ bl _savegpr_28 -/* 80303384 7C 7C 1B 78 */ mr r28, r3 -/* 80303388 7C 9D 23 78 */ mr r29, r4 -/* 8030338C 80 63 01 74 */ lwz r3, 0x174(r3) -/* 80303390 28 03 00 00 */ cmplwi r3, 0 -/* 80303394 41 82 00 38 */ beq lbl_803033CC -/* 80303398 A0 9C 01 66 */ lhz r4, 0x166(r28) -/* 8030339C 28 04 FF FF */ cmplwi r4, 0xffff -/* 803033A0 41 82 00 2C */ beq lbl_803033CC -/* 803033A4 38 A1 00 08 */ addi r5, r1, 8 -/* 803033A8 48 00 8C A1 */ bl getVisibility__20J2DAnmVisibilityFullCFUsPUc -/* 803033AC 88 01 00 08 */ lbz r0, 8(r1) -/* 803033B0 28 00 00 00 */ cmplwi r0, 0 -/* 803033B4 41 82 00 10 */ beq lbl_803033C4 -/* 803033B8 38 00 00 01 */ li r0, 1 -/* 803033BC 98 1C 00 B0 */ stb r0, 0xb0(r28) -/* 803033C0 48 00 00 0C */ b lbl_803033CC -lbl_803033C4: -/* 803033C4 38 00 00 00 */ li r0, 0 -/* 803033C8 98 1C 00 B0 */ stb r0, 0xb0(r28) -lbl_803033CC: -/* 803033CC 3C 60 80 3A */ lis r3, lit_3089@ha /* 0x803A1D40@ha */ -/* 803033D0 38 83 1D 40 */ addi r4, r3, lit_3089@l /* 0x803A1D40@l */ -/* 803033D4 80 64 00 00 */ lwz r3, 0(r4) -/* 803033D8 80 04 00 04 */ lwz r0, 4(r4) -/* 803033DC 90 61 00 0C */ stw r3, 0xc(r1) -/* 803033E0 90 01 00 10 */ stw r0, 0x10(r1) -/* 803033E4 80 64 00 08 */ lwz r3, 8(r4) -/* 803033E8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 803033EC 90 61 00 14 */ stw r3, 0x14(r1) -/* 803033F0 90 01 00 18 */ stw r0, 0x18(r1) -/* 803033F4 38 1C 01 28 */ addi r0, r28, 0x128 -/* 803033F8 90 01 00 0C */ stw r0, 0xc(r1) -/* 803033FC 38 1C 01 2C */ addi r0, r28, 0x12c -/* 80303400 90 01 00 10 */ stw r0, 0x10(r1) -/* 80303404 38 1C 01 30 */ addi r0, r28, 0x130 -/* 80303408 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030340C 38 1C 01 34 */ addi r0, r28, 0x134 -/* 80303410 90 01 00 18 */ stw r0, 0x18(r1) -/* 80303414 80 7C 01 78 */ lwz r3, 0x178(r28) -/* 80303418 28 03 00 00 */ cmplwi r3, 0 -/* 8030341C 41 82 00 D0 */ beq lbl_803034EC -/* 80303420 A3 E3 00 10 */ lhz r31, 0x10(r3) -/* 80303424 3B C0 00 00 */ li r30, 0 -/* 80303428 48 00 00 B8 */ b lbl_803034E0 -lbl_8030342C: -/* 8030342C 88 7C 01 7C */ lbz r3, 0x17c(r28) -/* 80303430 38 00 00 01 */ li r0, 1 -/* 80303434 57 C7 06 3E */ clrlwi r7, r30, 0x18 -/* 80303438 7C 00 38 30 */ slw r0, r0, r7 -/* 8030343C 7C 60 00 39 */ and. r0, r3, r0 -/* 80303440 41 82 00 9C */ beq lbl_803034DC -/* 80303444 38 A0 00 00 */ li r5, 0 -/* 80303448 57 C3 0D FC */ rlwinm r3, r30, 1, 0x17, 0x1e -/* 8030344C 39 23 01 68 */ addi r9, r3, 0x168 -/* 80303450 57 E0 04 3E */ clrlwi r0, r31, 0x10 -/* 80303454 48 00 00 7C */ b lbl_803034D0 -lbl_80303458: -/* 80303458 80 7C 01 78 */ lwz r3, 0x178(r28) -/* 8030345C 80 C3 00 14 */ lwz r6, 0x14(r3) -/* 80303460 54 A4 1B 78 */ rlwinm r4, r5, 3, 0xd, 0x1c -/* 80303464 7C C6 22 14 */ add r6, r6, r4 -/* 80303468 81 03 00 1C */ lwz r8, 0x1c(r3) -/* 8030346C 80 86 00 04 */ lwz r4, 4(r6) -/* 80303470 54 84 08 3C */ slwi r4, r4, 1 -/* 80303474 7D 48 22 14 */ add r10, r8, r4 -/* 80303478 39 60 00 00 */ li r11, 0 -/* 8030347C A1 06 00 00 */ lhz r8, 0(r6) -/* 80303480 48 00 00 40 */ b lbl_803034C0 -lbl_80303484: -/* 80303484 7C DC 4A 2E */ lhzx r6, r28, r9 -/* 80303488 55 64 0B FC */ rlwinm r4, r11, 1, 0xf, 0x1e -/* 8030348C 7C 8A 22 2E */ lhzx r4, r10, r4 -/* 80303490 7C 06 20 40 */ cmplw r6, r4 -/* 80303494 40 82 00 28 */ bne lbl_803034BC -/* 80303498 38 80 00 00 */ li r4, 0 -/* 8030349C 54 E0 10 3A */ slwi r0, r7, 2 -/* 803034A0 38 C1 00 0C */ addi r6, r1, 0xc -/* 803034A4 7C C6 00 2E */ lwzx r6, r6, r0 -/* 803034A8 81 83 00 00 */ lwz r12, 0(r3) -/* 803034AC 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 803034B0 7D 89 03 A6 */ mtctr r12 -/* 803034B4 4E 80 04 21 */ bctrl -/* 803034B8 48 00 00 24 */ b lbl_803034DC -lbl_803034BC: -/* 803034BC 39 6B 00 01 */ addi r11, r11, 1 -lbl_803034C0: -/* 803034C0 55 64 04 3E */ clrlwi r4, r11, 0x10 -/* 803034C4 7C 04 40 40 */ cmplw r4, r8 -/* 803034C8 41 80 FF BC */ blt lbl_80303484 -/* 803034CC 38 A5 00 01 */ addi r5, r5, 1 -lbl_803034D0: -/* 803034D0 54 A3 04 3E */ clrlwi r3, r5, 0x10 -/* 803034D4 7C 03 00 40 */ cmplw r3, r0 -/* 803034D8 41 80 FF 80 */ blt lbl_80303458 -lbl_803034DC: -/* 803034DC 3B DE 00 01 */ addi r30, r30, 1 -lbl_803034E0: -/* 803034E0 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 803034E4 28 00 00 04 */ cmplwi r0, 4 -/* 803034E8 41 80 FF 44 */ blt lbl_8030342C -lbl_803034EC: -/* 803034EC 7F 83 E3 78 */ mr r3, r28 -/* 803034F0 7F A4 EB 78 */ mr r4, r29 -/* 803034F4 4B FF 4D 35 */ bl animationPane__7J2DPaneFPC15J2DAnmTransform -/* 803034F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 803034FC 48 05 ED 29 */ bl _restgpr_28 -/* 80303500 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80303504 7C 08 03 A6 */ mtlr r0 -/* 80303508 38 21 00 30 */ addi r1, r1, 0x30 -/* 8030350C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/drawSelf__11J2DWindowExFffPA3_A4_f.s b/asm/JSystem/J2DGraph/J2DWindowEx/drawSelf__11J2DWindowExFffPA3_A4_f.s deleted file mode 100644 index f481e3a1063..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/drawSelf__11J2DWindowExFffPA3_A4_f.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8030122C: -/* 8030122C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80301230 7C 08 02 A6 */ mflr r0 -/* 80301234 90 01 00 54 */ stw r0, 0x54(r1) -/* 80301238 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 8030123C 7C 7F 1B 78 */ mr r31, r3 -/* 80301240 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80301244 D0 01 00 08 */ stfs f0, 8(r1) -/* 80301248 C0 A3 00 24 */ lfs f5, 0x24(r3) -/* 8030124C D0 A1 00 0C */ stfs f5, 0xc(r1) -/* 80301250 C0 83 00 28 */ lfs f4, 0x28(r3) -/* 80301254 D0 81 00 10 */ stfs f4, 0x10(r1) -/* 80301258 C0 63 00 2C */ lfs f3, 0x2c(r3) -/* 8030125C D0 61 00 14 */ stfs f3, 0x14(r1) -/* 80301260 EC 00 08 2A */ fadds f0, f0, f1 -/* 80301264 D0 01 00 08 */ stfs f0, 8(r1) -/* 80301268 EC 05 10 2A */ fadds f0, f5, f2 -/* 8030126C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80301270 EC 04 08 2A */ fadds f0, f4, f1 -/* 80301274 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80301278 EC 03 10 2A */ fadds f0, f3, f2 -/* 8030127C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80301280 7C 83 23 78 */ mr r3, r4 -/* 80301284 38 9F 00 80 */ addi r4, r31, 0x80 -/* 80301288 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8030128C 48 04 52 59 */ bl PSMTXConcat -/* 80301290 38 61 00 18 */ addi r3, r1, 0x18 -/* 80301294 38 80 00 00 */ li r4, 0 -/* 80301298 48 05 EF B5 */ bl GXLoadPosMtxImm -/* 8030129C 7F E3 FB 78 */ mr r3, r31 -/* 803012A0 38 81 00 08 */ addi r4, r1, 8 -/* 803012A4 38 BF 01 14 */ addi r5, r31, 0x114 -/* 803012A8 48 00 00 25 */ bl func_803012CC -/* 803012AC 7F E3 FB 78 */ mr r3, r31 -/* 803012B0 38 9F 01 14 */ addi r4, r31, 0x114 -/* 803012B4 4B FF 5F B1 */ bl func_802F7264 -/* 803012B8 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 803012BC 80 01 00 54 */ lwz r0, 0x54(r1) -/* 803012C0 7C 08 03 A6 */ mtlr r0 -/* 803012C4 38 21 00 50 */ addi r1, r1, 0x50 -/* 803012C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/draw__11J2DWindowExFffff.s b/asm/JSystem/J2DGraph/J2DWindowEx/draw__11J2DWindowExFffff.s deleted file mode 100644 index c3491c0e060..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/draw__11J2DWindowExFffff.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80303568: -/* 80303568 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8030356C 7C 08 02 A6 */ mflr r0 -/* 80303570 90 01 00 24 */ stw r0, 0x24(r1) -/* 80303574 D0 21 00 08 */ stfs f1, 8(r1) -/* 80303578 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 8030357C FC 00 08 18 */ frsp f0, f1 -/* 80303580 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80303584 FC 00 10 18 */ frsp f0, f2 -/* 80303588 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8030358C EC 01 18 2A */ fadds f0, f1, f3 -/* 80303590 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80303594 EC 02 20 2A */ fadds f0, f2, f4 -/* 80303598 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8030359C 38 81 00 10 */ addi r4, r1, 0x10 -/* 803035A0 81 83 00 00 */ lwz r12, 0(r3) -/* 803035A4 81 8C 00 94 */ lwz r12, 0x94(r12) -/* 803035A8 7D 89 03 A6 */ mtctr r12 -/* 803035AC 4E 80 04 21 */ bctrl -/* 803035B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803035B4 7C 08 03 A6 */ mtlr r0 -/* 803035B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 803035BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DWindowEx/getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor.s deleted file mode 100644 index 492ec6979c5..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_80302A4C: -/* 80302A4C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80302A50 7C 08 02 A6 */ mflr r0 -/* 80302A54 90 01 00 44 */ stw r0, 0x44(r1) -/* 80302A58 39 61 00 40 */ addi r11, r1, 0x40 -/* 80302A5C 48 05 F7 71 */ bl _savegpr_25 -/* 80302A60 7C 7D 1B 78 */ mr r29, r3 -/* 80302A64 7C 9E 23 78 */ mr r30, r4 -/* 80302A68 7C BF 2B 78 */ mr r31, r5 -/* 80302A6C 80 63 01 48 */ lwz r3, 0x148(r3) -/* 80302A70 28 03 00 00 */ cmplwi r3, 0 -/* 80302A74 40 82 00 0C */ bne lbl_80302A80 -/* 80302A78 38 60 00 00 */ li r3, 0 -/* 80302A7C 48 00 01 54 */ b lbl_80302BD0 -lbl_80302A80: -/* 80302A80 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302A84 28 03 00 00 */ cmplwi r3, 0 -/* 80302A88 40 82 00 0C */ bne lbl_80302A94 -/* 80302A8C 38 60 00 00 */ li r3, 0 -/* 80302A90 48 00 01 40 */ b lbl_80302BD0 -lbl_80302A94: -/* 80302A94 81 83 00 00 */ lwz r12, 0(r3) -/* 80302A98 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 80302A9C 7D 89 03 A6 */ mtctr r12 -/* 80302AA0 4E 80 04 21 */ bctrl -/* 80302AA4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80302AA8 20 60 00 01 */ subfic r3, r0, 1 -/* 80302AAC 30 03 FF FF */ addic r0, r3, -1 -/* 80302AB0 7C 60 19 10 */ subfe r3, r0, r3 -/* 80302AB4 38 00 00 00 */ li r0, 0 -/* 80302AB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80302ABC 88 01 00 14 */ lbz r0, 0x14(r1) -/* 80302AC0 98 1E 00 00 */ stb r0, 0(r30) -/* 80302AC4 88 01 00 15 */ lbz r0, 0x15(r1) -/* 80302AC8 98 1E 00 01 */ stb r0, 1(r30) -/* 80302ACC 88 01 00 16 */ lbz r0, 0x16(r1) -/* 80302AD0 98 1E 00 02 */ stb r0, 2(r30) -/* 80302AD4 88 01 00 17 */ lbz r0, 0x17(r1) -/* 80302AD8 98 1E 00 03 */ stb r0, 3(r30) -/* 80302ADC 38 00 FF FF */ li r0, -1 -/* 80302AE0 90 01 00 10 */ stw r0, 0x10(r1) -/* 80302AE4 88 01 00 10 */ lbz r0, 0x10(r1) -/* 80302AE8 98 1F 00 00 */ stb r0, 0(r31) -/* 80302AEC 88 01 00 11 */ lbz r0, 0x11(r1) -/* 80302AF0 98 1F 00 01 */ stb r0, 1(r31) -/* 80302AF4 88 01 00 12 */ lbz r0, 0x12(r1) -/* 80302AF8 98 1F 00 02 */ stb r0, 2(r31) -/* 80302AFC 88 01 00 13 */ lbz r0, 0x13(r1) -/* 80302B00 98 1F 00 03 */ stb r0, 3(r31) -/* 80302B04 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80302B08 41 82 00 C4 */ beq lbl_80302BCC -/* 80302B0C 80 7D 01 48 */ lwz r3, 0x148(r29) -/* 80302B10 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302B14 38 80 00 00 */ li r4, 0 -/* 80302B18 81 83 00 00 */ lwz r12, 0(r3) -/* 80302B1C 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 80302B20 7D 89 03 A6 */ mtctr r12 -/* 80302B24 4E 80 04 21 */ bctrl -/* 80302B28 AB 83 00 00 */ lha r28, 0(r3) -/* 80302B2C AB 63 00 02 */ lha r27, 2(r3) -/* 80302B30 AB 43 00 04 */ lha r26, 4(r3) -/* 80302B34 AB 23 00 06 */ lha r25, 6(r3) -/* 80302B38 80 7D 01 48 */ lwz r3, 0x148(r29) -/* 80302B3C 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302B40 38 80 00 01 */ li r4, 1 -/* 80302B44 81 83 00 00 */ lwz r12, 0(r3) -/* 80302B48 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 80302B4C 7D 89 03 A6 */ mtctr r12 -/* 80302B50 4E 80 04 21 */ bctrl -/* 80302B54 A8 83 00 00 */ lha r4, 0(r3) -/* 80302B58 A8 A3 00 02 */ lha r5, 2(r3) -/* 80302B5C A8 C3 00 04 */ lha r6, 4(r3) -/* 80302B60 A8 63 00 06 */ lha r3, 6(r3) -/* 80302B64 57 60 82 1E */ rlwinm r0, r27, 0x10, 8, 0xf -/* 80302B68 53 80 C0 0E */ rlwimi r0, r28, 0x18, 0, 7 -/* 80302B6C 53 40 44 2E */ rlwimi r0, r26, 8, 0x10, 0x17 -/* 80302B70 53 20 06 3E */ rlwimi r0, r25, 0, 0x18, 0x1f -/* 80302B74 90 01 00 0C */ stw r0, 0xc(r1) -/* 80302B78 88 01 00 0C */ lbz r0, 0xc(r1) -/* 80302B7C 98 1E 00 00 */ stb r0, 0(r30) -/* 80302B80 88 01 00 0D */ lbz r0, 0xd(r1) -/* 80302B84 98 1E 00 01 */ stb r0, 1(r30) -/* 80302B88 88 01 00 0E */ lbz r0, 0xe(r1) -/* 80302B8C 98 1E 00 02 */ stb r0, 2(r30) -/* 80302B90 88 01 00 0F */ lbz r0, 0xf(r1) -/* 80302B94 98 1E 00 03 */ stb r0, 3(r30) -/* 80302B98 54 A0 82 1E */ rlwinm r0, r5, 0x10, 8, 0xf -/* 80302B9C 50 80 C0 0E */ rlwimi r0, r4, 0x18, 0, 7 -/* 80302BA0 50 C0 44 2E */ rlwimi r0, r6, 8, 0x10, 0x17 -/* 80302BA4 50 60 06 3E */ rlwimi r0, r3, 0, 0x18, 0x1f -/* 80302BA8 90 01 00 08 */ stw r0, 8(r1) -/* 80302BAC 88 01 00 08 */ lbz r0, 8(r1) -/* 80302BB0 98 1F 00 00 */ stb r0, 0(r31) -/* 80302BB4 88 01 00 09 */ lbz r0, 9(r1) -/* 80302BB8 98 1F 00 01 */ stb r0, 1(r31) -/* 80302BBC 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80302BC0 98 1F 00 02 */ stb r0, 2(r31) -/* 80302BC4 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80302BC8 98 1F 00 03 */ stb r0, 3(r31) -lbl_80302BCC: -/* 80302BCC 38 60 00 01 */ li r3, 1 -lbl_80302BD0: -/* 80302BD0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80302BD4 48 05 F6 45 */ bl _restgpr_25 -/* 80302BD8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80302BDC 7C 08 03 A6 */ mtlr r0 -/* 80302BE0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80302BE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/getBlack__11J2DWindowExCFv.s b/asm/JSystem/J2DGraph/J2DWindowEx/getBlack__11J2DWindowExCFv.s deleted file mode 100644 index 8305b021c9c..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/getBlack__11J2DWindowExCFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80302C88: -/* 80302C88 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80302C8C 7C 08 02 A6 */ mflr r0 -/* 80302C90 90 01 00 24 */ stw r0, 0x24(r1) -/* 80302C94 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80302C98 7C 7F 1B 78 */ mr r31, r3 -/* 80302C9C 38 00 FF FF */ li r0, -1 -/* 80302CA0 90 01 00 0C */ stw r0, 0xc(r1) -/* 80302CA4 90 01 00 08 */ stw r0, 8(r1) -/* 80302CA8 7C 83 23 78 */ mr r3, r4 -/* 80302CAC 38 81 00 0C */ addi r4, r1, 0xc -/* 80302CB0 38 A1 00 08 */ addi r5, r1, 8 -/* 80302CB4 4B FF FD 99 */ bl getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor -/* 80302CB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80302CBC 40 82 00 10 */ bne lbl_80302CCC -/* 80302CC0 38 00 00 00 */ li r0, 0 -/* 80302CC4 90 1F 00 00 */ stw r0, 0(r31) -/* 80302CC8 48 00 00 0C */ b lbl_80302CD4 -lbl_80302CCC: -/* 80302CCC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80302CD0 90 1F 00 00 */ stw r0, 0(r31) -lbl_80302CD4: -/* 80302CD4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80302CD8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80302CDC 7C 08 03 A6 */ mtlr r0 -/* 80302CE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80302CE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/getContentsMaterial__11J2DWindowExCFv.s b/asm/JSystem/J2DGraph/J2DWindowEx/getContentsMaterial__11J2DWindowExCFv.s deleted file mode 100644 index a573fb9fd0d..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/getContentsMaterial__11J2DWindowExCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80303534: -/* 80303534 80 63 01 60 */ lwz r3, 0x160(r3) -/* 80303538 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/getContentsTexture__11J2DWindowExCFUc.s b/asm/JSystem/J2DGraph/J2DWindowEx/getContentsTexture__11J2DWindowExCFUc.s deleted file mode 100644 index 0eb8d46096c..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/getContentsTexture__11J2DWindowExCFUc.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80302E74: -/* 80302E74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80302E78 7C 08 02 A6 */ mflr r0 -/* 80302E7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80302E80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80302E84 7C 9F 23 78 */ mr r31, r4 -/* 80302E88 81 83 00 00 */ lwz r12, 0(r3) -/* 80302E8C 81 8C 00 C4 */ lwz r12, 0xc4(r12) -/* 80302E90 7D 89 03 A6 */ mtctr r12 -/* 80302E94 4E 80 04 21 */ bctrl -/* 80302E98 28 03 00 00 */ cmplwi r3, 0 -/* 80302E9C 41 82 00 28 */ beq lbl_80302EC4 -/* 80302EA0 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302EA4 28 03 00 00 */ cmplwi r3, 0 -/* 80302EA8 41 82 00 1C */ beq lbl_80302EC4 -/* 80302EAC 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 80302EB0 81 83 00 00 */ lwz r12, 0(r3) -/* 80302EB4 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80302EB8 7D 89 03 A6 */ mtctr r12 -/* 80302EBC 4E 80 04 21 */ bctrl -/* 80302EC0 48 00 00 08 */ b lbl_80302EC8 -lbl_80302EC4: -/* 80302EC4 38 60 00 00 */ li r3, 0 -lbl_80302EC8: -/* 80302EC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80302ECC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80302ED0 7C 08 03 A6 */ mtlr r0 -/* 80302ED4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80302ED8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/getFrameMaterial__11J2DWindowExCFUc.s b/asm/JSystem/J2DGraph/J2DWindowEx/getFrameMaterial__11J2DWindowExCFUc.s deleted file mode 100644 index e211c2be261..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/getFrameMaterial__11J2DWindowExCFUc.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80303510: -/* 80303510 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80303514 28 00 00 04 */ cmplwi r0, 4 -/* 80303518 41 80 00 0C */ blt lbl_80303524 -/* 8030351C 38 60 00 00 */ li r3, 0 -/* 80303520 4E 80 00 20 */ blr -lbl_80303524: -/* 80303524 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 80303528 7C 63 02 14 */ add r3, r3, r0 -/* 8030352C 80 63 01 48 */ lwz r3, 0x148(r3) -/* 80303530 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/getFrameTexture__11J2DWindowExCFUcUc.s b/asm/JSystem/J2DGraph/J2DWindowEx/getFrameTexture__11J2DWindowExCFUcUc.s deleted file mode 100644 index b5e1dcc17c9..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/getFrameTexture__11J2DWindowExCFUcUc.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80302E0C: -/* 80302E0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80302E10 7C 08 02 A6 */ mflr r0 -/* 80302E14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80302E18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80302E1C 7C BF 2B 78 */ mr r31, r5 -/* 80302E20 81 83 00 00 */ lwz r12, 0(r3) -/* 80302E24 81 8C 00 C0 */ lwz r12, 0xc0(r12) -/* 80302E28 7D 89 03 A6 */ mtctr r12 -/* 80302E2C 4E 80 04 21 */ bctrl -/* 80302E30 28 03 00 00 */ cmplwi r3, 0 -/* 80302E34 41 82 00 28 */ beq lbl_80302E5C -/* 80302E38 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302E3C 28 03 00 00 */ cmplwi r3, 0 -/* 80302E40 41 82 00 1C */ beq lbl_80302E5C -/* 80302E44 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 80302E48 81 83 00 00 */ lwz r12, 0(r3) -/* 80302E4C 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80302E50 7D 89 03 A6 */ mtctr r12 -/* 80302E54 4E 80 04 21 */ bctrl -/* 80302E58 48 00 00 08 */ b lbl_80302E60 -lbl_80302E5C: -/* 80302E5C 38 60 00 00 */ li r3, 0 -lbl_80302E60: -/* 80302E60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80302E64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80302E68 7C 08 03 A6 */ mtlr r0 -/* 80302E6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80302E70 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/getMaterial__11J2DWindowExCFRQ29J2DWindow9TMaterial.s b/asm/JSystem/J2DGraph/J2DWindowEx/getMaterial__11J2DWindowExCFRQ29J2DWindow9TMaterial.s deleted file mode 100644 index 93cba68faa6..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/getMaterial__11J2DWindowExCFRQ29J2DWindow9TMaterial.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8030353C: -/* 8030353C 80 03 01 48 */ lwz r0, 0x148(r3) -/* 80303540 90 04 00 00 */ stw r0, 0(r4) -/* 80303544 80 03 01 4C */ lwz r0, 0x14c(r3) -/* 80303548 90 04 00 04 */ stw r0, 4(r4) -/* 8030354C 80 03 01 50 */ lwz r0, 0x150(r3) -/* 80303550 90 04 00 08 */ stw r0, 8(r4) -/* 80303554 80 03 01 54 */ lwz r0, 0x154(r3) -/* 80303558 90 04 00 0C */ stw r0, 0xc(r4) -/* 8030355C 80 03 01 60 */ lwz r0, 0x160(r3) -/* 80303560 90 04 00 10 */ stw r0, 0x10(r4) -/* 80303564 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/getWhite__11J2DWindowExCFv.s b/asm/JSystem/J2DGraph/J2DWindowEx/getWhite__11J2DWindowExCFv.s deleted file mode 100644 index 5bf80c66b73..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/getWhite__11J2DWindowExCFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80302CE8: -/* 80302CE8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80302CEC 7C 08 02 A6 */ mflr r0 -/* 80302CF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80302CF4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80302CF8 7C 7F 1B 78 */ mr r31, r3 -/* 80302CFC 38 00 FF FF */ li r0, -1 -/* 80302D00 90 01 00 0C */ stw r0, 0xc(r1) -/* 80302D04 90 01 00 08 */ stw r0, 8(r1) -/* 80302D08 7C 83 23 78 */ mr r3, r4 -/* 80302D0C 38 81 00 0C */ addi r4, r1, 0xc -/* 80302D10 38 A1 00 08 */ addi r5, r1, 8 -/* 80302D14 4B FF FD 39 */ bl getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor -/* 80302D18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80302D1C 40 82 00 10 */ bne lbl_80302D2C -/* 80302D20 38 00 FF FF */ li r0, -1 -/* 80302D24 90 1F 00 00 */ stw r0, 0(r31) -/* 80302D28 48 00 00 0C */ b lbl_80302D34 -lbl_80302D2C: -/* 80302D2C 80 01 00 08 */ lwz r0, 8(r1) -/* 80302D30 90 1F 00 00 */ stw r0, 0(r31) -lbl_80302D34: -/* 80302D34 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80302D38 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80302D3C 7C 08 03 A6 */ mtlr r0 -/* 80302D40 38 21 00 20 */ addi r1, r1, 0x20 -/* 80302D44 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/isNeedSetAnm__11J2DWindowExFUc.s b/asm/JSystem/J2DGraph/J2DWindowEx/isNeedSetAnm__11J2DWindowExFUc.s deleted file mode 100644 index a259dabc1ae..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/isNeedSetAnm__11J2DWindowExFUc.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8030321C: -/* 8030321C 39 00 00 00 */ li r8, 0 -/* 80303220 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 80303224 54 87 15 BA */ rlwinm r7, r4, 2, 0x16, 0x1d -/* 80303228 38 C7 01 48 */ addi r6, r7, 0x148 -/* 8030322C 48 00 00 28 */ b lbl_80303254 -lbl_80303230: -/* 80303230 55 04 15 BA */ rlwinm r4, r8, 2, 0x16, 0x1d -/* 80303234 38 04 01 48 */ addi r0, r4, 0x148 -/* 80303238 7C 83 00 2E */ lwzx r4, r3, r0 -/* 8030323C 7C 03 30 2E */ lwzx r0, r3, r6 -/* 80303240 7C 04 00 40 */ cmplw r4, r0 -/* 80303244 40 82 00 0C */ bne lbl_80303250 -/* 80303248 38 60 00 00 */ li r3, 0 -/* 8030324C 4E 80 00 20 */ blr -lbl_80303250: -/* 80303250 39 08 00 01 */ addi r8, r8, 1 -lbl_80303254: -/* 80303254 55 00 06 3E */ clrlwi r0, r8, 0x18 -/* 80303258 7C 00 28 40 */ cmplw r0, r5 -/* 8030325C 41 80 FF D4 */ blt lbl_80303230 -/* 80303260 7C 63 3A 14 */ add r3, r3, r7 -/* 80303264 80 63 01 48 */ lwz r3, 0x148(r3) -/* 80303268 30 03 FF FF */ addic r0, r3, -1 -/* 8030326C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80303270 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DWindowEx/isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor.s deleted file mode 100644 index 6c28f61223d..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80302BE8: -/* 80302BE8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80302BEC 7C 08 02 A6 */ mflr r0 -/* 80302BF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80302BF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80302BF8 48 05 F5 E5 */ bl _savegpr_29 -/* 80302BFC 7C 7D 1B 78 */ mr r29, r3 -/* 80302C00 80 04 00 00 */ lwz r0, 0(r4) -/* 80302C04 28 00 00 00 */ cmplwi r0, 0 -/* 80302C08 40 82 00 1C */ bne lbl_80302C24 -/* 80302C0C 80 65 00 00 */ lwz r3, 0(r5) -/* 80302C10 3C 03 00 01 */ addis r0, r3, 1 -/* 80302C14 28 00 FF FF */ cmplwi r0, 0xffff -/* 80302C18 40 82 00 0C */ bne lbl_80302C24 -/* 80302C1C 38 60 00 01 */ li r3, 1 -/* 80302C20 48 00 00 50 */ b lbl_80302C70 -lbl_80302C24: -/* 80302C24 3B C0 00 00 */ li r30, 0 -/* 80302C28 3B E0 00 00 */ li r31, 0 -lbl_80302C2C: -/* 80302C2C 38 1F 01 48 */ addi r0, r31, 0x148 -/* 80302C30 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80302C34 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302C38 81 83 00 00 */ lwz r12, 0(r3) -/* 80302C3C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80302C40 7D 89 03 A6 */ mtctr r12 -/* 80302C44 4E 80 04 21 */ bctrl -/* 80302C48 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80302C4C 28 00 00 01 */ cmplwi r0, 1 -/* 80302C50 40 82 00 0C */ bne lbl_80302C5C -/* 80302C54 38 60 00 00 */ li r3, 0 -/* 80302C58 48 00 00 18 */ b lbl_80302C70 -lbl_80302C5C: -/* 80302C5C 3B DE 00 01 */ addi r30, r30, 1 -/* 80302C60 2C 1E 00 04 */ cmpwi r30, 4 -/* 80302C64 3B FF 00 04 */ addi r31, r31, 4 -/* 80302C68 41 80 FF C4 */ blt lbl_80302C2C -/* 80302C6C 38 60 00 01 */ li r3, 1 -lbl_80302C70: -/* 80302C70 39 61 00 20 */ addi r11, r1, 0x20 -/* 80302C74 48 05 F5 B5 */ bl _restgpr_29 -/* 80302C78 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80302C7C 7C 08 03 A6 */ mtlr r0 -/* 80302C80 38 21 00 20 */ addi r1, r1, 0x20 -/* 80302C84 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResFONT.s b/asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResFONT.s deleted file mode 100644 index c365f618f1b..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResFONT.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_803035FC: -/* 803035FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80303600 7C 08 02 A6 */ mflr r0 -/* 80303604 90 01 00 14 */ stw r0, 0x14(r1) -/* 80303608 4B FF 3E B1 */ bl isUsed__7J2DPaneFPC7ResFONT -/* 8030360C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80303610 7C 08 03 A6 */ mtlr r0 -/* 80303614 38 21 00 10 */ addi r1, r1, 0x10 -/* 80303618 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResTIMG.s deleted file mode 100644 index 538c6cd4b41..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResTIMG.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_80302EDC: -/* 80302EDC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80302EE0 7C 08 02 A6 */ mflr r0 -/* 80302EE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80302EE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80302EEC 48 05 F2 E9 */ bl _savegpr_27 -/* 80302EF0 7C 7B 1B 78 */ mr r27, r3 -/* 80302EF4 7C 9C 23 78 */ mr r28, r4 -/* 80302EF8 3B C0 00 00 */ li r30, 0 -/* 80302EFC 48 00 00 70 */ b lbl_80302F6C -lbl_80302F00: -/* 80302F00 57 C3 15 BA */ rlwinm r3, r30, 2, 0x16, 0x1d -/* 80302F04 3B E3 01 48 */ addi r31, r3, 0x148 -/* 80302F08 7C 7B F8 2E */ lwzx r3, r27, r31 -/* 80302F0C 28 03 00 00 */ cmplwi r3, 0 -/* 80302F10 41 82 00 58 */ beq lbl_80302F68 -/* 80302F14 80 03 00 70 */ lwz r0, 0x70(r3) -/* 80302F18 28 00 00 00 */ cmplwi r0, 0 -/* 80302F1C 41 82 00 4C */ beq lbl_80302F68 -/* 80302F20 3B A0 00 00 */ li r29, 0 -lbl_80302F24: -/* 80302F24 7C 7B F8 2E */ lwzx r3, r27, r31 -/* 80302F28 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302F2C 7F A4 EB 78 */ mr r4, r29 -/* 80302F30 81 83 00 00 */ lwz r12, 0(r3) -/* 80302F34 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80302F38 7D 89 03 A6 */ mtctr r12 -/* 80302F3C 4E 80 04 21 */ bctrl -/* 80302F40 28 03 00 00 */ cmplwi r3, 0 -/* 80302F44 41 82 00 18 */ beq lbl_80302F5C -/* 80302F48 80 03 00 20 */ lwz r0, 0x20(r3) -/* 80302F4C 7C 00 E0 40 */ cmplw r0, r28 -/* 80302F50 40 82 00 0C */ bne lbl_80302F5C -/* 80302F54 38 60 00 01 */ li r3, 1 -/* 80302F58 48 00 00 8C */ b lbl_80302FE4 -lbl_80302F5C: -/* 80302F5C 3B BD 00 01 */ addi r29, r29, 1 -/* 80302F60 28 1D 00 08 */ cmplwi r29, 8 -/* 80302F64 41 80 FF C0 */ blt lbl_80302F24 -lbl_80302F68: -/* 80302F68 3B DE 00 01 */ addi r30, r30, 1 -lbl_80302F6C: -/* 80302F6C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80302F70 28 00 00 04 */ cmplwi r0, 4 -/* 80302F74 41 80 FF 8C */ blt lbl_80302F00 -/* 80302F78 80 7B 01 60 */ lwz r3, 0x160(r27) -/* 80302F7C 28 03 00 00 */ cmplwi r3, 0 -/* 80302F80 41 82 00 58 */ beq lbl_80302FD8 -/* 80302F84 80 03 00 70 */ lwz r0, 0x70(r3) -/* 80302F88 28 00 00 00 */ cmplwi r0, 0 -/* 80302F8C 41 82 00 4C */ beq lbl_80302FD8 -/* 80302F90 3B A0 00 00 */ li r29, 0 -lbl_80302F94: -/* 80302F94 80 7B 01 60 */ lwz r3, 0x160(r27) -/* 80302F98 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302F9C 7F A4 EB 78 */ mr r4, r29 -/* 80302FA0 81 83 00 00 */ lwz r12, 0(r3) -/* 80302FA4 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80302FA8 7D 89 03 A6 */ mtctr r12 -/* 80302FAC 4E 80 04 21 */ bctrl -/* 80302FB0 28 03 00 00 */ cmplwi r3, 0 -/* 80302FB4 41 82 00 18 */ beq lbl_80302FCC -/* 80302FB8 80 03 00 20 */ lwz r0, 0x20(r3) -/* 80302FBC 7C 00 E0 40 */ cmplw r0, r28 -/* 80302FC0 40 82 00 0C */ bne lbl_80302FCC -/* 80302FC4 38 60 00 01 */ li r3, 1 -/* 80302FC8 48 00 00 1C */ b lbl_80302FE4 -lbl_80302FCC: -/* 80302FCC 3B BD 00 01 */ addi r29, r29, 1 -/* 80302FD0 28 1D 00 08 */ cmplwi r29, 8 -/* 80302FD4 41 80 FF C0 */ blt lbl_80302F94 -lbl_80302FD8: -/* 80302FD8 7F 63 DB 78 */ mr r3, r27 -/* 80302FDC 7F 84 E3 78 */ mr r4, r28 -/* 80302FE0 4B FF 44 51 */ bl isUsed__7J2DPaneFPC7ResTIMG -lbl_80302FE4: -/* 80302FE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80302FE8 48 05 F2 39 */ bl _restgpr_27 -/* 80302FEC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80302FF0 7C 08 03 A6 */ mtlr r0 -/* 80302FF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80302FF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/rewriteAlpha__11J2DWindowExFv.s b/asm/JSystem/J2DGraph/J2DWindowEx/rewriteAlpha__11J2DWindowExFv.s deleted file mode 100644 index a92a26ad4b0..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/rewriteAlpha__11J2DWindowExFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80302DF4: -/* 80302DF4 80 83 01 60 */ lwz r4, 0x160(r3) -/* 80302DF8 28 04 00 00 */ cmplwi r4, 0 -/* 80302DFC 4D 82 00 20 */ beqlr -/* 80302E00 88 04 00 13 */ lbz r0, 0x13(r4) -/* 80302E04 98 03 00 B2 */ stb r0, 0xb2(r3) -/* 80302E08 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setAlpha__11J2DWindowExFUc.s b/asm/JSystem/J2DGraph/J2DWindowEx/setAlpha__11J2DWindowExFUc.s deleted file mode 100644 index d92090a2f28..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setAlpha__11J2DWindowExFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80302D48: -/* 80302D48 98 83 00 B2 */ stb r4, 0xb2(r3) -/* 80302D4C 38 A0 00 00 */ li r5, 0 -/* 80302D50 38 00 00 04 */ li r0, 4 -/* 80302D54 7C 09 03 A6 */ mtctr r0 -lbl_80302D58: -/* 80302D58 38 05 01 48 */ addi r0, r5, 0x148 -/* 80302D5C 7C C3 00 2E */ lwzx r6, r3, r0 -/* 80302D60 28 06 00 00 */ cmplwi r6, 0 -/* 80302D64 41 82 00 10 */ beq lbl_80302D74 -/* 80302D68 34 C6 00 10 */ addic. r6, r6, 0x10 -/* 80302D6C 41 82 00 08 */ beq lbl_80302D74 -/* 80302D70 98 86 00 03 */ stb r4, 3(r6) -lbl_80302D74: -/* 80302D74 38 A5 00 04 */ addi r5, r5, 4 -/* 80302D78 42 00 FF E0 */ bdnz lbl_80302D58 -/* 80302D7C 80 63 01 60 */ lwz r3, 0x160(r3) -/* 80302D80 28 03 00 00 */ cmplwi r3, 0 -/* 80302D84 4D 82 00 20 */ beqlr -/* 80302D88 34 63 00 10 */ addic. r3, r3, 0x10 -/* 80302D8C 4D 82 00 20 */ beqlr -/* 80302D90 98 83 00 03 */ stb r4, 3(r3) -/* 80302D94 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP10J2DAnmBase.s b/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP10J2DAnmBase.s deleted file mode 100644 index d27ff3b4f28..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP10J2DAnmBase.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8030361C: -/* 8030361C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80303620 7C 08 02 A6 */ mflr r0 -/* 80303624 90 01 00 14 */ stw r0, 0x14(r1) -/* 80303628 4B FF 48 CD */ bl setAnimation__7J2DPaneFP10J2DAnmBase -/* 8030362C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80303630 7C 08 03 A6 */ mtlr r0 -/* 80303634 38 21 00 10 */ addi r1, r1, 0x10 -/* 80303638 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP11J2DAnmColor.s b/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP11J2DAnmColor.s deleted file mode 100644 index 2082f7812b2..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP11J2DAnmColor.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80302FFC: -/* 80302FFC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80303000 7C 08 02 A6 */ mflr r0 -/* 80303004 90 01 00 24 */ stw r0, 0x24(r1) -/* 80303008 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030300C 48 05 F1 D1 */ bl _savegpr_29 -/* 80303010 7C 7D 1B 78 */ mr r29, r3 -/* 80303014 7C 9E 23 78 */ mr r30, r4 -/* 80303018 3B E0 00 00 */ li r31, 0 -/* 8030301C 48 00 00 30 */ b lbl_8030304C -lbl_80303020: -/* 80303020 7F A3 EB 78 */ mr r3, r29 -/* 80303024 7F E4 FB 78 */ mr r4, r31 -/* 80303028 48 00 01 F5 */ bl isNeedSetAnm__11J2DWindowExFUc -/* 8030302C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80303030 41 82 00 18 */ beq lbl_80303048 -/* 80303034 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d -/* 80303038 38 03 01 48 */ addi r0, r3, 0x148 -/* 8030303C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80303040 7F C4 F3 78 */ mr r4, r30 -/* 80303044 4B FE 78 59 */ bl setAnimation__11J2DMaterialFP11J2DAnmColor -lbl_80303048: -/* 80303048 3B FF 00 01 */ addi r31, r31, 1 -lbl_8030304C: -/* 8030304C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80303050 28 00 00 04 */ cmplwi r0, 4 -/* 80303054 41 80 FF CC */ blt lbl_80303020 -/* 80303058 80 7D 01 60 */ lwz r3, 0x160(r29) -/* 8030305C 28 03 00 00 */ cmplwi r3, 0 -/* 80303060 41 82 00 0C */ beq lbl_8030306C -/* 80303064 7F C4 F3 78 */ mr r4, r30 -/* 80303068 4B FE 78 35 */ bl setAnimation__11J2DMaterialFP11J2DAnmColor -lbl_8030306C: -/* 8030306C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80303070 48 05 F1 B9 */ bl _restgpr_29 -/* 80303074 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80303078 7C 08 03 A6 */ mtlr r0 -/* 8030307C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80303080 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP14J2DAnmVtxColor.s b/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP14J2DAnmVtxColor.s deleted file mode 100644 index bd6235c5b0f..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP14J2DAnmVtxColor.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8030327C: -/* 8030327C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80303280 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80303284 90 83 01 78 */ stw r4, 0x178(r3) -/* 80303288 38 00 00 00 */ li r0, 0 -/* 8030328C 98 03 01 7C */ stb r0, 0x17c(r3) -/* 80303290 28 04 00 00 */ cmplwi r4, 0 -/* 80303294 41 82 00 BC */ beq lbl_80303350 -/* 80303298 A0 E4 00 10 */ lhz r7, 0x10(r4) -/* 8030329C 39 40 00 00 */ li r10, 0 -/* 803032A0 48 00 00 A4 */ b lbl_80303344 -lbl_803032A4: -/* 803032A4 55 45 0D FC */ rlwinm r5, r10, 1, 0x17, 0x1e -/* 803032A8 39 25 01 68 */ addi r9, r5, 0x168 -/* 803032AC 7C 03 4A 2E */ lhzx r0, r3, r9 -/* 803032B0 28 00 FF FF */ cmplwi r0, 0xffff -/* 803032B4 41 82 00 8C */ beq lbl_80303340 -/* 803032B8 39 60 00 00 */ li r11, 0 -/* 803032BC 54 E0 04 3E */ clrlwi r0, r7, 0x10 -/* 803032C0 48 00 00 74 */ b lbl_80303334 -lbl_803032C4: -/* 803032C4 80 C4 00 14 */ lwz r6, 0x14(r4) -/* 803032C8 55 65 1B 78 */ rlwinm r5, r11, 3, 0xd, 0x1c -/* 803032CC 7C C6 2A 14 */ add r6, r6, r5 -/* 803032D0 81 04 00 1C */ lwz r8, 0x1c(r4) -/* 803032D4 80 A6 00 04 */ lwz r5, 4(r6) -/* 803032D8 54 A5 08 3C */ slwi r5, r5, 1 -/* 803032DC 7D 88 2A 14 */ add r12, r8, r5 -/* 803032E0 3B E0 00 00 */ li r31, 0 -/* 803032E4 A1 06 00 00 */ lhz r8, 0(r6) -/* 803032E8 48 00 00 3C */ b lbl_80303324 -lbl_803032EC: -/* 803032EC 7C C3 4A 2E */ lhzx r6, r3, r9 -/* 803032F0 57 E5 0B FC */ rlwinm r5, r31, 1, 0xf, 0x1e -/* 803032F4 7C AC 2A 2E */ lhzx r5, r12, r5 -/* 803032F8 7C 06 28 40 */ cmplw r6, r5 -/* 803032FC 40 82 00 24 */ bne lbl_80303320 -/* 80303300 90 83 01 78 */ stw r4, 0x178(r3) -/* 80303304 88 C3 01 7C */ lbz r6, 0x17c(r3) -/* 80303308 38 A0 00 01 */ li r5, 1 -/* 8030330C 55 40 06 3E */ clrlwi r0, r10, 0x18 -/* 80303310 7C A0 00 30 */ slw r0, r5, r0 -/* 80303314 7C C0 03 78 */ or r0, r6, r0 -/* 80303318 98 03 01 7C */ stb r0, 0x17c(r3) -/* 8030331C 48 00 00 24 */ b lbl_80303340 -lbl_80303320: -/* 80303320 3B FF 00 01 */ addi r31, r31, 1 -lbl_80303324: -/* 80303324 57 E5 04 3E */ clrlwi r5, r31, 0x10 -/* 80303328 7C 05 40 40 */ cmplw r5, r8 -/* 8030332C 41 80 FF C0 */ blt lbl_803032EC -/* 80303330 39 6B 00 01 */ addi r11, r11, 1 -lbl_80303334: -/* 80303334 55 65 04 3E */ clrlwi r5, r11, 0x10 -/* 80303338 7C 05 00 40 */ cmplw r5, r0 -/* 8030333C 41 80 FF 88 */ blt lbl_803032C4 -lbl_80303340: -/* 80303340 39 4A 00 01 */ addi r10, r10, 1 -lbl_80303344: -/* 80303344 55 40 06 3E */ clrlwi r0, r10, 0x18 -/* 80303348 28 00 00 04 */ cmplwi r0, 4 -/* 8030334C 41 80 FF 58 */ blt lbl_803032A4 -lbl_80303350: -/* 80303350 88 03 01 7C */ lbz r0, 0x17c(r3) -/* 80303354 28 00 00 00 */ cmplwi r0, 0 -/* 80303358 40 82 00 0C */ bne lbl_80303364 -/* 8030335C 38 00 00 00 */ li r0, 0 -/* 80303360 90 03 01 78 */ stw r0, 0x178(r3) -lbl_80303364: -/* 80303364 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80303368 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030336C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP15J2DAnmTevRegKey.s b/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP15J2DAnmTevRegKey.s deleted file mode 100644 index 8eeffa6bb73..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP15J2DAnmTevRegKey.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80303194: -/* 80303194 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80303198 7C 08 02 A6 */ mflr r0 -/* 8030319C 90 01 00 24 */ stw r0, 0x24(r1) -/* 803031A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 803031A4 48 05 F0 39 */ bl _savegpr_29 -/* 803031A8 7C 7D 1B 78 */ mr r29, r3 -/* 803031AC 7C 9E 23 78 */ mr r30, r4 -/* 803031B0 3B E0 00 00 */ li r31, 0 -/* 803031B4 48 00 00 30 */ b lbl_803031E4 -lbl_803031B8: -/* 803031B8 7F A3 EB 78 */ mr r3, r29 -/* 803031BC 7F E4 FB 78 */ mr r4, r31 -/* 803031C0 48 00 00 5D */ bl isNeedSetAnm__11J2DWindowExFUc -/* 803031C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 803031C8 41 82 00 18 */ beq lbl_803031E0 -/* 803031CC 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d -/* 803031D0 38 03 01 48 */ addi r0, r3, 0x148 -/* 803031D4 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 803031D8 7F C4 F3 78 */ mr r4, r30 -/* 803031DC 4B FE 79 31 */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey -lbl_803031E0: -/* 803031E0 3B FF 00 01 */ addi r31, r31, 1 -lbl_803031E4: -/* 803031E4 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 803031E8 28 00 00 04 */ cmplwi r0, 4 -/* 803031EC 41 80 FF CC */ blt lbl_803031B8 -/* 803031F0 80 7D 01 60 */ lwz r3, 0x160(r29) -/* 803031F4 28 03 00 00 */ cmplwi r3, 0 -/* 803031F8 41 82 00 0C */ beq lbl_80303204 -/* 803031FC 7F C4 F3 78 */ mr r4, r30 -/* 80303200 4B FE 79 0D */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey -lbl_80303204: -/* 80303204 39 61 00 20 */ addi r11, r1, 0x20 -/* 80303208 48 05 F0 21 */ bl _restgpr_29 -/* 8030320C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80303210 7C 08 03 A6 */ mtlr r0 -/* 80303214 38 21 00 20 */ addi r1, r1, 0x20 -/* 80303218 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP16J2DAnmTexPattern.s b/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP16J2DAnmTexPattern.s deleted file mode 100644 index 72270b2fb93..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP16J2DAnmTexPattern.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8030310C: -/* 8030310C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80303110 7C 08 02 A6 */ mflr r0 -/* 80303114 90 01 00 24 */ stw r0, 0x24(r1) -/* 80303118 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030311C 48 05 F0 C1 */ bl _savegpr_29 -/* 80303120 7C 7D 1B 78 */ mr r29, r3 -/* 80303124 7C 9E 23 78 */ mr r30, r4 -/* 80303128 3B E0 00 00 */ li r31, 0 -/* 8030312C 48 00 00 30 */ b lbl_8030315C -lbl_80303130: -/* 80303130 7F A3 EB 78 */ mr r3, r29 -/* 80303134 7F E4 FB 78 */ mr r4, r31 -/* 80303138 48 00 00 E5 */ bl isNeedSetAnm__11J2DWindowExFUc -/* 8030313C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80303140 41 82 00 18 */ beq lbl_80303158 -/* 80303144 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d -/* 80303148 38 03 01 48 */ addi r0, r3, 0x148 -/* 8030314C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80303150 7F C4 F3 78 */ mr r4, r30 -/* 80303154 4B FE 78 D9 */ bl setAnimation__11J2DMaterialFP16J2DAnmTexPattern -lbl_80303158: -/* 80303158 3B FF 00 01 */ addi r31, r31, 1 -lbl_8030315C: -/* 8030315C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80303160 28 00 00 04 */ cmplwi r0, 4 -/* 80303164 41 80 FF CC */ blt lbl_80303130 -/* 80303168 80 7D 01 60 */ lwz r3, 0x160(r29) -/* 8030316C 28 03 00 00 */ cmplwi r3, 0 -/* 80303170 41 82 00 0C */ beq lbl_8030317C -/* 80303174 7F C4 F3 78 */ mr r4, r30 -/* 80303178 4B FE 78 B5 */ bl setAnimation__11J2DMaterialFP16J2DAnmTexPattern -lbl_8030317C: -/* 8030317C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80303180 48 05 F0 A9 */ bl _restgpr_29 -/* 80303184 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80303188 7C 08 03 A6 */ mtlr r0 -/* 8030318C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80303190 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP19J2DAnmTextureSRTKey.s b/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP19J2DAnmTextureSRTKey.s deleted file mode 100644 index 7da6a8ff1db..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP19J2DAnmTextureSRTKey.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80303084: -/* 80303084 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80303088 7C 08 02 A6 */ mflr r0 -/* 8030308C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80303090 39 61 00 20 */ addi r11, r1, 0x20 -/* 80303094 48 05 F1 49 */ bl _savegpr_29 -/* 80303098 7C 7D 1B 78 */ mr r29, r3 -/* 8030309C 7C 9E 23 78 */ mr r30, r4 -/* 803030A0 3B E0 00 00 */ li r31, 0 -/* 803030A4 48 00 00 30 */ b lbl_803030D4 -lbl_803030A8: -/* 803030A8 7F A3 EB 78 */ mr r3, r29 -/* 803030AC 7F E4 FB 78 */ mr r4, r31 -/* 803030B0 48 00 01 6D */ bl isNeedSetAnm__11J2DWindowExFUc -/* 803030B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 803030B8 41 82 00 18 */ beq lbl_803030D0 -/* 803030BC 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d -/* 803030C0 38 03 01 48 */ addi r0, r3, 0x148 -/* 803030C4 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 803030C8 7F C4 F3 78 */ mr r4, r30 -/* 803030CC 4B FE 78 81 */ bl setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey -lbl_803030D0: -/* 803030D0 3B FF 00 01 */ addi r31, r31, 1 -lbl_803030D4: -/* 803030D4 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 803030D8 28 00 00 04 */ cmplwi r0, 4 -/* 803030DC 41 80 FF CC */ blt lbl_803030A8 -/* 803030E0 80 7D 01 60 */ lwz r3, 0x160(r29) -/* 803030E4 28 03 00 00 */ cmplwi r3, 0 -/* 803030E8 41 82 00 0C */ beq lbl_803030F4 -/* 803030EC 7F C4 F3 78 */ mr r4, r30 -/* 803030F0 4B FE 78 5D */ bl setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey -lbl_803030F4: -/* 803030F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 803030F8 48 05 F1 31 */ bl _restgpr_29 -/* 803030FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80303100 7C 08 03 A6 */ mtlr r0 -/* 80303104 38 21 00 20 */ addi r1, r1, 0x20 -/* 80303108 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setBlack__11J2DWindowExFQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DWindowEx/setBlack__11J2DWindowExFQ28JUtility6TColor.s deleted file mode 100644 index 50a4c10188d..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setBlack__11J2DWindowExFQ28JUtility6TColor.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80302764: -/* 80302764 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80302768 7C 08 02 A6 */ mflr r0 -/* 8030276C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80302770 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80302774 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80302778 7C 7E 1B 78 */ mr r30, r3 -/* 8030277C 7C 9F 23 78 */ mr r31, r4 -/* 80302780 38 00 FF FF */ li r0, -1 -/* 80302784 90 01 00 14 */ stw r0, 0x14(r1) -/* 80302788 90 01 00 10 */ stw r0, 0x10(r1) -/* 8030278C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80302790 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80302794 48 00 02 B9 */ bl getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor -/* 80302798 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8030279C 40 82 00 0C */ bne lbl_803027A8 -/* 803027A0 38 60 00 00 */ li r3, 0 -/* 803027A4 48 00 00 30 */ b lbl_803027D4 -lbl_803027A8: -/* 803027A8 80 01 00 10 */ lwz r0, 0x10(r1) -/* 803027AC 90 01 00 08 */ stw r0, 8(r1) -/* 803027B0 80 1F 00 00 */ lwz r0, 0(r31) -/* 803027B4 90 01 00 0C */ stw r0, 0xc(r1) -/* 803027B8 7F C3 F3 78 */ mr r3, r30 -/* 803027BC 38 81 00 0C */ addi r4, r1, 0xc -/* 803027C0 38 A1 00 08 */ addi r5, r1, 8 -/* 803027C4 81 9E 00 00 */ lwz r12, 0(r30) -/* 803027C8 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 803027CC 7D 89 03 A6 */ mtctr r12 -/* 803027D0 4E 80 04 21 */ bctrl -lbl_803027D4: -/* 803027D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 803027D8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 803027DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803027E0 7C 08 03 A6 */ mtlr r0 -/* 803027E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 803027E8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExF11_GXCullMode.s b/asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExF11_GXCullMode.s deleted file mode 100644 index 9e071dfc650..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExF11_GXCullMode.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80302D98: -/* 80302D98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80302D9C 7C 08 02 A6 */ mflr r0 -/* 80302DA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80302DA4 98 83 00 B1 */ stb r4, 0xb1(r3) -/* 80302DA8 38 A0 00 00 */ li r5, 0 -/* 80302DAC 38 00 00 04 */ li r0, 4 -/* 80302DB0 7C 09 03 A6 */ mtctr r0 -lbl_80302DB4: -/* 80302DB4 38 05 01 48 */ addi r0, r5, 0x148 -/* 80302DB8 7C C3 00 2E */ lwzx r6, r3, r0 -/* 80302DBC 28 06 00 00 */ cmplwi r6, 0 -/* 80302DC0 41 82 00 08 */ beq lbl_80302DC8 -/* 80302DC4 98 86 00 22 */ stb r4, 0x22(r6) -lbl_80302DC8: -/* 80302DC8 38 A5 00 04 */ addi r5, r5, 4 -/* 80302DCC 42 00 FF E8 */ bdnz lbl_80302DB4 -/* 80302DD0 80 A3 01 60 */ lwz r5, 0x160(r3) -/* 80302DD4 28 05 00 00 */ cmplwi r5, 0 -/* 80302DD8 41 82 00 08 */ beq lbl_80302DE0 -/* 80302DDC 98 85 00 22 */ stb r4, 0x22(r5) -lbl_80302DE0: -/* 80302DE0 4B FF 48 A1 */ bl setCullBack__7J2DPaneF11_GXCullMode -/* 80302DE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80302DE8 7C 08 03 A6 */ mtlr r0 -/* 80302DEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80302DF0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExFb.s b/asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExFb.s deleted file mode 100644 index a8d4377c5c4..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExFb.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_803035C0: -/* 803035C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803035C4 7C 08 02 A6 */ mflr r0 -/* 803035C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803035CC 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 803035D0 38 80 00 00 */ li r4, 0 -/* 803035D4 41 82 00 08 */ beq lbl_803035DC -/* 803035D8 38 80 00 02 */ li r4, 2 -lbl_803035DC: -/* 803035DC 81 83 00 00 */ lwz r12, 0(r3) -/* 803035E0 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 803035E4 7D 89 03 A6 */ mtctr r12 -/* 803035E8 4E 80 04 21 */ bctrl -/* 803035EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803035F0 7C 08 03 A6 */ mtlr r0 -/* 803035F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803035F8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setMinSize__11J2DWindowExFv.s b/asm/JSystem/J2DGraph/J2DWindowEx/setMinSize__11J2DWindowExFv.s deleted file mode 100644 index f6a936287c5..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setMinSize__11J2DWindowExFv.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_80300F80: -/* 80300F80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80300F84 7C 08 02 A6 */ mflr r0 -/* 80300F88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80300F8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80300F90 93 C1 00 08 */ stw r30, 8(r1) -/* 80300F94 7C 7F 1B 78 */ mr r31, r3 -/* 80300F98 38 00 00 01 */ li r0, 1 -/* 80300F9C B0 03 01 40 */ sth r0, 0x140(r3) -/* 80300FA0 B0 03 01 42 */ sth r0, 0x142(r3) -/* 80300FA4 80 63 01 48 */ lwz r3, 0x148(r3) -/* 80300FA8 28 03 00 00 */ cmplwi r3, 0 -/* 80300FAC 41 82 01 80 */ beq lbl_8030112C -/* 80300FB0 80 9F 01 4C */ lwz r4, 0x14c(r31) -/* 80300FB4 28 04 00 00 */ cmplwi r4, 0 -/* 80300FB8 41 82 01 74 */ beq lbl_8030112C -/* 80300FBC 80 BF 01 50 */ lwz r5, 0x150(r31) -/* 80300FC0 28 05 00 00 */ cmplwi r5, 0 -/* 80300FC4 41 82 01 68 */ beq lbl_8030112C -/* 80300FC8 80 DF 01 54 */ lwz r6, 0x154(r31) -/* 80300FCC 28 06 00 00 */ cmplwi r6, 0 -/* 80300FD0 41 82 01 5C */ beq lbl_8030112C -/* 80300FD4 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80300FD8 28 03 00 00 */ cmplwi r3, 0 -/* 80300FDC 41 82 01 50 */ beq lbl_8030112C -/* 80300FE0 80 04 00 70 */ lwz r0, 0x70(r4) -/* 80300FE4 28 00 00 00 */ cmplwi r0, 0 -/* 80300FE8 41 82 01 44 */ beq lbl_8030112C -/* 80300FEC 80 05 00 70 */ lwz r0, 0x70(r5) -/* 80300FF0 28 00 00 00 */ cmplwi r0, 0 -/* 80300FF4 41 82 01 38 */ beq lbl_8030112C -/* 80300FF8 80 06 00 70 */ lwz r0, 0x70(r6) -/* 80300FFC 28 00 00 00 */ cmplwi r0, 0 -/* 80301000 41 82 01 2C */ beq lbl_8030112C -/* 80301004 38 80 00 00 */ li r4, 0 -/* 80301008 81 83 00 00 */ lwz r12, 0(r3) -/* 8030100C 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80301010 7D 89 03 A6 */ mtctr r12 -/* 80301014 4E 80 04 21 */ bctrl -/* 80301018 28 03 00 00 */ cmplwi r3, 0 -/* 8030101C 41 82 01 10 */ beq lbl_8030112C -/* 80301020 80 7F 01 4C */ lwz r3, 0x14c(r31) -/* 80301024 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80301028 38 80 00 00 */ li r4, 0 -/* 8030102C 81 83 00 00 */ lwz r12, 0(r3) -/* 80301030 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80301034 7D 89 03 A6 */ mtctr r12 -/* 80301038 4E 80 04 21 */ bctrl -/* 8030103C 28 03 00 00 */ cmplwi r3, 0 -/* 80301040 41 82 00 EC */ beq lbl_8030112C -/* 80301044 80 7F 01 50 */ lwz r3, 0x150(r31) -/* 80301048 80 63 00 70 */ lwz r3, 0x70(r3) -/* 8030104C 38 80 00 00 */ li r4, 0 -/* 80301050 81 83 00 00 */ lwz r12, 0(r3) -/* 80301054 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80301058 7D 89 03 A6 */ mtctr r12 -/* 8030105C 4E 80 04 21 */ bctrl -/* 80301060 28 03 00 00 */ cmplwi r3, 0 -/* 80301064 41 82 00 C8 */ beq lbl_8030112C -/* 80301068 80 7F 01 54 */ lwz r3, 0x154(r31) -/* 8030106C 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80301070 38 80 00 00 */ li r4, 0 -/* 80301074 81 83 00 00 */ lwz r12, 0(r3) -/* 80301078 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 8030107C 7D 89 03 A6 */ mtctr r12 -/* 80301080 4E 80 04 21 */ bctrl -/* 80301084 28 03 00 00 */ cmplwi r3, 0 -/* 80301088 41 82 00 A4 */ beq lbl_8030112C -/* 8030108C 80 7F 01 4C */ lwz r3, 0x14c(r31) -/* 80301090 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80301094 38 80 00 00 */ li r4, 0 -/* 80301098 81 83 00 00 */ lwz r12, 0(r3) -/* 8030109C 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 803010A0 7D 89 03 A6 */ mtctr r12 -/* 803010A4 4E 80 04 21 */ bctrl -/* 803010A8 80 63 00 20 */ lwz r3, 0x20(r3) -/* 803010AC A3 C3 00 02 */ lhz r30, 2(r3) -/* 803010B0 80 7F 01 48 */ lwz r3, 0x148(r31) -/* 803010B4 80 63 00 70 */ lwz r3, 0x70(r3) -/* 803010B8 38 80 00 00 */ li r4, 0 -/* 803010BC 81 83 00 00 */ lwz r12, 0(r3) -/* 803010C0 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 803010C4 7D 89 03 A6 */ mtctr r12 -/* 803010C8 4E 80 04 21 */ bctrl -/* 803010CC 80 63 00 20 */ lwz r3, 0x20(r3) -/* 803010D0 A0 03 00 02 */ lhz r0, 2(r3) -/* 803010D4 7C 00 F2 14 */ add r0, r0, r30 -/* 803010D8 B0 1F 01 40 */ sth r0, 0x140(r31) -/* 803010DC 80 7F 01 50 */ lwz r3, 0x150(r31) -/* 803010E0 80 63 00 70 */ lwz r3, 0x70(r3) -/* 803010E4 38 80 00 00 */ li r4, 0 -/* 803010E8 81 83 00 00 */ lwz r12, 0(r3) -/* 803010EC 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 803010F0 7D 89 03 A6 */ mtctr r12 -/* 803010F4 4E 80 04 21 */ bctrl -/* 803010F8 80 63 00 20 */ lwz r3, 0x20(r3) -/* 803010FC A3 C3 00 04 */ lhz r30, 4(r3) -/* 80301100 80 7F 01 48 */ lwz r3, 0x148(r31) -/* 80301104 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80301108 38 80 00 00 */ li r4, 0 -/* 8030110C 81 83 00 00 */ lwz r12, 0(r3) -/* 80301110 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80301114 7D 89 03 A6 */ mtctr r12 -/* 80301118 4E 80 04 21 */ bctrl -/* 8030111C 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80301120 A0 03 00 04 */ lhz r0, 4(r3) -/* 80301124 7C 00 F2 14 */ add r0, r0, r30 -/* 80301128 B0 1F 01 42 */ sth r0, 0x142(r31) -lbl_8030112C: -/* 8030112C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80301130 83 C1 00 08 */ lwz r30, 8(r1) -/* 80301134 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80301138 7C 08 03 A6 */ mtlr r0 -/* 8030113C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80301140 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setTevOrder__11J2DWindowExFb.s b/asm/JSystem/J2DGraph/J2DWindowEx/setTevOrder__11J2DWindowExFb.s deleted file mode 100644 index e9b4113fe70..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setTevOrder__11J2DWindowExFb.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80302284: -/* 80302284 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80302288 7C 08 02 A6 */ mflr r0 -/* 8030228C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80302290 39 61 00 40 */ addi r11, r1, 0x40 -/* 80302294 48 05 FF 39 */ bl _savegpr_25 -/* 80302298 7C 7F 1B 78 */ mr r31, r3 -/* 8030229C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 803022A0 40 82 00 1C */ bne lbl_803022BC -/* 803022A4 38 00 00 04 */ li r0, 4 -/* 803022A8 B0 01 00 10 */ sth r0, 0x10(r1) -/* 803022AC 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 803022B0 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 803022B4 B0 01 00 12 */ sth r0, 0x12(r1) -/* 803022B8 48 00 00 18 */ b lbl_803022D0 -lbl_803022BC: -/* 803022BC 38 00 00 FF */ li r0, 0xff -/* 803022C0 B0 01 00 10 */ sth r0, 0x10(r1) -/* 803022C4 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FF04@ha */ -/* 803022C8 38 03 FF 04 */ addi r0, r3, 0xFF04 /* 0x0000FF04@l */ -/* 803022CC B0 01 00 12 */ sth r0, 0x12(r1) -lbl_803022D0: -/* 803022D0 3B 40 00 00 */ li r26, 0 -/* 803022D4 3B A1 00 10 */ addi r29, r1, 0x10 -/* 803022D8 48 00 00 8C */ b lbl_80302364 -lbl_803022DC: -/* 803022DC 57 5C 06 3E */ clrlwi r28, r26, 0x18 -/* 803022E0 57 40 0D FC */ rlwinm r0, r26, 1, 0x17, 0x1e -/* 803022E4 7C 7D 02 2E */ lhzx r3, r29, r0 -/* 803022E8 7C 60 46 70 */ srawi r0, r3, 8 -/* 803022EC 98 01 00 0C */ stb r0, 0xc(r1) -/* 803022F0 98 01 00 0D */ stb r0, 0xd(r1) -/* 803022F4 98 61 00 0E */ stb r3, 0xe(r1) -/* 803022F8 3B 20 00 00 */ li r25, 0 -/* 803022FC 3B C0 00 00 */ li r30, 0 -lbl_80302300: -/* 80302300 3B 7E 01 48 */ addi r27, r30, 0x148 -/* 80302304 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 80302308 80 63 00 70 */ lwz r3, 0x70(r3) -/* 8030230C 81 83 00 00 */ lwz r12, 0(r3) -/* 80302310 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80302314 7D 89 03 A6 */ mtctr r12 -/* 80302318 4E 80 04 21 */ bctrl -/* 8030231C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80302320 7C 00 E0 40 */ cmplw r0, r28 -/* 80302324 40 81 00 2C */ ble lbl_80302350 -/* 80302328 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8030232C 90 01 00 08 */ stw r0, 8(r1) -/* 80302330 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 80302334 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302338 7F 84 E3 78 */ mr r4, r28 -/* 8030233C 38 A1 00 08 */ addi r5, r1, 8 -/* 80302340 81 83 00 00 */ lwz r12, 0(r3) -/* 80302344 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80302348 7D 89 03 A6 */ mtctr r12 -/* 8030234C 4E 80 04 21 */ bctrl -lbl_80302350: -/* 80302350 3B 39 00 01 */ addi r25, r25, 1 -/* 80302354 2C 19 00 04 */ cmpwi r25, 4 -/* 80302358 3B DE 00 04 */ addi r30, r30, 4 -/* 8030235C 41 80 FF A4 */ blt lbl_80302300 -/* 80302360 3B 5A 00 01 */ addi r26, r26, 1 -lbl_80302364: -/* 80302364 57 40 06 3E */ clrlwi r0, r26, 0x18 -/* 80302368 28 00 00 02 */ cmplwi r0, 2 -/* 8030236C 41 80 FF 70 */ blt lbl_803022DC -/* 80302370 39 61 00 40 */ addi r11, r1, 0x40 -/* 80302374 48 05 FE A5 */ bl _restgpr_25 -/* 80302378 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8030237C 7C 08 03 A6 */ mtlr r0 -/* 80302380 38 21 00 40 */ addi r1, r1, 0x40 -/* 80302384 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setWhite__11J2DWindowExFQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DWindowEx/setWhite__11J2DWindowExFQ28JUtility6TColor.s deleted file mode 100644 index 22e8eba579c..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setWhite__11J2DWindowExFQ28JUtility6TColor.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_803027EC: -/* 803027EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803027F0 7C 08 02 A6 */ mflr r0 -/* 803027F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 803027F8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803027FC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80302800 7C 7E 1B 78 */ mr r30, r3 -/* 80302804 7C 9F 23 78 */ mr r31, r4 -/* 80302808 38 00 FF FF */ li r0, -1 -/* 8030280C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80302810 90 01 00 10 */ stw r0, 0x10(r1) -/* 80302814 38 81 00 14 */ addi r4, r1, 0x14 -/* 80302818 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8030281C 48 00 02 31 */ bl getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor -/* 80302820 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80302824 40 82 00 0C */ bne lbl_80302830 -/* 80302828 38 60 00 00 */ li r3, 0 -/* 8030282C 48 00 00 30 */ b lbl_8030285C -lbl_80302830: -/* 80302830 80 1F 00 00 */ lwz r0, 0(r31) -/* 80302834 90 01 00 08 */ stw r0, 8(r1) -/* 80302838 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030283C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80302840 7F C3 F3 78 */ mr r3, r30 -/* 80302844 38 81 00 0C */ addi r4, r1, 0xc -/* 80302848 38 A1 00 08 */ addi r5, r1, 8 -/* 8030284C 81 9E 00 00 */ lwz r12, 0(r30) -/* 80302850 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80302854 7D 89 03 A6 */ mtctr r12 -/* 80302858 4E 80 04 21 */ bctrl -lbl_8030285C: -/* 8030285C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80302860 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80302864 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80302868 7C 08 03 A6 */ mtlr r0 -/* 8030286C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80302870 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index 4f125294b2f..1e3f84653bc 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -55,6 +55,9 @@ public: } /* 8030A358 */ virtual ~J2DAnmVtxColor() {} /* 8030363C */ virtual void getColor(u8, u16, _GXColor*) const; + u16 getAnmTableNum(u8 param_0) const { return mAnmTableNum[param_0]; } + J3DAnmVtxColorIndexDataItem* getAnmVtxColorIndexData(u8 param_0, u16 param_1) const { return mVtxColorIndexData[param_0]->field_0x0 + param_1; } + u16* getVtxColorIndexPointer(u8 param_0) const { return mVtxColorIndexPointer[param_0]; } /* 0x10 */ u16 mAnmTableNum[2]; /* 0x14 */ J3DAnmVtxColorIndexData* mVtxColorIndexData[2]; diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h index 2308ab5b89c..3eaeecc92f1 100644 --- a/include/JSystem/J2DGraph/J2DWindow.h +++ b/include/JSystem/J2DGraph/J2DWindow.h @@ -73,7 +73,7 @@ public: setContentsColor(param_0, param_0, param_0, param_0); } -private: +protected: /* 0x100 */ JUTTexture* field_0x100; /* 0x104 */ JUTTexture* field_0x104; /* 0x108 */ JUTTexture* field_0x108; diff --git a/include/JSystem/J2DGraph/J2DWindowEx.h b/include/JSystem/J2DGraph/J2DWindowEx.h index 848b21016b2..566fe2aba67 100644 --- a/include/JSystem/J2DGraph/J2DWindowEx.h +++ b/include/JSystem/J2DGraph/J2DWindowEx.h @@ -16,9 +16,9 @@ public: /* 80302284 */ void setTevOrder(bool); /* 80302388 */ void setTevStage(bool); /* 803024B4 */ void setStage(J2DTevStage*, J2DWindowEx::stage_enum); - /* 80302A4C */ void getBlackWhite(JUtility::TColor*, JUtility::TColor*) const; - /* 80302BE8 */ void isSetBlackWhite(JUtility::TColor, JUtility::TColor) const; - /* 8030321C */ void isNeedSetAnm(u8); + /* 80302A4C */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const; + /* 80302BE8 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const; + /* 8030321C */ bool isNeedSetAnm(u8); /* 80301144 */ virtual ~J2DWindowEx(); /* 803035C0 */ virtual void setCullBack(bool); @@ -36,7 +36,7 @@ public: /* 80303194 */ virtual void setAnimation(J2DAnmTevRegKey*); /* 80303274 */ virtual void setAnimation(J2DAnmVisibilityFull*); /* 8030327C */ virtual void setAnimation(J2DAnmVtxColor*); - /* 80303370 */ virtual J2DAnmTransform* animationPane(J2DAnmTransform const*); + /* 80303370 */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*); /* 80301FC8 */ virtual void draw(JGeometry::TBox2 const&); /* 80302164 */ virtual void draw(JGeometry::TBox2 const&, JGeometry::TBox2 const&); /* 80303568 */ virtual void draw(f32, f32, f32, f32); @@ -62,6 +62,7 @@ private: /* 0x170 */ u8 field_0x170; /* 0x174 */ J2DAnmVisibilityFull* mAnmVisibilityFull; /* 0x178 */ J2DAnmVtxColor* mAnmVtxColor; + /* 0x17C */ u8 field_0x17c; }; #endif /* J2DWINDOWEX_H */ diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index ae8d86f7544..5992a039ea7 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -21,7 +21,14 @@ struct J3DAnmColorKeyTable { J3DAnmKeyTableBase mAInfo; }; // Size = 0x18 -struct J3DAnmVtxColorIndexData; +struct J3DAnmVtxColorIndexDataItem { + u16 count; + u32 offset; +}; + +struct J3DAnmVtxColorIndexData { + J3DAnmVtxColorIndexDataItem field_0x0[4]; +}; struct J3DAnmColorFullTable { /* 0x00 */ u16 mRMaxFrame; diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 9d24942e3f9..27f89924634 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -389,7 +389,7 @@ template<> struct TBox > { template struct TBox2 : TBox > { TBox2() {} - TBox2(const TVec2& i, const TVec2 f) { set(i, f); } + TBox2(const TVec2& i, const TVec2& f) { set(i, f); } TBox2(f32 x0, f32 y0, f32 x1, f32 y1) { set(x0, y0, x1, y1); } void absolute() { diff --git a/libs/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp index f0a9e1bc869..2020a53d88a 100644 --- a/libs/JSystem/J2DGraph/J2DWindowEx.cpp +++ b/libs/JSystem/J2DGraph/J2DWindowEx.cpp @@ -4,6 +4,8 @@ // #include "JSystem/J2DGraph/J2DWindowEx.h" +#include "JSystem/JUtility/JUTTexture.h" +#include "JSystem/JSupport/JSURandomInputStream.h" #include "dol2asm.h" // @@ -182,8 +184,86 @@ SECTION_SDATA2 static f64 lit_1549 = 4503601774854144.0 /* cast s32 to float */; /* 804562A8-804562B0 0048A8 0008+00 1/1 0/0 0/0 .sdata2 @1552 */ SECTION_SDATA2 static f64 lit_1552 = 4503599627370496.0 /* cast u32 to float */; +struct J2DWindowExDef { + u32 field_0x0[4]; + u16 field_0x10[4]; + u8 field_0x18; + u8 field_0x19; + u16 field_0x1A; + u16 field_0x1C; + u16 field_0x1E; + u16 field_0x20; + u16 field_0x22; + u16 field_0x24; + u16 field_0x26; + u16 field_0x28[4]; + u32 field_0x30[4]; +}; + +STATIC_ASSERT(sizeof(J2DWindowExDef) == 0x40); + /* 80300C94-80300F80 2FB5D4 02EC+00 0/0 1/1 0/0 .text * __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */ +// Matches with literals +#ifdef NONMATCHING +J2DWindowEx::J2DWindowEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2, + J2DMaterial* param_3) : J2DWindow() { + mAnmVisibilityFull = NULL; + mAnmVtxColor = NULL; + s32 position = param_1->getPosition(); + int uStack_88[2]; + param_1->read(uStack_88, 8); + mKind = uStack_88[0]; + s32 iVar2 = param_1->getPosition(); + int auStack_90[2]; + param_1->peek(auStack_90, 8); + makePaneExStream(param_0, param_1); + param_1->seek(iVar2 + auStack_90[1], JSUStreamSeekFrom_SET); + J2DWindowExDef auStack_70; + param_1->read(&auStack_70, sizeof(J2DWindowExDef)); + + JUtility::TColor* colors[4] = {NULL}; + colors[0] = &field_0x128; + colors[1] = &field_0x12C; + colors[2] = &field_0x130; + colors[3] = &field_0x134; + + for (int i = 0; i < 4; i++) { + field_0x158[i] = auStack_70.field_0x10[i]; + mFrameMaterial[i] = 0; + if (field_0x158[i] != 0xffff) { + mFrameMaterial[i] = param_3 + field_0x158[i]; + (param_3 + field_0x158[i])->field_0x4 = this; + } + field_0x168[i] = auStack_70.field_0x28[i]; + *(colors[i]) = JUtility::TColor(auStack_70.field_0x30[i]); + } + + field_0x144 = auStack_70.field_0x18; + field_0x114.set(auStack_70.field_0x1A, auStack_70.field_0x1C, + auStack_70.field_0x1A + auStack_70.field_0x1E, + auStack_70.field_0x1C + auStack_70.field_0x20); + field_0x166 = auStack_70.field_0x22; + field_0x164 = auStack_70.field_0x24; + mContentsMaterial = NULL; + + if (field_0x164 != 0xffff) { + mContentsMaterial = ¶m_3[field_0x164]; + param_3[field_0x164].field_0x4 = this; + } + + param_1->seek(position + uStack_88[1], JSUStreamSeekFrom_SET); + rewriteAlpha(); + field_0x100 = NULL; + field_0x104 = NULL; + field_0x108 = NULL; + field_0x10c = NULL; + mPalette = NULL; + field_0x110 = NULL; + field_0x170 = 0; + setMinSize(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -193,41 +273,235 @@ asm J2DWindowEx::J2DWindowEx(J2DPane* param_0, JSURandomInputStream* param_1, u3 #include "asm/JSystem/J2DGraph/J2DWindowEx/__ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s" } #pragma pop +#endif /* 80300F80-80301144 2FB8C0 01C4+00 1/1 0/0 0/0 .text setMinSize__11J2DWindowExFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setMinSize() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setMinSize__11J2DWindowExFv.s" +void J2DWindowEx::setMinSize() { + field_0x140 = 1; + field_0x142 = 1; + + if (mFrameMaterial[0] == NULL) return; + if (mFrameMaterial[1] == NULL) return; + if (mFrameMaterial[2] == NULL) return; + if (mFrameMaterial[3] == NULL) return; + if (mFrameMaterial[0]->getTevBlock() == NULL) return; + if (mFrameMaterial[1]->getTevBlock() == NULL) return; + if (mFrameMaterial[2]->getTevBlock() == NULL) return; + if (mFrameMaterial[3]->getTevBlock() == NULL) return; + if (mFrameMaterial[0]->getTevBlock()->getTexture(0) == NULL) return; + if (mFrameMaterial[1]->getTevBlock()->getTexture(0) == NULL) return; + if (mFrameMaterial[2]->getTevBlock()->getTexture(0) == NULL) return; + if (mFrameMaterial[3]->getTevBlock()->getTexture(0) == NULL) return; + + field_0x140 = mFrameMaterial[0]->getTevBlock()->getTexture(0)->getWidth() + mFrameMaterial[1]->getTevBlock()->getTexture(0)->getWidth(); + field_0x142 = mFrameMaterial[0]->getTevBlock()->getTexture(0)->getHeight() + mFrameMaterial[2]->getTevBlock()->getTexture(0)->getHeight(); } -#pragma pop /* 80301144-8030122C 2FBA84 00E8+00 1/0 0/0 0/0 .text __dt__11J2DWindowExFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __dt__11J2DWindowExFv() { - // asm J2DWindowEx::~J2DWindowEx() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/__dt__11J2DWindowExFv.s" +J2DWindowEx::~J2DWindowEx() { + for (u8 i = 0; i < 4; i++) { + if (field_0x170 & (1 << i)) { + delete mFrameMaterial[i]; + } + } + + if (field_0x170 & 0x10) { + delete mContentsMaterial; + } } -#pragma pop /* 8030122C-803012CC 2FBB6C 00A0+00 1/0 0/0 0/0 .text drawSelf__11J2DWindowExFffPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/drawSelf__11J2DWindowExFffPA3_A4_f.s" +void J2DWindowEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) { + JGeometry::TBox2 aTStack_50(mBounds); + Mtx auStack_40; + aTStack_50.addPos(JGeometry::TVec2(param_0, param_1)); + MTXConcat(*param_2, mGlobalMtx, auStack_40); + GXLoadPosMtxImm(auStack_40, 0); + draw_private(aTStack_50, field_0x114); + clip(field_0x114); } -#pragma pop /* 803012CC-80301994 2FBC0C 06C8+00 2/2 0/0 0/0 .text * draw_private__11J2DWindowExFRCQ29JGeometry8TBox2RCQ29JGeometry8TBox2 */ +// Matches with literals +#ifdef NONMATCHING +void J2DWindowEx::draw_private(JGeometry::TBox2 const& param_0, + JGeometry::TBox2 const& param_1) { + if (param_0.getWidth() >= field_0x140 && param_0.getHeight() >= field_0x142) { + JUTTexture* textures[4]; + bool anyFrameMaterialNull = false; + for (int i = 0; i < 4; i++) { + if (mFrameMaterial[i] == NULL) { + return; + } + J2DTevBlock* block = mFrameMaterial[i]->getTevBlock(); + if (block == NULL) { + return; + } + + textures[i] = block->getTexture(0); + if (textures[i] == NULL) { + anyFrameMaterialNull = true; + } + } + + JGeometry::TBox2 aTStack_b8(param_1); + aTStack_b8.addPos(param_0.i); + drawContents(aTStack_b8); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + + if (!anyFrameMaterialNull) { + f32 dVar16 = param_0.i.x; + f32 dVar15 = param_0.i.y; + f32 dVar18 = param_0.f.x - textures[3]->getWidth(); + f32 dVar17 = param_0.f.y - textures[3]->getHeight(); + f32 dVar14 = dVar16 + textures[0]->getWidth(); + f32 dVar12 = dVar15 + textures[0]->getHeight(); + u16 local_c4; + if (field_0x144 & 0x80) { + local_c4 = 0; + } else { + local_c4 = 0x8000; + } + u16 local_c6; + if (field_0x144 & 0x40) { + local_c6 = 0; + } else { + local_c6 = 0x8000; + } + + drawFrameTexture(dVar16, dVar15, textures[0]->getWidth(), textures[0]->getHeight(), + local_c4, local_c6, 0x8000 - local_c4, 0x8000 - local_c6, + mFrameMaterial[0], true); + bool r9 = mFrameMaterial[1] != mFrameMaterial[0]; + u16 local_c8; + if (field_0x144 & 0x20) { + local_c8 = 0; + } else { + local_c8 = 0x8000; + } + u16 local_ca; + if (field_0x144 & 0x10) { + local_ca = 0; + } else { + local_ca = 0x8000; + } + drawFrameTexture(dVar18, dVar15, textures[3]->getWidth(), textures[0]->getHeight(), + local_c8, local_ca, 0x8000 - local_c8, 0x8000 - local_ca, + mFrameMaterial[1], r9); + + u16 local_cc; + if (field_0x144 & 0x20) { + local_cc = 0x8000; + } else { + local_cc = 0; + } + + u16 local_ce; + if (field_0x144 & 0x10) { + local_ce = 0; + } else { + local_ce = 0x8000; + } + drawFrameTexture(dVar14, dVar15, dVar18 - dVar14, textures[0]->getHeight(), local_cc, + local_ce, local_cc, local_ce ^ 0x8000, mFrameMaterial[1], false); + + r9 = mFrameMaterial[3] != mFrameMaterial[1]; + u16 local_d0; + if (field_0x144 & 2) { + local_d0 = 0; + } else { + local_d0 = 0x8000; + } + u16 local_d2; + if (field_0x144 & 1) { + local_d2 = 0; + } else { + local_d2 = 0x8000; + } + + drawFrameTexture(dVar18, dVar17, textures[3]->getWidth(), textures[3]->getHeight(), + local_d0, local_d2, 0x8000 - local_d0, 0x8000 - local_d2, + mFrameMaterial[3], r9); + + u16 local_d4; + if (field_0x144 & 2) { + local_d4 = 0x8000; + } else { + local_d4 = 0; + } + + u16 local_d6; + if (field_0x144 & 1) { + local_d6 = 0; + } else { + local_d6 = 0x8000; + } + drawFrameTexture(dVar14, dVar17, dVar18 - dVar14, textures[3]->getHeight(), local_d4, + local_d6, local_d4, local_d6 ^ 0x8000, mFrameMaterial[3], false); + + u16 local_d8; + if (field_0x144 & 2) { + local_d8 = 0; + } else { + local_d8 = 0x8000; + } + + u16 local_da; + if (field_0x144 & 1) { + local_da = 0x8000; + } else { + local_da = 0; + } + drawFrameTexture(dVar18, dVar12, textures[3]->getWidth(), dVar17 - dVar12, local_d8, + local_da, local_d8 ^ 0x8000, local_da, mFrameMaterial[3], false); + + r9 = mFrameMaterial[2] != mFrameMaterial[3]; + u16 local_dc; + if (field_0x144 & 8) { + local_dc = 0; + } else { + local_dc = 0x8000; + } + + u16 local_de; + if (field_0x144 & 4) { + local_de = 0; + } else { + local_de = 0x8000; + } + drawFrameTexture(dVar16, dVar17, textures[0]->getWidth(), textures[3]->getHeight(), + local_dc, local_de, 0x8000 - local_dc, 0x8000 - local_de, + mFrameMaterial[2], r9); + + u16 local_e0; + if (field_0x144 & 8) { + local_e0 = 0; + } else { + local_e0 = 0x8000; + } + + u16 local_e2; + if (field_0x144 & 4) { + local_e2 = 0x8000; + } else { + local_e2 = 0; + } + drawFrameTexture(dVar16, dVar12, textures[0]->getWidth(), dVar17 - dVar12, local_e0, + local_e2, local_e0 ^ 0x8000, local_e2, mFrameMaterial[2], false); + } + + GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetNumTexGens(0); + GXSetVtxDesc(GX_VA_TEX0, GX_NONE); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -237,6 +511,7 @@ asm void J2DWindowEx::draw_private(JGeometry::TBox2 const& param_0, #include "asm/JSystem/J2DGraph/J2DWindowEx/func_803012CC.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804562B0-804562B4 0048B0 0004+00 4/4 0/0 0/0 .sdata2 @1827 */ @@ -305,14 +580,29 @@ asm void J2DWindowEx::draw(JGeometry::TBox2 const& param_0, #pragma pop /* 80302284-80302388 2FCBC4 0104+00 1/1 0/0 0/0 .text setTevOrder__11J2DWindowExFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setTevOrder(bool param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setTevOrder__11J2DWindowExFb.s" +void J2DWindowEx::setTevOrder(bool param_0) { + u16 local_28[2]; + if (!param_0) { + local_28[0] = 4; + local_28[1] = 0xffff; + } else { + local_28[0] = 0xff; + local_28[1] = 0xff04; + } + for (u8 i = 0; i < 2; i++) { + s32 uVar1 = local_28[i]; + J2DTevOrderInfo info; + info.mTexCoord = uVar1 >> 8; + info.mTexMap = uVar1 >> 8; + info.mColor = uVar1; + J2DTevOrder local_30(info); + for (int j = 0; j < 4; j++) { + if (mFrameMaterial[j]->getTevBlock()->getMaxStage() > i) { + mFrameMaterial[j]->getTevBlock()->setTevOrder(i, local_30); + } + } + } } -#pragma pop /* 80302388-803024B4 2FCCC8 012C+00 1/1 0/0 0/0 .text setTevStage__11J2DWindowExFb */ #pragma push @@ -326,6 +616,32 @@ asm void J2DWindowEx::setTevStage(bool param_0) { /* 803024B4-80302764 2FCDF4 02B0+00 1/1 0/0 0/0 .text * setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum */ +// rlwinm/slwi diffs + regalloc. Need to verify data arrays. +#ifdef NONMATCHING +void J2DWindowEx::setStage(J2DTevStage* param_0, J2DWindowEx::stage_enum param_1) { + u8 local_30[6][4] = { + {0x0f, 0x08, 0x0a, 0x0f}, {0x0f, 0x08, 0x0a, 0x0f}, {0x0f, 0x0a, 0x00, 0x0f}, + {0x02, 0x04, 0x08, 0x0f}, {0x02, 0x04, 0x08, 0x0f}, {0x0f, 0x0f, 0x0f, 0x0a}, + }; + u8 local_48[6][4] = { + {0x07, 0x04, 0x05, 0x07}, {0x05, 0x07, 0x07, 0x07}, {0x07, 0x05, 0x00, 0x07}, + {0x01, 0x02, 0x04, 0x07}, {0x07, 0x07, 0x07, 0x02}, {0x07, 0x07, 0x07, 0x05}, + }; + u8 local_68[6][5] = { + {1, 0, 0, 0, 0}, {0, 0, 0, 0, 0}, {0, 1, 0, 0, 1}, + {0, 0, 1, 0, 0}, {1, 0, 0, 0, 0}, {0, 0, 0, 0, 1}, + }; + + param_0->setTevColorAB(local_30[param_1][0], local_30[param_1][1]); + param_0->setTevColorCD(local_30[param_1][2], local_30[param_1][3]); + param_0->setTevColorOp(local_68[param_1][0], local_68[param_1][1], local_68[param_1][2], + local_68[param_1][3], local_68[param_1][4]); + param_0->setAlphaABCD(local_48[param_1][0], local_48[param_1][1], local_48[param_1][2], + local_48[param_1][3]); + param_0->setTevAlphaOp(local_68[param_1][0], local_68[param_1][1], local_68[param_1][2], + local_68[param_1][3], local_68[param_1][4]); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -334,31 +650,81 @@ asm void J2DWindowEx::setStage(J2DTevStage* param_0, J2DWindowEx::stage_enum par #include "asm/JSystem/J2DGraph/J2DWindowEx/setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum.s" } #pragma pop +#endif /* 80302764-803027EC 2FD0A4 0088+00 1/0 0/0 0/0 .text setBlack__11J2DWindowExFQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DWindowEx::setBlack(JUtility::TColor param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setBlack__11J2DWindowExFQ28JUtility6TColor.s" +bool J2DWindowEx::setBlack(JUtility::TColor black) { + JUtility::TColor dummy,white; + + if (!getBlackWhite(&dummy, &white)) { + return false; + } + + return setBlackWhite(black, white); } -#pragma pop /* 803027EC-80302874 2FD12C 0088+00 1/0 0/0 0/0 .text setWhite__11J2DWindowExFQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DWindowEx::setWhite(JUtility::TColor param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setWhite__11J2DWindowExFQ28JUtility6TColor.s" +bool J2DWindowEx::setWhite(JUtility::TColor white) { + JUtility::TColor black,dummy; + + if (!getBlackWhite(&black, &dummy)) { + return false; + } + + return setBlackWhite(black, white); } -#pragma pop /* 80302874-80302A4C 2FD1B4 01D8+00 1/0 0/0 0/0 .text * setBlackWhite__11J2DWindowExFQ28JUtility6TColorQ28JUtility6TColor */ +// J2DGXColorS10 issue +#ifdef NONMATCHING +bool J2DWindowEx::setBlackWhite(JUtility::TColor black, JUtility::TColor white) { + for (int i = 0; i < 4; i++) { + if (mFrameMaterial[i] == NULL) { + return false; + } + + if (mFrameMaterial[i]->getTevBlock() == NULL) { + return false; + } + } + + if (!isSetBlackWhite(black, white)) { + return false; + } + + bool bVar1 = false; + if ((u32)black != 0 || (u32)white != 0xffffffff) { + bVar1 = true; + } + u8 uVar3 = bVar1 ? 2 : 1; + for (int i = 0; i < 4; i++) { + mFrameMaterial[i]->getTevBlock()->setTevStageNum(uVar3); + } + setTevOrder(bVar1); + setTevStage(bVar1); + if (bVar1) { + J2DGXColorS10 color0; + J2DGXColorS10 color1; + color0.r = black.r; + color0.g = black.g; + color0.b = black.b; + color0.a = black.a; + color1.r = white.r; + color1.g = white.g; + color1.b = white.b; + color1.a = white.a; + + for (int i = 0; i < 4; i++) { + mFrameMaterial[i]->getTevBlock()->setTevColor(0, color0); + mFrameMaterial[i]->getTevBlock()->setTevColor(1, color1); + } + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -367,179 +733,258 @@ asm bool J2DWindowEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor p #include "asm/JSystem/J2DGraph/J2DWindowEx/setBlackWhite__11J2DWindowExFQ28JUtility6TColorQ28JUtility6TColor.s" } #pragma pop +#endif /* 80302A4C-80302BE8 2FD38C 019C+00 4/4 0/0 0/0 .text * getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor.s" +bool J2DWindowEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const { + if (mFrameMaterial[0] == NULL) { + return false; + } + + if (mFrameMaterial[0]->getTevBlock() == NULL) { + return false; + } + + bool cVar6 = mFrameMaterial[0]->getTevBlock()->getTevStageNum() != 1; + *param_0 = JUtility::TColor(0); + *param_1 = JUtility::TColor(0xffffffff); + if (cVar6) { + J2DGXColorS10* color0p = mFrameMaterial[0]->getTevBlock()->getTevColor(0); + GXColorS10 color0; + color0.r = color0p->r; + color0.g = color0p->g; + color0.b = color0p->b; + color0.a = color0p->a; + J2DGXColorS10* color1p = mFrameMaterial[0]->getTevBlock()->getTevColor(1); + GXColorS10 color1; + color1.r = color1p->r; + color1.g = color1p->g; + color1.b = color1p->b; + color1.a = color1p->a; + *param_0 = JUtility::TColor((((u8)color0.r) << 0x18) | (((u8)color0.g) << 0x10) | (((u8)color0.b) << 0x8) | (((u8)color0.a))); + *param_1 = JUtility::TColor((((u8)color1.r) << 0x18) | (((u8)color1.g) << 0x10) | (((u8)color1.b) << 0x8) | (((u8)color1.a))); + } + return true; } -#pragma pop /* 80302BE8-80302C88 2FD528 00A0+00 1/1 0/0 0/0 .text * isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor.s" +bool J2DWindowEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const { + if ((u32)param_0 == 0 && (u32)param_1 == 0xffffffff) { + return true; + } + for (int i = 0; i < 4; i++) { + if (mFrameMaterial[i]->getTevBlock()->getMaxStage() == 1) { + return false; + } + } + return true; } -#pragma pop /* 80302C88-80302CE8 2FD5C8 0060+00 1/0 0/0 0/0 .text getBlack__11J2DWindowExCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUtility::TColor J2DWindowEx::getBlack() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/getBlack__11J2DWindowExCFv.s" +JUtility::TColor J2DWindowEx::getBlack() const { + JUtility::TColor black, white; + if (!getBlackWhite(&black, &white)) { + return JUtility::TColor(0); + } + + return black; } -#pragma pop /* 80302CE8-80302D48 2FD628 0060+00 1/0 0/0 0/0 .text getWhite__11J2DWindowExCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUtility::TColor J2DWindowEx::getWhite() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/getWhite__11J2DWindowExCFv.s" +JUtility::TColor J2DWindowEx::getWhite() const { + JUtility::TColor black, white; + if (!getBlackWhite(&black, &white)) { + return JUtility::TColor(0xffffffff); + } + + return white; } -#pragma pop /* 80302D48-80302D98 2FD688 0050+00 1/0 0/0 0/0 .text setAlpha__11J2DWindowExFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setAlpha(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setAlpha__11J2DWindowExFUc.s" +void J2DWindowEx::setAlpha(u8 param_0) { + mAlpha = param_0; + + for (int i = 0; i < 4; i++) { + if (mFrameMaterial[i] != NULL) { + if (mFrameMaterial[i]->getColorBlock()->getMatColor(0) != NULL) { + mFrameMaterial[i]->getColorBlock()->getMatColor(0)->a = param_0; + } + } + } + + if (mContentsMaterial != NULL) { + if (mContentsMaterial->getColorBlock()->getMatColor(0) != 0) { + mContentsMaterial->getColorBlock()->getMatColor(0)->a = param_0; + } + } } -#pragma pop /* 80302D98-80302DF4 2FD6D8 005C+00 1/0 0/0 0/0 .text setCullBack__11J2DWindowExF11_GXCullMode */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setCullBack(_GXCullMode param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExF11_GXCullMode.s" +void J2DWindowEx::setCullBack(_GXCullMode param_0) { + mCullMode = param_0; + + for (int i = 0; i < 4; i++) { + if (mFrameMaterial[i] != NULL) { + mFrameMaterial[i]->getColorBlock()->setCullMode(param_0); + } + } + + if (mContentsMaterial != NULL) { + mContentsMaterial->getColorBlock()->setCullMode(param_0); + } + J2DPane::setCullBack(param_0); } -#pragma pop /* 80302DF4-80302E0C 2FD734 0018+00 1/0 0/0 0/0 .text rewriteAlpha__11J2DWindowExFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::rewriteAlpha() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/rewriteAlpha__11J2DWindowExFv.s" +void J2DWindowEx::rewriteAlpha() { + if (mContentsMaterial != NULL) { + mAlpha = mContentsMaterial->getColorBlock()->getMatColor(0)->a; + } } -#pragma pop /* 80302E0C-80302E74 2FD74C 0068+00 1/0 0/0 0/0 .text getFrameTexture__11J2DWindowExCFUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTTexture* J2DWindowEx::getFrameTexture(u8 param_0, u8 param_1) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/getFrameTexture__11J2DWindowExCFUcUc.s" +JUTTexture* J2DWindowEx::getFrameTexture(u8 param_0, u8 param_1) const { + J2DMaterial* frameMaterial = getFrameMaterial(param_0); + if (frameMaterial != NULL && frameMaterial->getTevBlock() != NULL) { + return frameMaterial->getTevBlock()->getTexture(param_1); + } + return NULL; } -#pragma pop /* 80302E74-80302EDC 2FD7B4 0068+00 1/0 0/0 0/0 .text getContentsTexture__11J2DWindowExCFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTTexture* J2DWindowEx::getContentsTexture(u8 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/getContentsTexture__11J2DWindowExCFUc.s" +JUTTexture* J2DWindowEx::getContentsTexture(u8 param_0) const { + J2DMaterial* frameMaterial = getContentsMaterial(); + if (frameMaterial != NULL && frameMaterial->getTevBlock() != NULL) { + return frameMaterial->getTevBlock()->getTexture(param_0); + } + return NULL; } -#pragma pop /* 80302EDC-80302FFC 2FD81C 0120+00 1/0 0/0 0/0 .text isUsed__11J2DWindowExFPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DWindowEx::isUsed(ResTIMG const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResTIMG.s" +bool J2DWindowEx::isUsed(ResTIMG const* timg) { + for (u8 i = 0; i < 4; i++) { + if (mFrameMaterial[i] != NULL && mFrameMaterial[i]->getTevBlock() != NULL) { + for (u32 j = 0; j < 8; j++) { + JUTTexture* texture = mFrameMaterial[i]->getTevBlock()->getTexture(j); + if (texture != NULL && texture->getTexInfo() == timg) { + return true; + } + } + } + } + + if (mContentsMaterial != NULL && mContentsMaterial->getTevBlock() != NULL) { + for (u32 j = 0; j < 8; j++) { + JUTTexture* texture = mContentsMaterial->getTevBlock()->getTexture(j); + if (texture != NULL && texture->getTexInfo() == timg) { + return true; + } + } + } + + return J2DPane::isUsed(timg); } -#pragma pop /* 80302FFC-80303084 2FD93C 0088+00 1/0 0/0 0/0 .text setAnimation__11J2DWindowExFP11J2DAnmColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setAnimation(J2DAnmColor* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP11J2DAnmColor.s" +void J2DWindowEx::setAnimation(J2DAnmColor* anmColor) { + for (u8 i = 0; i < 4; i++) { + if (isNeedSetAnm(i)) { + mFrameMaterial[i]->setAnimation(anmColor); + } + } + if (mContentsMaterial != NULL) { + mContentsMaterial->setAnimation(anmColor); + } } -#pragma pop /* 80303084-8030310C 2FD9C4 0088+00 1/0 0/0 0/0 .text * setAnimation__11J2DWindowExFP19J2DAnmTextureSRTKey */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setAnimation(J2DAnmTextureSRTKey* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP19J2DAnmTextureSRTKey.s" +void J2DWindowEx::setAnimation(J2DAnmTextureSRTKey* param_0) { + for (u8 i = 0; i < 4; i++) { + if (isNeedSetAnm(i)) { + mFrameMaterial[i]->setAnimation(param_0); + } + } + if (mContentsMaterial != NULL) { + mContentsMaterial->setAnimation(param_0); + } } -#pragma pop /* 8030310C-80303194 2FDA4C 0088+00 1/0 0/0 0/0 .text * setAnimation__11J2DWindowExFP16J2DAnmTexPattern */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setAnimation(J2DAnmTexPattern* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP16J2DAnmTexPattern.s" +void J2DWindowEx::setAnimation(J2DAnmTexPattern* param_0) { + for (u8 i = 0; i < 4; i++) { + if (isNeedSetAnm(i)) { + mFrameMaterial[i]->setAnimation(param_0); + } + } + if (mContentsMaterial != NULL) { + mContentsMaterial->setAnimation(param_0); + } } -#pragma pop /* 80303194-8030321C 2FDAD4 0088+00 1/0 0/0 0/0 .text * setAnimation__11J2DWindowExFP15J2DAnmTevRegKey */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setAnimation(J2DAnmTevRegKey* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP15J2DAnmTevRegKey.s" +void J2DWindowEx::setAnimation(J2DAnmTevRegKey* param_0) { + for (u8 i = 0; i < 4; i++) { + if (isNeedSetAnm(i)) { + mFrameMaterial[i]->setAnimation(param_0); + } + } + if (mContentsMaterial != NULL) { + mContentsMaterial->setAnimation(param_0); + } } -#pragma pop /* 8030321C-80303274 2FDB5C 0058+00 4/4 0/0 0/0 .text isNeedSetAnm__11J2DWindowExFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::isNeedSetAnm(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/isNeedSetAnm__11J2DWindowExFUc.s" +bool J2DWindowEx::isNeedSetAnm(u8 param_0) { + for (u8 i = 0; i < param_0; i++) { + if (mFrameMaterial[i] == mFrameMaterial[param_0]) { + return false; + } + } + return mFrameMaterial[param_0] != NULL; } -#pragma pop /* 80303274-8030327C -00001 0008+00 0/0 0/0 0/0 .text * setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull */ void J2DWindowEx::setAnimation(J2DAnmVisibilityFull* param_0) { - *(u32*)(((u8*)this) + 372) /* this->field_0x174 */ = (u32)(param_0); + mAnmVisibilityFull = param_0; } /* 8030327C-80303370 2FDBBC 00F4+00 1/0 0/0 0/0 .text * setAnimation__11J2DWindowExFP14J2DAnmVtxColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP14J2DAnmVtxColor.s" +void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) { + mAnmVtxColor = param_0; + field_0x17c = 0; + if (param_0 != NULL) { + u16 uVar3 = param_0->getAnmTableNum(0); + for (u8 i = 0; i < 4; i++) { + if (field_0x168[i] != 0xffff) { + for (u16 j = 0; j < uVar3; j++) { + J3DAnmVtxColorIndexDataItem* puVar1 = param_0->getAnmVtxColorIndexData(0, j); + u16* indexPointer = param_0->getVtxColorIndexPointer(0); + u16* indexPointer2 = indexPointer + puVar1->offset; + for (u16 k = 0; k < puVar1->count; k++) { + if (indexPointer2[k] == field_0x168[i]) { + mAnmVtxColor = param_0; + field_0x17c |= 1 << i; + goto nexti; + } + } + } + } + nexti:; + } + } + + if (field_0x17c == 0) { + mAnmVtxColor = NULL; + } } -#pragma pop /* ############################################################################################## */ /* 803A1C70-803A1C80 02E2D0 0010+00 0/0 0/0 0/0 .rodata @1557 */ @@ -675,94 +1120,97 @@ SECTION_RODATA static u8 const lit_2532[30 + 2 /* padding */] = { COMPILER_STRIP_GATE(0x803A1D20, &lit_2532); #pragma pop -/* 803A1D40-803A1D50 02E3A0 0010+00 1/1 0/0 0/0 .rodata @3089 */ -SECTION_RODATA static u8 const lit_3089[16] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x803A1D40, &lit_3089); - /* 80303370-80303510 2FDCB0 01A0+00 1/0 0/0 0/0 .text * animationPane__11J2DWindowExFPC15J2DAnmTransform */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DAnmTransform* J2DWindowEx::animationPane(J2DAnmTransform const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/animationPane__11J2DWindowExFPC15J2DAnmTransform.s" +const J2DAnmTransform* J2DWindowEx::animationPane(J2DAnmTransform const* param_0) { + if (mAnmVisibilityFull != 0 && field_0x166 != 0xffff) { + u8 visibility; + mAnmVisibilityFull->getVisibility(field_0x166, &visibility); + if (visibility) { + J2DPane::show(); + } else { + J2DPane::hide(); + } + } + + JUtility::TColor* local_38[4] = {NULL}; + local_38[0] = &field_0x128; + local_38[1] = &field_0x12C; + local_38[2] = &field_0x130; + local_38[3] = &field_0x134; + if (mAnmVtxColor != NULL) { + u16 uVar3 = mAnmVtxColor->getAnmTableNum(0); + for (u8 i = 0; i < 4; i++) { + if ((field_0x17c & (1 << i))) { + for (u16 j = 0; j < uVar3; j++) { + J3DAnmVtxColorIndexDataItem* puVar1 = mAnmVtxColor->getAnmVtxColorIndexData(0, j); + u16* indexPointer = mAnmVtxColor->getVtxColorIndexPointer(0); + u16* indexPointer2 = indexPointer + puVar1->offset; + for (u16 k = 0; k < puVar1->count; k++) { + if (indexPointer2[k] == field_0x168[i]) { + mAnmVtxColor->getColor(0, j, local_38[i]); + goto nexti; + } + } + } + } + nexti:; + } + } + return J2DPane::animationPane(param_0); } -#pragma pop /* 80303510-80303534 2FDE50 0024+00 1/0 0/0 0/0 .text getFrameMaterial__11J2DWindowExCFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DMaterial* J2DWindowEx::getFrameMaterial(u8 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/getFrameMaterial__11J2DWindowExCFUc.s" +J2DMaterial* J2DWindowEx::getFrameMaterial(u8 index) const { + if (index >= 4) { + return NULL; + } + + return mFrameMaterial[index]; } -#pragma pop /* 80303534-8030353C 2FDE74 0008+00 1/0 0/0 0/0 .text getContentsMaterial__11J2DWindowExCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DMaterial* J2DWindowEx::getContentsMaterial() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/getContentsMaterial__11J2DWindowExCFv.s" +J2DMaterial* J2DWindowEx::getContentsMaterial() const { + return mContentsMaterial; } -#pragma pop /* 8030353C-80303568 2FDE7C 002C+00 1/0 0/0 0/0 .text * getMaterial__11J2DWindowExCFRQ29J2DWindow9TMaterial */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::getMaterial(J2DWindow::TMaterial& param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/getMaterial__11J2DWindowExCFRQ29J2DWindow9TMaterial.s" +void J2DWindowEx::getMaterial(J2DWindow::TMaterial& param_0) const { + param_0.field_0x0 = mFrameMaterial[0]; + param_0.field_0x4 = mFrameMaterial[1]; + param_0.field_0x8 = mFrameMaterial[2]; + param_0.field_0xc = mFrameMaterial[3]; + param_0.field_0x10 = mContentsMaterial; } -#pragma pop /* 80303568-803035C0 2FDEA8 0058+00 1/0 0/0 0/0 .text draw__11J2DWindowExFffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::draw(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/draw__11J2DWindowExFffff.s" +void J2DWindowEx::draw(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { + draw(JGeometry::TBox2(JGeometry::TVec2(param_0, param_1), + JGeometry::TVec2(param_0 + param_2, param_1 + param_3))); } -#pragma pop /* 803035C0-803035FC 2FDF00 003C+00 1/0 0/0 0/0 .text setCullBack__11J2DWindowExFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setCullBack(bool param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setCullBack__11J2DWindowExFb.s" +void J2DWindowEx::setCullBack(bool param_0) { + _GXCullMode mode; + if (param_0) { + mode = GX_CULL_BACK; + } else { + mode = GX_CULL_NONE; + } + setCullBack(mode); } -#pragma pop /* 803035FC-8030361C 2FDF3C 0020+00 1/0 0/0 0/0 .text isUsed__11J2DWindowExFPC7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DWindowEx::isUsed(ResFONT const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResFONT.s" +bool J2DWindowEx::isUsed(ResFONT const* param_0) { + return J2DPane::isUsed(param_0); } -#pragma pop /* 8030361C-8030363C 2FDF5C 0020+00 1/0 0/0 0/0 .text setAnimation__11J2DWindowExFP10J2DAnmBase */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setAnimation(J2DAnmBase* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP10J2DAnmBase.s" +void J2DWindowEx::setAnimation(J2DAnmBase* param_0) { + J2DPane::setAnimation(param_0); } -#pragma pop /* 8030363C-80303640 2FDF7C 0004+00 0/0 1/0 0/0 .text getColor__14J2DAnmVtxColorCFUcUsP8_GXColor */