falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Work on J2DPictureEx (#1919)

This commit is contained in:
hatal175 2023-09-09 23:39:49 +03:00 committed by GitHub
parent 0f4eac4420
commit 8a146f81b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 557 additions and 1249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
asm/JSystem/J2DGraph/J2DPictureEx/append__12J2DPictureExFP10JUTTexturef.s
View File

@ -1,21 +0,0 @@
lbl_80303EEC:
/* 80303EEC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80303EF0 7C 08 02 A6 */ mflr r0
/* 80303EF4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80303EF8 80 A3 01 50 */ lwz r5, 0x150(r3)
/* 80303EFC 28 05 00 00 */ cmplwi r5, 0
/* 80303F00 40 82 00 0C */ bne lbl_80303F0C
/* 80303F04 38 60 00 00 */ li r3, 0
/* 80303F08 48 00 00 1C */ b lbl_80303F24
lbl_80303F0C:
/* 80303F0C 80 05 00 28 */ lwz r0, 0x28(r5)
/* 80303F10 54 05 06 3E */ clrlwi r5, r0, 0x18
/* 80303F14 81 83 00 00 */ lwz r12, 0(r3)
/* 80303F18 81 8C 00 D4 */ lwz r12, 0xd4(r12)
/* 80303F1C 7D 89 03 A6 */ mtctr r12
/* 80303F20 4E 80 04 21 */ bctrl
lbl_80303F24:
/* 80303F24 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80303F28 7C 08 03 A6 */ mtlr r0
/* 80303F2C 38 21 00 10 */ addi r1, r1, 0x10
/* 80303F30 4E 80 00 20 */ blr

21
asm/JSystem/J2DGraph/J2DPictureEx/append__12J2DPictureExFPC7ResTIMGP10JUTPalettef.s
View File

@ -1,21 +0,0 @@
lbl_80303E5C:
/* 80303E5C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80303E60 7C 08 02 A6 */ mflr r0
/* 80303E64 90 01 00 14 */ stw r0, 0x14(r1)
/* 80303E68 80 C3 01 50 */ lwz r6, 0x150(r3)
/* 80303E6C 28 06 00 00 */ cmplwi r6, 0
/* 80303E70 40 82 00 0C */ bne lbl_80303E7C
/* 80303E74 38 60 00 00 */ li r3, 0
/* 80303E78 48 00 00 1C */ b lbl_80303E94
lbl_80303E7C:
/* 80303E7C 80 06 00 28 */ lwz r0, 0x28(r6)
/* 80303E80 54 06 06 3E */ clrlwi r6, r0, 0x18
/* 80303E84 81 83 00 00 */ lwz r12, 0(r3)
/* 80303E88 81 8C 00 C8 */ lwz r12, 0xc8(r12)
/* 80303E8C 7D 89 03 A6 */ mtctr r12
/* 80303E90 4E 80 04 21 */ bctrl
lbl_80303E94:
/* 80303E94 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80303E98 7C 08 03 A6 */ mtlr r0
/* 80303E9C 38 21 00 10 */ addi r1, r1, 0x10
/* 80303EA0 4E 80 00 20 */ blr

21
asm/JSystem/J2DGraph/J2DPictureEx/append__12J2DPictureExFPCcP10JUTPalettef.s
View File

@ -1,21 +0,0 @@
lbl_80303EA4:
/* 80303EA4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80303EA8 7C 08 02 A6 */ mflr r0
/* 80303EAC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80303EB0 80 C3 01 50 */ lwz r6, 0x150(r3)
/* 80303EB4 28 06 00 00 */ cmplwi r6, 0
/* 80303EB8 40 82 00 0C */ bne lbl_80303EC4
/* 80303EBC 38 60 00 00 */ li r3, 0
/* 80303EC0 48 00 00 1C */ b lbl_80303EDC
lbl_80303EC4:
/* 80303EC4 80 06 00 28 */ lwz r0, 0x28(r6)
/* 80303EC8 54 06 06 3E */ clrlwi r6, r0, 0x18
/* 80303ECC 81 83 00 00 */ lwz r12, 0(r3)
/* 80303ED0 81 8C 00 D0 */ lwz r12, 0xd0(r12)
/* 80303ED4 7D 89 03 A6 */ mtctr r12
/* 80303ED8 4E 80 04 21 */ bctrl
lbl_80303EDC:
/* 80303EDC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80303EE0 7C 08 03 A6 */ mtlr r0
/* 80303EE4 38 21 00 10 */ addi r1, r1, 0x10
/* 80303EE8 4E 80 00 20 */ blr

23
asm/JSystem/J2DGraph/J2DPictureEx/changeTexture__12J2DPictureExFPCcUc.s
View File

@ -1,23 +0,0 @@
lbl_803060DC:
/* 803060DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 803060E0 7C 08 02 A6 */ mflr r0
/* 803060E4 90 01 00 14 */ stw r0, 0x14(r1)
/* 803060E8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 803060EC 93 C1 00 08 */ stw r30, 8(r1)
/* 803060F0 7C 7E 1B 78 */ mr r30, r3
/* 803060F4 7C BF 2B 78 */ mr r31, r5
/* 803060F8 7C 83 23 78 */ mr r3, r4
/* 803060FC 4B FF 35 45 */ bl getNameResource__9J2DScreenFPCc
/* 80306100 7C 64 1B 78 */ mr r4, r3
/* 80306104 7F C3 F3 78 */ mr r3, r30
/* 80306108 7F E5 FB 78 */ mr r5, r31
/* 8030610C 81 9E 00 00 */ lwz r12, 0(r30)
/* 80306110 81 8C 01 10 */ lwz r12, 0x110(r12)
/* 80306114 7D 89 03 A6 */ mtctr r12
/* 80306118 4E 80 04 21 */ bctrl
/* 8030611C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80306120 83 C1 00 08 */ lwz r30, 8(r1)
/* 80306124 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80306128 7C 08 03 A6 */ mtlr r0
/* 8030612C 38 21 00 10 */ addi r1, r1, 0x10
/* 80306130 4E 80 00 20 */ blr

25
asm/JSystem/J2DGraph/J2DPictureEx/changeTexture__12J2DPictureExFPCcUcP10JUTPalette.s
View File

@ -1,25 +0,0 @@
lbl_80306298:
/* 80306298 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8030629C 7C 08 02 A6 */ mflr r0
/* 803062A0 90 01 00 24 */ stw r0, 0x24(r1)
/* 803062A4 39 61 00 20 */ addi r11, r1, 0x20
/* 803062A8 48 05 BF 35 */ bl _savegpr_29
/* 803062AC 7C 7D 1B 78 */ mr r29, r3
/* 803062B0 7C BE 2B 78 */ mr r30, r5
/* 803062B4 7C DF 33 78 */ mr r31, r6
/* 803062B8 7C 83 23 78 */ mr r3, r4
/* 803062BC 4B FF 33 85 */ bl getNameResource__9J2DScreenFPCc
/* 803062C0 7C 64 1B 78 */ mr r4, r3
/* 803062C4 7F A3 EB 78 */ mr r3, r29
/* 803062C8 7F C5 F3 78 */ mr r5, r30
/* 803062CC 7F E6 FB 78 */ mr r6, r31
/* 803062D0 81 9D 00 00 */ lwz r12, 0(r29)
/* 803062D4 81 8C 01 18 */ lwz r12, 0x118(r12)
/* 803062D8 7D 89 03 A6 */ mtctr r12
/* 803062DC 4E 80 04 21 */ bctrl
/* 803062E0 39 61 00 20 */ addi r11, r1, 0x20
/* 803062E4 48 05 BF 45 */ bl _restgpr_29
/* 803062E8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 803062EC 7C 08 03 A6 */ mtlr r0
/* 803062F0 38 21 00 20 */ addi r1, r1, 0x20
/* 803062F4 4E 80 00 20 */ blr

24
asm/JSystem/J2DGraph/J2DPictureEx/drawFullSet__12J2DPictureExFffffPA3_A4_f.s
View File

@ -1,24 +0,0 @@
lbl_80303B80:
/* 80303B80 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80303B84 7C 08 02 A6 */ mflr r0
/* 80303B88 90 01 00 14 */ stw r0, 0x14(r1)
/* 80303B8C A8 03 01 18 */ lha r0, 0x118(r3)
/* 80303B90 90 01 00 08 */ stw r0, 8(r1)
/* 80303B94 90 81 00 0C */ stw r4, 0xc(r1)
/* 80303B98 C0 23 00 20 */ lfs f1, 0x20(r3)
/* 80303B9C C0 43 00 24 */ lfs f2, 0x24(r3)
/* 80303BA0 A8 83 01 0A */ lha r4, 0x10a(r3)
/* 80303BA4 A8 A3 01 0C */ lha r5, 0x10c(r3)
/* 80303BA8 A8 C3 01 0E */ lha r6, 0x10e(r3)
/* 80303BAC A8 E3 01 10 */ lha r7, 0x110(r3)
/* 80303BB0 A9 03 01 12 */ lha r8, 0x112(r3)
/* 80303BB4 A9 23 01 14 */ lha r9, 0x114(r3)
/* 80303BB8 A9 43 01 16 */ lha r10, 0x116(r3)
/* 80303BBC 81 83 00 00 */ lwz r12, 0(r3)
/* 80303BC0 81 8C 01 44 */ lwz r12, 0x144(r12)
/* 80303BC4 7D 89 03 A6 */ mtctr r12
/* 80303BC8 4E 80 04 21 */ bctrl
/* 80303BCC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80303BD0 7C 08 03 A6 */ mtlr r0
/* 80303BD4 38 21 00 10 */ addi r1, r1, 0x10
/* 80303BD8 4E 80 00 20 */ blr

53
asm/JSystem/J2DGraph/J2DPictureEx/drawSelf__12J2DPictureExFffPA3_A4_f.s
View File

@ -1,53 +0,0 @@
lbl_80303AB4:
/* 80303AB4 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 80303AB8 7C 08 02 A6 */ mflr r0
/* 80303ABC 90 01 00 34 */ stw r0, 0x34(r1)
/* 80303AC0 DB E1 00 20 */ stfd f31, 0x20(r1)
/* 80303AC4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */
/* 80303AC8 DB C1 00 10 */ stfd f30, 0x10(r1)
/* 80303ACC F3 C1 00 18 */ psq_st f30, 24(r1), 0, 0 /* qr0 */
/* 80303AD0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80303AD4 93 C1 00 08 */ stw r30, 8(r1)
/* 80303AD8 7C 7E 1B 78 */ mr r30, r3
/* 80303ADC FF C0 08 90 */ fmr f30, f1
/* 80303AE0 FF E0 10 90 */ fmr f31, f2
/* 80303AE4 7C 9F 23 78 */ mr r31, r4
/* 80303AE8 80 63 01 50 */ lwz r3, 0x150(r3)
/* 80303AEC 28 03 00 00 */ cmplwi r3, 0
/* 80303AF0 41 82 00 68 */ beq lbl_80303B58
/* 80303AF4 4B FE 68 99 */ bl setGX__11J2DMaterialFv
/* 80303AF8 48 05 7A 95 */ bl GXClearVtxDesc
/* 80303AFC 38 60 00 09 */ li r3, 9
/* 80303B00 38 80 00 01 */ li r4, 1
/* 80303B04 48 05 73 B5 */ bl GXSetVtxDesc
/* 80303B08 38 60 00 0B */ li r3, 0xb
/* 80303B0C 38 80 00 01 */ li r4, 1
/* 80303B10 48 05 73 A9 */ bl GXSetVtxDesc
/* 80303B14 38 60 00 0D */ li r3, 0xd
/* 80303B18 38 80 00 01 */ li r4, 1
/* 80303B1C 48 05 73 9D */ bl GXSetVtxDesc
/* 80303B20 7F C3 F3 78 */ mr r3, r30
/* 80303B24 FC 20 F0 90 */ fmr f1, f30
/* 80303B28 FC 40 F8 90 */ fmr f2, f31
/* 80303B2C C0 7E 00 28 */ lfs f3, 0x28(r30)
/* 80303B30 C0 1E 00 20 */ lfs f0, 0x20(r30)
/* 80303B34 EC 63 00 28 */ fsubs f3, f3, f0
/* 80303B38 C0 9E 00 2C */ lfs f4, 0x2c(r30)
/* 80303B3C C0 1E 00 24 */ lfs f0, 0x24(r30)
/* 80303B40 EC 84 00 28 */ fsubs f4, f4, f0
/* 80303B44 7F E4 FB 78 */ mr r4, r31
/* 80303B48 81 9E 00 00 */ lwz r12, 0(r30)
/* 80303B4C 81 8C 01 40 */ lwz r12, 0x140(r12)
/* 80303B50 7D 89 03 A6 */ mtctr r12
/* 80303B54 4E 80 04 21 */ bctrl
lbl_80303B58:
/* 80303B58 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */
/* 80303B5C CB E1 00 20 */ lfd f31, 0x20(r1)
/* 80303B60 E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 /* qr0 */
/* 80303B64 CB C1 00 10 */ lfd f30, 0x10(r1)
/* 80303B68 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80303B6C 83 C1 00 08 */ lwz r30, 8(r1)
/* 80303B70 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80303B74 7C 08 03 A6 */ mtlr r0
/* 80303B78 38 21 00 30 */ addi r1, r1, 0x30
/* 80303B7C 4E 80 00 20 */ blr

10
asm/JSystem/J2DGraph/J2DPictureEx/getTextureCount__12J2DPictureExCFv.s
View File

@ -1,10 +0,0 @@
lbl_80306350:
/* 80306350 80 63 01 50 */ lwz r3, 0x150(r3)
/* 80306354 28 03 00 00 */ cmplwi r3, 0
/* 80306358 40 82 00 0C */ bne lbl_80306364
/* 8030635C 38 60 00 00 */ li r3, 0
/* 80306360 4E 80 00 20 */ blr
lbl_80306364:
/* 80306364 80 03 00 28 */ lwz r0, 0x28(r3)
/* 80306368 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8030636C 4E 80 00 20 */ blr

26
asm/JSystem/J2DGraph/J2DPictureEx/getTexture__12J2DPictureExCFUc.s
View File

@ -1,26 +0,0 @@
lbl_803062F8:
/* 803062F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 803062FC 7C 08 02 A6 */ mflr r0
/* 80306300 90 01 00 14 */ stw r0, 0x14(r1)
/* 80306304 80 63 01 50 */ lwz r3, 0x150(r3)
/* 80306308 28 03 00 00 */ cmplwi r3, 0
/* 8030630C 40 82 00 0C */ bne lbl_80306318
/* 80306310 38 60 00 00 */ li r3, 0
/* 80306314 48 00 00 2C */ b lbl_80306340
lbl_80306318:
/* 80306318 80 63 00 70 */ lwz r3, 0x70(r3)
/* 8030631C 28 03 00 00 */ cmplwi r3, 0
/* 80306320 40 82 00 0C */ bne lbl_8030632C
/* 80306324 38 60 00 00 */ li r3, 0
/* 80306328 48 00 00 18 */ b lbl_80306340
lbl_8030632C:
/* 8030632C 54 84 06 3E */ clrlwi r4, r4, 0x18
/* 80306330 81 83 00 00 */ lwz r12, 0(r3)
/* 80306334 81 8C 00 A0 */ lwz r12, 0xa0(r12)
/* 80306338 7D 89 03 A6 */ mtctr r12
/* 8030633C 4E 80 04 21 */ bctrl
lbl_80306340:
/* 80306340 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80306344 7C 08 03 A6 */ mtlr r0
/* 80306348 38 21 00 10 */ addi r1, r1, 0x10
/* 8030634C 4E 80 00 20 */ blr

43
asm/JSystem/J2DGraph/J2DPictureEx/insert__12J2DPictureExFP10JUTTextureUcf.s
View File

@ -1,43 +0,0 @@
lbl_80304048:
/* 80304048 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8030404C 7C 08 02 A6 */ mflr r0
/* 80304050 90 01 00 24 */ stw r0, 0x24(r1)
/* 80304054 DB E1 00 18 */ stfd f31, 0x18(r1)
/* 80304058 39 61 00 18 */ addi r11, r1, 0x18
/* 8030405C 48 05 E1 81 */ bl _savegpr_29
/* 80304060 7C 7D 1B 78 */ mr r29, r3
/* 80304064 7C 9E 23 79 */ or. r30, r4, r4
/* 80304068 7C BF 2B 78 */ mr r31, r5
/* 8030406C FF E0 08 90 */ fmr f31, f1
/* 80304070 40 82 00 0C */ bne lbl_8030407C
/* 80304074 38 60 00 00 */ li r3, 0
/* 80304078 48 00 00 50 */ b lbl_803040C8
lbl_8030407C:
/* 8030407C 7F E4 FB 78 */ mr r4, r31
/* 80304080 48 00 02 FD */ bl isInsert__12J2DPictureExCFUc
/* 80304084 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80304088 40 82 00 0C */ bne lbl_80304094
/* 8030408C 38 60 00 00 */ li r3, 0
/* 80304090 48 00 00 38 */ b lbl_803040C8
lbl_80304094:
/* 80304094 7F A3 EB 78 */ mr r3, r29
/* 80304098 7F E4 FB 78 */ mr r4, r31
/* 8030409C FC 20 F8 90 */ fmr f1, f31
/* 803040A0 48 00 00 45 */ bl insertCommon__12J2DPictureExFUcf
/* 803040A4 80 7D 01 50 */ lwz r3, 0x150(r29)
/* 803040A8 80 63 00 70 */ lwz r3, 0x70(r3)
/* 803040AC 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 803040B0 7F C5 F3 78 */ mr r5, r30
/* 803040B4 81 83 00 00 */ lwz r12, 0(r3)
/* 803040B8 81 8C 00 80 */ lwz r12, 0x80(r12)
/* 803040BC 7D 89 03 A6 */ mtctr r12
/* 803040C0 4E 80 04 21 */ bctrl
/* 803040C4 38 60 00 01 */ li r3, 1
lbl_803040C8:
/* 803040C8 CB E1 00 18 */ lfd f31, 0x18(r1)
/* 803040CC 39 61 00 18 */ addi r11, r1, 0x18
/* 803040D0 48 05 E1 59 */ bl _restgpr_29
/* 803040D4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 803040D8 7C 08 03 A6 */ mtlr r0
/* 803040DC 38 21 00 20 */ addi r1, r1, 0x20
/* 803040E0 4E 80 00 20 */ blr

45
asm/JSystem/J2DGraph/J2DPictureEx/insert__12J2DPictureExFPC7ResTIMGP10JUTPaletteUcf.s
View File

@ -1,45 +0,0 @@
lbl_80303F34:
/* 80303F34 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80303F38 7C 08 02 A6 */ mflr r0
/* 80303F3C 90 01 00 24 */ stw r0, 0x24(r1)
/* 80303F40 DB E1 00 18 */ stfd f31, 0x18(r1)
/* 80303F44 39 61 00 18 */ addi r11, r1, 0x18
/* 80303F48 48 05 E2 91 */ bl _savegpr_28
/* 80303F4C 7C 7C 1B 78 */ mr r28, r3
/* 80303F50 7C 9D 23 79 */ or. r29, r4, r4
/* 80303F54 7C BE 2B 78 */ mr r30, r5
/* 80303F58 7C DF 33 78 */ mr r31, r6
/* 80303F5C FF E0 08 90 */ fmr f31, f1
/* 80303F60 40 82 00 0C */ bne lbl_80303F6C
/* 80303F64 38 60 00 00 */ li r3, 0
/* 80303F68 48 00 00 54 */ b lbl_80303FBC
lbl_80303F6C:
/* 80303F6C 7F E4 FB 78 */ mr r4, r31
/* 80303F70 48 00 04 0D */ bl isInsert__12J2DPictureExCFUc
/* 80303F74 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80303F78 40 82 00 0C */ bne lbl_80303F84
/* 80303F7C 38 60 00 00 */ li r3, 0
/* 80303F80 48 00 00 3C */ b lbl_80303FBC
lbl_80303F84:
/* 80303F84 7F 83 E3 78 */ mr r3, r28
/* 80303F88 7F E4 FB 78 */ mr r4, r31
/* 80303F8C FC 20 F8 90 */ fmr f1, f31
/* 80303F90 48 00 01 55 */ bl insertCommon__12J2DPictureExFUcf
/* 80303F94 80 7C 01 50 */ lwz r3, 0x150(r28)
/* 80303F98 80 63 00 70 */ lwz r3, 0x70(r3)
/* 80303F9C 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 80303FA0 7F A5 EB 78 */ mr r5, r29
/* 80303FA4 7F C6 F3 78 */ mr r6, r30
/* 80303FA8 81 83 00 00 */ lwz r12, 0(r3)
/* 80303FAC 81 8C 00 7C */ lwz r12, 0x7c(r12)
/* 80303FB0 7D 89 03 A6 */ mtctr r12
/* 80303FB4 4E 80 04 21 */ bctrl
/* 80303FB8 38 60 00 01 */ li r3, 1
lbl_80303FBC:
/* 80303FBC CB E1 00 18 */ lfd f31, 0x18(r1)
/* 80303FC0 39 61 00 18 */ addi r11, r1, 0x18
/* 80303FC4 48 05 E2 61 */ bl _restgpr_28
/* 80303FC8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80303FCC 7C 08 03 A6 */ mtlr r0
/* 80303FD0 38 21 00 20 */ addi r1, r1, 0x20
/* 80303FD4 4E 80 00 20 */ blr

29
asm/JSystem/J2DGraph/J2DPictureEx/insert__12J2DPictureExFPCcP10JUTPaletteUcf.s
View File

@ -1,29 +0,0 @@
lbl_80303FD8:
/* 80303FD8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80303FDC 7C 08 02 A6 */ mflr r0
/* 80303FE0 90 01 00 24 */ stw r0, 0x24(r1)
/* 80303FE4 DB E1 00 18 */ stfd f31, 0x18(r1)
/* 80303FE8 39 61 00 18 */ addi r11, r1, 0x18
/* 80303FEC 48 05 E1 F1 */ bl _savegpr_29
/* 80303FF0 7C 7D 1B 78 */ mr r29, r3
/* 80303FF4 7C BE 2B 78 */ mr r30, r5
/* 80303FF8 7C DF 33 78 */ mr r31, r6
/* 80303FFC FF E0 08 90 */ fmr f31, f1
/* 80304000 7C 83 23 78 */ mr r3, r4
/* 80304004 4B FF 56 3D */ bl getNameResource__9J2DScreenFPCc
/* 80304008 7C 64 1B 78 */ mr r4, r3
/* 8030400C 7F A3 EB 78 */ mr r3, r29
/* 80304010 7F C5 F3 78 */ mr r5, r30
/* 80304014 7F E6 FB 78 */ mr r6, r31
/* 80304018 FC 20 F8 90 */ fmr f1, f31
/* 8030401C 81 9D 00 00 */ lwz r12, 0(r29)
/* 80304020 81 8C 00 C8 */ lwz r12, 0xc8(r12)
/* 80304024 7D 89 03 A6 */ mtctr r12
/* 80304028 4E 80 04 21 */ bctrl
/* 8030402C CB E1 00 18 */ lfd f31, 0x18(r1)
/* 80304030 39 61 00 18 */ addi r11, r1, 0x18
/* 80304034 48 05 E1 F5 */ bl _restgpr_29
/* 80304038 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8030403C 7C 08 03 A6 */ mtlr r0
/* 80304040 38 21 00 20 */ addi r1, r1, 0x20
/* 80304044 4E 80 00 20 */ blr

68
asm/JSystem/J2DGraph/J2DPictureEx/isInsert__12J2DPictureExCFUc.s
View File

@ -1,68 +0,0 @@
lbl_8030437C:
/* 8030437C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80304380 7C 08 02 A6 */ mflr r0
/* 80304384 90 01 00 24 */ stw r0, 0x24(r1)
/* 80304388 39 61 00 20 */ addi r11, r1, 0x20
/* 8030438C 48 05 DE 51 */ bl _savegpr_29
/* 80304390 7C 7D 1B 78 */ mr r29, r3
/* 80304394 80 A3 01 50 */ lwz r5, 0x150(r3)
/* 80304398 28 05 00 00 */ cmplwi r5, 0
/* 8030439C 40 82 00 0C */ bne lbl_803043A8
/* 803043A0 38 60 00 00 */ li r3, 0
/* 803043A4 48 00 00 B0 */ b lbl_80304454
lbl_803043A8:
/* 803043A8 80 65 00 70 */ lwz r3, 0x70(r5)
/* 803043AC 28 03 00 00 */ cmplwi r3, 0
/* 803043B0 40 82 00 0C */ bne lbl_803043BC
/* 803043B4 38 60 00 00 */ li r3, 0
/* 803043B8 48 00 00 9C */ b lbl_80304454
lbl_803043BC:
/* 803043BC 80 05 00 28 */ lwz r0, 0x28(r5)
/* 803043C0 54 1E 06 3E */ clrlwi r30, r0, 0x18
/* 803043C4 28 1E 00 08 */ cmplwi r30, 8
/* 803043C8 40 80 00 18 */ bge lbl_803043E0
/* 803043CC 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 803043D0 28 00 00 08 */ cmplwi r0, 8
/* 803043D4 40 80 00 0C */ bge lbl_803043E0
/* 803043D8 7C 00 F0 40 */ cmplw r0, r30
/* 803043DC 40 81 00 0C */ ble lbl_803043E8
lbl_803043E0:
/* 803043E0 38 60 00 00 */ li r3, 0
/* 803043E4 48 00 00 70 */ b lbl_80304454
lbl_803043E8:
/* 803043E8 81 83 00 00 */ lwz r12, 0(r3)
/* 803043EC 81 8C 00 18 */ lwz r12, 0x18(r12)
/* 803043F0 7D 89 03 A6 */ mtctr r12
/* 803043F4 4E 80 04 21 */ bctrl
/* 803043F8 7C 7F 1B 78 */ mr r31, r3
/* 803043FC 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80304400 28 00 00 02 */ cmplwi r0, 2
/* 80304404 41 81 00 14 */ bgt lbl_80304418
/* 80304408 28 1E 00 00 */ cmplwi r30, 0
/* 8030440C 41 82 00 0C */ beq lbl_80304418
/* 80304410 38 60 00 00 */ li r3, 0
/* 80304414 48 00 00 40 */ b lbl_80304454
lbl_80304418:
/* 80304418 80 7D 01 50 */ lwz r3, 0x150(r29)
/* 8030441C 80 63 00 70 */ lwz r3, 0x70(r3)
/* 80304420 81 83 00 00 */ lwz r12, 0(r3)
/* 80304424 81 8C 00 58 */ lwz r12, 0x58(r12)
/* 80304428 7D 89 03 A6 */ mtctr r12
/* 8030442C 4E 80 04 21 */ bctrl
/* 80304430 54 63 06 3E */ clrlwi r3, r3, 0x18
/* 80304434 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 80304438 7C 00 18 40 */ cmplw r0, r3
/* 8030443C 40 82 00 14 */ bne lbl_80304450
/* 80304440 28 1E 00 00 */ cmplwi r30, 0
/* 80304444 41 82 00 0C */ beq lbl_80304450
/* 80304448 38 60 00 00 */ li r3, 0
/* 8030444C 48 00 00 08 */ b lbl_80304454
lbl_80304450:
/* 80304450 38 60 00 01 */ li r3, 1
lbl_80304454:
/* 80304454 39 61 00 20 */ addi r11, r1, 0x20
/* 80304458 48 05 DD D1 */ bl _restgpr_29
/* 8030445C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80304460 7C 08 03 A6 */ mtlr r0
/* 80304464 38 21 00 20 */ addi r1, r1, 0x20
/* 80304468 4E 80 00 20 */ blr

26
asm/JSystem/J2DGraph/J2DPictureEx/isRemove__12J2DPictureExCFUc.s
View File

@ -1,26 +0,0 @@
lbl_80304728:
/* 80304728 80 63 01 50 */ lwz r3, 0x150(r3)
/* 8030472C 28 03 00 00 */ cmplwi r3, 0
/* 80304730 40 82 00 0C */ bne lbl_8030473C
/* 80304734 38 60 00 00 */ li r3, 0
/* 80304738 4E 80 00 20 */ blr
lbl_8030473C:
/* 8030473C 80 03 00 70 */ lwz r0, 0x70(r3)
/* 80304740 28 00 00 00 */ cmplwi r0, 0
/* 80304744 40 82 00 0C */ bne lbl_80304750
/* 80304748 38 60 00 00 */ li r3, 0
/* 8030474C 4E 80 00 20 */ blr
lbl_80304750:
/* 80304750 80 03 00 28 */ lwz r0, 0x28(r3)
/* 80304754 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 80304758 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 8030475C 7C 03 00 40 */ cmplw r3, r0
/* 80304760 40 81 00 0C */ ble lbl_8030476C
/* 80304764 28 03 00 01 */ cmplwi r3, 1
/* 80304768 40 82 00 0C */ bne lbl_80304774
lbl_8030476C:
/* 8030476C 38 60 00 00 */ li r3, 0
/* 80304770 4E 80 00 20 */ blr
lbl_80304774:
/* 80304774 38 60 00 01 */ li r3, 1
/* 80304778 4E 80 00 20 */ blr

20
asm/JSystem/J2DGraph/J2DPictureEx/load__12J2DPictureExF11_GXTexMapIDUc.s
View File

@ -1,20 +0,0 @@
lbl_80305264:
/* 80305264 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80305268 7C 08 02 A6 */ mflr r0
/* 8030526C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80305270 80 63 01 50 */ lwz r3, 0x150(r3)
/* 80305274 28 03 00 00 */ cmplwi r3, 0
/* 80305278 41 82 00 24 */ beq lbl_8030529C
/* 8030527C 80 63 00 70 */ lwz r3, 0x70(r3)
/* 80305280 28 03 00 00 */ cmplwi r3, 0
/* 80305284 41 82 00 18 */ beq lbl_8030529C
/* 80305288 54 A5 06 3E */ clrlwi r5, r5, 0x18
/* 8030528C 81 83 00 00 */ lwz r12, 0(r3)
/* 80305290 81 8C 00 10 */ lwz r12, 0x10(r12)
/* 80305294 7D 89 03 A6 */ mtctr r12
/* 80305298 4E 80 04 21 */ bctrl
lbl_8030529C:
/* 8030529C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 803052A0 7C 08 03 A6 */ mtlr r0
/* 803052A4 38 21 00 10 */ addi r1, r1, 0x10
/* 803052A8 4E 80 00 20 */ blr

63
asm/JSystem/J2DGraph/J2DPictureEx/prepareTexture__12J2DPictureExFUc.s
View File

@ -1,63 +0,0 @@
lbl_803039CC:
/* 803039CC 94 21 FF 90 */ stwu r1, -0x70(r1)
/* 803039D0 7C 08 02 A6 */ mflr r0
/* 803039D4 90 01 00 74 */ stw r0, 0x74(r1)
/* 803039D8 39 61 00 70 */ addi r11, r1, 0x70
/* 803039DC 48 05 E7 FD */ bl _savegpr_28
/* 803039E0 7C 7C 1B 78 */ mr r28, r3
/* 803039E4 7C 9F 23 78 */ mr r31, r4
/* 803039E8 80 63 01 50 */ lwz r3, 0x150(r3)
/* 803039EC 80 63 00 70 */ lwz r3, 0x70(r3)
/* 803039F0 81 83 00 00 */ lwz r12, 0(r3)
/* 803039F4 81 8C 00 9C */ lwz r12, 0x9c(r12)
/* 803039F8 7D 89 03 A6 */ mtctr r12
/* 803039FC 4E 80 04 21 */ bctrl
/* 80303A00 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80303A04 40 82 00 0C */ bne lbl_80303A10
/* 80303A08 38 60 00 00 */ li r3, 0
/* 80303A0C 48 00 00 90 */ b lbl_80303A9C
lbl_80303A10:
/* 80303A10 3B A0 00 00 */ li r29, 0
/* 80303A14 3C 60 80 3A */ lis r3, j2dDefaultTexMtxInfo@ha /* 0x803A1BA0@ha */
/* 80303A18 3B C3 1B A0 */ addi r30, r3, j2dDefaultTexMtxInfo@l /* 0x803A1BA0@l */
/* 80303A1C 57 FF 06 3E */ clrlwi r31, r31, 0x18
/* 80303A20 48 00 00 6C */ b lbl_80303A8C
lbl_80303A24:
/* 80303A24 C0 1E 00 04 */ lfs f0, 4(r30)
/* 80303A28 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 80303A2C C0 1E 00 08 */ lfs f0, 8(r30)
/* 80303A30 D0 01 00 10 */ stfs f0, 0x10(r1)
/* 80303A34 C0 1E 00 0C */ lfs f0, 0xc(r30)
/* 80303A38 D0 01 00 14 */ stfs f0, 0x14(r1)
/* 80303A3C 88 1E 00 00 */ lbz r0, 0(r30)
/* 80303A40 98 01 00 08 */ stb r0, 8(r1)
/* 80303A44 88 1E 00 01 */ lbz r0, 1(r30)
/* 80303A48 98 01 00 09 */ stb r0, 9(r1)
/* 80303A4C C0 1E 00 10 */ lfs f0, 0x10(r30)
/* 80303A50 D0 01 00 18 */ stfs f0, 0x18(r1)
/* 80303A54 C0 1E 00 14 */ lfs f0, 0x14(r30)
/* 80303A58 D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 80303A5C C0 1E 00 18 */ lfs f0, 0x18(r30)
/* 80303A60 D0 01 00 20 */ stfs f0, 0x20(r1)
/* 80303A64 C0 1E 00 1C */ lfs f0, 0x1c(r30)
/* 80303A68 D0 01 00 24 */ stfs f0, 0x24(r1)
/* 80303A6C C0 1E 00 20 */ lfs f0, 0x20(r30)
/* 80303A70 D0 01 00 28 */ stfs f0, 0x28(r1)
/* 80303A74 80 7C 01 50 */ lwz r3, 0x150(r28)
/* 80303A78 38 63 00 28 */ addi r3, r3, 0x28
/* 80303A7C 57 A4 06 3E */ clrlwi r4, r29, 0x18
/* 80303A80 38 A1 00 08 */ addi r5, r1, 8
/* 80303A84 4B FE 7C 21 */ bl setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx
/* 80303A88 3B BD 00 01 */ addi r29, r29, 1
lbl_80303A8C:
/* 80303A8C 57 A0 06 3E */ clrlwi r0, r29, 0x18
/* 80303A90 7C 00 F8 40 */ cmplw r0, r31
/* 80303A94 41 80 FF 90 */ blt lbl_80303A24
/* 80303A98 38 60 00 01 */ li r3, 1
lbl_80303A9C:
/* 80303A9C 39 61 00 70 */ addi r11, r1, 0x70
/* 80303AA0 48 05 E7 85 */ bl _restgpr_28
/* 80303AA4 80 01 00 74 */ lwz r0, 0x74(r1)
/* 80303AA8 7C 08 03 A6 */ mtlr r0
/* 80303AAC 38 21 00 70 */ addi r1, r1, 0x70
/* 80303AB0 4E 80 00 20 */ blr

54
asm/JSystem/J2DGraph/J2DPictureEx/remove__12J2DPictureExFP10JUTTexture.s
View File

@ -1,54 +0,0 @@
lbl_8030466C:
/* 8030466C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80304670 7C 08 02 A6 */ mflr r0
/* 80304674 90 01 00 24 */ stw r0, 0x24(r1)
/* 80304678 39 61 00 20 */ addi r11, r1, 0x20
/* 8030467C 48 05 DB 5D */ bl _savegpr_28
/* 80304680 7C 7C 1B 78 */ mr r28, r3
/* 80304684 7C 9D 23 78 */ mr r29, r4
/* 80304688 80 63 01 50 */ lwz r3, 0x150(r3)
/* 8030468C 28 03 00 00 */ cmplwi r3, 0
/* 80304690 40 82 00 0C */ bne lbl_8030469C
/* 80304694 38 60 00 00 */ li r3, 0
/* 80304698 48 00 00 78 */ b lbl_80304710
lbl_8030469C:
/* 8030469C 80 03 00 70 */ lwz r0, 0x70(r3)
/* 803046A0 28 00 00 00 */ cmplwi r0, 0
/* 803046A4 40 82 00 0C */ bne lbl_803046B0
/* 803046A8 38 60 00 00 */ li r3, 0
/* 803046AC 48 00 00 64 */ b lbl_80304710
lbl_803046B0:
/* 803046B0 80 03 00 28 */ lwz r0, 0x28(r3)
/* 803046B4 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 803046B8 3B C0 00 00 */ li r30, 0
/* 803046BC 7C 1F 03 78 */ mr r31, r0
/* 803046C0 48 00 00 2C */ b lbl_803046EC
lbl_803046C4:
/* 803046C4 80 7C 01 50 */ lwz r3, 0x150(r28)
/* 803046C8 80 63 00 70 */ lwz r3, 0x70(r3)
/* 803046CC 57 C4 06 3E */ clrlwi r4, r30, 0x18
/* 803046D0 81 83 00 00 */ lwz r12, 0(r3)
/* 803046D4 81 8C 00 A0 */ lwz r12, 0xa0(r12)
/* 803046D8 7D 89 03 A6 */ mtctr r12
/* 803046DC 4E 80 04 21 */ bctrl
/* 803046E0 7C 03 E8 40 */ cmplw r3, r29
/* 803046E4 41 82 00 14 */ beq lbl_803046F8
/* 803046E8 3B DE 00 01 */ addi r30, r30, 1
lbl_803046EC:
/* 803046EC 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 803046F0 7C 00 F8 40 */ cmplw r0, r31
/* 803046F4 41 80 FF D0 */ blt lbl_803046C4
lbl_803046F8:
/* 803046F8 7F 83 E3 78 */ mr r3, r28
/* 803046FC 7F C4 F3 78 */ mr r4, r30
/* 80304700 81 9C 00 00 */ lwz r12, 0(r28)
/* 80304704 81 8C 00 D8 */ lwz r12, 0xd8(r12)
/* 80304708 7D 89 03 A6 */ mtctr r12
/* 8030470C 4E 80 04 21 */ bctrl
lbl_80304710:
/* 80304710 39 61 00 20 */ addi r11, r1, 0x20
/* 80304714 48 05 DB 11 */ bl _restgpr_28
/* 80304718 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8030471C 7C 08 03 A6 */ mtlr r0
/* 80304720 38 21 00 20 */ addi r1, r1, 0x20
/* 80304724 4E 80 00 20 */ blr

29
asm/JSystem/J2DGraph/J2DPictureEx/remove__12J2DPictureExFv.s
View File

@ -1,29 +0,0 @@
lbl_80304608:
/* 80304608 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8030460C 7C 08 02 A6 */ mflr r0
/* 80304610 90 01 00 14 */ stw r0, 0x14(r1)
/* 80304614 80 83 01 50 */ lwz r4, 0x150(r3)
/* 80304618 28 04 00 00 */ cmplwi r4, 0
/* 8030461C 40 82 00 0C */ bne lbl_80304628
/* 80304620 38 60 00 00 */ li r3, 0
/* 80304624 48 00 00 38 */ b lbl_8030465C
lbl_80304628:
/* 80304628 80 04 00 70 */ lwz r0, 0x70(r4)
/* 8030462C 28 00 00 00 */ cmplwi r0, 0
/* 80304630 40 82 00 0C */ bne lbl_8030463C
/* 80304634 38 60 00 00 */ li r3, 0
/* 80304638 48 00 00 24 */ b lbl_8030465C
lbl_8030463C:
/* 8030463C 80 04 00 28 */ lwz r0, 0x28(r4)
/* 80304640 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80304644 38 04 FF FF */ addi r0, r4, -1
/* 80304648 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8030464C 81 83 00 00 */ lwz r12, 0(r3)
/* 80304650 81 8C 00 D8 */ lwz r12, 0xd8(r12)
/* 80304654 7D 89 03 A6 */ mtctr r12
/* 80304658 4E 80 04 21 */ bctrl
lbl_8030465C:
/* 8030465C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80304660 7C 08 03 A6 */ mtlr r0
/* 80304664 38 21 00 10 */ addi r1, r1, 0x10
/* 80304668 4E 80 00 20 */ blr

130
asm/JSystem/J2DGraph/J2DPictureEx/setBlackWhite__12J2DPictureExFQ28JUtility6TColorQ28JUtility6TColor.s
View File

@ -1,130 +0,0 @@
lbl_80306480:
/* 80306480 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 80306484 7C 08 02 A6 */ mflr r0
/* 80306488 90 01 00 44 */ stw r0, 0x44(r1)
/* 8030648C 39 61 00 40 */ addi r11, r1, 0x40
/* 80306490 48 05 BD 41 */ bl _savegpr_26
/* 80306494 7C 7B 1B 78 */ mr r27, r3
/* 80306498 7C 9C 23 78 */ mr r28, r4
/* 8030649C 7C BD 2B 78 */ mr r29, r5
/* 803064A0 80 83 01 50 */ lwz r4, 0x150(r3)
/* 803064A4 28 04 00 00 */ cmplwi r4, 0
/* 803064A8 40 82 00 0C */ bne lbl_803064B4
/* 803064AC 38 60 00 00 */ li r3, 0
/* 803064B0 48 00 01 9C */ b lbl_8030664C
lbl_803064B4:
/* 803064B4 80 04 00 70 */ lwz r0, 0x70(r4)
/* 803064B8 28 00 00 00 */ cmplwi r0, 0
/* 803064BC 40 82 00 0C */ bne lbl_803064C8
/* 803064C0 38 60 00 00 */ li r3, 0
/* 803064C4 48 00 01 88 */ b lbl_8030664C
lbl_803064C8:
/* 803064C8 80 1D 00 00 */ lwz r0, 0(r29)
/* 803064CC 90 01 00 08 */ stw r0, 8(r1)
/* 803064D0 80 1C 00 00 */ lwz r0, 0(r28)
/* 803064D4 90 01 00 0C */ stw r0, 0xc(r1)
/* 803064D8 38 81 00 0C */ addi r4, r1, 0xc
/* 803064DC 38 A1 00 08 */ addi r5, r1, 8
/* 803064E0 48 00 03 45 */ bl isSetBlackWhite__12J2DPictureExCFQ28JUtility6TColorQ28JUtility6TColor
/* 803064E4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 803064E8 40 82 00 0C */ bne lbl_803064F4
/* 803064EC 38 60 00 00 */ li r3, 0
/* 803064F0 48 00 01 5C */ b lbl_8030664C
lbl_803064F4:
/* 803064F4 80 9B 01 50 */ lwz r4, 0x150(r27)
/* 803064F8 80 04 00 28 */ lwz r0, 0x28(r4)
/* 803064FC 54 1E 06 3E */ clrlwi r30, r0, 0x18
/* 80306500 3B E0 00 01 */ li r31, 1
/* 80306504 80 1C 00 00 */ lwz r0, 0(r28)
/* 80306508 28 00 00 00 */ cmplwi r0, 0
/* 8030650C 40 82 00 18 */ bne lbl_80306524
/* 80306510 80 7D 00 00 */ lwz r3, 0(r29)
/* 80306514 3C 03 00 01 */ addis r0, r3, 1
/* 80306518 28 00 FF FF */ cmplwi r0, 0xffff
/* 8030651C 40 82 00 08 */ bne lbl_80306524
/* 80306520 3B E0 00 00 */ li r31, 0
lbl_80306524:
/* 80306524 28 1E 00 01 */ cmplwi r30, 1
/* 80306528 40 82 00 1C */ bne lbl_80306544
/* 8030652C 57 E3 06 3E */ clrlwi r3, r31, 0x18
/* 80306530 30 03 FF FF */ addic r0, r3, -1
/* 80306534 7C 60 19 10 */ subfe r3, r0, r3
/* 80306538 38 03 00 01 */ addi r0, r3, 1
/* 8030653C 54 1A 06 3E */ clrlwi r26, r0, 0x18
/* 80306540 48 00 00 1C */ b lbl_8030655C
lbl_80306544:
/* 80306544 57 E3 06 3E */ clrlwi r3, r31, 0x18
/* 80306548 30 03 FF FF */ addic r0, r3, -1
/* 8030654C 7C 60 19 10 */ subfe r3, r0, r3
/* 80306550 38 03 00 01 */ addi r0, r3, 1
/* 80306554 7C 1E 02 14 */ add r0, r30, r0
/* 80306558 54 1A 06 3E */ clrlwi r26, r0, 0x18
lbl_8030655C:
/* 8030655C 80 64 00 70 */ lwz r3, 0x70(r4)
/* 80306560 7F 44 D3 78 */ mr r4, r26
/* 80306564 81 83 00 00 */ lwz r12, 0(r3)
/* 80306568 81 8C 00 54 */ lwz r12, 0x54(r12)
/* 8030656C 7D 89 03 A6 */ mtctr r12
/* 80306570 4E 80 04 21 */ bctrl
/* 80306574 7F 63 DB 78 */ mr r3, r27
/* 80306578 7F C4 F3 78 */ mr r4, r30
/* 8030657C 7F 45 D3 78 */ mr r5, r26
/* 80306580 7F E6 FB 78 */ mr r6, r31
/* 80306584 4B FF ED 29 */ bl setTevOrder__12J2DPictureExFUcUcb
/* 80306588 7F 63 DB 78 */ mr r3, r27
/* 8030658C 7F C4 F3 78 */ mr r4, r30
/* 80306590 7F 45 D3 78 */ mr r5, r26
/* 80306594 7F E6 FB 78 */ mr r6, r31
/* 80306598 4B FF EE 49 */ bl setTevStage__12J2DPictureExFUcUcb
/* 8030659C 7F 63 DB 78 */ mr r3, r27
/* 803065A0 7F C4 F3 78 */ mr r4, r30
/* 803065A4 4B FF F3 85 */ bl setTevKColor__12J2DPictureExFUc
/* 803065A8 7F 63 DB 78 */ mr r3, r27
/* 803065AC 7F C4 F3 78 */ mr r4, r30
/* 803065B0 4B FF F6 C1 */ bl setTevKColorSel__12J2DPictureExFUc
/* 803065B4 7F 63 DB 78 */ mr r3, r27
/* 803065B8 7F C4 F3 78 */ mr r4, r30
/* 803065BC 4B FF F7 5D */ bl setTevKAlphaSel__12J2DPictureExFUc
/* 803065C0 57 E0 06 3F */ clrlwi. r0, r31, 0x18
/* 803065C4 41 82 00 84 */ beq lbl_80306648
/* 803065C8 88 1C 00 00 */ lbz r0, 0(r28)
/* 803065CC 88 7C 00 01 */ lbz r3, 1(r28)
/* 803065D0 88 9C 00 02 */ lbz r4, 2(r28)
/* 803065D4 88 BC 00 03 */ lbz r5, 3(r28)
/* 803065D8 B0 01 00 18 */ sth r0, 0x18(r1)
/* 803065DC B0 61 00 1A */ sth r3, 0x1a(r1)
/* 803065E0 B0 81 00 1C */ sth r4, 0x1c(r1)
/* 803065E4 B0 A1 00 1E */ sth r5, 0x1e(r1)
/* 803065E8 80 7B 01 50 */ lwz r3, 0x150(r27)
/* 803065EC 80 63 00 70 */ lwz r3, 0x70(r3)
/* 803065F0 38 80 00 00 */ li r4, 0
/* 803065F4 38 A1 00 18 */ addi r5, r1, 0x18
/* 803065F8 81 83 00 00 */ lwz r12, 0(r3)
/* 803065FC 81 8C 00 34 */ lwz r12, 0x34(r12)
/* 80306600 7D 89 03 A6 */ mtctr r12
/* 80306604 4E 80 04 21 */ bctrl
/* 80306608 88 7D 00 01 */ lbz r3, 1(r29)
/* 8030660C 88 9D 00 02 */ lbz r4, 2(r29)
/* 80306610 88 BD 00 03 */ lbz r5, 3(r29)
/* 80306614 88 1D 00 00 */ lbz r0, 0(r29)
/* 80306618 B0 01 00 10 */ sth r0, 0x10(r1)
/* 8030661C B0 61 00 12 */ sth r3, 0x12(r1)
/* 80306620 B0 81 00 14 */ sth r4, 0x14(r1)
/* 80306624 B0 A1 00 16 */ sth r5, 0x16(r1)
/* 80306628 80 7B 01 50 */ lwz r3, 0x150(r27)
/* 8030662C 80 63 00 70 */ lwz r3, 0x70(r3)
/* 80306630 38 80 00 01 */ li r4, 1
/* 80306634 38 A1 00 10 */ addi r5, r1, 0x10
/* 80306638 81 83 00 00 */ lwz r12, 0(r3)
/* 8030663C 81 8C 00 34 */ lwz r12, 0x34(r12)
/* 80306640 7D 89 03 A6 */ mtctr r12
/* 80306644 4E 80 04 21 */ bctrl
lbl_80306648:
/* 80306648 38 60 00 01 */ li r3, 1
lbl_8030664C:
/* 8030664C 39 61 00 40 */ addi r11, r1, 0x40
/* 80306650 48 05 BB CD */ bl _restgpr_26
/* 80306654 80 01 00 44 */ lwz r0, 0x44(r1)
/* 80306658 7C 08 03 A6 */ mtlr r0
/* 8030665C 38 21 00 40 */ addi r1, r1, 0x40
/* 80306660 4E 80 00 20 */ blr

37
asm/JSystem/J2DGraph/J2DPictureEx/setBlack__12J2DPictureExFQ28JUtility6TColor.s
View File

@ -1,37 +0,0 @@
lbl_80306370:
/* 80306370 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80306374 7C 08 02 A6 */ mflr r0
/* 80306378 90 01 00 24 */ stw r0, 0x24(r1)
/* 8030637C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80306380 93 C1 00 18 */ stw r30, 0x18(r1)
/* 80306384 7C 7E 1B 78 */ mr r30, r3
/* 80306388 7C 9F 23 78 */ mr r31, r4
/* 8030638C 38 00 FF FF */ li r0, -1
/* 80306390 90 01 00 14 */ stw r0, 0x14(r1)
/* 80306394 90 01 00 10 */ stw r0, 0x10(r1)
/* 80306398 38 81 00 14 */ addi r4, r1, 0x14
/* 8030639C 38 A1 00 10 */ addi r5, r1, 0x10
/* 803063A0 48 00 02 C5 */ bl getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor
/* 803063A4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 803063A8 40 82 00 0C */ bne lbl_803063B4
/* 803063AC 38 60 00 00 */ li r3, 0
/* 803063B0 48 00 00 30 */ b lbl_803063E0
lbl_803063B4:
/* 803063B4 80 01 00 10 */ lwz r0, 0x10(r1)
/* 803063B8 90 01 00 08 */ stw r0, 8(r1)
/* 803063BC 80 1F 00 00 */ lwz r0, 0(r31)
/* 803063C0 90 01 00 0C */ stw r0, 0xc(r1)
/* 803063C4 7F C3 F3 78 */ mr r3, r30
/* 803063C8 38 81 00 0C */ addi r4, r1, 0xc
/* 803063CC 38 A1 00 08 */ addi r5, r1, 8
/* 803063D0 81 9E 00 00 */ lwz r12, 0(r30)
/* 803063D4 81 8C 01 30 */ lwz r12, 0x130(r12)
/* 803063D8 7D 89 03 A6 */ mtctr r12
/* 803063DC 4E 80 04 21 */ bctrl
lbl_803063E0:
/* 803063E0 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 803063E4 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 803063E8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 803063EC 7C 08 03 A6 */ mtlr r0
/* 803063F0 38 21 00 20 */ addi r1, r1, 0x20
/* 803063F4 4E 80 00 20 */ blr

47
asm/JSystem/J2DGraph/J2DPictureEx/setTevKAlphaSel__12J2DPictureExFUc.s
View File

@ -1,47 +0,0 @@
lbl_80305D18:
/* 80305D18 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80305D1C 7C 08 02 A6 */ mflr r0
/* 80305D20 90 01 00 24 */ stw r0, 0x24(r1)
/* 80305D24 39 61 00 20 */ addi r11, r1, 0x20
/* 80305D28 48 05 C4 B5 */ bl _savegpr_29
/* 80305D2C 7C 7D 1B 78 */ mr r29, r3
/* 80305D30 3B C0 00 00 */ li r30, 0
/* 80305D34 54 9F 06 3E */ clrlwi r31, r4, 0x18
/* 80305D38 48 00 00 64 */ b lbl_80305D9C
lbl_80305D3C:
/* 80305D3C 57 C4 06 3E */ clrlwi r4, r30, 0x18
/* 80305D40 28 04 00 04 */ cmplwi r4, 4
/* 80305D44 40 80 00 2C */ bge lbl_80305D70
/* 80305D48 80 7D 01 50 */ lwz r3, 0x150(r29)
/* 80305D4C 80 63 00 70 */ lwz r3, 0x70(r3)
/* 80305D50 57 C0 15 BA */ rlwinm r0, r30, 2, 0x16, 0x1d
/* 80305D54 20 00 00 1D */ subfic r0, r0, 0x1d
/* 80305D58 54 05 06 3E */ clrlwi r5, r0, 0x18
/* 80305D5C 81 83 00 00 */ lwz r12, 0(r3)
/* 80305D60 81 8C 00 4C */ lwz r12, 0x4c(r12)
/* 80305D64 7D 89 03 A6 */ mtctr r12
/* 80305D68 4E 80 04 21 */ bctrl
/* 80305D6C 48 00 00 2C */ b lbl_80305D98
lbl_80305D70:
/* 80305D70 80 7D 01 50 */ lwz r3, 0x150(r29)
/* 80305D74 80 63 00 70 */ lwz r3, 0x70(r3)
/* 80305D78 38 04 FF FC */ addi r0, r4, -4
/* 80305D7C 54 00 10 3A */ slwi r0, r0, 2
/* 80305D80 20 00 00 1C */ subfic r0, r0, 0x1c
/* 80305D84 54 05 06 3E */ clrlwi r5, r0, 0x18
/* 80305D88 81 83 00 00 */ lwz r12, 0(r3)
/* 80305D8C 81 8C 00 4C */ lwz r12, 0x4c(r12)
/* 80305D90 7D 89 03 A6 */ mtctr r12
/* 80305D94 4E 80 04 21 */ bctrl
lbl_80305D98:
/* 80305D98 3B DE 00 01 */ addi r30, r30, 1
lbl_80305D9C:
/* 80305D9C 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 80305DA0 7C 00 F8 40 */ cmplw r0, r31
/* 80305DA4 41 80 FF 98 */ blt lbl_80305D3C
/* 80305DA8 39 61 00 20 */ addi r11, r1, 0x20
/* 80305DAC 48 05 C4 7D */ bl _restgpr_29
/* 80305DB0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80305DB4 7C 08 03 A6 */ mtlr r0
/* 80305DB8 38 21 00 20 */ addi r1, r1, 0x20
/* 80305DBC 4E 80 00 20 */ blr

47
asm/JSystem/J2DGraph/J2DPictureEx/setTevKColorSel__12J2DPictureExFUc.s
View File

@ -1,47 +0,0 @@
lbl_80305C70:
/* 80305C70 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80305C74 7C 08 02 A6 */ mflr r0
/* 80305C78 90 01 00 24 */ stw r0, 0x24(r1)
/* 80305C7C 39 61 00 20 */ addi r11, r1, 0x20
/* 80305C80 48 05 C5 5D */ bl _savegpr_29
/* 80305C84 7C 7D 1B 78 */ mr r29, r3
/* 80305C88 3B C0 00 00 */ li r30, 0
/* 80305C8C 54 9F 06 3E */ clrlwi r31, r4, 0x18
/* 80305C90 48 00 00 64 */ b lbl_80305CF4
lbl_80305C94:
/* 80305C94 57 C4 06 3E */ clrlwi r4, r30, 0x18
/* 80305C98 28 04 00 04 */ cmplwi r4, 4
/* 80305C9C 40 80 00 2C */ bge lbl_80305CC8
/* 80305CA0 80 7D 01 50 */ lwz r3, 0x150(r29)
/* 80305CA4 80 63 00 70 */ lwz r3, 0x70(r3)
/* 80305CA8 57 C0 15 BA */ rlwinm r0, r30, 2, 0x16, 0x1d
/* 80305CAC 20 00 00 1F */ subfic r0, r0, 0x1f
/* 80305CB0 54 05 06 3E */ clrlwi r5, r0, 0x18
/* 80305CB4 81 83 00 00 */ lwz r12, 0(r3)
/* 80305CB8 81 8C 00 44 */ lwz r12, 0x44(r12)
/* 80305CBC 7D 89 03 A6 */ mtctr r12
/* 80305CC0 4E 80 04 21 */ bctrl
/* 80305CC4 48 00 00 2C */ b lbl_80305CF0
lbl_80305CC8:
/* 80305CC8 80 7D 01 50 */ lwz r3, 0x150(r29)
/* 80305CCC 80 63 00 70 */ lwz r3, 0x70(r3)
/* 80305CD0 38 04 FF FC */ addi r0, r4, -4
/* 80305CD4 54 00 10 3A */ slwi r0, r0, 2
/* 80305CD8 20 00 00 1E */ subfic r0, r0, 0x1e
/* 80305CDC 54 05 06 3E */ clrlwi r5, r0, 0x18
/* 80305CE0 81 83 00 00 */ lwz r12, 0(r3)
/* 80305CE4 81 8C 00 44 */ lwz r12, 0x44(r12)
/* 80305CE8 7D 89 03 A6 */ mtctr r12
/* 80305CEC 4E 80 04 21 */ bctrl
lbl_80305CF0:
/* 80305CF0 3B DE 00 01 */ addi r30, r30, 1
lbl_80305CF4:
/* 80305CF4 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 80305CF8 7C 00 F8 40 */ cmplw r0, r31
/* 80305CFC 41 80 FF 98 */ blt lbl_80305C94
/* 80305D00 39 61 00 20 */ addi r11, r1, 0x20
/* 80305D04 48 05 C5 25 */ bl _restgpr_29
/* 80305D08 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80305D0C 7C 08 03 A6 */ mtlr r0
/* 80305D10 38 21 00 20 */ addi r1, r1, 0x20
/* 80305D14 4E 80 00 20 */ blr

37
asm/JSystem/J2DGraph/J2DPictureEx/setWhite__12J2DPictureExFQ28JUtility6TColor.s
View File

@ -1,37 +0,0 @@
lbl_803063F8:
/* 803063F8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 803063FC 7C 08 02 A6 */ mflr r0
/* 80306400 90 01 00 24 */ stw r0, 0x24(r1)
/* 80306404 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80306408 93 C1 00 18 */ stw r30, 0x18(r1)
/* 8030640C 7C 7E 1B 78 */ mr r30, r3
/* 80306410 7C 9F 23 78 */ mr r31, r4
/* 80306414 38 00 FF FF */ li r0, -1
/* 80306418 90 01 00 14 */ stw r0, 0x14(r1)
/* 8030641C 90 01 00 10 */ stw r0, 0x10(r1)
/* 80306420 38 81 00 14 */ addi r4, r1, 0x14
/* 80306424 38 A1 00 10 */ addi r5, r1, 0x10
/* 80306428 48 00 02 3D */ bl getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor
/* 8030642C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80306430 40 82 00 0C */ bne lbl_8030643C
/* 80306434 38 60 00 00 */ li r3, 0
/* 80306438 48 00 00 30 */ b lbl_80306468
lbl_8030643C:
/* 8030643C 80 1F 00 00 */ lwz r0, 0(r31)
/* 80306440 90 01 00 08 */ stw r0, 8(r1)
/* 80306444 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80306448 90 01 00 0C */ stw r0, 0xc(r1)
/* 8030644C 7F C3 F3 78 */ mr r3, r30
/* 80306450 38 81 00 0C */ addi r4, r1, 0xc
/* 80306454 38 A1 00 08 */ addi r5, r1, 8
/* 80306458 81 9E 00 00 */ lwz r12, 0(r30)
/* 8030645C 81 8C 01 30 */ lwz r12, 0x130(r12)
/* 80306460 7D 89 03 A6 */ mtctr r12
/* 80306464 4E 80 04 21 */ bctrl
lbl_80306468:
/* 80306468 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8030646C 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 80306470 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80306474 7C 08 03 A6 */ mtlr r0
/* 80306478 38 21 00 20 */ addi r1, r1, 0x20
/* 8030647C 4E 80 00 20 */ blr

85
asm/JSystem/J2DGraph/J2DPictureEx/shiftSetBlendRatio__12J2DPictureExFUcfbb.s
View File

@ -1,85 +0,0 @@
lbl_80305DC0:
/* 80305DC0 54 A0 06 3F */ clrlwi. r0, r5, 0x18
/* 80305DC4 41 82 00 0C */ beq lbl_80305DD0
/* 80305DC8 38 E3 01 1C */ addi r7, r3, 0x11c
/* 80305DCC 48 00 00 08 */ b lbl_80305DD4
lbl_80305DD0:
/* 80305DD0 38 E3 01 24 */ addi r7, r3, 0x124
lbl_80305DD4:
/* 80305DD4 54 A0 06 3F */ clrlwi. r0, r5, 0x18
/* 80305DD8 41 82 00 0C */ beq lbl_80305DE4
/* 80305DDC 38 A3 01 60 */ addi r5, r3, 0x160
/* 80305DE0 48 00 00 08 */ b lbl_80305DE8
lbl_80305DE4:
/* 80305DE4 38 A3 01 78 */ addi r5, r3, 0x178
lbl_80305DE8:
/* 80305DE8 54 C0 06 3F */ clrlwi. r0, r6, 0x18
/* 80305DEC 41 82 00 88 */ beq lbl_80305E74
/* 80305DF0 39 20 00 07 */ li r9, 7
/* 80305DF4 38 60 00 1C */ li r3, 0x1c
/* 80305DF8 54 88 06 3E */ clrlwi r8, r4, 0x18
/* 80305DFC 20 08 00 07 */ subfic r0, r8, 7
/* 80305E00 7C 09 03 A6 */ mtctr r0
/* 80305E04 2C 08 00 07 */ cmpwi r8, 7
/* 80305E08 40 80 00 44 */ bge lbl_80305E4C
lbl_80305E0C:
/* 80305E0C 2C 09 00 02 */ cmpwi r9, 2
/* 80305E10 40 81 00 14 */ ble lbl_80305E24
/* 80305E14 7C C5 1A 14 */ add r6, r5, r3
/* 80305E18 C0 06 FF F4 */ lfs f0, -0xc(r6)
/* 80305E1C D0 06 FF F8 */ stfs f0, -8(r6)
/* 80305E20 48 00 00 20 */ b lbl_80305E40
lbl_80305E24:
/* 80305E24 40 82 00 10 */ bne lbl_80305E34
/* 80305E28 C0 07 00 04 */ lfs f0, 4(r7)
/* 80305E2C D0 05 00 00 */ stfs f0, 0(r5)
/* 80305E30 48 00 00 10 */ b lbl_80305E40
lbl_80305E34:
/* 80305E34 7C C7 1A 14 */ add r6, r7, r3
/* 80305E38 C0 06 FF FC */ lfs f0, -4(r6)
/* 80305E3C D0 06 00 00 */ stfs f0, 0(r6)
lbl_80305E40:
/* 80305E40 39 29 FF FF */ addi r9, r9, -1
/* 80305E44 38 63 FF FC */ addi r3, r3, -4
/* 80305E48 42 00 FF C4 */ bdnz lbl_80305E0C
lbl_80305E4C:
/* 80305E4C 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 80305E50 28 00 00 02 */ cmplwi r0, 2
/* 80305E54 41 80 00 14 */ blt lbl_80305E68
/* 80305E58 55 00 10 3A */ slwi r0, r8, 2
/* 80305E5C 7C 65 02 14 */ add r3, r5, r0
/* 80305E60 D0 23 FF F8 */ stfs f1, -8(r3)
/* 80305E64 4E 80 00 20 */ blr
lbl_80305E68:
/* 80305E68 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d
/* 80305E6C 7C 27 05 2E */ stfsx f1, r7, r0
/* 80305E70 4E 80 00 20 */ blr
lbl_80305E74:
/* 80305E74 54 83 06 3E */ clrlwi r3, r4, 0x18
/* 80305E78 38 C3 00 01 */ addi r6, r3, 1
/* 80305E7C 54 C3 10 3A */ slwi r3, r6, 2
/* 80305E80 20 06 00 08 */ subfic r0, r6, 8
/* 80305E84 7C 09 03 A6 */ mtctr r0
/* 80305E88 2C 06 00 08 */ cmpwi r6, 8
/* 80305E8C 4C 80 00 20 */ bgelr
lbl_80305E90:
/* 80305E90 2C 06 00 02 */ cmpwi r6, 2
/* 80305E94 40 81 00 14 */ ble lbl_80305EA8
/* 80305E98 7C 85 1A 14 */ add r4, r5, r3
/* 80305E9C C0 04 FF F8 */ lfs f0, -8(r4)
/* 80305EA0 D0 04 FF F4 */ stfs f0, -0xc(r4)
/* 80305EA4 48 00 00 20 */ b lbl_80305EC4
lbl_80305EA8:
/* 80305EA8 40 82 00 10 */ bne lbl_80305EB8
/* 80305EAC C0 05 00 00 */ lfs f0, 0(r5)
/* 80305EB0 D0 07 00 04 */ stfs f0, 4(r7)
/* 80305EB4 48 00 00 10 */ b lbl_80305EC4
lbl_80305EB8:
/* 80305EB8 7C 87 1A 14 */ add r4, r7, r3
/* 80305EBC C0 04 00 00 */ lfs f0, 0(r4)
/* 80305EC0 D0 04 FF FC */ stfs f0, -4(r4)
lbl_80305EC4:
/* 80305EC4 38 C6 00 01 */ addi r6, r6, 1
/* 80305EC8 38 63 00 04 */ addi r3, r3, 4
/* 80305ECC 42 00 FF C4 */ bdnz lbl_80305E90
/* 80305ED0 4E 80 00 20 */ blr

50
include/JSystem/J2DGraph/J2DPicture.h
View File

@ -28,7 +28,8 @@ struct J2DScrnBlockPictureParameter {
/* 0x00 */ u16 field_0x0;
/* 0x02 */ u16 mMaterialNum;
/* 0x04 */ u16 field_0x4;
/* 0x04 */ u8 field_0x6[10];
/* 0x06 */ u16 field_0x6;
/* 0x08 */ u16 field_0x8[4];
/* 0x10 */ JGeometry::TVec2<s16> field_0x10[4];
/* 0x20 */ u32 mCornerColor[4];
}; // Size: 0x30
@ -44,24 +45,24 @@ public:
/* 802FF65C */ virtual void rewriteAlpha();
/* 802FCCDC */ virtual void initiate(ResTIMG const*, ResTLUT const*);
/* 802FD098 */ virtual bool prepareTexture(u8);
/* 801BDD40 */ virtual void append(ResTIMG const*, f32);
/* 802FF238 */ virtual void append(ResTIMG const*, JUTPalette*, f32);
/* 80020338 */ virtual void append(char const*, f32);
/* 802FF2F0 */ virtual void append(char const*, JUTPalette*, f32);
/* 802FF208 */ virtual void append(JUTTexture*, f32);
/* 801BDD40 */ virtual bool append(ResTIMG const*, f32);
/* 802FF238 */ virtual bool append(ResTIMG const*, JUTPalette*, f32);
/* 80020338 */ virtual bool append(char const*, f32);
/* 802FF2F0 */ virtual bool append(char const*, JUTPalette*, f32);
/* 802FF208 */ virtual bool append(JUTTexture*, f32);
/* 802FF3E0 */ virtual void prepend(ResTIMG const*, f32);
/* 802FF3B0 */ virtual void prepend(ResTIMG const*, JUTPalette*, f32);
/* 802FF380 */ virtual void prepend(char const*, f32);
/* 802FF350 */ virtual void prepend(char const*, JUTPalette*, f32);
/* 802FF320 */ virtual void prepend(JUTTexture*, f32);
/* 801BDD70 */ virtual void insert(ResTIMG const*, u8, f32);
/* 802FD168 */ virtual void insert(ResTIMG const*, JUTPalette*, u8, f32);
/* 802FD168 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
/* 80020368 */ virtual void insert(char const*, u8, f32);
/* 802FD4B4 */ virtual void insert(char const*, JUTPalette*, u8, f32);
/* 802FD524 */ virtual void insert(JUTTexture*, u8, f32);
/* 802FD6F4 */ virtual int remove(u8);
/* 802FF410 */ virtual int remove();
/* 802FD814 */ virtual void remove(JUTTexture*);
/* 802FD4B4 */ virtual bool insert(char const*, JUTPalette*, u8, f32);
/* 802FD524 */ virtual bool insert(JUTTexture*, u8, f32);
/* 802FD6F4 */ virtual bool remove(u8);
/* 802FF410 */ virtual bool remove();
/* 802FD814 */ virtual bool remove(JUTTexture*);
/* 802FF4E0 */ virtual void draw(f32, f32, bool, bool, bool);
/* 802FF448 */ virtual void draw(f32, f32, u8, bool, bool, bool);
/* 802FDC70 */ virtual void draw(f32, f32, f32, f32, bool, bool, bool);
@ -73,22 +74,22 @@ public:
/* 800202CC */ virtual void setBlendRatio(f32, f32);
/* 802FEA74 */ virtual void setBlendColorRatio(f32, f32);
/* 802FEA9C */ virtual void setBlendAlphaRatio(f32, f32);
/* 802FD874 */ virtual void changeTexture(ResTIMG const*, u8);
/* 802FD964 */ virtual void changeTexture(char const*, u8);
/* 802FD9BC */ virtual void changeTexture(ResTIMG const*, u8, JUTPalette*);
/* 802FDAC8 */ virtual void changeTexture(char const*, u8, JUTPalette*);
/* 800539DC */ virtual void getTexture(u8) const;
/* 802FD874 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
/* 802FD964 */ virtual const ResTIMG* changeTexture(char const*, u8);
/* 802FD9BC */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
/* 802FDAC8 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
/* 800539DC */ virtual JUTTexture* getTexture(u8) const;
/* 802FF634 */ virtual u8 getTextureCount() const;
/* 80053C6C */ virtual void setBlack(JUtility::TColor);
/* 80053C44 */ virtual void setWhite(JUtility::TColor);
/* 8018BEE0 */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 80053C6C */ virtual bool setBlack(JUtility::TColor);
/* 80053C44 */ virtual bool setWhite(JUtility::TColor);
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 801DFA4C */ virtual JUtility::TColor getBlack() const;
/* 801DFA40 */ virtual JUtility::TColor getWhite() const;
/* 8025603C */ virtual bool getMaterial() const;
/* 802FDBFC */ virtual void drawFullSet(f32, f32, f32, f32, Mtx*);
/* 802FE380 */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
s16, Mtx*);
/* 802FF100 */ virtual void getUsableTlut(u8);
/* 802FF100 */ virtual u8 getUsableTlut(u8);
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
/* 802FC708 */ J2DPicture(ResTIMG const*);
@ -106,7 +107,7 @@ public:
/* 802FED84 */ void setTexCoord(JGeometry::TVec2<s16>*, JUTTexture const*, J2DBinding,
J2DMirror, bool);
/* 802FED44 */ void setTexCoord(JUTTexture const*, J2DBinding, J2DMirror, bool);
/* 802FF1D0 */ u8 getTlutID(ResTIMG const*, u8);
/* 802FF1D0 */ GXTlut getTlutID(ResTIMG const*, u8);
void setCornerColor(JUtility::TColor c0, JUtility::TColor c1, JUtility::TColor c2,
JUtility::TColor c3) {
@ -116,12 +117,13 @@ public:
mCornerColor[3] = c3;
}
private:
protected:
/* 0x100 */ JUTTexture* mTexture[2];
/* 0x108 */ u8 mTextureCount;
/* 0x109 */ u8 field_0x109;
/* 0x10A */ JGeometry::TVec2<s16> field_0x10a[4];
/* 0x11C */ f32 field_0x11c[4];
/* 0x11C */ f32 field_0x11c[2];
/* 0x124 */ f32 field_0x124[2];
/* 0x12C */ JUTPalette* mPalette;
/* 0x130 */ JUtility::TColor mWhite;
/* 0x134 */ JUtility::TColor mBlack;

52
include/JSystem/J2DGraph/J2DPictureEx.h
View File

@ -13,8 +13,8 @@ public:
/* 803036EC */ J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
/* 803040E4 */ void insertCommon(u8, f32);
/* 8030437C */ void isInsert(u8) const;
/* 80304728 */ void isRemove(u8) const;
/* 8030437C */ bool isInsert(u8) const;
/* 80304728 */ bool isRemove(u8) const;
/* 803052AC */ void setTevOrder(u8, u8, bool);
/* 803053E0 */ void setTevStage(u8, u8, bool);
/* 80305688 */ void setStage(J2DTevStage*, J2DPictureEx::stage_enum);
@ -22,8 +22,8 @@ public:
/* 80305C70 */ void setTevKColorSel(u8);
/* 80305D18 */ void setTevKAlphaSel(u8);
/* 80305DC0 */ void shiftSetBlendRatio(u8, f32, bool, bool);
/* 80306664 */ void getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
/* 80306824 */ void isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
/* 80306664 */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
/* 80306824 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
/* 8030393C */ virtual ~J2DPictureEx();
/* 80307168 */ virtual void setCullBack(bool);
@ -43,25 +43,25 @@ public:
/* 80306B7C */ virtual void setAnimation(J2DAnmVtxColor*);
/* 80306C70 */ virtual void animationPane(J2DAnmTransform const*);
/* 80303640 */ virtual void initiate(ResTIMG const*, ResTLUT const*);
/* 803039CC */ virtual void prepareTexture(u8);
/* 80306ED4 */ virtual void append(ResTIMG const*, f32);
/* 80303E5C */ virtual void append(ResTIMG const*, JUTPalette*, f32);
/* 80306F04 */ virtual void append(char const*, f32);
/* 80303EA4 */ virtual void append(char const*, JUTPalette*, f32);
/* 80303EEC */ virtual void append(JUTTexture*, f32);
/* 803039CC */ virtual bool prepareTexture(u8);
/* 80306ED4 */ virtual bool append(ResTIMG const*, f32);
/* 80303E5C */ virtual bool append(ResTIMG const*, JUTPalette*, f32);
/* 80306F04 */ virtual bool append(char const*, f32);
/* 80303EA4 */ virtual bool append(char const*, JUTPalette*, f32);
/* 80303EEC */ virtual bool append(JUTTexture*, f32);
/* 80306FF4 */ virtual void prepend(ResTIMG const*, f32);
/* 80306FC4 */ virtual void prepend(ResTIMG const*, JUTPalette*, f32);
/* 80306F94 */ virtual void prepend(char const*, f32);
/* 80306F64 */ virtual void prepend(char const*, JUTPalette*, f32);
/* 80306F34 */ virtual void prepend(JUTTexture*, f32);
/* 80307058 */ virtual void insert(ResTIMG const*, u8, f32);
/* 80303F34 */ virtual void insert(ResTIMG const*, JUTPalette*, u8, f32);
/* 80303F34 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
/* 80307024 */ virtual void insert(char const*, u8, f32);
/* 80303FD8 */ virtual void insert(char const*, JUTPalette*, u8, f32);
/* 80304048 */ virtual void insert(JUTTexture*, u8, f32);
/* 8030446C */ virtual void remove(u8);
/* 80304608 */ virtual void remove();
/* 8030466C */ virtual void remove(JUTTexture*);
/* 80303FD8 */ virtual bool insert(char const*, JUTPalette*, u8, f32);
/* 80304048 */ virtual bool insert(JUTTexture*, u8, f32);
/* 8030446C */ virtual bool remove(u8);
/* 80304608 */ virtual bool remove();
/* 8030466C */ virtual bool remove(JUTTexture*);
/* 8030708C */ virtual void draw(f32, f32, bool, bool, bool);
/* 8030477C */ virtual void draw(f32, f32, u8, bool, bool, bool);
/* 80304890 */ virtual void draw(f32, f32, f32, f32, bool, bool, bool);
@ -72,22 +72,22 @@ public:
/* 80307134 */ virtual void load(u8);
/* 80305ED4 */ virtual void setBlendColorRatio(f32, f32);
/* 80305F34 */ virtual void setBlendAlphaRatio(f32, f32);
/* 80305F94 */ virtual void changeTexture(ResTIMG const*, u8);
/* 803060DC */ virtual void changeTexture(char const*, u8);
/* 80306134 */ virtual void changeTexture(ResTIMG const*, u8, JUTPalette*);
/* 80306298 */ virtual void changeTexture(char const*, u8, JUTPalette*);
/* 803062F8 */ virtual void getTexture(u8) const;
/* 80306350 */ virtual void getTextureCount() const;
/* 80306370 */ virtual void setBlack(JUtility::TColor);
/* 803063F8 */ virtual void setWhite(JUtility::TColor);
/* 80306480 */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 80305F94 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
/* 803060DC */ virtual const ResTIMG* changeTexture(char const*, u8);
/* 80306134 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
/* 80306298 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
/* 803062F8 */ virtual JUTTexture* getTexture(u8) const;
/* 80306350 */ virtual u8 getTextureCount() const;
/* 80306370 */ virtual bool setBlack(JUtility::TColor);
/* 803063F8 */ virtual bool setWhite(JUtility::TColor);
/* 80306480 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 803068F8 */ virtual void getBlack() const;
/* 80306958 */ virtual void getWhite() const;
/* 80256034 */ virtual void getMaterial() const;
/* 80303B80 */ virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]);
/* 80303BDC */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
s16, f32 (*)[3][4]);
/* 80306DC8 */ virtual void getUsableTlut(u8);
/* 80306DC8 */ virtual u8 getUsableTlut(u8);
private:
/* 0x150 */ J2DMaterial* mMaterial;

3
include/JSystem/J2DGraph/J2DTevs.h
View File

@ -36,8 +36,11 @@ struct J2DTexMtxInfo {
}; // Size: 0x24
extern J2DTexMtxInfo const j2dDefaultTexMtxInfo;
class J2DTexMtx {
public:
J2DTexMtx() { mInfo = j2dDefaultTexMtxInfo; }
J2DTexMtx(const J2DTexMtxInfo& info) { mInfo = info; }
/* 802E9C90 */ void load(u32);
/* 802E9CC4 */ void calc();

1
libs/JSystem/J2DGraph/J2DMaterial.cpp
View File

@ -85,7 +85,6 @@ extern "C" void getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor();
extern "C" void __construct_array();
extern "C" void _savegpr_26();
extern "C" void _restgpr_26();
extern "C" extern u8 const j2dDefaultTexMtxInfo[36];
extern "C" extern void* __vt__15J2DIndBlockFull[14];
extern "C" extern void* __vt__11J2DTevBlock[47];
extern "C" extern void* __vt__14J2DTexGenBlock[3 + 1 /* padding */];

48
libs/JSystem/J2DGraph/J2DPicture.cpp
View File

@ -580,23 +580,23 @@ bool J2DPicture::prepareTexture(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::insert(ResTIMG const* param_0, JUTPalette* param_1, u8 param_2, f32 param_3) {
asm bool J2DPicture::insert(ResTIMG const* param_0, JUTPalette* param_1, u8 param_2, f32 param_3) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPicture/insert__10J2DPictureFPC7ResTIMGP10JUTPaletteUcf.s"
}
#pragma pop
/* 802FD4B4-802FD524 2F7DF4 0070+00 1/0 0/0 0/0 .text insert__10J2DPictureFPCcP10JUTPaletteUcf */
void J2DPicture::insert(char const* param_0, JUTPalette* param_1, u8 param_2, f32 param_3) {
bool J2DPicture::insert(char const* param_0, JUTPalette* param_1, u8 param_2, f32 param_3) {
void* resource = J2DScreen::getNameResource(param_0);
insert((ResTIMG*)resource, param_1, param_2, param_3);
return insert((ResTIMG*)resource, param_1, param_2, param_3);
}
/* 802FD524-802FD6F4 2F7E64 01D0+00 1/0 0/0 0/0 .text insert__10J2DPictureFP10JUTTextureUcf */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::insert(JUTTexture* param_0, u8 param_1, f32 param_2) {
asm bool J2DPicture::insert(JUTTexture* param_0, u8 param_1, f32 param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPicture/insert__10J2DPictureFP10JUTTextureUcf.s"
}
@ -606,7 +606,7 @@ asm void J2DPicture::insert(JUTTexture* param_0, u8 param_1, f32 param_2) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int J2DPicture::remove(u8 param_0) {
asm bool J2DPicture::remove(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFUc.s"
}
@ -614,21 +614,21 @@ asm int J2DPicture::remove(u8 param_0) {
/* 802FD814-802FD874 2F8154 0060+00 1/0 0/0 0/0 .text remove__10J2DPictureFP10JUTTexture
*/
void J2DPicture::remove(JUTTexture* param_0) {
bool J2DPicture::remove(JUTTexture* param_0) {
u8 i = 0;
for (; i < mTextureCount; i++) {
if (mTexture[i] == param_0) {
break;
}
}
remove(i);
return remove(i);
}
/* 802FD874-802FD964 2F81B4 00F0+00 1/0 0/0 0/0 .text changeTexture__10J2DPictureFPC7ResTIMGUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::changeTexture(ResTIMG const* param_0, u8 param_1) {
asm const ResTIMG* J2DPicture::changeTexture(ResTIMG const* param_0, u8 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPC7ResTIMGUc.s"
}
@ -636,9 +636,9 @@ asm void J2DPicture::changeTexture(ResTIMG const* param_0, u8 param_1) {
/* 802FD964-802FD9BC 2F82A4 0058+00 1/0 0/0 0/0 .text changeTexture__10J2DPictureFPCcUc
*/
void J2DPicture::changeTexture(char const* param_0, u8 param_1) {
const ResTIMG* J2DPicture::changeTexture(char const* param_0, u8 param_1) {
void* resource = J2DScreen::getNameResource(param_0);
changeTexture((ResTIMG*)resource, param_1);
return changeTexture((ResTIMG*)resource, param_1);
}
/* 802FD9BC-802FDAC8 2F82FC 010C+00 1/0 0/0 0/0 .text
@ -646,7 +646,7 @@ void J2DPicture::changeTexture(char const* param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::changeTexture(ResTIMG const* param_0, u8 param_1, JUTPalette* param_2) {
asm const ResTIMG* J2DPicture::changeTexture(ResTIMG const* param_0, u8 param_1, JUTPalette* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPC7ResTIMGUcP10JUTPalette.s"
}
@ -654,9 +654,9 @@ asm void J2DPicture::changeTexture(ResTIMG const* param_0, u8 param_1, JUTPalett
/* 802FDAC8-802FDB28 2F8408 0060+00 1/0 0/0 0/0 .text
* changeTexture__10J2DPictureFPCcUcP10JUTPalette */
void J2DPicture::changeTexture(char const* param_0, u8 param_1, JUTPalette* param_2) {
const ResTIMG* J2DPicture::changeTexture(char const* param_0, u8 param_1, JUTPalette* param_2) {
void* resource = J2DScreen::getNameResource(param_0);
changeTexture((ResTIMG*)resource, param_1, param_2);
return changeTexture((ResTIMG*)resource, param_1, param_2);
}
/* 802FDB28-802FDB90 2F8468 0068+00 1/0 1/0 0/0 .text drawSelf__10J2DPictureFff */
@ -806,8 +806,8 @@ void J2DPicture::setBlendColorRatio(f32 param_0, f32 param_1) {
/* 802FEA9C-802FEAC4 2F93DC 0028+00 1/0 0/0 0/0 .text setBlendAlphaRatio__10J2DPictureFff
*/
void J2DPicture::setBlendAlphaRatio(f32 param_0, f32 param_1) {
field_0x11c[2] = param_0;
field_0x11c[3] = param_1;
field_0x124[0] = param_0;
field_0x124[1] = param_1;
setBlendKonstAlpha();
}
@ -906,7 +906,7 @@ bool J2DPicture::isUsed(ResTIMG const* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::getUsableTlut(u8 param_0) {
asm u8 J2DPicture::getUsableTlut(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPicture/getUsableTlut__10J2DPictureFUc.s"
}
@ -916,7 +916,7 @@ asm void J2DPicture::getUsableTlut(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm u8 J2DPicture::getTlutID(ResTIMG const* param_0, u8 param_1) {
asm GXTlut J2DPicture::getTlutID(ResTIMG const* param_0, u8 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPicture/getTlutID__10J2DPictureFPC7ResTIMGUc.s"
}
@ -929,14 +929,14 @@ extern "C" void func_802FF204(void* _this) {
/* 802FF208-802FF238 2F9B48 0030+00 1/0 0/0 0/0 .text append__10J2DPictureFP10JUTTexturef
*/
void J2DPicture::append(JUTTexture* param_0, f32 param_1) {
insert(param_0, mTextureCount, param_1);
bool J2DPicture::append(JUTTexture* param_0, f32 param_1) {
return insert(param_0, mTextureCount, param_1);
}
/* 802FF238-802FF268 2F9B78 0030+00 1/0 0/0 0/0 .text
* append__10J2DPictureFPC7ResTIMGP10JUTPalettef */
void J2DPicture::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
insert(param_0, param_1, mTextureCount, param_2);
bool J2DPicture::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
return insert(param_0, param_1, mTextureCount, param_2);
}
/* 802FF268-802FF29C 2F9BA8 0034+00 1/0 0/0 0/0 .text load__10J2DPictureFUc */
@ -958,8 +958,8 @@ u16 J2DPicture::getTypeID() const {
}
/* 802FF2F0-802FF320 2F9C30 0030+00 1/0 0/0 0/0 .text append__10J2DPictureFPCcP10JUTPalettef */
void J2DPicture::append(char const* param_0, JUTPalette* param_1, f32 param_2) {
insert(param_0, param_1, mTextureCount, param_2);
bool J2DPicture::append(char const* param_0, JUTPalette* param_1, f32 param_2) {
return insert(param_0, param_1, mTextureCount, param_2);
}
/* 802FF320-802FF350 2F9C60 0030+00 1/0 0/0 0/0 .text prepend__10J2DPictureFP10JUTTexturef */
@ -990,7 +990,7 @@ void J2DPicture::prepend(ResTIMG const* param_0, f32 param_1) {
}
/* 802FF410-802FF448 2F9D50 0038+00 1/0 0/0 0/0 .text remove__10J2DPictureFv */
int J2DPicture::remove() {
bool J2DPicture::remove() {
return remove(mTextureCount - 1);
}

643
libs/JSystem/J2DGraph/J2DPictureEx.cpp
View File

@ -5,6 +5,9 @@
#include "JSystem/J2DGraph/J2DPictureEx.h"
#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/JSupport/JSURandomInputStream.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@ -148,7 +151,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 const j2dDefaultTexMtxInfo[36];
//
// Declarations:
@ -160,6 +162,17 @@ SECTION_SDATA2 static f32 lit_1517 = 1.0f;
/* 80303640-803036EC 2FDF80 00AC+00 1/0 0/0 0/0 .text
* initiate__12J2DPictureExFPC7ResTIMGPC7ResTLUT */
// Matches with literals
#ifdef NONMATCHING
void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1) {
J2DTexGenBlock* this_00 = mMaterial->getTexGenBlock();
if (this_00->getTexGenNum() == 0 && append(param_0, 1.0f) && param_1 != NULL) {
if (mMaterial->getTevBlock()->getPalette(0) == NULL) {
mMaterial->getTevBlock()->setPalette(0, param_1);
}
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@ -168,6 +181,7 @@ asm void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1)
#include "asm/JSystem/J2DGraph/J2DPictureEx/initiate__12J2DPictureExFPC7ResTIMGPC7ResTLUT.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 803CD4B8-803CD608 02A5D8 014C+04 2/2 0/0 0/0 .data __vt__12J2DPictureEx */
@ -261,6 +275,52 @@ SECTION_DATA extern void* __vt__12J2DPictureEx[83 + 1 /* padding */] = {
/* 803036EC-8030393C 2FE02C 0250+00 0/0 1/1 0/0 .text
* __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */
// Issue with TColor
#ifdef NONMATCHING
J2DPictureEx::J2DPictureEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2,
J2DMaterial* param_3) {
field_0x194 = 0;
field_0x198 = 0;
s32 origPosition = param_1->getPosition();
u32 local_68[2];
param_1->read(local_68, 8);
mKind = local_68[0];
s32 iVar2 = param_1->getPosition();
u32 auStack_70[2];
param_1->peek(auStack_70, 8);
makePaneExStream(param_0, param_1);
param_1->seek(iVar2 + auStack_70[1], JSUStreamSeekFrom_SET);
J2DScrnBlockPictureParameter aJStack_60;
param_1->read(&aJStack_60, sizeof(J2DScrnBlockPictureParameter));
field_0x154 = aJStack_60.mMaterialNum;
field_0x156 = aJStack_60.field_0x4;
// Issues with this loop
for (int i = 0; i < 4; i++) {
field_0x158[i] = aJStack_60.field_0x8[i];
field_0x10a[i] = aJStack_60.field_0x10[i];
mCornerColor[i] = JUtility::TColor(aJStack_60.mCornerColor[i]);
}
param_1->seek(origPosition + local_68[1], JSUStreamSeekFrom_SET);
mMaterial = NULL;
if (field_0x156 != 0xffff) {
mMaterial = param_3 + field_0x156;
(param_3 + field_0x156)->field_0x4 = this;
}
field_0x190 = 0;
mAlpha = 0xff;
rewriteAlpha();
for (int iVar1 = 0; iVar1 < 2; iVar1++) {
field_0x11c[iVar1] = 1.0f;
field_0x124[iVar1] = 1.0f;
}
for (int iVar1 = 0; iVar1 < 6; iVar1++) {
field_0x160[iVar1] = 1.0f;
field_0x178[iVar1] = 1.0f;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@ -270,8 +330,17 @@ asm J2DPictureEx::J2DPictureEx(J2DPane* param_0, JSURandomInputStream* param_1,
#include "asm/JSystem/J2DGraph/J2DPictureEx/__ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s"
}
#pragma pop
#endif
/* 8030393C-803039CC 2FE27C 0090+00 1/0 0/0 0/0 .text __dt__12J2DPictureExFv */
// Needs ctor matched
#ifdef NONMATCHING
J2DPictureEx::~J2DPictureEx() {
if (field_0x190) {
delete mMaterial;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@ -281,39 +350,42 @@ extern "C" asm void __dt__12J2DPictureExFv() {
#include "asm/JSystem/J2DGraph/J2DPictureEx/__dt__12J2DPictureExFv.s"
}
#pragma pop
#endif
/* 803039CC-80303AB4 2FE30C 00E8+00 1/0 0/0 0/0 .text prepareTexture__12J2DPictureExFUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::prepareTexture(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/prepareTexture__12J2DPictureExFUc.s"
bool J2DPictureEx::prepareTexture(u8 param_0) {
if (!mMaterial->getTevBlock()->prepareTexture(param_0)) {
return false;
}
for (u8 i = 0; i < param_0; i++) {
J2DTexMtx aJStack_68;
mMaterial->getTexGenBlock()->setTexMtx(i, aJStack_68);
}
return true;
}
#pragma pop
/* 80303AB4-80303B80 2FE3F4 00CC+00 1/0 0/0 0/0 .text drawSelf__12J2DPictureExFffPA3_A4_f
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/drawSelf__12J2DPictureExFffPA3_A4_f.s"
void J2DPictureEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
if (mMaterial != NULL) {
mMaterial->setGX();
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT);
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
drawFullSet(param_0, param_1, getWidth(), getHeight(), param_2);
}
}
#pragma pop
/* 80303B80-80303BDC 2FE4C0 005C+00 1/0 0/0 0/0 .text drawFullSet__12J2DPictureExFffffPA3_A4_f */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
void J2DPictureEx::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
f32 (*param_4)[3][4]) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/drawFullSet__12J2DPictureExFffffPA3_A4_f.s"
drawTexCoord(mBounds.i.x, mBounds.i.y, param_2, param_3, field_0x10a[0].x, field_0x10a[0].y,
field_0x10a[1].x, field_0x10a[1].y, field_0x10a[2].x, field_0x10a[2].y,
field_0x10a[3].x, field_0x10a[3].y, param_4);
}
#pragma pop
/* ############################################################################################## */
/* 804562C4-804562C8 0048C4 0004+00 5/5 0/0 0/0 .sdata2 @1784 */
@ -326,6 +398,54 @@ SECTION_SDATA2 static u8 lit_1784[4] = {
/* 80303BDC-80303E5C 2FE51C 0280+00 1/0 0/0 0/0 .text
* drawTexCoord__12J2DPictureExFffffssssssssPA3_A4_f */
// Matches with literals
#ifdef NONMATCHING
void J2DPictureEx::drawTexCoord(f32 param_0, f32 param_1, f32 param_2, f32 param_3, s16 param_4,
s16 param_5, s16 param_6, s16 param_7, s16 param_8, s16 param_9,
s16 param_10, s16 param_11, f32 (*param_12)[3][4]) {
f32 dVar12 = param_0 + param_2;
f32 dVar11 = param_1 + param_3;
Mtx auStack_88;
MTXConcat(*param_12, mGlobalMtx, auStack_88);
if (mMaterial == NULL || mMaterial->isVisible()) {
GXLoadPosMtxImm(auStack_88, 0);
JUtility::TColor TStack_8c = mCornerColor[0];
JUtility::TColor TStack_90 = mCornerColor[1];
JUtility::TColor TStack_94 = mCornerColor[2];
JUtility::TColor TStack_98 = mCornerColor[3];
if (mMaterial != NULL) {
if (mMaterial->getColorBlock()->getColorChan(1)->getMatSrc() == 1) {
if (mMaterial->getMaterialAlphaCalc() == 1) {
TStack_8c.a = TStack_8c.a * mColorAlpha / 255;
TStack_90.a = TStack_90.a * mColorAlpha / 255;
TStack_94.a = TStack_94.a * mColorAlpha / 255;
TStack_98.a = TStack_98.a * mColorAlpha / 255;
}
} else if (mIsInfluencedAlpha) {
GXSetChanMatColor(GX_ALPHA0, JUtility::TColor(mColorAlpha));
}
}
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBA4, 8);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition3f32(param_0, param_1, 0.0f);
GXColor1u32(TStack_8c);
GXTexCoord2s16(param_4, param_5);
GXPosition3f32(dVar12, param_1, 0.0f);
GXColor1u32(TStack_90);
GXTexCoord2s16(param_6, param_7);
GXPosition3f32(dVar12, dVar11, 0.0f);
GXColor1u32(TStack_98);
GXTexCoord2s16(param_10, param_11);
GXPosition3f32(param_0, dVar11, 0.0f);
GXColor1u32(TStack_94);
GXTexCoord2s16(param_8, param_9);
i_GXEnd();
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBX8, 0xf);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0);
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@ -336,70 +456,74 @@ asm void J2DPictureEx::drawTexCoord(f32 param_0, f32 param_1, f32 param_2, f32 p
#include "asm/JSystem/J2DGraph/J2DPictureEx/drawTexCoord__12J2DPictureExFffffssssssssPA3_A4_f.s"
}
#pragma pop
#endif
/* 80303E5C-80303EA4 2FE79C 0048+00 1/0 0/0 0/0 .text
* append__12J2DPictureExFPC7ResTIMGP10JUTPalettef */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/append__12J2DPictureExFPC7ResTIMGP10JUTPalettef.s"
bool J2DPictureEx::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
if (mMaterial == NULL) {
return false;
}
return insert(param_0, param_1, mMaterial->getTexGenBlock()->getTexGenNum(), param_2);
}
#pragma pop
/* 80303EA4-80303EEC 2FE7E4 0048+00 1/0 0/0 0/0 .text append__12J2DPictureExFPCcP10JUTPalettef */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::append(char const* param_0, JUTPalette* param_1, f32 param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/append__12J2DPictureExFPCcP10JUTPalettef.s"
bool J2DPictureEx::append(char const* param_0, JUTPalette* param_1, f32 param_2) {
if (mMaterial == NULL) {
return false;
}
return insert(param_0, param_1, mMaterial->getTexGenBlock()->getTexGenNum(), param_2);
}
#pragma pop
/* 80303EEC-80303F34 2FE82C 0048+00 1/0 0/0 0/0 .text append__12J2DPictureExFP10JUTTexturef */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::append(JUTTexture* param_0, f32 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/append__12J2DPictureExFP10JUTTexturef.s"
bool J2DPictureEx::append(JUTTexture* param_0, f32 param_1) {
if (mMaterial == NULL) {
return false;
}
return insert(param_0, mMaterial->getTexGenBlock()->getTexGenNum(), param_1);
}
#pragma pop
/* 80303F34-80303FD8 2FE874 00A4+00 1/0 0/0 0/0 .text
* insert__12J2DPictureExFPC7ResTIMGP10JUTPaletteUcf */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::insert(ResTIMG const* param_0, JUTPalette* param_1, u8 param_2,
bool J2DPictureEx::insert(ResTIMG const* param_0, JUTPalette* param_1, u8 param_2,
f32 param_3) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/insert__12J2DPictureExFPC7ResTIMGP10JUTPaletteUcf.s"
if (param_0 == NULL) {
return false;
}
if (!isInsert(param_2)) {
return false;
}
insertCommon(param_2, param_3);
mMaterial->getTevBlock()->insertTexture(param_2, param_0, param_1);
return true;
}
#pragma pop
/* 80303FD8-80304048 2FE918 0070+00 1/0 0/0 0/0 .text insert__12J2DPictureExFPCcP10JUTPaletteUcf
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::insert(char const* param_0, JUTPalette* param_1, u8 param_2, f32 param_3) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/insert__12J2DPictureExFPCcP10JUTPaletteUcf.s"
bool J2DPictureEx::insert(char const* param_0, JUTPalette* param_1, u8 param_2, f32 param_3) {
ResTIMG const* resource = (ResTIMG const*)J2DScreen::getNameResource(param_0);
return insert(resource, param_1, param_2, param_3);
}
#pragma pop
/* 80304048-803040E4 2FE988 009C+00 1/0 0/0 0/0 .text insert__12J2DPictureExFP10JUTTextureUcf */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::insert(JUTTexture* param_0, u8 param_1, f32 param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/insert__12J2DPictureExFP10JUTTextureUcf.s"
bool J2DPictureEx::insert(JUTTexture* param_0, u8 param_1, f32 param_2) {
if (param_0 == NULL) {
return false;
}
if (!isInsert(param_1)) {
return false;
}
insertCommon(param_1, param_2);
mMaterial->getTevBlock()->insertTexture(param_1, param_0);
return true;
}
#pragma pop
/* 803040E4-8030437C 2FEA24 0298+00 2/2 0/0 0/0 .text insertCommon__12J2DPictureExFUcf */
#pragma push
@ -412,54 +536,89 @@ asm void J2DPictureEx::insertCommon(u8 param_0, f32 param_1) {
#pragma pop
/* 8030437C-8030446C 2FECBC 00F0+00 2/2 0/0 0/0 .text isInsert__12J2DPictureExCFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::isInsert(u8 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/isInsert__12J2DPictureExCFUc.s"
bool J2DPictureEx::isInsert(u8 param_0) const {
if (mMaterial == NULL) {
return false;
}
if (mMaterial->getTevBlock() == NULL) {
return false;
}
u8 texGenNum = mMaterial->getTexGenBlock()->getTexGenNum();
if (texGenNum >= 8 || param_0 >= 8 || param_0 > texGenNum) {
return false;
}
u8 bVar5 = mMaterial->getTevBlock()->getMaxStage();
if (bVar5 <= 2 && texGenNum != 0) {
return false;
}
if (bVar5 == mMaterial->getTevBlock()->getTevStageNum() && texGenNum != 0) {
return false;
}
return true;
}
#pragma pop
/* 8030446C-80304608 2FEDAC 019C+00 1/0 0/0 0/0 .text remove__12J2DPictureExFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::remove(u8 param_0) {
asm bool J2DPictureEx::remove(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/remove__12J2DPictureExFUc.s"
}
#pragma pop
/* 80304608-8030466C 2FEF48 0064+00 1/0 0/0 0/0 .text remove__12J2DPictureExFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::remove() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/remove__12J2DPictureExFv.s"
bool J2DPictureEx::remove() {
if (mMaterial == NULL) {
return false;
}
if (mMaterial->getTevBlock() == NULL) {
return false;
}
u8 texGenNum = mMaterial->getTexGenBlock()->getTexGenNum();
return remove(texGenNum - 1);
}
#pragma pop
/* 8030466C-80304728 2FEFAC 00BC+00 1/0 0/0 0/0 .text remove__12J2DPictureExFP10JUTTexture */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::remove(JUTTexture* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/remove__12J2DPictureExFP10JUTTexture.s"
bool J2DPictureEx::remove(JUTTexture* param_0) {
if (mMaterial == NULL) {
return false;
}
if (mMaterial->getTevBlock() == NULL) {
return false;
}
u8 texGenNum = mMaterial->getTexGenBlock()->getTexGenNum();
u8 i;
for (i = 0; i < texGenNum; i++) {
if (mMaterial->getTevBlock()->getTexture(i) == param_0)
break;
}
return remove(i);
}
#pragma pop
/* 80304728-8030477C 2FF068 0054+00 1/1 0/0 0/0 .text isRemove__12J2DPictureExCFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::isRemove(u8 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/isRemove__12J2DPictureExCFUc.s"
bool J2DPictureEx::isRemove(u8 param_0) const {
if (mMaterial == NULL) {
return false;
}
if (mMaterial->getTevBlock() == NULL) {
return false;
}
u8 texGenNum = mMaterial->getTexGenBlock()->getTexGenNum();
if (texGenNum <= param_0 || texGenNum == 1) {
return false;
}
return true;
}
#pragma pop
/* ############################################################################################## */
/* 804562C8-804562D0 0048C8 0008+00 2/2 0/0 0/0 .sdata2 @2130 */
@ -511,14 +670,17 @@ asm void J2DPictureEx::drawOut(JGeometry::TBox2<f32> const& param_0,
#pragma pop
/* 80305264-803052AC 2FFBA4 0048+00 1/0 0/0 0/0 .text load__12J2DPictureExF11_GXTexMapIDUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::load(_GXTexMapID param_0, u8 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/load__12J2DPictureExF11_GXTexMapIDUc.s"
void J2DPictureEx::load(_GXTexMapID param_0, u8 param_1) {
if (mMaterial == NULL) {
return;
}
if (mMaterial->getTevBlock() == NULL) {
return;
}
mMaterial->getTevBlock()->loadTexture(param_0, param_1);
}
#pragma pop
/* 803052AC-803053E0 2FFBEC 0134+00 3/3 0/0 0/0 .text setTevOrder__12J2DPictureExFUcUcb
*/
@ -581,37 +743,79 @@ asm void J2DPictureEx::setTevKColor(u8 param_0) {
/* 80305C70-80305D18 3005B0 00A8+00 3/3 0/0 0/0 .text setTevKColorSel__12J2DPictureExFUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::setTevKColorSel(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/setTevKColorSel__12J2DPictureExFUc.s"
void J2DPictureEx::setTevKColorSel(u8 param_0) {
for (u8 i = 0; i < param_0; i++) {
if (i < 4) {
mMaterial->getTevBlock()->setTevKColorSel(i, 31 - 4 * i);
} else {
mMaterial->getTevBlock()->setTevKColorSel(i, 30 - 4 * (i - 4));
}
}
}
#pragma pop
/* 80305D18-80305DC0 300658 00A8+00 3/3 0/0 0/0 .text setTevKAlphaSel__12J2DPictureExFUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::setTevKAlphaSel(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/setTevKAlphaSel__12J2DPictureExFUc.s"
void J2DPictureEx::setTevKAlphaSel(u8 param_0) {
for (u8 i = 0; i < param_0; i++) {
if (i < 4) {
mMaterial->getTevBlock()->setTevKAlphaSel(i, 29 - 4 * i);
} else {
mMaterial->getTevBlock()->setTevKAlphaSel(i, 28 - 4 * (i - 4));
}
}
}
#pragma pop
/* 80305DC0-80305ED4 300700 0114+00 2/2 0/0 0/0 .text shiftSetBlendRatio__12J2DPictureExFUcfbb */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::shiftSetBlendRatio(u8 param_0, f32 param_1, bool param_2, bool param_3) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/shiftSetBlendRatio__12J2DPictureExFUcfbb.s"
void J2DPictureEx::shiftSetBlendRatio(u8 param_0, f32 param_1, bool param_2, bool param_3) {
f32* pJVar4 = param_2 != 0 ? field_0x11c : field_0x124;
f32* local_44 = param_2 != 0 ? field_0x160 : field_0x178;
if (param_3) {
for (int i = 7; i > param_0; i--) {
if (i > 2) {
local_44[i - 2] = local_44[i - 3];
} else if (i == 2) {
local_44[0] = pJVar4[1];
} else {
pJVar4[i] = pJVar4[i - 1];
}
}
if (param_0 >= 2) {
local_44[param_0 - 2] = param_1;
} else {
pJVar4[param_0] = param_1;
}
} else {
for (int i = param_0 + 1; i < 8; i++) {
if (i > 2) {
local_44[i - 3] = local_44[i - 2];
} else if (i == 2) {
pJVar4[1] = local_44[0];
} else {
pJVar4[i - 1] = pJVar4[i];
}
}
}
}
#pragma pop
/* 80305ED4-80305F34 300814 0060+00 1/0 0/0 0/0 .text setBlendColorRatio__12J2DPictureExFff */
// Matches with literals
#ifdef NONMATCHING
void J2DPictureEx::setBlendColorRatio(f32 param_0, f32 param_1) {
if (mMaterial == NULL) {
return;
}
field_0x11c[0] = param_0;
field_0x11c[1] = param_1;
for (int i = 0; i < 6; i++) {
field_0x160[i] = 1.0f;
}
setTevKColor(mMaterial->getTexGenBlock()->getTexGenNum());
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@ -620,8 +824,26 @@ asm void J2DPictureEx::setBlendColorRatio(f32 param_0, f32 param_1) {
#include "asm/JSystem/J2DGraph/J2DPictureEx/setBlendColorRatio__12J2DPictureExFff.s"
}
#pragma pop
#endif
/* 80305F34-80305F94 300874 0060+00 1/0 0/0 0/0 .text setBlendAlphaRatio__12J2DPictureExFff */
// Matches with literals
#ifdef NONMATCHING
void J2DPictureEx::setBlendAlphaRatio(f32 param_0, f32 param_1) {
if (mMaterial == NULL) {
return;
}
field_0x124[0] = param_0;
field_0x124[1] = param_1;
for (int i = 0; i < 6; i++) {
field_0x178[i] = 1.0f;
}
setTevKColor(mMaterial->getTexGenBlock()->getTexGenNum());
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@ -630,13 +852,14 @@ asm void J2DPictureEx::setBlendAlphaRatio(f32 param_0, f32 param_1) {
#include "asm/JSystem/J2DGraph/J2DPictureEx/setBlendAlphaRatio__12J2DPictureExFff.s"
}
#pragma pop
#endif
/* 80305F94-803060DC 3008D4 0148+00 1/0 0/0 0/0 .text changeTexture__12J2DPictureExFPC7ResTIMGUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1) {
asm const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/changeTexture__12J2DPictureExFPC7ResTIMGUc.s"
}
@ -644,97 +867,163 @@ asm void J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1) {
/* 803060DC-80306134 300A1C 0058+00 1/0 0/0 0/0 .text changeTexture__12J2DPictureExFPCcUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::changeTexture(char const* param_0, u8 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/changeTexture__12J2DPictureExFPCcUc.s"
const ResTIMG* J2DPictureEx::changeTexture(char const* param_0, u8 param_1) {
ResTIMG const* resource = (ResTIMG const*)J2DScreen::getNameResource(param_0);
return changeTexture(resource, param_1);
}
#pragma pop
/* 80306134-80306298 300A74 0164+00 1/0 0/0 0/0 .text
* changeTexture__12J2DPictureExFPC7ResTIMGUcP10JUTPalette */
// Issues with param_1 >= bVar5. Maybe some inline min function.
#ifdef NONMATCHING
inline u8 mina(u8 a, u8 b) {
return a > b ? b : a;
}
const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1, JUTPalette* param_2) {
if (mMaterial == NULL || param_0 == NULL) {
return NULL;
}
u32 uVar2 = mMaterial->getTexGenBlock()->getTexGenNum();
if (param_1 > uVar2) {
return NULL;
}
u8 bVar5 = mMaterial->getTevBlock()->getMaxStage();
bVar5 = bVar5 > 8 ? 8 : bVar5;
if (param_1 >= bVar5) {
return NULL;
}
if (param_1 < uVar2) {
const ResTIMG* texInfo = getTexture(param_1)->getTexInfo();
GXTlut _Var7 = GX_TLUT0;
if (param_0->indexTexture != 0) {
_Var7 = getTlutID(param_0, getUsableTlut(param_1));
}
getTexture(param_1)->storeTIMG(param_0, param_2, _Var7);
return texInfo;
}
append(param_0, param_2, 1.0f);
return NULL;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1, JUTPalette* param_2) {
asm const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1, JUTPalette* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/changeTexture__12J2DPictureExFPC7ResTIMGUcP10JUTPalette.s"
}
#pragma pop
#endif
/* 80306298-803062F8 300BD8 0060+00 1/0 0/0 0/0 .text
* changeTexture__12J2DPictureExFPCcUcP10JUTPalette */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::changeTexture(char const* param_0, u8 param_1, JUTPalette* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/changeTexture__12J2DPictureExFPCcUcP10JUTPalette.s"
const ResTIMG* J2DPictureEx::changeTexture(char const* param_0, u8 param_1, JUTPalette* param_2) {
ResTIMG const* resource = (ResTIMG const*)J2DScreen::getNameResource(param_0);
return changeTexture(resource, param_1, param_2);
}
#pragma pop
/* 803062F8-80306350 300C38 0058+00 1/0 0/0 0/0 .text getTexture__12J2DPictureExCFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::getTexture(u8 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/getTexture__12J2DPictureExCFUc.s"
JUTTexture* J2DPictureEx::getTexture(u8 param_0) const {
if (mMaterial == NULL) {
return NULL;
}
if (mMaterial->getTevBlock() == NULL) {
return NULL;
}
return mMaterial->getTevBlock()->getTexture(param_0);
}
#pragma pop
/* 80306350-80306370 300C90 0020+00 1/0 0/0 0/0 .text getTextureCount__12J2DPictureExCFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::getTextureCount() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/getTextureCount__12J2DPictureExCFv.s"
u8 J2DPictureEx::getTextureCount() const {
if (mMaterial == NULL) {
return NULL;
}
return mMaterial->getTexGenBlock()->getTexGenNum();
}
#pragma pop
/* 80306370-803063F8 300CB0 0088+00 1/0 0/0 0/0 .text setBlack__12J2DPictureExFQ28JUtility6TColor
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::setBlack(JUtility::TColor param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/setBlack__12J2DPictureExFQ28JUtility6TColor.s"
bool J2DPictureEx::setBlack(JUtility::TColor param_0) {
JUtility::TColor black, white;
if (!getBlackWhite(&black, &white)) {
return false;
}
return setBlackWhite(param_0, white);
}
#pragma pop
/* 803063F8-80306480 300D38 0088+00 1/0 0/0 0/0 .text setWhite__12J2DPictureExFQ28JUtility6TColor
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::setWhite(JUtility::TColor param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/setWhite__12J2DPictureExFQ28JUtility6TColor.s"
bool J2DPictureEx::setWhite(JUtility::TColor param_0) {
JUtility::TColor black, white;
if (!getBlackWhite(&black, &white)) {
return false;
}
return setBlackWhite(black, param_0);
}
#pragma pop
/* 80306480-80306664 300DC0 01E4+00 1/0 0/0 0/0 .text
* setBlackWhite__12J2DPictureExFQ28JUtility6TColorQ28JUtility6TColor */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/setBlackWhite__12J2DPictureExFQ28JUtility6TColorQ28JUtility6TColor.s"
bool J2DPictureEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
if (mMaterial == NULL) {
return false;
}
if (mMaterial->getTevBlock() == NULL) {
return false;
}
if (!isSetBlackWhite(param_0, param_1)) {
return false;
}
bool bVar1;
u8 uVar2;
u8 texGenNum = mMaterial->getTexGenBlock()->getTexGenNum();
bVar1 = true;
if ((param_0 == 0) && (param_1 == 0xffffffff)) {
bVar1 = false;
}
if (texGenNum == 1) {
uVar2 = (bVar1) ? 2 : 1;
} else {
uVar2 = texGenNum + ((bVar1) ? 2 : 1);
}
mMaterial->getTevBlock()->setTevStageNum(uVar2);
setTevOrder(texGenNum, uVar2, bVar1);
setTevStage(texGenNum, uVar2, bVar1);
setTevKColor(texGenNum);
setTevKColorSel(texGenNum);
setTevKAlphaSel(texGenNum);
if (bVar1) {
J2DGXColorS10 local_38;
local_38.r = param_0.r;
local_38.g = param_0.g;
local_38.b = param_0.b;
local_38.a = param_0.a;
mMaterial->getTevBlock()->setTevColor(0, local_38);
local_38.r = param_1.r;
local_38.g = param_1.g;
local_38.b = param_1.b;
local_38.a = param_1.a;
mMaterial->getTevBlock()->setTevColor(1, local_38);
}
return true;
}
#pragma pop
/* 80306664-80306824 300FA4 01C0+00 4/4 0/0 0/0 .text
* getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const {
asm bool J2DPictureEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor.s"
}
@ -745,7 +1034,7 @@ asm void J2DPictureEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const {
asm bool J2DPictureEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/isSetBlackWhite__12J2DPictureExCFQ28JUtility6TColorQ28JUtility6TColor.s"
}
@ -888,7 +1177,7 @@ asm void J2DPictureEx::animationPane(J2DAnmTransform const* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::getUsableTlut(u8 param_0) {
asm u8 J2DPictureEx::getUsableTlut(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/getUsableTlut__12J2DPictureExFUc.s"
}
@ -899,7 +1188,7 @@ asm void J2DPictureEx::getUsableTlut(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::append(ResTIMG const* param_0, f32 param_1) {
asm bool J2DPictureEx::append(ResTIMG const* param_0, f32 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/append__12J2DPictureExFPC7ResTIMGf.s"
}
@ -909,7 +1198,7 @@ asm void J2DPictureEx::append(ResTIMG const* param_0, f32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPictureEx::append(char const* param_0, f32 param_1) {
asm bool J2DPictureEx::append(char const* param_0, f32 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DPictureEx/append__12J2DPictureExFPCcf.s"
}

2
rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp
View File

@ -6,6 +6,8 @@
#include "rel/d/a/b/d_a_b_oh/d_a_b_oh.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_procname.h"
#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_math.h"
#include "dol2asm.h"
#include "rel/d/a/b/d_a_b_ob/d_a_b_ob.h"

6
src/d/d_drawlist.cpp
View File

@ -1389,7 +1389,7 @@ extern "C" asm void draw__12dDlst_2DMt_cFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::getTexture(u8 param_0) const {
asm JUTTexture* J2DPicture::getTexture(u8 param_0) const {
nofralloc
#include "asm/d/d_drawlist/getTexture__10J2DPictureCFUc.s"
}
@ -1484,7 +1484,7 @@ extern "C" s32 getTypeID__7J2DPaneCFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::setWhite(JUtility::TColor param_0) {
asm bool J2DPicture::setWhite(JUtility::TColor param_0) {
nofralloc
#include "asm/d/d_drawlist/setWhite__10J2DPictureFQ28JUtility6TColor.s"
}
@ -1494,7 +1494,7 @@ asm void J2DPicture::setWhite(JUtility::TColor param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::setBlack(JUtility::TColor param_0) {
asm bool J2DPicture::setBlack(JUtility::TColor param_0) {
nofralloc
#include "asm/d/d_drawlist/setBlack__10J2DPictureFQ28JUtility6TColor.s"
}

2
src/d/file/d_file_select.cpp
View File

@ -3878,7 +3878,7 @@ asm void dFile_select_c::screenSet() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
asm bool J2DPicture::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
nofralloc
#include "asm/d/file/d_file_select/setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor.s"
}

2
src/d/menu/d_menu_dmap.cpp
View File

@ -1698,7 +1698,7 @@ asm void dMenu_Dmap_c::_create() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DPicture::append(ResTIMG const* param_0, f32 param_1) {
asm bool J2DPicture::append(ResTIMG const* param_0, f32 param_1) {
nofralloc
#include "asm/d/menu/d_menu_dmap/append__10J2DPictureFPC7ResTIMGf.s"
}

11
src/d/meter/d_meter2_draw.cpp
View File

@ -2435,11 +2435,8 @@ SECTION_SBSS2 static u8 data_80456B9C[4];
#ifdef NONMATCHING
void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) {
CPaneMgr* pane = mpItemXY[i_button];
f32 local_68[2][2];
local_68[1][0] = 0.0f;
local_68[1][1] = 0.0f;
local_68[0][0] = 0.0f;
local_68[0][1] = 0.0f;
f32 local_74[2] = {0.0f};
f32 local_68[2] = {0.0f};
if (i_alphaRate == 1.0f) {
i_alphaRate = pane->getAlphaRate();
@ -2448,8 +2445,8 @@ void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) {
JGeometry::TVec3<f32> vtx1 = pane->getPanePtr()->getGlbVtx(0);
JGeometry::TVec3<f32> vtx2 = pane->getPanePtr()->getGlbVtx(3);
mpKanteraMeter[i_button]->setPos((vtx1.x + vtx2.x) * 0.5f + 9.0f + local_68[1][i_button],
vtx2.y + local_68[0][i_button]);
mpKanteraMeter[i_button]->setPos((vtx1.x + vtx2.x) * 0.5f + 9.0f + local_74[i_button],
vtx2.y + local_68[i_button]);
mpKanteraMeter[i_button]->setScale(0.6f, 0.6f);
mpKanteraMeter[i_button]->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil());
mpKanteraMeter[i_button]->setAlphaRate(i_alphaRate);

2
src/f_op/f_op_msg_mng.cpp
View File

@ -405,7 +405,7 @@ void J2DPicture::setBlendRatio(f32 param_0, f32 param_1) {
}
/* 80020338-80020368 01AC78 0030+00 0/0 1/0 0/0 .text append__10J2DPictureFPCcf */
void J2DPicture::append(char const* param_0, f32 param_1) {
bool J2DPicture::append(char const* param_0, f32 param_1) {
insert(param_0, mTextureCount, param_1);
}