diff options
167 files changed, 3801 insertions, 5692 deletions
diff --git a/asm/JSystem/J2DGraph/J2DPane/__ct__7J2DPaneFv.s b/asm/JSystem/J2DGraph/J2DPane/__ct__7J2DPaneFv.s deleted file mode 100644 index 35ee19fe34..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/__ct__7J2DPaneFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_802F5BF8: -/* 802F5BF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F5BFC 7C 08 02 A6 */ mflr r0 -/* 802F5C00 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F5C04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F5C08 93 C1 00 08 */ stw r30, 8(r1) -/* 802F5C0C 7C 7E 1B 78 */ mr r30, r3 -/* 802F5C10 3C 60 80 3D */ lis r3, __vt__7J2DPane@ha /* 0x803CCFD0@ha */ -/* 802F5C14 38 03 CF D0 */ addi r0, r3, __vt__7J2DPane@l /* 0x803CCFD0@l */ -/* 802F5C18 90 1E 00 00 */ stw r0, 0(r30) -/* 802F5C1C 3B FE 00 DC */ addi r31, r30, 0xdc -/* 802F5C20 7F E3 FB 78 */ mr r3, r31 -/* 802F5C24 4B FE 62 F1 */ bl initiate__10JSUPtrListFv -/* 802F5C28 38 7F 00 0C */ addi r3, r31, 0xc -/* 802F5C2C 7F C4 F3 78 */ mr r4, r30 -/* 802F5C30 4B FE 61 CD */ bl __ct__10JSUPtrLinkFPv -/* 802F5C34 38 80 00 00 */ li r4, 0 -/* 802F5C38 90 9E 00 F8 */ stw r4, 0xf8(r30) -/* 802F5C3C 3C 60 50 41 */ lis r3, 0x5041 /* 0x50414E31@ha */ -/* 802F5C40 38 03 4E 31 */ addi r0, r3, 0x4E31 /* 0x50414E31@l */ -/* 802F5C44 90 1E 00 08 */ stw r0, 8(r30) -/* 802F5C48 38 00 00 01 */ li r0, 1 -/* 802F5C4C 98 1E 00 B0 */ stb r0, 0xb0(r30) -/* 802F5C50 90 9E 00 14 */ stw r4, 0x14(r30) -/* 802F5C54 90 9E 00 10 */ stw r4, 0x10(r30) -/* 802F5C58 90 9E 00 1C */ stw r4, 0x1c(r30) -/* 802F5C5C 90 9E 00 18 */ stw r4, 0x18(r30) -/* 802F5C60 C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F5C64 D0 1E 00 20 */ stfs f0, 0x20(r30) -/* 802F5C68 D0 1E 00 24 */ stfs f0, 0x24(r30) -/* 802F5C6C D0 1E 00 28 */ stfs f0, 0x28(r30) -/* 802F5C70 D0 1E 00 2C */ stfs f0, 0x2c(r30) -/* 802F5C74 7F C3 F3 78 */ mr r3, r30 -/* 802F5C78 48 00 00 41 */ bl initiate__7J2DPaneFv -/* 802F5C7C 7F C3 F3 78 */ mr r3, r30 -/* 802F5C80 38 80 00 00 */ li r4, 0 -/* 802F5C84 48 00 07 75 */ bl changeUseTrans__7J2DPaneFP7J2DPane -/* 802F5C88 7F C3 F3 78 */ mr r3, r30 -/* 802F5C8C 81 9E 00 00 */ lwz r12, 0(r30) -/* 802F5C90 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F5C94 7D 89 03 A6 */ mtctr r12 -/* 802F5C98 4E 80 04 21 */ bctrl -/* 802F5C9C 7F C3 F3 78 */ mr r3, r30 -/* 802F5CA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F5CA4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F5CA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F5CAC 7C 08 03 A6 */ mtlr r0 -/* 802F5CB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F5CB4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/add__7J2DPaneFff.s b/asm/JSystem/J2DGraph/J2DPane/add__7J2DPaneFff.s deleted file mode 100644 index c99077fd66..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/add__7J2DPaneFff.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_802F6FB4: -/* 802F6FB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F6FB8 7C 08 02 A6 */ mflr r0 -/* 802F6FBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F6FC0 C0 03 00 D4 */ lfs f0, 0xd4(r3) -/* 802F6FC4 EC 00 08 2A */ fadds f0, f0, f1 -/* 802F6FC8 D0 03 00 D4 */ stfs f0, 0xd4(r3) -/* 802F6FCC C0 03 00 D8 */ lfs f0, 0xd8(r3) -/* 802F6FD0 EC 00 10 2A */ fadds f0, f0, f2 -/* 802F6FD4 D0 03 00 D8 */ stfs f0, 0xd8(r3) -/* 802F6FD8 81 83 00 00 */ lwz r12, 0(r3) -/* 802F6FDC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F6FE0 7D 89 03 A6 */ mtctr r12 -/* 802F6FE4 4E 80 04 21 */ bctrl -/* 802F6FE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F6FEC 7C 08 03 A6 */ mtlr r0 -/* 802F6FF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F6FF4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/animationPane__7J2DPaneFPC15J2DAnmTransform.s b/asm/JSystem/J2DGraph/J2DPane/animationPane__7J2DPaneFPC15J2DAnmTransform.s deleted file mode 100644 index 96c15c2282..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/animationPane__7J2DPaneFPC15J2DAnmTransform.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_802F8228: -/* 802F8228 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F822C 7C 08 02 A6 */ mflr r0 -/* 802F8230 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F8234 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8238 48 06 9F A5 */ bl _savegpr_29 -/* 802F823C 7C 7D 1B 78 */ mr r29, r3 -/* 802F8240 7C 9E 23 78 */ mr r30, r4 -/* 802F8244 80 03 00 F8 */ lwz r0, 0xf8(r3) -/* 802F8248 28 00 00 00 */ cmplwi r0, 0 -/* 802F824C 41 82 00 08 */ beq lbl_802F8254 -/* 802F8250 7C 1E 03 78 */ mr r30, r0 -lbl_802F8254: -/* 802F8254 83 FD 00 DC */ lwz r31, 0xdc(r29) -/* 802F8258 28 1F 00 00 */ cmplwi r31, 0 -/* 802F825C 41 82 00 34 */ beq lbl_802F8290 -/* 802F8260 3B FF FF F4 */ addi r31, r31, -12 -/* 802F8264 48 00 00 2C */ b lbl_802F8290 -lbl_802F8268: -/* 802F8268 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F826C 7F C4 F3 78 */ mr r4, r30 -/* 802F8270 81 83 00 00 */ lwz r12, 0(r3) -/* 802F8274 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 802F8278 7D 89 03 A6 */ mtctr r12 -/* 802F827C 4E 80 04 21 */ bctrl -/* 802F8280 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F8284 28 1F 00 00 */ cmplwi r31, 0 -/* 802F8288 41 82 00 08 */ beq lbl_802F8290 -/* 802F828C 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F8290: -/* 802F8290 28 1F 00 00 */ cmplwi r31, 0 -/* 802F8294 40 82 FF D4 */ bne lbl_802F8268 -/* 802F8298 7F A3 EB 78 */ mr r3, r29 -/* 802F829C 7F C4 F3 78 */ mr r4, r30 -/* 802F82A0 48 00 00 21 */ bl updateTransform__7J2DPaneFPC15J2DAnmTransform -/* 802F82A4 7F C3 F3 78 */ mr r3, r30 -/* 802F82A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F82AC 48 06 9F 7D */ bl _restgpr_29 -/* 802F82B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F82B4 7C 08 03 A6 */ mtlr r0 -/* 802F82B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F82BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/animationTransform__7J2DPaneFPC15J2DAnmTransform.s b/asm/JSystem/J2DGraph/J2DPane/animationTransform__7J2DPaneFPC15J2DAnmTransform.s deleted file mode 100644 index df558edbb6..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/animationTransform__7J2DPaneFPC15J2DAnmTransform.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_802F8080: -/* 802F8080 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F8084 7C 08 02 A6 */ mflr r0 -/* 802F8088 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F808C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8090 48 06 A1 4D */ bl _savegpr_29 -/* 802F8094 7C 7D 1B 78 */ mr r29, r3 -/* 802F8098 7C 9E 23 78 */ mr r30, r4 -/* 802F809C 80 03 00 F8 */ lwz r0, 0xf8(r3) -/* 802F80A0 28 00 00 00 */ cmplwi r0, 0 -/* 802F80A4 41 82 00 08 */ beq lbl_802F80AC -/* 802F80A8 7C 1E 03 78 */ mr r30, r0 -lbl_802F80AC: -/* 802F80AC 83 FD 00 DC */ lwz r31, 0xdc(r29) -/* 802F80B0 28 1F 00 00 */ cmplwi r31, 0 -/* 802F80B4 41 82 00 34 */ beq lbl_802F80E8 -/* 802F80B8 3B FF FF F4 */ addi r31, r31, -12 -/* 802F80BC 48 00 00 2C */ b lbl_802F80E8 -lbl_802F80C0: -/* 802F80C0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F80C4 7F C4 F3 78 */ mr r4, r30 -/* 802F80C8 81 83 00 00 */ lwz r12, 0(r3) -/* 802F80CC 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 802F80D0 7D 89 03 A6 */ mtctr r12 -/* 802F80D4 4E 80 04 21 */ bctrl -/* 802F80D8 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F80DC 28 1F 00 00 */ cmplwi r31, 0 -/* 802F80E0 41 82 00 08 */ beq lbl_802F80E8 -/* 802F80E4 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F80E8: -/* 802F80E8 28 1F 00 00 */ cmplwi r31, 0 -/* 802F80EC 40 82 FF D4 */ bne lbl_802F80C0 -/* 802F80F0 7F A3 EB 78 */ mr r3, r29 -/* 802F80F4 7F C4 F3 78 */ mr r4, r30 -/* 802F80F8 48 00 01 C9 */ bl updateTransform__7J2DPaneFPC15J2DAnmTransform -/* 802F80FC 7F C3 F3 78 */ mr r3, r30 -/* 802F8100 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8104 48 06 A1 25 */ bl _restgpr_29 -/* 802F8108 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F810C 7C 08 03 A6 */ mtlr r0 -/* 802F8110 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F8114 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/animationTransform__7J2DPaneFv.s b/asm/JSystem/J2DGraph/J2DPane/animationTransform__7J2DPaneFv.s deleted file mode 100644 index 031dcd03ab..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/animationTransform__7J2DPaneFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802F7FCC: -/* 802F7FCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F7FD0 7C 08 02 A6 */ mflr r0 -/* 802F7FD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F7FD8 80 83 00 F8 */ lwz r4, 0xf8(r3) -/* 802F7FDC 28 04 00 00 */ cmplwi r4, 0 -/* 802F7FE0 41 82 00 14 */ beq lbl_802F7FF4 -/* 802F7FE4 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7FE8 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 802F7FEC 7D 89 03 A6 */ mtctr r12 -/* 802F7FF0 4E 80 04 21 */ bctrl -lbl_802F7FF4: -/* 802F7FF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F7FF8 7C 08 03 A6 */ mtlr r0 -/* 802F7FFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8000 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/appendChild__7J2DPaneFP7J2DPane.s b/asm/JSystem/J2DGraph/J2DPane/appendChild__7J2DPaneFP7J2DPane.s deleted file mode 100644 index 4596dfc58a..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/appendChild__7J2DPaneFP7J2DPane.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_802F666C: -/* 802F666C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F6670 7C 08 02 A6 */ mflr r0 -/* 802F6674 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F6678 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F667C 48 06 BB 5D */ bl _savegpr_28 -/* 802F6680 7C 7C 1B 78 */ mr r28, r3 -/* 802F6684 7C 9D 23 79 */ or. r29, r4, r4 -/* 802F6688 40 82 00 0C */ bne lbl_802F6694 -/* 802F668C 38 60 00 00 */ li r3, 0 -/* 802F6690 48 00 00 6C */ b lbl_802F66FC -lbl_802F6694: -/* 802F6694 7F A3 EB 78 */ mr r3, r29 -/* 802F6698 48 00 14 65 */ bl getParentPane__7J2DPaneFv -/* 802F669C 7C 7F 1B 78 */ mr r31, r3 -/* 802F66A0 34 9D 00 DC */ addic. r4, r29, 0xdc -/* 802F66A4 41 82 00 08 */ beq lbl_802F66AC -/* 802F66A8 38 84 00 0C */ addi r4, r4, 0xc -lbl_802F66AC: -/* 802F66AC 38 7C 00 DC */ addi r3, r28, 0xdc -/* 802F66B0 4B FE 58 9D */ bl append__10JSUPtrListFP10JSUPtrLink -/* 802F66B4 7C 7E 1B 78 */ mr r30, r3 -/* 802F66B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802F66BC 41 82 00 3C */ beq lbl_802F66F8 -/* 802F66C0 28 1F 00 00 */ cmplwi r31, 0 -/* 802F66C4 40 82 00 34 */ bne lbl_802F66F8 -/* 802F66C8 7F A3 EB 78 */ mr r3, r29 -/* 802F66CC C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 802F66D0 C0 5C 00 24 */ lfs f2, 0x24(r28) -/* 802F66D4 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F66D8 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802F66DC 7D 89 03 A6 */ mtctr r12 -/* 802F66E0 4E 80 04 21 */ bctrl -/* 802F66E4 7F A3 EB 78 */ mr r3, r29 -/* 802F66E8 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F66EC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F66F0 7D 89 03 A6 */ mtctr r12 -/* 802F66F4 4E 80 04 21 */ bctrl -lbl_802F66F8: -/* 802F66F8 7F C3 F3 78 */ mr r3, r30 -lbl_802F66FC: -/* 802F66FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F6700 48 06 BB 25 */ bl _restgpr_28 -/* 802F6704 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F6708 7C 08 03 A6 */ mtlr r0 -/* 802F670C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F6710 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/clearAnmTransform__7J2DPaneFv.s b/asm/JSystem/J2DGraph/J2DPane/clearAnmTransform__7J2DPaneFv.s deleted file mode 100644 index 097291e2e4..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/clearAnmTransform__7J2DPaneFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_802F8004: -/* 802F8004 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F8008 7C 08 02 A6 */ mflr r0 -/* 802F800C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F8010 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F8014 7C 7F 1B 78 */ mr r31, r3 -/* 802F8018 38 80 00 00 */ li r4, 0 -/* 802F801C 81 83 00 00 */ lwz r12, 0(r3) -/* 802F8020 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 802F8024 7D 89 03 A6 */ mtctr r12 -/* 802F8028 4E 80 04 21 */ bctrl -/* 802F802C 83 FF 00 DC */ lwz r31, 0xdc(r31) -/* 802F8030 28 1F 00 00 */ cmplwi r31, 0 -/* 802F8034 41 82 00 30 */ beq lbl_802F8064 -/* 802F8038 3B FF FF F4 */ addi r31, r31, -12 -/* 802F803C 48 00 00 28 */ b lbl_802F8064 -lbl_802F8040: -/* 802F8040 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F8044 81 83 00 00 */ lwz r12, 0(r3) -/* 802F8048 81 8C 00 54 */ lwz r12, 0x54(r12) -/* 802F804C 7D 89 03 A6 */ mtctr r12 -/* 802F8050 4E 80 04 21 */ bctrl -/* 802F8054 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F8058 28 1F 00 00 */ cmplwi r31, 0 -/* 802F805C 41 82 00 08 */ beq lbl_802F8064 -/* 802F8060 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F8064: -/* 802F8064 28 1F 00 00 */ cmplwi r31, 0 -/* 802F8068 40 82 FF D8 */ bne lbl_802F8040 -/* 802F806C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F8070 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F8074 7C 08 03 A6 */ mtlr r0 -/* 802F8078 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F807C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/getNextChildPane__7J2DPaneFv.s b/asm/JSystem/J2DGraph/J2DPane/getNextChildPane__7J2DPaneFv.s deleted file mode 100644 index 0ae888c233..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/getNextChildPane__7J2DPaneFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_802F7AC4: -/* 802F7AC4 80 83 00 F4 */ lwz r4, 0xf4(r3) -/* 802F7AC8 28 04 00 00 */ cmplwi r4, 0 -/* 802F7ACC 41 82 00 08 */ beq lbl_802F7AD4 -/* 802F7AD0 38 84 FF F4 */ addi r4, r4, -12 -lbl_802F7AD4: -/* 802F7AD4 28 04 00 00 */ cmplwi r4, 0 -/* 802F7AD8 40 82 00 0C */ bne lbl_802F7AE4 -/* 802F7ADC 38 60 00 00 */ li r3, 0 -/* 802F7AE0 4E 80 00 20 */ blr -lbl_802F7AE4: -/* 802F7AE4 80 63 00 F4 */ lwz r3, 0xf4(r3) -/* 802F7AE8 28 03 00 00 */ cmplwi r3, 0 -/* 802F7AEC 41 82 00 08 */ beq lbl_802F7AF4 -/* 802F7AF0 38 63 FF F4 */ addi r3, r3, -12 -lbl_802F7AF4: -/* 802F7AF4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802F7AF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/getParentPane__7J2DPaneFv.s b/asm/JSystem/J2DGraph/J2DPane/getParentPane__7J2DPaneFv.s deleted file mode 100644 index e33828c248..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/getParentPane__7J2DPaneFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802F7AFC: -/* 802F7AFC 80 63 00 EC */ lwz r3, 0xec(r3) -/* 802F7B00 28 03 00 00 */ cmplwi r3, 0 -/* 802F7B04 40 82 00 0C */ bne lbl_802F7B10 -/* 802F7B08 38 60 00 00 */ li r3, 0 -/* 802F7B0C 4E 80 00 20 */ blr -lbl_802F7B10: -/* 802F7B10 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802F7B14 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/initiate__7J2DPaneFv.s b/asm/JSystem/J2DGraph/J2DPane/initiate__7J2DPaneFv.s deleted file mode 100644 index 3e28ee7e58..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/initiate__7J2DPaneFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802F5CB8: -/* 802F5CB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F5CBC 7C 08 02 A6 */ mflr r0 -/* 802F5CC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F5CC4 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 802F5CC8 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 802F5CCC B0 03 00 04 */ sth r0, 4(r3) -/* 802F5CD0 C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F5CD4 D0 03 00 B8 */ stfs f0, 0xb8(r3) -/* 802F5CD8 D0 03 00 BC */ stfs f0, 0xbc(r3) -/* 802F5CDC D0 03 00 C0 */ stfs f0, 0xc0(r3) -/* 802F5CE0 D0 03 00 C4 */ stfs f0, 0xc4(r3) -/* 802F5CE4 D0 03 00 C8 */ stfs f0, 0xc8(r3) -/* 802F5CE8 38 A0 00 00 */ li r5, 0 -/* 802F5CEC 98 A3 00 B7 */ stb r5, 0xb7(r3) -/* 802F5CF0 38 00 00 7A */ li r0, 0x7a -/* 802F5CF4 98 03 00 B6 */ stb r0, 0xb6(r3) -/* 802F5CF8 C0 02 C7 F4 */ lfs f0, lit_1489(r2) -/* 802F5CFC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802F5D00 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802F5D04 98 A3 00 B1 */ stb r5, 0xb1(r3) -/* 802F5D08 38 80 00 FF */ li r4, 0xff -/* 802F5D0C 98 83 00 B2 */ stb r4, 0xb2(r3) -/* 802F5D10 38 00 00 01 */ li r0, 1 -/* 802F5D14 98 03 00 B4 */ stb r0, 0xb4(r3) -/* 802F5D18 98 83 00 B3 */ stb r4, 0xb3(r3) -/* 802F5D1C 98 A3 00 B5 */ stb r5, 0xb5(r3) -/* 802F5D20 81 83 00 00 */ lwz r12, 0(r3) -/* 802F5D24 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F5D28 7D 89 03 A6 */ mtctr r12 -/* 802F5D2C 4E 80 04 21 */ bctrl -/* 802F5D30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F5D34 7C 08 03 A6 */ mtlr r0 -/* 802F5D38 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F5D3C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/isUsed__7J2DPaneFPC7ResFONT.s b/asm/JSystem/J2DGraph/J2DPane/isUsed__7J2DPaneFPC7ResFONT.s deleted file mode 100644 index fdbc36e133..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/isUsed__7J2DPaneFPC7ResFONT.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_802F74B8: -/* 802F74B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F74BC 7C 08 02 A6 */ mflr r0 -/* 802F74C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F74C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F74C8 93 C1 00 08 */ stw r30, 8(r1) -/* 802F74CC 7C 9E 23 78 */ mr r30, r4 -/* 802F74D0 83 E3 00 DC */ lwz r31, 0xdc(r3) -/* 802F74D4 28 1F 00 00 */ cmplwi r31, 0 -/* 802F74D8 41 82 00 44 */ beq lbl_802F751C -/* 802F74DC 3B FF FF F4 */ addi r31, r31, -12 -/* 802F74E0 48 00 00 3C */ b lbl_802F751C -lbl_802F74E4: -/* 802F74E4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F74E8 7F C4 F3 78 */ mr r4, r30 -/* 802F74EC 81 83 00 00 */ lwz r12, 0(r3) -/* 802F74F0 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 802F74F4 7D 89 03 A6 */ mtctr r12 -/* 802F74F8 4E 80 04 21 */ bctrl -/* 802F74FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802F7500 41 82 00 0C */ beq lbl_802F750C -/* 802F7504 38 60 00 01 */ li r3, 1 -/* 802F7508 48 00 00 20 */ b lbl_802F7528 -lbl_802F750C: -/* 802F750C 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F7510 28 1F 00 00 */ cmplwi r31, 0 -/* 802F7514 41 82 00 08 */ beq lbl_802F751C -/* 802F7518 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F751C: -/* 802F751C 28 1F 00 00 */ cmplwi r31, 0 -/* 802F7520 40 82 FF C4 */ bne lbl_802F74E4 -/* 802F7524 38 60 00 00 */ li r3, 0 -lbl_802F7528: -/* 802F7528 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F752C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F7530 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F7534 7C 08 03 A6 */ mtlr r0 -/* 802F7538 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F753C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/isUsed__7J2DPaneFPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DPane/isUsed__7J2DPaneFPC7ResTIMG.s deleted file mode 100644 index c65a4128c9..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/isUsed__7J2DPaneFPC7ResTIMG.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_802F7430: -/* 802F7430 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F7434 7C 08 02 A6 */ mflr r0 -/* 802F7438 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F743C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F7440 93 C1 00 08 */ stw r30, 8(r1) -/* 802F7444 7C 9E 23 78 */ mr r30, r4 -/* 802F7448 83 E3 00 DC */ lwz r31, 0xdc(r3) -/* 802F744C 28 1F 00 00 */ cmplwi r31, 0 -/* 802F7450 41 82 00 44 */ beq lbl_802F7494 -/* 802F7454 3B FF FF F4 */ addi r31, r31, -12 -/* 802F7458 48 00 00 3C */ b lbl_802F7494 -lbl_802F745C: -/* 802F745C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F7460 7F C4 F3 78 */ mr r4, r30 -/* 802F7464 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7468 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 802F746C 7D 89 03 A6 */ mtctr r12 -/* 802F7470 4E 80 04 21 */ bctrl -/* 802F7474 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802F7478 41 82 00 0C */ beq lbl_802F7484 -/* 802F747C 38 60 00 01 */ li r3, 1 -/* 802F7480 48 00 00 20 */ b lbl_802F74A0 -lbl_802F7484: -/* 802F7484 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F7488 28 1F 00 00 */ cmplwi r31, 0 -/* 802F748C 41 82 00 08 */ beq lbl_802F7494 -/* 802F7490 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F7494: -/* 802F7494 28 1F 00 00 */ cmplwi r31, 0 -/* 802F7498 40 82 FF C4 */ bne lbl_802F745C -/* 802F749C 38 60 00 00 */ li r3, 0 -lbl_802F74A0: -/* 802F74A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F74A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F74A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F74AC 7C 08 03 A6 */ mtlr r0 -/* 802F74B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F74B4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/rotate__7J2DPaneFf.s b/asm/JSystem/J2DGraph/J2DPane/rotate__7J2DPaneFf.s deleted file mode 100644 index 04541b6824..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/rotate__7J2DPaneFf.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_802F720C: -/* 802F720C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F7210 7C 08 02 A6 */ mflr r0 -/* 802F7214 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F7218 88 03 00 B6 */ lbz r0, 0xb6(r3) -/* 802F721C 7C 00 07 74 */ extsb r0, r0 -/* 802F7220 2C 00 00 78 */ cmpwi r0, 0x78 -/* 802F7224 40 82 00 0C */ bne lbl_802F7230 -/* 802F7228 D0 23 00 B8 */ stfs f1, 0xb8(r3) -/* 802F722C 48 00 00 18 */ b lbl_802F7244 -lbl_802F7230: -/* 802F7230 2C 00 00 79 */ cmpwi r0, 0x79 -/* 802F7234 40 82 00 0C */ bne lbl_802F7240 -/* 802F7238 D0 23 00 BC */ stfs f1, 0xbc(r3) -/* 802F723C 48 00 00 08 */ b lbl_802F7244 -lbl_802F7240: -/* 802F7240 D0 23 00 C0 */ stfs f1, 0xc0(r3) -lbl_802F7244: -/* 802F7244 81 83 00 00 */ lwz r12, 0(r3) -/* 802F7248 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F724C 7D 89 03 A6 */ mtctr r12 -/* 802F7250 4E 80 04 21 */ bctrl -/* 802F7254 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F7258 7C 08 03 A6 */ mtlr r0 -/* 802F725C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F7260 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/rotate__7J2DPaneFff13J2DRotateAxisf.s b/asm/JSystem/J2DGraph/J2DPane/rotate__7J2DPaneFff13J2DRotateAxisf.s deleted file mode 100644 index f2bf6ccdfa..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/rotate__7J2DPaneFff13J2DRotateAxisf.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802F71DC: -/* 802F71DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F71E0 7C 08 02 A6 */ mflr r0 -/* 802F71E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F71E8 D0 23 00 C4 */ stfs f1, 0xc4(r3) -/* 802F71EC D0 43 00 C8 */ stfs f2, 0xc8(r3) -/* 802F71F0 98 83 00 B6 */ stb r4, 0xb6(r3) -/* 802F71F4 FC 20 18 90 */ fmr f1, f3 -/* 802F71F8 48 00 00 15 */ bl rotate__7J2DPaneFf -/* 802F71FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F7200 7C 08 03 A6 */ mtlr r0 -/* 802F7204 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F7208 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/searchUserInfo__7J2DPaneFUx.s b/asm/JSystem/J2DGraph/J2DPane/searchUserInfo__7J2DPaneFUx.s deleted file mode 100644 index b1691a43dd..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/searchUserInfo__7J2DPaneFUx.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802F7388: -/* 802F7388 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F738C 7C 08 02 A6 */ mflr r0 -/* 802F7390 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F7394 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F7398 48 06 AE 45 */ bl _savegpr_29 -/* 802F739C 7C BE 2B 78 */ mr r30, r5 -/* 802F73A0 7C DD 33 78 */ mr r29, r6 -/* 802F73A4 80 03 00 18 */ lwz r0, 0x18(r3) -/* 802F73A8 80 83 00 1C */ lwz r4, 0x1c(r3) -/* 802F73AC 7F A4 22 78 */ xor r4, r29, r4 -/* 802F73B0 7F C0 02 78 */ xor r0, r30, r0 -/* 802F73B4 7C 80 03 79 */ or. r0, r4, r0 -/* 802F73B8 40 82 00 08 */ bne lbl_802F73C0 -/* 802F73BC 48 00 00 5C */ b lbl_802F7418 -lbl_802F73C0: -/* 802F73C0 83 E3 00 DC */ lwz r31, 0xdc(r3) -/* 802F73C4 28 1F 00 00 */ cmplwi r31, 0 -/* 802F73C8 41 82 00 44 */ beq lbl_802F740C -/* 802F73CC 3B FF FF F4 */ addi r31, r31, -12 -/* 802F73D0 48 00 00 3C */ b lbl_802F740C -lbl_802F73D4: -/* 802F73D4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F73D8 7F A6 EB 78 */ mr r6, r29 -/* 802F73DC 7F C5 F3 78 */ mr r5, r30 -/* 802F73E0 81 83 00 00 */ lwz r12, 0(r3) -/* 802F73E4 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 802F73E8 7D 89 03 A6 */ mtctr r12 -/* 802F73EC 4E 80 04 21 */ bctrl -/* 802F73F0 28 03 00 00 */ cmplwi r3, 0 -/* 802F73F4 41 82 00 08 */ beq lbl_802F73FC -/* 802F73F8 48 00 00 20 */ b lbl_802F7418 -lbl_802F73FC: -/* 802F73FC 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F7400 28 1F 00 00 */ cmplwi r31, 0 -/* 802F7404 41 82 00 08 */ beq lbl_802F740C -/* 802F7408 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F740C: -/* 802F740C 28 1F 00 00 */ cmplwi r31, 0 -/* 802F7410 40 82 FF C4 */ bne lbl_802F73D4 -/* 802F7414 38 60 00 00 */ li r3, 0 -lbl_802F7418: -/* 802F7418 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F741C 48 06 AE 0D */ bl _restgpr_29 -/* 802F7420 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F7424 7C 08 03 A6 */ mtlr r0 -/* 802F7428 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F742C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/search__7J2DPaneFUx.s b/asm/JSystem/J2DGraph/J2DPane/search__7J2DPaneFUx.s deleted file mode 100644 index c17b391b60..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/search__7J2DPaneFUx.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802F72E0: -/* 802F72E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F72E4 7C 08 02 A6 */ mflr r0 -/* 802F72E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F72EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F72F0 48 06 AE ED */ bl _savegpr_29 -/* 802F72F4 7C BE 2B 78 */ mr r30, r5 -/* 802F72F8 7C DD 33 78 */ mr r29, r6 -/* 802F72FC 80 03 00 10 */ lwz r0, 0x10(r3) -/* 802F7300 80 83 00 14 */ lwz r4, 0x14(r3) -/* 802F7304 7F A4 22 78 */ xor r4, r29, r4 -/* 802F7308 7F C0 02 78 */ xor r0, r30, r0 -/* 802F730C 7C 80 03 79 */ or. r0, r4, r0 -/* 802F7310 40 82 00 08 */ bne lbl_802F7318 -/* 802F7314 48 00 00 5C */ b lbl_802F7370 -lbl_802F7318: -/* 802F7318 83 E3 00 DC */ lwz r31, 0xdc(r3) -/* 802F731C 28 1F 00 00 */ cmplwi r31, 0 -/* 802F7320 41 82 00 44 */ beq lbl_802F7364 -/* 802F7324 3B FF FF F4 */ addi r31, r31, -12 -/* 802F7328 48 00 00 3C */ b lbl_802F7364 -lbl_802F732C: -/* 802F732C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F7330 7F A6 EB 78 */ mr r6, r29 -/* 802F7334 7F C5 F3 78 */ mr r5, r30 -/* 802F7338 81 83 00 00 */ lwz r12, 0(r3) -/* 802F733C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802F7340 7D 89 03 A6 */ mtctr r12 -/* 802F7344 4E 80 04 21 */ bctrl -/* 802F7348 28 03 00 00 */ cmplwi r3, 0 -/* 802F734C 41 82 00 08 */ beq lbl_802F7354 -/* 802F7350 48 00 00 20 */ b lbl_802F7370 -lbl_802F7354: -/* 802F7354 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F7358 28 1F 00 00 */ cmplwi r31, 0 -/* 802F735C 41 82 00 08 */ beq lbl_802F7364 -/* 802F7360 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F7364: -/* 802F7364 28 1F 00 00 */ cmplwi r31, 0 -/* 802F7368 40 82 FF C4 */ bne lbl_802F732C -/* 802F736C 38 60 00 00 */ li r3, 0 -lbl_802F7370: -/* 802F7370 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F7374 48 06 AE B5 */ bl _restgpr_29 -/* 802F7378 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F737C 7C 08 03 A6 */ mtlr r0 -/* 802F7380 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F7384 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setAnimationVC__7J2DPaneFP14J2DAnmVtxColor.s b/asm/JSystem/J2DGraph/J2DPane/setAnimationVC__7J2DPaneFP14J2DAnmVtxColor.s deleted file mode 100644 index 33705c7a0f..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setAnimationVC__7J2DPaneFP14J2DAnmVtxColor.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F83FC: -/* 802F83FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F8400 7C 08 02 A6 */ mflr r0 -/* 802F8404 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F8408 81 83 00 00 */ lwz r12, 0(r3) -/* 802F840C 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 802F8410 7D 89 03 A6 */ mtctr r12 -/* 802F8414 4E 80 04 21 */ bctrl -/* 802F8418 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F841C 7C 08 03 A6 */ mtlr r0 -/* 802F8420 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8424 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull.s b/asm/JSystem/J2DGraph/J2DPane/setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull.s deleted file mode 100644 index ea0239f5a8..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F83D0: -/* 802F83D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F83D4 7C 08 02 A6 */ mflr r0 -/* 802F83D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F83DC 81 83 00 00 */ lwz r12, 0(r3) -/* 802F83E0 81 8C 00 74 */ lwz r12, 0x74(r12) -/* 802F83E4 7D 89 03 A6 */ mtctr r12 -/* 802F83E8 4E 80 04 21 */ bctrl -/* 802F83EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F83F0 7C 08 03 A6 */ mtlr r0 -/* 802F83F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F83F8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setBasePosition__7J2DPaneF15J2DBasePosition.s b/asm/JSystem/J2DGraph/J2DPane/setBasePosition__7J2DPaneF15J2DBasePosition.s deleted file mode 100644 index aa51a89489..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setBasePosition__7J2DPaneF15J2DBasePosition.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_802F76F8: -/* 802F76F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F76FC 7C 08 02 A6 */ mflr r0 -/* 802F7700 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F7704 98 83 00 B7 */ stb r4, 0xb7(r3) -/* 802F7708 38 00 00 7A */ li r0, 0x7a -/* 802F770C 98 03 00 B6 */ stb r0, 0xb6(r3) -/* 802F7710 C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F7714 D0 03 00 C4 */ stfs f0, 0xc4(r3) -/* 802F7718 38 A0 00 03 */ li r5, 3 -/* 802F771C 7C 04 2B D6 */ divw r0, r4, r5 -/* 802F7720 7C 00 29 D6 */ mullw r0, r0, r5 -/* 802F7724 7C 00 20 50 */ subf r0, r0, r4 -/* 802F7728 2C 00 00 01 */ cmpwi r0, 1 -/* 802F772C 40 82 00 20 */ bne lbl_802F774C -/* 802F7730 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 802F7734 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F7738 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802F773C C0 02 C8 08 */ lfs f0, lit_1725(r2) -/* 802F7740 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802F7744 D0 03 00 C4 */ stfs f0, 0xc4(r3) -/* 802F7748 48 00 00 1C */ b lbl_802F7764 -lbl_802F774C: -/* 802F774C 2C 00 00 02 */ cmpwi r0, 2 -/* 802F7750 40 82 00 14 */ bne lbl_802F7764 -/* 802F7754 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 802F7758 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802F775C EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F7760 D0 03 00 C4 */ stfs f0, 0xc4(r3) -lbl_802F7764: -/* 802F7764 C0 02 C7 F0 */ lfs f0, lit_1469(r2) -/* 802F7768 D0 03 00 C8 */ stfs f0, 0xc8(r3) -/* 802F776C 38 00 00 03 */ li r0, 3 -/* 802F7770 7C 04 03 D6 */ divw r0, r4, r0 -/* 802F7774 2C 00 00 01 */ cmpwi r0, 1 -/* 802F7778 40 82 00 20 */ bne lbl_802F7798 -/* 802F777C C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802F7780 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F7784 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802F7788 C0 02 C8 08 */ lfs f0, lit_1725(r2) -/* 802F778C EC 01 00 32 */ fmuls f0, f1, f0 -/* 802F7790 D0 03 00 C8 */ stfs f0, 0xc8(r3) -/* 802F7794 48 00 00 1C */ b lbl_802F77B0 -lbl_802F7798: -/* 802F7798 2C 00 00 02 */ cmpwi r0, 2 -/* 802F779C 40 82 00 14 */ bne lbl_802F77B0 -/* 802F77A0 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802F77A4 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F77A8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F77AC D0 03 00 C8 */ stfs f0, 0xc8(r3) -lbl_802F77B0: -/* 802F77B0 81 83 00 00 */ lwz r12, 0(r3) -/* 802F77B4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F77B8 7D 89 03 A6 */ mtctr r12 -/* 802F77BC 4E 80 04 21 */ bctrl -/* 802F77C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F77C4 7C 08 03 A6 */ mtlr r0 -/* 802F77C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F77CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setConnectParent__7J2DPaneFb.s b/asm/JSystem/J2DGraph/J2DPane/setConnectParent__7J2DPaneFb.s deleted file mode 100644 index 4849260bf8..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setConnectParent__7J2DPaneFb.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F8464: -/* 802F8464 38 00 00 00 */ li r0, 0 -/* 802F8468 98 03 00 B5 */ stb r0, 0xb5(r3) -/* 802F846C 38 60 00 00 */ li r3, 0 -/* 802F8470 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setCullBack__7J2DPaneF11_GXCullMode.s b/asm/JSystem/J2DGraph/J2DPane/setCullBack__7J2DPaneF11_GXCullMode.s deleted file mode 100644 index a6f2ab11d7..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setCullBack__7J2DPaneF11_GXCullMode.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802F7680: -/* 802F7680 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F7684 7C 08 02 A6 */ mflr r0 -/* 802F7688 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F768C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F7690 93 C1 00 08 */ stw r30, 8(r1) -/* 802F7694 7C 9E 23 78 */ mr r30, r4 -/* 802F7698 9B C3 00 B1 */ stb r30, 0xb1(r3) -/* 802F769C 83 E3 00 DC */ lwz r31, 0xdc(r3) -/* 802F76A0 28 1F 00 00 */ cmplwi r31, 0 -/* 802F76A4 41 82 00 34 */ beq lbl_802F76D8 -/* 802F76A8 3B FF FF F4 */ addi r31, r31, -12 -/* 802F76AC 48 00 00 2C */ b lbl_802F76D8 -lbl_802F76B0: -/* 802F76B0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F76B4 7F C4 F3 78 */ mr r4, r30 -/* 802F76B8 81 83 00 00 */ lwz r12, 0(r3) -/* 802F76BC 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802F76C0 7D 89 03 A6 */ mtctr r12 -/* 802F76C4 4E 80 04 21 */ bctrl -/* 802F76C8 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F76CC 28 1F 00 00 */ cmplwi r31, 0 -/* 802F76D0 41 82 00 08 */ beq lbl_802F76D8 -/* 802F76D4 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F76D8: -/* 802F76D8 28 1F 00 00 */ cmplwi r31, 0 -/* 802F76DC 40 82 FF D4 */ bne lbl_802F76B0 -/* 802F76E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F76E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F76E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F76EC 7C 08 03 A6 */ mtlr r0 -/* 802F76F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F76F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setCullBack__7J2DPaneFb.s b/asm/JSystem/J2DGraph/J2DPane/setCullBack__7J2DPaneFb.s deleted file mode 100644 index 5f6b23a212..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setCullBack__7J2DPaneFb.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_802F8428: -/* 802F8428 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F842C 7C 08 02 A6 */ mflr r0 -/* 802F8430 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F8434 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802F8438 38 80 00 00 */ li r4, 0 -/* 802F843C 41 82 00 08 */ beq lbl_802F8444 -/* 802F8440 38 80 00 02 */ li r4, 2 -lbl_802F8444: -/* 802F8444 81 83 00 00 */ lwz r12, 0(r3) -/* 802F8448 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802F844C 7D 89 03 A6 */ mtctr r12 -/* 802F8450 4E 80 04 21 */ bctrl -/* 802F8454 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F8458 7C 08 03 A6 */ mtlr r0 -/* 802F845C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8460 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull.s b/asm/JSystem/J2DGraph/J2DPane/setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull.s deleted file mode 100644 index 28384a8b2d..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_802F8118: -/* 802F8118 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F811C 7C 08 02 A6 */ mflr r0 -/* 802F8120 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F8124 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F8128 93 C1 00 08 */ stw r30, 8(r1) -/* 802F812C 7C 7F 1B 78 */ mr r31, r3 -/* 802F8130 7C 9E 23 78 */ mr r30, r4 -/* 802F8134 81 83 00 00 */ lwz r12, 0(r3) -/* 802F8138 81 8C 00 84 */ lwz r12, 0x84(r12) -/* 802F813C 7D 89 03 A6 */ mtctr r12 -/* 802F8140 4E 80 04 21 */ bctrl -/* 802F8144 83 FF 00 DC */ lwz r31, 0xdc(r31) -/* 802F8148 28 1F 00 00 */ cmplwi r31, 0 -/* 802F814C 41 82 00 34 */ beq lbl_802F8180 -/* 802F8150 3B FF FF F4 */ addi r31, r31, -12 -/* 802F8154 48 00 00 2C */ b lbl_802F8180 -lbl_802F8158: -/* 802F8158 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F815C 7F C4 F3 78 */ mr r4, r30 -/* 802F8160 81 83 00 00 */ lwz r12, 0(r3) -/* 802F8164 81 8C 00 80 */ lwz r12, 0x80(r12) -/* 802F8168 7D 89 03 A6 */ mtctr r12 -/* 802F816C 4E 80 04 21 */ bctrl -/* 802F8170 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F8174 28 1F 00 00 */ cmplwi r31, 0 -/* 802F8178 41 82 00 08 */ beq lbl_802F8180 -/* 802F817C 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F8180: -/* 802F8180 28 1F 00 00 */ cmplwi r31, 0 -/* 802F8184 40 82 FF D4 */ bne lbl_802F8158 -/* 802F8188 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F818C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F8190 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F8194 7C 08 03 A6 */ mtlr r0 -/* 802F8198 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F819C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPane/setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor.s b/asm/JSystem/J2DGraph/J2DPane/setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor.s deleted file mode 100644 index 50b2b0fdbd..0000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_802F81A0: -/* 802F81A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F81A4 7C 08 02 A6 */ mflr r0 -/* 802F81A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F81AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F81B0 93 C1 00 08 */ stw r30, 8(r1) -/* 802F81B4 7C 7F 1B 78 */ mr r31, r3 -/* 802F81B8 7C 9E 23 78 */ mr r30, r4 -/* 802F81BC 81 83 00 00 */ lwz r12, 0(r3) -/* 802F81C0 81 8C 00 8C */ lwz r12, 0x8c(r12) -/* 802F81C4 7D 89 03 A6 */ mtctr r12 -/* 802F81C8 4E 80 04 21 */ bctrl -/* 802F81CC 83 FF 00 DC */ lwz r31, 0xdc(r31) -/* 802F81D0 28 1F 00 00 */ cmplwi r31, 0 -/* 802F81D4 41 82 00 34 */ beq lbl_802F8208 -/* 802F81D8 3B FF FF F4 */ addi r31, r31, -12 -/* 802F81DC 48 00 00 2C */ b lbl_802F8208 -lbl_802F81E0: -/* 802F81E0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802F81E4 7F C4 F3 78 */ mr r4, r30 -/* 802F81E8 81 83 00 00 */ lwz r12, 0(r3) -/* 802F81EC 81 8C 00 88 */ lwz r12, 0x88(r12) -/* 802F81F0 7D 89 03 A6 */ mtctr r12 -/* 802F81F4 4E 80 04 21 */ bctrl -/* 802F81F8 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802F81FC 28 1F 00 00 */ cmplwi r31, 0 -/* 802F8200 41 82 00 08 */ beq lbl_802F8208 -/* 802F8204 3B FF FF F4 */ addi r31, r31, -12 -lbl_802F8208: -/* 802F8208 28 1F 00 00 */ cmplwi r31, 0 -/* 802F820C 40 82 FF D4 */ bne lbl_802F81E0 -/* 802F8210 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F8214 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F8218 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F821C 7C 08 03 A6 */ mtlr r0 -/* 802F8220 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8224 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/__dt__10J2DPictureFv.s b/asm/JSystem/J2DGraph/J2DPicture/__dt__10J2DPictureFv.s deleted file mode 100644 index ed1cefdcf6..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/__dt__10J2DPictureFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_802FCFF0: -/* 802FCFF0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802FCFF4 7C 08 02 A6 */ mflr r0 -/* 802FCFF8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FCFFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD000 48 06 51 D5 */ bl _savegpr_27 -/* 802FD004 7C 7B 1B 79 */ or. r27, r3, r3 -/* 802FD008 7C 9C 23 78 */ mr r28, r4 -/* 802FD00C 41 82 00 70 */ beq lbl_802FD07C -/* 802FD010 3C 60 80 3D */ lis r3, __vt__10J2DPicture@ha /* 0x803CD1D8@ha */ -/* 802FD014 38 03 D1 D8 */ addi r0, r3, __vt__10J2DPicture@l /* 0x803CD1D8@l */ -/* 802FD018 90 1B 00 00 */ stw r0, 0(r27) -/* 802FD01C 3B A0 00 00 */ li r29, 0 -/* 802FD020 3B E0 00 00 */ li r31, 0 -/* 802FD024 3B C0 00 01 */ li r30, 1 -lbl_802FD028: -/* 802FD028 88 7B 01 09 */ lbz r3, 0x109(r27) -/* 802FD02C 7F C0 E8 30 */ slw r0, r30, r29 -/* 802FD030 7C 60 00 39 */ and. r0, r3, r0 -/* 802FD034 41 82 00 14 */ beq lbl_802FD048 -/* 802FD038 38 1F 01 00 */ addi r0, r31, 0x100 -/* 802FD03C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802FD040 38 80 00 01 */ li r4, 1 -/* 802FD044 4B FE 11 F1 */ bl __dt__10JUTTextureFv -lbl_802FD048: -/* 802FD048 3B BD 00 01 */ addi r29, r29, 1 -/* 802FD04C 2C 1D 00 02 */ cmpwi r29, 2 -/* 802FD050 3B FF 00 04 */ addi r31, r31, 4 -/* 802FD054 41 80 FF D4 */ blt lbl_802FD028 -/* 802FD058 80 7B 01 2C */ lwz r3, 0x12c(r27) -/* 802FD05C 4B FD 1C E1 */ bl __dl__FPv -/* 802FD060 7F 63 DB 78 */ mr r3, r27 -/* 802FD064 38 80 00 00 */ li r4, 0 -/* 802FD068 4B FF 95 25 */ bl __dt__7J2DPaneFv -/* 802FD06C 7F 80 07 35 */ extsh. r0, r28 -/* 802FD070 40 81 00 0C */ ble lbl_802FD07C -/* 802FD074 7F 63 DB 78 */ mr r3, r27 -/* 802FD078 4B FD 1C C5 */ bl __dl__FPv -lbl_802FD07C: -/* 802FD07C 7F 63 DB 78 */ mr r3, r27 -/* 802FD080 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD084 48 06 51 9D */ bl _restgpr_27 -/* 802FD088 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FD08C 7C 08 03 A6 */ mtlr r0 -/* 802FD090 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FD094 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFP10JUTTexturef.s b/asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFP10JUTTexturef.s deleted file mode 100644 index e525c826e8..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFP10JUTTexturef.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802FF208: -/* 802FF208 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF20C 7C 08 02 A6 */ mflr r0 -/* 802FF210 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF214 88 A3 01 08 */ lbz r5, 0x108(r3) -/* 802FF218 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF21C 81 8C 00 D4 */ lwz r12, 0xd4(r12) -/* 802FF220 7D 89 03 A6 */ mtctr r12 -/* 802FF224 4E 80 04 21 */ bctrl -/* 802FF228 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF22C 7C 08 03 A6 */ mtlr r0 -/* 802FF230 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF234 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFPC7ResTIMGP10JUTPalettef.s b/asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFPC7ResTIMGP10JUTPalettef.s deleted file mode 100644 index bb912c5ea8..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFPC7ResTIMGP10JUTPalettef.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802FF238: -/* 802FF238 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF23C 7C 08 02 A6 */ mflr r0 -/* 802FF240 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF244 88 C3 01 08 */ lbz r6, 0x108(r3) -/* 802FF248 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF24C 81 8C 00 C8 */ lwz r12, 0xc8(r12) -/* 802FF250 7D 89 03 A6 */ mtctr r12 -/* 802FF254 4E 80 04 21 */ bctrl -/* 802FF258 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF25C 7C 08 03 A6 */ mtlr r0 -/* 802FF260 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF264 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFPCcP10JUTPalettef.s b/asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFPCcP10JUTPalettef.s deleted file mode 100644 index ca96321e3d..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFPCcP10JUTPalettef.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802FF2F0: -/* 802FF2F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF2F4 7C 08 02 A6 */ mflr r0 -/* 802FF2F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF2FC 88 C3 01 08 */ lbz r6, 0x108(r3) -/* 802FF300 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF304 81 8C 00 D0 */ lwz r12, 0xd0(r12) -/* 802FF308 7D 89 03 A6 */ mtctr r12 -/* 802FF30C 4E 80 04 21 */ bctrl -/* 802FF310 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF314 7C 08 03 A6 */ mtlr r0 -/* 802FF318 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF31C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPCcUc.s b/asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPCcUc.s deleted file mode 100644 index 4ab1e4a84c..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPCcUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802FD964: -/* 802FD964 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FD968 7C 08 02 A6 */ mflr r0 -/* 802FD96C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FD970 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802FD974 93 C1 00 08 */ stw r30, 8(r1) -/* 802FD978 7C 7E 1B 78 */ mr r30, r3 -/* 802FD97C 7C BF 2B 78 */ mr r31, r5 -/* 802FD980 7C 83 23 78 */ mr r3, r4 -/* 802FD984 4B FF BC BD */ bl getNameResource__9J2DScreenFPCc -/* 802FD988 7C 64 1B 78 */ mr r4, r3 -/* 802FD98C 7F C3 F3 78 */ mr r3, r30 -/* 802FD990 7F E5 FB 78 */ mr r5, r31 -/* 802FD994 81 9E 00 00 */ lwz r12, 0(r30) -/* 802FD998 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 802FD99C 7D 89 03 A6 */ mtctr r12 -/* 802FD9A0 4E 80 04 21 */ bctrl -/* 802FD9A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802FD9A8 83 C1 00 08 */ lwz r30, 8(r1) -/* 802FD9AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FD9B0 7C 08 03 A6 */ mtlr r0 -/* 802FD9B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FD9B8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPCcUcP10JUTPalette.s b/asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPCcUcP10JUTPalette.s deleted file mode 100644 index 45d3e8c026..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPCcUcP10JUTPalette.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_802FDAC8: -/* 802FDAC8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802FDACC 7C 08 02 A6 */ mflr r0 -/* 802FDAD0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FDAD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FDAD8 48 06 47 05 */ bl _savegpr_29 -/* 802FDADC 7C 7D 1B 78 */ mr r29, r3 -/* 802FDAE0 7C BE 2B 78 */ mr r30, r5 -/* 802FDAE4 7C DF 33 78 */ mr r31, r6 -/* 802FDAE8 7C 83 23 78 */ mr r3, r4 -/* 802FDAEC 4B FF BB 55 */ bl getNameResource__9J2DScreenFPCc -/* 802FDAF0 7C 64 1B 78 */ mr r4, r3 -/* 802FDAF4 7F A3 EB 78 */ mr r3, r29 -/* 802FDAF8 7F C5 F3 78 */ mr r5, r30 -/* 802FDAFC 7F E6 FB 78 */ mr r6, r31 -/* 802FDB00 81 9D 00 00 */ lwz r12, 0(r29) -/* 802FDB04 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 802FDB08 7D 89 03 A6 */ mtctr r12 -/* 802FDB0C 4E 80 04 21 */ bctrl -/* 802FDB10 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FDB14 48 06 47 15 */ bl _restgpr_29 -/* 802FDB18 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FDB1C 7C 08 03 A6 */ mtlr r0 -/* 802FDB20 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FDB24 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/drawFullSet__10J2DPictureFffffPA3_A4_f.s b/asm/JSystem/J2DGraph/J2DPicture/drawFullSet__10J2DPictureFffffPA3_A4_f.s deleted file mode 100644 index f3d1601be2..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/drawFullSet__10J2DPictureFffffPA3_A4_f.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_802FDBFC: -/* 802FDBFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FDC00 7C 08 02 A6 */ mflr r0 -/* 802FDC04 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FDC08 80 03 01 00 */ lwz r0, 0x100(r3) -/* 802FDC0C 28 00 00 00 */ cmplwi r0, 0 -/* 802FDC10 41 82 00 50 */ beq lbl_802FDC60 -/* 802FDC14 88 03 01 08 */ lbz r0, 0x108(r3) -/* 802FDC18 28 00 00 00 */ cmplwi r0, 0 -/* 802FDC1C 41 82 00 44 */ beq lbl_802FDC60 -/* 802FDC20 A8 03 01 18 */ lha r0, 0x118(r3) -/* 802FDC24 90 01 00 08 */ stw r0, 8(r1) -/* 802FDC28 90 81 00 0C */ stw r4, 0xc(r1) -/* 802FDC2C C0 23 00 20 */ lfs f1, 0x20(r3) -/* 802FDC30 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 802FDC34 A8 83 01 0A */ lha r4, 0x10a(r3) -/* 802FDC38 A8 A3 01 0C */ lha r5, 0x10c(r3) -/* 802FDC3C A8 C3 01 0E */ lha r6, 0x10e(r3) -/* 802FDC40 A8 E3 01 10 */ lha r7, 0x110(r3) -/* 802FDC44 A9 03 01 12 */ lha r8, 0x112(r3) -/* 802FDC48 A9 23 01 14 */ lha r9, 0x114(r3) -/* 802FDC4C A9 43 01 16 */ lha r10, 0x116(r3) -/* 802FDC50 81 83 00 00 */ lwz r12, 0(r3) -/* 802FDC54 81 8C 01 44 */ lwz r12, 0x144(r12) -/* 802FDC58 7D 89 03 A6 */ mtctr r12 -/* 802FDC5C 4E 80 04 21 */ bctrl -lbl_802FDC60: -/* 802FDC60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FDC64 7C 08 03 A6 */ mtlr r0 -/* 802FDC68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FDC6C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/drawSelf__10J2DPictureFff.s b/asm/JSystem/J2DGraph/J2DPicture/drawSelf__10J2DPictureFff.s deleted file mode 100644 index 291218bf5a..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/drawSelf__10J2DPictureFff.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802FDB28: -/* 802FDB28 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802FDB2C 7C 08 02 A6 */ mflr r0 -/* 802FDB30 90 01 00 54 */ stw r0, 0x54(r1) -/* 802FDB34 DB E1 00 48 */ stfd f31, 0x48(r1) -/* 802FDB38 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 802FDB3C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 802FDB40 7C 7F 1B 78 */ mr r31, r3 -/* 802FDB44 FF C0 08 90 */ fmr f30, f1 -/* 802FDB48 FF E0 10 90 */ fmr f31, f2 -/* 802FDB4C 38 61 00 08 */ addi r3, r1, 8 -/* 802FDB50 48 04 89 35 */ bl PSMTXIdentity -/* 802FDB54 7F E3 FB 78 */ mr r3, r31 -/* 802FDB58 FC 20 F0 90 */ fmr f1, f30 -/* 802FDB5C FC 40 F8 90 */ fmr f2, f31 -/* 802FDB60 38 81 00 08 */ addi r4, r1, 8 -/* 802FDB64 81 9F 00 00 */ lwz r12, 0(r31) -/* 802FDB68 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 802FDB6C 7D 89 03 A6 */ mtctr r12 -/* 802FDB70 4E 80 04 21 */ bctrl -/* 802FDB74 CB E1 00 48 */ lfd f31, 0x48(r1) -/* 802FDB78 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 802FDB7C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 802FDB80 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802FDB84 7C 08 03 A6 */ mtlr r0 -/* 802FDB88 38 21 00 50 */ addi r1, r1, 0x50 -/* 802FDB8C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/drawSelf__10J2DPictureFffPA3_A4_f.s b/asm/JSystem/J2DGraph/J2DPicture/drawSelf__10J2DPictureFffPA3_A4_f.s deleted file mode 100644 index f4c25490b7..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/drawSelf__10J2DPictureFffPA3_A4_f.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_802FDB90: -/* 802FDB90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FDB94 7C 08 02 A6 */ mflr r0 -/* 802FDB98 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FDB9C 80 03 01 00 */ lwz r0, 0x100(r3) -/* 802FDBA0 28 00 00 00 */ cmplwi r0, 0 -/* 802FDBA4 41 82 00 48 */ beq lbl_802FDBEC -/* 802FDBA8 88 03 01 08 */ lbz r0, 0x108(r3) -/* 802FDBAC 28 00 00 00 */ cmplwi r0, 0 -/* 802FDBB0 41 82 00 3C */ beq lbl_802FDBEC -/* 802FDBB4 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 802FDBB8 EC 20 08 2A */ fadds f1, f0, f1 -/* 802FDBBC C0 03 00 34 */ lfs f0, 0x34(r3) -/* 802FDBC0 EC 40 10 2A */ fadds f2, f0, f2 -/* 802FDBC4 C0 63 00 28 */ lfs f3, 0x28(r3) -/* 802FDBC8 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802FDBCC EC 63 00 28 */ fsubs f3, f3, f0 -/* 802FDBD0 C0 83 00 2C */ lfs f4, 0x2c(r3) -/* 802FDBD4 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802FDBD8 EC 84 00 28 */ fsubs f4, f4, f0 -/* 802FDBDC 81 83 00 00 */ lwz r12, 0(r3) -/* 802FDBE0 81 8C 01 40 */ lwz r12, 0x140(r12) -/* 802FDBE4 7D 89 03 A6 */ mtctr r12 -/* 802FDBE8 4E 80 04 21 */ bctrl -lbl_802FDBEC: -/* 802FDBEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FDBF0 7C 08 03 A6 */ mtlr r0 -/* 802FDBF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FDBF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/getTextureCount__10J2DPictureCFv.s b/asm/JSystem/J2DGraph/J2DPicture/getTextureCount__10J2DPictureCFv.s deleted file mode 100644 index 73e65497fc..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/getTextureCount__10J2DPictureCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802FF634: -/* 802FF634 88 63 01 08 */ lbz r3, 0x108(r3) -/* 802FF638 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/insert__10J2DPictureFPCcP10JUTPaletteUcf.s b/asm/JSystem/J2DGraph/J2DPicture/insert__10J2DPictureFPCcP10JUTPaletteUcf.s deleted file mode 100644 index a6508ffeb8..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/insert__10J2DPictureFPCcP10JUTPaletteUcf.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_802FD4B4: -/* 802FD4B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802FD4B8 7C 08 02 A6 */ mflr r0 -/* 802FD4BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FD4C0 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 802FD4C4 39 61 00 18 */ addi r11, r1, 0x18 -/* 802FD4C8 48 06 4D 15 */ bl _savegpr_29 -/* 802FD4CC 7C 7D 1B 78 */ mr r29, r3 -/* 802FD4D0 7C BE 2B 78 */ mr r30, r5 -/* 802FD4D4 7C DF 33 78 */ mr r31, r6 -/* 802FD4D8 FF E0 08 90 */ fmr f31, f1 -/* 802FD4DC 7C 83 23 78 */ mr r3, r4 -/* 802FD4E0 4B FF C1 61 */ bl getNameResource__9J2DScreenFPCc -/* 802FD4E4 7C 64 1B 78 */ mr r4, r3 -/* 802FD4E8 7F A3 EB 78 */ mr r3, r29 -/* 802FD4EC 7F C5 F3 78 */ mr r5, r30 -/* 802FD4F0 7F E6 FB 78 */ mr r6, r31 -/* 802FD4F4 FC 20 F8 90 */ fmr f1, f31 -/* 802FD4F8 81 9D 00 00 */ lwz r12, 0(r29) -/* 802FD4FC 81 8C 00 C8 */ lwz r12, 0xc8(r12) -/* 802FD500 7D 89 03 A6 */ mtctr r12 -/* 802FD504 4E 80 04 21 */ bctrl -/* 802FD508 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 802FD50C 39 61 00 18 */ addi r11, r1, 0x18 -/* 802FD510 48 06 4D 19 */ bl _restgpr_29 -/* 802FD514 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FD518 7C 08 03 A6 */ mtlr r0 -/* 802FD51C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FD520 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/isUsed__10J2DPictureFPC7ResFONT.s b/asm/JSystem/J2DGraph/J2DPicture/isUsed__10J2DPictureFPC7ResFONT.s deleted file mode 100644 index c35ee664af..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/isUsed__10J2DPictureFPC7ResFONT.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802FF63C: -/* 802FF63C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF640 7C 08 02 A6 */ mflr r0 -/* 802FF644 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF648 4B FF 7E 71 */ bl isUsed__7J2DPaneFPC7ResFONT -/* 802FF64C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF650 7C 08 03 A6 */ mtlr r0 -/* 802FF654 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF658 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/isUsed__10J2DPictureFPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DPicture/isUsed__10J2DPictureFPC7ResTIMG.s deleted file mode 100644 index e6c606ea19..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/isUsed__10J2DPictureFPC7ResTIMG.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_802FF09C: -/* 802FF09C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF0A0 7C 08 02 A6 */ mflr r0 -/* 802FF0A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF0A8 38 E0 00 00 */ li r7, 0 -/* 802FF0AC 88 C3 01 08 */ lbz r6, 0x108(r3) -/* 802FF0B0 48 00 00 30 */ b lbl_802FF0E0 -lbl_802FF0B4: -/* 802FF0B4 54 E5 15 BA */ rlwinm r5, r7, 2, 0x16, 0x1d -/* 802FF0B8 38 05 01 00 */ addi r0, r5, 0x100 -/* 802FF0BC 7C A3 00 2E */ lwzx r5, r3, r0 -/* 802FF0C0 28 05 00 00 */ cmplwi r5, 0 -/* 802FF0C4 41 82 00 18 */ beq lbl_802FF0DC -/* 802FF0C8 80 05 00 20 */ lwz r0, 0x20(r5) -/* 802FF0CC 7C 00 20 40 */ cmplw r0, r4 -/* 802FF0D0 40 82 00 0C */ bne lbl_802FF0DC -/* 802FF0D4 38 60 00 01 */ li r3, 1 -/* 802FF0D8 48 00 00 18 */ b lbl_802FF0F0 -lbl_802FF0DC: -/* 802FF0DC 38 E7 00 01 */ addi r7, r7, 1 -lbl_802FF0E0: -/* 802FF0E0 54 E0 06 3E */ clrlwi r0, r7, 0x18 -/* 802FF0E4 7C 00 30 40 */ cmplw r0, r6 -/* 802FF0E8 41 80 FF CC */ blt lbl_802FF0B4 -/* 802FF0EC 4B FF 83 45 */ bl isUsed__7J2DPaneFPC7ResTIMG -lbl_802FF0F0: -/* 802FF0F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF0F4 7C 08 03 A6 */ mtlr r0 -/* 802FF0F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF0FC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/load__10J2DPictureF11_GXTexMapIDUc.s b/asm/JSystem/J2DGraph/J2DPicture/load__10J2DPictureF11_GXTexMapIDUc.s deleted file mode 100644 index 35b1bb90de..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/load__10J2DPictureF11_GXTexMapIDUc.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_802FF29C: -/* 802FF29C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF2A0 7C 08 02 A6 */ mflr r0 -/* 802FF2A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF2A8 54 A6 06 3E */ clrlwi r6, r5, 0x18 -/* 802FF2AC 88 03 01 08 */ lbz r0, 0x108(r3) -/* 802FF2B0 7C 06 00 40 */ cmplw r6, r0 -/* 802FF2B4 40 80 00 24 */ bge lbl_802FF2D8 -/* 802FF2B8 28 06 00 02 */ cmplwi r6, 2 -/* 802FF2BC 40 80 00 1C */ bge lbl_802FF2D8 -/* 802FF2C0 54 A0 15 BA */ rlwinm r0, r5, 2, 0x16, 0x1d -/* 802FF2C4 7C 63 02 14 */ add r3, r3, r0 -/* 802FF2C8 80 63 01 00 */ lwz r3, 0x100(r3) -/* 802FF2CC 28 03 00 00 */ cmplwi r3, 0 -/* 802FF2D0 41 82 00 08 */ beq lbl_802FF2D8 -/* 802FF2D4 4B FD F5 6D */ bl load__10JUTTextureF11_GXTexMapID -lbl_802FF2D8: -/* 802FF2D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF2DC 7C 08 03 A6 */ mtlr r0 -/* 802FF2E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF2E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/load__10J2DPictureFUc.s b/asm/JSystem/J2DGraph/J2DPicture/load__10J2DPictureFUc.s deleted file mode 100644 index a30405c1b0..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/load__10J2DPictureFUc.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_802FF268: -/* 802FF268 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF26C 7C 08 02 A6 */ mflr r0 -/* 802FF270 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF274 7C 85 23 78 */ mr r5, r4 -/* 802FF278 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 802FF27C 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF280 81 8C 00 FC */ lwz r12, 0xfc(r12) -/* 802FF284 7D 89 03 A6 */ mtctr r12 -/* 802FF288 4E 80 04 21 */ bctrl -/* 802FF28C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF290 7C 08 03 A6 */ mtlr r0 -/* 802FF294 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF298 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/prepareTexture__10J2DPictureFUc.s b/asm/JSystem/J2DGraph/J2DPicture/prepareTexture__10J2DPictureFUc.s deleted file mode 100644 index e5157efe7f..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/prepareTexture__10J2DPictureFUc.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_802FD098: -/* 802FD098 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802FD09C 7C 08 02 A6 */ mflr r0 -/* 802FD0A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FD0A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD0A8 48 06 51 31 */ bl _savegpr_28 -/* 802FD0AC 7C 7C 1B 78 */ mr r28, r3 -/* 802FD0B0 3B A0 00 00 */ li r29, 0 -/* 802FD0B4 54 9F 06 3E */ clrlwi r31, r4, 0x18 -/* 802FD0B8 48 00 00 88 */ b lbl_802FD140 -lbl_802FD0BC: -/* 802FD0BC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802FD0C0 28 00 00 02 */ cmplwi r0, 2 -/* 802FD0C4 41 80 00 0C */ blt lbl_802FD0D0 -/* 802FD0C8 38 60 00 00 */ li r3, 0 -/* 802FD0CC 48 00 00 84 */ b lbl_802FD150 -lbl_802FD0D0: -/* 802FD0D0 57 A3 15 BA */ rlwinm r3, r29, 2, 0x16, 0x1d -/* 802FD0D4 3B C3 01 00 */ addi r30, r3, 0x100 -/* 802FD0D8 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802FD0DC 28 00 00 00 */ cmplwi r0, 0 -/* 802FD0E0 40 82 00 5C */ bne lbl_802FD13C -/* 802FD0E4 38 60 00 40 */ li r3, 0x40 -/* 802FD0E8 4B FD 1B 65 */ bl __nw__FUl -/* 802FD0EC 28 03 00 00 */ cmplwi r3, 0 -/* 802FD0F0 41 82 00 1C */ beq lbl_802FD10C -/* 802FD0F4 88 03 00 3B */ lbz r0, 0x3b(r3) -/* 802FD0F8 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802FD0FC 98 03 00 3B */ stb r0, 0x3b(r3) -/* 802FD100 38 00 00 00 */ li r0, 0 -/* 802FD104 90 03 00 28 */ stw r0, 0x28(r3) -/* 802FD108 90 03 00 20 */ stw r0, 0x20(r3) -lbl_802FD10C: -/* 802FD10C 7C 7C F1 2E */ stwx r3, r28, r30 -/* 802FD110 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802FD114 28 00 00 00 */ cmplwi r0, 0 -/* 802FD118 40 82 00 0C */ bne lbl_802FD124 -/* 802FD11C 38 60 00 00 */ li r3, 0 -/* 802FD120 48 00 00 30 */ b lbl_802FD150 -lbl_802FD124: -/* 802FD124 88 9C 01 09 */ lbz r4, 0x109(r28) -/* 802FD128 38 60 00 01 */ li r3, 1 -/* 802FD12C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802FD130 7C 60 00 30 */ slw r0, r3, r0 -/* 802FD134 7C 80 03 78 */ or r0, r4, r0 -/* 802FD138 98 1C 01 09 */ stb r0, 0x109(r28) -lbl_802FD13C: -/* 802FD13C 3B BD 00 01 */ addi r29, r29, 1 -lbl_802FD140: -/* 802FD140 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802FD144 7C 00 F8 40 */ cmplw r0, r31 -/* 802FD148 41 80 FF 74 */ blt lbl_802FD0BC -/* 802FD14C 38 60 00 01 */ li r3, 1 -lbl_802FD150: -/* 802FD150 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD154 48 06 50 D1 */ bl _restgpr_28 -/* 802FD158 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FD15C 7C 08 03 A6 */ mtlr r0 -/* 802FD160 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FD164 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFP10JUTTexturef.s b/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFP10JUTTexturef.s deleted file mode 100644 index ac87e5dde6..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFP10JUTTexturef.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802FF320: -/* 802FF320 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF324 7C 08 02 A6 */ mflr r0 -/* 802FF328 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF32C 38 A0 00 00 */ li r5, 0 -/* 802FF330 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF334 81 8C 00 D4 */ lwz r12, 0xd4(r12) -/* 802FF338 7D 89 03 A6 */ mtctr r12 -/* 802FF33C 4E 80 04 21 */ bctrl -/* 802FF340 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF344 7C 08 03 A6 */ mtlr r0 -/* 802FF348 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF34C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef.s b/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef.s deleted file mode 100644 index 3583b16efe..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802FF3B0: -/* 802FF3B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF3B4 7C 08 02 A6 */ mflr r0 -/* 802FF3B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF3BC 38 C0 00 00 */ li r6, 0 -/* 802FF3C0 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF3C4 81 8C 00 C8 */ lwz r12, 0xc8(r12) -/* 802FF3C8 7D 89 03 A6 */ mtctr r12 -/* 802FF3CC 4E 80 04 21 */ bctrl -/* 802FF3D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF3D4 7C 08 03 A6 */ mtlr r0 -/* 802FF3D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF3DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPC7ResTIMGf.s b/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPC7ResTIMGf.s deleted file mode 100644 index dd5143622d..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPC7ResTIMGf.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802FF3E0: -/* 802FF3E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF3E4 7C 08 02 A6 */ mflr r0 -/* 802FF3E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF3EC 38 A0 00 00 */ li r5, 0 -/* 802FF3F0 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF3F4 81 8C 00 C4 */ lwz r12, 0xc4(r12) -/* 802FF3F8 7D 89 03 A6 */ mtctr r12 -/* 802FF3FC 4E 80 04 21 */ bctrl -/* 802FF400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF404 7C 08 03 A6 */ mtlr r0 -/* 802FF408 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF40C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPCcP10JUTPalettef.s b/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPCcP10JUTPalettef.s deleted file mode 100644 index 5128252afa..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPCcP10JUTPalettef.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802FF350: -/* 802FF350 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF354 7C 08 02 A6 */ mflr r0 -/* 802FF358 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF35C 38 C0 00 00 */ li r6, 0 -/* 802FF360 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF364 81 8C 00 D0 */ lwz r12, 0xd0(r12) -/* 802FF368 7D 89 03 A6 */ mtctr r12 -/* 802FF36C 4E 80 04 21 */ bctrl -/* 802FF370 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF374 7C 08 03 A6 */ mtlr r0 -/* 802FF378 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF37C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPCcf.s b/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPCcf.s deleted file mode 100644 index d4c2a3adba..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPCcf.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802FF380: -/* 802FF380 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF384 7C 08 02 A6 */ mflr r0 -/* 802FF388 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF38C 38 A0 00 00 */ li r5, 0 -/* 802FF390 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF394 81 8C 00 CC */ lwz r12, 0xcc(r12) -/* 802FF398 7D 89 03 A6 */ mtctr r12 -/* 802FF39C 4E 80 04 21 */ bctrl -/* 802FF3A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF3A4 7C 08 03 A6 */ mtlr r0 -/* 802FF3A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF3AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFP10JUTTexture.s deleted file mode 100644 index 773ccd9aea..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFP10JUTTexture.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_802FD814: -/* 802FD814 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FD818 7C 08 02 A6 */ mflr r0 -/* 802FD81C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FD820 38 E0 00 00 */ li r7, 0 -/* 802FD824 88 C3 01 08 */ lbz r6, 0x108(r3) -/* 802FD828 48 00 00 1C */ b lbl_802FD844 -lbl_802FD82C: -/* 802FD82C 54 E5 15 BA */ rlwinm r5, r7, 2, 0x16, 0x1d -/* 802FD830 38 05 01 00 */ addi r0, r5, 0x100 -/* 802FD834 7C 03 00 2E */ lwzx r0, r3, r0 -/* 802FD838 7C 00 20 40 */ cmplw r0, r4 -/* 802FD83C 41 82 00 14 */ beq lbl_802FD850 -/* 802FD840 38 E7 00 01 */ addi r7, r7, 1 -lbl_802FD844: -/* 802FD844 54 E0 06 3E */ clrlwi r0, r7, 0x18 -/* 802FD848 7C 00 30 40 */ cmplw r0, r6 -/* 802FD84C 41 80 FF E0 */ blt lbl_802FD82C -lbl_802FD850: -/* 802FD850 7C E4 3B 78 */ mr r4, r7 -/* 802FD854 81 83 00 00 */ lwz r12, 0(r3) -/* 802FD858 81 8C 00 D8 */ lwz r12, 0xd8(r12) -/* 802FD85C 7D 89 03 A6 */ mtctr r12 -/* 802FD860 4E 80 04 21 */ bctrl -/* 802FD864 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FD868 7C 08 03 A6 */ mtlr r0 -/* 802FD86C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FD870 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFv.s b/asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFv.s deleted file mode 100644 index 0917c0cc6b..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802FF410: -/* 802FF410 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF414 7C 08 02 A6 */ mflr r0 -/* 802FF418 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF41C 88 83 01 08 */ lbz r4, 0x108(r3) -/* 802FF420 38 04 FF FF */ addi r0, r4, -1 -/* 802FF424 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 802FF428 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF42C 81 8C 00 D8 */ lwz r12, 0xd8(r12) -/* 802FF430 7D 89 03 A6 */ mtctr r12 -/* 802FF434 4E 80 04 21 */ bctrl -/* 802FF438 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF43C 7C 08 03 A6 */ mtlr r0 -/* 802FF440 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF444 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/setBlendAlphaRatio__10J2DPictureFff.s b/asm/JSystem/J2DGraph/J2DPicture/setBlendAlphaRatio__10J2DPictureFff.s deleted file mode 100644 index a6056527c8..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/setBlendAlphaRatio__10J2DPictureFff.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_802FEA9C: -/* 802FEA9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FEAA0 7C 08 02 A6 */ mflr r0 -/* 802FEAA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FEAA8 D0 23 01 24 */ stfs f1, 0x124(r3) -/* 802FEAAC D0 43 01 28 */ stfs f2, 0x128(r3) -/* 802FEAB0 48 00 00 E5 */ bl setBlendKonstAlpha__10J2DPictureFv -/* 802FEAB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FEAB8 7C 08 03 A6 */ mtlr r0 -/* 802FEABC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FEAC0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/setBlendColorRatio__10J2DPictureFff.s b/asm/JSystem/J2DGraph/J2DPicture/setBlendColorRatio__10J2DPictureFff.s deleted file mode 100644 index 4cdd20be94..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/setBlendColorRatio__10J2DPictureFff.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_802FEA74: -/* 802FEA74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FEA78 7C 08 02 A6 */ mflr r0 -/* 802FEA7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FEA80 D0 23 01 1C */ stfs f1, 0x11c(r3) -/* 802FEA84 D0 43 01 20 */ stfs f2, 0x120(r3) -/* 802FEA88 48 00 00 3D */ bl setBlendKonstColor__10J2DPictureFv -/* 802FEA8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FEA90 7C 08 03 A6 */ mtlr r0 -/* 802FEA94 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FEA98 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb.s b/asm/JSystem/J2DGraph/J2DPicture/setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb.s deleted file mode 100644 index 0fcbfe58d2..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_802FED44: -/* 802FED44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FED48 7C 08 02 A6 */ mflr r0 -/* 802FED4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FED50 7C 8A 23 78 */ mr r10, r4 -/* 802FED54 7C A9 2B 78 */ mr r9, r5 -/* 802FED58 7C C0 33 78 */ mr r0, r6 -/* 802FED5C 7C E8 3B 78 */ mr r8, r7 -/* 802FED60 38 83 01 0A */ addi r4, r3, 0x10a -/* 802FED64 7D 45 53 78 */ mr r5, r10 -/* 802FED68 7D 26 4B 78 */ mr r6, r9 -/* 802FED6C 7C 07 03 78 */ mr r7, r0 -/* 802FED70 48 00 00 15 */ bl func_802FED84 -/* 802FED74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FED78 7C 08 03 A6 */ mtlr r0 -/* 802FED7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FED80 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPicture/swap__10J2DPictureFRfRf.s b/asm/JSystem/J2DGraph/J2DPicture/swap__10J2DPictureFRfRf.s deleted file mode 100644 index 8e4d44f9ce..0000000000 --- a/asm/JSystem/J2DGraph/J2DPicture/swap__10J2DPictureFRfRf.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802FEA60: -/* 802FEA60 C0 23 00 00 */ lfs f1, 0(r3) -/* 802FEA64 C0 04 00 00 */ lfs f0, 0(r4) -/* 802FEA68 D0 03 00 00 */ stfs f0, 0(r3) -/* 802FEA6C D0 24 00 00 */ stfs f1, 0(r4) -/* 802FEA70 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/calcMtx__9J2DScreenFv.s b/asm/JSystem/J2DGraph/J2DScreen/calcMtx__9J2DScreenFv.s deleted file mode 100644 index 60bfa9377f..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/calcMtx__9J2DScreenFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_802F9A20: -/* 802F9A20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F9A24 7C 08 02 A6 */ mflr r0 -/* 802F9A28 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F9A2C C0 23 00 D4 */ lfs f1, 0xd4(r3) -/* 802F9A30 C0 43 00 D8 */ lfs f2, 0xd8(r3) -/* 802F9A34 81 83 00 00 */ lwz r12, 0(r3) -/* 802F9A38 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 802F9A3C 7D 89 03 A6 */ mtctr r12 -/* 802F9A40 4E 80 04 21 */ bctrl -/* 802F9A44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F9A48 7C 08 03 A6 */ mtlr r0 -/* 802F9A4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F9A50 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/clean__9J2DScreenFv.s b/asm/JSystem/J2DGraph/J2DScreen/clean__9J2DScreenFv.s deleted file mode 100644 index 928b39e23c..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/clean__9J2DScreenFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_802F85A8: -/* 802F85A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F85AC 7C 08 02 A6 */ mflr r0 -/* 802F85B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F85B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F85B8 7C 7F 1B 78 */ mr r31, r3 -/* 802F85BC 80 63 01 04 */ lwz r3, 0x104(r3) -/* 802F85C0 3C 80 80 2F */ lis r4, __dt__11J2DMaterialFv@ha /* 0x802EA2CC@ha */ -/* 802F85C4 38 84 A2 CC */ addi r4, r4, __dt__11J2DMaterialFv@l /* 0x802EA2CC@l */ -/* 802F85C8 48 06 96 A5 */ bl __destroy_new_array -/* 802F85CC 38 00 00 00 */ li r0, 0 -/* 802F85D0 B0 1F 01 02 */ sth r0, 0x102(r31) -/* 802F85D4 90 1F 01 04 */ stw r0, 0x104(r31) -/* 802F85D8 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 802F85DC 4B FD 67 85 */ bl __dla__FPv -/* 802F85E0 38 00 00 00 */ li r0, 0 -/* 802F85E4 90 1F 01 08 */ stw r0, 0x108(r31) -/* 802F85E8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802F85EC 4B FD 67 75 */ bl __dla__FPv -/* 802F85F0 38 00 00 00 */ li r0, 0 -/* 802F85F4 90 1F 01 0C */ stw r0, 0x10c(r31) -/* 802F85F8 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 802F85FC 28 03 00 00 */ cmplwi r3, 0 -/* 802F8600 41 82 00 34 */ beq lbl_802F8634 -/* 802F8604 80 63 00 04 */ lwz r3, 4(r3) -/* 802F8608 4B FD 67 59 */ bl __dla__FPv -/* 802F860C 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 802F8610 28 03 00 00 */ cmplwi r3, 0 -/* 802F8614 41 82 00 18 */ beq lbl_802F862C -/* 802F8618 38 80 00 01 */ li r4, 1 -/* 802F861C 81 83 00 00 */ lwz r12, 0(r3) -/* 802F8620 81 8C 00 08 */ lwz r12, 8(r12) -/* 802F8624 7D 89 03 A6 */ mtctr r12 -/* 802F8628 4E 80 04 21 */ bctrl -lbl_802F862C: -/* 802F862C 38 00 00 00 */ li r0, 0 -/* 802F8630 90 1F 01 10 */ stw r0, 0x110(r31) -lbl_802F8634: -/* 802F8634 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F8638 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F863C 7C 08 03 A6 */ mtlr r0 -/* 802F8640 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8644 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl.s b/asm/JSystem/J2DGraph/J2DScreen/createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl.s deleted file mode 100644 index b1a3e6b26e..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802F99E8: -/* 802F99E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F99EC 7C 08 02 A6 */ mflr r0 -/* 802F99F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F99F4 39 00 00 00 */ li r8, 0 -/* 802F99F8 81 83 00 00 */ lwz r12, 0(r3) -/* 802F99FC 81 8C 00 98 */ lwz r12, 0x98(r12) -/* 802F9A00 7D 89 03 A6 */ mtctr r12 -/* 802F9A04 4E 80 04 21 */ bctrl -/* 802F9A08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F9A0C 7C 08 03 A6 */ mtlr r0 -/* 802F9A10 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F9A14 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResFONT.s b/asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResFONT.s deleted file mode 100644 index aa950a1d88..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResFONT.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802F9620: -/* 802F9620 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F9624 7C 08 02 A6 */ mflr r0 -/* 802F9628 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F962C 4B FF DE 8D */ bl isUsed__7J2DPaneFPC7ResFONT -/* 802F9630 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F9634 7C 08 03 A6 */ mtlr r0 -/* 802F9638 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F963C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResTIMG.s deleted file mode 100644 index 1fa2d7fc3f..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResTIMG.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802F9600: -/* 802F9600 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F9604 7C 08 02 A6 */ mflr r0 -/* 802F9608 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F960C 4B FF DE 25 */ bl isUsed__7J2DPaneFPC7ResTIMG -/* 802F9610 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F9614 7C 08 03 A6 */ mtlr r0 -/* 802F9618 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F961C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP10J2DAnmBase.s b/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP10J2DAnmBase.s deleted file mode 100644 index 7b9f5c110b..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP10J2DAnmBase.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802F9A54: -/* 802F9A54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F9A58 7C 08 02 A6 */ mflr r0 -/* 802F9A5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F9A60 4B FF E4 95 */ bl setAnimation__7J2DPaneFP10J2DAnmBase -/* 802F9A64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F9A68 7C 08 03 A6 */ mtlr r0 -/* 802F9A6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F9A70 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP14J2DAnmVtxColor.s b/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP14J2DAnmVtxColor.s deleted file mode 100644 index a14a831ba6..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP14J2DAnmVtxColor.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802F99A8: -/* 802F99A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F99AC 7C 08 02 A6 */ mflr r0 -/* 802F99B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F99B4 4B FF E7 ED */ bl setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor -/* 802F99B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F99BC 7C 08 03 A6 */ mtlr r0 -/* 802F99C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F99C4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP20J2DAnmVisibilityFull.s b/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP20J2DAnmVisibilityFull.s deleted file mode 100644 index 9068e1fb50..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP20J2DAnmVisibilityFull.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802F99C8: -/* 802F99C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F99CC 7C 08 02 A6 */ mflr r0 -/* 802F99D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F99D4 4B FF E7 45 */ bl setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull -/* 802F99D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F99DC 7C 08 03 A6 */ mtlr r0 -/* 802F99E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F99E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s b/asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s deleted file mode 100644 index 8649c47220..0000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802F8748: -/* 802F8748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F874C 7C 08 02 A6 */ mflr r0 -/* 802F8750 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F8754 28 06 00 00 */ cmplwi r6, 0 -/* 802F8758 40 82 00 0C */ bne lbl_802F8764 -/* 802F875C 38 60 00 00 */ li r3, 0 -/* 802F8760 48 00 00 08 */ b lbl_802F8768 -lbl_802F8764: -/* 802F8764 48 00 00 15 */ bl private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive -lbl_802F8768: -/* 802F8768 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F876C 7C 08 03 A6 */ mtlr r0 -/* 802F8770 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8774 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s b/asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s deleted file mode 100644 index 100dbf2eaa..0000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_802FF6D8: -/* 802FF6D8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802FF6DC 7C 08 02 A6 */ mflr r0 -/* 802FF6E0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FF6E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FF6E8 48 06 2A F1 */ bl _savegpr_28 -/* 802FF6EC 7C 7C 1B 78 */ mr r28, r3 -/* 802FF6F0 7C 9D 23 78 */ mr r29, r4 -/* 802FF6F4 7C BE 2B 78 */ mr r30, r5 -/* 802FF6F8 7C DF 33 78 */ mr r31, r6 -/* 802FF6FC 4B FF 64 FD */ bl __ct__7J2DPaneFv -/* 802FF700 3C 60 80 3D */ lis r3, __vt__10J2DTextBox@ha /* 0x803CD328@ha */ -/* 802FF704 38 03 D3 28 */ addi r0, r3, __vt__10J2DTextBox@l /* 0x803CD328@l */ -/* 802FF708 90 1C 00 00 */ stw r0, 0(r28) -/* 802FF70C 38 60 00 00 */ li r3, 0 -/* 802FF710 90 7C 01 00 */ stw r3, 0x100(r28) -/* 802FF714 38 00 FF FF */ li r0, -1 -/* 802FF718 90 1C 01 04 */ stw r0, 0x104(r28) -/* 802FF71C 90 1C 01 08 */ stw r0, 0x108(r28) -/* 802FF720 90 7C 01 24 */ stw r3, 0x124(r28) -/* 802FF724 90 1C 01 28 */ stw r0, 0x128(r28) -/* 802FF728 90 1C 01 2C */ stw r0, 0x12c(r28) -/* 802FF72C 7F 83 E3 78 */ mr r3, r28 -/* 802FF730 7F A4 EB 78 */ mr r4, r29 -/* 802FF734 7F C5 F3 78 */ mr r5, r30 -/* 802FF738 7F E6 FB 78 */ mr r6, r31 -/* 802FF73C 48 00 07 4D */ bl private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive -/* 802FF740 7F 83 E3 78 */ mr r3, r28 -/* 802FF744 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FF748 48 06 2A DD */ bl _restgpr_28 -/* 802FF74C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FF750 7C 08 03 A6 */ mtlr r0 -/* 802FF754 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FF758 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFv.s b/asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFv.s deleted file mode 100644 index c32aa35072..0000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_802FF660: -/* 802FF660 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802FF664 7C 08 02 A6 */ mflr r0 -/* 802FF668 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FF66C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802FF670 7C 7F 1B 78 */ mr r31, r3 -/* 802FF674 4B FF 65 85 */ bl __ct__7J2DPaneFv -/* 802FF678 3C 60 80 3D */ lis r3, __vt__10J2DTextBox@ha /* 0x803CD328@ha */ -/* 802FF67C 38 03 D3 28 */ addi r0, r3, __vt__10J2DTextBox@l /* 0x803CD328@l */ -/* 802FF680 90 1F 00 00 */ stw r0, 0(r31) -/* 802FF684 38 60 00 00 */ li r3, 0 -/* 802FF688 90 7F 01 00 */ stw r3, 0x100(r31) -/* 802FF68C 38 00 FF FF */ li r0, -1 -/* 802FF690 90 1F 01 04 */ stw r0, 0x104(r31) -/* 802FF694 90 1F 01 08 */ stw r0, 0x108(r31) -/* 802FF698 90 7F 01 24 */ stw r3, 0x124(r31) -/* 802FF69C 90 1F 01 28 */ stw r0, 0x128(r31) -/* 802FF6A0 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 802FF6A4 7F E3 FB 78 */ mr r3, r31 -/* 802FF6A8 38 80 00 00 */ li r4, 0 -/* 802FF6AC 38 A0 00 00 */ li r5, 0 -/* 802FF6B0 38 C0 00 00 */ li r6, 0 -/* 802FF6B4 38 E0 00 02 */ li r7, 2 -/* 802FF6B8 39 00 00 02 */ li r8, 2 -/* 802FF6BC 48 00 05 9D */ bl initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding -/* 802FF6C0 7F E3 FB 78 */ mr r3, r31 -/* 802FF6C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802FF6C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802FF6CC 7C 08 03 A6 */ mtlr r0 -/* 802FF6D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF6D4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFff.s b/asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFff.s deleted file mode 100644 index e8dd8e05ed..0000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFff.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_803008E8: -/* 803008E8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 803008EC 7C 08 02 A6 */ mflr r0 -/* 803008F0 90 01 00 54 */ stw r0, 0x54(r1) -/* 803008F4 DB E1 00 48 */ stfd f31, 0x48(r1) -/* 803008F8 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 803008FC 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80300900 7C 7F 1B 78 */ mr r31, r3 -/* 80300904 FF C0 08 90 */ fmr f30, f1 -/* 80300908 FF E0 10 90 */ fmr f31, f2 -/* 8030090C 38 61 00 08 */ addi r3, r1, 8 -/* 80300910 48 04 5B 75 */ bl PSMTXIdentity -/* 80300914 7F E3 FB 78 */ mr r3, r31 -/* 80300918 FC 20 F0 90 */ fmr f1, f30 -/* 8030091C FC 40 F8 90 */ fmr f2, f31 -/* 80300920 38 81 00 08 */ addi r4, r1, 8 -/* 80300924 81 9F 00 00 */ lwz r12, 0(r31) -/* 80300928 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 8030092C 7D 89 03 A6 */ mtctr r12 -/* 80300930 4E 80 04 21 */ bctrl -/* 80300934 CB E1 00 48 */ lfd f31, 0x48(r1) -/* 80300938 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 8030093C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80300940 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80300944 7C 08 03 A6 */ mtlr r0 -/* 80300948 38 21 00 50 */ addi r1, r1, 0x50 -/* 8030094C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/func_802FFBC4.s b/asm/JSystem/J2DGraph/J2DTextBox/func_802FFBC4.s deleted file mode 100644 index 852d4fa994..0000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/func_802FFBC4.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_802FFBC4: -/* 802FFBC4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802FFBC8 7C 08 02 A6 */ mflr r0 -/* 802FFBCC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FFBD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FFBD4 48 06 25 FD */ bl _savegpr_26 -/* 802FFBD8 7C 7A 1B 78 */ mr r26, r3 -/* 802FFBDC 7D 1B 43 78 */ mr r27, r8 -/* 802FFBE0 7D 3C 4B 78 */ mr r28, r9 -/* 802FFBE4 7D 5D 53 78 */ mr r29, r10 -/* 802FFBE8 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 802FFBEC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 802FFBF0 4B FF 62 99 */ bl func_802F5E88 -/* 802FFBF4 3C 60 80 3D */ lis r3, __vt__10J2DTextBox@ha /* 0x803CD328@ha */ -/* 802FFBF8 38 03 D3 28 */ addi r0, r3, __vt__10J2DTextBox@l /* 0x803CD328@l */ -/* 802FFBFC 90 1A 00 00 */ stw r0, 0(r26) -/* 802FFC00 38 60 00 00 */ li r3, 0 -/* 802FFC04 90 7A 01 00 */ stw r3, 0x100(r26) -/* 802FFC08 38 00 FF FF */ li r0, -1 -/* 802FFC0C 90 1A 01 04 */ stw r0, 0x104(r26) -/* 802FFC10 90 1A 01 08 */ stw r0, 0x108(r26) -/* 802FFC14 90 7A 01 24 */ stw r3, 0x124(r26) -/* 802FFC18 90 1A 01 28 */ stw r0, 0x128(r26) -/* 802FFC1C 90 1A 01 2C */ stw r0, 0x12c(r26) -/* 802FFC20 7F 43 D3 78 */ mr r3, r26 -/* 802FFC24 7F 64 DB 78 */ mr r4, r27 -/* 802FFC28 7F 85 E3 78 */ mr r5, r28 -/* 802FFC2C 7F A6 EB 78 */ mr r6, r29 -/* 802FFC30 7F C7 F3 78 */ mr r7, r30 -/* 802FFC34 7F E8 FB 78 */ mr r8, r31 -/* 802FFC38 48 00 00 21 */ bl initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding -/* 802FFC3C 7F 43 D3 78 */ mr r3, r26 -/* 802FFC40 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FFC44 48 06 25 D9 */ bl _restgpr_26 -/* 802FFC48 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FFC4C 7C 08 03 A6 */ mtlr r0 -/* 802FFC50 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FFC54 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/getStringPtr__10J2DTextBoxCFv.s b/asm/JSystem/J2DGraph/J2DTextBox/getStringPtr__10J2DTextBoxCFv.s deleted file mode 100644 index 865f7dc845..0000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/getStringPtr__10J2DTextBoxCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80300658: -/* 80300658 80 63 01 24 */ lwz r3, 0x124(r3) -/* 8030065C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResTIMG.s deleted file mode 100644 index f2e96e910f..0000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResTIMG.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80300C70: -/* 80300C70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80300C74 7C 08 02 A6 */ mflr r0 -/* 80300C78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80300C7C 4B FF 67 B5 */ bl isUsed__7J2DPaneFPC7ResTIMG -/* 80300C80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80300C84 7C 08 03 A6 */ mtlr r0 -/* 80300C88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80300C8C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/setFont__10J2DTextBoxFP7JUTFont.s b/asm/JSystem/J2DGraph/J2DTextBox/setFont__10J2DTextBoxFP7JUTFont.s deleted file mode 100644 index fc583de048..0000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/setFont__10J2DTextBoxFP7JUTFont.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80300278: -/* 80300278 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030027C 7C 08 02 A6 */ mflr r0 -/* 80300280 90 01 00 14 */ stw r0, 0x14(r1) -/* 80300284 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80300288 93 C1 00 08 */ stw r30, 8(r1) -/* 8030028C 7C 7E 1B 78 */ mr r30, r3 -/* 80300290 7C 9F 23 79 */ or. r31, r4, r4 -/* 80300294 41 82 00 3C */ beq lbl_803002D0 -/* 80300298 88 1E 01 31 */ lbz r0, 0x131(r30) -/* 8030029C 28 00 00 00 */ cmplwi r0, 0 -/* 803002A0 41 82 00 24 */ beq lbl_803002C4 -/* 803002A4 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 803002A8 28 03 00 00 */ cmplwi r3, 0 -/* 803002AC 41 82 00 18 */ beq lbl_803002C4 -/* 803002B0 38 80 00 01 */ li r4, 1 -/* 803002B4 81 83 00 00 */ lwz r12, 0(r3) -/* 803002B8 81 8C 00 08 */ lwz r12, 8(r12) -/* 803002BC 7D 89 03 A6 */ mtctr r12 -/* 803002C0 4E 80 04 21 */ bctrl -lbl_803002C4: -/* 803002C4 93 FE 01 00 */ stw r31, 0x100(r30) -/* 803002C8 38 00 00 00 */ li r0, 0 -/* 803002CC 98 1E 01 31 */ stb r0, 0x131(r30) -lbl_803002D0: -/* 803002D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803002D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 803002D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803002DC 7C 08 03 A6 */ mtlr r0 -/* 803002E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803002E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTPalette/load__10JUTPaletteFv.s b/asm/JSystem/JUtility/JUTPalette/load__10JUTPaletteFv.s deleted file mode 100644 index 50c310d1b0..0000000000 --- a/asm/JSystem/JUtility/JUTPalette/load__10JUTPaletteFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802DE95C: -/* 802DE95C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DE960 7C 08 02 A6 */ mflr r0 -/* 802DE964 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DE968 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DE96C A0 83 00 14 */ lhz r4, 0x14(r3) -/* 802DE970 30 04 FF FF */ addic r0, r4, -1 -/* 802DE974 7F E0 21 10 */ subfe r31, r0, r4 -/* 802DE978 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802DE97C 41 82 00 0C */ beq lbl_802DE988 -/* 802DE980 88 83 00 0C */ lbz r4, 0xc(r3) -/* 802DE984 48 07 FB 1D */ bl GXLoadTlut -lbl_802DE988: -/* 802DE988 7F E3 FB 78 */ mr r3, r31 -/* 802DE98C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DE990 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DE994 7C 08 03 A6 */ mtlr r0 -/* 802DE998 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE99C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTPalette/storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv.s b/asm/JSystem/JUtility/JUTPalette/storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv.s deleted file mode 100644 index e96260adc3..0000000000 --- a/asm/JSystem/JUtility/JUTPalette/storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_802DE91C: -/* 802DE91C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DE920 7C 08 02 A6 */ mflr r0 -/* 802DE924 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DE928 98 83 00 0C */ stb r4, 0xc(r3) -/* 802DE92C 98 A3 00 0D */ stb r5, 0xd(r3) -/* 802DE930 98 C3 00 16 */ stb r6, 0x16(r3) -/* 802DE934 B0 E3 00 14 */ sth r7, 0x14(r3) -/* 802DE938 91 03 00 10 */ stw r8, 0x10(r3) -/* 802DE93C 80 83 00 10 */ lwz r4, 0x10(r3) -/* 802DE940 88 A3 00 0D */ lbz r5, 0xd(r3) -/* 802DE944 A0 C3 00 14 */ lhz r6, 0x14(r3) -/* 802DE948 48 07 FB 21 */ bl GXInitTlutObj -/* 802DE94C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DE950 7C 08 03 A6 */ mtlr r0 -/* 802DE954 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE958 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTPalette/storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT.s b/asm/JSystem/JUtility/JUTPalette/storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT.s deleted file mode 100644 index 50652a32c7..0000000000 --- a/asm/JSystem/JUtility/JUTPalette/storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_802DE890: -/* 802DE890 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DE894 7C 08 02 A6 */ mflr r0 -/* 802DE898 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DE89C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE8A0 48 08 39 3D */ bl _savegpr_29 -/* 802DE8A4 7C 7D 1B 78 */ mr r29, r3 -/* 802DE8A8 7C 9E 23 78 */ mr r30, r4 -/* 802DE8AC 7C BF 2B 79 */ or. r31, r5, r5 -/* 802DE8B0 40 82 00 1C */ bne lbl_802DE8CC -/* 802DE8B4 3C 60 80 3A */ lis r3, JUTPalette__stringBase0@ha /* 0x8039D360@ha */ -/* 802DE8B8 38 63 D3 60 */ addi r3, r3, JUTPalette__stringBase0@l /* 0x8039D360@l */ -/* 802DE8BC 38 80 00 23 */ li r4, 0x23 -/* 802DE8C0 38 A3 00 0F */ addi r5, r3, 0xf -/* 802DE8C4 4C C6 31 82 */ crclr 6 -/* 802DE8C8 4B D2 85 B5 */ bl OSPanic -lbl_802DE8CC: -/* 802DE8CC 9B DD 00 0C */ stb r30, 0xc(r29) -/* 802DE8D0 88 1F 00 00 */ lbz r0, 0(r31) -/* 802DE8D4 98 1D 00 0D */ stb r0, 0xd(r29) -/* 802DE8D8 88 1F 00 01 */ lbz r0, 1(r31) -/* 802DE8DC 98 1D 00 16 */ stb r0, 0x16(r29) -/* 802DE8E0 A0 1F 00 02 */ lhz r0, 2(r31) -/* 802DE8E4 B0 1D 00 14 */ sth r0, 0x14(r29) -/* 802DE8E8 38 1F 00 20 */ addi r0, r31, 0x20 -/* 802DE8EC 90 1D 00 10 */ stw r0, 0x10(r29) -/* 802DE8F0 7F A3 EB 78 */ mr r3, r29 -/* 802DE8F4 80 9D 00 10 */ lwz r4, 0x10(r29) -/* 802DE8F8 88 BD 00 0D */ lbz r5, 0xd(r29) -/* 802DE8FC A0 DD 00 14 */ lhz r6, 0x14(r29) -/* 802DE900 48 07 FB 69 */ bl GXInitTlutObj -/* 802DE904 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE908 48 08 39 21 */ bl _restgpr_29 -/* 802DE90C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DE910 7C 08 03 A6 */ mtlr r0 -/* 802DE914 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DE918 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/__ct__10JUTResFontFPC7ResFONTP7JKRHeap.s b/asm/JSystem/JUtility/JUTResFont/__ct__10JUTResFontFPC7ResFONTP7JKRHeap.s deleted file mode 100644 index 2a8b741000..0000000000 --- a/asm/JSystem/JUtility/JUTResFont/__ct__10JUTResFontFPC7ResFONTP7JKRHeap.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_802DEF94: -/* 802DEF94 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DEF98 7C 08 02 A6 */ mflr r0 -/* 802DEF9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DEFA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DEFA4 48 08 32 39 */ bl _savegpr_29 -/* 802DEFA8 7C 7D 1B 78 */ mr r29, r3 -/* 802DEFAC 7C 9E 23 78 */ mr r30, r4 -/* 802DEFB0 7C BF 2B 78 */ mr r31, r5 -/* 802DEFB4 4B FF FD 45 */ bl __ct__7JUTFontFv -/* 802DEFB8 3C 60 80 3D */ lis r3, __vt__10JUTResFont@ha /* 0x803CC5A0@ha */ -/* 802DEFBC 38 03 C5 A0 */ addi r0, r3, __vt__10JUTResFont@l /* 0x803CC5A0@l */ -/* 802DEFC0 90 1D 00 00 */ stw r0, 0(r29) -/* 802DEFC4 7F A3 EB 78 */ mr r3, r29 -/* 802DEFC8 48 00 00 E9 */ bl initialize_state__10JUTResFontFv -/* 802DEFCC 7F A3 EB 78 */ mr r3, r29 -/* 802DEFD0 4B FF FD 55 */ bl initialize_state__7JUTFontFv -/* 802DEFD4 7F A3 EB 78 */ mr r3, r29 -/* 802DEFD8 7F C4 F3 78 */ mr r4, r30 -/* 802DEFDC 7F E5 FB 78 */ mr r5, r31 -/* 802DEFE0 48 00 00 FD */ bl initiate__10JUTResFontFPC7ResFONTP7JKRHeap -/* 802DEFE4 7F A3 EB 78 */ mr r3, r29 -/* 802DEFE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DEFEC 48 08 32 3D */ bl _restgpr_29 -/* 802DEFF0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DEFF4 7C 08 03 A6 */ mtlr r0 -/* 802DEFF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DEFFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/__ct__10JUTResFontFv.s b/asm/JSystem/JUtility/JUTResFont/__ct__10JUTResFontFv.s deleted file mode 100644 index 945974ee5b..0000000000 --- a/asm/JSystem/JUtility/JUTResFont/__ct__10JUTResFontFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802DEF48: -/* 802DEF48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DEF4C 7C 08 02 A6 */ mflr r0 -/* 802DEF50 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DEF54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DEF58 7C 7F 1B 78 */ mr r31, r3 -/* 802DEF5C 4B FF FD 9D */ bl __ct__7JUTFontFv -/* 802DEF60 3C 60 80 3D */ lis r3, __vt__10JUTResFont@ha /* 0x803CC5A0@ha */ -/* 802DEF64 38 03 C5 A0 */ addi r0, r3, __vt__10JUTResFont@l /* 0x803CC5A0@l */ -/* 802DEF68 90 1F 00 00 */ stw r0, 0(r31) -/* 802DEF6C 7F E3 FB 78 */ mr r3, r31 -/* 802DEF70 48 00 01 41 */ bl initialize_state__10JUTResFontFv -/* 802DEF74 7F E3 FB 78 */ mr r3, r31 -/* 802DEF78 4B FF FD AD */ bl initialize_state__7JUTFontFv -/* 802DEF7C 7F E3 FB 78 */ mr r3, r31 -/* 802DEF80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DEF84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DEF88 7C 08 03 A6 */ mtlr r0 -/* 802DEF8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DEF90 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/__dt__10JUTResFontFv.s b/asm/JSystem/JUtility/JUTResFont/__dt__10JUTResFontFv.s deleted file mode 100644 index 47fa460cdd..0000000000 --- a/asm/JSystem/JUtility/JUTResFont/__dt__10JUTResFontFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_802DF000: -/* 802DF000 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DF004 7C 08 02 A6 */ mflr r0 -/* 802DF008 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DF00C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DF010 93 C1 00 08 */ stw r30, 8(r1) -/* 802DF014 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802DF018 7C 9F 23 78 */ mr r31, r4 -/* 802DF01C 41 82 00 54 */ beq lbl_802DF070 -/* 802DF020 3C 80 80 3D */ lis r4, __vt__10JUTResFont@ha /* 0x803CC5A0@ha */ -/* 802DF024 38 04 C5 A0 */ addi r0, r4, __vt__10JUTResFont@l /* 0x803CC5A0@l */ -/* 802DF028 90 1E 00 00 */ stw r0, 0(r30) -/* 802DF02C 88 1E 00 04 */ lbz r0, 4(r30) -/* 802DF030 28 00 00 00 */ cmplwi r0, 0 -/* 802DF034 41 82 00 18 */ beq lbl_802DF04C -/* 802DF038 48 00 00 55 */ bl deleteMemBlocks_ResFont__10JUTResFontFv -/* 802DF03C 7F C3 F3 78 */ mr r3, r30 -/* 802DF040 48 00 00 71 */ bl initialize_state__10JUTResFontFv -/* 802DF044 7F C3 F3 78 */ mr r3, r30 -/* 802DF048 4B FF FC DD */ bl initialize_state__7JUTFontFv -lbl_802DF04C: -/* 802DF04C 28 1E 00 00 */ cmplwi r30, 0 -/* 802DF050 41 82 00 10 */ beq lbl_802DF060 -/* 802DF054 3C 60 80 3A */ lis r3, __vt__7JUTFont@ha /* 0x803A31F0@ha */ -/* 802DF058 38 03 31 F0 */ addi r0, r3, __vt__7JUTFont@l /* 0x803A31F0@l */ -/* 802DF05C 90 1E 00 00 */ stw r0, 0(r30) -lbl_802DF060: -/* 802DF060 7F E0 07 35 */ extsh. r0, r31 -/* 802DF064 40 81 00 0C */ ble lbl_802DF070 -/* 802DF068 7F C3 F3 78 */ mr r3, r30 -/* 802DF06C 4B FE FC D1 */ bl __dl__FPv -lbl_802DF070: -/* 802DF070 7F C3 F3 78 */ mr r3, r30 -/* 802DF074 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DF078 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DF07C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DF080 7C 08 03 A6 */ mtlr r0 -/* 802DF084 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF088 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/deleteMemBlocks_ResFont__10JUTResFontFv.s b/asm/JSystem/JUtility/JUTResFont/deleteMemBlocks_ResFont__10JUTResFontFv.s deleted file mode 100644 index 2f4f36194e..0000000000 --- a/asm/JSystem/JUtility/JUTResFont/deleteMemBlocks_ResFont__10JUTResFontFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802DF08C: -/* 802DF08C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DF090 7C 08 02 A6 */ mflr r0 -/* 802DF094 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DF098 80 63 00 50 */ lwz r3, 0x50(r3) -/* 802DF09C 4B FE FC C5 */ bl __dla__FPv -/* 802DF0A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DF0A4 7C 08 03 A6 */ mtlr r0 -/* 802DF0A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF0AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/initialize_state__10JUTResFontFv.s b/asm/JSystem/JUtility/JUTResFont/initialize_state__10JUTResFontFv.s deleted file mode 100644 index aaba516e13..0000000000 --- a/asm/JSystem/JUtility/JUTResFont/initialize_state__10JUTResFontFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802DF0B0: -/* 802DF0B0 38 00 00 00 */ li r0, 0 -/* 802DF0B4 90 03 00 48 */ stw r0, 0x48(r3) -/* 802DF0B8 90 03 00 50 */ stw r0, 0x50(r3) -/* 802DF0BC 90 03 00 54 */ stw r0, 0x54(r3) -/* 802DF0C0 90 03 00 58 */ stw r0, 0x58(r3) -/* 802DF0C4 90 03 00 5C */ stw r0, 0x5c(r3) -/* 802DF0C8 90 03 00 1C */ stw r0, 0x1c(r3) -/* 802DF0CC 90 03 00 20 */ stw r0, 0x20(r3) -/* 802DF0D0 38 00 FF FF */ li r0, -1 -/* 802DF0D4 90 03 00 44 */ stw r0, 0x44(r3) -/* 802DF0D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/initiate__10JUTResFontFPC7ResFONTP7JKRHeap.s b/asm/JSystem/JUtility/JUTResFont/initiate__10JUTResFontFPC7ResFONTP7JKRHeap.s deleted file mode 100644 index 456769ee52..0000000000 --- a/asm/JSystem/JUtility/JUTResFont/initiate__10JUTResFontFPC7ResFONTP7JKRHeap.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802DF0DC: -/* 802DF0DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DF0E0 7C 08 02 A6 */ mflr r0 -/* 802DF0E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DF0E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DF0EC 7C 7F 1B 78 */ mr r31, r3 -/* 802DF0F0 48 00 00 4D */ bl protected_initiate__10JUTResFontFPC7ResFONTP7JKRHeap -/* 802DF0F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802DF0F8 40 82 00 2C */ bne lbl_802DF124 -/* 802DF0FC 7F E3 FB 78 */ mr r3, r31 -/* 802DF100 4B FF FF 8D */ bl deleteMemBlocks_ResFont__10JUTResFontFv -/* 802DF104 7F E3 FB 78 */ mr r3, r31 -/* 802DF108 4B FF FF A9 */ bl initialize_state__10JUTResFontFv -/* 802DF10C 7F E3 FB 78 */ mr r3, r31 -/* 802DF110 4B FF FC 15 */ bl initialize_state__7JUTFontFv -/* 802DF114 38 00 00 00 */ li r0, 0 -/* 802DF118 98 1F 00 04 */ stb r0, 4(r31) -/* 802DF11C 38 60 00 00 */ li r3, 0 -/* 802DF120 48 00 00 08 */ b lbl_802DF128 -lbl_802DF124: -/* 802DF124 38 60 00 01 */ li r3, 1 -lbl_802DF128: -/* 802DF128 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DF12C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DF130 7C 08 03 A6 */ mtlr r0 -/* 802DF134 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF138 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth.s b/asm/JSystem/JUtility/JUTResFont/loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth.s deleted file mode 100644 index 2798dc19ad..0000000000 --- a/asm/JSystem/JUtility/JUTResFont/loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802DFBE8: -/* 802DFBE8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DFBEC 7C 08 02 A6 */ mflr r0 -/* 802DFBF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DFBF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DFBF8 48 08 25 E5 */ bl _savegpr_29 -/* 802DFBFC 7C 7D 1B 78 */ mr r29, r3 -/* 802DFC00 7C 9E 23 78 */ mr r30, r4 -/* 802DFC04 7C BF 2B 78 */ mr r31, r5 -/* 802DFC08 28 06 00 00 */ cmplwi r6, 0 -/* 802DFC0C 41 82 00 18 */ beq lbl_802DFC24 -/* 802DFC10 7C C5 33 78 */ mr r5, r6 -/* 802DFC14 81 83 00 00 */ lwz r12, 0(r3) -/* 802DFC18 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802DFC1C 7D 89 03 A6 */ mtctr r12 -/* 802DFC20 4E 80 04 21 */ bctrl -lbl_802DFC24: -/* 802DFC24 7F A3 EB 78 */ mr r3, r29 -/* 802DFC28 7F C4 F3 78 */ mr r4, r30 -/* 802DFC2C 48 00 01 AD */ bl getFontCode__10JUTResFontCFi -/* 802DFC30 7C 64 1B 78 */ mr r4, r3 -/* 802DFC34 7F A3 EB 78 */ mr r3, r29 -/* 802DFC38 7F E5 FB 78 */ mr r5, r31 -/* 802DFC3C 81 9D 00 00 */ lwz r12, 0(r29) -/* 802DFC40 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 802DFC44 7D 89 03 A6 */ mtctr r12 -/* 802DFC48 4E 80 04 21 */ bctrl -/* 802DFC4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DFC50 48 08 25 D9 */ bl _restgpr_29 -/* 802DFC54 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DFC58 7C 08 03 A6 */ mtlr r0 -/* 802DFC5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DFC60 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/setGX__10JUTResFontFQ28JUtility6TColorQ28JUtility6TColor.s b/asm/JSystem/JUtility/JUTResFont/setGX__10JUTResFontFQ28JUtility6TColorQ28JUtility6TColor.s deleted file mode 100644 index 8d90c467e6..0000000000 --- a/asm/JSystem/JUtility/JUTResFont/setGX__10JUTResFontFQ28JUtility6TColorQ28JUtility6TColor.s +++ /dev/null @@ -1,147 +0,0 @@ -lbl_802DF584: -/* 802DF584 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DF588 7C 08 02 A6 */ mflr r0 -/* 802DF58C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DF590 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802DF594 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802DF598 7C 9E 23 78 */ mr r30, r4 -/* 802DF59C 7C BF 2B 78 */ mr r31, r5 -/* 802DF5A0 80 04 00 00 */ lwz r0, 0(r4) -/* 802DF5A4 28 00 00 00 */ cmplwi r0, 0 -/* 802DF5A8 40 82 00 28 */ bne lbl_802DF5D0 -/* 802DF5AC 80 9F 00 00 */ lwz r4, 0(r31) -/* 802DF5B0 3C 04 00 01 */ addis r0, r4, 1 -/* 802DF5B4 28 00 FF FF */ cmplwi r0, 0xffff -/* 802DF5B8 40 82 00 18 */ bne lbl_802DF5D0 -/* 802DF5BC 81 83 00 00 */ lwz r12, 0(r3) -/* 802DF5C0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802DF5C4 7D 89 03 A6 */ mtctr r12 -/* 802DF5C8 4E 80 04 21 */ bctrl -/* 802DF5CC 48 00 01 E0 */ b lbl_802DF7AC -lbl_802DF5D0: -/* 802DF5D0 38 60 00 01 */ li r3, 1 -/* 802DF5D4 48 07 E5 5D */ bl GXSetNumChans -/* 802DF5D8 38 60 00 02 */ li r3, 2 -/* 802DF5DC 48 08 02 B5 */ bl GXSetNumTevStages -/* 802DF5E0 38 60 00 01 */ li r3, 1 -/* 802DF5E4 48 07 C8 19 */ bl GXSetNumTexGens -/* 802DF5E8 38 60 00 00 */ li r3, 0 -/* 802DF5EC 38 80 00 00 */ li r4, 0 -/* 802DF5F0 38 A0 00 00 */ li r5, 0 -/* 802DF5F4 38 C0 00 FF */ li r6, 0xff -/* 802DF5F8 48 08 00 FD */ bl GXSetTevOrder -/* 802DF5FC 38 60 00 04 */ li r3, 4 -/* 802DF600 38 80 00 00 */ li r4, 0 -/* 802DF604 38 A0 00 00 */ li r5, 0 -/* 802DF608 38 C0 00 01 */ li r6, 1 -/* 802DF60C 38 E0 00 00 */ li r7, 0 -/* 802DF610 39 00 00 00 */ li r8, 0 -/* 802DF614 39 20 00 02 */ li r9, 2 -/* 802DF618 48 07 E5 55 */ bl GXSetChanCtrl -/* 802DF61C 80 1E 00 00 */ lwz r0, 0(r30) -/* 802DF620 90 01 00 0C */ stw r0, 0xc(r1) -/* 802DF624 38 60 00 01 */ li r3, 1 -/* 802DF628 38 81 00 0C */ addi r4, r1, 0xc -/* 802DF62C 48 07 FD 51 */ bl GXSetTevColor -/* 802DF630 80 1F 00 00 */ lwz r0, 0(r31) -/* 802DF634 90 01 00 08 */ stw r0, 8(r1) -/* 802DF638 38 60 00 02 */ li r3, 2 -/* 802DF63C 38 81 00 08 */ addi r4, r1, 8 -/* 802DF640 48 07 FD 3D */ bl GXSetTevColor -/* 802DF644 38 60 00 00 */ li r3, 0 -/* 802DF648 38 80 00 02 */ li r4, 2 -/* 802DF64C 38 A0 00 04 */ li r5, 4 -/* 802DF650 38 C0 00 08 */ li r6, 8 -/* 802DF654 38 E0 00 0F */ li r7, 0xf -/* 802DF658 48 07 FB CD */ bl GXSetTevColorIn -/* 802DF65C 38 60 00 00 */ li r3, 0 -/* 802DF660 38 80 00 01 */ li r4, 1 -/* 802DF664 38 A0 00 02 */ li r5, 2 -/* 802DF668 38 C0 00 04 */ li r6, 4 -/* 802DF66C 38 E0 00 07 */ li r7, 7 -/* 802DF670 48 07 FB F9 */ bl GXSetTevAlphaIn -/* 802DF674 38 60 00 00 */ li r3, 0 -/* 802DF678 38 80 00 00 */ li r4, 0 -/* 802DF67C 38 A0 00 00 */ li r5, 0 -/* 802DF680 38 C0 00 00 */ li r6, 0 -/* 802DF684 38 E0 00 01 */ li r7, 1 -/* 802DF688 39 00 00 00 */ li r8, 0 -/* 802DF68C 48 07 FC 21 */ bl GXSetTevColorOp -/* 802DF690 38 60 00 00 */ li r3, 0 -/* 802DF694 38 80 00 00 */ li r4, 0 -/* 802DF698 38 A0 00 00 */ li r5, 0 -/* 802DF69C 38 C0 00 00 */ li r6, 0 -/* 802DF6A0 38 E0 00 01 */ li r7, 1 -/* 802DF6A4 39 00 00 00 */ li r8, 0 -/* 802DF6A8 48 07 FC 6D */ bl GXSetTevAlphaOp -/* 802DF6AC 38 60 00 01 */ li r3, 1 -/* 802DF6B0 38 80 00 FF */ li r4, 0xff -/* 802DF6B4 38 A0 00 FF */ li r5, 0xff -/* 802DF6B8 38 C0 00 04 */ li r6, 4 -/* 802DF6BC 48 08 00 39 */ bl GXSetTevOrder -/* 802DF6C0 38 60 00 01 */ li r3, 1 -/* 802DF6C4 38 80 00 0F */ li r4, 0xf -/* 802DF6C8 38 A0 00 00 */ li r5, 0 -/* 802DF6CC 38 C0 00 0A */ li r6, 0xa -/* 802DF6D0 38 E0 00 0F */ li r7, 0xf -/* 802DF6D4 48 07 FB 51 */ bl GXSetTevColorIn -/* 802DF6D8 38 60 00 01 */ li r3, 1 -/* 802DF6DC 38 80 00 07 */ li r4, 7 -/* 802DF6E0 38 A0 00 00 */ li r5, 0 -/* 802DF6E4 38 C0 00 05 */ li r6, 5 -/* 802DF6E8 38 E0 00 07 */ li r7, 7 -/* 802DF6EC 48 07 FB 7D */ bl GXSetTevAlphaIn -/* 802DF6F0 38 60 00 01 */ li r3, 1 -/* 802DF6F4 38 80 00 00 */ li r4, 0 -/* 802DF6F8 38 A0 00 00 */ li r5, 0 -/* 802DF6FC 38 C0 00 00 */ li r6, 0 -/* 802DF700 38 E0 00 01 */ li r7, 1 -/* 802DF704 39 00 00 00 */ li r8, 0 -/* 802DF708 48 07 FB A5 */ bl GXSetTevColorOp -/* 802DF70C 38 60 00 01 */ li r3, 1 -/* 802DF710 38 80 00 00 */ li r4, 0 -/* 802DF714 38 A0 00 00 */ li r5, 0 -/* 802DF718 38 C0 00 00 */ li r6, 0 -/* 802DF71C 38 E0 00 01 */ li r7, 1 -/* 802DF720 39 00 00 00 */ li r8, 0 -/* 802DF724 48 07 FB F1 */ bl GXSetTevAlphaOp -/* 802DF728 38 60 00 01 */ li r3, 1 -/* 802DF72C 38 80 00 04 */ li r4, 4 -/* 802DF730 38 A0 00 05 */ li r5, 5 -/* 802DF734 38 C0 00 0F */ li r6, 0xf -/* 802DF738 48 08 04 B9 */ bl GXSetBlendMode -/* 802DF73C 38 60 00 00 */ li r3, 0 -/* 802DF740 38 80 00 09 */ li r4, 9 -/* 802DF744 38 A0 00 01 */ li r5, 1 -/* 802DF748 38 C0 00 03 */ li r6, 3 -/* 802DF74C 38 E0 00 00 */ li r7, 0 -/* 802DF750 48 07 BE 75 */ bl GXSetVtxAttrFmt -/* 802DF754 38 60 00 00 */ li r3, 0 -/* 802DF758 38 80 00 0B */ li r4, 0xb -/* 802DF75C 38 A0 00 01 */ li r5, 1 -/* 802DF760 38 C0 00 05 */ li r6, 5 -/* 802DF764 38 E0 00 00 */ li r7, 0 -/* 802DF768 48 07 BE 5D */ bl GXSetVtxAttrFmt -/* 802DF76C 38 60 00 00 */ li r3, 0 -/* 802DF770 38 80 00 0D */ li r4, 0xd -/* 802DF774 38 A0 00 01 */ li r5, 1 -/* 802DF778 38 C0 00 02 */ li r6, 2 -/* 802DF77C 38 E0 00 0F */ li r7, 0xf -/* 802DF780 48 07 BE 45 */ bl GXSetVtxAttrFmt -/* 802DF784 48 07 BE 09 */ bl GXClearVtxDesc -/* 802DF788 38 60 00 09 */ li r3, 9 -/* 802DF78C 38 80 00 01 */ li r4, 1 -/* 802DF790 48 07 B7 29 */ bl GXSetVtxDesc -/* 802DF794 38 60 00 0B */ li r3, 0xb -/* 802DF798 38 80 00 01 */ li r4, 1 -/* 802DF79C 48 07 B7 1D */ bl GXSetVtxDesc -/* 802DF7A0 38 60 00 0D */ li r3, 0xd -/* 802DF7A4 38 80 00 01 */ li r4, 1 -/* 802DF7A8 48 07 B7 11 */ bl GXSetVtxDesc -lbl_802DF7AC: -/* 802DF7AC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802DF7B0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802DF7B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DF7B8 7C 08 03 A6 */ mtlr r0 -/* 802DF7BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DF7C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/setGX__10JUTResFontFv.s b/asm/JSystem/JUtility/JUTResFont/setGX__10JUTResFontFv.s deleted file mode 100644 index d420124251..0000000000 --- a/asm/JSystem/JUtility/JUTResFont/setGX__10JUTResFontFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_802DF48C: -/* 802DF48C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DF490 7C 08 02 A6 */ mflr r0 -/* 802DF494 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DF498 38 60 00 01 */ li r3, 1 -/* 802DF49C 48 07 E6 95 */ bl GXSetNumChans -/* 802DF4A0 38 60 00 01 */ li r3, 1 -/* 802DF4A4 48 08 03 ED */ bl GXSetNumTevStages -/* 802DF4A8 38 60 00 01 */ li r3, 1 -/* 802DF4AC 48 07 C9 51 */ bl GXSetNumTexGens -/* 802DF4B0 38 60 00 00 */ li r3, 0 -/* 802DF4B4 38 80 00 00 */ li r4, 0 -/* 802DF4B8 38 A0 00 00 */ li r5, 0 -/* 802DF4BC 38 C0 00 04 */ li r6, 4 -/* 802DF4C0 48 08 02 35 */ bl GXSetTevOrder -/* 802DF4C4 38 60 00 04 */ li r3, 4 -/* 802DF4C8 38 80 00 00 */ li r4, 0 -/* 802DF4CC 38 A0 00 00 */ li r5, 0 -/* 802DF4D0 38 C0 00 01 */ li r6, 1 -/* 802DF4D4 38 E0 00 00 */ li r7, 0 -/* 802DF4D8 39 00 00 00 */ li r8, 0 -/* 802DF4DC 39 20 00 02 */ li r9, 2 -/* 802DF4E0 48 07 E6 8D */ bl GXSetChanCtrl -/* 802DF4E4 38 60 00 00 */ li r3, 0 -/* 802DF4E8 38 80 00 00 */ li r4, 0 -/* 802DF4EC 48 07 FC AD */ bl GXSetTevOp -/* 802DF4F0 38 60 00 01 */ li r3, 1 -/* 802DF4F4 38 80 00 04 */ li r4, 4 -/* 802DF4F8 38 A0 00 05 */ li r5, 5 -/* 802DF4FC 38 C0 00 0F */ li r6, 0xf -/* 802DF500 48 08 06 F1 */ bl GXSetBlendMode -/* 802DF504 38 60 00 00 */ li r3, 0 -/* 802DF508 38 80 00 09 */ li r4, 9 -/* 802DF50C 38 A0 00 01 */ li r5, 1 -/* 802DF510 38 C0 00 03 */ li r6, 3 -/* 802DF514 38 E0 00 00 */ li r7, 0 -/* 802DF518 48 07 C0 AD */ bl GXSetVtxAttrFmt -/* 802DF51C 38 60 00 00 */ li r3, 0 -/* 802DF520 38 80 00 0B */ li r4, 0xb -/* 802DF524 38 A0 00 01 */ li r5, 1 -/* 802DF528 38 C0 00 05 */ li r6, 5 -/* 802DF52C 38 E0 00 00 */ li r7, 0 -/* 802DF530 48 07 C0 95 */ bl GXSetVtxAttrFmt -/* 802DF534 38 60 00 00 */ li r3, 0 -/* 802DF538 38 80 00 0D */ li r4, 0xd -/* 802DF53C 38 A0 00 01 */ li r5, 1 -/* 802DF540 38 C0 00 02 */ li r6, 2 -/* 802DF544 38 E0 00 0F */ li r7, 0xf -/* 802DF548 48 07 C0 7D */ bl GXSetVtxAttrFmt -/* 802DF54C 48 07 C0 41 */ bl GXClearVtxDesc -/* 802DF550 38 60 00 09 */ li r3, 9 -/* 802DF554 38 80 00 01 */ li r4, 1 -/* 802DF558 48 07 B9 61 */ bl GXSetVtxDesc -/* 802DF55C 38 60 00 0B */ li r3, 0xb -/* 802DF560 38 80 00 01 */ li r4, 1 -/* 802DF564 48 07 B9 55 */ bl GXSetVtxDesc -/* 802DF568 38 60 00 0D */ li r3, 0xd -/* 802DF56C 38 80 00 01 */ li r4, 1 -/* 802DF570 48 07 B9 49 */ bl GXSetVtxDesc -/* 802DF574 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DF578 7C 08 03 A6 */ mtlr r0 -/* 802DF57C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF580 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTTexture/__dt__10JUTTextureFv.s b/asm/JSystem/JUtility/JUTTexture/__dt__10JUTTextureFv.s deleted file mode 100644 index a6c18f5e6e..0000000000 --- a/asm/JSystem/JUtility/JUTTexture/__dt__10JUTTextureFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802DE234: -/* 802DE234 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DE238 7C 08 02 A6 */ mflr r0 -/* 802DE23C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DE240 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DE244 93 C1 00 08 */ stw r30, 8(r1) -/* 802DE248 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802DE24C 7C 9F 23 78 */ mr r31, r4 -/* 802DE250 41 82 00 3C */ beq lbl_802DE28C -/* 802DE254 88 1E 00 3B */ lbz r0, 0x3b(r30) -/* 802DE258 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802DE25C 41 82 00 0C */ beq lbl_802DE268 -/* 802DE260 80 7E 00 3C */ lwz r3, 0x3c(r30) -/* 802DE264 4B FF 0A FD */ bl __dla__FPv -lbl_802DE268: -/* 802DE268 88 1E 00 3B */ lbz r0, 0x3b(r30) -/* 802DE26C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 802DE270 41 82 00 0C */ beq lbl_802DE27C -/* 802DE274 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 802DE278 4B FF 0A C5 */ bl __dl__FPv -lbl_802DE27C: -/* 802DE27C 7F E0 07 35 */ extsh. r0, r31 -/* 802DE280 40 81 00 0C */ ble lbl_802DE28C -/* 802DE284 7F C3 F3 78 */ mr r3, r30 -/* 802DE288 4B FF 0A B5 */ bl __dl__FPv -lbl_802DE28C: -/* 802DE28C 7F C3 F3 78 */ mr r3, r30 -/* 802DE290 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DE294 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DE298 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DE29C 7C 08 03 A6 */ mtlr r0 -/* 802DE2A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE2A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTTexture/attachPalette__10JUTTextureFP10JUTPalette.s b/asm/JSystem/JUtility/JUTTexture/attachPalette__10JUTTextureFP10JUTPalette.s deleted file mode 100644 index dd68a2cb0a..0000000000 --- a/asm/JSystem/JUtility/JUTTexture/attachPalette__10JUTTextureFP10JUTPalette.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_802DE5B0: -/* 802DE5B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DE5B4 7C 08 02 A6 */ mflr r0 -/* 802DE5B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DE5BC 80 A3 00 20 */ lwz r5, 0x20(r3) -/* 802DE5C0 88 05 00 08 */ lbz r0, 8(r5) -/* 802DE5C4 28 00 00 00 */ cmplwi r0, 0 -/* 802DE5C8 41 82 00 30 */ beq lbl_802DE5F8 -/* 802DE5CC 28 04 00 00 */ cmplwi r4, 0 -/* 802DE5D0 40 82 00 18 */ bne lbl_802DE5E8 -/* 802DE5D4 80 03 00 28 */ lwz r0, 0x28(r3) -/* 802DE5D8 28 00 00 00 */ cmplwi r0, 0 -/* 802DE5DC 41 82 00 0C */ beq lbl_802DE5E8 -/* 802DE5E0 90 03 00 2C */ stw r0, 0x2c(r3) -/* 802DE5E4 48 00 00 08 */ b lbl_802DE5EC -lbl_802DE5E8: -/* 802DE5E8 90 83 00 2C */ stw r4, 0x2c(r3) -lbl_802DE5EC: -/* 802DE5EC 80 83 00 2C */ lwz r4, 0x2c(r3) -/* 802DE5F0 88 84 00 0C */ lbz r4, 0xc(r4) -/* 802DE5F4 48 00 01 51 */ bl initTexObj__10JUTTextureF7_GXTlut -lbl_802DE5F8: -/* 802DE5F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DE5FC 7C 08 03 A6 */ mtlr r0 -/* 802DE600 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE604 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTTexture/init__10JUTTextureFv.s b/asm/JSystem/JUtility/JUTTexture/init__10JUTTextureFv.s deleted file mode 100644 index 6a65d25ef7..0000000000 --- a/asm/JSystem/JUtility/JUTTexture/init__10JUTTextureFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802DE608: -/* 802DE608 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DE60C 7C 08 02 A6 */ mflr r0 -/* 802DE610 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DE614 80 83 00 20 */ lwz r4, 0x20(r3) -/* 802DE618 A0 04 00 0A */ lhz r0, 0xa(r4) -/* 802DE61C 28 00 00 00 */ cmplwi r0, 0 -/* 802DE620 40 82 00 0C */ bne lbl_802DE62C -/* 802DE624 48 00 00 35 */ bl initTexObj__10JUTTextureFv -/* 802DE628 48 00 00 20 */ b lbl_802DE648 -lbl_802DE62C: -/* 802DE62C 80 03 00 28 */ lwz r0, 0x28(r3) -/* 802DE630 28 00 00 00 */ cmplwi r0, 0 -/* 802DE634 41 82 00 14 */ beq lbl_802DE648 -/* 802DE638 90 03 00 2C */ stw r0, 0x2c(r3) -/* 802DE63C 80 83 00 2C */ lwz r4, 0x2c(r3) -/* 802DE640 88 84 00 0C */ lbz r4, 0xc(r4) -/* 802DE644 48 00 01 01 */ bl initTexObj__10JUTTextureF7_GXTlut -lbl_802DE648: -/* 802DE648 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DE64C 7C 08 03 A6 */ mtlr r0 -/* 802DE650 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE654 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTTexture/load__10JUTTextureF11_GXTexMapID.s b/asm/JSystem/JUtility/JUTTexture/load__10JUTTextureF11_GXTexMapID.s deleted file mode 100644 index 6657bbe8fd..0000000000 --- a/asm/JSystem/JUtility/JUTTexture/load__10JUTTextureF11_GXTexMapID.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_802DE840: -/* 802DE840 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DE844 7C 08 02 A6 */ mflr r0 -/* 802DE848 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DE84C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DE850 93 C1 00 08 */ stw r30, 8(r1) -/* 802DE854 7C 7E 1B 78 */ mr r30, r3 -/* 802DE858 7C 9F 23 78 */ mr r31, r4 -/* 802DE85C 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 802DE860 28 03 00 00 */ cmplwi r3, 0 -/* 802DE864 41 82 00 08 */ beq lbl_802DE86C -/* 802DE868 48 00 00 F5 */ bl load__10JUTPaletteFv -lbl_802DE86C: -/* 802DE86C 7F C3 F3 78 */ mr r3, r30 -/* 802DE870 7F E4 FB 78 */ mr r4, r31 -/* 802DE874 48 07 FB A1 */ bl GXLoadTexObj -/* 802DE878 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DE87C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DE880 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DE884 7C 08 03 A6 */ mtlr r0 -/* 802DE888 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE88C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTTexture/storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette.s b/asm/JSystem/JUtility/JUTTexture/storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette.s deleted file mode 100644 index b2eb16aa92..0000000000 --- a/asm/JSystem/JUtility/JUTTexture/storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802DE44C: -/* 802DE44C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DE450 7C 08 02 A6 */ mflr r0 -/* 802DE454 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DE458 28 05 00 00 */ cmplwi r5, 0 -/* 802DE45C 41 82 00 0C */ beq lbl_802DE468 -/* 802DE460 88 C5 00 0C */ lbz r6, 0xc(r5) -/* 802DE464 48 00 00 08 */ b lbl_802DE46C -lbl_802DE468: -/* 802DE468 38 C0 00 00 */ li r6, 0 -lbl_802DE46C: -/* 802DE46C 48 00 00 15 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette7_GXTlut -/* 802DE470 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DE474 7C 08 03 A6 */ mtlr r0 -/* 802DE478 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE47C 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/getDaytime__18dScnKy_env_light_cFv.s b/asm/d/kankyo/d_kankyo/getDaytime__18dScnKy_env_light_cFv.s deleted file mode 100644 index 03020c2ec0..0000000000 --- a/asm/d/kankyo/d_kankyo/getDaytime__18dScnKy_env_light_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8019FA08: -/* 8019FA08 C0 23 12 44 */ lfs f1, 0x1244(r3) -/* 8019FA0C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/__dt__13dMeter2Info_cFv.s b/asm/d/meter/d_meter2_info/__dt__13dMeter2Info_cFv.s deleted file mode 100644 index f8511cd640..0000000000 --- a/asm/d/meter/d_meter2_info/__dt__13dMeter2Info_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8021BE20: -/* 8021BE20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021BE24 7C 08 02 A6 */ mflr r0 -/* 8021BE28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BE2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021BE30 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8021BE34 41 82 00 1C */ beq lbl_8021BE50 -/* 8021BE38 3C A0 80 3C */ lis r5, __vt__13dMeter2Info_c@ha /* 0x803BFA1C@ha */ -/* 8021BE3C 38 05 FA 1C */ addi r0, r5, __vt__13dMeter2Info_c@l /* 0x803BFA1C@l */ -/* 8021BE40 90 1F 00 00 */ stw r0, 0(r31) -/* 8021BE44 7C 80 07 35 */ extsh. r0, r4 -/* 8021BE48 40 81 00 08 */ ble lbl_8021BE50 -/* 8021BE4C 48 0B 2E F1 */ bl __dl__FPv -lbl_8021BE50: -/* 8021BE50 7F E3 FB 78 */ mr r3, r31 -/* 8021BE54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021BE58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021BE5C 7C 08 03 A6 */ mtlr r0 -/* 8021BE60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021BE64 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/changeWater__13dMeter2Info_cFUc.s b/asm/d/meter/d_meter2_info/changeWater__13dMeter2Info_cFUc.s deleted file mode 100644 index 600b4b738e..0000000000 --- a/asm/d/meter/d_meter2_info/changeWater__13dMeter2Info_cFUc.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8021DD5C: -/* 8021DD5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021DD60 7C 08 02 A6 */ mflr r0 -/* 8021DD64 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021DD68 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021DD6C 48 14 44 6D */ bl _savegpr_28 -/* 8021DD70 7C 9C 23 78 */ mr r28, r4 -/* 8021DD74 38 80 00 00 */ li r4, 0 -/* 8021DD78 57 9E 06 3E */ clrlwi r30, r28, 0x18 -/* 8021DD7C 38 1E FF F5 */ addi r0, r30, -11 -/* 8021DD80 54 00 08 3C */ slwi r0, r0, 1 -/* 8021DD84 7C 63 02 14 */ add r3, r3, r0 -/* 8021DD88 B0 83 00 9A */ sth r4, 0x9a(r3) -/* 8021DD8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021DD90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021DD94 3B E3 00 9C */ addi r31, r3, 0x9c -/* 8021DD98 7F E3 FB 78 */ mr r3, r31 -/* 8021DD9C 7F C4 F3 78 */ mr r4, r30 -/* 8021DDA0 38 A0 00 01 */ li r5, 1 -/* 8021DDA4 4B E1 52 8D */ bl getItem__17dSv_player_item_cCFib -/* 8021DDA8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8021DDAC 28 00 00 6B */ cmplwi r0, 0x6b -/* 8021DDB0 40 82 00 50 */ bne lbl_8021DE00 -/* 8021DDB4 7F E3 FB 78 */ mr r3, r31 -/* 8021DDB8 7F C4 F3 78 */ mr r4, r30 -/* 8021DDBC 38 A0 00 67 */ li r5, 0x67 -/* 8021DDC0 4B E1 51 F9 */ bl setItem__17dSv_player_item_cFiUc -/* 8021DDC4 3B A0 00 00 */ li r29, 0 -/* 8021DDC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021DDCC 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021DDD0 57 9F 06 3E */ clrlwi r31, r28, 0x18 -lbl_8021DDD4: -/* 8021DDD4 7F C3 F3 78 */ mr r3, r30 -/* 8021DDD8 7F A4 EB 78 */ mr r4, r29 -/* 8021DDDC 4B E1 4C 81 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8021DDE0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8021DDE4 7C 1F 00 40 */ cmplw r31, r0 -/* 8021DDE8 40 82 00 0C */ bne lbl_8021DDF4 -/* 8021DDEC 7F A3 EB 78 */ mr r3, r29 -/* 8021DDF0 4B E1 00 05 */ bl dComIfGp_setSelectItem__Fi -lbl_8021DDF4: -/* 8021DDF4 3B BD 00 01 */ addi r29, r29, 1 -/* 8021DDF8 2C 1D 00 03 */ cmpwi r29, 3 -/* 8021DDFC 41 80 FF D8 */ blt lbl_8021DDD4 -lbl_8021DE00: -/* 8021DE00 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021DE04 48 14 44 21 */ bl _restgpr_28 -/* 8021DE08 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021DE0C 7C 08 03 A6 */ mtlr r0 -/* 8021DE10 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021DE14 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/dMeter2Info_getNewLetterNum__Fv.s b/asm/d/meter/d_meter2_info/dMeter2Info_getNewLetterNum__Fv.s deleted file mode 100644 index 19375e668b..0000000000 --- a/asm/d/meter/d_meter2_info/dMeter2Info_getNewLetterNum__Fv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8021E754: -/* 8021E754 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021E758 7C 08 02 A6 */ mflr r0 -/* 8021E75C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021E760 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E764 48 14 3A 71 */ bl _savegpr_27 -/* 8021E768 3B 80 00 00 */ li r28, 0 -/* 8021E76C 3B 60 00 00 */ li r27, 0 -/* 8021E770 3B E0 00 00 */ li r31, 0 -/* 8021E774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E77C 3B C3 01 1C */ addi r30, r3, 0x11c -/* 8021E780 3B A3 07 F0 */ addi r29, r3, 0x7f0 -lbl_8021E784: -/* 8021E784 7F C3 F3 78 */ mr r3, r30 -/* 8021E788 7F 64 DB 78 */ mr r4, r27 -/* 8021E78C 4B E1 5C C1 */ bl isLetterGetFlag__17dSv_letter_info_cCFi -/* 8021E790 2C 03 00 00 */ cmpwi r3, 0 -/* 8021E794 40 82 00 44 */ bne lbl_8021E7D8 -/* 8021E798 3C 60 80 3C */ lis r3, letter_data__12dMenu_Letter@ha /* 0x803BF81C@ha */ -/* 8021E79C 38 03 F8 1C */ addi r0, r3, letter_data__12dMenu_Letter@l /* 0x803BF81C@l */ -/* 8021E7A0 7C 60 FA 14 */ add r3, r0, r31 -/* 8021E7A4 A0 03 00 02 */ lhz r0, 2(r3) -/* 8021E7A8 28 00 00 00 */ cmplwi r0, 0 -/* 8021E7AC 41 82 00 2C */ beq lbl_8021E7D8 -/* 8021E7B0 A0 03 00 06 */ lhz r0, 6(r3) -/* 8021E7B4 7F A3 EB 78 */ mr r3, r29 -/* 8021E7B8 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8021E7BC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8021E7C0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8021E7C4 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8021E7C8 4B E1 61 F5 */ bl isEventBit__11dSv_event_cCFUs -/* 8021E7CC 2C 03 00 00 */ cmpwi r3, 0 -/* 8021E7D0 41 82 00 08 */ beq lbl_8021E7D8 -/* 8021E7D4 3B 9C 00 01 */ addi r28, r28, 1 -lbl_8021E7D8: -/* 8021E7D8 3B 7B 00 01 */ addi r27, r27, 1 -/* 8021E7DC 2C 1B 00 40 */ cmpwi r27, 0x40 -/* 8021E7E0 3B FF 00 08 */ addi r31, r31, 8 -/* 8021E7E4 41 80 FF A0 */ blt lbl_8021E784 -/* 8021E7E8 7F 83 E3 78 */ mr r3, r28 -/* 8021E7EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E7F0 48 14 3A 31 */ bl _restgpr_27 -/* 8021E7F4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021E7F8 7C 08 03 A6 */ mtlr r0 -/* 8021E7FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021E800 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/dMeter2Info_getRecieveLetterNum__Fv.s b/asm/d/meter/d_meter2_info/dMeter2Info_getRecieveLetterNum__Fv.s deleted file mode 100644 index 7fe5f76295..0000000000 --- a/asm/d/meter/d_meter2_info/dMeter2Info_getRecieveLetterNum__Fv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8021E6E4: -/* 8021E6E4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021E6E8 7C 08 02 A6 */ mflr r0 -/* 8021E6EC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021E6F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E6F4 48 14 3A E9 */ bl _savegpr_29 -/* 8021E6F8 3B C0 00 00 */ li r30, 0 -/* 8021E6FC 3B A0 00 00 */ li r29, 0 -/* 8021E700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E708 3B E3 01 1C */ addi r31, r3, 0x11c -lbl_8021E70C: -/* 8021E70C 7F E3 FB 78 */ mr r3, r31 -/* 8021E710 7F A4 EB 78 */ mr r4, r29 -/* 8021E714 4B E1 5D 39 */ bl isLetterGetFlag__17dSv_letter_info_cCFi -/* 8021E718 2C 03 00 00 */ cmpwi r3, 0 -/* 8021E71C 41 82 00 10 */ beq lbl_8021E72C -/* 8021E720 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 8021E724 38 03 00 01 */ addi r0, r3, 1 -/* 8021E728 54 1E 06 3E */ clrlwi r30, r0, 0x18 -lbl_8021E72C: -/* 8021E72C 3B BD 00 01 */ addi r29, r29, 1 -/* 8021E730 2C 1D 00 40 */ cmpwi r29, 0x40 -/* 8021E734 41 80 FF D8 */ blt lbl_8021E70C -/* 8021E738 7F C3 F3 78 */ mr r3, r30 -/* 8021E73C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E740 48 14 3A E9 */ bl _restgpr_29 -/* 8021E744 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021E748 7C 08 03 A6 */ mtlr r0 -/* 8021E74C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021E750 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/dMeter2Info_isMapOpenCheck__Fv.s b/asm/d/meter/d_meter2_info/dMeter2Info_isMapOpenCheck__Fv.s deleted file mode 100644 index a33922363c..0000000000 --- a/asm/d/meter/d_meter2_info/dMeter2Info_isMapOpenCheck__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8021E668: -/* 8021E668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021E66C 7C 08 02 A6 */ mflr r0 -/* 8021E670 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021E674 4B FE F2 8D */ bl isMapOpenCheck__11dMeterMap_cFv -/* 8021E678 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021E67C 7C 08 03 A6 */ mtlr r0 -/* 8021E680 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021E684 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/dMeter2Info_setCloth__FUcb.s b/asm/d/meter/d_meter2_info/dMeter2Info_setCloth__FUcb.s deleted file mode 100644 index 4eaa68c77e..0000000000 --- a/asm/d/meter/d_meter2_info/dMeter2Info_setCloth__FUcb.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8021E4B0: -/* 8021E4B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021E4B4 7C 08 02 A6 */ mflr r0 -/* 8021E4B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021E4BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021E4C0 7C 7F 1B 78 */ mr r31, r3 -/* 8021E4C4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8021E4C8 2C 00 00 32 */ cmpwi r0, 0x32 -/* 8021E4CC 40 80 00 0C */ bge lbl_8021E4D8 -/* 8021E4D0 2C 00 00 2E */ cmpwi r0, 0x2e -/* 8021E4D4 40 80 00 0C */ bge lbl_8021E4E0 -lbl_8021E4D8: -/* 8021E4D8 3B E0 00 2E */ li r31, 0x2e -/* 8021E4DC 38 80 00 00 */ li r4, 0 -lbl_8021E4E0: -/* 8021E4E0 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8021E4E4 41 82 00 24 */ beq lbl_8021E508 -/* 8021E4E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E4EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E4F0 88 83 00 13 */ lbz r4, 0x13(r3) -/* 8021E4F4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8021E4F8 28 00 00 FF */ cmplwi r0, 0xff -/* 8021E4FC 41 82 00 0C */ beq lbl_8021E508 -/* 8021E500 38 63 00 CC */ addi r3, r3, 0xcc -/* 8021E504 4B E1 59 91 */ bl offFirstBit__21dSv_player_get_item_cFUc -lbl_8021E508: -/* 8021E508 7F E3 FB 78 */ mr r3, r31 -/* 8021E50C 4B E1 09 A5 */ bl dComIfGs_setSelectEquipClothes__FUc -/* 8021E510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E518 9B E3 5E 74 */ stb r31, 0x5e74(r3) -/* 8021E51C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021E520 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021E524 7C 08 03 A6 */ mtlr r0 -/* 8021E528 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021E52C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/dMeter2Info_setShield__FUcb.s b/asm/d/meter/d_meter2_info/dMeter2Info_setShield__FUcb.s deleted file mode 100644 index a31c06ac6e..0000000000 --- a/asm/d/meter/d_meter2_info/dMeter2Info_setShield__FUcb.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8021E5D4: -/* 8021E5D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021E5D8 7C 08 02 A6 */ mflr r0 -/* 8021E5DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021E5E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021E5E4 7C 7F 1B 78 */ mr r31, r3 -/* 8021E5E8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8021E5EC 2C 00 00 FF */ cmpwi r0, 0xff -/* 8021E5F0 41 82 00 20 */ beq lbl_8021E610 -/* 8021E5F4 40 80 00 14 */ bge lbl_8021E608 -/* 8021E5F8 2C 00 00 2D */ cmpwi r0, 0x2d -/* 8021E5FC 40 80 00 0C */ bge lbl_8021E608 -/* 8021E600 2C 00 00 2A */ cmpwi r0, 0x2a -/* 8021E604 40 80 00 0C */ bge lbl_8021E610 -lbl_8021E608: -/* 8021E608 3B E0 00 FF */ li r31, 0xff -/* 8021E60C 38 80 00 00 */ li r4, 0 -lbl_8021E610: -/* 8021E610 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8021E614 41 82 00 24 */ beq lbl_8021E638 -/* 8021E618 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E61C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E620 88 83 00 15 */ lbz r4, 0x15(r3) -/* 8021E624 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8021E628 28 00 00 FF */ cmplwi r0, 0xff -/* 8021E62C 41 82 00 0C */ beq lbl_8021E638 -/* 8021E630 38 63 00 CC */ addi r3, r3, 0xcc -/* 8021E634 4B E1 58 61 */ bl offFirstBit__21dSv_player_get_item_cFUc -lbl_8021E638: -/* 8021E638 7F E3 FB 78 */ mr r3, r31 -/* 8021E63C 4B E1 09 59 */ bl dComIfGs_setSelectEquipShield__FUc -/* 8021E640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E648 9B E3 5E 76 */ stb r31, 0x5e76(r3) -/* 8021E64C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021E650 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021E654 7C 08 03 A6 */ mtlr r0 -/* 8021E658 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021E65C 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/dMeter2Info_setSword__FUcb.s b/asm/d/meter/d_meter2_info/dMeter2Info_setSword__FUcb.s deleted file mode 100644 index 44cbee86b4..0000000000 --- a/asm/d/meter/d_meter2_info/dMeter2Info_setSword__FUcb.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8021E530: -/* 8021E530 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021E534 7C 08 02 A6 */ mflr r0 -/* 8021E538 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021E53C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021E540 7C 7F 1B 78 */ mr r31, r3 -/* 8021E544 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8021E548 2C 00 00 49 */ cmpwi r0, 0x49 -/* 8021E54C 41 82 00 38 */ beq lbl_8021E584 -/* 8021E550 40 80 00 24 */ bge lbl_8021E574 -/* 8021E554 2C 00 00 3F */ cmpwi r0, 0x3f -/* 8021E558 41 82 00 2C */ beq lbl_8021E584 -/* 8021E55C 40 80 00 20 */ bge lbl_8021E57C -/* 8021E560 2C 00 00 2A */ cmpwi r0, 0x2a -/* 8021E564 40 80 00 18 */ bge lbl_8021E57C -/* 8021E568 2C 00 00 28 */ cmpwi r0, 0x28 -/* 8021E56C 40 80 00 18 */ bge lbl_8021E584 -/* 8021E570 48 00 00 0C */ b lbl_8021E57C -lbl_8021E574: -/* 8021E574 2C 00 00 FF */ cmpwi r0, 0xff -/* 8021E578 41 82 00 0C */ beq lbl_8021E584 -lbl_8021E57C: -/* 8021E57C 3B E0 00 FF */ li r31, 0xff -/* 8021E580 38 80 00 00 */ li r4, 0 -lbl_8021E584: -/* 8021E584 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8021E588 41 82 00 24 */ beq lbl_8021E5AC -/* 8021E58C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E590 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E594 88 83 00 14 */ lbz r4, 0x14(r3) -/* 8021E598 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8021E59C 28 00 00 FF */ cmplwi r0, 0xff -/* 8021E5A0 41 82 00 0C */ beq lbl_8021E5AC -/* 8021E5A4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8021E5A8 4B E1 58 ED */ bl offFirstBit__21dSv_player_get_item_cFUc -lbl_8021E5AC: -/* 8021E5AC 7F E3 FB 78 */ mr r3, r31 -/* 8021E5B0 4B E1 09 11 */ bl dComIfGs_setSelectEquipSword__FUc -/* 8021E5B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E5B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E5BC 9B E3 5E 75 */ stb r31, 0x5e75(r3) -/* 8021E5C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021E5C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021E5C8 7C 08 03 A6 */ mtlr r0 -/* 8021E5CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021E5D0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/isFloatingMessageVisible__13dMeter2Info_cFv.s b/asm/d/meter/d_meter2_info/isFloatingMessageVisible__13dMeter2Info_cFv.s deleted file mode 100644 index 75aa2fd68c..0000000000 --- a/asm/d/meter/d_meter2_info/isFloatingMessageVisible__13dMeter2Info_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8021C1DC: -/* 8021C1DC A8 63 00 A8 */ lha r3, 0xa8(r3) -/* 8021C1E0 7C 03 00 D0 */ neg r0, r3 -/* 8021C1E4 7C 00 18 78 */ andc r0, r0, r3 -/* 8021C1E8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8021C1EC 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/resetMiniGameItem__13dMeter2Info_cFb.s b/asm/d/meter/d_meter2_info/resetMiniGameItem__13dMeter2Info_cFb.s deleted file mode 100644 index 9954db60d4..0000000000 --- a/asm/d/meter/d_meter2_info/resetMiniGameItem__13dMeter2Info_cFb.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_8021E0C4: -/* 8021E0C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021E0C8 7C 08 02 A6 */ mflr r0 -/* 8021E0CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021E0D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E0D4 48 14 41 01 */ bl _savegpr_27 -/* 8021E0D8 7C 7E 1B 78 */ mr r30, r3 -/* 8021E0DC 7C 9F 23 78 */ mr r31, r4 -/* 8021E0E0 88 03 00 DD */ lbz r0, 0xdd(r3) -/* 8021E0E4 28 00 00 00 */ cmplwi r0, 0 -/* 8021E0E8 41 82 01 68 */ beq lbl_8021E250 -/* 8021E0EC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 8021E0F0 41 82 00 9C */ beq lbl_8021E18C -/* 8021E0F4 3B 60 00 00 */ li r27, 0 -/* 8021E0F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E0FC 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_8021E100: -/* 8021E100 7F 63 DB 78 */ mr r3, r27 -/* 8021E104 4B E0 FC C5 */ bl dComIfGs_getMixItemIndex__Fi -/* 8021E108 7F 9E DA 14 */ add r28, r30, r27 -/* 8021E10C 98 7C 00 D4 */ stb r3, 0xd4(r28) -/* 8021E110 7F A3 EB 78 */ mr r3, r29 -/* 8021E114 7F 64 DB 78 */ mr r4, r27 -/* 8021E118 4B E1 49 45 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8021E11C 98 7C 00 D0 */ stb r3, 0xd0(r28) -/* 8021E120 3B 7B 00 01 */ addi r27, r27, 1 -/* 8021E124 2C 1B 00 02 */ cmpwi r27, 2 -/* 8021E128 41 80 FF D8 */ blt lbl_8021E100 -/* 8021E12C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E130 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E134 3B 83 00 EC */ addi r28, r3, 0xec -/* 8021E138 7F 83 E3 78 */ mr r3, r28 -/* 8021E13C 88 9E 00 DC */ lbz r4, 0xdc(r30) -/* 8021E140 4B E1 5E 3D */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8021E144 98 7E 00 D8 */ stb r3, 0xd8(r30) -/* 8021E148 88 1C 00 00 */ lbz r0, 0(r28) -/* 8021E14C 98 1E 00 D9 */ stb r0, 0xd9(r30) -/* 8021E150 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E154 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E158 3B 83 00 9C */ addi r28, r3, 0x9c -/* 8021E15C 7F 83 E3 78 */ mr r3, r28 -/* 8021E160 38 80 00 04 */ li r4, 4 -/* 8021E164 38 A0 00 00 */ li r5, 0 -/* 8021E168 4B E1 4E C9 */ bl getItem__17dSv_player_item_cCFib -/* 8021E16C 98 7E 00 DA */ stb r3, 0xda(r30) -/* 8021E170 7F 83 E3 78 */ mr r3, r28 -/* 8021E174 88 9E 00 DC */ lbz r4, 0xdc(r30) -/* 8021E178 38 04 00 0F */ addi r0, r4, 0xf -/* 8021E17C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021E180 38 A0 00 00 */ li r5, 0 -/* 8021E184 4B E1 4E AD */ bl getItem__17dSv_player_item_cCFib -/* 8021E188 98 7E 00 DB */ stb r3, 0xdb(r30) -lbl_8021E18C: -/* 8021E18C 3B 60 00 00 */ li r27, 0 -lbl_8021E190: -/* 8021E190 7F 63 DB 78 */ mr r3, r27 -/* 8021E194 7F 9E DA 14 */ add r28, r30, r27 -/* 8021E198 88 9C 00 C8 */ lbz r4, 0xc8(r28) -/* 8021E19C 4B E0 FB 6D */ bl dComIfGs_setMixItemIndex__FiUc -/* 8021E1A0 7F 63 DB 78 */ mr r3, r27 -/* 8021E1A4 88 9C 00 C4 */ lbz r4, 0xc4(r28) -/* 8021E1A8 4B E0 FB 1D */ bl dComIfGs_setSelectItemIndex__FiUc -/* 8021E1AC 3B 7B 00 01 */ addi r27, r27, 1 -/* 8021E1B0 2C 1B 00 02 */ cmpwi r27, 2 -/* 8021E1B4 41 80 FF DC */ blt lbl_8021E190 -/* 8021E1B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E1BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E1C0 3B 83 00 9C */ addi r28, r3, 0x9c -/* 8021E1C4 7F 83 E3 78 */ mr r3, r28 -/* 8021E1C8 38 80 00 04 */ li r4, 4 -/* 8021E1CC 88 BE 00 CE */ lbz r5, 0xce(r30) -/* 8021E1D0 4B E1 4D E9 */ bl setItem__17dSv_player_item_cFiUc -/* 8021E1D4 88 9E 00 CE */ lbz r4, 0xce(r30) -/* 8021E1D8 38 00 00 04 */ li r0, 4 -/* 8021E1DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E1E0 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E1E4 98 1D 5E 7D */ stb r0, 0x5e7d(r29) -/* 8021E1E8 98 9D 5E 7E */ stb r4, 0x5e7e(r29) -/* 8021E1EC 7F 83 E3 78 */ mr r3, r28 -/* 8021E1F0 88 9E 00 DC */ lbz r4, 0xdc(r30) -/* 8021E1F4 38 04 00 0F */ addi r0, r4, 0xf -/* 8021E1F8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021E1FC 88 BE 00 CF */ lbz r5, 0xcf(r30) -/* 8021E200 4B E1 4D B9 */ bl setItem__17dSv_player_item_cFiUc -/* 8021E204 88 7E 00 CF */ lbz r3, 0xcf(r30) -/* 8021E208 88 9E 00 DC */ lbz r4, 0xdc(r30) -/* 8021E20C 38 04 00 0F */ addi r0, r4, 0xf -/* 8021E210 98 1D 5E 7D */ stb r0, 0x5e7d(r29) -/* 8021E214 98 7D 5E 7E */ stb r3, 0x5e7e(r29) -/* 8021E218 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E21C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E220 3B 83 00 EC */ addi r28, r3, 0xec -/* 8021E224 7F 83 E3 78 */ mr r3, r28 -/* 8021E228 88 BE 00 CC */ lbz r5, 0xcc(r30) -/* 8021E22C 4B E1 5D 41 */ bl setBombNum__24dSv_player_item_record_cFUcUc -/* 8021E230 88 1E 00 CD */ lbz r0, 0xcd(r30) -/* 8021E234 98 1C 00 00 */ stb r0, 0(r28) -/* 8021E238 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 8021E23C 40 82 00 14 */ bne lbl_8021E250 -/* 8021E240 38 00 00 00 */ li r0, 0 -/* 8021E244 98 1E 00 DD */ stb r0, 0xdd(r30) -/* 8021E248 38 00 00 FF */ li r0, 0xff -/* 8021E24C 98 1E 00 DC */ stb r0, 0xdc(r30) -lbl_8021E250: -/* 8021E250 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E254 48 14 3F CD */ bl _restgpr_27 -/* 8021E258 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021E25C 7C 08 03 A6 */ mtlr r0 -/* 8021E260 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021E264 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/resetWarpStatus__13dMeter2Info_cFv.s b/asm/d/meter/d_meter2_info/resetWarpStatus__13dMeter2Info_cFv.s deleted file mode 100644 index d0aff448c0..0000000000 --- a/asm/d/meter/d_meter2_info/resetWarpStatus__13dMeter2Info_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8021C9DC: -/* 8021C9DC 88 03 00 C0 */ lbz r0, 0xc0(r3) -/* 8021C9E0 28 00 00 02 */ cmplwi r0, 2 -/* 8021C9E4 40 82 00 14 */ bne lbl_8021C9F8 -/* 8021C9E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021C9EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021C9F0 38 00 FF FF */ li r0, -1 -/* 8021C9F4 98 04 00 98 */ stb r0, 0x98(r4) -lbl_8021C9F8: -/* 8021C9F8 38 00 00 00 */ li r0, 0 -/* 8021C9FC 98 03 00 C0 */ stb r0, 0xc0(r3) -/* 8021CA00 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/setMiniGameItem__13dMeter2Info_cFUc.s b/asm/d/meter/d_meter2_info/setMiniGameItem__13dMeter2Info_cFUc.s deleted file mode 100644 index 1487d87cfd..0000000000 --- a/asm/d/meter/d_meter2_info/setMiniGameItem__13dMeter2Info_cFUc.s +++ /dev/null @@ -1,181 +0,0 @@ -lbl_8021DE18: -/* 8021DE18 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8021DE1C 7C 08 02 A6 */ mflr r0 -/* 8021DE20 90 01 00 24 */ stw r0, 0x24(r1) -/* 8021DE24 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021DE28 48 14 43 A9 */ bl _savegpr_26 -/* 8021DE2C 7C 7C 1B 78 */ mr r28, r3 -/* 8021DE30 7C 9A 23 78 */ mr r26, r4 -/* 8021DE34 3B A0 00 00 */ li r29, 0 -/* 8021DE38 88 03 00 DD */ lbz r0, 0xdd(r3) -/* 8021DE3C 28 00 00 00 */ cmplwi r0, 0 -/* 8021DE40 41 82 00 08 */ beq lbl_8021DE48 -/* 8021DE44 3B A0 00 01 */ li r29, 1 -lbl_8021DE48: -/* 8021DE48 88 1C 00 DC */ lbz r0, 0xdc(r28) -/* 8021DE4C 28 00 00 FF */ cmplwi r0, 0xff -/* 8021DE50 40 82 00 64 */ bne lbl_8021DEB4 -/* 8021DE54 3B C0 00 00 */ li r30, 0 -/* 8021DE58 3B E0 00 00 */ li r31, 0 -/* 8021DE5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021DE60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021DE64 3B 63 00 9C */ addi r27, r3, 0x9c -lbl_8021DE68: -/* 8021DE68 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8021DE6C 40 82 00 2C */ bne lbl_8021DE98 -/* 8021DE70 7F 63 DB 78 */ mr r3, r27 -/* 8021DE74 38 1F 00 0F */ addi r0, r31, 0xf -/* 8021DE78 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021DE7C 38 A0 00 01 */ li r5, 1 -/* 8021DE80 4B E1 51 B1 */ bl getItem__17dSv_player_item_cCFib -/* 8021DE84 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8021DE88 28 00 00 FF */ cmplwi r0, 0xff -/* 8021DE8C 40 82 00 0C */ bne lbl_8021DE98 -/* 8021DE90 9B FC 00 DC */ stb r31, 0xdc(r28) -/* 8021DE94 3B C0 00 01 */ li r30, 1 -lbl_8021DE98: -/* 8021DE98 3B FF 00 01 */ addi r31, r31, 1 -/* 8021DE9C 2C 1F 00 03 */ cmpwi r31, 3 -/* 8021DEA0 41 80 FF C8 */ blt lbl_8021DE68 -/* 8021DEA4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8021DEA8 40 82 00 0C */ bne lbl_8021DEB4 -/* 8021DEAC 38 00 00 02 */ li r0, 2 -/* 8021DEB0 98 1C 00 DC */ stb r0, 0xdc(r28) -lbl_8021DEB4: -/* 8021DEB4 9B 5C 00 DD */ stb r26, 0xdd(r28) -/* 8021DEB8 3B E0 00 00 */ li r31, 0 -/* 8021DEBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021DEC0 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_8021DEC4: -/* 8021DEC4 7F E3 FB 78 */ mr r3, r31 -/* 8021DEC8 4B E0 FF 01 */ bl dComIfGs_getMixItemIndex__Fi -/* 8021DECC 7F DC FA 14 */ add r30, r28, r31 -/* 8021DED0 98 7E 00 C8 */ stb r3, 0xc8(r30) -/* 8021DED4 7F 63 DB 78 */ mr r3, r27 -/* 8021DED8 7F E4 FB 78 */ mr r4, r31 -/* 8021DEDC 4B E1 4B 81 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8021DEE0 98 7E 00 C4 */ stb r3, 0xc4(r30) -/* 8021DEE4 3B FF 00 01 */ addi r31, r31, 1 -/* 8021DEE8 2C 1F 00 02 */ cmpwi r31, 2 -/* 8021DEEC 41 80 FF D8 */ blt lbl_8021DEC4 -/* 8021DEF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021DEF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021DEF8 3B E3 00 EC */ addi r31, r3, 0xec -/* 8021DEFC 7F E3 FB 78 */ mr r3, r31 -/* 8021DF00 88 9C 00 DC */ lbz r4, 0xdc(r28) -/* 8021DF04 4B E1 60 79 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8021DF08 98 7C 00 CC */ stb r3, 0xcc(r28) -/* 8021DF0C 88 1F 00 00 */ lbz r0, 0(r31) -/* 8021DF10 98 1C 00 CD */ stb r0, 0xcd(r28) -/* 8021DF14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021DF18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021DF1C 3B C3 00 9C */ addi r30, r3, 0x9c -/* 8021DF20 7F C3 F3 78 */ mr r3, r30 -/* 8021DF24 38 80 00 04 */ li r4, 4 -/* 8021DF28 38 A0 00 00 */ li r5, 0 -/* 8021DF2C 4B E1 51 05 */ bl getItem__17dSv_player_item_cCFib -/* 8021DF30 98 7C 00 CE */ stb r3, 0xce(r28) -/* 8021DF34 7F C3 F3 78 */ mr r3, r30 -/* 8021DF38 88 9C 00 DC */ lbz r4, 0xdc(r28) -/* 8021DF3C 38 04 00 0F */ addi r0, r4, 0xf -/* 8021DF40 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021DF44 38 A0 00 00 */ li r5, 0 -/* 8021DF48 4B E1 50 E9 */ bl getItem__17dSv_player_item_cCFib -/* 8021DF4C 98 7C 00 CF */ stb r3, 0xcf(r28) -/* 8021DF50 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 8021DF54 41 82 00 98 */ beq lbl_8021DFEC -/* 8021DF58 3B 40 00 00 */ li r26, 0 -lbl_8021DF5C: -/* 8021DF5C 7F 43 D3 78 */ mr r3, r26 -/* 8021DF60 7F 7C D2 14 */ add r27, r28, r26 -/* 8021DF64 88 9B 00 D4 */ lbz r4, 0xd4(r27) -/* 8021DF68 4B E0 FD A1 */ bl dComIfGs_setMixItemIndex__FiUc -/* 8021DF6C 7F 43 D3 78 */ mr r3, r26 -/* 8021DF70 88 9B 00 D0 */ lbz r4, 0xd0(r27) -/* 8021DF74 4B E0 FD 51 */ bl dComIfGs_setSelectItemIndex__FiUc -/* 8021DF78 3B 5A 00 01 */ addi r26, r26, 1 -/* 8021DF7C 2C 1A 00 02 */ cmpwi r26, 2 -/* 8021DF80 41 80 FF DC */ blt lbl_8021DF5C -/* 8021DF84 7F C3 F3 78 */ mr r3, r30 -/* 8021DF88 38 80 00 04 */ li r4, 4 -/* 8021DF8C 88 BC 00 DA */ lbz r5, 0xda(r28) -/* 8021DF90 4B E1 50 29 */ bl setItem__17dSv_player_item_cFiUc -/* 8021DF94 88 9C 00 DA */ lbz r4, 0xda(r28) -/* 8021DF98 38 00 00 04 */ li r0, 4 -/* 8021DF9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021DFA0 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021DFA4 98 1B 5E 7D */ stb r0, 0x5e7d(r27) -/* 8021DFA8 98 9B 5E 7E */ stb r4, 0x5e7e(r27) -/* 8021DFAC 7F C3 F3 78 */ mr r3, r30 -/* 8021DFB0 88 9C 00 DC */ lbz r4, 0xdc(r28) -/* 8021DFB4 38 04 00 0F */ addi r0, r4, 0xf -/* 8021DFB8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021DFBC 88 BC 00 DB */ lbz r5, 0xdb(r28) -/* 8021DFC0 4B E1 4F F9 */ bl setItem__17dSv_player_item_cFiUc -/* 8021DFC4 88 7C 00 DB */ lbz r3, 0xdb(r28) -/* 8021DFC8 88 9C 00 DC */ lbz r4, 0xdc(r28) -/* 8021DFCC 38 04 00 0F */ addi r0, r4, 0xf -/* 8021DFD0 98 1B 5E 7D */ stb r0, 0x5e7d(r27) -/* 8021DFD4 98 7B 5E 7E */ stb r3, 0x5e7e(r27) -/* 8021DFD8 7F E3 FB 78 */ mr r3, r31 -/* 8021DFDC 88 BC 00 D8 */ lbz r5, 0xd8(r28) -/* 8021DFE0 4B E1 5F 8D */ bl setBombNum__24dSv_player_item_record_cFUcUc -/* 8021DFE4 88 1C 00 D9 */ lbz r0, 0xd9(r28) -/* 8021DFE8 98 1F 00 00 */ stb r0, 0(r31) -lbl_8021DFEC: -/* 8021DFEC 7F C3 F3 78 */ mr r3, r30 -/* 8021DFF0 88 9C 00 DC */ lbz r4, 0xdc(r28) -/* 8021DFF4 38 04 00 0F */ addi r0, r4, 0xf -/* 8021DFF8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021DFFC 38 A0 00 70 */ li r5, 0x70 -/* 8021E000 4B E1 4F B9 */ bl setItem__17dSv_player_item_cFiUc -/* 8021E004 88 7C 00 DC */ lbz r3, 0xdc(r28) -/* 8021E008 38 03 00 0F */ addi r0, r3, 0xf -/* 8021E00C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E010 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E014 98 1B 5E 7D */ stb r0, 0x5e7d(r27) -/* 8021E018 38 00 00 70 */ li r0, 0x70 -/* 8021E01C 98 1B 5E 7E */ stb r0, 0x5e7e(r27) -/* 8021E020 88 1C 00 DD */ lbz r0, 0xdd(r28) -/* 8021E024 28 00 00 03 */ cmplwi r0, 3 -/* 8021E028 41 82 00 5C */ beq lbl_8021E084 -/* 8021E02C 7F C3 F3 78 */ mr r3, r30 -/* 8021E030 38 80 00 04 */ li r4, 4 -/* 8021E034 38 A0 00 43 */ li r5, 0x43 -/* 8021E038 4B E1 4F 81 */ bl setItem__17dSv_player_item_cFiUc -/* 8021E03C 38 00 00 04 */ li r0, 4 -/* 8021E040 98 1B 5E 7D */ stb r0, 0x5e7d(r27) -/* 8021E044 38 00 00 43 */ li r0, 0x43 -/* 8021E048 98 1B 5E 7E */ stb r0, 0x5e7e(r27) -/* 8021E04C 38 60 00 01 */ li r3, 1 -/* 8021E050 38 80 00 FF */ li r4, 0xff -/* 8021E054 4B E0 FC B5 */ bl dComIfGs_setMixItemIndex__FiUc -/* 8021E058 38 60 00 01 */ li r3, 1 -/* 8021E05C 38 80 00 FF */ li r4, 0xff -/* 8021E060 4B E0 FC 65 */ bl dComIfGs_setSelectItemIndex__FiUc -/* 8021E064 38 60 00 00 */ li r3, 0 -/* 8021E068 38 80 00 04 */ li r4, 4 -/* 8021E06C 4B E0 FC 9D */ bl dComIfGs_setMixItemIndex__FiUc -/* 8021E070 38 60 00 00 */ li r3, 0 -/* 8021E074 88 9C 00 DC */ lbz r4, 0xdc(r28) -/* 8021E078 38 04 00 0F */ addi r0, r4, 0xf -/* 8021E07C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021E080 4B E0 FC 45 */ bl dComIfGs_setSelectItemIndex__FiUc -lbl_8021E084: -/* 8021E084 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 8021E088 40 82 00 24 */ bne lbl_8021E0AC -/* 8021E08C 7F E3 FB 78 */ mr r3, r31 -/* 8021E090 88 9C 00 DC */ lbz r4, 0xdc(r28) -/* 8021E094 38 A0 00 1E */ li r5, 0x1e -/* 8021E098 4B E1 5E D5 */ bl setBombNum__24dSv_player_item_record_cFUcUc -/* 8021E09C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021E0A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021E0A4 88 03 00 F8 */ lbz r0, 0xf8(r3) -/* 8021E0A8 98 1F 00 00 */ stb r0, 0(r31) -lbl_8021E0AC: -/* 8021E0AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E0B0 48 14 41 6D */ bl _restgpr_26 -/* 8021E0B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8021E0B8 7C 08 03 A6 */ mtlr r0 -/* 8021E0BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021E0C0 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter2_info/warpInProc__13dMeter2Info_cFv.s b/asm/d/meter/d_meter2_info/warpInProc__13dMeter2Info_cFv.s deleted file mode 100644 index 95c4c32e09..0000000000 --- a/asm/d/meter/d_meter2_info/warpInProc__13dMeter2Info_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8021CA04: -/* 8021CA04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8021CA08 7C 08 02 A6 */ mflr r0 -/* 8021CA0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021CA10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021CA14 38 60 00 00 */ li r3, 0 -/* 8021CA18 4B E1 28 F9 */ bl dComIfGs_setWarpMarkFlag__FUc -/* 8021CA1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8021CA20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8021CA24 38 00 FF FF */ li r0, -1 -/* 8021CA28 98 03 00 98 */ stb r0, 0x98(r3) -/* 8021CA2C 3B E3 00 9C */ addi r31, r3, 0x9c -/* 8021CA30 7F E3 FB 78 */ mr r3, r31 -/* 8021CA34 38 80 00 12 */ li r4, 0x12 -/* 8021CA38 38 A0 00 01 */ li r5, 1 -/* 8021CA3C 4B E1 65 F5 */ bl getItem__17dSv_player_item_cCFib -/* 8021CA40 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8021CA44 28 00 00 EC */ cmplwi r0, 0xec -/* 8021CA48 41 82 00 14 */ beq lbl_8021CA5C -/* 8021CA4C 7F E3 FB 78 */ mr r3, r31 -/* 8021CA50 38 80 00 12 */ li r4, 0x12 -/* 8021CA54 38 A0 00 25 */ li r5, 0x25 -/* 8021CA58 4B E1 65 61 */ bl setItem__17dSv_player_item_cFiUc -lbl_8021CA5C: -/* 8021CA5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8021CA60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8021CA64 7C 08 03 A6 */ mtlr r0 -/* 8021CA68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021CA6C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event000__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event000__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index a72d166dc3..0000000000 --- a/asm/d/msg/d_msg_flow/event000__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8024C3FC: -/* 8024C3FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C400 7C 08 02 A6 */ mflr r0 -/* 8024C404 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C408 7C 86 23 78 */ mr r6, r4 -/* 8024C40C 38 81 00 08 */ addi r4, r1, 8 -/* 8024C410 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024C414 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C418 4B FF EC D9 */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024C41C A0 01 00 08 */ lhz r0, 8(r1) -/* 8024C420 28 00 00 00 */ cmplwi r0, 0 -/* 8024C424 41 82 00 24 */ beq lbl_8024C448 -/* 8024C428 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C42C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C430 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8024C434 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024C438 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8024C43C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8024C440 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C444 4B DE 85 49 */ bl onEventBit__11dSv_event_cFUs -lbl_8024C448: -/* 8024C448 A0 01 00 0A */ lhz r0, 0xa(r1) -/* 8024C44C 28 00 00 00 */ cmplwi r0, 0 -/* 8024C450 41 82 00 24 */ beq lbl_8024C474 -/* 8024C454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C45C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8024C460 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024C464 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8024C468 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8024C46C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C470 4B DE 85 1D */ bl onEventBit__11dSv_event_cFUs -lbl_8024C474: -/* 8024C474 38 60 00 01 */ li r3, 1 -/* 8024C478 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C47C 7C 08 03 A6 */ mtlr r0 -/* 8024C480 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C484 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event001__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event001__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 76ed0a8f1b..0000000000 --- a/asm/d/msg/d_msg_flow/event001__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8024C488: -/* 8024C488 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C48C 7C 08 02 A6 */ mflr r0 -/* 8024C490 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C494 7C 86 23 78 */ mr r6, r4 -/* 8024C498 38 81 00 08 */ addi r4, r1, 8 -/* 8024C49C 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024C4A0 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C4A4 4B FF EC 4D */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024C4A8 A0 01 00 08 */ lhz r0, 8(r1) -/* 8024C4AC 28 00 00 00 */ cmplwi r0, 0 -/* 8024C4B0 41 82 00 24 */ beq lbl_8024C4D4 -/* 8024C4B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C4B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C4BC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8024C4C0 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024C4C4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8024C4C8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8024C4CC 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C4D0 4B DE 84 D5 */ bl offEventBit__11dSv_event_cFUs -lbl_8024C4D4: -/* 8024C4D4 A0 01 00 0A */ lhz r0, 0xa(r1) -/* 8024C4D8 28 00 00 00 */ cmplwi r0, 0 -/* 8024C4DC 41 82 00 24 */ beq lbl_8024C500 -/* 8024C4E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C4E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C4E8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8024C4EC 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024C4F0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8024C4F4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8024C4F8 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C4FC 4B DE 84 A9 */ bl offEventBit__11dSv_event_cFUs -lbl_8024C500: -/* 8024C500 38 60 00 01 */ li r3, 1 -/* 8024C504 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C508 7C 08 03 A6 */ mtlr r0 -/* 8024C50C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C510 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event002__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event002__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 2ec1b00b61..0000000000 --- a/asm/d/msg/d_msg_flow/event002__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8024C514: -/* 8024C514 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C518 7C 08 02 A6 */ mflr r0 -/* 8024C51C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C520 38 84 00 04 */ addi r4, r4, 4 -/* 8024C524 4B FF EC 0D */ bl getParam__10dMsgFlow_cFPUc -/* 8024C528 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C52C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C530 80 04 5D C4 */ lwz r0, 0x5dc4(r4) -/* 8024C534 7C 00 1A 14 */ add r0, r0, r3 -/* 8024C538 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 8024C53C 38 60 00 01 */ li r3, 1 -/* 8024C540 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C544 7C 08 03 A6 */ mtlr r0 -/* 8024C548 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C54C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUc.s b/asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUc.s deleted file mode 100644 index 5917aa58de..0000000000 --- a/asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8024B130: -/* 8024B130 80 64 00 00 */ lwz r3, 0(r4) -/* 8024B134 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUsPUsPUc.s b/asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUsPUsPUc.s deleted file mode 100644 index 1b837e2bb3..0000000000 --- a/asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUsPUsPUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8024B0F0: -/* 8024B0F0 A0 06 00 00 */ lhz r0, 0(r6) -/* 8024B0F4 B0 04 00 00 */ sth r0, 0(r4) -/* 8024B0F8 A0 06 00 02 */ lhz r0, 2(r6) -/* 8024B0FC B0 05 00 00 */ sth r0, 0(r5) -/* 8024B100 80 66 00 00 */ lwz r3, 0(r6) -/* 8024B104 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index 3c13cd5f26..8f79a04d04 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -1,6 +1,87 @@ #ifndef J2DANIMATION_H #define J2DANIMATION_H +#include "dolphin/gx/GXTexture.h" #include "dolphin/types.h" +struct J3DTransformInfo; +struct J3DTextureSRTInfo; +class J2DScreen; + +struct J2DAnmVtxColorKey { + /* 8030B704 */ void getColor(u8, u16, _GXColor*) const; + /* 8030CC20 */ ~J2DAnmVtxColorKey(); +}; + +struct J2DAnmVtxColorFull { + /* 8030B4C4 */ void getColor(u8, u16, _GXColor*) const; + /* 8030CC8C */ ~J2DAnmVtxColorFull(); +}; + +struct J2DAnmVisibilityFull { + /* 8030C048 */ void getVisibility(u16, u8*) const; +}; + +struct J2DAnmTransformKey { + /* 801959C0 */ ~J2DAnmTransformKey(); + /* 8030AAFC */ void calcTransform(f32, u16, J3DTransformInfo*) const; + /* 8030CD7C */ void getTransform(u16, J3DTransformInfo*) const; +}; + +struct J2DAnmTransformFull { + /* 8030A590 */ void getTransform(u16, J3DTransformInfo*) const; + /* 8030CDAC */ ~J2DAnmTransformFull(); +}; + +struct J2DAnmTextureSRTKey { + /* 80184274 */ ~J2DAnmTextureSRTKey(); + /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const; + /* 8030BC60 */ void searchUpdateMaterialID(J2DScreen*); +}; + +struct J2DAnmTexPattern { + struct J2DAnmTexPatternTIMGPointer { + /* 8030CB2C */ J2DAnmTexPatternTIMGPointer(); + /* 8030CB3C */ ~J2DAnmTexPatternTIMGPointer(); + }; + + /* 8030BD10 */ void searchUpdateMaterialID(J2DScreen*); + /* 8030BEE8 */ void getTexNo(u16, u16*) const; + /* 8030BF9C */ void getResTIMG(u16) const; + /* 8030BFF0 */ void getPalette(u16) const; + /* 8030CB90 */ ~J2DAnmTexPattern(); +}; + +struct J2DAnmTevRegKey { + /* 801841EC */ ~J2DAnmTevRegKey(); + /* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const; + /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const; + /* 8030C678 */ void searchUpdateMaterialID(J2DScreen*); +}; + +struct J2DAnmColorKey { + /* 80239BE0 */ ~J2DAnmColorKey(); + /* 8030B200 */ void getColor(u16, _GXColor*) const; +}; + +struct J2DAnmColorFull { + /* 8030AFC8 */ void getColor(u16, _GXColor*) const; + /* 8030CCF8 */ ~J2DAnmColorFull(); +}; + +struct J2DAnmColor { + /* 801842FC */ ~J2DAnmColor(); + /* 802EB390 */ void getColor(u16, _GXColor*) const; + /* 8030AF24 */ void searchUpdateMaterialID(J2DScreen*); +}; + +struct J2DAnmBase { + /* 80053C94 */ ~J2DAnmBase(); + /* 800569B0 */ void searchUpdateMaterialID(J2DScreen*); +}; + +struct J2DAnmVtxColor {}; + +struct J2DAnmTransform {}; + #endif /* J2DANIMATION_H */ diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/include/JSystem/J2DGraph/J2DGrafContext.h index de1fca9aaa..5a8d084bdc 100644 --- a/include/JSystem/J2DGraph/J2DGrafContext.h +++ b/include/JSystem/J2DGraph/J2DGrafContext.h @@ -1,6 +1,28 @@ #ifndef J2DGRAFCONTEXT_H #define J2DGRAFCONTEXT_H +#include "JSystem/JGeometry.h" +#include "JSystem/JUtility.h" #include "dolphin/types.h" +struct J2DGrafContext { + /* 802E8B08 */ J2DGrafContext(f32, f32, f32, f32); + /* 802E8BB4 */ void setPort(); + /* 802E8C44 */ void setup2D(); + /* 802E8E20 */ void setScissor(); + /* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&); + /* 802E90E4 */ void place(JGeometry::TBox2<f32> const&); + /* 802E961C */ void place(f32, f32, f32, f32); + /* 802E9118 */ void setColor(JUtility::TColor, JUtility::TColor, JUtility::TColor, + JUtility::TColor); + /* 802E9234 */ void setLineWidth(u8); + /* 802E9260 */ void fillBox(JGeometry::TBox2<f32> const&); + /* 802E9368 */ void drawFrame(JGeometry::TBox2<f32> const&); + /* 802E9488 */ void line(JGeometry::TVec2<f32>, JGeometry::TVec2<f32>); + /* 802E9564 */ void lineTo(JGeometry::TVec2<f32>); + /* 802E95D4 */ ~J2DGrafContext(); + /* 802E9664 */ bool getGrafType() const; + /* 802E966C */ void setLookat(); +}; + #endif /* J2DGRAFCONTEXT_H */ diff --git a/include/JSystem/J2DGraph/J2DManage.h b/include/JSystem/J2DGraph/J2DManage.h index b17c623296..6222e2139b 100644 --- a/include/JSystem/J2DGraph/J2DManage.h +++ b/include/JSystem/J2DGraph/J2DManage.h @@ -1,6 +1,18 @@ #ifndef J2DMANAGE_H #define J2DMANAGE_H +#include "JSystem/JSupport/JSUInputStream.h" #include "dolphin/types.h" +struct J2DResReference { + /* 8030CF10 */ void getResReference(u16) const; + /* 8030CF44 */ void getName(u16) const; +}; + +class J2DDataManage { +public: + /* 8030CE18 */ void get(char const*); + /* 8030CE7C */ void get(JSUInputStream*); +}; + #endif /* J2DMANAGE_H */ diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/include/JSystem/J2DGraph/J2DMaterial.h index 767753657c..065484c208 100644 --- a/include/JSystem/J2DGraph/J2DMaterial.h +++ b/include/JSystem/J2DGraph/J2DMaterial.h @@ -1,6 +1,25 @@ #ifndef J2DMATERIAL_H #define J2DMATERIAL_H +#include "JSystem/J2DGraph/J2DAnimation.h" #include "dolphin/types.h" +struct J2DMaterial { + struct J2DMaterialAnmPointer { + /* 802EA79C */ J2DMaterialAnmPointer(); + }; + + /* 802EA1AC */ J2DMaterial(); + /* 802EA2CC */ ~J2DMaterial(); + /* 802EA38C */ void setGX(); + /* 802EA410 */ void createTevBlock(int, bool); + /* 802EA5C4 */ void createIndBlock(int, bool); + /* 802EA84C */ void makeAnmPointer(); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); + /* 802EAC78 */ void animation(); +}; + #endif /* J2DMATERIAL_H */ diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index aa1cd96a7e..093b44ff94 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -1,6 +1,135 @@ #ifndef J2DPANE_H #define J2DPANE_H +#include "JSystem/J2DGraph/J2DAnimation.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/JGeometry.h" +#include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/JSupport/JSUList.h" +#include "JSystem/JSupport/JSURandomInputStream.h" +#include "JSystem/JUtility/JUTFont.h" +#include "JSystem/JUtility/JUTResFont.h" +#include "JSystem/JUtility/JUTTexture.h" +#include "dolphin/mtx/mtx.h" #include "dolphin/types.h" +class J2DScreen; + +enum J2DRotateAxis { + /* 0x78 */ ROTATE_X = 'x', + /* 0x79 */ ROTATE_Y = 'y', + /* 0x7A */ ROTATE_Z = 'z' +}; + +enum J2DBasePosition {}; + +class J2DPane { +public: + J2DPane(); + J2DPane(J2DPane*, bool, u64, const JGeometry::TBox2<f32>&); + J2DPane(u64, const JGeometry::TBox2<f32>&); + J2DPane(J2DPane* other, JSURandomInputStream* stream, u8 arg3); + virtual ~J2DPane(); + + /* 0x0c */ virtual s32 getTypeID() const; + /* 0x10 */ virtual void move(f32 x, f32 y); + /* 0x14 */ virtual void add(f32 x, f32 y); + /* 0x18 */ virtual void resize(f32 x, f32 y); + /* 0x1c */ virtual void setCullBack(bool cull); + /* 0x20 */ virtual void setCullBack(_GXCullMode cmode); + /* 0x24 */ virtual void setAlpha(u8); + /* 0x28 */ virtual bool setConnectParent(bool connected); + /* 0x2c */ virtual void calcMtx(); + /* 0x30 */ virtual void update(); + /* 0x34 */ virtual void drawSelf(f32 arg1, f32 arg2); + /* 0x38 */ virtual void drawSelf(f32 arg1, f32 arg2, Mtx* mtx); + /* 0x3c */ virtual const J2DPane* search(u64 tag); + /* 0x40 */ virtual const J2DPane* searchUserInfo(u64 tag); + /* 0x44 */ virtual void makeMatrix(f32, f32); + /* 0x48 */ virtual void makeMatrix(f32 a, f32 b, f32 c, f32 d); + /* 0x4c */ virtual bool isUsed(const ResTIMG* timg); + /* 0x50 */ virtual bool isUsed(const ResFONT* font); + /* 0x54 */ virtual void clearAnmTransform(); + /* 0x58 */ virtual void rewriteAlpha(); + /* 0x5c */ virtual void setAnimation(J2DAnmBase* anm); + /* 0x60 */ virtual void setAnimation(J2DAnmTransform* anm); + /* 0x64 */ virtual void setAnimation(J2DAnmColor* anm); + /* 0x68 */ virtual void setAnimation(J2DAnmTexPattern* anm); + /* 0x6c */ virtual void setAnimation(J2DAnmTextureSRTKey* anm); + /* 0x70 */ virtual void setAnimation(J2DAnmTevRegKey* anm); + /* 0x74 */ virtual void setAnimation(J2DAnmVisibilityFull* anm); + /* 0x78 */ virtual void setAnimation(J2DAnmVtxColor* anm); + /* 0x7c */ virtual const J2DAnmTransform* animationTransform(const J2DAnmTransform* transform); + /* 0x80 */ virtual void setVisibileAnimation(J2DAnmVisibilityFull* visibility); + /* 0x84 */ virtual void setAnimationVF(J2DAnmVisibilityFull* visibility); + /* 0x88 */ virtual void setVtxColorAnimation(J2DAnmVtxColor* vtx_color); + /* 0x8c */ virtual void setAnimationVC(J2DAnmVtxColor* vtx_color); + /* 0x90 */ virtual const J2DAnmTransform* animationPane(const J2DAnmTransform* transform); + + f32 getHeight() const { return mBounds.getHeight(); } + f32 getWidth() const { return mBounds.getWidth(); } + JSUTree<J2DPane>* getFirstChild() { return mPaneTree.getFirstChild(); } + const JSUTree<J2DPane>* getPaneTree() { return &mPaneTree; } + + void initiate(); + void initialize(J2DPane*, bool, u64, const JGeometry::TBox2<f32>&); + void initialize(u64 tag, const JGeometry::TBox2<f32>& dim); + void makePaneStream(J2DPane* other, JSURandomInputStream* stream); + void changeUseTrans(J2DPane* other); + bool appendChild(J2DPane* child); + bool insertChild(J2DPane* before, J2DPane* child); + void draw(f32 a1, f32 a2, const J2DGrafContext* ctx, bool a4, bool a5); + void place(const JGeometry::TBox2<f32>& dim); + JGeometry::TBox2<f32>& getBounds(); + void rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle); + void rotate(f32 angle); + void clip(const JGeometry::TBox2<f32>& bounds); + void setBasePosition(J2DBasePosition position); + void setInfluencedAlpha(bool arg1, bool arg2); + void getGlbVtx(u8 arg1) const; + const J2DPane* getFirstChildPane(); + const J2DPane* getNextChildPane(); + const J2DPane* getParentPane(); + void makePaneExStream(J2DPane* other, JSURandomInputStream* stream); + static s16 J2DCast_F32_to_S16(f32 value, u8 arg2); + void* getPointer(JSURandomInputStream* stream, u32 size, JKRArchive* archive); + void animationTransform(); + void updateTransform(const J2DAnmTransform* transform); + + static f32 static_mBounds[4]; + +public: + /* 0x04 */ u16 _4; + /* 0x06 */ u8 _6[2]; + /* 0x08 */ int id; + /* 0x0C */ u8 _c[4]; + /* 0x10 */ u64 mInfoTag; + /* 0x18 */ u64 mUserInfoTag; + /* 0x20 */ JGeometry::TBox2<f32> mBounds; + /* 0x30 */ JGeometry::TBox2<f32> mGlobalBounds; + /* 0x40 */ JGeometry::TBox2<f32> mClipRect; + /* 0x50 */ Mtx mPositionMtx; + /* 0x80 */ Mtx mGlobalMtx; + /* 0xB0 */ bool mVisible; + /* 0xB1 */ u8 mCullMode; + /* 0xB2 */ u8 mAlpha; + /* 0xB3 */ u8 mColorAlpha; + /* 0xB4 */ bool mIsInfluencedAlpha; + /* 0xB5 */ bool mConnected; + /* 0xB6 */ char mRotAxis; + /* 0xB7 */ u8 mBasePosition; + /* 0xB8 */ f32 mRotateX; + /* 0xBC */ f32 mRotateY; + /* 0xC0 */ f32 mRotateZ; + /* 0xC4 */ f32 mRotateOffsetX; + /* 0xC8 */ f32 mRotateOffsetY; + /* 0xCC */ f32 mScaleX; + /* 0xD0 */ f32 mScaleY; + /* 0xD4 */ f32 mTranslateX; + /* 0xD8 */ f32 mTranslateY; + /* 0xDC */ JSUTree<J2DPane> mPaneTree; + /* 0xF8 */ const J2DAnmTransform* mTransform; + /* 0xFC */ u32 _fc; +}; + #endif /* J2DPANE_H */ diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h index 8eed8588ed..2dca4ac374 100644 --- a/include/JSystem/J2DGraph/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture.h @@ -1,6 +1,114 @@ #ifndef J2DPICTURE_H #define J2DPICTURE_H +#include "JSystem/J2DGraph/J2DPane.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/JUtility/JUTTexture.h" #include "dolphin/types.h" +enum J2DMirror { + /* 0x0 */ MIRROR0, // temp, figure out later +}; + +enum J2DBinding { + /* 0xF */ BIND15 = 15, // temp, figure out later +}; + +class J2DPicture : public J2DPane { +public: + /* 802FCFF0 */ virtual ~J2DPicture(); + /* 802FF2E8 */ virtual s32 getTypeID() const; + /* 802FDB28 */ virtual void drawSelf(f32, f32); + /* 802FDB90 */ virtual void drawSelf(f32, f32, Mtx*); + /* 802FF09C */ virtual bool isUsed(ResTIMG const*); + /* 802FF63C */ virtual bool isUsed(ResFONT const*); + /* 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); + /* 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); + /* 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*); + /* 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); + /* 802FF588 */ virtual void drawOut(f32, f32, f32, f32, f32, f32); + /* 802FF524 */ virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32); + /* 802FDF88 */ virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&); + /* 802FF29C */ virtual void load(_GXTexMapID, u8); + /* 802FF268 */ virtual void load(u8); + /* 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; + /* 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); + /* 801DFA4C */ virtual void getBlack() const; + /* 801DFA40 */ virtual void 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); + + /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*); + /* 802FC708 */ J2DPicture(ResTIMG const*); + /* 802FC118 */ J2DPicture(J2DPane*, JSURandomInputStream*, JKRArchive*); + /* 802FC050 */ J2DPicture(); + /* 802FC1D4 */ J2DPicture(J2DPane*, JSURandomInputStream*, J2DMaterial*); + /* 802FC8E8 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*); + /* 802FCD70 */ void private_initiate(ResTIMG const*, ResTLUT const*); + /* 802FCE9C */ void initinfo(); + /* 802FE5D0 */ void setTevMode(); + /* 802FEA60 */ static void swap(f32&, f32&); + /* 802FEAC4 */ void setBlendKonstColor(); + /* 802FEB94 */ void setBlendKonstAlpha(); + /* 802FEC64 */ void getNewColor(JUtility::TColor*); + /* 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); + + void setCornerColor(JUtility::TColor c0, JUtility::TColor c1, JUtility::TColor c2, + JUtility::TColor c3) { + mCornerColor[0] = c0; + mCornerColor[1] = c1; + mCornerColor[2] = c2; + mCornerColor[3] = c3; + } + +private: + /* 0x100 */ JUTTexture* mTexture[2]; + /* 0x108 */ u8 mTextureCount; + /* 0x109 */ u8 field_0x109; + /* 0x10A */ JGeometry::TVec2<s16> field_0x10a[4]; + /* 0x11C */ f32 field_0x11c[4]; + /* 0x12C */ JUTPalette* field_0x12c; + /* 0x130 */ JUtility::TColor mWhite; + /* 0x134 */ JUtility::TColor mBlack; + /* 0x138 */ JUtility::TColor mCornerColor[4]; + /* 0x148 */ JUtility::TColor field_0x148; + /* 0x14C */ JUtility::TColor field_0x14c; +}; + #endif /* J2DPICTURE_H */ diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h index ef3e43079d..27f5c55161 100644 --- a/include/JSystem/J2DGraph/J2DScreen.h +++ b/include/JSystem/J2DGraph/J2DScreen.h @@ -1,6 +1,64 @@ #ifndef J2DSCREEN_H #define J2DSCREEN_H +#include "JSystem/J2DGraph/J2DManage.h" +#include "JSystem/J2DGraph/J2DMaterial.h" +#include "JSystem/J2DGraph/J2DPane.h" +#include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/types.h" +struct J2DScrnBlockHeader {}; + +class J2DScreen : public J2DPane { +public: + /* 802F8540 */ virtual ~J2DScreen(); + /* 802F9A18 */ virtual s32 getTypeID() const; + /* 802F9A20 */ virtual void calcMtx(); + /* 802F9120 */ virtual void drawSelf(f32, f32, Mtx*); + /* 802F90A0 */ virtual const J2DPane* search(u64); + /* 802F90E0 */ virtual const J2DPane* searchUserInfo(u64); + /* 802F9600 */ virtual bool isUsed(ResTIMG const*); + /* 802F9620 */ virtual bool isUsed(ResFONT const*); + /* 80053BA0 */ virtual void clearAnmTransform(); + /* 802F9704 */ virtual void setAnimation(J2DAnmColor*); + /* 80192414 */ virtual void setAnimation(J2DAnmTransform*); + /* 802F9798 */ virtual void setAnimation(J2DAnmTextureSRTKey*); + /* 802F99A8 */ virtual void setAnimation(J2DAnmVtxColor*); + /* 802F9838 */ virtual void setAnimation(J2DAnmTexPattern*); + /* 802F99C8 */ virtual void setAnimation(J2DAnmVisibilityFull*); + /* 802F98CC */ virtual void setAnimation(J2DAnmTevRegKey*); + /* 802F9A54 */ virtual void setAnimation(J2DAnmBase*); + /* 802F9A74 */ virtual void setAnimationVF(J2DAnmVisibilityFull*); + /* 802F9A78 */ virtual void setAnimationVC(J2DAnmVtxColor*); + /* 802F99E8 */ virtual void createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, + J2DPane*, u32); + /* 802F8B98 */ virtual void createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, + J2DPane*, u32, JKRArchive*); + + /* 802F8498 */ J2DScreen(); + /* 802F85A8 */ void clean(); + /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); + /* 802F8748 */ bool setPriority(JSURandomInputStream*, u32, JKRArchive*); + /* 802F8778 */ bool private_set(JSURandomInputStream*, u32, JKRArchive*); + /* 802F8834 */ bool checkSignature(JSURandomInputStream*); + /* 802F8894 */ void getScreenInformation(JSURandomInputStream*); + /* 802F8990 */ void makeHierarchyPanes(J2DPane*, JSURandomInputStream*, u32, JKRArchive*); + /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); + /* 802F9280 */ void getResReference(JSURandomInputStream*, u32); + /* 802F937C */ void createMaterial(JSURandomInputStream*, u32, JKRArchive*); + /* 802F9640 */ static void* getNameResource(char const*); + /* 802F9690 */ void animation(); + + static J2DDataManage* mDataManage; + +private: + /* 0x100 */ bool mScissor; + /* 0x102 */ u16 mMaterialNum; + /* 0x104 */ J2DMaterial* mMaterials; + /* 0x108 */ J2DResReference* field_0x108; + /* 0x10C */ J2DResReference* field_0x10c; + /* 0x110 */ JUTNameTab* mNameTable; + /* 0x114 */ u32 field_0x114; +}; + #endif /* J2DSCREEN_H */ diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index 90e31c1877..d58cfe1669 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -1,6 +1,72 @@ #ifndef J2DTEXTBOX_H #define J2DTEXTBOX_H +#include "JSystem/J2DGraph/J2DMaterial.h" +#include "JSystem/J2DGraph/J2DPane.h" #include "dolphin/types.h" +enum J2DTextBoxVBinding { + /* 0x0 */ VBIND_CENTER, + /* 0x1 */ VBIND_BOTTOM, + /* 0x2 */ VBIND_TOP +}; + +enum J2DTextBoxHBinding { + /* 0x0 */ HBIND_CENTER, + /* 0x1 */ HBIND_RIGHT, + /* 0x2 */ HBIND_LEFT +}; + +class J2DTextBox : public J2DPane { +public: + /* 803001E0 */ virtual ~J2DTextBox(); + /* 80300C68 */ virtual s32 getTypeID() const; + /* 80300AF8 */ virtual void resize(f32, f32); + /* 80300870 */ virtual bool setConnectParent(bool); + /* 80300950 */ virtual void drawSelf(f32, f32, Mtx*); + /* 803008E8 */ virtual void drawSelf(f32, f32); + /* 80300C70 */ virtual bool isUsed(ResTIMG const*); + /* 80300BFC */ virtual bool isUsed(ResFONT const*); + /* 80300C90 */ virtual void rewriteAlpha(); + /* 80300490 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding); + /* 803002E8 */ virtual void draw(f32, f32); + /* 80300278 */ virtual void setFont(JUTFont*); + /* 8021C7F4 */ virtual void getFont() const; + /* 80254408 */ virtual void setBlack(JUtility::TColor); + /* 80186C84 */ virtual void setWhite(JUtility::TColor); + /* 8019230C */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor); + /* 801DFA34 */ virtual void getBlack() const; + /* 801DFA28 */ virtual void getWhite() const; + /* 8025602C */ virtual bool getMaterial() const; + + /* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16, + J2DTextBoxHBinding, J2DTextBoxVBinding); + /* 802FF6D8 */ J2DTextBox(J2DPane*, JSURandomInputStream*, JKRArchive*); + /* 802FF75C */ J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); + /* 802FF660 */ J2DTextBox(); + /* 802FFC58 */ void initiate(ResFONT const*, char const*, s16, J2DTextBoxHBinding, + J2DTextBoxVBinding); + /* 802FFE88 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*); + /* 80300658 */ char* getStringPtr() const; + /* 8030074C */ s32 setString(s16, char const*, ...); + /* 80300660 */ s32 setString(char const*, ...); + +private: + /* 0x0100 */ JUTFont* mFont; + /* 0x0104 */ JUtility::TColor mCharColor; + /* 0x0108 */ JUtility::TColor mGradientColor; + /* 0x010C */ f32 field_0x10c; + /* 0x0110 */ f32 field_0x110; + /* 0x0114 */ f32 mCharSpacing; + /* 0x0118 */ f32 mLineSpacing; + /* 0x011C */ f32 field_0x11c; + /* 0x0120 */ f32 field_0x120; + /* 0x0124 */ char* mStringPtr; + /* 0x0128 */ JUtility::TColor mWhiteColor; + /* 0x012C */ JUtility::TColor mBlackColor; + /* 0x0130 */ u8 mFlags; + /* 0x0131 */ bool mTextFontOwned; + /* 0x0132 */ s16 mStringLength; +}; + #endif /* J2DTEXTBOX_H */ diff --git a/include/JSystem/JAudio2/JAISoundInfo.h b/include/JSystem/JAudio2/JAISoundInfo.h index f6938f3e8a..795d674969 100644 --- a/include/JSystem/JAudio2/JAISoundInfo.h +++ b/include/JSystem/JAudio2/JAISoundInfo.h @@ -3,4 +3,9 @@ #include "dolphin/types.h" +struct JAISoundInfo { + /* 802A2D34 */ JAISoundInfo(bool); + /* 802A2D50 */ ~JAISoundInfo(); +}; + #endif /* JAISOUNDINFO_H */ diff --git a/include/JSystem/JAudio2/JASAudioReseter.h b/include/JSystem/JAudio2/JASAudioReseter.h index b9bf1b0921..c842115b09 100644 --- a/include/JSystem/JAudio2/JASAudioReseter.h +++ b/include/JSystem/JAudio2/JASAudioReseter.h @@ -3,4 +3,19 @@ #include "dolphin/types.h" +struct JASAudioReseter { + /* 8029D0B4 */ JASAudioReseter(); + /* 8029D0FC */ ~JASAudioReseter(); + /* 8029D138 */ void start(u32, bool); + /* 8029D1D4 */ void resume(); + /* 8029D1F8 */ void checkDone() const; + /* 8029D200 */ void calc(); + /* 8029D2D4 */ void callback(void*); + + /* 0x0 */ u32 field_0x0; + /* 0x4 */ f32 mDSPLevel; + /* 0x8 */ s32 mIsDone; + /* 0xC */ bool field_0xc; +}; // Size: 0x10 + #endif /* JASAUDIORESETER_H */ diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h new file mode 100644 index 0000000000..6edcf6961a --- /dev/null +++ b/include/JSystem/JAudio2/JASGadget.h @@ -0,0 +1,14 @@ +#ifndef JASGADGET_H +#define JASGADGET_H + +#include "dolphin/types.h" + +template <class T> +class JASGlobalInstance { +public: + // T* getInstance() { return sInstance; } + + // static T* sInstance; +}; + +#endif /* JASGADGET_H */ diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h index 01887531c1..23821622c7 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/include/JSystem/JParticle/JPAParticle.h @@ -1,12 +1,13 @@ #ifndef JPAPARTICLE_H #define JPAPARTICLE_H +#include "dolphin/gx/GX.h" #include "dolphin/types.h" class JPABaseParticle; -struct _GXTexMapID {}; struct JPABaseEmitter { + /* 8027EC60 */ void deleteAllParticle(); /* 8027EB60 */ void createChild(JPABaseParticle*); /* 8027EA40 */ void createParticle(); /* 8027EF30 */ void getCurrentCreateNumber() const; diff --git a/include/JSystem/JUtility.h b/include/JSystem/JUtility.h new file mode 100644 index 0000000000..c72bceccca --- /dev/null +++ b/include/JSystem/JUtility.h @@ -0,0 +1,30 @@ +#ifndef JUTILITY_H +#define JUTILITY_H + +#include "dolphin/gx/GXTexture.h" +#include "dolphin/types.h" + +namespace JUtility { + +struct TColor : _GXColor { + TColor() { set(-1); } + + TColor(u32 raw) { *(u32*)&r = raw; } + + void set(u32 col) { *(u32*)&r = col; } + void set(u8 oR, u8 oG, u8 oB, u8 oA) { + r = oR; + g = oG; + b = oB; + a = oA; + } + + u32 toUInt32() const { return *(u32*)&r; } + + operator u32() const { return toUInt32(); } + void operator=(const TColor& rhs) { ((_GXColor*)this)->operator=(rhs); } +}; + +} // namespace JUtility + +#endif /* JUTILITY_H */
\ No newline at end of file diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index 640143a768..b000764382 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -1,46 +1,82 @@ #ifndef JUTFONT_H #define JUTFONT_H +#include "JSystem/JUtility.h" #include "dolphin/gx/GX.h" #include "dolphin/types.h" -namespace JUtility { +struct ResFONT { + struct INF1 { + /* 0x00 */ u32 magic; + /* 0x04 */ u32 size; + /* 0x08 */ u16 fontType; + /* 0x0A */ u16 ascent; + /* 0x0C */ u16 descent; + /* 0x0E */ u16 width; + /* 0x10 */ u16 leading; + /* 0x12 */ u16 defaultCode; + }; -struct TColor : _GXColor { - TColor() { set(-1); } + struct WID1 { + /* 0x00 */ u32 magic; + /* 0x04 */ u32 size; + /* 0x08 */ u16 startCode; + /* 0x0A */ u16 endCode; + }; - TColor(u32 raw) { *(u32*)&r = raw; } + struct MAP1 { + /* 0x00 */ u32 magic; + /* 0x04 */ u32 size; + /* 0x08 */ u16 mappingMethod; + /* 0x0A */ u16 startCode; + /* 0x0C */ u16 endCode; + /* 0x0E */ u16 numEntries; + }; - void set(u32 col) { *(u32*)&r = col; } + struct GLY1 { + /* 0x00 */ u32 magic; + /* 0x04 */ u32 size; + /* 0x08 */ u16 startCode; + /* 0x0A */ u16 endCode; + /* 0x0C */ u16 cellWidth; + /* 0x0E */ u16 cellHeight; + /* 0x10 */ u32 textureSize; + /* 0x14 */ u16 textureFormat; + /* 0x16 */ u16 numRows; + /* 0x18 */ u16 numColumns; + /* 0x1A */ u16 textureWidth; + /* 0x1C */ u16 textureHeight; + }; - u32 toUInt32() const { return *(u32*)&r; } - - operator u32() const { return toUInt32(); } - void operator=(const TColor& rhs) { ((_GXColor*)this)->operator=(rhs); } + /* 0x00 */ u64 magic; + /* 0x08 */ u32 filesize; + /* 0x0C */ u32 numBlocks; + /* 0x10 */ u8 padding[0x10]; }; -} // namespace JUtility - class JUTFont { public: JUTFont(); virtual ~JUTFont() {} - struct TWidth {}; + struct TWidth { + u8 field_0x0; + u8 field_0x1; + }; - /* 0x0c */ virtual void setGX() = 0; + /* 0x0C */ virtual void setGX() = 0; /* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2); /* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) = 0; /* 0x18 */ virtual u16 getLeading() const = 0; - /* 0x1c */ virtual u16 getAscent() const = 0; + /* 0x1C */ virtual u16 getAscent() const = 0; /* 0x20 */ virtual u16 getDescent() const = 0; - /* 0x24 */ virtual u32 getHeight() const = 0; - /* 0x28 */ virtual u32 getWidth() const = 0; - /* 0x2c */ virtual void getWidthEntry(int i_no, TWidth* width) const; - /* 0x30 */ virtual u32 getCellWidth() const; - /* 0x34 */ virtual u32 getCellHeight() const; - /* 0x38 */ virtual u32 getFontType() const = 0; - /* 0x3c */ virtual void getResFont() const = 0; + /* 0x24 */ virtual u16 getHeight() const = 0; + /* 0x28 */ virtual u16 getWidth() const = 0; + /* 0x2C */ virtual void getWidthEntry(int i_no, TWidth* width) const; + /* 0x30 */ virtual u16 getCellWidth() const; + /* 0x34 */ virtual u16 getCellHeight() const; + /* 0x38 */ virtual u16 getFontType() const = 0; + /* 0x3C */ virtual ResFONT* getResFont() const = 0; /* 0x40 */ virtual bool isLeadByte(int a1) const = 0; static bool isLeadByte_1Byte(int b); @@ -52,14 +88,13 @@ public: void setGradColor(JUtility::TColor col1, JUtility::TColor col2); f32 drawString_size_scale(f32 a1, f32 a2, f32 a3, f32 a4, const char* a5, u32 usz, bool a7); - u8 unk4; - bool unk5; - int unk8; - JUtility::TColor mColor1; - JUtility::TColor mColor2; - JUtility::TColor mColor3; - JUtility::TColor mColor4; - int unk1C; + /* 0x04 */ bool mValid; + /* 0x05 */ bool mFixed; + /* 0x08 */ int mFixedWidth; + /* 0x0C */ JUtility::TColor mColor1; + /* 0x10 */ JUtility::TColor mColor2; + /* 0x14 */ JUtility::TColor mColor3; + /* 0x18 */ JUtility::TColor mColor4; }; #endif /* JUTFONT_H */ diff --git a/include/JSystem/JUtility/JUTNameTab.h b/include/JSystem/JUtility/JUTNameTab.h index ff0e7860e8..7f9d62dfde 100644 --- a/include/JSystem/JUtility/JUTNameTab.h +++ b/include/JSystem/JUtility/JUTNameTab.h @@ -26,6 +26,7 @@ public: s32 getIndex(char const*) const; const char* getName(u16 index) const; u16 calcKeyCode(char const* pName) const; + const ResNTAB* getResNameTable() const { return mpNameTable; } private: const ResNTAB* mpNameTable; diff --git a/include/JSystem/JUtility/JUTPalette.h b/include/JSystem/JUtility/JUTPalette.h index 64ef0ce53c..5de6c98ae6 100644 --- a/include/JSystem/JUtility/JUTPalette.h +++ b/include/JSystem/JUtility/JUTPalette.h @@ -1,6 +1,59 @@ #ifndef JUTPALETTE_H #define JUTPALETTE_H +#include "dolphin/gx/GX.h" #include "dolphin/types.h" +enum JUTTransparency { UNK0, UNK1 }; + +enum _GXTlut { + /* 0x00 */ GX_TLUT0, + /* 0x01 */ GX_TLUT1, + /* 0x02 */ GX_TLUT2, + /* 0x03 */ GX_TLUT3, + /* 0x04 */ GX_TLUT4, + /* 0x05 */ GX_TLUT5, + /* 0x06 */ GX_TLUT6, + /* 0x07 */ GX_TLUT7, + /* 0x08 */ GX_TLUT8, + /* 0x09 */ GX_TLUT9, + /* 0x0A */ GX_TLUT10, + /* 0x0B */ GX_TLUT11, + /* 0x0C */ GX_TLUT12, + /* 0x0D */ GX_TLUT13, + /* 0x0E */ GX_TLUT14, + /* 0x0F */ GX_TLUT15, + /* 0x10 */ GX_BIGTLUT0, + /* 0x11 */ GX_BIGTLUT1, + /* 0x12 */ GX_BIGTLUT2, + /* 0x13 */ GX_BIGTLUT3, +}; + +enum _GXTlutFmt { + /* 0x00 */ UNK, +}; + +struct ResTLUT { + u8 format; + u8 transparency; + u16 numColors; +}; + +class JUTPalette { +public: + /* 802DE890 */ void storeTLUT(_GXTlut, ResTLUT*); + /* 802DE91C */ void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*); + /* 802DE95C */ bool load(); + + u8 getTlutName() const { return mTlutName; } + +private: + /* 0x00 */ _GXTlutObj mTlutObj; + /* 0x0C */ u8 mTlutName; + /* 0x0D */ u8 mFormat; + /* 0x10 */ ResTLUT* mColorTable; + /* 0x14 */ u16 mNumColors; + /* 0x16 */ u8 mTransparency; +}; + #endif /* JUTPALETTE_H */ diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 848933805a..cf0398abd3 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -1,6 +1,65 @@ #ifndef JUTRESFONT_H #define JUTRESFONT_H +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JUtility/JUTFont.h" #include "dolphin/types.h" +class JUTResFont : public JUTFont { +public: + /* 802DF000 */ virtual ~JUTResFont(); + /* 802DF48C */ virtual void setGX(); + /* 802DF584 */ virtual void setGX(JUtility::TColor, JUtility::TColor); + /* 802DF7C4 */ virtual f32 drawChar_scale(f32, f32, f32, f32, int, bool); + /* 802DDFEC */ virtual u16 getLeading() const; + /* 802DE004 */ virtual u16 getAscent() const; + /* 802DE010 */ virtual u16 getDescent() const; + /* 802DE01C */ virtual u16 getHeight() const; + /* 802DDFF8 */ virtual u16 getWidth() const; + /* 802DFC64 */ virtual void getWidthEntry(int, JUTFont::TWidth*) const; + /* 802DFD0C */ virtual u16 getCellWidth() const; + /* 802DFD58 */ virtual u16 getCellHeight() const; + /* 802DDFE0 */ virtual u16 getFontType() const; + /* 802DDFD8 */ virtual ResFONT* getResFont() const; + /* 802DFDA4 */ virtual bool isLeadByte(int) const; + /* 802DFF60 */ virtual void loadImage(int, _GXTexMapID); + /* 802DF344 */ virtual void setBlock(); + + /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*); + /* 802DEF48 */ JUTResFont(); + /* 802DF08C */ void deleteMemBlocks_ResFont(); + /* 802DF0B0 */ void initialize_state(); + /* 802DF0DC */ bool initiate(ResFONT const*, JKRHeap*); + /* 802DF13C */ bool protected_initiate(ResFONT const*, JKRHeap*); + /* 802DF248 */ void countBlock(); + /* 802DFBE8 */ void loadFont(int, _GXTexMapID, JUTFont::TWidth*); + /* 802DFDD8 */ int getFontCode(int) const; + /* 802E00C4 */ void convertSjis(int, u16*) const; + + inline void delete_and_initialize() { + deleteMemBlocks_ResFont(); + initialize_state(); + } + + static void* const saoAboutEncoding_[3]; + + // some types uncertain, may need to be fixed + /* 0x1C */ void* field_0x1c; + /* 0x20 */ void* field_0x20; + /* 0x24 */ _GXTexObj field_0x24; + /* 0x44 */ int field_0x44; + /* 0x48 */ const ResFONT* mResFont; + /* 0x4C */ ResFONT::INF1* mInf1Ptr; + /* 0x50 */ void* field_0x50; + /* 0x54 */ ResFONT::WID1* mWid1Ptr; + /* 0x58 */ ResFONT::GLY1* mGly1Ptr; + /* 0x5C */ ResFONT::MAP1* mMap1Ptr; + /* 0x60 */ u16 mWid1BlockNum; + /* 0x62 */ u16 mGly1BlockNum; + /* 0x64 */ u16 mMap1BlockNum; + /* 0x66 */ u16 field_0x66; + /* 0x68 */ u16 field_0x68; + /* 0x6C */ void* field_0x6c; +}; + #endif /* JUTRESFONT_H */ diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index ad657caffb..113cdf923c 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -1,33 +1,74 @@ #ifndef JUTTEXTURE_H #define JUTTEXTURE_H +#include "JSystem/JUtility/JUTPalette.h" #include "dolphin/types.h" struct ResTIMG { /* Acts as the header to image data. Usually texture data immediately follows it, so any pointer arithmetic to go past the end of this structure is so that a variable sized allocated buffer can be accessed. */ - u8 texture_format; - bool is_alpha_enabled; - u16 texture_width; - u16 texture_height; - u8 wrap_s; - u8 wrap_t; - bool is_palettes_enabled; - u8 palette_format; - u16 palette_count; - u32 palette_offset; - bool is_mip_map_enabled; - bool do_edge_lod; - bool bias_clamp; - u8 max_anisotropy; - u8 min_filter; - u8 mag_filter; - u8 min_lod; - u8 max_lod; - u8 num_mipmaps; + u8 format; + bool alphaEnabled; + u16 width; + u16 height; + u8 wrapS; + u8 wrapT; + bool palettesEnabled; + u8 paletteFormat; + u16 paletteCount; + u32 paletteOffset; + bool mipmapEnabled; + bool doEdgeLOD; + bool biasClamp; + u8 maxAnisotropy; + u8 minFilter; + u8 magFilter; + u8 minLOD; + u8 maxLOD; + u8 mipmapCount; u8 unknown; - u16 lod_bias; - u32 texture_data_offset; + s16 LODBias; + u32 texDataOffset; +}; + +class JUTTexture { +public: + JUTTexture() { + setCaptureFlag(false); + mEmbPalette = NULL; + mTexInfo = NULL; + } + ~JUTTexture(); + void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut); + void storeTIMG(ResTIMG const*, u8); + void storeTIMG(ResTIMG const*, JUTPalette*); + void attachPalette(JUTPalette*); + void init(); + void initTexObj(_GXTlut); + void initTexObj(); + void load(_GXTexMapID); + + const ResTIMG* getTexInfo() const { return mTexInfo; } + void setCaptureFlag(bool flag) { mFlags &= 2 | flag; } + u8 getCaptureFlag() const { return mFlags & 1; } + u8 getEmbPaletteDelFlag() const { return mFlags & 2; } + +private: + /* 0x00 */ _GXTexObj mTexObj; + /* 0x20 */ const ResTIMG* mTexInfo; + /* 0x24 */ void* mTexData; + /* 0x28 */ JUTPalette* mEmbPalette; + /* 0x2C */ JUTPalette* field_0x2c; + /* 0x30 */ u8 mWrapS; + /* 0x31 */ u8 mWrapT; + /* 0x32 */ u8 mMinFilter; + /* 0x33 */ u8 mMagFilter; + /* 0x34 */ s16 mMinLOD; + /* 0x36 */ s16 mMaxLOD; + /* 0x38 */ s16 mLODBias; + /* 0x3A */ u8 mTlutName; + /* 0x3B */ u8 mFlags; + /* 0x3C */ void* field_0x3c; }; #endif /* JUTTEXTURE_H */ diff --git a/include/SSystem/SComponent/c_sxyz.h b/include/SSystem/SComponent/c_sxyz.h index 61843437ef..ad1bf45b45 100644 --- a/include/SSystem/SComponent/c_sxyz.h +++ b/include/SSystem/SComponent/c_sxyz.h @@ -5,6 +5,12 @@ struct SVec { s16 x, y, z; + + void set(s16 oX, s16 oY, s16 oZ) { + x = oX; + y = oY; + z = oZ; + } }; class csXyz : public SVec { public: diff --git a/include/Z2AudioLib/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr.h index 212d5f94c4..f804cd58d1 100644 --- a/include/Z2AudioLib/Z2AudioMgr.h +++ b/include/Z2AudioLib/Z2AudioMgr.h @@ -2,11 +2,13 @@ #define Z2AUDIOMGR_H #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JASAudioReseter.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "Z2AudioLib/Z2SceneMgr.h" #include "Z2AudioLib/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr.h" +#include "Z2AudioLib/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2SoundStarter.h" #include "Z2AudioLib/Z2StatusMgr.h" #include "dolphin/types.h" @@ -30,8 +32,8 @@ private: /* 0x03D0 */ Z2SeqMgr mSeqMgr; /* 0x04A4 */ Z2SceneMgr mSceneMgr; /* 0x04C4 */ Z2StatusMgr mStatusMgr; - /* 0x04F4 */ // Z2SoundObjMgr mSoundObjMgr; - /* 0x051C */ // JASAudioReseter mAudioReseter; + /* 0x04F4 */ Z2SoundObjMgr mSoundObjMgr; + /* 0x051C */ JASAudioReseter mAudioReseter; /* 0x052C */ Z2SoundStarter mSoundStarter; /* 0x0530 */ // Z2SoundMgr mSoundMgr; /* 0x0D40 */ // JAISoundInfo mSoundInfo; diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 8bd14a7d87..3cea0e6b23 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -96,6 +96,10 @@ private: class Z2CreatureRide { public: + Z2CreatureRide(); + ~Z2CreatureRide(); + void deleteObject(); + void init(Vec*, Vec*, u8, u8); void setLinkRiding(bool); private: diff --git a/include/Z2AudioLib/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr.h index 844bf871f0..a926878fc7 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr.h +++ b/include/Z2AudioLib/Z2EnvSeMgr.h @@ -1,6 +1,47 @@ #ifndef Z2ENVSEMGR_H #define Z2ENVSEMGR_H +#include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" +struct Z2EnvSeMgr { + /* 802C611C */ Z2EnvSeMgr(); + /* 802C6540 */ ~Z2EnvSeMgr(); + /* 802C66B0 */ void framework(); + /* 802C6998 */ void resetScene(); + /* 802C699C */ void resetSceneInner(); + /* 802C6AC0 */ void initSceneEnvSe(s32, s8, f32); + /* 802C6C1C */ void playSceneEnvSe(); + /* 802C6C84 */ void initStaticEnvSe(u8, u8, u8, u8, Vec*); + /* 802C70C8 */ void startStaticEnvSe(s8); + /* 802C780C */ void registWindowPos(Vec*); + /* 802C7830 */ void startRainSe(s32, s8); + /* 802C7CF4 */ void startNearThunderSe(s8); + /* 802C7E68 */ void startFarThunderSe(Vec*, s8); + /* 802C7FB4 */ void setSnowPower(s8); + /* 802C7FBC */ void initStrongWindSe(); + /* 802C7FC8 */ void setWindDirection(Vec*); + /* 802C800C */ void startStrongWindSe(s8); + /* 802C80F8 */ void initRiverSe(u8, u8, u8, u8); + /* 802C8234 */ void registRiverSePos(Vec*); + /* 802C8258 */ void setHyrulSewerOpen(bool); + /* 802C8300 */ void startRiverSe(s8); + /* 802C8730 */ void initFallSe(u8, u8, u8, u8); + /* 802C886C */ void registFallSePos(Vec*); + /* 802C8890 */ void startFallSe(s8); + /* 802C8A90 */ void initEtcSe(u8, u8, u8, u8); + /* 802C8C24 */ void registEtcSePos(Vec*); + /* 802C8C48 */ void startEtcSe(s8); + /* 802C92C8 */ void registWolfSmellSePos(Vec*); + /* 802C92EC */ void startFogWipeTrigger(Vec*); + /* 802C93A0 */ void setFogWipeWidth(f32); + /* 802C93E4 */ void getFogDensity(); + /* 802C9400 */ void startFogSe(); + /* 802C950C */ void initLv3WaterSe(u8, u8, u8, u8); + /* 802C9F58 */ void registLv3WaterSePos(u8, Vec*); + /* 802CA794 */ void startLv3WaterSe(s8); + + u8 field_0x0[780]; +}; + #endif /* Z2ENVSEMGR_H */ diff --git a/include/Z2AudioLib/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr.h index ec67d7326a..dfb77c2aed 100644 --- a/include/Z2AudioLib/Z2SceneMgr.h +++ b/include/Z2AudioLib/Z2SceneMgr.h @@ -28,6 +28,8 @@ public: void loadSeWave(u32); void loadBgmWave(u32); + bool isSceneExist() { return sceneExist; } + private: /* 0x00 */ long BGM_ID; /* 0x04 */ int sceneNum; diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 726d58950c..d2b0c5dc92 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -307,7 +307,7 @@ public: /* 8009D87C */ bool getE3Zhint(); /* 8009D884 */ char* getAlinkArcName(); /* 8009DA60 */ static bool checkStageName(char const*); - /* 8009DA98 */ void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*); + /* 8009DA98 */ static void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*); /* 8009DB64 */ void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*); /* 8009DC6C */ void setMatrixWorldAxisRot(f32 (*)[4], s16, s16, s16, int, cXyz const*); /* 8009DD90 */ void jointControll(int); diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 70a50b7c5c..814364f39f 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -110,6 +110,8 @@ public: void setSelectItem(int idx, u8 itemId) { mSelectItem[idx] = itemId; } + void setSelectEquip(int idx, u8 item_id) { mSelectEquip[idx] = item_id; } + u8 getSelectItem(int idx) { return mSelectItem[idx]; } void setZStatus(u8 status, u8 flag) { @@ -161,6 +163,7 @@ public: inline JKRHeap* getExpHeap2D() { return mExpHeap2D; } inline dEvent_manager_c& getEvtManager() { return mEvtManager; } inline dAttention_c& getAttention() { return mAttention; } + JKRArchive* getMsgDtArchive(int idx) { return mMsgDtArchive[idx]; } public: /* 0x00000 */ dBgS mDBgS; @@ -453,6 +456,9 @@ int dComIfGp_checkEmptySubHeap2D(); int dComIfGp_searchUseSubHeap2D(int); void dComIfGs_setLastWarpMarkItemData(const char*, cXyz, s16, s8, u8, u8); u16 dComIfGs_getMaxLifeGauge(); +void dComIfGs_setWarpMarkFlag(u8); +void dComIfGs_setSelectEquipSword(u8); +void dComIfGs_setSelectEquipShield(u8); inline void dComIfGp_setRStatus(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setRStatus(status, flag); @@ -937,4 +943,36 @@ inline void dComIfGs_addBottleNum(u8 param_0, s16 param_1) { g_dComIfG_gameInfo.info.getPlayer().getItemRecord().addBottleNum(param_0, param_1); } +inline void dComIfGs_resetLastWarpAcceptStage() { + g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().resetWarpAcceptStage(); +} + +inline void dComIfGp_setSelectEquipClothes(u8 i_clothId) { + g_dComIfG_gameInfo.play.setSelectEquip(COLLECT_CLOTHING, i_clothId); +} + +inline void dComIfGp_setSelectEquipSword(u8 i_swordId) { + g_dComIfG_gameInfo.play.setSelectEquip(COLLECT_SWORD, i_swordId); +} + +inline void dComIfGp_setSelectEquipShield(u8 i_shieldId) { + g_dComIfG_gameInfo.play.setSelectEquip(COLLECT_SHIELD, i_shieldId); +} + +inline void dComIfGs_offItemFirstBit(u8 param_0) { + g_dComIfG_gameInfo.info.getPlayer().getGetItem().offFirstBit(param_0); +} + +inline BOOL dComIfGs_isLetterGetFlag(int param_0) { + return g_dComIfG_gameInfo.info.getPlayer().getLetterInfo().isLetterGetFlag(param_0); +} + +inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) { + return g_dComIfG_gameInfo.play.getMsgDtArchive(idx); +} + +inline u8 dComIfGs_getArrowNum() { + return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getArrowNum(); +} + #endif /* D_COM_D_COM_INF_GAME_H */ diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index a54f18f9d7..166b9633a9 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -1,10 +1,15 @@ #ifndef D_KANKYO_D_KANKYO_H #define D_KANKYO_D_KANKYO_H +#include "JSystem/J3DGraphAnimator/J3DModelData.h" +#include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphBase/J3DStruct.h" +#include "JSystem/JParticle/JPAParticle.h" +#include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/gx/GXTexture.h" #include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" struct LIGHT_INFLUENCE { /* 800CFC7C */ ~LIGHT_INFLUENCE(); @@ -26,6 +31,85 @@ struct WIND_INFLUENCE { /* 0x29 */ u8 field_0x29; }; +struct WIND_INF_ENTITY { + /* 8019F4B8 */ ~WIND_INF_ENTITY(); + /* 8019F4F4 */ WIND_INF_ENTITY(); + + /* 0x00 */ u8 field_0x0[0x10]; + /* 0x10 */ WIND_INFLUENCE field_0x10; +}; // Size: 0x3C + +struct EFLIGHT_PROC { + /* 0x00 */ u8 field_0x0; + /* 0x01 */ u8 field_0x1; + /* 0x04 */ int field_0x4; + /* 0x08 */ LIGHT_INFLUENCE field_0x8; +}; + +struct SND_INFLUENCE { + /* 0x00 */ cXyz field_0x0; + /* 0x0C */ int field_0xc; + /* 0x10 */ int field_0x10; + /* 0x14 */ u32 field_0x14; +}; + +struct DALKMIST_INFLUENCE { + /* 0x00 */ u8 field_0x0[0x10]; +}; + +struct DUNGEON_LIGHT { + /* 8019F478 */ ~DUNGEON_LIGHT(); + /* 8019F4B4 */ DUNGEON_LIGHT(); + + /* 0x00 */ cXyz field_0x0; + /* 0x0C */ u8 field_0xc[0x20]; + /* 0x2C */ // LIGHT_INFLUENCE field_0x2c; this breaks ctor for some reason + u8 field_0x2c[0x20]; +}; // Size: 0x4C + +struct BOSS_LIGHT { + /* 8019F438 */ ~BOSS_LIGHT(); + /* 8019F474 */ BOSS_LIGHT(); + + /* 0x00 */ cXyz field_0x0; + /* 0x0C */ int field_0xc; + /* 0x10 */ int field_0x10; + /* 0x14 */ int field_0x14; + /* 0x18 */ int field_0x18; + /* 0x1C */ int field_0x1c; + /* 0x20 */ int field_0x20; + /* 0x24 */ u8 field_0x24; + /* 0x25 */ u8 field_0x25; + /* 0x26 */ u8 field_0x26; +}; // Size: 0x28 + +struct GB_WIND_INFLUENCE { + /* 0x00 */ cXyz pos; + /* 0x0C */ int field_0xc; + /* 0x10 */ f32 pow; +}; + +struct EF_THUNDER { + /* 0x00 */ u8 field_0x0; + /* 0x01 */ u8 field_0x1; + /* 0x02 */ u8 field_0x2; + /* 0x04 */ int field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ u8 field_0x20[4]; + /* 0x24 */ LIGHT_INFLUENCE field_0x24; +}; + +struct GB_MAPLE_COL_CHANGE { + /* 8019F400 */ GB_MAPLE_COL_CHANGE(); + + /* 0x00 */ J3DLightObj field_0x0; +}; // Size: 0x74 + class dKy_tevstr_c { public: private: @@ -63,6 +147,516 @@ private: STATIC_ASSERT(sizeof(dKy_tevstr_c) == 0x388); +class dKankyo_sun_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_sun_Packet(); + +private: + /* 0x10 */ cXyz field_0x10[2]; +}; + +class dKankyo_sunlenz_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_sunlenz_Packet(); + +private: + /* 0x10 */ u8 field_0x10[0x14]; + /* 0x24 */ cXyz field_0x24[8]; +}; + +struct RAIN_EFF { + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ u8 field_0x1c[0x1c]; +}; // Size: 0x38 + +class dKankyo_rain_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_rain_Packet(); + +private: + /* 0x10 */ u8 field_0x10[8]; + /* 0x18 */ RAIN_EFF field_0x18[250]; +}; + +struct SNOW_EFF { + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ u8 field_0x1c[0x1c]; +}; // Size: 0x38 + +class dKankyo_snow_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_snow_Packet(); + +private: + /* 0x10 */ u8 field_0x10[4]; + /* 0x14 */ SNOW_EFF field_0x14[500]; +}; + +struct STAR_EFF { + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ u8 field_0x1c[0x18]; +}; // Size: 0x34 + +class dKankyo_star_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_star_Packet(); + +private: + /* 0x10 */ u8 field_0x10[4]; + /* 0x14 */ STAR_EFF field_0x14[1]; +}; + +struct HOUSI_EFF { + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ cXyz field_0x1c; + /* 0x28 */ u8 field_0x28[0x28]; +}; // Size: 0x50 + +class dKankyo_housi_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_housi_Packet(); + +private: + /* 0x10 */ u8 field_0x10[0x10]; + /* 0x20 */ HOUSI_EFF field_0x18[300]; +}; + +struct CLOUD_EFF { + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ cXyz field_0x1c; + /* 0x28 */ u8 field_0x28[0x10]; +}; // Size: 0x38 + +class dKankyo_cloud_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_cloud_Packet(); + +private: + /* 0x10 */ u8 field_0x10[8]; + /* 0x18 */ CLOUD_EFF field_0x18[50]; +}; + +struct VRKUMO_EFF { + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ u8 field_0x1c[0x10]; +}; // Size: 0x2C + +class dKankyo_vrkumo_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_vrkumo_Packet(); + +private: + /* 0x10 */ u8 field_0x10[0x10]; + /* 0x20 */ VRKUMO_EFF field_0x18[100]; +}; + +// might be fake +class dKankyo_shstar_Packet : public J3DPacket {}; + +struct ODOUR_EFF { + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ u8 field_0x1c[0x14]; +}; // Size: 0x30 + +class dKankyo_odour_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_odour_Packet(); + +private: + /* 0x10 */ u8 field_0x10[4]; + /* 0x14 */ ODOUR_EFF field_0x18[2000]; +}; + +struct MUD_EFF { + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ cXyz field_0x1c; + /* 0x28 */ u8 field_0x28[0x20]; +}; // Size: 0x48 + +class dKankyo_mud_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_mud_Packet(); + +private: + /* 0x10 */ u8 field_0x10[8]; + /* 0x18 */ MUD_EFF field_0x18[100]; +}; + +struct EVIL_EFF { + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ csXyz field_0x1c; + /* 0x22 */ u8 field_0x22[0x22]; +}; // Size: 0x44 + +class dKankyo_evil_Packet : public J3DPacket { +public: + virtual void draw(); + virtual ~dKankyo_evil_Packet(); + +private: + /* 0x10 */ u8 field_0x10[8]; + /* 0x18 */ EVIL_EFF field_0x18[2000]; +}; + +struct GXFogAdjTable { + u16 field_0x0[10]; +}; + +class fopAc_ac_c; + +class dScnKy_env_light_c { +public: + /* 8019F2E8 */ dScnKy_env_light_c(); + /* 8019F4FC */ void setDaytime(); + /* 8019F788 */ void setSunpos(); + /* 8019FA08 */ f32 getDaytime(); + /* 8019FBCC */ void getDarkDaytime(); + /* 8019FBD4 */ void setLight_palno_get(u8*, u8*, u8*, u8*, u8*, u8*, u8*, u8*, f32*, int*, int*, + f32*, u8*); + /* 801A040C */ void setLight(); + /* 801A133C */ void setLight_bg(dKy_tevstr_c*, _GXColorS10*, _GXColorS10*, f32*, f32*); + /* 801A16C0 */ void setLight_actor(dKy_tevstr_c*, _GXColorS10*, f32*, f32*); + /* 801A1D64 */ void settingTevStruct_colget_actor(cXyz*, dKy_tevstr_c*, _GXColorS10*, + _GXColorS10*, f32*, f32*); + /* 801A1F58 */ void settingTevStruct_colget_player(dKy_tevstr_c*); + /* 801A2128 */ void settingTevStruct_plightcol_plus(cXyz*, dKy_tevstr_c*, _GXColorS10, + _GXColorS10, u8); + /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); + /* 801A441C */ void setLightTevColorType(J3DModelData*, dKy_tevstr_c*); + /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); + /* 801A4E90 */ void CalcTevColor(); + /* 801A4F24 */ void Sndpos(); + /* 801A4F64 */ void Eflight_flush_proc(); + /* 801A516C */ void SetBaseLight(); + /* 801A5288 */ void exeKankyo(); + /* 801A56DC */ void drawKankyo(); + + /* 801ADBBC */ virtual ~dScnKy_env_light_c(); + +public: + /* 0x0000 */ // vtable + /* 0x0004 */ void* field_0x4; + /* 0x0008 */ void* field_0x8; + /* 0x000C */ void* field_0xc; + /* 0x0010 */ void* field_0x10; + /* 0x0014 */ void* field_0x14; + /* 0x0018 */ LIGHT_INFLUENCE field_0x18; + /* 0x0038 */ LIGHT_INFLUENCE field_0x38[30]; + /* 0x03F8 */ LIGHT_INFLUENCE* mPLight[100]; + /* 0x0588 */ LIGHT_INFLUENCE* mEfPLight[5]; + /* 0x059C */ u8 field_0x59c[400]; + /* 0x072C */ int field_0x72c[5]; + /* 0x0740 */ LIGHT_INFLUENCE field_0x740; + /* 0x0760 */ u8 field_0x760[4]; + /* 0x0764 */ LIGHT_INFLUENCE mBGpartsActiveLight[2]; + /* 0x07A4 */ EFLIGHT_PROC field_0x7a4; + /* 0x07CC */ void* stagPlightInfo; // might be part of EFLIGHT_PROC + /* 0x07D0 */ WIND_INFLUENCE* mPntWind[30]; + /* 0x0848 */ WIND_INF_ENTITY field_0x848[5]; + /* 0x0974 */ SND_INFLUENCE mSound; + /* 0x098C */ u8 field_0x98c; + /* 0x0990 */ DALKMIST_INFLUENCE* mDalkmistInf[10]; + /* 0x09B8 */ DUNGEON_LIGHT field_0x9b8[8]; + /* 0x0C18 */ BOSS_LIGHT field_0x0c18[8]; + /* 0x0D58 */ BOSS_LIGHT field_0x0d58[6]; + /* 0x0E48 */ GB_WIND_INFLUENCE field_0xe48; + /* 0x0E5C */ f32 custom_windpower; + /* 0x0E60 */ f32 field_0xe60; + /* 0x0E64 */ u16 field_0xe64; + /* 0x0E66 */ u16 field_0xe66; + /* 0x0E68 */ s16 field_0xe68; + /* 0x0E6A */ s16 field_0xe6a; + /* 0x0E6C */ u8 field_0xe6c; + /* 0x0E6D */ u8 field_0xe6d; + /* 0x0E6E */ u8 field_0xe6e; // E5C - E6E might all be part of GB_WIND_INFLUENCE + /* 0x0E6F */ u8 field_0xe6f; + /* 0x0E70 */ u8 field_0xe70; + /* 0x0E74 */ dKankyo_sun_Packet* field_0xe74; + /* 0x0E78 */ dKankyo_sunlenz_Packet* field_0xe78; + /* 0x0E7C */ u8 field_0xe7c; + /* 0x0E80 */ int mRainCheck; + /* 0x0E84 */ dKankyo_rain_Packet* field_0xe84; + /* 0x0E88 */ u8 field_0xe88; + /* 0x0E8C */ int field_0xe8c; + /* 0x0E90 */ u8 field_0xe90; + /* 0x0E91 */ u8 field_0xe91; + /* 0x0E92 */ u8 field_0xe92; + /* 0x0E94 */ dKankyo_snow_Packet* field_0xe94; + /* 0x0E98 */ u8 field_0xe98; + /* 0x0E9C */ int field_0xe9c; + /* 0x0EA0 */ f32 field_0xea0; + /* 0x0EA4 */ dKankyo_star_Packet* field_0xea4; + /* 0x0EA8 */ u8 field_0xea8; + /* 0x0EA9 */ u8 field_0xea9; + /* 0x0EAC */ int field_0xeac; + /* 0x0EB0 */ dKankyo_housi_Packet* field_0xeb0; + /* 0x0EB4 */ u8 field_0xeb4; + /* 0x0EB5 */ u8 field_0xeb5; + /* 0x0EB8 */ int field_0xeb8; + /* 0x0EBC */ f32 field_0xebc; + /* 0x0EC0 */ dKankyo_cloud_Packet* field_0xec0; + /* 0x0EC4 */ u8 field_0xec4; + /* 0x0EC8 */ int field_0xec8; + /* 0x0ECC */ f32 field_0xecc; + /* 0x0ED0 */ dKankyo_vrkumo_Packet* field_0xed0; + /* 0x0ED4 */ EF_THUNDER field_0xef4; + /* 0x0F18 */ u8 field_0xf18[4]; + /* 0x0F1C */ dKankyo_shstar_Packet* field_0xf1c; + /* 0x0F20 */ u8 field_0xf20; + /* 0x0F21 */ u8 field_0xf21; + /* 0x0F24 */ int field_0xf24; + /* 0x0F28 */ dKankyo_odour_Packet* field_0xf28; + /* 0x0F2C */ u8 field_0xf2c; + /* 0x0F30 */ J3DModel* field_0xf30; + /* 0x0F34 */ f32 field_0xf34; + /* 0x0F38 */ int field_0xf38; + /* 0x0F3C */ u8 field_0xf3c; + /* 0x0F3D */ u8 field_0xf3d; + /* 0x0F40 */ f32 field_0xf40; + /* 0x0F44 */ JPABaseEmitter* field_0xf44; + /* 0x0F48 */ JPABaseEmitter* field_0xf48; + /* 0x0F4C */ JPABaseEmitter* field_0xf4c; + /* 0x0F50 */ GB_MAPLE_COL_CHANGE field_0xf50[2]; + /* 0x1038 */ u8 field_0x1038; + /* 0x103C */ int field_0x103c; + /* 0x1040 */ u8 field_0x1040[4]; + /* 0x1044 */ u8 field_0x1044; + /* 0x1048 */ int field_0x1048; + /* 0x104C */ dKankyo_mud_Packet* field_0x104c; + /* 0x1050 */ u8 field_0x1050; + /* 0x1051 */ u8 field_0x1051; + /* 0x1054 */ int field_0x1054; + /* 0x1058 */ dKankyo_evil_Packet* field_0x1058; + /* 0x105C */ mDoExt_btkAnm* field_0x105c; + /* 0x1060 */ fopAc_ac_c* field_0x1060; + /* 0x1064 */ f32 field_0x1064; + /* 0x1068 */ f32 field_0x1068; + /* 0x106C */ f32 field_0x106c; + /* 0x1070 */ cXyz field_0x1070; + /* 0x107C */ cXyz mPLightNearPos; + /* 0x1088 */ cXyz field_0x1088; + /* 0x1094 */ cXyz field_0x1094; + /* 0x10A0 */ cXyz field_0x10a0; + /* 0x10AC */ GXFogAdjTable field_0x10ac; + /* 0x10C0 */ u16 field_0x10c0; + /* 0x10C2 */ u16 field_0x10c2; + /* 0x10C4 */ u16 field_0x10c4; + /* 0x10C6 */ u16 field_0x10c6; + /* 0x10C8 */ u16 field_0x10c8; + /* 0x10CA */ u16 field_0x10ca; + /* 0x10CC */ u16 field_0x10cc; + /* 0x10CE */ u16 field_0x10ce; + /* 0x10D0 */ u16 field_0x10d0; + /* 0x10D2 */ u16 field_0x10d2; + /* 0x10D4 */ u16 field_0x10d4; + /* 0x10D6 */ u16 field_0x10d6; + /* 0x10D8 */ u16 field_0x10d8; + /* 0x10DA */ u16 field_0x10da; + /* 0x10DC */ u16 field_0x10dc; + /* 0x10DE */ u16 field_0x10de; + /* 0x10E0 */ u16 field_0x10e0; + /* 0x10E2 */ u16 field_0x10e2; + /* 0x10E4 */ u16 field_0x10e4; + /* 0x10E6 */ u16 field_0x10e6; + /* 0x10E8 */ u16 field_0x10e8; + /* 0x10EA */ u16 field_0x10ea; + /* 0x10EC */ u16 field_0x10ec; + /* 0x10EE */ u16 field_0x10ee; + /* 0x10F0 */ s16 field_0x10f0; + /* 0x10F2 */ s16 field_0x10f2; + /* 0x10F4 */ s16 field_0x10f4; + /* 0x10F6 */ s16 field_0x10f6; + /* 0x10F8 */ s16 field_0x10f8; + /* 0x10FA */ s16 field_0x10fa; + /* 0x10FC */ s16 field_0x10fc; + /* 0x10FE */ s16 field_0x10fe; + /* 0x1100 */ _GXColorS10 field_0x1100; + /* 0x1108 */ _GXColorS10 field_0x1108; + /* 0x1110 */ s16 field_0x1110; + /* 0x1112 */ s16 field_0x1112; + /* 0x1114 */ s16 field_0x1114; + /* 0x1116 */ s16 field_0x1116; + /* 0x1118 */ s16 field_0x1118; + /* 0x111A */ s16 field_0x111a; + /* 0x111C */ s16 field_0x111c; + /* 0x111E */ s16 field_0x111e; + /* 0x1120 */ s16 field_0x1120; + /* 0x1122 */ s16 field_0x1122; + /* 0x1124 */ s16 field_0x1124; + /* 0x1126 */ s16 field_0x1126; + /* 0x1128 */ _GXColorS10 field_0x1128; + /* 0x1130 */ u8 field_0x1130[0x28]; + /* 0x1158 */ _GXColorS10 field_0x1158; + /* 0x1160 */ s16 field_0x1160; + /* 0x1162 */ s16 field_0x1162; + /* 0x1164 */ s16 field_0x1164; + /* 0x1166 */ u8 field_0x1166[10]; + /* 0x1170 */ s16 field_0x1170; + /* 0x1172 */ s16 field_0x1172; + /* 0x1174 */ s16 field_0x1174; + /* 0x1176 */ u8 field_0x1176[10]; + /* 0x1180 */ s16 field_0x1180; + /* 0x1182 */ s16 field_0x1182; + /* 0x1184 */ s16 field_0x1184; + /* 0x1186 */ u8 field_0x1186[10]; + /* 0x1190 */ s16 field_0x1190; + /* 0x1192 */ s16 field_0x1192; + /* 0x1194 */ s16 field_0x1194; + /* 0x1196 */ u8 field_0x1196[10]; + /* 0x11A0 */ s16 field_0x11a0; + /* 0x11A2 */ s16 field_0x11a2; + /* 0x11A4 */ s16 field_0x11a4; + /* 0x11A6 */ u8 field_0x11a6[10]; + /* 0x11B0 */ s16 field_0x11b0; + /* 0x11B2 */ s16 field_0x11b2; + /* 0x11B4 */ s16 field_0x11b4; + /* 0x11B6 */ s16 field_0x11b6; + /* 0x11B8 */ s16 field_0x11b8; + /* 0x11BA */ s16 field_0x11ba; + /* 0x11BC */ s16 field_0x11bc; + /* 0x11BE */ u8 field_0x11be[2]; + /* 0x11C0 */ s16 field_0x11c0; + /* 0x11C2 */ s16 field_0x11c2; + /* 0x11C4 */ s16 field_0x11c4; + /* 0x11C8 */ f32 field_0x11c8; + /* 0x11CC */ f32 field_0x11cc; + /* 0x11D0 */ f32 field_0x11d0; + /* 0x11D4 */ f32 field_0x11d4; + /* 0x11D8 */ f32 field_0x11d8; + /* 0x11DC */ f32 field_0x11dc; + /* 0x11E0 */ f32 field_0x11e0; + /* 0x11E4 */ f32 field_0x11e4; + /* 0x11E8 */ f32 field_0x11e8; + /* 0x11EC */ f32 field_0x11ec; + /* 0x11F0 */ f32 field_0x11f0; + /* 0x11F4 */ f32 field_0x11f4; + /* 0x11F8 */ f32 field_0x11f8; + /* 0x11FC */ f32 field_0x11fc; + /* 0x1200 */ f32 field_0x1200; + /* 0x1204 */ f32 field_0x1204; + /* 0x1208 */ f32 field_0x1208; + /* 0x120C */ f32 field_0x120c; + /* 0x1210 */ f32 field_0x1210; + /* 0x1214 */ f32 mAllcolRatio; + /* 0x1218 */ f32 mActcolRatio; + /* 0x121C */ f32 mBgcolRatio; + /* 0x1220 */ f32 mFogcolRatio; + /* 0x1224 */ f32 mVrboxSoracolRatio; + /* 0x1228 */ f32 mVrboxKumocolRatio; + /* 0x122C */ f32 field_0x122c; + /* 0x1230 */ f32 field_0x1230; + /* 0x1234 */ f32 field_0x1234; + /* 0x1238 */ f32 field_0x1238; + /* 0x123C */ f32 field_0x123c; + /* 0x1240 */ f32 field_0x1240; + /* 0x1244 */ f32 mDaytime; + /* 0x1248 */ f32 mNexttime; + /* 0x124C */ f32 field_0x124c; + /* 0x1250 */ f32 mDarkDaytime; + /* 0x1254 */ f32 field_0x1254; + /* 0x1258 */ f32 field_0x1258; + /* 0x125C */ f32 field_0x125c; + /* 0x1260 */ f32 field_0x1260; + /* 0x1264 */ f32 field_0x1264; + /* 0x1268 */ f32 field_0x1268; + /* 0x126C */ f32 field_0x126c; + /* 0x1270 */ f32 field_0x1270; + /* 0x1274 */ f32 field_0x1274; + /* 0x1278 */ f32 field_0x1278; + /* 0x127C */ f32 field_0x127c; + /* 0x1280 */ int field_0x1280; + /* 0x1284 */ u8 field_0x1284[4]; + /* 0x1288 */ int field_0x1288; + /* 0x128C */ u8 field_0x128c[12]; + /* 0x1298 */ int field_0x1298; + /* 0x129C */ int field_0x129c; + /* 0x12A0 */ int field_0x12a0; + /* 0x12A4 */ int field_0x12a4; + /* 0x12A8 */ int field_0x12a8; + /* 0x12AC */ u8 field_0x12ac[4]; + /* 0x12B0 */ int field_0x12b0; + /* 0x12B4 */ int field_0x12b4; + /* 0x12B8 */ u8 field_0x12b8[4]; + /* 0x12BC */ u16 field_0x12bc; + /* 0x12BE */ u16 field_0x12be; + /* 0x12C0 */ u16 field_0x12c0; + /* 0x12C2 */ u8 field_0x12c2; + /* 0x12C3 */ u8 field_0x12c3; + /* 0x12C4 */ u8 field_0x12c4; + /* 0x12C5 */ u8 field_0x12c5; + /* 0x12C6 */ u8 field_0x12c6; + /* 0x12C7 */ u8 field_0x12c7; + /* 0x12C8 */ u8 field_0x12c8; + /* 0x12C9 */ u8 field_0x12c9; + /* 0x12CA */ u8 field_0x12ca; + /* 0x12CB */ u8 field_0x12cb; + /* 0x12CC */ u8 field_0x12cc; + /* 0x12CD */ u8 field_0x12cd; + /* 0x12CE */ u8 field_0x12ce; + /* 0x12CF */ u8 field_0x12cf; + /* 0x12D0 */ u8 field_0x12d0; + /* 0x12D1 */ u8 mItemGetCol_chg; + /* 0x12D2 */ u8 field_0x12d2; + /* 0x12D3 */ u8 field_0x12d3; + /* 0x12D4 */ u8 field_0x12d4; + /* 0x12D5 */ u8 field_0x12d5; + /* 0x12D6 */ u8 field_0x12d6; + /* 0x12D7 */ u8 mShadowMode; + /* 0x12D8 */ u8 mCameraInWater; + /* 0x12DC */ void* field_0x12dc; + /* 0x12E0 */ void* field_0x12e0; + /* 0x12E4 */ void* field_0x12e4; + /* 0x12E8 */ void* field_0x12e8; + /* 0x12EC */ void* field_0x12ec; + /* 0x12F0 */ void* field_0x12f0; + /* 0x12F4 */ void* field_0x12f4; + /* 0x12F8 */ u8 field_0x12f8; + /* 0x12F9 */ u8 field_0x12f9; + /* 0x12FA */ u8 field_0x12fa; + /* 0x12FB */ u8 field_0x12fb; + /* 0x12FC */ u8 field_0x12fc; + /* 0x12FD */ u8 mDarktimeWeek; + /* 0x12FE */ u8 field_0x12fe; + /* 0x1300 */ u16 field_0x1300; + /* 0x1302 */ u16 field_0x1302; + /* 0x1304 */ f32 field_0x1304; + /* 0x1308 */ u8 field_0x1308; + /* 0x1309 */ u8 field_0x1309; + /* 0x130A */ u8 field_0x130a; + /* 0x130B */ u8 field_0x130b; + /* 0x130C */ u8 field_0x130c; +}; // Size: 0x1310 + +STATIC_ASSERT(sizeof(dScnKy_env_light_c) == 4880); + BOOL dKy_darkworld_stage_check(char const*, int); #endif /* D_KANKYO_D_KANKYO_H */ diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index c058da0d98..686bd99c69 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -5,19 +5,19 @@ #include "d/d_resorce.h" #include "d/menu/d_menu_window.h" #include "d/msg/d_msg_flow.h" +#include "d/pane/d_pane_class.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" -//#include "JSystem/JUtility/JUTFont.h" struct dMsgObject_c { - /* 802384C4 */ void setLetterNameID(u16); + /* 802384C4 */ static void setLetterNameID(u16); /* 802379AC */ void setKillMessageFlag(); /* 8023822C */ void getStatus(); }; class dMeterMap_c { public: - /* 8020D900 */ bool isMapOpenCheck(); + /* 8020D900 */ static bool isMapOpenCheck(); /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); /* 8020D874 */ void setDispPosInsideFlg_SE_On(); /* 8020D8BC */ void setDispPosOutsideFlg_SE_On(); @@ -31,18 +31,26 @@ struct J2DTextBox { /* 8021C7F4 */ void getFont() const; }; -struct JUTFont {}; +struct dMenu_LetterData { + u16 mSubject; + u16 mName; + u16 mText; + u16 mEventFlag; +}; struct dMenu_Letter { - static u8 letter_data[512]; + static u16 getLetterSubject(int idx) { return letter_data[idx].mSubject; } + static u16 getLetterName(int idx) { return letter_data[idx].mName; } + static u16 getLetterText(int idx) { return letter_data[idx].mText; } + static u16 getLetterEventFlag(int idx) { return letter_data[idx].mEventFlag; } + + static dMenu_LetterData letter_data[64]; }; struct dItem_data { static void* item_resource[1530]; }; -struct CPaneMgr {}; - class dMw_c; class dMeter2_c { @@ -65,7 +73,7 @@ public: dMeter2Info_c(); virtual ~dMeter2Info_c(); void init(void); - void setFloatingMessage(u16, s16, bool); + int setFloatingMessage(u16, s16, bool); void setFloatingFlow(u16, s16, bool); int isFloatingMessageVisible(void); int decFloatingMessageTimer(void); @@ -115,8 +123,7 @@ public: private: /* 0x04 */ u8 unk4[4]; - /* 0x08 */ u32 unk8; - /* 0x0C */ u32 unk12; + /* 0x08 */ u64 unk8; /* 0x10 */ void* mMsgResource; /* 0x14 */ void* mStageMsgResource; /* 0x18 */ void* mMsgUnitResource; @@ -161,26 +168,27 @@ private: /* 0xBA */ u8 unk186; /* 0xBB */ u8 mMaxCount; /* 0xBC */ u8 mNowCount; - /* 0xBD */ u8 mShopTalkFlag; + /* 0xBD */ bool mShopTalkFlag; /* 0xBE */ u8 unk190; /* 0xBF */ u8 mMapStatus; /* 0xC0 */ u8 mWarpStatus; /* 0xC1 */ u8 mPauseStatus; /* 0xC2 */ u8 mGameOverType; /* 0xC3 */ u8 mInsectSelectType; - /* 0xC4 */ u32 unk196; - /* 0xC8 */ u32 unk200; + /* 0xC4 */ u8 unk196[4]; + /* 0xC8 */ u8 unk200[4]; /* 0xCC */ u8 unk204; - /* 0xCD */ u8 unk205; - /* 0xCE */ u8 unk206; - /* 0xCF */ u8 unk207; - /* 0xD0 */ f64 unk208; - /* 0xD8 */ u8 unk216; - /* 0xD9 */ u8 unk217; - /* 0xDA */ u8 unk218; - /* 0xDB */ u8 unk219; + /* 0xCD */ u8 unk205; // arrow num + /* 0xCE */ u8 unk206; // item 1 + /* 0xCF */ u8 unk207; // item 2 + /* 0xD0 */ u8 unk208[4]; + /* 0xD4 */ u8 unk212[4]; + /* 0xD8 */ u8 unk216; // bomb num + /* 0xD9 */ u8 unk217; // arrow num? + /* 0xDA */ u8 unk218; // item 1? + /* 0xDB */ u8 unk219; // item 2 /* 0xDC */ u8 mRentalBombBag; - /* 0xDD */ u8 mMiniGameItemSetFlag; + /* 0xDD */ u8 mMiniGameItemSetFlag; // 1: rented in game, 3: rented not in game /* 0xDE */ u8 mMiniGameCount; /* 0xDF */ u8 mCollectCursorPosX; /* 0xE0 */ u8 mCollectCursorPosY; @@ -191,7 +199,7 @@ private: /* 0xE7 */ u8 unk231; /* 0xE8 */ u8 mItemExplainWindowStatus; /* 0xE9 */ char mSaveStageName[8]; - /* 0xF1 */ u8 mFloatingMessageWakuVisible; + /* 0xF1 */ bool mFloatingMessageWakuVisible; /* 0xF2 */ u8 mMapDrugFlag; /* 0xF3 */ u8 unk243[5]; }; diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h index a7cbb3418c..b7a0313b69 100644 --- a/include/d/meter/d_meter_HIO.h +++ b/include/d/meter/d_meter_HIO.h @@ -1,6 +1,54 @@ #ifndef D_METER_D_METER_HIO_H #define D_METER_D_METER_HIO_H +#include "JSystem/JUtility.h" +#include "SSystem/SComponent/c_Xyz.h" +#include "SSystem/SComponent/c_sXyz.h" #include "dolphin/types.h" +class dMeter_drawCollectHIO_c { +public: + dMeter_drawCollectHIO_c(); + virtual ~dMeter_drawCollectHIO_c(); + +private: + /* 0x00 */ // vtable + /* 0x04 */ u8 field_0x04[4]; + /* 0x08 */ f32 mItemScaleSmall; + /* 0x0C */ f32 mItemScaleLarge; + /* 0x10 */ f32 mSaveOptionItemScaleSmall; + /* 0x14 */ f32 mSaveOptionItemScaleLarge; + /* 0x18 */ f32 mBlueFuzzPosX; + /* 0x1C */ f32 mBlueFuzzPosY; + /* 0x20 */ f32 mBlueFuzzScale; + /* 0x24 */ f32 mBlueFuzzAlpha; + /* 0x28 */ cXyz mMaskMirrorPos; + /* 0x34 */ f32 mMaskMirrorScale; + /* 0x38 */ f32 mMaskMirrorAnimation; + /* 0x3C */ f32 mHeartVesselPosX; + /* 0x40 */ f32 mHeartVesselPosY; + /* 0x44 */ f32 mHeartVesselScale; + /* 0x48 */ f32 mAButtonPosX; + /* 0x4C */ f32 mAButtonPosY; + /* 0x50 */ f32 mAButtonScale; + /* 0x54 */ f32 mBButtonPosX; + /* 0x58 */ f32 mBButtonPosY; + /* 0x5C */ f32 mBButtonScale; + /* 0x60 */ f32 mAButtonTextPosX; + /* 0x64 */ f32 mAButtonTextPosY; + /* 0x68 */ f32 mAButtonTextScale; + /* 0x6C */ f32 mBButtonTextPosX; + /* 0x70 */ f32 mBButtonTextPosY; + /* 0x74 */ f32 mBButtonTextScale; + /* 0x78 */ JUtility::TColor mBasBlack[2]; // ht_n_bas, h_kaz_n + /* 0x80 */ JUtility::TColor mBasWhite[2]; // same as above + /* 0x88 */ f32 mHeartPiecePosX; + /* 0x8C */ f32 mHeartPiecePosY; + /* 0x90 */ f32 mHeartPieceScale; + /* 0x94 */ csXyz mMaskMirrorAngle; + /* 0x9A */ bool field_0x9a; + /* 0x9B */ bool mColorDebugON; + /* 0x9C */ bool mButtonDebugON; +}; // Size = 0xA0 + #endif /* D_METER_D_METER_HIO_H */ diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h index 30e1ae2625..f387463e3e 100644 --- a/include/d/msg/d_msg_flow.h +++ b/include/d/msg/d_msg_flow.h @@ -4,9 +4,15 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" -struct mesg_flow_node_branch {}; +struct mesg_flow_node_branch { + /* 0x00 */ int field_0x0; + /* 0x04 */ u16 param; +}; -struct mesg_flow_node_event {}; +struct mesg_flow_node_event { + /* 0x00 */ int field_0x0; + /* 0x04 */ u8 param; +}; struct mesg_flow_node {}; @@ -34,9 +40,9 @@ public: /* 8024AD54 */ void branchNodeProc(fopAc_ac_c*, fopAc_ac_c**); /* 8024ADEC */ void eventNodeProc(fopAc_ac_c*, fopAc_ac_c**); /* 8024AFF8 */ void nodeProc(fopAc_ac_c*, fopAc_ac_c**); - /* 8024B0F0 */ void getParam(u16*, u16*, u8*); + /* 8024B0F0 */ int getParam(u16*, u16*, u8*); /* 8024B108 */ void getParam(u8*, u8*); - /* 8024B130 */ void getParam(u8*); + /* 8024B130 */ int getParam(u8*); /* 8024B138 */ void query001(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024B180 */ void query002(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024B208 */ void query003(mesg_flow_node_branch*, fopAc_ac_c*, int); @@ -90,11 +96,11 @@ public: /* 8024C340 */ void query051(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024C3A0 */ void query052(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024C3D4 */ void query053(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C3FC */ void event000(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C488 */ void event001(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C514 */ void event002(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C550 */ void event003(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C590 */ void event004(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C3FC */ int event000(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C488 */ int event001(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C514 */ int event002(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C550 */ int event003(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C590 */ int event004(mesg_flow_node_event*, fopAc_ac_c*); /* 8024C5F0 */ void event005(mesg_flow_node_event*, fopAc_ac_c*); /* 8024C654 */ void event006(mesg_flow_node_event*, fopAc_ac_c*); /* 8024C694 */ void event007(mesg_flow_node_event*, fopAc_ac_c*); diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h index 3a02e0bed0..8a0cc7c06e 100644 --- a/include/d/pane/d_pane_class.h +++ b/include/d/pane/d_pane_class.h @@ -1,6 +1,50 @@ #ifndef D_PANE_D_PANE_CLASS_H #define D_PANE_D_PANE_CLASS_H +#include "d/pane/d_pane_class_alpha.h" #include "dolphin/types.h" +class CPaneMgr : public CPaneMgrAlpha { +public: + /* 80253A18 */ virtual ~CPaneMgr(); + /* 80253AB4 */ virtual void setAlpha(u8); + + /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); + /* 80253930 */ CPaneMgr(); + /* 80253B2C */ void reinit(); + /* 80253C08 */ void initiate(J2DPane*, JKRExpHeap*); + /* 80254018 */ void childPaneGetSize(J2DPane*); + /* 80254134 */ void childPaneSetSize(J2DPane*, f32, f32); + /* 802542E8 */ void getGlobalPosX(); + /* 80254364 */ void getGlobalPosY(); + /* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor); + /* 802545B0 */ void paneTrans(f32, f32); + /* 80254638 */ void paneScale(f32, f32); + /* 802547CC */ void scaleAnime(s16, f32, f32, u8); + /* 802548BC */ void colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor, + JUtility::TColor, u8); + /* 80254C90 */ void getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16); + /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); + /* 80254FB8 */ void getBounds(J2DPane*); + +private: + /* 0x1C */ void* field_0x1c; + /* 0x20 */ void* field_0x20; + /* 0x24 */ JGeometry::TVec2<f32> mInitPos; + /* 0x2C */ JGeometry::TVec2<f32> mGlobalPos; + /* 0x34 */ JGeometry::TVec2<f32> mInitSize; + /* 0x3C */ JGeometry::TVec2<f32> mInitScale; + /* 0x44 */ JGeometry::TVec2<f32> field_0x44; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ JGeometry::TVec2<f32> field_0x50; + /* 0x58 */ JUtility::TColor mInitWhite; + /* 0x5C */ JUtility::TColor mInitBlack; + /* 0x60 */ s16 field_0x60; + /* 0x62 */ s16 field_0x62; + /* 0x64 */ s16 mScaleAnime; + /* 0x66 */ s16 field_0x66; + /* 0x68 */ s16 field_0x68; + /* 0x6A */ s16 mColorAnime; +}; + #endif /* D_PANE_D_PANE_CLASS_H */ diff --git a/include/d/pane/d_pane_class_alpha.h b/include/d/pane/d_pane_class_alpha.h index ae3f3d7ca5..6fcadd7b2b 100644 --- a/include/d/pane/d_pane_class_alpha.h +++ b/include/d/pane/d_pane_class_alpha.h @@ -1,6 +1,49 @@ #ifndef D_PANE_D_PANE_CLASS_ALPHA_H #define D_PANE_D_PANE_CLASS_ALPHA_H +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "dolphin/types.h" +struct CPaneMgrAlphaMorf { + /* 80255C68 */ CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*); + /* 80255CAC */ ~CPaneMgrAlphaMorf(); + /* 80255D48 */ void initiateAlphaMorf(); + /* 80255DD0 */ void setBackupAlpha(); + /* 80255E28 */ void setAlphaMorfRate(f32); + /* 80255E98 */ void childPaneBackupAlpha(J2DPane*); + /* 80255F28 */ void childPaneSetAlphaMorf(J2DPane*, f32); +}; + +class CPaneMgrAlpha { +public: + /* 8025546C */ virtual ~CPaneMgrAlpha(); + /* 80255758 */ virtual void setAlpha(u8); + + /* 802553EC */ CPaneMgrAlpha(); + /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); + /* 802554E0 */ void initiateAlpha(J2DPane*, JKRExpHeap*); + /* 802555C8 */ void show(); + /* 80255608 */ void hide(); + /* 8025564C */ void isVisible(); + /* 80255658 */ void rateCalc(s16, s16, u8); + /* 802557D0 */ void setAlphaRate(f32); + /* 80255828 */ void getAlphaRate(); + /* 80255878 */ void alphaAnime(s16, u8, u8, u8); + /* 80255964 */ void alphaAnimeLoop(s16, u8, u8, u8); + /* 80255A60 */ void childPaneCount(J2DPane*); + /* 80255ACC */ void childPaneGetAlpha(J2DPane*); + /* 80255B5C */ void childPaneSetAlpha(J2DPane*, u8); + +private: + /* 0x04 */ J2DPane* mPanePtr; + /* 0x08 */ JKRHeap* heap; + /* 0x0C */ void* field_0x0c; + /* 0x10 */ int field_0x10; + /* 0x14 */ s16 mChildPaneCount; + /* 0x16 */ s16 mAlphaTimer; + /* 0x18 */ u8 mInitAlpha; + /* 0x19 */ u8 mFlags; +}; + #endif /* D_PANE_D_PANE_CLASS_ALPHA_H */ diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index e6cfc1e681..cf0cdeef5d 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -22,310 +22,335 @@ #define ITEM_ZONE_MAX 0x20 #define ITEM_ONE_ZONE_MAX 0x10 -enum Wallets { WALLET, BIG_WALLET, GIANT_WALLET }; +enum Wallets { + /* 0x0 */ WALLET, + /* 0x1 */ BIG_WALLET, + /* 0x2 */ GIANT_WALLET +}; enum ItemSlots { - SLOT_0, - SLOT_1, - SLOT_2, - SLOT_3, - SLOT_4, - SLOT_5, - SLOT_6, - SLOT_7, - SLOT_8, - SLOT_9, - SLOT_10, - SLOT_11, - SLOT_12, - SLOT_13, - SLOT_14, - SLOT_15, - SLOT_16, - SLOT_17, - SLOT_18, - SLOT_19, - SLOT_20, - SLOT_21, - SLOT_22, - SLOT_23 + /* 0x00 */ SLOT_0, + /* 0x01 */ SLOT_1, + /* 0x02 */ SLOT_2, + /* 0x03 */ SLOT_3, + /* 0x04 */ SLOT_4, + /* 0x05 */ SLOT_5, + /* 0x06 */ SLOT_6, + /* 0x07 */ SLOT_7, + /* 0x08 */ SLOT_8, + /* 0x09 */ SLOT_9, + /* 0x0A */ SLOT_10, + /* 0x0B */ SLOT_11, + /* 0x0C */ SLOT_12, + /* 0x0D */ SLOT_13, + /* 0x0E */ SLOT_14, + /* 0x0F */ SLOT_15, + /* 0x10 */ SLOT_16, + /* 0x11 */ SLOT_17, + /* 0x12 */ SLOT_18, + /* 0x13 */ SLOT_19, + /* 0x14 */ SLOT_20, + /* 0x15 */ SLOT_21, + /* 0x16 */ SLOT_22, + /* 0x17 */ SLOT_23 }; enum ItemTable { - HEART, - GREEN_RUPEE, - BLUE_RUPEE, - YELLOW_RUPEE, - RED_RUPEE, - PURPLE_RUPEE, - ORANGE_RUPEE, - SILVER_RUPEE, - S_MAGIC, - L_MAGIC, - BOMB_5, - BOMB_10, - BOMB_20, - BOMB_30, - ARROW_10, - ARROW_20, - ARROW_30, - ARROW_1, - PACHINKO_SHOT, - noentry1, - noentry2, - noentry3, - WATER_BOMB_5, - WATER_BOMB_10, - WATER_BOMB_20, - WATER_BOMB_30, - BOMB_INSECT_5, - BOMB_INSECT_10, - BOMB_INSECT_20, - BOMB_INSECT_30, - RECOVERY_FAILY, - TRIPLE_HEART, - SMALL_KEY, - KAKERA_HEART, - UTAWA_HEART, - MAP, - COMPUS, - DUNGEON_EXIT, - BOSS_KEY, - DUNGEON_BACK, - SWORD, - MASTER_SWORD, - WOOD_SHIELD, - SHIELD, - HYLIA_SHIELD, - TKS_LETTER, - WEARS_CASUAL, - WEAR_KOKIRI, - ARMOR, - WEAR_ZORA, - MAGIC_LV1, - DUNGEON_EXIT_2, - WALLET_LV1, - WALLET_LV2, - WALLET_LV3, - noentry4, - noentry5, - noentry6, - noentry7, - noentry8, - noentry9, - ZORAS_JEWEL, - HAWK_EYE, - WOOD_STICK, - BOOMERANG, - SPINNER, - IRONBALL, - BOW, - HOOKSHOT, - HVY_BOOTS, - COPY_ROD, - W_HOOKSHOT, - KANTERA, - LIGHT_SWORD, - FISHING_ROD_1, - PACHINKO, - COPY_ROD_2, - noentry10, - noentry11, - BOMB_BAG_LV2, - BOMB_BAG_LV1, - BOMB_IN_BAG, - noentry12, - LIGHT_ARROW, - ARROW_LV1, - ARROW_LV2, - ARROW_LV3, - noentry13, - LURE_ROD, - BOMB_ARROW, - HAWK_ARROW, - BEE_ROD, - JEWEL_ROD, - WORM_ROD, - JEWEL_BEE_ROD, - JEWEL_WORM_ROD, - EMPTY_BOTTLE, - RED_BOTTLE, - GREEN_BOTTLE, - BLUE_BOTTLE, - MILK_BOTTLE, - HALF_MILK_BOTTLE, - OIL_BOTTLE, - WATER_BOTTLE, - OIL_BOTTLE_2, - RED_BOTTLE_2, - UGLY_SOUP, - HOT_SPRING, - FAIRY, - HOT_SPRING_2, - OIL2, - OIL, - NORMAL_BOMB, - WATER_BOMB, - POKE_BOMB, - FAIRY_DROP, - WORM, - DROP_BOTTLE, - BEE_CHILD, - CHUCHU_RARE, - CHUCHU_RED, - CHUCHU_BLUE, - CHUCHU_GREEN, - CHUCHU_YELLOW, - CHUCHU_PURPLE, - LV1_SOUP, - LV2_SOUP, - LV3_SOUP, - LETTER, - BILL, - WOOD_STATUE, - IRIAS_PENDANT, - HORSE_FLUTE, - noentry14, - noentry15, - noentry16, - noentry17, - noentry18, - noentry19, - noentry20, - noentry21, - noentry22, - noentry23, - noentry24, - RAFRELS_MEMO, - ASHS_SCRIBBLING, - noentry25, - noentry26, - noentry27, - noentry28, - noentry29, - noentry30, - noentry31, - noentry32, - noentry33, - noentry34, - CHUCHU_YELLOW2, - OIL_BOTTLE3, - SHOP_BEE_CHILD, - CHUCHU_BLACK, - LIGHT_DROP, - DROP_CONTAINER, - DROP_CONTAINER02, - DROP_CONTAINER03, - FILLED_CONTAINER, - MIRROR_PIECE_2, - MIRROR_PIECE_3, - MIRROR_PIECE_4, - noentry35, - noentry36, - noentry37, - noentry38, - noentry39, - noentry40, - noentry41, - noentry42, - SMELL_YELIA_POUCH, - SMELL_PUMPKIN, - SMELL_POH, - SMELL_FISH, - SMELL_CHILDREN, - SMELL_MEDICINE, - noentry43, - noentry44, - noentry45, - noentry46, - noentry47, - noentry48, - noentry49, - noentry50, - noentry51, - noentry52, - M_BEETLE, - F_BEETLE, - M_BUTTERFLY, - F_BUTTERFLY, - M_STAG_BEETLE, - F_STAG_BEETLE, - M_GRASSHOPPER, - F_GRASSHOPPER, - M_NANAFUSHI, - F_NANAFUSHI, - M_DANGOMUSHI, - F_DANGOMUSHI, - M_MANTIS, - F_MANTIS, - M_LADYBUG, - F_LADYBUG, - M_SNAIL, - F_SNAIL, - M_DRAGONFLY, - F_DRAGONFLY, - M_ANT, - F_ANT, - M_MAYFLY, - F_MAYFLY, - noentry53, - noentry54, - noentry55, - noentry56, - noentry57, - noentry58, - noentry59, - noentry60, - POU_SPIRIT, - noentry61, - noentry62, - noentry63, - noentry64, - noentry65, - noentry66, - noentry67, - noentry68, - ANCIENT_DOCUMENT, - AIR_LETTER, - ANCIENT_DOCUMENT2, - LV7_DUNGEON_EXIT, - LINKS_SAVINGS, - SMALL_KEY2, - POU_FIRE1, - POU_FIRE2, - POU_FIRE3, - POU_FIRE4, - BOSSRIDER_KEY, - TOMATO_PUREE, - TASTE, - LV5_BOSS_KEY, - SURFBOARD, - KANTERA2, - L2_KEY_PIECES1, - L2_KEY_PIECES2, - L2_KEY_PIECES3, - KEY_OF_CARAVAN, - LV2_BOSS_KEY, - KEY_OF_FILONE, - NO_ITEM + /* 0x00 */ HEART, + /* 0x01 */ GREEN_RUPEE, + /* 0x02 */ BLUE_RUPEE, + /* 0x03 */ YELLOW_RUPEE, + /* 0x04 */ RED_RUPEE, + /* 0x05 */ PURPLE_RUPEE, + /* 0x06 */ ORANGE_RUPEE, + /* 0x07 */ SILVER_RUPEE, + /* 0x08 */ S_MAGIC, + /* 0x09 */ L_MAGIC, + /* 0x0A */ BOMB_5, + /* 0x0B */ BOMB_10, + /* 0x0C */ BOMB_20, + /* 0x0D */ BOMB_30, + /* 0x0E */ ARROW_10, + /* 0x0F */ ARROW_20, + /* 0x10 */ ARROW_30, + /* 0x11 */ ARROW_1, + /* 0x12 */ PACHINKO_SHOT, + /* 0x13 */ noentry1, + /* 0x14 */ noentry2, + /* 0x15 */ noentry3, + /* 0x16 */ WATER_BOMB_5, + /* 0x17 */ WATER_BOMB_10, + /* 0x18 */ WATER_BOMB_20, + /* 0x19 */ WATER_BOMB_30, + /* 0x1A */ BOMB_INSECT_5, + /* 0x1B */ BOMB_INSECT_10, + /* 0x1C */ BOMB_INSECT_20, + /* 0x1D */ BOMB_INSECT_30, + /* 0x1E */ RECOVERY_FAILY, + /* 0x1F */ TRIPLE_HEART, + /* 0x20 */ SMALL_KEY, + /* 0x21 */ KAKERA_HEART, + /* 0x22 */ UTAWA_HEART, + /* 0x23 */ MAP, + /* 0x24 */ COMPUS, + /* 0x25 */ DUNGEON_EXIT, + /* 0x26 */ BOSS_KEY, + /* 0x27 */ DUNGEON_BACK, + /* 0x28 */ SWORD, + /* 0x29 */ MASTER_SWORD, + /* 0x2A */ WOOD_SHIELD, + /* 0x2B */ SHIELD, + /* 0x2C */ HYLIA_SHIELD, + /* 0x2D */ TKS_LETTER, + /* 0x2E */ WEARS_CASUAL, + /* 0x2F */ WEAR_KOKIRI, + /* 0x30 */ ARMOR, + /* 0x31 */ WEAR_ZORA, + /* 0x32 */ MAGIC_LV1, + /* 0x33 */ DUNGEON_EXIT_2, + /* 0x34 */ WALLET_LV1, + /* 0x35 */ WALLET_LV2, + /* 0x36 */ WALLET_LV3, + /* 0x37 */ noentry4, + /* 0x38 */ noentry5, + /* 0x39 */ noentry6, + /* 0x3A */ noentry7, + /* 0x3B */ noentry8, + /* 0x3C */ noentry9, + /* 0x3D */ ZORAS_JEWEL, + /* 0x3E */ HAWK_EYE, + /* 0x3F */ WOOD_STICK, + /* 0x40 */ BOOMERANG, + /* 0x41 */ SPINNER, + /* 0x42 */ IRONBALL, + /* 0x43 */ BOW, + /* 0x44 */ HOOKSHOT, + /* 0x45 */ HVY_BOOTS, + /* 0x46 */ COPY_ROD, + /* 0x47 */ W_HOOKSHOT, + /* 0x48 */ KANTERA, + /* 0x49 */ LIGHT_SWORD, + /* 0x4A */ FISHING_ROD_1, + /* 0x4B */ PACHINKO, + /* 0x4C */ COPY_ROD_2, + /* 0x4D */ noentry10, + /* 0x4E */ noentry11, + /* 0x4F */ BOMB_BAG_LV2, + /* 0x50 */ BOMB_BAG_LV1, + /* 0x51 */ BOMB_IN_BAG, + /* 0x52 */ noentry12, + /* 0x53 */ LIGHT_ARROW, + /* 0x54 */ ARROW_LV1, + /* 0x55 */ ARROW_LV2, + /* 0x56 */ ARROW_LV3, + /* 0x57 */ noentry13, + /* 0x58 */ LURE_ROD, + /* 0x59 */ BOMB_ARROW, + /* 0x5A */ HAWK_ARROW, + /* 0x5B */ BEE_ROD, + /* 0x5C */ JEWEL_ROD, + /* 0x5D */ WORM_ROD, + /* 0x5E */ JEWEL_BEE_ROD, + /* 0x5F */ JEWEL_WORM_ROD, + /* 0x60 */ EMPTY_BOTTLE, + /* 0x61 */ RED_BOTTLE, + /* 0x62 */ GREEN_BOTTLE, + /* 0x63 */ BLUE_BOTTLE, + /* 0x64 */ MILK_BOTTLE, + /* 0x65 */ HALF_MILK_BOTTLE, + /* 0x66 */ OIL_BOTTLE, + /* 0x67 */ WATER_BOTTLE, + /* 0x68 */ OIL_BOTTLE_2, + /* 0x69 */ RED_BOTTLE_2, + /* 0x6A */ UGLY_SOUP, + /* 0x6B */ HOT_SPRING, + /* 0x6C */ FAIRY, + /* 0x6D */ HOT_SPRING_2, + /* 0x6E */ OIL2, + /* 0x6F */ OIL, + /* 0x70 */ NORMAL_BOMB, + /* 0x71 */ WATER_BOMB, + /* 0x72 */ POKE_BOMB, + /* 0x73 */ FAIRY_DROP, + /* 0x74 */ WORM, + /* 0x75 */ DROP_BOTTLE, + /* 0x76 */ BEE_CHILD, + /* 0x77 */ CHUCHU_RARE, + /* 0x78 */ CHUCHU_RED, + /* 0x79 */ CHUCHU_BLUE, + /* 0x7A */ CHUCHU_GREEN, + /* 0x7B */ CHUCHU_YELLOW, + /* 0x7C */ CHUCHU_PURPLE, + /* 0x7D */ LV1_SOUP, + /* 0x7E */ LV2_SOUP, + /* 0x7F */ LV3_SOUP, + /* 0x80 */ LETTER, + /* 0x81 */ BILL, + /* 0x82 */ WOOD_STATUE, + /* 0x83 */ IRIAS_PENDANT, + /* 0x84 */ HORSE_FLUTE, + /* 0x85 */ noentry14, + /* 0x86 */ noentry15, + /* 0x87 */ noentry16, + /* 0x88 */ noentry17, + /* 0x89 */ noentry18, + /* 0x8A */ noentry19, + /* 0x8B */ noentry20, + /* 0x8C */ noentry21, + /* 0x8D */ noentry22, + /* 0x8E */ noentry23, + /* 0x8F */ noentry24, + /* 0x90 */ RAFRELS_MEMO, + /* 0x91 */ ASHS_SCRIBBLING, + /* 0x92 */ noentry25, + /* 0x93 */ noentry26, + /* 0x94 */ noentry27, + /* 0x95 */ noentry28, + /* 0x96 */ noentry29, + /* 0x97 */ noentry30, + /* 0x98 */ noentry31, + /* 0x99 */ noentry32, + /* 0x9A */ noentry33, + /* 0x9B */ noentry34, + /* 0x9C */ CHUCHU_YELLOW2, + /* 0x9D */ OIL_BOTTLE3, + /* 0x9E */ SHOP_BEE_CHILD, + /* 0x9F */ CHUCHU_BLACK, + /* 0xA0 */ LIGHT_DROP, + /* 0xA1 */ DROP_CONTAINER, + /* 0xA2 */ DROP_CONTAINER02, + /* 0xA3 */ DROP_CONTAINER03, + /* 0xA4 */ FILLED_CONTAINER, + /* 0xA5 */ MIRROR_PIECE_2, + /* 0xA6 */ MIRROR_PIECE_3, + /* 0xA7 */ MIRROR_PIECE_4, + /* 0xA8 */ noentry35, + /* 0xA9 */ noentry36, + /* 0xAA */ noentry37, + /* 0xAB */ noentry38, + /* 0xAC */ noentry39, + /* 0xAD */ noentry40, + /* 0xAE */ noentry41, + /* 0xAF */ noentry42, + /* 0xB0 */ SMELL_YELIA_POUCH, + /* 0xB1 */ SMELL_PUMPKIN, + /* 0xB2 */ SMELL_POH, + /* 0xB3 */ SMELL_FISH, + /* 0xB4 */ SMELL_CHILDREN, + /* 0xB5 */ SMELL_MEDICINE, + /* 0xB6 */ noentry43, + /* 0xB7 */ noentry44, + /* 0xB8 */ noentry45, + /* 0xB9 */ noentry46, + /* 0xBA */ noentry47, + /* 0xBB */ noentry48, + /* 0xBC */ noentry49, + /* 0xBD */ noentry50, + /* 0xBE */ noentry51, + /* 0xBF */ noentry52, + /* 0xC0 */ M_BEETLE, + /* 0xC1 */ F_BEETLE, + /* 0xC2 */ M_BUTTERFLY, + /* 0xC3 */ F_BUTTERFLY, + /* 0xC4 */ M_STAG_BEETLE, + /* 0xC5 */ F_STAG_BEETLE, + /* 0xC6 */ M_GRASSHOPPER, + /* 0xC7 */ F_GRASSHOPPER, + /* 0xC8 */ M_NANAFUSHI, + /* 0xC9 */ F_NANAFUSHI, + /* 0xCA */ M_DANGOMUSHI, + /* 0xCB */ F_DANGOMUSHI, + /* 0xCC */ M_MANTIS, + /* 0xCD */ F_MANTIS, + /* 0xCE */ M_LADYBUG, + /* 0xCF */ F_LADYBUG, + /* 0xD0 */ M_SNAIL, + /* 0xD1 */ F_SNAIL, + /* 0xD2 */ M_DRAGONFLY, + /* 0xD3 */ F_DRAGONFLY, + /* 0xD4 */ M_ANT, + /* 0xD5 */ F_ANT, + /* 0xD6 */ M_MAYFLY, + /* 0xD7 */ F_MAYFLY, + /* 0xD8 */ noentry53, + /* 0xD9 */ noentry54, + /* 0xDA */ noentry55, + /* 0xDB */ noentry56, + /* 0xDC */ noentry57, + /* 0xDD */ noentry58, + /* 0xDE */ noentry59, + /* 0xDF */ noentry60, + /* 0xE0 */ POU_SPIRIT, + /* 0xE1 */ noentry61, + /* 0xE2 */ noentry62, + /* 0xE3 */ noentry63, + /* 0xE4 */ noentry64, + /* 0xE5 */ noentry65, + /* 0xE6 */ noentry66, + /* 0xE7 */ noentry67, + /* 0xE8 */ noentry68, + /* 0xE9 */ ANCIENT_DOCUMENT, + /* 0xEA */ AIR_LETTER, + /* 0xEB */ ANCIENT_DOCUMENT2, + /* 0xEC */ LV7_DUNGEON_EXIT, + /* 0xED */ LINKS_SAVINGS, + /* 0xEE */ SMALL_KEY2, + /* 0xEF */ POU_FIRE1, + /* 0xF0 */ POU_FIRE2, + /* 0xF1 */ POU_FIRE3, + /* 0xF2 */ POU_FIRE4, + /* 0xF3 */ BOSSRIDER_KEY, + /* 0xF4 */ TOMATO_PUREE, + /* 0xF5 */ TASTE, + /* 0xF6 */ LV5_BOSS_KEY, + /* 0xF7 */ SURFBOARD, + /* 0xF8 */ KANTERA2, + /* 0xF9 */ L2_KEY_PIECES1, + /* 0xFA */ L2_KEY_PIECES2, + /* 0xFB */ L2_KEY_PIECES3, + /* 0xFC */ KEY_OF_CARAVAN, + /* 0xFD */ LV2_BOSS_KEY, + /* 0xFE */ KEY_OF_FILONE, + /* 0xFF */ NO_ITEM }; -enum CollectItem { COLLECT_CLOTHING, COLLECT_SWORD, COLLECT_SHIELD, COLLECT_SMELL, B_BUTTON_ITEM }; +enum CollectItem { + /* 0x0 */ COLLECT_CLOTHING, + /* 0x1 */ COLLECT_SWORD, + /* 0x2 */ COLLECT_SHIELD, + /* 0x3 */ COLLECT_SMELL, + /* 0x4 */ B_BUTTON_ITEM +}; enum Swords { - COLLECT_ORDON_SWORD, - COLLECT_MASTER_SWORD, - COLLECT_WOODEN_SWORD, - COLLECT_LIGHT_SWORD + /* 0x0 */ COLLECT_ORDON_SWORD, + /* 0x1 */ COLLECT_MASTER_SWORD, + /* 0x2 */ COLLECT_WOODEN_SWORD, + /* 0x3 */ COLLECT_LIGHT_SWORD }; -enum Shields { COLLECT_WOODEN_SHIELD, COLLECT_ORDON_SHIELD, COLLECT_HYLIAN_SHIELD }; +enum Shields { + /* 0x0 */ COLLECT_WOODEN_SHIELD, + /* 0x1 */ COLLECT_ORDON_SHIELD, + /* 0x2 */ COLLECT_HYLIAN_SHIELD +}; -enum Armors { KOKIRI_CLOTHES_FLAG }; +enum Clothes { + /* 0x0 */ KOKIRI_CLOTHES_FLAG +}; -enum LightDropStages { FARON_VESSEL, ELDIN_VESSEL, LANAYRU_VESSEL }; +enum LightDropStages { + /* 0x0 */ FARON_VESSEL, + /* 0x1 */ ELDIN_VESSEL, + /* 0x2 */ LANAYRU_VESSEL +}; -enum ItemMax { ARROW_MAX, NORMAL_BOMB_MAX, WATER_BOMB_MAX, POKE_BOMB_MAX = 6 }; +enum ItemMax { + /* 0x0 */ ARROW_MAX, + /* 0x1 */ NORMAL_BOMB_MAX, + /* 0x2 */ WATER_BOMB_MAX, + /* 0x6 */ POKE_BOMB_MAX = 6 +}; class dSv_player_status_a_c { public: @@ -451,6 +476,7 @@ public: s16 getAngleY() { return mAngleY; } s8 getRoomNo() { return mRoomNo; } char getWarpAcceptStage() { return mWarpAcceptStage; } + void resetWarpAcceptStage() { mWarpAcceptStage = -1; } private: /* 0x00 */ cXyz mPos; @@ -514,6 +540,7 @@ public: u8 addBottleNum(u8, s16); u8 getBottleNum(u8) const; + u8 getArrowNum() const { return mArrowNum; } void setArrowNum(u8 amount) { mArrowNum = amount; } u8 getPachinkoNum() const { return mPachinkoNum; } void setPachinkoNum(u8 num) { mPachinkoNum = num; } @@ -680,6 +707,7 @@ public: dSv_light_drop_c& getLightDrop() { return mLightDrop; } dSv_player_get_item_c& getGetItem() { return mGetItem; } dSv_player_config_c& getConfig() { return mConfig; } + dSv_letter_info_c& getLetterInfo() { return mLetterInfo; } private: /* 0x000 */ dSv_player_status_a_c mPlayerStatusA; @@ -704,14 +732,14 @@ private: class dSv_memBit_c { public: enum { - MAP, - COMPASS, - BOSS_KEY, - STAGE_BOSS_ENEMY, - STAGE_LIFE, - STAGE_BOSS_DEMO, - OOCCOO_NOTE, - STAGE_BOSS_ENEMY_2 + /* 0x0 */ MAP, + /* 0x1 */ COMPASS, + /* 0x2 */ BOSS_KEY, + /* 0x3 */ STAGE_BOSS_ENEMY, + /* 0x4 */ STAGE_LIFE, + /* 0x5 */ STAGE_BOSS_DEMO, + /* 0x6 */ OOCCOO_NOTE, + /* 0x7 */ STAGE_BOSS_ENEMY_2 }; void init(); diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index ad2d4d99ed..c890624114 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -28,6 +28,262 @@ typedef enum _GXTexMapID { GX_MAX_TEXMAP = 8 } GXTexMapID; +typedef enum _GXTevStageID { + /* 0x0 */ GX_TEVSTAGE0, + /* 0x1 */ GX_TEVSTAGE1, + /* 0x2 */ GX_TEVSTAGE2, + /* 0x3 */ GX_TEVSTAGE3, + /* 0x4 */ GX_TEVSTAGE4, + /* 0x5 */ GX_TEVSTAGE5, + /* 0x6 */ GX_TEVSTAGE6, + /* 0x7 */ GX_TEVSTAGE7, + /* 0x8 */ GX_TEVSTAGE8, + /* 0x9 */ GX_TEVSTAGE9, + /* 0xA */ GX_TEVSTAGE10, + /* 0xB */ GX_TEVSTAGE11, + /* 0xC */ GX_TEVSTAGE12, + /* 0xD */ GX_TEVSTAGE13, + /* 0xE */ GX_TEVSTAGE14, + /* 0xF */ GX_TEVSTAGE15, +} GXTevStageID; + +typedef enum _GXTexCoordID { + /* 0x00 */ GX_TEXCOORD0, + /* 0x01 */ GX_TEXCOORD1, + /* 0x02 */ GX_TEXCOORD2, + /* 0x03 */ GX_TEXCOORD3, + /* 0x04 */ GX_TEXCOORD4, + /* 0x05 */ GX_TEXCOORD5, + /* 0x06 */ GX_TEXCOORD6, + /* 0x07 */ GX_TEXCOORD7, + /* 0xFF */ GX_TEXCOORD_NULL = 255, +} GXTexCoordID; + +typedef enum _GXChannelID { + /* 0x00 */ GX_COLOR0, + /* 0x01 */ GX_COLOR1, + /* 0x02 */ GX_ALPHA0, + /* 0x03 */ GX_ALPHA1, + /* 0x04 */ GX_COLOR0A0, + /* 0x05 */ GX_COLOR1A1, + /* 0x06 */ GX_COLOR_ZERO, + /* 0x07 */ GX_ALPHA_BUMP, + /* 0x08 */ GX_ALPHA_BUMPN, + /* 0xFF */ GX_COLOR_NULL = 255, +} GXChannelID; + +typedef enum _GXColorSrc { + /* 0x0 */ GX_SRC_REG, + /* 0x1 */ GX_SRC_VTX, +} GXColorSrc; + +typedef enum _GXLightID { + /* 0x00 */ GX_LIGHT0, + /* 0x02 */ GX_LIGHT1 = 0x2, + /* 0x04 */ GX_LIGHT2 = 0x4, + /* 0x08 */ GX_LIGHT3 = 0x8, + /* 0x10 */ GX_LIGHT4 = 0x10, + /* 0x20 */ GX_LIGHT5 = 0x20, + /* 0x40 */ GX_LIGHT6 = 0x40, + /* 0x80 */ GX_LIGHT7 = 0x80, +} GXLightID; + +typedef enum _GXDiffuseFn { + /* 0x0 */ GX_DF_NONE, + /* 0x1 */ GX_DF_SIGN, + /* 0x2 */ GX_DF_CLAMP, +} GXDiffuseFn; + +typedef enum _GXAttnFn { + /* 0x0 */ GX_AF_SPEC, + /* 0x1 */ GX_AF_SPOT, + /* 0x2 */ GX_AF_NONE, +} GXAttnFn; + +typedef enum _GXTevMode { + /* 0x0 */ GX_MODULATE, + /* 0x1 */ GX_DECAL, + /* 0x2 */ GX_BLEND, + /* 0x3 */ GX_REPLACE, + /* 0x4 */ GX_PASSCLR, +} GXTevMode; + +typedef enum _GXBlendMode { + /* 0x0 */ GX_BM_NONE, + /* 0x1 */ GX_BM_BLEND, + /* 0x2 */ GX_BM_LOGIC, + /* 0x3 */ GX_BM_SUBTRACT, +} GXBlendMode; + +typedef enum _GXBlendFactor { + /* 0x0 */ GX_BL_ZERO, + /* 0x1 */ GX_BL_ONE, + /* 0x2 */ GX_BL_SRC_COLOR, + /* 0x3 */ GX_BL_INV_SRC_COLOR, + /* 0x4 */ GX_BL_SRC_ALPHA, + /* 0x5 */ GX_BL_INV_SRC_ALPHA, + /* 0x6 */ GX_BL_DST_ALPHA, + /* 0x7 */ GX_BL_INV_DST_ALPHA, +} GXBlendFactor; + +typedef enum _GXLogicOp { + /* 0x0 */ GX_LO_CLEAR, + /* 0x1 */ GX_LO_AND, + /* 0x2 */ GX_LO_REV_AND, + /* 0x3 */ GX_LO_COPY, + /* 0x4 */ GX_LO_INV_AND, + /* 0x5 */ GX_LO_NOOP, + /* 0x6 */ GX_LO_XOR, + /* 0x7 */ GX_LO_OP, + /* 0x8 */ GX_LO_NOR, + /* 0x9 */ GX_LO_EQUIV, + /* 0xA */ GX_LO_INV, + /* 0xB */ GX_LO_REV_OR, + /* 0xC */ GX_LO_INV_COPY, + /* 0xD */ GX_LO_INV_OR, + /* 0xE */ GX_LO_NAND, + /* 0xF */ GX_LO_SET, +} GXLogicOp; + +typedef enum _GXVtxFmt { + /* 0x0 */ GX_VTXFMT0, + /* 0x1 */ GX_VTXFMT1, + /* 0x2 */ GX_VTXFMT2, + /* 0x3 */ GX_VTXFMT3, + /* 0x4 */ GX_VTXFMT4, + /* 0x5 */ GX_VTXFMT5, + /* 0x6 */ GX_VTXFMT6, + /* 0x7 */ GX_VTXFMT7, +} GXVtxFmt; + +typedef enum _GXAttr { + /* 0x00 */ GX_VA_PTNMTXIDX, + /* 0x01 */ GX_VA_TEX0MTXIDX, + /* 0x02 */ GX_VA_TEX1MTXIDX, + /* 0x03 */ GX_VA_TEX2MTXIDX, + /* 0x04 */ GX_VA_TEX3MTXIDX, + /* 0x05 */ GX_VA_TEX4MTXIDX, + /* 0x06 */ GX_VA_TEX5MTXIDX, + /* 0x07 */ GX_VA_TEX6MTXIDX, + /* 0x08 */ GX_VA_TEX7MTXIDX, + /* 0x09 */ GX_VA_POS, + /* 0x0A */ GX_VA_NRM, + /* 0x0B */ GX_VA_CLR0, + /* 0x0C */ GX_VA_CLR1, + /* 0x0D */ GX_VA_TEX0, + /* 0x0E */ GX_VA_TEX1, + /* 0x0F */ GX_VA_TEX2, + /* 0x10 */ GX_VA_TEX3, + /* 0x11 */ GX_VA_TEX4, + /* 0x12 */ GX_VA_TEX5, + /* 0x13 */ GX_VA_TEX6, + /* 0x14 */ GX_VA_TEX7, + /* 0x15 */ GX_POS_MTX_ARRAY, + /* 0x16 */ GX_NRM_MTX_ARRAY, + /* 0x17 */ GX_TEX_MTX_ARRAY, + /* 0x18 */ GX_LIGHT_ARRAY, + /* 0x19 */ GX_VA_NBT, + /* 0x1A */ GX_VA_MAX_ATTR, + /* 0xFF */ GX_VA_NULL = 255, +} GXAttr; + +typedef enum _GXCompCnt { + /* 0x0 */ GX_TEX_S, + /* 0x0 */ GX_NRM_XYZ = 0, + /* 0x0 */ GX_CLR_RGB = 0, + /* 0x0 */ GX_POS_XY = 0, + /* 0x1 */ GX_TEX_ST = 1, + /* 0x1 */ GX_NRM_NBT = 1, + /* 0x1 */ GX_CLR_RGBA = 1, + /* 0x1 */ GX_POS_XYZ = 1, + /* 0x2 */ GX_NRM_NBT3, +} GXCompCnt; + +typedef enum _GXCompType { + /* 0x0 */ GX_U8, + /* 0x0 */ GX_RGB565 = 0, + /* 0x1 */ GX_S8, + /* 0x1 */ GX_RGB8 = 1, + /* 0x2 */ GX_RGBX8, + /* 0x2 */ GX_U16 = 2, + /* 0x3 */ GX_S16, + /* 0x3 */ GX_RGBA4 = 3, + /* 0x4 */ GX_RGBA6, + /* 0x4 */ GX_F32 = 4, + /* 0x5 */ GX_RGBA8, +} GXCompType; + +typedef enum _GXAttrType { + /* 0x0 */ GX_NONE, + /* 0x1 */ GX_DIRECT, + /* 0x2 */ GX_INDEX8, + /* 0x3 */ GX_INDEX16, +} GXAttrType; + +typedef enum _GXTevOp { + /* 0x0 */ GX_TEV_ADD, + /* 0x1 */ GX_TEV_SUB, + /* 0x8 */ GX_TEV_COMP_R8_GT = 8, + /* 0x9 */ GX_TEV_COMP_R8_EQ, + /* 0xA */ GX_TEV_COMP_GR16_GT, + /* 0xB */ GX_TEV_COMP_GR16_EQ, + /* 0xC */ GX_TEV_COMP_BGR24_GT, + /* 0xD */ GX_TEV_COMP_BGR24_EQ, + /* 0xE */ GX_TEV_COMP_A8_GT, + /* 0xE */ GX_TEV_COMP_RGB8_GT = 14, + /* 0xF */ GX_TEV_COMP_RGB8_EQ, + /* 0xF */ GX_TEV_COMP_A8_EQ = 15, +} GXTevOp; + +typedef enum _GXTevBias { + /* 0x0 */ GX_TB_ZERO, + /* 0x1 */ GX_TB_ADDHALF, + /* 0x2 */ GX_TB_SUBHALF, +} GXTevBias; + +typedef enum _GXTevColorArg { + /* 0x0 */ GX_CC_CPREV, + /* 0x1 */ GX_CC_APREV, + /* 0x2 */ GX_CC_C0, + /* 0x3 */ GX_CC_A0, + /* 0x4 */ GX_CC_C1, + /* 0x5 */ GX_CC_A1, + /* 0x6 */ GX_CC_C2, + /* 0x7 */ GX_CC_A2, + /* 0x8 */ GX_CC_TEXC, + /* 0x9 */ GX_CC_TEXA, + /* 0xA */ GX_CC_RASC, + /* 0xB */ GX_CC_RASA, + /* 0xC */ GX_CC_ONE, + /* 0xD */ GX_CC_HALF, + /* 0xE */ GX_CC_KONST, + /* 0xF */ GX_CC_ZERO, +} GXTevColorArg; + +typedef enum _GXTevScale { + /* 0x0 */ GX_CS_SCALE_1, + /* 0x1 */ GX_CS_SCALE_2, + /* 0x2 */ GX_CS_SCALE_4, + /* 0x3 */ GX_CS_DIVIDE_2, +} GXTevScale; + +typedef enum _GXTevRegID { + /* 0x0 */ GX_TEVPREV, + /* 0x1 */ GX_TEVREG0, + /* 0x2 */ GX_TEVREG1, + /* 0x3 */ GX_TEVREG2, +} GXTevRegID; + +typedef enum _GXTevAlphaArg { + /* 0x0 */ GX_CA_APREV, + /* 0x1 */ GX_CA_A0, + /* 0x2 */ GX_CA_A1, + /* 0x3 */ GX_CA_A2, + /* 0x4 */ GX_CA_TEXA, + /* 0x5 */ GX_CA_TEXB, + /* 0x6 */ GX_CA_ZERO, +} GXTevAlphaArg; + struct GXRenderModeObj { s32 vi_tv_mode; u16 fb_width; @@ -44,6 +300,25 @@ struct GXRenderModeObj { u8 vfilter[7]; }; +struct _GXTexObj { + u32 texture_filter; + u32 texture_lod; + u32 texture_size; + u32 texture_address; + u32 user_data; + u32 texture_format; + u32 tlut_name; + u16 texture_time_count; + u8 texture_tile_type; + u8 texture_flags; +}; + +struct _GXTlutObj { + u32 format; + u32 address; + u32 numEntries; +}; + typedef enum GXTexFmt8 { /* 8-bit version of GXTexFmt for use in structures */ GX_CTF_A8 = 39, GX_CTF_B8 = 42, @@ -72,12 +347,46 @@ typedef enum GXTexFmt8 { /* 8-bit version of GXTexFmt for use in structures */ GX_TF_Z8 = 17 } GXTexFmt8; +typedef enum GXTexFmt { + _GX_TF_I4, + _GX_TF_I8, + _GX_TF_IA4, + _GX_TF_IA8, + _GX_TF_RGB565, + _GX_TF_TGB5A3, + _GX_TF_RGBA8, + _GX_TF_CMPR = 14, + _GX_TF_Z8 = 17, + _GX_TF_Z16 = 19, + _GX_TF_Z24X8 = 22, + _GX_CTF_R4 = 32, + _GX_CTF_RA4 = 34, + _GX_CTF_RA8, + _GX_CTF_YUVA8 = 38, + _GX_CTF_A8, + _GX_CTF_R8, + _GX_CTF_G8, + _GX_CTF_B8, + _GX_CTF_RG8, + _GX_CTF_GB8, + _GX_CTF_Z4 = 48, + _GX_CTF_Z8M = 57, + _GX_CTF_Z8L, + _GX_CTF_Z16L = 60 +} GXTexFmt; + typedef enum GXTexWrapMode8 { /* Same as GXTexWrapMode, but as 1 byte for use inside structures */ GX_CLAMP = 0, GX_MIRROR = 2, GX_REPEAT = 1 } GXTexWrapMode8; +typedef enum GXTexWrapMode { + _GX_CLAMP, + _GX_REPEAT, + _GX_MIRROR, +} GXTexWrapMode; + typedef enum GXTexFilter8 { /* Same as GXTexFilter, but as 1 byte for use within structures that store the value as a byte */ GX_LINEAR = 1, @@ -88,14 +397,37 @@ typedef enum GXTexFilter8 { /* Same as GXTexFilter, but as 1 byte for use within GX_NEAR_MIP_NEAR = 2 } GXTexFilter8; +typedef enum GXTexFilter { + _GX_NEAR, + _GX_LINEAR, + _GX_NEAR_MIP_NEAR, + _GX_LIN_MIP_NEAR, + _GX_NEAR_MIP_LIN, + _GX_LIN_MIP_LIN, +} GXTexFilter; + +typedef enum GXAnisotropy { + GX_ANISO_1, + GX_ANISO_2, + GX_ANISO_4, +} GXAnisotropy; + +typedef enum GXTlutFmt { + GX_TL_IA8, + GX_TL_RGB565, + GX_TL_RGB5A3, +} GXTlutFmt; + extern "C" { f32 GXGetYScaleFactor(u16 efb_height, u16 xfb_height); u16 GXGetNumXfbLines(u32 efb_height, f32 y_scale); void GXBegin(u8, u8, u16); -void GXLoadTexObj(u32*, s32); -void GXInitTexObjLOD(f32, f32, f32, u32*, s32, s32, u32, u8, u32); -void GXInitTexObj(u32*, u32, u32, u32, u32, u32, u8); +void GXLoadTexObj(_GXTexObj*, _GXTexMapID); +void GXInitTexObjLOD(_GXTexObj, GXTexFilter, GXTexFilter, f32, f32, f32, s32, s32, GXAnisotropy); +void GXInitTexObj(_GXTexObj, void*, u16, u16, GXTexFmt, GXTexWrapMode, GXTexWrapMode, s32); +void GXInitTlutObj(_GXTlutObj*, void*, GXTlutFmt, u16); +void GXLoadTlut(_GXTlutObj*, u32); void GXSetNumChans(u32); void GXSetNumTevStages(u32); diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp index 887497e5e2..d1d2613923 100644 --- a/libs/JSystem/J2DGraph/J2DAnimation.cpp +++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp @@ -15,10 +15,6 @@ struct _GXTlutFmt {}; struct _GXTlut {}; -struct _GXColorS10 {}; - -struct _GXColor {}; - struct JUTTransparency {}; struct JKRArchive {}; @@ -55,77 +51,6 @@ struct J2DDataManage { /* 8030CE18 */ void get(char const*); }; -struct J2DAnmVtxColorKey { - /* 8030B704 */ void getColor(u8, u16, _GXColor*) const; - /* 8030CC20 */ ~J2DAnmVtxColorKey(); -}; - -struct J2DAnmVtxColorFull { - /* 8030B4C4 */ void getColor(u8, u16, _GXColor*) const; - /* 8030CC8C */ ~J2DAnmVtxColorFull(); -}; - -struct J2DAnmVisibilityFull { - /* 8030C048 */ void getVisibility(u16, u8*) const; -}; - -struct J2DAnmTransformKey { - /* 801959C0 */ ~J2DAnmTransformKey(); - /* 8030AAFC */ void calcTransform(f32, u16, J3DTransformInfo*) const; - /* 8030CD7C */ void getTransform(u16, J3DTransformInfo*) const; -}; - -struct J2DAnmTransformFull { - /* 8030A590 */ void getTransform(u16, J3DTransformInfo*) const; - /* 8030CDAC */ ~J2DAnmTransformFull(); -}; - -struct J2DAnmTextureSRTKey { - /* 80184274 */ ~J2DAnmTextureSRTKey(); - /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const; - /* 8030BC60 */ void searchUpdateMaterialID(J2DScreen*); -}; - -struct J2DAnmTexPattern { - struct J2DAnmTexPatternTIMGPointer { - /* 8030CB2C */ J2DAnmTexPatternTIMGPointer(); - /* 8030CB3C */ ~J2DAnmTexPatternTIMGPointer(); - }; - - /* 8030BD10 */ void searchUpdateMaterialID(J2DScreen*); - /* 8030BEE8 */ void getTexNo(u16, u16*) const; - /* 8030BF9C */ void getResTIMG(u16) const; - /* 8030BFF0 */ void getPalette(u16) const; - /* 8030CB90 */ ~J2DAnmTexPattern(); -}; - -struct J2DAnmTevRegKey { - /* 801841EC */ ~J2DAnmTevRegKey(); - /* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const; - /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const; - /* 8030C678 */ void searchUpdateMaterialID(J2DScreen*); -}; - -struct J2DAnmColorKey { - /* 80239BE0 */ ~J2DAnmColorKey(); - /* 8030B200 */ void getColor(u16, _GXColor*) const; -}; - -struct J2DAnmColorFull { - /* 8030AFC8 */ void getColor(u16, _GXColor*) const; - /* 8030CCF8 */ ~J2DAnmColorFull(); -}; - -struct J2DAnmColor { - /* 801842FC */ ~J2DAnmColor(); - /* 802EB390 */ void getColor(u16, _GXColor*) const; - /* 8030AF24 */ void searchUpdateMaterialID(J2DScreen*); -}; - -struct J2DAnmBase { - /* 800569B0 */ void searchUpdateMaterialID(J2DScreen*); -}; - // // Forward References: // diff --git a/libs/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp index cf29efd972..0d7f12952a 100644 --- a/libs/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/libs/JSystem/J2DGraph/J2DGrafContext.cpp @@ -8,46 +8,6 @@ #include "dolphin/types.h" // -// Types: -// - -struct JUtility { - struct TColor {}; -}; - -struct JGeometry { - template <typename A1> - struct TBox2 {}; - /* TBox2<f32> */ - struct TBox2__template0 {}; - - template <typename A1> - struct TVec2 {}; - /* TVec2<f32> */ - struct TVec2__template1 {}; -}; - -struct J2DGrafContext { - /* 802E8B08 */ J2DGrafContext(f32, f32, f32, f32); - /* 802E8BB4 */ void setPort(); - /* 802E8C44 */ void setup2D(); - /* 802E8E20 */ void setScissor(); - /* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&); - /* 802E90E4 */ void place(JGeometry::TBox2<f32> const&); - /* 802E961C */ void place(f32, f32, f32, f32); - /* 802E9118 */ void setColor(JUtility::TColor, JUtility::TColor, JUtility::TColor, - JUtility::TColor); - /* 802E9234 */ void setLineWidth(u8); - /* 802E9260 */ void fillBox(JGeometry::TBox2<f32> const&); - /* 802E9368 */ void drawFrame(JGeometry::TBox2<f32> const&); - /* 802E9488 */ void line(JGeometry::TVec2<f32>, JGeometry::TVec2<f32>); - /* 802E9564 */ void lineTo(JGeometry::TVec2<f32>); - /* 802E95D4 */ ~J2DGrafContext(); - /* 802E9664 */ bool getGrafType() const; - /* 802E966C */ void setLookat(); -}; - -// // Forward References: // diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp index c261a7986e..fa9b518c61 100644 --- a/libs/JSystem/J2DGraph/J2DManage.cpp +++ b/libs/JSystem/J2DGraph/J2DManage.cpp @@ -8,24 +8,6 @@ #include "dolphin/types.h" // -// Types: -// - -struct JSUInputStream { - /* 802DC298 */ void read(void*, s32); -}; - -struct J2DResReference { - /* 8030CF10 */ void getResReference(u16) const; - /* 8030CF44 */ void getName(u16) const; -}; - -struct J2DDataManage { - /* 8030CE18 */ void get(char const*); - /* 8030CE7C */ void get(JSUInputStream*); -}; - -// // Forward References: // diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp index 2ea0b7aa3d..def8304ad0 100644 --- a/libs/JSystem/J2DGraph/J2DMaterial.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp @@ -13,10 +13,6 @@ struct _GXTlut {}; -struct _GXColorS10 {}; - -struct _GXColor {}; - struct ResTIMG {}; struct JUtility { @@ -82,43 +78,6 @@ struct J2DPEBlock { /* 802F1840 */ void setGX(); }; -struct J2DAnmTexPattern { - /* 8030BEE8 */ void getTexNo(u16, u16*) const; - /* 8030BF9C */ void getResTIMG(u16) const; - /* 8030BFF0 */ void getPalette(u16) const; -}; - -struct J2DAnmTevRegKey { - /* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const; - /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const; -}; - -struct J2DAnmTextureSRTKey { - /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const; -}; - -struct J2DAnmColor { - /* 802EB390 */ void getColor(u16, _GXColor*) const; -}; - -struct J2DMaterial { - struct J2DMaterialAnmPointer { - /* 802EA79C */ J2DMaterialAnmPointer(); - }; - - /* 802EA1AC */ J2DMaterial(); - /* 802EA2CC */ ~J2DMaterial(); - /* 802EA38C */ void setGX(); - /* 802EA410 */ void createTevBlock(int, bool); - /* 802EA5C4 */ void createIndBlock(int, bool); - /* 802EA84C */ void makeAnmPointer(); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); - /* 802EAC78 */ void animation(); -}; - struct J2DIndTexOrder { /* 802EB378 */ J2DIndTexOrder(); }; diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index 418be8b670..c866eeae07 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -11,145 +11,10 @@ // Types: // -struct _GXCullMode {}; - -struct ResTIMG {}; - -struct ResFONT {}; - -struct JSUInputStream { - /* 802DC298 */ void read(void*, s32); -}; - -struct JKRArchive {}; - struct JUTResReference { /* 802DE078 */ void getResource(JSUInputStream*, u32, JKRArchive*); }; -struct JSUStreamSeekFrom {}; - -struct JSURandomInputStream { - /* 802DC370 */ void align(s32); - /* 802DC458 */ void peek(void*, s32); - /* 802DC4DC */ void seek(s32, JSUStreamSeekFrom); -}; - -struct JSUPtrLink { - /* 802DBDFC */ JSUPtrLink(void*); - /* 802DBE14 */ ~JSUPtrLink(); -}; - -struct JSUPtrList { - /* 802DBEAC */ ~JSUPtrList(); - /* 802DBF14 */ void initiate(); - /* 802DBF4C */ void append(JSUPtrLink*); - /* 802DC094 */ void insert(JSUPtrLink*, JSUPtrLink*); -}; - -struct JGeometry { - template <typename A1> - struct TBox2 {}; - /* TBox2<f32> */ - struct TBox2__template0 {}; -}; - -struct J2DScreen { - static u8 mDataManage[4 + 4 /* padding */]; -}; - -struct J2DRotateAxis {}; - -struct J2DAnmVisibilityFull {}; - -struct J2DAnmBase {}; - -struct J2DAnmTexPattern {}; - -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; - -struct J2DGrafContext { - /* 802E8E20 */ void setScissor(); - /* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&); -}; - -struct J2DBasePosition {}; - -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmVtxColor {}; - -struct J2DAnmTransform {}; - -struct J2DPane { - /* 80053BC0 */ void calcMtx(); - /* 80053C00 */ void makeMatrix(f32, f32); - /* 802F7540 */ void makeMatrix(f32, f32, f32, f32); - /* 80053C3C */ s32 getTypeID() const; - /* 80256018 */ void setAnimation(J2DAnmVtxColor*); - /* 8025601C */ void setAnimation(J2DAnmVisibilityFull*); - /* 80256020 */ void setAnimation(J2DAnmTexPattern*); - /* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802F7FC4 */ void setAnimation(J2DAnmTransform*); - /* 80126350 */ void setAnimation(J2DAnmTevRegKey*); - /* 80126354 */ void setAnimation(J2DAnmColor*); - /* 802F7EF4 */ void setAnimation(J2DAnmBase*); - /* 802F5E88 */ J2DPane(u64, JGeometry::TBox2<f32> const&); - /* 802F5F9C */ J2DPane(J2DPane*, JSURandomInputStream*, u8); - /* 802F5BF8 */ J2DPane(); - /* 802F5D40 */ J2DPane(J2DPane*, bool, u64, JGeometry::TBox2<f32> const&); - /* 802F5CB8 */ void initiate(); - /* 802F5F08 */ void initialize(u64, JGeometry::TBox2<f32> const&); - /* 802F5DD0 */ void initialize(J2DPane*, bool, u64, JGeometry::TBox2<f32> const&); - /* 802F60C4 */ void makePaneStream(J2DPane*, JSURandomInputStream*); - /* 802F63F8 */ void changeUseTrans(J2DPane*); - /* 802F658C */ ~J2DPane(); - /* 802F666C */ void appendChild(J2DPane*); - /* 802F6714 */ void insertChild(J2DPane*, J2DPane*); - /* 802F67E0 */ void draw(f32, f32, J2DGrafContext const*, bool, bool); - /* 802F6D18 */ void place(JGeometry::TBox2<f32> const&); - /* 802F6F60 */ void move(f32, f32); - /* 802F6FB4 */ void add(f32, f32); - /* 802F6FF8 */ void resize(f32, f32); - /* 802F7100 */ void getBounds(); - /* 802F720C */ void rotate(f32); - /* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32); - /* 802F7264 */ void clip(JGeometry::TBox2<f32> const&); - /* 802F72E0 */ void search(u64); - /* 802F7388 */ void searchUserInfo(u64); - /* 802F7430 */ void isUsed(ResTIMG const*); - /* 802F74B8 */ void isUsed(ResFONT const*); - /* 802F7680 */ void setCullBack(_GXCullMode); - /* 802F8428 */ void setCullBack(bool); - /* 802F76F8 */ void setBasePosition(J2DBasePosition); - /* 802F77D0 */ void setInfluencedAlpha(bool, bool); - /* 802F79A8 */ void getGlbVtx(u8) const; - /* 802F7A8C */ void getFirstChildPane(); - /* 802F7AC4 */ void getNextChildPane(); - /* 802F7AFC */ void getParentPane(); - /* 802F7B18 */ void makePaneExStream(J2DPane*, JSURandomInputStream*); - /* 802F7D00 */ void J2DCast_F32_to_S16(f32, u8); - /* 802F7DB8 */ void getPointer(JSURandomInputStream*, u32, JKRArchive*); - /* 802F8080 */ void animationTransform(J2DAnmTransform const*); - /* 802F7FCC */ void animationTransform(); - /* 802F8004 */ void clearAnmTransform(); - /* 802F8118 */ void setVisibileAnimation(J2DAnmVisibilityFull*); - /* 802F81A0 */ void setVtxColorAnimation(J2DAnmVtxColor*); - /* 802F8228 */ void animationPane(J2DAnmTransform const*); - /* 802F82C0 */ void updateTransform(J2DAnmTransform const*); - /* 802F83C8 */ void drawSelf(f32, f32, f32 (*)[3][4]); - /* 802F8478 */ void drawSelf(f32, f32); - /* 802F83CC */ void rewriteAlpha(); - /* 802F83D0 */ void setAnimationVF(J2DAnmVisibilityFull*); - /* 802F83FC */ void setAnimationVC(J2DAnmVtxColor*); - /* 802F8464 */ void setConnectParent(bool); - /* 802F8474 */ void update(); - - static f32 static_mBounds[4]; -}; - struct J2DOrthoGraph { /* 802E987C */ void scissorBounds(JGeometry::TBox2<f32>*, JGeometry::TBox2<f32> const*); }; @@ -248,12 +113,6 @@ extern "C" void setScissor__14J2DGrafContextFv(); extern "C" void func_802E90C0(); extern "C" void func_802E987C(); extern "C" void get__13J2DDataManageFP14JSUInputStream(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXRotRad(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXTransApply(); -extern "C" void PSMTXScaleApply(); extern "C" void GXSetCullMode(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -335,28 +194,38 @@ SECTION_SDATA2 static u8 lit_1469[4] = { }; /* 802F5BF8-802F5CB8 2F0538 00C0+00 0/0 10/10 0/0 .text __ct__7J2DPaneFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DPane::J2DPane() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/__ct__7J2DPaneFv.s" +J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { + mTransform = NULL; + id = 'PAN1'; + mVisible = true; + mInfoTag = 0; + mUserInfoTag = 0; + mBounds.set(FLOAT_LABEL(lit_1469), FLOAT_LABEL(lit_1469), FLOAT_LABEL(lit_1469), + FLOAT_LABEL(lit_1469)); + initiate(); + changeUseTrans(NULL); + calcMtx(); } -#pragma pop /* ############################################################################################## */ /* 804561F4-804561F8 0047F4 0004+00 3/3 0/0 0/0 .sdata2 @1489 */ SECTION_SDATA2 static f32 lit_1489 = 1.0f; /* 802F5CB8-802F5D40 2F05F8 0088+00 3/3 0/0 0/0 .text initiate__7J2DPaneFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::initiate() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/initiate__7J2DPaneFv.s" +void J2DPane::initiate() { + _4 = -1; + mRotateOffsetY = mRotateOffsetX = mRotateZ = mRotateY = mRotateX = FLOAT_LABEL(lit_1469); + mBasePosition = 0; + mRotAxis = ROTATE_Z; + mScaleY = mScaleX = lit_1489; + mCullMode = GX_CULL_NONE; + mAlpha = 0xFF; + mIsInfluencedAlpha = true; + mColorAlpha = 0xFF; + mConnected = false; + + calcMtx(); } -#pragma pop /* 802F5D40-802F5DD0 2F0680 0090+00 0/0 1/1 0/0 .text * __ct__7J2DPaneFP7J2DPanebUxRCQ29JGeometry8TBox2<f> */ @@ -394,6 +263,18 @@ asm J2DPane::J2DPane(u64 param_0, JGeometry::TBox2<f32> const& param_1) { /* 802F5F08-802F5F9C 2F0848 0094+00 1/1 0/0 0/0 .text * initialize__7J2DPaneFUxRCQ29JGeometry8TBox2<f> */ +#ifdef NONMATCHING // templating..... again +void J2DPane::initialize(u64 tag, const TBox2<f32>& dim) { + id = 'PAN1'; + mVisible = true; + mInfoTag = tag; + mUserInfoTag = tag; + mBounds.set(dim); + initiate(); + changeUseTrans(NULL); + calcMtx(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -402,6 +283,7 @@ asm void J2DPane::initialize(u64 param_0, JGeometry::TBox2<f32> const& param_1) #include "asm/JSystem/J2DGraph/J2DPane/func_802F5F08.s" } #pragma pop +#endif /* 802F5F9C-802F60C4 2F08DC 0128+00 0/0 1/1 0/0 .text * __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc */ @@ -451,31 +333,56 @@ asm void J2DPane::changeUseTrans(J2DPane* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DPane::~J2DPane() { +// asm J2DPane::~J2DPane() { +extern "C" asm void __dt__7J2DPaneFv() { nofralloc #include "asm/JSystem/J2DGraph/J2DPane/__dt__7J2DPaneFv.s" } #pragma pop /* 802F666C-802F6714 2F0FAC 00A8+00 0/0 2/2 0/0 .text appendChild__7J2DPaneFP7J2DPane */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::appendChild(J2DPane* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/appendChild__7J2DPaneFP7J2DPane.s" +bool J2DPane::appendChild(J2DPane* pChild) { + if (pChild == NULL) + return false; + + const J2DPane* parent = pChild->getParentPane(); + bool result = mPaneTree.appendChild(&pChild->mPaneTree); + + if (result && parent == NULL) { + pChild->add(mBounds.i.x, mBounds.i.y); + pChild->calcMtx(); + } + + return result; } -#pragma pop /* 802F6714-802F67E0 2F1054 00CC+00 0/0 1/1 0/0 .text insertChild__7J2DPaneFP7J2DPaneP7J2DPane */ +#ifdef NONMATCHING +bool J2DPane::insertChild(J2DPane* before, J2DPane* child) { + if (child == NULL) + return false; + + const J2DPane* parent = child->getParentPane(); + + bool result = mPaneTree.insertChild(&before->mPaneTree, &child->mPaneTree); + + if (result && parent == NULL) { + child->add(mBounds.i.x, mBounds.i.y); + child->calcMtx(); + } + + return result; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPane::insertChild(J2DPane* param_0, J2DPane* param_1) { +asm bool J2DPane::insertChild(J2DPane* param_0, J2DPane* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DPane/insertChild__7J2DPaneFP7J2DPaneP7J2DPane.s" } #pragma pop +#endif /* 802F67E0-802F6D18 2F1120 0538+00 0/0 1/1 0/0 .text draw__7J2DPaneFffPC14J2DGrafContextbb */ #pragma push @@ -499,6 +406,11 @@ asm void J2DPane::place(JGeometry::TBox2<f32> const& param_0) { #pragma pop /* 802F6F60-802F6FB4 2F18A0 0054+00 1/0 7/0 0/0 .text move__7J2DPaneFff */ +#ifdef NONMATCHING +void J2DPane::move(f32 x, f32 y) { + place(TBox2<f32>(x, y, x + getWidth(), y + getHeight())); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -507,18 +419,32 @@ asm void J2DPane::move(f32 param_0, f32 param_1) { #include "asm/JSystem/J2DGraph/J2DPane/move__7J2DPaneFff.s" } #pragma pop +#endif /* 802F6FB4-802F6FF8 2F18F4 0044+00 1/0 7/0 0/0 .text add__7J2DPaneFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::add(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/add__7J2DPaneFff.s" +void J2DPane::add(f32 x, f32 y) { + mTranslateX += x; + mTranslateY += y; + calcMtx(); } -#pragma pop /* 802F6FF8-802F7100 2F1938 0108+00 1/0 5/2 0/0 .text resize__7J2DPaneFff */ +#ifdef NONMATCHING +void J2DPane::resize(f32 x, f32 y) { + TBox2<f32> box = mBounds; + + box.addPos(TVec2<f32>(mTranslateX, mTranslateY)); + + const J2DPane* parent = getParentPane(); + if (parent != NULL) { + box.addPos(TVec2<f32>(-parent->mBounds.i.x, -parent->mBounds.i.y)); + } + + box.f.x = box.i.x + x; + box.f.y = box.i.y + y; + place(box); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -527,40 +453,56 @@ asm void J2DPane::resize(f32 param_0, f32 param_1) { #include "asm/JSystem/J2DGraph/J2DPane/resize__7J2DPaneFff.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804349B0-804349C0 0616D0 0010+00 2/2 0/0 0/0 .bss static_mBounds__7J2DPane */ f32 J2DPane::static_mBounds[4]; /* 802F7100-802F71DC 2F1A40 00DC+00 0/0 25/25 1/1 .text getBounds__7J2DPaneFv */ +#ifdef NONMATCHING // close ish +TBox2<f32>& J2DPane::getBounds() { + lbl_804349B0 = mBounds; + lbl_804349B0.addPos(TVec2<f32>(mTranslateX, mTranslateY)); + + const J2DPane* parent = getParentPane(); + if (parent != NULL) { + lbl_804349B0.addPos(TVec2<f32>(-parent->mBounds.i.x, -parent->mBounds.i.y)); + } + + return lbl_804349B0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPane::getBounds() { +asm JGeometry::TBox2<f32>& J2DPane::getBounds() { nofralloc #include "asm/JSystem/J2DGraph/J2DPane/getBounds__7J2DPaneFv.s" } #pragma pop +#endif /* 802F71DC-802F720C 2F1B1C 0030+00 0/0 12/12 0/0 .text rotate__7J2DPaneFff13J2DRotateAxisf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::rotate(f32 param_0, f32 param_1, J2DRotateAxis param_2, f32 param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/rotate__7J2DPaneFff13J2DRotateAxisf.s" +void J2DPane::rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle) { + mRotateOffsetX = offsetX; + mRotateOffsetY = offsetY; + mRotAxis = axis; + rotate(angle); } -#pragma pop /* 802F720C-802F7264 2F1B4C 0058+00 1/1 0/0 0/0 .text rotate__7J2DPaneFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::rotate(f32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/rotate__7J2DPaneFf.s" +void J2DPane::rotate(f32 angle) { + if (mRotAxis == ROTATE_X) { + mRotateX = angle; + } else if (mRotAxis == ROTATE_Y) { + mRotateY = angle; + } else { + mRotateZ = angle; + } + + calcMtx(); } -#pragma pop /* 802F7264-802F72E0 2F1BA4 007C+00 0/0 2/2 0/0 .text clip__7J2DPaneFRCQ29JGeometry8TBox2<f> */ #pragma push @@ -573,44 +515,54 @@ asm void J2DPane::clip(JGeometry::TBox2<f32> const& param_0) { #pragma pop /* 802F72E0-802F7388 2F1C20 00A8+00 1/0 7/1 0/0 .text search__7J2DPaneFUx */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::search(u64 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/search__7J2DPaneFUx.s" +const J2DPane* J2DPane::search(u64 tag) { + if (tag == mInfoTag) { + return this; + } + + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + if (const J2DPane* result = iter.getObject()->search(tag)) { + return result; + } + } + return NULL; } -#pragma pop /* 802F7388-802F7430 2F1CC8 00A8+00 1/0 7/1 0/0 .text searchUserInfo__7J2DPaneFUx */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::searchUserInfo(u64 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/searchUserInfo__7J2DPaneFUx.s" +const J2DPane* J2DPane::searchUserInfo(u64 tag) { + if (tag == mUserInfoTag) { + return this; + } + + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + if (const J2DPane* result = iter.getObject()->searchUserInfo(tag)) { + return result; + } + } + return NULL; } -#pragma pop /* 802F7430-802F74B8 2F1D70 0088+00 1/0 7/7 0/0 .text isUsed__7J2DPaneFPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::isUsed(ResTIMG const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/isUsed__7J2DPaneFPC7ResTIMG.s" +bool J2DPane::isUsed(const ResTIMG* timg) { + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + if (iter.getObject()->isUsed(timg)) + return true; + } + return false; } -#pragma pop /* 802F74B8-802F7540 2F1DF8 0088+00 1/0 7/7 0/0 .text isUsed__7J2DPaneFPC7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::isUsed(ResFONT const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/isUsed__7J2DPaneFPC7ResFONT.s" +bool J2DPane::isUsed(const ResFONT* font) { + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + if (iter.getObject()->isUsed(font)) + return true; + } + return false; } -#pragma pop /* ############################################################################################## */ /* 8045620C-80456210 00480C 0004+00 1/1 0/0 0/0 .sdata2 @2466 */ @@ -628,25 +580,42 @@ asm void J2DPane::makeMatrix(f32 param_0, f32 param_1, f32 param_2, f32 param_3) /* 802F7680-802F76F8 2F1FC0 0078+00 1/0 7/3 0/0 .text setCullBack__7J2DPaneF11_GXCullMode */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setCullBack(_GXCullMode param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setCullBack__7J2DPaneF11_GXCullMode.s" +void J2DPane::setCullBack(_GXCullMode mode) { + mCullMode = mode; + + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + iter.getObject()->setCullBack(mode); + } } -#pragma pop /* 802F76F8-802F77D0 2F2038 00D8+00 0/0 8/8 0/0 .text setBasePosition__7J2DPaneF15J2DBasePosition */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setBasePosition(J2DBasePosition param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setBasePosition__7J2DPaneF15J2DBasePosition.s" +void J2DPane::setBasePosition(J2DBasePosition position) { + mBasePosition = position; + mRotAxis = ROTATE_Z; + + mRotateOffsetX = FLOAT_LABEL(lit_1469); + + if (position % 3 == 1) { + f32 width = getWidth(); + mRotateOffsetX = width * lit_1725; + } else if (position % 3 == 2) { + f32 width = getWidth(); + mRotateOffsetX = width; + } + + mRotateOffsetY = FLOAT_LABEL(lit_1469); + if (position / 3 == 1) { + f32 height = getHeight(); + mRotateOffsetY = height * lit_1725; + } else if (position / 3 == 2) { + f32 height = getHeight(); + mRotateOffsetY = height; + } + + calcMtx(); } -#pragma pop /* ############################################################################################## */ /* 80456210-80456214 004810 0004+00 1/1 0/0 0/0 .sdata2 @2547 */ @@ -673,34 +642,39 @@ asm void J2DPane::getGlbVtx(u8 param_0) const { #pragma pop /* 802F7A8C-802F7AC4 2F23CC 0038+00 1/1 15/15 0/0 .text getFirstChildPane__7J2DPaneFv */ +#ifdef NONMATCHING // probably an issue with JSUTree +const J2DPane* J2DPane::getFirstChildPane() { + if (!getFirstChild()) + return NULL; + + return getFirstChild()->getObject(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPane::getFirstChildPane() { +asm const J2DPane* J2DPane::getFirstChildPane() { nofralloc #include "asm/JSystem/J2DGraph/J2DPane/getFirstChildPane__7J2DPaneFv.s" } #pragma pop +#endif /* 802F7AC4-802F7AFC 2F2404 0038+00 1/1 8/8 0/0 .text getNextChildPane__7J2DPaneFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::getNextChildPane() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/getNextChildPane__7J2DPaneFv.s" +const J2DPane* J2DPane::getNextChildPane() { + if (getPaneTree()->getNextChild() == NULL) + return NULL; + + return getPaneTree()->getNextChild()->getObject(); } -#pragma pop /* 802F7AFC-802F7B18 2F243C 001C+00 6/6 11/11 0/0 .text getParentPane__7J2DPaneFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::getParentPane() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/getParentPane__7J2DPaneFv.s" +const J2DPane* J2DPane::getParentPane() { + if (getPaneTree()->getParent() == NULL) + return NULL; + + return getPaneTree()->getParent()->getObject(); } -#pragma pop /* 802F7B18-802F7D00 2F2458 01E8+00 1/1 6/6 0/0 .text * makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream */ @@ -714,27 +688,92 @@ asm void J2DPane::makePaneExStream(J2DPane* param_0, JSURandomInputStream* param #pragma pop /* 802F7D00-802F7DB8 2F2640 00B8+00 0/0 1/1 0/0 .text J2DCast_F32_to_S16__7J2DPaneFfUc */ +#ifdef NONMATCHING // not happening +s16 J2DPane::J2DCast_F32_to_S16(f32 value, u8 arg2) { + f32 temp; + s32 temp2; + s16 result; + + if (arg2 < 0xf) { + temp = value; + if (temp < lbl_804561F0) + temp = -value; + + temp2 = value; + + if (temp2 < 0x8000) { + if (value >= lbl_804561F0) { + result = temp2; + } else { + result = ~temp2 + 1; + } + } else { + if (value >= lbl_804561F0) { + result = 0x7fff; + } else { + result = -0x8000; + } + } + } else { + result = 0; + } + + return result; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPane::J2DCast_F32_to_S16(f32 param_0, u8 param_1) { +asm s16 J2DPane::J2DCast_F32_to_S16(f32 param_0, u8 param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DPane/J2DCast_F32_to_S16__7J2DPaneFfUc.s" } #pragma pop +#endif /* 802F7DB8-802F7EF4 2F26F8 013C+00 0/0 3/3 0/0 .text * getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPane::getPointer(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { +asm void* J2DPane::getPointer(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DPane/getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive.s" } #pragma pop /* 802F7EF4-802F7FC4 2F2834 00D0+00 2/0 7/4 0/0 .text setAnimation__7J2DPaneFP10J2DAnmBase */ +#ifdef NONMATCHING // matching in diff.py, what gives? +void J2DPane::setAnimation(J2DAnmBase* anm) { + if (anm != NULL) { + switch (anm->getKind()) { + default: + break; + case 0: + setAnimation(static_cast<J2DAnmTransform*>(anm)); + break; + case 1: + setAnimation(static_cast<J2DAnmColor*>(anm)); + break; + case 2: + setAnimation(static_cast<J2DAnmVtxColor*>(anm)); + break; + case 4: + setAnimation(static_cast<J2DAnmTextureSRTKey*>(anm)); + break; + case 5: + setAnimation(static_cast<J2DAnmTexPattern*>(anm)); + break; + case 6: + setAnimation(static_cast<J2DAnmVisibilityFull*>(anm)); + break; + case 7: + setAnimation(static_cast<J2DAnmTevRegKey*>(anm)); + break; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -743,75 +782,83 @@ asm void J2DPane::setAnimation(J2DAnmBase* param_0) { #include "asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP10J2DAnmBase.s" } #pragma pop +#endif /* 802F7FC4-802F7FCC -00001 0008+00 0/0 0/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTransform */ -void J2DPane::setAnimation(J2DAnmTransform* param_0) { - *(u32*)(((u8*)this) + 248) /* this->field_0xf8 */ = (u32)(param_0); +void J2DPane::setAnimation(J2DAnmTransform* anm) { + mTransform = anm; } /* 802F7FCC-802F8004 2F290C 0038+00 0/0 57/57 0/0 .text animationTransform__7J2DPaneFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::animationTransform() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/animationTransform__7J2DPaneFv.s" +void J2DPane::animationTransform() { + if (mTransform != NULL) + animationTransform(mTransform); } -#pragma pop /* 802F8004-802F8080 2F2944 007C+00 1/0 7/1 0/0 .text clearAnmTransform__7J2DPaneFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::clearAnmTransform() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/clearAnmTransform__7J2DPaneFv.s" +void J2DPane::clearAnmTransform() { + J2DAnmTransform* none = NULL; + setAnimation(none); + + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + iter.getObject()->clearAnmTransform(); + } } -#pragma pop /* 802F8080-802F8118 2F29C0 0098+00 1/0 7/0 0/0 .text * animationTransform__7J2DPaneFPC15J2DAnmTransform */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::animationTransform(J2DAnmTransform const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/animationTransform__7J2DPaneFPC15J2DAnmTransform.s" +const J2DAnmTransform* J2DPane::animationTransform(const J2DAnmTransform* transform) { + const J2DAnmTransform* p = transform; + if (mTransform != NULL) + p = mTransform; + + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + iter.getObject()->animationTransform(p); + } + + updateTransform(p); + return p; } -#pragma pop /* 802F8118-802F81A0 2F2A58 0088+00 1/0 8/1 0/0 .text * setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setVisibileAnimation(J2DAnmVisibilityFull* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull.s" +void J2DPane::setVisibileAnimation(J2DAnmVisibilityFull* visibility) { + setAnimationVF(visibility); + + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + iter.getObject()->setVisibileAnimation(visibility); + } } -#pragma pop /* 802F81A0-802F8228 2F2AE0 0088+00 1/0 8/1 0/0 .text * setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setVtxColorAnimation(J2DAnmVtxColor* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor.s" +void J2DPane::setVtxColorAnimation(J2DAnmVtxColor* vtx_color) { + setAnimationVC(vtx_color); + + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + iter.getObject()->setVtxColorAnimation(vtx_color); + } } -#pragma pop /* 802F8228-802F82C0 2F2B68 0098+00 1/0 7/3 0/0 .text animationPane__7J2DPaneFPC15J2DAnmTransform */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::animationPane(J2DAnmTransform const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/animationPane__7J2DPaneFPC15J2DAnmTransform.s" +const J2DAnmTransform* J2DPane::animationPane(const J2DAnmTransform* transform) { + const J2DAnmTransform* p = transform; + if (mTransform != NULL) + p = mTransform; + + JSUTreeIterator<J2DPane> iter; + for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { + iter.getObject()->animationPane(p); + } + + updateTransform(p); + return p; } -#pragma pop /* ############################################################################################## */ /* 80456214-80456218 004814 0004+00 1/1 0/0 0/0 .sdata2 @2890 */ @@ -847,45 +894,33 @@ void J2DPane::rewriteAlpha() { /* 802F83D0-802F83FC 2F2D10 002C+00 1/0 6/0 0/0 .text * setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setAnimationVF(J2DAnmVisibilityFull* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull.s" +void J2DPane::setAnimationVF(J2DAnmVisibilityFull* visibility) { + setAnimation(visibility); } -#pragma pop /* 802F83FC-802F8428 2F2D3C 002C+00 1/0 6/0 0/0 .text setAnimationVC__7J2DPaneFP14J2DAnmVtxColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setAnimationVC(J2DAnmVtxColor* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setAnimationVC__7J2DPaneFP14J2DAnmVtxColor.s" +void J2DPane::setAnimationVC(J2DAnmVtxColor* vtx_color) { + setAnimation(vtx_color); } -#pragma pop /* 802F8428-802F8464 2F2D68 003C+00 1/0 4/0 0/0 .text setCullBack__7J2DPaneFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setCullBack(bool param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setCullBack__7J2DPaneFb.s" +void J2DPane::setCullBack(bool cull) { + GXCullMode mode; + + if (!cull) + mode = GX_CULL_NONE; + else + mode = GX_CULL_BACK; + + setCullBack(mode); } -#pragma pop /* 802F8464-802F8474 2F2DA4 0010+00 1/0 5/0 0/0 .text setConnectParent__7J2DPaneFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setConnectParent(bool param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setConnectParent__7J2DPaneFb.s" +bool J2DPane::setConnectParent(bool connected) { + mConnected = false; + return false; } -#pragma pop /* 802F8474-802F8478 2F2DB4 0004+00 1/0 7/0 0/0 .text update__7J2DPaneFv */ void J2DPane::update() { diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp index 0d4d12982a..ede225ac4f 100644 --- a/libs/JSystem/J2DGraph/J2DPicture.cpp +++ b/libs/JSystem/J2DGraph/J2DPicture.cpp @@ -8,207 +8,6 @@ #include "dolphin/types.h" // -// Types: -// - -struct _GXTlut {}; - -struct _GXTexMapID {}; - -struct _GXCullMode {}; - -struct ResTLUT {}; - -struct ResTIMG {}; - -struct ResFONT {}; - -struct JUtility { - struct TColor { - /* 80193960 */ TColor(); - }; -}; - -struct JUTPalette { - /* 802DE890 */ void storeTLUT(_GXTlut, ResTLUT*); -}; - -struct JUTTexture { - /* 802DE234 */ ~JUTTexture(); - /* 802DE480 */ void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut); - /* 802DE2A8 */ void storeTIMG(ResTIMG const*, u8); - /* 802DE44C */ void storeTIMG(ResTIMG const*, JUTPalette*); - /* 802DE5B0 */ void attachPalette(JUTPalette*); - /* 802DE840 */ void load(_GXTexMapID); -}; - -struct JSUStreamSeekFrom {}; - -struct JSURandomInputStream { - /* 802DC458 */ void peek(void*, s32); - /* 802DC4DC */ void seek(s32, JSUStreamSeekFrom); -}; - -struct JSUInputStream { - /* 802DC298 */ void read(void*, s32); -}; - -struct JKRArchive {}; - -struct JGeometry { - template <typename A1> - struct TBox2 {}; - /* TBox2<f32> */ - struct TBox2__template0 {}; - - template <typename A1> - struct TVec2 {}; - /* TVec2<s16> */ - struct TVec2__template0 { - /* 802FF204 */ void func_802FF204(void* _this); - }; -}; - -struct J2DScreen { - /* 802F9640 */ void getNameResource(char const*); -}; - -struct J2DMirror {}; - -struct J2DAnmTexPattern {}; - -struct J2DAnmVisibilityFull {}; - -struct J2DAnmBase {}; - -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; - -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmTransform {}; - -struct J2DAnmVtxColor {}; - -struct J2DPane { - /* 80053BC0 */ void calcMtx(); - /* 80053C00 */ void makeMatrix(f32, f32); - /* 802F7540 */ void makeMatrix(f32, f32, f32, f32); - /* 80256018 */ void setAnimation(J2DAnmVtxColor*); - /* 8025601C */ void setAnimation(J2DAnmVisibilityFull*); - /* 80256020 */ void setAnimation(J2DAnmTexPattern*); - /* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*); - /* 80126350 */ void setAnimation(J2DAnmTevRegKey*); - /* 80126354 */ void setAnimation(J2DAnmColor*); - /* 802F7EF4 */ void setAnimation(J2DAnmBase*); - /* 802F5E88 */ J2DPane(u64, JGeometry::TBox2<f32> const&); - /* 802F5BF8 */ J2DPane(); - /* 802F60C4 */ void makePaneStream(J2DPane*, JSURandomInputStream*); - /* 802F658C */ ~J2DPane(); - /* 802F6D18 */ void place(JGeometry::TBox2<f32> const&); - /* 802F6F60 */ void move(f32, f32); - /* 802F6FB4 */ void add(f32, f32); - /* 802F6FF8 */ void resize(f32, f32); - /* 802F72E0 */ void search(u64); - /* 802F7388 */ void searchUserInfo(u64); - /* 802F7430 */ void isUsed(ResTIMG const*); - /* 802F74B8 */ void isUsed(ResFONT const*); - /* 802F7680 */ void setCullBack(_GXCullMode); - /* 802F8428 */ void setCullBack(bool); - /* 802F7B18 */ void makePaneExStream(J2DPane*, JSURandomInputStream*); - /* 802F7D00 */ void J2DCast_F32_to_S16(f32, u8); - /* 802F7DB8 */ void getPointer(JSURandomInputStream*, u32, JKRArchive*); - /* 802F8004 */ void clearAnmTransform(); - /* 802F8080 */ void animationTransform(J2DAnmTransform const*); - /* 802F8118 */ void setVisibileAnimation(J2DAnmVisibilityFull*); - /* 802F81A0 */ void setVtxColorAnimation(J2DAnmVtxColor*); - /* 802F8228 */ void animationPane(J2DAnmTransform const*); - /* 802F83D0 */ void setAnimationVF(J2DAnmVisibilityFull*); - /* 802F83FC */ void setAnimationVC(J2DAnmVtxColor*); - /* 802F8464 */ void setConnectParent(bool); - /* 802F8474 */ void update(); -}; - -struct J2DMaterial {}; - -struct J2DBinding {}; - -struct J2DPicture { - /* 800202CC */ void setBlendRatio(f32, f32); - /* 802FF208 */ void append(JUTTexture*, f32); - /* 802FF238 */ void append(ResTIMG const*, JUTPalette*, f32); - /* 80020338 */ void append(char const*, f32); - /* 801BDD40 */ void append(ResTIMG const*, f32); - /* 802FF2F0 */ void append(char const*, JUTPalette*, f32); - /* 802FD524 */ void insert(JUTTexture*, u8, f32); - /* 802FD4B4 */ void insert(char const*, JUTPalette*, u8, f32); - /* 802FD168 */ void insert(ResTIMG const*, JUTPalette*, u8, f32); - /* 80020368 */ void insert(char const*, u8, f32); - /* 801BDD70 */ void insert(ResTIMG const*, u8, f32); - /* 800539DC */ void getTexture(u8) const; - /* 80053C44 */ void setWhite(JUtility::TColor); - /* 80053C6C */ void setBlack(JUtility::TColor); - /* 8018BEE0 */ void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 801DFA40 */ void getWhite() const; - /* 801DFA4C */ void getBlack() const; - /* 8025603C */ bool getMaterial() const; - /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*); - /* 802FC708 */ J2DPicture(ResTIMG const*); - /* 802FC118 */ J2DPicture(J2DPane*, JSURandomInputStream*, JKRArchive*); - /* 802FC050 */ J2DPicture(); - /* 802FC1D4 */ J2DPicture(J2DPane*, JSURandomInputStream*, J2DMaterial*); - /* 802FC8E8 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*); - /* 802FCCDC */ void initiate(ResTIMG const*, ResTLUT const*); - /* 802FCD70 */ void private_initiate(ResTIMG const*, ResTLUT const*); - /* 802FCE9C */ void initinfo(); - /* 802FCFF0 */ ~J2DPicture(); - /* 802FD098 */ void prepareTexture(u8); - /* 802FF410 */ void remove(); - /* 802FD814 */ void remove(JUTTexture*); - /* 802FD6F4 */ void remove(u8); - /* 802FD9BC */ void changeTexture(ResTIMG const*, u8, JUTPalette*); - /* 802FDAC8 */ void changeTexture(char const*, u8, JUTPalette*); - /* 802FD964 */ void changeTexture(char const*, u8); - /* 802FD874 */ void changeTexture(ResTIMG const*, u8); - /* 802FDB90 */ void drawSelf(f32, f32, f32 (*)[3][4]); - /* 802FDB28 */ void drawSelf(f32, f32); - /* 802FDBFC */ void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]); - /* 802FF448 */ void draw(f32, f32, u8, bool, bool, bool); - /* 802FF4E0 */ void draw(f32, f32, bool, bool, bool); - /* 802FDC70 */ void draw(f32, f32, f32, f32, bool, bool, bool); - /* 802FDF88 */ void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&); - /* 802FF588 */ void drawOut(f32, f32, f32, f32, f32, f32); - /* 802FF524 */ void drawOut(f32, f32, f32, f32, f32, f32, f32, f32); - /* 802FE380 */ void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16, s16, - f32 (*)[3][4]); - /* 802FE5D0 */ void setTevMode(); - /* 802FEA60 */ void swap(f32&, f32&); - /* 802FEA74 */ void setBlendColorRatio(f32, f32); - /* 802FEA9C */ void setBlendAlphaRatio(f32, f32); - /* 802FEAC4 */ void setBlendKonstColor(); - /* 802FEB94 */ void setBlendKonstAlpha(); - /* 802FEC64 */ void getNewColor(JUtility::TColor*); - /* 802FED84 */ void setTexCoord(JGeometry::TVec2<s16>*, JUTTexture const*, J2DBinding, - J2DMirror, bool); - /* 802FED44 */ void setTexCoord(JUTTexture const*, J2DBinding, J2DMirror, bool); - /* 802FF09C */ void isUsed(ResTIMG const*); - /* 802FF63C */ void isUsed(ResFONT const*); - /* 802FF100 */ void getUsableTlut(u8); - /* 802FF1D0 */ void getTlutID(ResTIMG const*, u8); - /* 802FF29C */ void load(_GXTexMapID, u8); - /* 802FF268 */ void load(u8); - /* 802FF2E8 */ s32 getTypeID() const; - /* 802FF380 */ void prepend(char const*, f32); - /* 802FF320 */ void prepend(JUTTexture*, f32); - /* 802FF3B0 */ void prepend(ResTIMG const*, JUTPalette*, f32); - /* 802FF350 */ void prepend(char const*, JUTPalette*, f32); - /* 802FF3E0 */ void prepend(ResTIMG const*, f32); - /* 802FF634 */ void getTextureCount() const; - /* 802FF65C */ void rewriteAlpha(); -}; - -// // Forward References: // @@ -339,30 +138,13 @@ extern "C" void setCullBack__7J2DPaneFb(); extern "C" void setConnectParent__7J2DPaneFb(); extern "C" void update__7J2DPaneFv(); extern "C" void getNameResource__9J2DScreenFPCc(); -extern "C" void PSMTXIdentity(); -extern "C" void PSMTXConcat(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXBegin(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); extern "C" void GXSetNumIndStages(); extern "C" void GXSetTevDirect(); -extern "C" void GXSetTevOp(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); extern "C" void GXSetTevKColor(); extern "C" void GXSetTevKColorSel(); extern "C" void GXSetTevKAlphaSel(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetBlendMode(); extern "C" void GXLoadPosMtxImm(); extern "C" void GXSetCurrentMtx(); extern "C" void __construct_array(); @@ -476,6 +258,19 @@ SECTION_DATA extern void* __vt__10J2DPicture[83 + 1 /* padding */] = { }; /* 802FC050-802FC118 2F6990 00C8+00 0/0 2/2 0/0 .text __ct__10J2DPictureFv */ +#ifdef NONMATCHING +J2DPicture::J2DPicture() + : field_0x10a(), field_0x12c(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(), + field_0x14c() { + for (int i = 0; i < 2; i++) { + mTexture[i] = NULL; + } + + field_0x109 = 0; + mTextureCount = 0; + initinfo(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -484,6 +279,7 @@ asm J2DPicture::J2DPicture() { #include "asm/JSystem/J2DGraph/J2DPicture/__ct__10J2DPictureFv.s" } #pragma pop +#endif /* 802FC118-802FC1D4 2F6A58 00BC+00 0/0 1/1 0/0 .text * __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */ @@ -584,6 +380,18 @@ asm void J2DPicture::private_initiate(ResTIMG const* param_0, ResTLUT const* par #pragma pop /* 802FCE9C-802FCFF0 2F77DC 0154+00 3/3 0/0 0/0 .text initinfo__10J2DPictureFv */ +// matches with real literal +#ifdef NONMATCHING +void J2DPicture::initinfo() { + id = 'PIC1'; + setTexCoord(NULL, BIND15, MIRROR0, false); + setBlendRatio(lit_1767, lit_1767); + + mBlack = 0; + mWhite = -1; + setCornerColor(-1, -1, -1, -1); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -592,26 +400,37 @@ asm void J2DPicture::initinfo() { #include "asm/JSystem/J2DGraph/J2DPicture/initinfo__10J2DPictureFv.s" } #pragma pop +#endif /* 802FCFF0-802FD098 2F7930 00A8+00 1/0 3/3 0/0 .text __dt__10J2DPictureFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DPicture::~J2DPicture() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/__dt__10J2DPictureFv.s" +J2DPicture::~J2DPicture() { + for (int i = 0; i < 2; i++) { + if ((int)(field_0x109 & 1 << i) != 0) { + delete mTexture[i]; + } + } + delete field_0x12c; } -#pragma pop /* 802FD098-802FD168 2F79D8 00D0+00 1/0 0/0 0/0 .text prepareTexture__10J2DPictureFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::prepareTexture(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/prepareTexture__10J2DPictureFUc.s" +bool J2DPicture::prepareTexture(u8 param_0) { + for (u8 i = 0; i < param_0; i++) { + if (i >= 2) { + return 0; + } + + if (mTexture[i] == NULL) { + JUTTexture* tmp = new JUTTexture(); + mTexture[i] = tmp; + + if (mTexture[i] == NULL) { + return 0; + } + field_0x109 |= (1 << i); + } + } + return 1; } -#pragma pop /* 802FD168-802FD4B4 2F7AA8 034C+00 1/0 0/0 0/0 .text * insert__10J2DPictureFPC7ResTIMGP10JUTPaletteUcf */ @@ -625,14 +444,10 @@ asm void J2DPicture::insert(ResTIMG const* param_0, JUTPalette* param_1, u8 para #pragma pop /* 802FD4B4-802FD524 2F7DF4 0070+00 1/0 0/0 0/0 .text insert__10J2DPictureFPCcP10JUTPaletteUcf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::insert(char const* param_0, JUTPalette* param_1, u8 param_2, f32 param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/insert__10J2DPictureFPCcP10JUTPaletteUcf.s" +void 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); } -#pragma pop /* 802FD524-802FD6F4 2F7E64 01D0+00 1/0 0/0 0/0 .text insert__10J2DPictureFP10JUTTextureUcf */ #pragma push @@ -648,7 +463,7 @@ asm void J2DPicture::insert(JUTTexture* param_0, u8 param_1, f32 param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPicture::remove(u8 param_0) { +asm int J2DPicture::remove(u8 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFUc.s" } @@ -656,14 +471,15 @@ asm void J2DPicture::remove(u8 param_0) { /* 802FD814-802FD874 2F8154 0060+00 1/0 0/0 0/0 .text remove__10J2DPictureFP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::remove(JUTTexture* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFP10JUTTexture.s" +void J2DPicture::remove(JUTTexture* param_0) { + u8 i = 0; + for (; i < mTextureCount; i++) { + if (mTexture[i] == param_0) { + break; + } + } + remove(i); } -#pragma pop /* 802FD874-802FD964 2F81B4 00F0+00 1/0 0/0 0/0 .text changeTexture__10J2DPictureFPC7ResTIMGUc */ #pragma push @@ -677,14 +493,10 @@ 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 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::changeTexture(char const* param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPCcUc.s" +void J2DPicture::changeTexture(char const* param_0, u8 param_1) { + void* resource = J2DScreen::getNameResource(param_0); + changeTexture((ResTIMG*)resource, param_1); } -#pragma pop /* 802FD9BC-802FDAC8 2F82FC 010C+00 1/0 0/0 0/0 .text * changeTexture__10J2DPictureFPC7ResTIMGUcP10JUTPalette */ @@ -699,46 +511,36 @@ 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 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::changeTexture(char const* param_0, u8 param_1, JUTPalette* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/changeTexture__10J2DPictureFPCcUcP10JUTPalette.s" +void 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); } -#pragma pop /* 802FDB28-802FDB90 2F8468 0068+00 1/0 1/0 0/0 .text drawSelf__10J2DPictureFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::drawSelf(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/drawSelf__10J2DPictureFff.s" +void J2DPicture::drawSelf(f32 param_0, f32 param_1) { + Mtx tmp; + PSMTXIdentity(tmp); + + drawSelf(param_0, param_1, &tmp); } -#pragma pop /* 802FDB90-802FDBFC 2F84D0 006C+00 1/0 0/0 0/0 .text drawSelf__10J2DPictureFffPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/drawSelf__10J2DPictureFffPA3_A4_f.s" +void J2DPicture::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { + if (mTexture[0] != NULL && mTextureCount != 0) { + drawFullSet(mGlobalBounds.i.x + param_0, mGlobalBounds.i.y + param_1, + mBounds.f.x - mBounds.i.x, mBounds.f.y - mBounds.i.y, param_2); + } } -#pragma pop /* 802FDBFC-802FDC70 2F853C 0074+00 1/0 0/0 0/0 .text drawFullSet__10J2DPictureFffffPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_3, - f32 (*param_4)[3][4]) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/drawFullSet__10J2DPictureFffffPA3_A4_f.s" +void J2DPicture::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_3, Mtx* param_4) { + if (mTexture[0] != NULL && mTextureCount != 0) { + 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 /* 802FDC70-802FDF88 2F85B0 0318+00 1/0 1/1 0/0 .text draw__10J2DPictureFffffbbb */ #pragma push @@ -787,36 +589,27 @@ asm void J2DPicture::setTevMode() { #pragma pop /* 802FEA60-802FEA74 2F93A0 0014+00 1/1 0/0 0/0 .text swap__10J2DPictureFRfRf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::swap(f32& param_0, f32& param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/swap__10J2DPictureFRfRf.s" +void J2DPicture::swap(f32& lhs, f32& rhs) { + f32 tmp = lhs; + lhs = rhs; + rhs = tmp; } -#pragma pop /* 802FEA74-802FEA9C 2F93B4 0028+00 1/0 0/0 0/0 .text setBlendColorRatio__10J2DPictureFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::setBlendColorRatio(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/setBlendColorRatio__10J2DPictureFff.s" +void J2DPicture::setBlendColorRatio(f32 param_0, f32 param_1) { + field_0x11c[0] = param_0; + field_0x11c[1] = param_1; + setBlendKonstColor(); } -#pragma pop /* 802FEA9C-802FEAC4 2F93DC 0028+00 1/0 0/0 0/0 .text setBlendAlphaRatio__10J2DPictureFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::setBlendAlphaRatio(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/setBlendAlphaRatio__10J2DPictureFff.s" +void J2DPicture::setBlendAlphaRatio(f32 param_0, f32 param_1) { + field_0x11c[2] = param_0; + field_0x11c[3] = param_1; + setBlendKonstAlpha(); } -#pragma pop /* ############################################################################################## */ /* 80456278-8045627C 004878 0004+00 2/2 0/0 0/0 .sdata2 @2758 */ @@ -824,6 +617,25 @@ SECTION_SDATA2 static f32 lit_2758 = 255.0f; /* 802FEAC4-802FEB94 2F9404 00D0+00 4/4 0/0 0/0 .text setBlendKonstColor__10J2DPictureFv */ +// matches with real literals +#ifdef NONMATCHING +void J2DPicture::setBlendKonstColor() { + int uvar3 = 0; + for (u8 i = 1; i < mTextureCount; i++) { + f32 tmp = 0.0f; + for (u8 j = 0; j < i; j++) { + tmp += field_0x11c[j]; + } + + f32 tmp2 = tmp + field_0x11c[i]; + if (tmp2 != 0.0f) { + // probably fake match but idk whats happening here + uvar3 |= (u8)(255.0f * (1.0f - tmp / tmp2)) << (i - 1) * 8; + } + } + field_0x148 = uvar3; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -832,6 +644,7 @@ asm void J2DPicture::setBlendKonstColor() { #include "asm/JSystem/J2DGraph/J2DPicture/setBlendKonstColor__10J2DPictureFv.s" } #pragma pop +#endif /* 802FEB94-802FEC64 2F94D4 00D0+00 4/4 0/0 0/0 .text setBlendKonstAlpha__10J2DPictureFv */ @@ -857,15 +670,10 @@ asm void J2DPicture::getNewColor(JUtility::TColor* param_0) { /* 802FED44-802FED84 2F9684 0040+00 4/4 0/0 0/0 .text * setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::setTexCoord(JUTTexture const* param_0, J2DBinding param_1, J2DMirror param_2, - bool param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb.s" +void J2DPicture::setTexCoord(JUTTexture const* param_0, J2DBinding param_1, J2DMirror param_2, + bool param_3) { + setTexCoord(&field_0x10a[0], param_0, param_1, param_2, param_3); } -#pragma pop /* ############################################################################################## */ /* 8045627C-80456280 00487C 0004+00 1/1 0/0 0/0 .sdata2 @2933 */ @@ -884,14 +692,15 @@ asm void J2DPicture::setTexCoord(JGeometry::TVec2<s16>* param_0, JUTTexture cons #pragma pop /* 802FF09C-802FF100 2F99DC 0064+00 1/0 0/0 0/0 .text isUsed__10J2DPictureFPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::isUsed(ResTIMG const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/isUsed__10J2DPictureFPC7ResTIMG.s" +bool J2DPicture::isUsed(ResTIMG const* param_0) { + for (u8 i = 0; i < mTextureCount; i++) { + if (mTexture[i] != NULL && mTexture[i]->getTexInfo() == param_0) { + return true; + } + } + + return J2DPane::isUsed(param_0); } -#pragma pop /* 802FF100-802FF1D0 2F9A40 00D0+00 1/0 0/0 0/0 .text getUsableTlut__10J2DPictureFUc */ #pragma push @@ -907,7 +716,7 @@ asm void J2DPicture::getUsableTlut(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPicture::getTlutID(ResTIMG const* param_0, u8 param_1) { +asm u8 J2DPicture::getTlutID(ResTIMG const* param_0, u8 param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DPicture/getTlutID__10J2DPictureFPC7ResTIMGUc.s" } @@ -920,46 +729,28 @@ extern "C" void func_802FF204(void* _this) { /* 802FF208-802FF238 2F9B48 0030+00 1/0 0/0 0/0 .text append__10J2DPictureFP10JUTTexturef */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::append(JUTTexture* param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFP10JUTTexturef.s" +void J2DPicture::append(JUTTexture* param_0, f32 param_1) { + insert(param_0, mTextureCount, param_1); } -#pragma pop /* 802FF238-802FF268 2F9B78 0030+00 1/0 0/0 0/0 .text * append__10J2DPictureFPC7ResTIMGP10JUTPalettef */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFPC7ResTIMGP10JUTPalettef.s" +void J2DPicture::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) { + insert(param_0, param_1, mTextureCount, param_2); } -#pragma pop /* 802FF268-802FF29C 2F9BA8 0034+00 1/0 0/0 0/0 .text load__10J2DPictureFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::load(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/load__10J2DPictureFUc.s" +void J2DPicture::load(u8 param_0) { + load((_GXTexMapID)param_0, param_0); } -#pragma pop /* 802FF29C-802FF2E8 2F9BDC 004C+00 1/0 0/0 0/0 .text load__10J2DPictureF11_GXTexMapIDUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::load(_GXTexMapID param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/load__10J2DPictureF11_GXTexMapIDUc.s" +void J2DPicture::load(_GXTexMapID param_0, u8 param_1) { + if (param_1 < mTextureCount && param_1 < 2 && mTexture[param_1] != NULL) { + mTexture[param_1]->load(param_0); + } } -#pragma pop /* 802FF2E8-802FF2F0 2F9C28 0008+00 1/0 1/0 0/0 .text getTypeID__10J2DPictureCFv */ s32 J2DPicture::getTypeID() const { @@ -967,76 +758,41 @@ s32 J2DPicture::getTypeID() const { } /* 802FF2F0-802FF320 2F9C30 0030+00 1/0 0/0 0/0 .text append__10J2DPictureFPCcP10JUTPalettef */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::append(char const* param_0, JUTPalette* param_1, f32 param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/append__10J2DPictureFPCcP10JUTPalettef.s" +void J2DPicture::append(char const* param_0, JUTPalette* param_1, f32 param_2) { + insert(param_0, param_1, mTextureCount, param_2); } -#pragma pop /* 802FF320-802FF350 2F9C60 0030+00 1/0 0/0 0/0 .text prepend__10J2DPictureFP10JUTTexturef */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::prepend(JUTTexture* param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFP10JUTTexturef.s" +void J2DPicture::prepend(JUTTexture* param_0, f32 param_1) { + insert(param_0, 0, param_1); } -#pragma pop /* 802FF350-802FF380 2F9C90 0030+00 1/0 0/0 0/0 .text prepend__10J2DPictureFPCcP10JUTPalettef */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::prepend(char const* param_0, JUTPalette* param_1, f32 param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPCcP10JUTPalettef.s" +void J2DPicture::prepend(char const* param_0, JUTPalette* param_1, f32 param_2) { + insert(param_0, param_1, 0, param_2); } -#pragma pop /* 802FF380-802FF3B0 2F9CC0 0030+00 1/0 0/0 0/0 .text prepend__10J2DPictureFPCcf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::prepend(char const* param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPCcf.s" +void J2DPicture::prepend(char const* param_0, f32 param_1) { + insert(param_0, 0, param_1); } -#pragma pop /* 802FF3B0-802FF3E0 2F9CF0 0030+00 1/0 0/0 0/0 .text * prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::prepend(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef.s" +void J2DPicture::prepend(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) { + insert(param_0, param_1, 0, param_2); } -#pragma pop /* 802FF3E0-802FF410 2F9D20 0030+00 1/0 0/0 0/0 .text prepend__10J2DPictureFPC7ResTIMGf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::prepend(ResTIMG const* param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/prepend__10J2DPictureFPC7ResTIMGf.s" +void J2DPicture::prepend(ResTIMG const* param_0, f32 param_1) { + insert(param_0, 0, param_1); } -#pragma pop /* 802FF410-802FF448 2F9D50 0038+00 1/0 0/0 0/0 .text remove__10J2DPictureFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::remove() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/remove__10J2DPictureFv.s" +int J2DPicture::remove() { + return remove(mTextureCount - 1); } -#pragma pop /* 802FF448-802FF4E0 2F9D88 0098+00 1/0 0/0 0/0 .text draw__10J2DPictureFffUcbbb */ #pragma push @@ -1082,24 +838,14 @@ asm void J2DPicture::drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3, #pragma pop /* 802FF634-802FF63C 2F9F74 0008+00 1/0 0/0 0/0 .text getTextureCount__10J2DPictureCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::getTextureCount() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/getTextureCount__10J2DPictureCFv.s" +u8 J2DPicture::getTextureCount() const { + return mTextureCount; } -#pragma pop /* 802FF63C-802FF65C 2F9F7C 0020+00 1/0 0/0 0/0 .text isUsed__10J2DPictureFPC7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPicture::isUsed(ResFONT const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPicture/isUsed__10J2DPictureFPC7ResFONT.s" +bool J2DPicture::isUsed(ResFONT const* param_0) { + return J2DPane::isUsed(param_0); } -#pragma pop /* 802FF65C-802FF660 2F9F9C 0004+00 1/0 0/0 0/0 .text rewriteAlpha__10J2DPictureFv */ void J2DPicture::rewriteAlpha() { diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index 84132bea69..bdb965a63f 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -11,103 +11,10 @@ // Types: // -struct _GXCullMode {}; - -struct ResTIMG {}; - -struct ResNTAB {}; - -struct ResFONT {}; - -struct JUTNameTab { - /* 802DE9E0 */ JUTNameTab(ResNTAB const*); -}; - -struct JSUStreamSeekFrom {}; - -struct JSURandomInputStream { - /* 802DC458 */ void peek(void*, s32); - /* 802DC4DC */ void seek(s32, JSUStreamSeekFrom); -}; - struct JSUMemoryInputStream { /* 802DC520 */ void setBuffer(void const*, s32); }; -struct JSUInputStream { - /* 802DC23C */ ~JSUInputStream(); - /* 802DC298 */ void read(void*, s32); -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRArchive {}; - -struct JGeometry { - template <typename A1> - struct TBox2 {}; - /* TBox2<f32> */ - struct TBox2__template0 {}; -}; - -struct J2DAnmVisibilityFull {}; - -struct J2DAnmBase {}; - -struct J2DGrafContext {}; - -struct J2DAnmTransform {}; - -struct J2DAnmVtxColor {}; - -struct J2DPane { - /* 80053C00 */ void makeMatrix(f32, f32); - /* 802F7540 */ void makeMatrix(f32, f32, f32, f32); - /* 802F5F9C */ J2DPane(J2DPane*, JSURandomInputStream*, u8); - /* 802F5D40 */ J2DPane(J2DPane*, bool, u64, JGeometry::TBox2<f32> const&); - /* 802F658C */ ~J2DPane(); - /* 802F67E0 */ void draw(f32, f32, J2DGrafContext const*, bool, bool); - /* 802F6D18 */ void place(JGeometry::TBox2<f32> const&); - /* 802F6F60 */ void move(f32, f32); - /* 802F6FB4 */ void add(f32, f32); - /* 802F6FF8 */ void resize(f32, f32); - /* 802F72E0 */ void search(u64); - /* 802F7388 */ void searchUserInfo(u64); - /* 802F7430 */ void isUsed(ResTIMG const*); - /* 802F74B8 */ void isUsed(ResFONT const*); - /* 802F7680 */ void setCullBack(_GXCullMode); - /* 802F8428 */ void setCullBack(bool); - /* 802F7EF4 */ void setAnimation(J2DAnmBase*); - /* 802F8080 */ void animationTransform(J2DAnmTransform const*); - /* 802F8118 */ void setVisibileAnimation(J2DAnmVisibilityFull*); - /* 802F81A0 */ void setVtxColorAnimation(J2DAnmVtxColor*); - /* 802F8228 */ void animationPane(J2DAnmTransform const*); - /* 802F83CC */ void rewriteAlpha(); - /* 802F8464 */ void setConnectParent(bool); - /* 802F8474 */ void update(); - /* 802F8478 */ void drawSelf(f32, f32); -}; - -struct J2DAnmTexPattern {}; - -struct J2DAnmTevRegKey {}; - -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmColor {}; - -struct J2DMaterial { - /* 802EA1AC */ J2DMaterial(); - /* 802EA2CC */ ~J2DMaterial(); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); - /* 802EAC78 */ void animation(); -}; - struct J2DWindowEx { /* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); }; @@ -126,50 +33,6 @@ struct J2DTextBox { /* 802FF75C */ J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); }; -struct J2DScrnBlockHeader {}; - -struct J2DScreen { - /* 80053BA0 */ void clearAnmTransform(); - /* 802F9704 */ void setAnimation(J2DAnmColor*); - /* 80192414 */ void setAnimation(J2DAnmTransform*); - /* 802F9798 */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802F99A8 */ void setAnimation(J2DAnmVtxColor*); - /* 802F9838 */ void setAnimation(J2DAnmTexPattern*); - /* 802F99C8 */ void setAnimation(J2DAnmVisibilityFull*); - /* 802F98CC */ void setAnimation(J2DAnmTevRegKey*); - /* 802F9A54 */ void setAnimation(J2DAnmBase*); - /* 802F8498 */ J2DScreen(); - /* 802F8540 */ ~J2DScreen(); - /* 802F85A8 */ void clean(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8748 */ void setPriority(JSURandomInputStream*, u32, JKRArchive*); - /* 802F8778 */ void private_set(JSURandomInputStream*, u32, JKRArchive*); - /* 802F8834 */ void checkSignature(JSURandomInputStream*); - /* 802F8894 */ void getScreenInformation(JSURandomInputStream*); - /* 802F8990 */ void makeHierarchyPanes(J2DPane*, JSURandomInputStream*, u32, JKRArchive*); - /* 802F8B98 */ void createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, J2DPane*, u32, - JKRArchive*); - /* 802F99E8 */ void createPane(J2DScrnBlockHeader const&, JSURandomInputStream*, J2DPane*, u32); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F90A0 */ void search(u64); - /* 802F90E0 */ void searchUserInfo(u64); - /* 802F9120 */ void drawSelf(f32, f32, f32 (*)[3][4]); - /* 802F9280 */ void getResReference(JSURandomInputStream*, u32); - /* 802F937C */ void createMaterial(JSURandomInputStream*, u32, JKRArchive*); - /* 802F9600 */ void isUsed(ResTIMG const*); - /* 802F9620 */ void isUsed(ResFONT const*); - /* 802F9640 */ void getNameResource(char const*); - /* 802F9690 */ void animation(); - /* 802F9A18 */ s32 getTypeID() const; - /* 802F9A20 */ void calcMtx(); - /* 802F9A74 */ void setAnimationVF(J2DAnmVisibilityFull*); - /* 802F9A78 */ void setAnimationVC(J2DAnmVtxColor*); - - static u8 mDataManage[4 + 4 /* padding */]; -}; - -struct J2DResReference {}; - struct J2DPictureEx { /* 803036EC */ J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); }; @@ -192,10 +55,6 @@ struct J2DMaterialFactory { JKRArchive*) const; }; -struct J2DDataManage { - /* 8030CE18 */ void get(char const*); -}; - // // Forward References: // @@ -301,19 +160,9 @@ extern "C" void __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMate extern "C" void __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial(); extern "C" void __ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial(); extern "C" void get__13J2DDataManageFPCc(); -extern "C" void GXSetVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXBegin(); -extern "C" void GXSetCullMode(); -extern "C" void GXSetChanCtrl(); extern "C" void GXSetNumIndStages(); extern "C" void GXSetTevDirect(); -extern "C" void GXSetTevOp(); extern "C" void GXSetTevSwapModeTable(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetBlendMode(); extern "C" void GXSetScissor(); extern "C" void GXGetScissor(); extern "C" void __destroy_new_array(); @@ -416,21 +265,31 @@ asm J2DScreen::J2DScreen() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DScreen::~J2DScreen() { +// asm J2DScreen::~J2DScreen() { +extern "C" asm void __dt__9J2DScreenFv() { nofralloc #include "asm/JSystem/J2DGraph/J2DScreen/__dt__9J2DScreenFv.s" } #pragma pop /* 802F85A8-802F8648 2F2EE8 00A0+00 3/3 0/0 0/0 .text clean__9J2DScreenFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::clean() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/clean__9J2DScreenFv.s" +void J2DScreen::clean() { + delete[] mMaterials; + mMaterialNum = 0; + mMaterials = NULL; + + delete[] field_0x108; + field_0x108 = NULL; + + delete[] field_0x10c; + field_0x10c = NULL; + + if (mNameTable != NULL) { + delete[] mNameTable->getResNameTable(); + delete mNameTable; + mNameTable = NULL; + } } -#pragma pop /* 802F8648-802F8748 2F2F88 0100+00 0/0 58/58 4/4 .text setPriority__9J2DScreenFPCcUlP10JKRArchive */ @@ -445,21 +304,20 @@ asm void J2DScreen::setPriority(char const* param_0, u32 param_1, JKRArchive* pa /* 802F8748-802F8778 2F3088 0030+00 1/1 1/1 0/0 .text * setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::setPriority(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s" +bool J2DScreen::setPriority(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { + if (param_2 == NULL) { + return false; + } else { + return private_set(param_0, param_1, param_2); + } } -#pragma pop /* 802F8778-802F8834 2F30B8 00BC+00 1/1 0/0 0/0 .text * private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DScreen::private_set(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { +asm bool J2DScreen::private_set(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DScreen/private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s" } @@ -467,14 +325,27 @@ asm void J2DScreen::private_set(JSURandomInputStream* param_0, u32 param_1, JKRA /* 802F8834-802F8894 2F3174 0060+00 1/1 0/0 0/0 .text * checkSignature__9J2DScreenFP20JSURandomInputStream */ +#ifdef NONMATCHING +bool J2DScreen::checkSignature(JSURandomInputStream* param_0) { + int tag; + param_0->read(&tag, 32); + + if (tag == 'SCRN' && (tag2 == 'blo1' || tag2 == 'blo2')) { + return true; + } else { + return false; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DScreen::checkSignature(JSURandomInputStream* param_0) { +asm bool J2DScreen::checkSignature(JSURandomInputStream* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DScreen/checkSignature__9J2DScreenFP20JSURandomInputStream.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80456230-80456238 004830 0008+00 1/1 0/0 0/0 .sdata2 @1705 */ @@ -536,7 +407,7 @@ asm void J2DScreen::draw(f32 param_0, f32 param_1, J2DGrafContext const* param_2 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DScreen::search(u64 param_0) { +asm const J2DPane* J2DScreen::search(u64 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DScreen/search__9J2DScreenFUx.s" } @@ -546,7 +417,7 @@ asm void J2DScreen::search(u64 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DScreen::searchUserInfo(u64 param_0) { +asm const J2DPane* J2DScreen::searchUserInfo(u64 param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DScreen/searchUserInfo__9J2DScreenFUx.s" } @@ -586,34 +457,24 @@ asm void J2DScreen::createMaterial(JSURandomInputStream* param_0, u32 param_1, #pragma pop /* 802F9600-802F9620 2F3F40 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::isUsed(ResTIMG const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResTIMG.s" +bool J2DScreen::isUsed(ResTIMG const* param_0) { + return J2DPane::isUsed(param_0); } -#pragma pop /* 802F9620-802F9640 2F3F60 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::isUsed(ResFONT const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/isUsed__9J2DScreenFPC7ResFONT.s" +bool J2DScreen::isUsed(ResFONT const* param_0) { + return J2DPane::isUsed(param_0); } -#pragma pop /* ############################################################################################## */ /* 80451590-80451598 000A90 0004+04 1/1 3/3 0/0 .sbss mDataManage__9J2DScreen */ -u8 J2DScreen::mDataManage[4 + 4 /* padding */]; +J2DDataManage* J2DScreen::mDataManage; /* 802F9640-802F9690 2F3F80 0050+00 0/0 6/6 0/0 .text getNameResource__9J2DScreenFPCc */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DScreen::getNameResource(char const* param_0) { +asm void* J2DScreen::getNameResource(char const* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DScreen/getNameResource__9J2DScreenFPCc.s" } @@ -674,37 +535,22 @@ asm void J2DScreen::setAnimation(J2DAnmTevRegKey* param_0) { /* 802F99A8-802F99C8 2F42E8 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP14J2DAnmVtxColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::setAnimation(J2DAnmVtxColor* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP14J2DAnmVtxColor.s" +void J2DScreen::setAnimation(J2DAnmVtxColor* param_0) { + J2DPane::setVtxColorAnimation(param_0); } -#pragma pop /* 802F99C8-802F99E8 2F4308 0020+00 1/0 0/0 0/0 .text * setAnimation__9J2DScreenFP20J2DAnmVisibilityFull */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::setAnimation(J2DAnmVisibilityFull* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP20J2DAnmVisibilityFull.s" +void J2DScreen::setAnimation(J2DAnmVisibilityFull* param_0) { + J2DPane::setVisibileAnimation(param_0); } -#pragma pop /* 802F99E8-802F9A18 2F4328 0030+00 1/0 0/0 0/0 .text * createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::createPane(J2DScrnBlockHeader const& param_0, JSURandomInputStream* param_1, - J2DPane* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl.s" +void J2DScreen::createPane(J2DScrnBlockHeader const& param_0, JSURandomInputStream* param_1, + J2DPane* param_2, u32 param_3) { + createPane(param_0, param_1, param_2, param_3, NULL); } -#pragma pop /* 802F9A18-802F9A20 2F4358 0008+00 1/0 0/0 0/0 .text getTypeID__9J2DScreenCFv */ s32 J2DScreen::getTypeID() const { @@ -712,24 +558,14 @@ s32 J2DScreen::getTypeID() const { } /* 802F9A20-802F9A54 2F4360 0034+00 1/0 0/0 0/0 .text calcMtx__9J2DScreenFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::calcMtx() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/calcMtx__9J2DScreenFv.s" +void J2DScreen::calcMtx() { + makeMatrix(mTranslateX, mTranslateY); } -#pragma pop /* 802F9A54-802F9A74 2F4394 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP10J2DAnmBase */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DScreen::setAnimation(J2DAnmBase* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP10J2DAnmBase.s" +void J2DScreen::setAnimation(J2DAnmBase* param_0) { + J2DPane::setAnimation(param_0); } -#pragma pop /* 802F9A74-802F9A78 2F43B4 0004+00 1/0 0/0 0/0 .text * setAnimationVF__9J2DScreenFP20J2DAnmVisibilityFull */ diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index 26c004387e..bd7e7dfe77 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -6,140 +6,12 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "msl_c/string.h" // // Types: // -struct _GXCullMode {}; - -struct ResTIMG {}; - -struct ResFONT {}; - -struct JUtility { - struct TColor {}; -}; - -struct JKRHeap {}; - -struct JUTResFont { - /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*); -}; - -struct JUTFont {}; - -struct JSUStreamSeekFrom {}; - -struct JSURandomInputStream { - /* 802DC458 */ void peek(void*, s32); - /* 802DC4DC */ void seek(s32, JSUStreamSeekFrom); -}; - -struct JSUInputStream { - /* 802DC298 */ void read(void*, s32); -}; - -struct JKRArchive {}; - -struct JGeometry { - template <typename A1> - struct TBox2 {}; - /* TBox2<f32> */ - struct TBox2__template0 {}; -}; - -struct J2DTextBoxVBinding {}; - -struct J2DTextBoxHBinding {}; - -struct J2DAnmTexPattern {}; - -struct J2DAnmVisibilityFull {}; - -struct J2DAnmBase {}; - -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; - -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmTransform {}; - -struct J2DAnmVtxColor {}; - -struct J2DPane { - /* 80053BC0 */ void calcMtx(); - /* 80053C00 */ void makeMatrix(f32, f32); - /* 802F7540 */ void makeMatrix(f32, f32, f32, f32); - /* 80256018 */ void setAnimation(J2DAnmVtxColor*); - /* 8025601C */ void setAnimation(J2DAnmVisibilityFull*); - /* 80256020 */ void setAnimation(J2DAnmTexPattern*); - /* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*); - /* 80126350 */ void setAnimation(J2DAnmTevRegKey*); - /* 80126354 */ void setAnimation(J2DAnmColor*); - /* 802F7EF4 */ void setAnimation(J2DAnmBase*); - /* 802F5E88 */ J2DPane(u64, JGeometry::TBox2<f32> const&); - /* 802F5BF8 */ J2DPane(); - /* 802F60C4 */ void makePaneStream(J2DPane*, JSURandomInputStream*); - /* 802F658C */ ~J2DPane(); - /* 802F6F60 */ void move(f32, f32); - /* 802F6FB4 */ void add(f32, f32); - /* 802F6FF8 */ void resize(f32, f32); - /* 802F72E0 */ void search(u64); - /* 802F7388 */ void searchUserInfo(u64); - /* 802F7430 */ void isUsed(ResTIMG const*); - /* 802F74B8 */ void isUsed(ResFONT const*); - /* 802F7680 */ void setCullBack(_GXCullMode); - /* 802F8428 */ void setCullBack(bool); - /* 802F7B18 */ void makePaneExStream(J2DPane*, JSURandomInputStream*); - /* 802F7DB8 */ void getPointer(JSURandomInputStream*, u32, JKRArchive*); - /* 802F8004 */ void clearAnmTransform(); - /* 802F8080 */ void animationTransform(J2DAnmTransform const*); - /* 802F8118 */ void setVisibileAnimation(J2DAnmVisibilityFull*); - /* 802F81A0 */ void setVtxColorAnimation(J2DAnmVtxColor*); - /* 802F8228 */ void animationPane(J2DAnmTransform const*); - /* 802F83D0 */ void setAnimationVF(J2DAnmVisibilityFull*); - /* 802F83FC */ void setAnimationVC(J2DAnmVtxColor*); - /* 802F8474 */ void update(); -}; - -struct J2DMaterial {}; - -struct J2DTextBox { - /* 80186C84 */ void setWhite(JUtility::TColor); - /* 8019230C */ void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 801DFA28 */ void getWhite() const; - /* 801DFA34 */ void getBlack() const; - /* 8021C7F4 */ void getFont() const; - /* 80254408 */ void setBlack(JUtility::TColor); - /* 8025602C */ bool getMaterial() const; - /* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16, - J2DTextBoxHBinding, J2DTextBoxVBinding); - /* 802FF6D8 */ J2DTextBox(J2DPane*, JSURandomInputStream*, JKRArchive*); - /* 802FF75C */ J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); - /* 802FF660 */ J2DTextBox(); - /* 802FFC58 */ void initiate(ResFONT const*, char const*, s16, J2DTextBoxHBinding, - J2DTextBoxVBinding); - /* 802FFE88 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*); - /* 803001E0 */ ~J2DTextBox(); - /* 80300278 */ void setFont(JUTFont*); - /* 80300490 */ void draw(f32, f32, f32, J2DTextBoxHBinding); - /* 803002E8 */ void draw(f32, f32); - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); - /* 80300660 */ void setString(char const*, ...); - /* 80300870 */ void setConnectParent(bool); - /* 80300950 */ void drawSelf(f32, f32, f32 (*)[3][4]); - /* 803008E8 */ void drawSelf(f32, f32); - /* 80300AF8 */ void resize(f32, f32); - /* 80300C70 */ void isUsed(ResTIMG const*); - /* 80300BFC */ void isUsed(ResFONT const*); - /* 80300C68 */ s32 getTypeID() const; - /* 80300C90 */ void rewriteAlpha(); -}; - struct J2DPrint { /* 802F4394 */ J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor); @@ -237,10 +109,7 @@ extern "C" void setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull(); extern "C" void setAnimationVC__7J2DPaneFP14J2DAnmVtxColor(); extern "C" void setCullBack__7J2DPaneFb(); extern "C" void update__7J2DPaneFv(); -extern "C" void PSMTXIdentity(); -extern "C" void PSMTXConcat(); extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); extern "C" void GXSetNumIndStages(); extern "C" void GXSetTevDirect(); extern "C" void GXLoadPosMtxImm(); @@ -255,9 +124,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strncpy(); -extern "C" void strcpy(); -extern "C" void strlen(); // // Declarations: @@ -318,25 +184,17 @@ SECTION_DATA extern void* __vt__10J2DTextBox[47 + 1 /* padding */] = { }; /* 802FF660-802FF6D8 2F9FA0 0078+00 0/0 1/1 0/0 .text __ct__10J2DTextBoxFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTextBox::J2DTextBox() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFv.s" +J2DTextBox::J2DTextBox() + : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() { + initiate(NULL, 0, 0, HBIND_LEFT, VBIND_TOP); } -#pragma pop /* 802FF6D8-802FF75C 2FA018 0084+00 0/0 1/1 0/0 .text * __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, JKRArchive* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s" +J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, JKRArchive* param_2) + : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() { + private_readStream(param_0, param_1, param_2); } -#pragma pop /* ############################################################################################## */ /* 80456280-80456288 004880 0004+04 6/6 0/0 0/0 .sdata2 @1660 */ @@ -367,16 +225,13 @@ asm J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, u32 /* 802FFBC4-802FFC58 2FA504 0094+00 0/0 1/1 0/0 .text * __ct__10J2DTextBoxFUxRCQ29JGeometry8TBox2<f>PC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTextBox::J2DTextBox(u64 param_0, JGeometry::TBox2<f32> const& param_1, - ResFONT const* param_2, char const* param_3, s16 param_4, - J2DTextBoxHBinding param_5, J2DTextBoxVBinding param_6) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/func_802FFBC4.s" +J2DTextBox::J2DTextBox(u64 param_0, JGeometry::TBox2<f32> const& param_1, ResFONT const* param_2, + char const* param_3, s16 param_4, J2DTextBoxHBinding param_5, + J2DTextBoxVBinding param_6) + : J2DPane(param_0, param_1), mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), + mWhiteColor(), mBlackColor() { + initiate(param_2, param_3, param_4, param_5, param_6); } -#pragma pop /* 802FFC58-802FFE88 2FA598 0230+00 2/2 1/0 0/0 .text * initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding */ @@ -406,21 +261,23 @@ asm void J2DTextBox::private_readStream(J2DPane* param_0, JSURandomInputStream* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DTextBox::~J2DTextBox() { +// asm J2DTextBox::~J2DTextBox() { +extern "C" asm void __dt__10J2DTextBoxFv() { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBox/__dt__10J2DTextBoxFv.s" } #pragma pop /* 80300278-803002E8 2FABB8 0070+00 1/0 0/0 0/0 .text setFont__10J2DTextBoxFP7JUTFont */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::setFont(JUTFont* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/setFont__10J2DTextBoxFP7JUTFont.s" +void J2DTextBox::setFont(JUTFont* pFont) { + if (pFont) { + if (mTextFontOwned) { + delete mFont; + } + mFont = pFont; + mTextFontOwned = false; + } } -#pragma pop /* ############################################################################################## */ /* 803A1C58-803A1C58 02E2B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -451,54 +308,100 @@ asm void J2DTextBox::draw(f32 param_0, f32 param_1, f32 param_2, J2DTextBoxHBind #pragma pop /* 80300658-80300660 2FAF98 0008+00 0/0 62/62 2/2 .text getStringPtr__10J2DTextBoxCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::getStringPtr() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/getStringPtr__10J2DTextBoxCFv.s" +char* J2DTextBox::getStringPtr() const { + return mStringPtr; } -#pragma pop /* 80300660-8030074C 2FAFA0 00EC+00 0/0 6/6 0/0 .text setString__10J2DTextBoxFPCce */ +// missing block of instructions before delete[] +#ifdef NONMATCHING +s32 J2DTextBox::setString(char const* string, ...) { + delete[] mStringPtr; + + u32 len = strlen(string); + + if (len >= 0xFFFF) { + len = 0xFFFF - 1; + } + + mStringLength = 0; + char* tmp = new char[len + 1]; + mStringPtr = tmp; + + if (mStringPtr) { + mStringLength = len + 1; + strcpy(mStringPtr, string); + } + return len; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBox::setString(char const* param_0, ...) { +asm s32 J2DTextBox::setString(char const* param_0, ...) { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFPCce.s" } #pragma pop +#endif /* 8030074C-80300870 2FB08C 0124+00 0/0 41/41 2/2 .text setString__10J2DTextBoxFsPCce */ +#ifdef NONMATCHING +s32 J2DTextBox::setString(s16 param_0, char const* string, ...) { + delete[] mStringPtr; + mStringPtr = NULL; + + u32 len = strlen(string); + + if (param_0 == -1) { + if (len >= 0xFFFF) { + len = 0xFFFF - 1; + } + param_0 = len + 1; + } + + mStringLength = 0; + + if (param_0 != 0) { + char* tmp = new char[param_0]; + mStringPtr = tmp; + } + + if (mStringPtr) { + strncpy(mStringPtr, string, param_0 - 1); + mStringPtr[param_0 - 1] = 0; + mStringLength = param_0; + } + return len; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBox::setString(s16 param_0, char const* param_1, ...) { +asm s32 J2DTextBox::setString(s16 param_0, char const* param_1, ...) { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFsPCce.s" } #pragma pop +#endif /* 80300870-803008E8 2FB1B0 0078+00 1/0 1/0 0/0 .text setConnectParent__10J2DTextBoxFb */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBox::setConnectParent(bool param_0) { +asm bool J2DTextBox::setConnectParent(bool param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBox/setConnectParent__10J2DTextBoxFb.s" } #pragma pop /* 803008E8-80300950 2FB228 0068+00 1/0 1/0 0/0 .text drawSelf__10J2DTextBoxFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::drawSelf(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFff.s" +void J2DTextBox::drawSelf(f32 param_0, f32 param_1) { + Mtx tmp; + PSMTXIdentity(tmp); + + drawSelf(param_0, param_1, &tmp); } -#pragma pop /* ############################################################################################## */ /* 80456298-804562A0 004898 0004+04 1/1 0/0 0/0 .sdata2 @2049 */ @@ -533,7 +436,7 @@ asm void J2DTextBox::resize(f32 param_0, f32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBox::isUsed(ResFONT const* param_0) { +asm bool J2DTextBox::isUsed(ResFONT const* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResFONT.s" } @@ -545,14 +448,9 @@ s32 J2DTextBox::getTypeID() const { } /* 80300C70-80300C90 2FB5B0 0020+00 1/0 0/0 0/0 .text isUsed__10J2DTextBoxFPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::isUsed(ResTIMG const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResTIMG.s" +bool J2DTextBox::isUsed(ResTIMG const* param_0) { + return J2DPane::isUsed(param_0); } -#pragma pop /* 80300C90-80300C94 2FB5D0 0004+00 1/0 0/0 0/0 .text rewriteAlpha__10J2DTextBoxFv */ void J2DTextBox::rewriteAlpha() { diff --git a/libs/JSystem/JAudio2/JAISoundInfo.cpp b/libs/JSystem/JAudio2/JAISoundInfo.cpp index d23eb630b5..ce12f5c6c6 100644 --- a/libs/JSystem/JAudio2/JAISoundInfo.cpp +++ b/libs/JSystem/JAudio2/JAISoundInfo.cpp @@ -8,15 +8,6 @@ #include "dolphin/types.h" // -// Types: -// - -struct JAISoundInfo { - /* 802A2D34 */ JAISoundInfo(bool); - /* 802A2D50 */ ~JAISoundInfo(); -}; - -// // Forward References: // diff --git a/libs/JSystem/JAudio2/JASAudioReseter.cpp b/libs/JSystem/JAudio2/JASAudioReseter.cpp index 7a811aae21..ab89daf5d8 100644 --- a/libs/JSystem/JAudio2/JASAudioReseter.cpp +++ b/libs/JSystem/JAudio2/JASAudioReseter.cpp @@ -26,16 +26,6 @@ struct JASAudioThread { /* 8029CDC0 */ void stop(); }; -struct JASAudioReseter { - /* 8029D0B4 */ JASAudioReseter(); - /* 8029D0FC */ ~JASAudioReseter(); - /* 8029D138 */ void start(u32, bool); - /* 8029D1D4 */ void resume(); - /* 8029D1F8 */ void checkDone() const; - /* 8029D200 */ void calc(); - /* 8029D2D4 */ void callback(void*); -}; - // // Forward References: // diff --git a/libs/JSystem/JUtility/JUTFont.cpp b/libs/JSystem/JUtility/JUTFont.cpp index 6d3a9d433c..ba078e8ace 100644 --- a/libs/JSystem/JUtility/JUTFont.cpp +++ b/libs/JSystem/JUtility/JUTFont.cpp @@ -31,15 +31,15 @@ extern "C" extern void* __vt__7JUTFont[17]; /* 802DECF8-802DED24 2D9638 002C+00 0/0 2/2 0/0 .text __ct__7JUTFontFv */ JUTFont::JUTFont() : mColor1(), mColor2(), mColor3(), mColor4() { - unk4 = 0; + mValid = false; } /* 802DED24-802DED70 2D9664 004C+00 0/0 9/9 0/0 .text initialize_state__7JUTFontFv */ void JUTFont::initialize_state() { setCharColor(JUtility::TColor()); - unk5 = false; - unk8 = 0; - unk4 = false; + mFixed = false; + mFixedWidth = 0; + mValid = false; } /* 802DED70-802DEDC4 2D96B0 0054+00 1/1 3/3 0/0 .text setCharColor__7JUTFontFQ28JUtility6TColor */ diff --git a/libs/JSystem/JUtility/JUTPalette.cpp b/libs/JSystem/JUtility/JUTPalette.cpp index 4cb8693f04..6b1cd63333 100644 --- a/libs/JSystem/JUtility/JUTPalette.cpp +++ b/libs/JSystem/JUtility/JUTPalette.cpp @@ -1,93 +1,33 @@ -// -// Generated By: dol2asm -// Translation Unit: JUTPalette -// - #include "JSystem/JUtility/JUTPalette.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct _GXTlutFmt {}; - -struct _GXTlut {}; - -struct ResTLUT {}; - -struct JUTTransparency {}; - -struct JUTPalette { - /* 802DE890 */ void storeTLUT(_GXTlut, ResTLUT*); - /* 802DE91C */ void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*); - /* 802DE95C */ void load(); -}; - -// -// Forward References: -// - -extern "C" void storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT(); -extern "C" void storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv(); -extern "C" void load__10JUTPaletteFv(); -extern "C" extern char const* const JUTPalette__stringBase0; - -// -// External References: -// - -extern "C" void OSPanic(); -extern "C" void GXInitTlutObj(); -extern "C" void GXLoadTlut(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8039D360-8039D360 0299C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039D360 = "JUTPalette.cpp"; -SECTION_DEAD static char const* const stringBase_8039D36F = "JUTTexture: TLUT is NULL\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D389 = "\0\0\0\0\0\0"; -#pragma pop - -/* 802DE890-802DE91C 2D91D0 008C+00 0/0 8/8 0/0 .text storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTPalette::storeTLUT(_GXTlut param_0, ResTLUT* param_1) { - nofralloc -#include "asm/JSystem/JUtility/JUTPalette/storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT.s" +#include "dolphin/os/OS.h" + +void JUTPalette::storeTLUT(_GXTlut param_0, ResTLUT* tlut) { + if (tlut == NULL) { + OSPanic("JUTPalette.cpp", 35, "JUTTexture: TLUT is NULL\n"); + } + mTlutName = param_0; + mFormat = tlut->format; + mTransparency = tlut->transparency; + mNumColors = tlut->numColors; + mColorTable = tlut + 8; + GXInitTlutObj(&mTlutObj, (void*)mColorTable, (GXTlutFmt)mFormat, mNumColors); } -#pragma pop -/* 802DE91C-802DE95C 2D925C 0040+00 0/0 3/3 0/0 .text - * storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTPalette::storeTLUT(_GXTlut param_0, _GXTlutFmt param_1, JUTTransparency param_2, - u16 param_3, void* param_4) { - nofralloc -#include "asm/JSystem/JUtility/JUTPalette/storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv.s" +void JUTPalette::storeTLUT(_GXTlut param_0, _GXTlutFmt param_1, JUTTransparency param_2, + u16 param_3, void* param_4) { + mTlutName = param_0; + mFormat = param_1; + mTransparency = param_2; + mNumColors = param_3; + mColorTable = (ResTLUT*)param_4; + GXInitTlutObj(&mTlutObj, (void*)mColorTable, (GXTlutFmt)mFormat, mNumColors); } -#pragma pop -/* 802DE95C-802DE9A0 2D929C 0044+00 0/0 1/1 0/0 .text load__10JUTPaletteFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTPalette::load() { - nofralloc -#include "asm/JSystem/JUtility/JUTPalette/load__10JUTPaletteFv.s" -} -#pragma pop +bool JUTPalette::load() { + bool check = mNumColors != 0; + if (check) { + GXLoadTlut(&mTlutObj, mTlutName); + } -/* 8039D360-8039D360 0299C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ + return check; +} diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp index d662c33417..10c2614859 100644 --- a/libs/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/JUtility/JUTResFont.cpp @@ -8,62 +8,6 @@ #include "dolphin/types.h" // -// Types: -// - -struct _GXTexMapID {}; - -struct ResFONT {}; - -struct JUtility { - struct TColor {}; -}; - -struct JUTFont { - struct TWidth {}; - - /* 802DECF8 */ JUTFont(); - /* 802DED24 */ void initialize_state(); - /* 802E0108 */ bool isLeadByte_1Byte(int); - /* 802E0110 */ bool isLeadByte_2Byte(int); - /* 802E0118 */ void isLeadByte_ShiftJIS(int); -}; - -struct JKRHeap {}; - -struct JUTResFont { - /* 802DDFD8 */ void getResFont() const; - /* 802DDFE0 */ void getFontType() const; - /* 802DDFEC */ void getLeading() const; - /* 802DDFF8 */ void getWidth() const; - /* 802DE004 */ void getAscent() const; - /* 802DE010 */ void getDescent() const; - /* 802DE01C */ void getHeight() const; - /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*); - /* 802DEF48 */ JUTResFont(); - /* 802DF000 */ ~JUTResFont(); - /* 802DF08C */ void deleteMemBlocks_ResFont(); - /* 802DF0B0 */ void initialize_state(); - /* 802DF0DC */ void initiate(ResFONT const*, JKRHeap*); - /* 802DF13C */ void protected_initiate(ResFONT const*, JKRHeap*); - /* 802DF248 */ void countBlock(); - /* 802DF344 */ void setBlock(); - /* 802DF584 */ void setGX(JUtility::TColor, JUtility::TColor); - /* 802DF48C */ void setGX(); - /* 802DF7C4 */ void drawChar_scale(f32, f32, f32, f32, int, bool); - /* 802DFBE8 */ void loadFont(int, _GXTexMapID, JUTFont::TWidth*); - /* 802DFC64 */ void getWidthEntry(int, JUTFont::TWidth*) const; - /* 802DFD0C */ void getCellWidth() const; - /* 802DFD58 */ void getCellHeight() const; - /* 802DFDA4 */ void isLeadByte(int) const; - /* 802DFDD8 */ void getFontCode(int) const; - /* 802DFF60 */ void loadImage(int, _GXTexMapID); - /* 802E00C4 */ void convertSjis(int, u16*) const; - - static void* const saoAboutEncoding_[3]; -}; - -// // Forward References: // @@ -110,25 +54,7 @@ extern "C" void getHeight__10JUTResFontCFv(); extern "C" void __ct__7JUTFontFv(); extern "C" void initialize_state__7JUTFontFv(); extern "C" void JUTReportConsole(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXBegin(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); -extern "C" void GXSetTevOp(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetBlendMode(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); @@ -170,76 +96,107 @@ SECTION_DATA extern void* __vt__10JUTResFont[19 + 1 /* padding */] = { }; /* 802DEF48-802DEF94 2D9888 004C+00 0/0 1/1 0/0 .text __ct__10JUTResFontFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTResFont::JUTResFont() { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/__ct__10JUTResFontFv.s" +JUTResFont::JUTResFont() { + initialize_state(); + JUTFont::initialize_state(); } -#pragma pop /* 802DEF94-802DF000 2D98D4 006C+00 0/0 10/10 0/0 .text __ct__10JUTResFontFPC7ResFONTP7JKRHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTResFont::JUTResFont(ResFONT const* param_0, JKRHeap* param_1) { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/__ct__10JUTResFontFPC7ResFONTP7JKRHeap.s" +JUTResFont::JUTResFont(ResFONT const* param_0, JKRHeap* param_1) { + initialize_state(); + JUTFont::initialize_state(); + initiate(param_0, param_1); } -#pragma pop /* 802DF000-802DF08C 2D9940 008C+00 1/0 2/2 0/0 .text __dt__10JUTResFontFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTResFont::~JUTResFont() { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/__dt__10JUTResFontFv.s" +JUTResFont::~JUTResFont() { + if (mValid) { + deleteMemBlocks_ResFont(); + initialize_state(); + JUTFont::initialize_state(); + } } -#pragma pop /* 802DF08C-802DF0B0 2D99CC 0024+00 3/3 3/3 0/0 .text deleteMemBlocks_ResFont__10JUTResFontFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTResFont::deleteMemBlocks_ResFont() { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/deleteMemBlocks_ResFont__10JUTResFontFv.s" +void JUTResFont::deleteMemBlocks_ResFont() { + delete[] field_0x50; } -#pragma pop /* 802DF0B0-802DF0DC 2D99F0 002C+00 5/5 3/3 0/0 .text initialize_state__10JUTResFontFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTResFont::initialize_state() { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/initialize_state__10JUTResFontFv.s" +void JUTResFont::initialize_state() { + mResFont = NULL; + field_0x50 = NULL; + mWid1Ptr = NULL; + mGly1Ptr = NULL; + mMap1Ptr = NULL; + field_0x1c = NULL; + field_0x20 = NULL; + field_0x44 = -1; } -#pragma pop /* 802DF0DC-802DF13C 2D9A1C 0060+00 1/1 0/0 0/0 .text initiate__10JUTResFontFPC7ResFONTP7JKRHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTResFont::initiate(ResFONT const* param_0, JKRHeap* param_1) { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/initiate__10JUTResFontFPC7ResFONTP7JKRHeap.s" +bool JUTResFont::initiate(ResFONT const* param_0, JKRHeap* param_1) { + if (!protected_initiate(param_0, param_1)) { + deleteMemBlocks_ResFont(); + initialize_state(); + JUTFont::initialize_state(); + mValid = false; + return false; + } else { + return true; + } } -#pragma pop /* 802DF13C-802DF248 2D9A7C 010C+00 1/1 0/0 0/0 .text * protected_initiate__10JUTResFontFPC7ResFONTP7JKRHeap */ +// regalloc +#ifdef NONMATCHING +bool JUTResFont::protected_initiate(ResFONT const* param_0, JKRHeap* param_1) { + delete_and_initialize(); + JUTFont::initialize_state(); + + if (!param_0) { + return false; + } else { + mResFont = param_0; + mValid = true; + + countBlock(); + + void* tmp = new (param_1, 0) void*[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum]; + field_0x50 = tmp; + + if (!field_0x50) { + return false; + } else { + if (mWid1BlockNum != 0) { + mWid1Ptr = (ResFONT::WID1*)tmp; + (int*)tmp += mWid1BlockNum; + } + if (mGly1BlockNum != 0) { + mGly1Ptr = (ResFONT::GLY1*)tmp; + (int*)tmp += mGly1BlockNum; + } + if (mMap1BlockNum != 0) { + mMap1Ptr = (ResFONT::MAP1*)tmp; + } + setBlock(); + return true; + } + } + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTResFont::protected_initiate(ResFONT const* param_0, JKRHeap* param_1) { +asm bool JUTResFont::protected_initiate(ResFONT const* param_0, JKRHeap* param_1) { nofralloc #include "asm/JSystem/JUtility/JUTResFont/protected_initiate__10JUTResFontFPC7ResFONTP7JKRHeap.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8039D45C-8039D45C 029ABC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -284,25 +241,55 @@ asm void JUTResFont::setBlock() { #pragma pop /* 802DF48C-802DF584 2D9DCC 00F8+00 1/0 1/0 0/0 .text setGX__10JUTResFontFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTResFont::setGX() { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/setGX__10JUTResFontFv.s" +void JUTResFont::setGX() { + GXSetNumChans(1); + GXSetNumTevStages(1); + GXSetNumTexGens(1); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetChanCtrl(GX_COLOR0A0, 0, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT0, GX_DF_NONE, GX_AF_NONE); + GXSetTevOp(GX_TEVSTAGE0, GX_MODULATE); + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBX8, 15); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); } -#pragma pop /* 802DF584-802DF7C4 2D9EC4 0240+00 1/0 1/0 0/0 .text * setGX__10JUTResFontFQ28JUtility6TColorQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTResFont::setGX(JUtility::TColor param_0, JUtility::TColor param_1) { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/setGX__10JUTResFontFQ28JUtility6TColorQ28JUtility6TColor.s" +void JUTResFont::setGX(JUtility::TColor param_0, JUtility::TColor param_1) { + if (param_0 == 0 && param_1 == -1) { + setGX(); + } else { + GXSetNumChans(1); + GXSetNumTevStages(2); + GXSetNumTexGens(1); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL); + GXSetChanCtrl(GX_COLOR0A0, 0, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT0, GX_DF_NONE, GX_AF_NONE); + GXSetTevColor(GX_TEVREG0, param_0); + GXSetTevColor(GX_TEVREG1, param_1); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C1, GX_CC_TEXC, GX_CC_ZERO); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_A0, GX_CA_A1, GX_CA_TEXA, 7); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevOrder(GX_TEVSTAGE1, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_ZERO, GX_CC_CPREV, GX_CC_RASC, GX_CC_ZERO); + GXSetTevAlphaIn(GX_TEVSTAGE1, 7, GX_CA_APREV, GX_CA_TEXB, 7); + GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBX8, 15); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + } } -#pragma pop /* ############################################################################################## */ /* 80455FF0-80455FF8 0045F0 0004+04 2/2 0/0 0/0 .sdata2 @647 */ @@ -323,8 +310,8 @@ SECTION_SDATA2 static f64 lit_651 = 4503599627370496.0 /* cast u32 to float */; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTResFont::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 param_3, int param_4, - bool param_5) { +asm f32 JUTResFont::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 param_3, int param_4, + bool param_5) { nofralloc #include "asm/JSystem/JUtility/JUTResFont/drawChar_scale__10JUTResFontFffffib.s" } @@ -332,17 +319,37 @@ asm void JUTResFont::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 p /* 802DFBE8-802DFC64 2DA528 007C+00 1/1 0/0 0/0 .text * loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTResFont::loadFont(int param_0, _GXTexMapID param_1, JUTFont::TWidth* param_2) { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth.s" +void JUTResFont::loadFont(int param_0, _GXTexMapID param_1, JUTFont::TWidth* param_2) { + if (param_2 != 0) { + getWidthEntry(param_0, param_2); + } + + int code = getFontCode(param_0); + loadImage(code, param_1); } -#pragma pop /* 802DFC64-802DFD0C 2DA5A4 00A8+00 1/0 1/0 0/0 .text * getWidthEntry__10JUTResFontCFiPQ27JUTFont6TWidth */ +#ifdef NONMATCHING +void JUTResFont::getWidthEntry(int param_0, JUTFont::TWidth* param_1) const { + int code = getFontCode(param_0); + int tmp = 0; + param_1->field_0x0 = 0; + param_1->field_0x1 = mInf1Ptr->width; + + for (int i = mWid1BlockNum; i > 0; i--) { + if (i = 0) { + return; + } + + ResFONT::WID1* tmp2 = mWid1Ptr + tmp; + if (tmp2->startCode <= code && code <= tmp2->endCode) { + break; + } + tmp += 4; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -351,22 +358,38 @@ asm void JUTResFont::getWidthEntry(int param_0, JUTFont::TWidth* param_1) const #include "asm/JSystem/JUtility/JUTResFont/getWidthEntry__10JUTResFontCFiPQ27JUTFont6TWidth.s" } #pragma pop +#endif /* 802DFD0C-802DFD58 2DA64C 004C+00 1/0 1/0 0/0 .text getCellWidth__10JUTResFontCFv */ +// regalloc +#ifdef NONMATCING +u16 JUTResFont::getCellWidth() const { + u16 width; + + if (mGly1Ptr && mGly1Ptr->magic != 0) { + width = mGly1Ptr->cellWidth; + } else { + width = getWidth(); + } + + return width; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTResFont::getCellWidth() const { +asm u16 JUTResFont::getCellWidth() const { nofralloc #include "asm/JSystem/JUtility/JUTResFont/getCellWidth__10JUTResFontCFv.s" } #pragma pop +#endif /* 802DFD58-802DFDA4 2DA698 004C+00 1/0 1/0 0/0 .text getCellHeight__10JUTResFontCFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTResFont::getCellHeight() const { +asm u16 JUTResFont::getCellHeight() const { nofralloc #include "asm/JSystem/JUtility/JUTResFont/getCellHeight__10JUTResFontCFv.s" } @@ -376,7 +399,7 @@ asm void JUTResFont::getCellHeight() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTResFont::isLeadByte(int param_0) const { +asm bool JUTResFont::isLeadByte(int param_0) const { nofralloc #include "asm/JSystem/JUtility/JUTResFont/isLeadByte__10JUTResFontCFi.s" } @@ -585,7 +608,7 @@ COMPILER_STRIP_GATE(0x8039D39C, &halftofull); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTResFont::getFontCode(int param_0) const { +asm int JUTResFont::getFontCode(int param_0) const { nofralloc #include "asm/JSystem/JUtility/JUTResFont/getFontCode__10JUTResFontCFi.s" } @@ -625,7 +648,7 @@ bool JUTFont::isLeadByte_2Byte(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTFont::isLeadByte_ShiftJIS(int param_0) { +asm bool JUTFont::isLeadByte_ShiftJIS(int param_0) { nofralloc #include "asm/JSystem/JUtility/JUTResFont/isLeadByte_ShiftJIS__7JUTFontFi.s" } diff --git a/libs/JSystem/JUtility/JUTTexture.cpp b/libs/JSystem/JUtility/JUTTexture.cpp index be9a985b67..1fb148939d 100644 --- a/libs/JSystem/JUtility/JUTTexture.cpp +++ b/libs/JSystem/JUtility/JUTTexture.cpp @@ -8,35 +8,6 @@ #include "dolphin/types.h" // -// Types: -// - -struct _GXTlutFmt {}; - -struct _GXTlut {}; - -struct _GXTexMapID {}; - -struct JUTTransparency {}; - -struct JUTPalette { - /* 802DE91C */ void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*); - /* 802DE95C */ void load(); -}; - -struct JUTTexture { - /* 802DE234 */ ~JUTTexture(); - /* 802DE480 */ void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut); - /* 802DE2A8 */ void storeTIMG(ResTIMG const*, u8); - /* 802DE44C */ void storeTIMG(ResTIMG const*, JUTPalette*); - /* 802DE5B0 */ void attachPalette(JUTPalette*); - /* 802DE608 */ void init(); - /* 802DE744 */ void initTexObj(_GXTlut); - /* 802DE658 */ void initTexObj(); - /* 802DE840 */ void load(_GXTexMapID); -}; - -// // Forward References: // @@ -59,10 +30,7 @@ extern "C" void __dl__FPv(); extern "C" void __dla__FPv(); extern "C" void storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv(); extern "C" void load__10JUTPaletteFv(); -extern "C" void GXInitTexObj(); extern "C" void GXInitTexObjCI(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); @@ -71,16 +39,68 @@ extern "C" void _restgpr_29(); // /* 802DE234-802DE2A8 2D8B74 0074+00 0/0 30/30 0/0 .text __dt__10JUTTextureFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTTexture::~JUTTexture() { - nofralloc -#include "asm/JSystem/JUtility/JUTTexture/__dt__10JUTTextureFv.s" +JUTTexture::~JUTTexture() { + if (getCaptureFlag()) { + delete[] field_0x3c; + } + if (getEmbPaletteDelFlag()) { + delete mEmbPalette; + } } -#pragma pop /* 802DE2A8-802DE44C 2D8BE8 01A4+00 0/0 18/18 0/0 .text storeTIMG__10JUTTextureFPC7ResTIMGUc */ +#ifdef NONMATCHING +void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { + _GXTlut tlut; + + if (param_0 && param_1 < 0x10) { + mTexInfo = param_0; + mTexData = (void*)((int)mTexInfo + mTexInfo->texDataOffset); + + if (mTexInfo->texDataOffset == 0) { + mTexData = (void*)((int)mTexInfo + 0x20); + } + + field_0x2c = NULL; + mTlutName = 0; + mWrapS = mTexInfo->wrapS; + mWrapT = mTexInfo->wrapT; + mMinFilter = mTexInfo->minFilter; + mMagFilter = mTexInfo->magFilter; + mMinLOD = (s8)mTexInfo->minLOD; + mMaxLOD = (s8)mTexInfo->maxLOD; + mLODBias = mTexInfo->LODBias; + + ResTIMG* tmp = (ResTIMG*)mTexInfo; + + if (mTexInfo->paletteCount == 0) { + initTexObj(); + } else { + if (mTexInfo->paletteCount > 0x100) { + tlut = (_GXTlut)param_1; + } else { + tlut = (_GXTlut)((param_1 & 3) + GX_BIGTLUT0); + } + + if (mEmbPalette == NULL || !getEmbPaletteDelFlag()) { + JUTPalette* palette = new JUTPalette(); + if (palette) { + palette->storeTLUT(tlut, (_GXTlutFmt)tmp->paletteFormat, + (JUTTransparency)tmp->alphaEnabled, tmp->paletteCount, + (void*)(tmp->format + tmp->paletteOffset)); + } + mEmbPalette = palette; + mFlags = mFlags & 1 | 2; + } else { + mEmbPalette->storeTLUT(tlut, (_GXTlutFmt)tmp->paletteFormat, + (JUTTransparency)tmp->alphaEnabled, tmp->paletteCount, + (void*)(tmp->format + tmp->paletteOffset)); + } + attachPalette(mEmbPalette); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -89,17 +109,20 @@ asm void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { #include "asm/JSystem/JUtility/JUTTexture/storeTIMG__10JUTTextureFPC7ResTIMGUc.s" } #pragma pop +#endif /* 802DE44C-802DE480 2D8D8C 0034+00 0/0 6/6 0/0 .text * storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1) { - nofralloc -#include "asm/JSystem/JUtility/JUTTexture/storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette.s" +void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1) { + _GXTlut type; + + if (param_1 != NULL) { + type = (_GXTlut)param_1->getTlutName(); + } else { + type = GX_TLUT0; + } + storeTIMG(param_0, param_1, type); } -#pragma pop /* 802DE480-802DE5B0 2D8DC0 0130+00 1/1 3/3 0/0 .text * storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette7_GXTlut */ @@ -113,24 +136,31 @@ asm void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, _GXT #pragma pop /* 802DE5B0-802DE608 2D8EF0 0058+00 1/1 7/7 0/0 .text attachPalette__10JUTTextureFP10JUTPalette */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTTexture::attachPalette(JUTPalette* param_0) { - nofralloc -#include "asm/JSystem/JUtility/JUTTexture/attachPalette__10JUTTextureFP10JUTPalette.s" +void JUTTexture::attachPalette(JUTPalette* param_0) { + if (mTexInfo->palettesEnabled) { + if (param_0 == NULL && mEmbPalette != NULL) { + field_0x2c = mEmbPalette; + } else { + field_0x2c = param_0; + } + _GXTlut name = (_GXTlut)field_0x2c->getTlutName(); + initTexObj(name); + } } -#pragma pop /* 802DE608-802DE658 2D8F48 0050+00 1/1 0/0 0/0 .text init__10JUTTextureFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTTexture::init() { - nofralloc -#include "asm/JSystem/JUtility/JUTTexture/init__10JUTTextureFv.s" +void JUTTexture::init() { + if (mTexInfo->paletteCount == 0) { + initTexObj(); + } else { + if (mEmbPalette != NULL) { + field_0x2c = mEmbPalette; + + _GXTlut name = (_GXTlut)field_0x2c->getTlutName(); + initTexObj(name); + } + } } -#pragma pop /* ############################################################################################## */ /* 80455FD8-80455FDC 0045D8 0004+00 2/2 0/0 0/0 .sdata2 @453 */ @@ -146,6 +176,24 @@ SECTION_SDATA2 static f64 lit_456 = 4503599627370496.0 /* cast u32 to float */; SECTION_SDATA2 static f64 lit_459 = 4503601774854144.0 /* cast s32 to float */; /* 802DE658-802DE744 2D8F98 00EC+00 2/2 0/0 0/0 .text initTexObj__10JUTTextureFv */ +#ifdef NONMATCHING +void JUTTexture::initTexObj() { + int offset; + + if (mTexInfo->mipmapEnabled) { + offset = mTexInfo->texDataOffset; + } else { + offset = 0x20; + } + + GXInitTexObj(mTexObj, &mTexInfo + offset, mTexInfo->width, mTexInfo->height, + (GXTexFmt)mTexInfo->format, (GXTexWrapMode)mTexInfo->wrapS, + (GXTexWrapMode)mTexInfo->wrapT, mTexInfo->mipmapEnabled); + GXInitTexObjLOD(mTexObj, (GXTexFilter)mTexInfo->minFilter, (GXTexFilter)mTexInfo->magFilter, + mTexInfo->minLOD, mTexInfo->maxLOD, mTexInfo->LODBias, mTexInfo->biasClamp, + mTexInfo->doEdgeLOD, (GXAnisotropy)mTexInfo->maxAnisotropy); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -154,6 +202,7 @@ asm void JUTTexture::initTexObj() { #include "asm/JSystem/JUtility/JUTTexture/initTexObj__10JUTTextureFv.s" } #pragma pop +#endif /* 802DE744-802DE840 2D9084 00FC+00 2/2 0/0 0/0 .text initTexObj__10JUTTextureF7_GXTlut */ @@ -168,11 +217,9 @@ asm void JUTTexture::initTexObj(_GXTlut param_0) { /* 802DE840-802DE890 2D9180 0050+00 0/0 14/14 0/0 .text load__10JUTTextureF11_GXTexMapID */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTTexture::load(_GXTexMapID param_0) { - nofralloc -#include "asm/JSystem/JUtility/JUTTexture/load__10JUTTextureF11_GXTexMapID.s" +void JUTTexture::load(_GXTexMapID param_0) { + if (field_0x2c) { + field_0x2c->load(); + } + GXLoadTexObj(&mTexObj, param_0); } -#pragma pop diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index 1e253033bd..568ca39d77 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -16,10 +16,6 @@ struct Z2SpeechMgr2 { /* 802CC9D0 */ void framework(); }; -struct Z2SoundObjMgr { - /* 802BF920 */ Z2SoundObjMgr(); -}; - struct Z2SoundMgr { /* 802A9E80 */ Z2SoundMgr(); /* 802AA67C */ void framework(); @@ -134,13 +130,6 @@ struct JASDriver { /* 8029E178 */ void setOutputMode(u32); }; -struct JASAudioReseter { - /* 8029D0B4 */ JASAudioReseter(); - /* 8029D138 */ void start(u32, bool); - /* 8029D1D4 */ void resume(); - /* 8029D1F8 */ void checkDone() const; -}; - struct JASAramStream { static u8 sBlockSize[4]; }; diff --git a/libs/Z2AudioLib/Z2EnvSeMgr.cpp b/libs/Z2AudioLib/Z2EnvSeMgr.cpp index 97532c0456..515de1317e 100644 --- a/libs/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/libs/Z2AudioLib/Z2EnvSeMgr.cpp @@ -42,8 +42,6 @@ struct Z2SoundMgr { struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -57,44 +55,6 @@ struct Z2MultiSeMgr { /* 802AEDC0 */ void getDolbyPower(); }; -struct Z2EnvSeMgr { - /* 802C611C */ Z2EnvSeMgr(); - /* 802C6540 */ ~Z2EnvSeMgr(); - /* 802C66B0 */ void framework(); - /* 802C6998 */ void resetScene(); - /* 802C699C */ void resetSceneInner(); - /* 802C6AC0 */ void initSceneEnvSe(s32, s8, f32); - /* 802C6C1C */ void playSceneEnvSe(); - /* 802C6C84 */ void initStaticEnvSe(u8, u8, u8, u8, Vec*); - /* 802C70C8 */ void startStaticEnvSe(s8); - /* 802C780C */ void registWindowPos(Vec*); - /* 802C7830 */ void startRainSe(s32, s8); - /* 802C7CF4 */ void startNearThunderSe(s8); - /* 802C7E68 */ void startFarThunderSe(Vec*, s8); - /* 802C7FB4 */ void setSnowPower(s8); - /* 802C7FBC */ void initStrongWindSe(); - /* 802C7FC8 */ void setWindDirection(Vec*); - /* 802C800C */ void startStrongWindSe(s8); - /* 802C80F8 */ void initRiverSe(u8, u8, u8, u8); - /* 802C8234 */ void registRiverSePos(Vec*); - /* 802C8258 */ void setHyrulSewerOpen(bool); - /* 802C8300 */ void startRiverSe(s8); - /* 802C8730 */ void initFallSe(u8, u8, u8, u8); - /* 802C886C */ void registFallSePos(Vec*); - /* 802C8890 */ void startFallSe(s8); - /* 802C8A90 */ void initEtcSe(u8, u8, u8, u8); - /* 802C8C24 */ void registEtcSePos(Vec*); - /* 802C8C48 */ void startEtcSe(s8); - /* 802C92C8 */ void registWolfSmellSePos(Vec*); - /* 802C92EC */ void startFogWipeTrigger(Vec*); - /* 802C93A0 */ void setFogWipeWidth(f32); - /* 802C93E4 */ void getFogDensity(); - /* 802C9400 */ void startFogSe(); - /* 802C950C */ void initLv3WaterSe(u8, u8, u8, u8); - /* 802C9F58 */ void registLv3WaterSePos(u8, Vec*); - /* 802CA794 */ void startLv3WaterSe(s8); -}; - struct Z2EnvSeDir { /* 802C5C9C */ Z2EnvSeDir(Vec*); /* 802C5D1C */ ~Z2EnvSeDir(); diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 394247747b..3d0cc22845 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -563,11 +563,6 @@ struct daAlinkHIO_atnMove_c0 { static u8 const m[84]; }; -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - struct dPa_control_c { struct level_c { /* 8004B8B4 */ void forceOnEventMove(u32); @@ -640,8 +635,6 @@ struct dBgS_ObjAcch { /* 800D0C6C */ ~dBgS_ObjAcch(); }; -struct _GXTexObj {}; - struct Z2SeqMgr { /* 802AF010 */ void bgmStart(u32, u32, s32); /* 802AF49C */ void subBgmStart(u32); @@ -744,24 +737,6 @@ struct J3DAnmLoaderDataBase { /* 80337B40 */ void load(void const*, J3DAnmLoaderDataBaseFlag); }; -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct J2DAnmTevRegKey {}; - -struct J2DAnmColor {}; - -struct J2DPane { - /* 80126350 */ void setAnimation(J2DAnmTevRegKey*); - /* 80126354 */ void setAnimation(J2DAnmColor*); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; @@ -3659,30 +3634,14 @@ extern "C" void entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey() extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag(); extern "C" void JMAEulerToQuat__FsssP10Quaternion(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXBegin(); extern "C" void GXSetCullMode(); extern "C" void GXLoadLightObjImm(); extern "C" void GXSetChanAmbColor(); extern "C" void GXSetChanMatColor(); -extern "C" void GXSetNumChans(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetBlendMode(); extern "C" void GXSetZMode(); extern "C" void GXLoadPosMtxImm(); extern "C" void GXLoadNrmMtxImm(); diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 17e81247f8..be3a7989db 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -149,16 +149,8 @@ extern "C" void __ct__15J3DAnmTransformFsPfPsPf(); extern "C" void __ct__19J3DAnmTextureSRTKeyFv(); extern "C" void __ct__16J3DAnmTexPatternFv(); extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevColor(); -extern "C" void GXSetTevOrder(); -extern "C" void GXCallDisplayList(); extern "C" void GXLoadPosMtxImm(); extern "C" void GXSetCurrentMtx(); extern "C" void _savegpr_27(); diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index df876851d1..af0e448c2a 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -43,8 +43,6 @@ struct dMapInfo_n { /* 8003EE5C */ void getMapPlayerPos(); }; -struct _GXTexObj {}; - struct dDlst_shadowControl_c { /* 80055C74 */ void setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*); /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 08b27a7b51..4c6389c504 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -4,6 +4,7 @@ // #include "d/d_drawlist.h" +#include "JSystem/J2DGraph/J2DScreen.h" #include "dol2asm.h" #include "dolphin/mtx/mtx44.h" #include "dolphin/mtx/mtxvec.h" @@ -41,8 +42,6 @@ struct dDlst_shadowTri_c { /* 80056344 */ dDlst_shadowTri_c(); }; -struct _GXTexObj {}; - struct dDlst_shadowSimple_c { /* 8005520C */ void draw(); /* 800553EC */ void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); @@ -76,8 +75,6 @@ struct dDlst_shadowPoly_c { /* 800543B4 */ void draw(); }; -struct ResTIMG {}; - struct dDlst_shadowControl_c { /* 80055684 */ void init(); /* 80055768 */ void reset(); @@ -157,24 +154,14 @@ struct cBgS { /* 80074840 */ void ShdwDraw(cBgS_ShdwDraw*); }; -struct _GXTlutObj {}; - struct ShdwDrawPoly_c { /* 80054A6C */ ~ShdwDrawPoly_c(); }; -struct JUtility { - struct TColor {}; -}; - struct JMath { static u8 sincosTable_[65536]; }; -struct JKRArchive { - /* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*); -}; - struct J3DUClipper { /* 8027378C */ void calcViewFrustum(); /* 80273A44 */ void clip(f32 const (*)[4], Vec*, Vec*) const; @@ -186,13 +173,6 @@ struct J3DShape { static u8 sOldVcdVatCmd[4]; }; -struct J2DGrafContext {}; - -struct J2DScreen { - /* 80053BA0 */ void clearAnmTransform(); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); -}; - struct J2DPicture { /* 800539DC */ void getTexture(u8) const; /* 80053C44 */ void setWhite(JUtility::TColor); @@ -200,18 +180,6 @@ struct J2DPicture { /* 802FC050 */ J2DPicture(); }; -struct J2DPane { - /* 80053BC0 */ void calcMtx(); - /* 80053C00 */ void makeMatrix(f32, f32); - /* 80053C3C */ s32 getTypeID() const; - /* 802F8004 */ void clearAnmTransform(); -}; - -struct J2DAnmBase { - /* 80053C94 */ ~J2DAnmBase(); - /* 800569B0 */ void searchUpdateMaterialID(J2DScreen*); -}; - // // Forward References: // @@ -347,15 +315,11 @@ extern "C" void __dt__13J3DDrawBufferFv(); extern "C" void frameInit__13J3DDrawBufferFv(); extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs(); extern "C" void draw__13J3DDrawBufferCFv(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); extern "C" void GXSetArray(); extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); extern "C" void GXPixModeSync(); extern "C" void GXPeekZ(); -extern "C" void GXBegin(); extern "C" void GXSetLineWidth(); extern "C" void GXSetPointSize(); extern "C" void GXSetCullMode(); @@ -363,37 +327,20 @@ extern "C" void GXSetTexCopySrc(); extern "C" void GXSetTexCopyDst(); extern "C" void GXCopyTex(); extern "C" void GXSetChanMatColor(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); -extern "C" void GXGetTexBufferSize(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); extern "C" void GXGetTexObjWidth(); extern "C" void GXGetTexObjHeight(); extern "C" void GXGetTexObjWrapS(); extern "C" void GXGetTexObjWrapT(); extern "C" void GXGetTexObjTlut(); -extern "C" void GXLoadTexObj(); -extern "C" void GXLoadTlut(); extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevOp(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); extern "C" void GXSetTevSwapModeTable(); extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); extern "C" void GXSetFog(); -extern "C" void GXSetBlendMode(); extern "C" void GXSetColorUpdate(); extern "C" void GXSetAlphaUpdate(); extern "C" void GXSetZMode(); extern "C" void GXSetZCompLoc(); extern "C" void GXSetDither(); -extern "C" void GXCallDisplayList(); extern "C" void GXSetProjection(); extern "C" void GXLoadPosMtxImm(); extern "C" void GXSetCurrentMtx(); diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index cd81232e39..22a375a9f9 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -21,8 +21,6 @@ struct dEvt_control_c { /* 800434D8 */ void searchMapEventData(u8); }; -struct JKRHeap {}; - struct JKRExpandSwitch {}; struct JKRArchive { @@ -75,7 +73,6 @@ extern "C" void __mi__4cXyzCFRC3Vec(); extern "C" void aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl(); extern "C" void findFsResource__10JKRArchiveCFPCcUl(); extern "C" void getAramAddress__14JKRAramArchiveFPCc(); -extern "C" void PSMTXMultVec(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 2bcbc344dd..2e453ae48e 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -27,19 +27,6 @@ struct mDoGph_gInf_c { static u8 m_bloom[20]; }; -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; @@ -73,38 +60,6 @@ struct dStage_roomControl_c { static u8 mStatus[65792]; }; -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - -struct dScnKy_env_light_c { - /* 8019F2E8 */ dScnKy_env_light_c(); - /* 8019F4FC */ void setDaytime(); - /* 8019F788 */ void setSunpos(); - /* 8019FA08 */ void getDaytime(); - /* 8019FBCC */ void getDarkDaytime(); - /* 8019FBD4 */ void setLight_palno_get(u8*, u8*, u8*, u8*, u8*, u8*, u8*, u8*, f32*, int*, int*, - f32*, u8*); - /* 801A040C */ void setLight(); - /* 801A133C */ void setLight_bg(dKy_tevstr_c*, _GXColorS10*, _GXColorS10*, f32*, f32*); - /* 801A16C0 */ void setLight_actor(dKy_tevstr_c*, _GXColorS10*, f32*, f32*); - /* 801A1D64 */ void settingTevStruct_colget_actor(cXyz*, dKy_tevstr_c*, _GXColorS10*, - _GXColorS10*, f32*, f32*); - /* 801A1F58 */ void settingTevStruct_colget_player(dKy_tevstr_c*); - /* 801A2128 */ void settingTevStruct_plightcol_plus(cXyz*, dKy_tevstr_c*, _GXColorS10, - _GXColorS10, u8); - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A441C */ void setLightTevColorType(J3DModelData*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); - /* 801A4E90 */ void CalcTevColor(); - /* 801A4F24 */ void Sndpos(); - /* 801A4F64 */ void Eflight_flush_proc(); - /* 801A516C */ void SetBaseLight(); - /* 801A5288 */ void exeKankyo(); - /* 801A56DC */ void drawKankyo(); - /* 801ADBBC */ ~dScnKy_env_light_c(); -}; - struct dRes_info_c {}; struct dRes_control_c { @@ -113,8 +68,6 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -174,60 +127,27 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct WIND_INF_ENTITY { - /* 8019F4B8 */ ~WIND_INF_ENTITY(); - /* 8019F4F4 */ WIND_INF_ENTITY(); -}; - struct JUTNameTab { /* 802DEAF8 */ void getName(u16) const; }; -struct JPABaseEmitter { - /* 8027EC60 */ void deleteAllParticle(); -}; - struct JMath { static u8 sincosTable_[65536]; }; -struct JKRSolidHeap {}; - struct J3DTexMtxInfo { /* 80325794 */ void setEffectMtx(f32 (*)[4]); }; -struct J3DModel {}; - struct J3DMaterial {}; struct J3DGXColor {}; -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); -}; - struct J3DColorBlock { /* 801A4C08 */ void setLight(u32, J3DLightObj*); /* 801A4C0C */ void setAmbColor(u32, J3DGXColor const*); }; -struct GB_MAPLE_COL_CHANGE { - /* 8019F400 */ GB_MAPLE_COL_CHANGE(); -}; - -struct DUNGEON_LIGHT { - /* 8019F478 */ ~DUNGEON_LIGHT(); - /* 8019F4B4 */ DUNGEON_LIGHT(); -}; - -struct DALKMIST_INFLUENCE {}; - -struct BOSS_LIGHT { - /* 8019F438 */ ~BOSS_LIGHT(); - /* 8019F474 */ BOSS_LIGHT(); -}; - // // Forward References: // @@ -435,7 +355,6 @@ extern "C" extern u8 struct_80451070[8]; SECTION_INIT void memset(); SECTION_INIT void memcpy(); -extern "C" void OSReport_Warning(); extern "C" void mDoAud_setSceneName__FPCcll(); extern "C" void __dt__4cXyzFv(); extern "C" void create__Q213mDoGph_gInf_c7bloom_cFv(); @@ -516,11 +435,6 @@ extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo(); extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightPerspective(); -extern "C" void PSMTXMultVec(); extern "C" void GXInitLightAttn(); extern "C" void GXInitLightSpot(); extern "C" void GXInitLightDistAttn(); @@ -577,7 +491,6 @@ extern "C" u8 mStatus__20dStage_roomControl_c[65792]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_meter2_info[248]; extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; extern "C" extern u8 struct_80450D64[4]; @@ -1714,14 +1627,9 @@ asm void dScnKy_env_light_c::setSunpos() { /* 8019FA08-8019FA10 19A348 0008+00 3/3 5/5 1/1 .text getDaytime__18dScnKy_env_light_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnKy_env_light_c::getDaytime() { - nofralloc -#include "asm/d/kankyo/d_kankyo/getDaytime__18dScnKy_env_light_cFv.s" +f32 dScnKy_env_light_c::getDaytime() { + return mDaytime; } -#pragma pop /* 8019FA10-8019FA3C 19A350 002C+00 2/2 2/2 32/32 .text dKy_getdaytime_hour__Fv */ #pragma push @@ -3596,7 +3504,8 @@ asm void dKy_bg_MAxx_proc(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dScnKy_env_light_c::~dScnKy_env_light_c() { +// asm dScnKy_env_light_c::~dScnKy_env_light_c() { +extern "C" asm void __dt__18dScnKy_env_light_cFv() { nofralloc #include "asm/d/kankyo/d_kankyo/__dt__18dScnKy_env_light_cFv.s" } diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 052f0636e2..3a090963b0 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -374,32 +374,16 @@ extern "C" void freeAll__7JKRHeapFv(); extern "C" void getTotalFreeSize__7JKRHeapFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); extern "C" void GXPixModeSync(); -extern "C" void GXBegin(); extern "C" void GXSetCullMode(); extern "C" void GXSetTexCopySrc(); extern "C" void GXSetTexCopyDst(); extern "C" void GXCopyTex(); -extern "C" void GXSetNumChans(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); extern "C" void GXSetFog(); extern "C" void GXSetFogRangeAdj(); -extern "C" void GXSetBlendMode(); extern "C" void GXSetZMode(); extern "C" void GXSetZCompLoc(); extern "C" void GXSetDither(); diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp index 8a65704cc4..18833651b0 100644 --- a/src/d/meter/d_meter2_info.cpp +++ b/src/d/meter/d_meter2_info.cpp @@ -4,6 +4,7 @@ // #include "d/meter/d_meter2_info.h" +#include "d/com/d_com_inf_game.h" #include "d/save/d_save.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -125,12 +126,19 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" void* item_resource__10dItem_data[1530]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: // +inline BOOL dComIfGs_isEventBit(u16 id) { + return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(id); +} + +inline s8 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { + return param_0->field_0x09 >> 1 & 0x1f; +} + /* ############################################################################################## */ /* 80399168-80399168 0257C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push @@ -217,46 +225,39 @@ SECTION_DATA static char* tex_name_5183[10] = { }; /* 803BF81C-803BFA1C 01C93C 0200+00 3/3 6/6 0/0 .data letter_data__12dMenu_Letter */ -SECTION_DATA u8 dMenu_Letter::letter_data[512] = { - 0x09, 0xC5, 0x0A, 0x29, 0x0A, 0x8D, 0x01, 0x0B, 0x09, 0xC6, 0x0A, 0x2A, 0x0A, 0x8E, 0x02, 0x37, - 0x09, 0xC7, 0x0A, 0x2B, 0x0A, 0x8F, 0x02, 0x36, 0x09, 0xC8, 0x0A, 0x2C, 0x0A, 0x90, 0x00, 0x37, - 0x09, 0xC9, 0x0A, 0x2D, 0x0A, 0x91, 0x00, 0x39, 0x09, 0xCA, 0x0A, 0x2E, 0x0A, 0x92, 0x00, 0x67, - 0x09, 0xCB, 0x0A, 0x2F, 0x0A, 0x93, 0x01, 0x09, 0x09, 0xCC, 0x0A, 0x30, 0x0A, 0x94, 0x00, 0x4D, - 0x09, 0xCD, 0x0A, 0x31, 0x0A, 0x95, 0x01, 0x19, 0x09, 0xCE, 0x0A, 0x32, 0x0A, 0x96, 0x01, 0x08, - 0x09, 0xCF, 0x0A, 0x33, 0x0A, 0x97, 0x01, 0x0C, 0x09, 0xD4, 0x0A, 0x38, 0x0A, 0x9E, 0x01, 0x0C, - 0x09, 0xD1, 0x0A, 0x35, 0x0A, 0x9B, 0x00, 0xB6, 0x09, 0xD2, 0x0A, 0x36, 0x0A, 0x9C, 0x00, 0x67, - 0x09, 0xD5, 0x0A, 0x39, 0x0A, 0xA0, 0x03, 0x1C, 0x09, 0xD6, 0x0A, 0x3A, 0x0A, 0xA1, 0x01, 0x0A, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 803BFA1C-803BFA28 01CB3C 000C+00 2/2 0/0 0/0 .data __vt__13dMeter2Info_c */ -SECTION_DATA extern void* __vt__13dMeter2Info_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__13dMeter2Info_cFv, +SECTION_DATA dMenu_LetterData dMenu_Letter::letter_data[64] = { + {0x09C5, 0x0A29, 0x0A8D, 0x010B}, {0x09C6, 0x0A2A, 0x0A8E, 0x0237}, + {0x09C7, 0x0A2B, 0x0A8F, 0x0236}, {0x09C8, 0x0A2C, 0x0A90, 0x0037}, + {0x09C9, 0x0A2D, 0x0A91, 0x0039}, {0x09CA, 0x0A2E, 0x0A92, 0x0067}, + {0x09CB, 0x0A2F, 0x0A93, 0x0109}, {0x09CC, 0x0A30, 0x0A94, 0x004D}, + {0x09CD, 0x0A31, 0x0A95, 0x0119}, {0x09CE, 0x0A32, 0x0A96, 0x0108}, + {0x09CF, 0x0A33, 0x0A97, 0x010C}, {0x09D4, 0x0A38, 0x0A9E, 0x010C}, + {0x09D1, 0x0A35, 0x0A9B, 0x00B6}, {0x09D2, 0x0A36, 0x0A9C, 0x0067}, + {0x09D5, 0x0A39, 0x0AA0, 0x031C}, {0x09D6, 0x0A3A, 0x0AA1, 0x010A}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, + {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, }; /* 8021BDDC-8021BE20 21671C 0044+00 1/1 0/0 0/0 .text __ct__13dMeter2Info_cFv */ @@ -265,15 +266,7 @@ dMeter2Info_c::dMeter2Info_c() { mTempBits = 0; } -/* 8021BE20-8021BE68 216760 0048+00 2/1 0/0 0/0 .text __dt__13dMeter2Info_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMeter2Info_c::~dMeter2Info_c() { - nofralloc -#include "asm/d/meter/d_meter2_info/__dt__13dMeter2Info_cFv.s" -} -#pragma pop +dMeter2Info_c::~dMeter2Info_c() {} /* ############################################################################################## */ /* 80454998-8045499C 002F98 0004+00 4/4 0/0 0/0 .sdata2 @3916 */ @@ -307,6 +300,108 @@ SECTION_SDATA2 static f32 lit_3922[1 + 1 /* padding */] = { }; /* 8021BE68-8021C0E0 2167A8 0278+00 1/1 1/1 0/0 .text init__13dMeter2Info_cFv */ +// just some float issues +#ifdef NONMATCHING +void dMeter2Info_c::init() { + mMsgResource = NULL; + mStageMsgResource = NULL; + mMsgUnitResource = NULL; + mMeterClass = NULL; + mMeterMap = NULL; + mMenuWindowClass = NULL; + + for (int i = 0; i < 4; i++) { + mMeterItemPanePtr[i] = NULL; + } + + unk8 = 0; + mSub2DStatus = 0; + mHorseLifeCount = 0; + mMsgKeyWaitTimer = 0; + unk152 = 0; + mWindowStatus = 0; + unk186 = 0; + + unk84 = FLOAT_LABEL(lit_3916); + unk88 = FLOAT_LABEL(lit_3916); + unk92 = FLOAT_LABEL(lit_3916); + unk96 = 1.0f; + unk100 = 30.0f; + unk104 = 304.0f; + unk108 = 224.0f; + m2DWidth = 608.0f; + m2DHeight = 448.0f; + m2DPosH = FLOAT_LABEL(lit_3916); + m2DPosV = FLOAT_LABEL(lit_3916); + unk128 = FLOAT_LABEL(lit_3916); + mTimeMs = 0; + mMsgTimeMs = 0; + mNowCount = 0; + mMaxCount = 0; + mShopTalkFlag = false; + mMapStatus = 0; + mMapKeyDirection = 0; + mBlinkButton = 0; + mOilGaugeBackUp = 0; + mUseButton = -1; + mDirectUseItem = 0; + mGameStatus = 0; + mTouchKeyCheck = 0; + mWindowAccept = -1; + mMeterString = 0; + mFloatingFlowID = 0; + mFloatingMessageID = 0; + mFloatingMessageTimer = 0; + mFloatingMessageWakuVisible = 0; + resetWarpStatus(); + mPauseStatus = 0; + mGameOverType = 0; + mInsectSelectType = 0xFF; + + cXyz tmp(FLOAT_LABEL(lit_3916), FLOAT_LABEL(lit_3916), FLOAT_LABEL(lit_3916)); + setWarpInfo("", tmp, 0, 0, 0, 0); + + for (int i = 0; i < 4; i++) { + changeWater(i + SLOT_11); + } + + for (int i = 0; i < 4; i++) { + unk196[i] = 0; + unk200[i] = 0; + unk208[i] = 0; + unk212[i] = 0; + } + + unk204 = 0; + unk205 = 0; + unk206 = 0; + unk207 = 0; + unk216 = 0; + unk217 = 0; + unk218 = 0; + unk219 = 0; + mRentalBombBag = 0xFF; + mMiniGameItemSetFlag = 0; + mMiniGameCount = 0; + setSaveStageName(""); + mCollectCursorPosX = 0; + mCollectCursorPosY = 0; + mTableMapRegionNo = 0xFF; + mGoldWolfMapType = 0; + unk231 = 0; + mItemExplainWindowStatus = 0; + mLifeGaugeSE = 0; + mMapDrugFlag = 0; + + for (int i = 0; i < 3; i++) { + if (dComIfGs_isLightDropGetFlag(i)) { + mLightDropGetFlag[i] = 0xFF; + } else { + mLightDropGetFlag[i] = 0; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -315,12 +410,13 @@ asm void dMeter2Info_c::init() { #include "asm/d/meter/d_meter2_info/init__13dMeter2Info_cFv.s" } #pragma pop +#endif /* 8021C0E0-8021C11C 216A20 003C+00 0/0 1/1 2/2 .text setFloatingMessage__13dMeter2Info_cFUssb */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMeter2Info_c::setFloatingMessage(u16 param_0, s16 param_1, bool param_2) { +asm int dMeter2Info_c::setFloatingMessage(u16 param_0, s16 param_1, bool param_2) { nofralloc #include "asm/d/meter/d_meter2_info/setFloatingMessage__13dMeter2Info_cFUssb.s" } @@ -338,14 +434,9 @@ asm void dMeter2Info_c::setFloatingFlow(u16 param_0, s16 param_1, bool param_2) /* 8021C1DC-8021C1F0 216B1C 0014+00 0/0 4/4 0/0 .text isFloatingMessageVisible__13dMeter2Info_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMeter2Info_c::isFloatingMessageVisible() { - nofralloc -#include "asm/d/meter/d_meter2_info/isFloatingMessageVisible__13dMeter2Info_cFv.s" +int dMeter2Info_c::isFloatingMessageVisible() { + return mFloatingMessageTimer > 0; } -#pragma pop /* 8021C1F0-8021C218 216B30 0028+00 0/0 1/1 0/0 .text decFloatingMessageTimer__13dMeter2Info_cFv */ @@ -473,24 +564,22 @@ asm int dMeter2Info_c::setMeterString(s32 param_0) { /* 8021C9DC-8021CA04 21731C 0028+00 1/1 3/3 0/0 .text resetWarpStatus__13dMeter2Info_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_c::resetWarpStatus() { - nofralloc -#include "asm/d/meter/d_meter2_info/resetWarpStatus__13dMeter2Info_cFv.s" +void dMeter2Info_c::resetWarpStatus() { + if (mWarpStatus == 2) { + dComIfGs_resetLastWarpAcceptStage(); + } + mWarpStatus = 0; } -#pragma pop /* 8021CA04-8021CA70 217344 006C+00 0/0 2/2 3/3 .text warpInProc__13dMeter2Info_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_c::warpInProc() { - nofralloc -#include "asm/d/meter/d_meter2_info/warpInProc__13dMeter2Info_cFv.s" +void dMeter2Info_c::warpInProc() { + dComIfGs_setWarpMarkFlag(0); + dComIfGs_resetLastWarpAcceptStage(); + + if (dComIfGs_getItem(SLOT_18, true) != LV7_DUNGEON_EXIT) { + dComIfGs_setItem(SLOT_18, DUNGEON_EXIT); + } } -#pragma pop /* 8021CA70-8021CC00 2173B0 0190+00 0/0 1/1 0/0 .text warpOutProc__13dMeter2Info_cFv */ #pragma push @@ -979,35 +1068,123 @@ void dMeter2Info_c::decHotSpringTimer() { } /* 8021DD5C-8021DE18 21869C 00BC+00 2/2 1/1 0/0 .text changeWater__13dMeter2Info_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_c::changeWater(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_info/changeWater__13dMeter2Info_cFUc.s" +void dMeter2Info_c::changeWater(u8 i_slotNo) { + int i_bottleIdx = i_slotNo - SLOT_11; + mHotSpringTimer[i_bottleIdx] = 0; + + if (dComIfGs_getItem(i_slotNo, true) == HOT_SPRING) { + dComIfGs_setItem(i_slotNo, WATER_BOTTLE); + + for (int i = 0; i < 3; i++) { + if (i_slotNo == dComIfGs_getSelectItemIndex(i)) { + dComIfGp_setSelectItem(i); + } + } + } } -#pragma pop /* 8021DE18-8021E0C4 218758 02AC+00 0/0 3/3 3/3 .text setMiniGameItem__13dMeter2Info_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_c::setMiniGameItem(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter2_info/setMiniGameItem__13dMeter2Info_cFUc.s" +void dMeter2Info_c::setMiniGameItem(u8 param_0) { + bool bvar1 = false; + + if (mMiniGameItemSetFlag) { + bvar1 = true; + } + + if (mRentalBombBag == 0xFF) { + bool bvar2 = false; + + for (int bagIdx = 0; bagIdx < 3; bagIdx++) { + if (!bvar2 && dComIfGs_getItem((u8)(bagIdx + SLOT_15), true) == 0xFF) { + mRentalBombBag = bagIdx; + bvar2 = true; + } + } + if (!bvar2) { + mRentalBombBag = 2; + } + } + + mMiniGameItemSetFlag = param_0; + + for (int i = 0; i < 2; i++) { + unk200[i] = dComIfGs_getMixItemIndex(i); + unk196[i] = dComIfGs_getSelectItemIndex(i); + } + + unk204 = dComIfGs_getBombNum(mRentalBombBag); + unk205 = dComIfGs_getArrowNum(); + unk206 = dComIfGs_getItem(SLOT_4, false); + unk207 = dComIfGs_getItem((u8)(mRentalBombBag + SLOT_15), false); + + if (bvar1) { + for (int i = 0; i < 2; i++) { + dComIfGs_setMixItemIndex(i, unk212[i]); + dComIfGs_setSelectItemIndex(i, unk208[i]); + } + dComIfGs_setItem(SLOT_4, unk218); + dComIfGp_setItem(SLOT_4, unk218); + dComIfGs_setItem((u8)(mRentalBombBag + SLOT_15), unk219); + dComIfGp_setItem((u8)(mRentalBombBag + SLOT_15), unk219); + dComIfGs_setBombNum(mRentalBombBag, unk216); + dComIfGs_setArrowNum(unk217); + } + + dComIfGs_setItem((u8)(mRentalBombBag + SLOT_15), NORMAL_BOMB); + dComIfGp_setItem((u8)(mRentalBombBag + SLOT_15), NORMAL_BOMB); + + if (mMiniGameItemSetFlag != 3) { + dComIfGs_setItem(SLOT_4, BOW); + dComIfGp_setItem(SLOT_4, BOW); + dComIfGs_setMixItemIndex(1, 0xFF); + dComIfGs_setSelectItemIndex(1, 0xFF); + dComIfGs_setMixItemIndex(0, 4); + dComIfGs_setSelectItemIndex(0, (u8)(mRentalBombBag + SLOT_15)); + } + + if (!bvar1) { + dComIfGs_setBombNum(mRentalBombBag, 30); + u8 arrow_max = dComIfGs_getArrowMax(); + dComIfGs_setArrowNum(arrow_max); + } } -#pragma pop /* 8021E0C4-8021E268 218A04 01A4+00 0/0 3/3 4/4 .text resetMiniGameItem__13dMeter2Info_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_c::resetMiniGameItem(bool param_0) { - nofralloc -#include "asm/d/meter/d_meter2_info/resetMiniGameItem__13dMeter2Info_cFb.s" +void dMeter2Info_c::resetMiniGameItem(bool param_0) { + if (mMiniGameItemSetFlag) { + if (param_0) { + for (int i = 0; i < 2; i++) { + unk212[i] = dComIfGs_getMixItemIndex(i); + unk208[i] = dComIfGs_getSelectItemIndex(i); + } + + unk216 = dComIfGs_getBombNum(mRentalBombBag); + unk217 = dComIfGs_getArrowNum(); + unk218 = dComIfGs_getItem(SLOT_4, false); + unk219 = dComIfGs_getItem((u8)(mRentalBombBag + SLOT_15), false); + } + + for (int i = 0; i < 2; i++) { + dComIfGs_setMixItemIndex(i, unk200[i]); + dComIfGs_setSelectItemIndex(i, unk196[i]); + } + + dComIfGs_setItem(SLOT_4, unk206); + dComIfGp_setItem(SLOT_4, unk206); + + dComIfGs_setItem((u8)(mRentalBombBag + SLOT_15), unk207); + dComIfGp_setItem((u8)(mRentalBombBag + SLOT_15), unk207); + + dComIfGs_setBombNum(mRentalBombBag, unk204); + dComIfGs_setArrowNum(unk205); + + if (!param_0) { + mMiniGameItemSetFlag = 0; + mRentalBombBag = 0xFF; + } + } } -#pragma pop /* 8021E268-8021E290 218BA8 0028+00 0/0 0/0 5/5 .text setMiniGameCount__13dMeter2Info_cFSc */ void dMeter2Info_c::setMiniGameCount(s8 pCount) { @@ -1038,7 +1215,7 @@ asm void dMeter2Info_getNowLifeGauge() { /* 8021E2C8-8021E2DC 218C08 0014+00 0/0 11/11 3/3 .text dMeter2Info_getNumberTextureName__Fi */ char* dMeter2Info_getNumberTextureName(int pIndex) { return tex_name_5183[pIndex]; -} // +} /* 804510B8-804510BC 0005B8 0004+00 1/1 0/0 0/0 .sbss tex_name$5188 */ static char* tex_name_5188; @@ -1070,34 +1247,62 @@ asm void dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3 #pragma pop /* 8021E4B0-8021E530 218DF0 0080+00 0/0 2/2 1/1 .text dMeter2Info_setCloth__FUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_setCloth(u8 param_0, bool param_1) { - nofralloc -#include "asm/d/meter/d_meter2_info/dMeter2Info_setCloth__FUcb.s" +void dMeter2Info_setCloth(u8 i_clothId, bool param_1) { + if ((int)i_clothId >= MAGIC_LV1 || (int)i_clothId < WEARS_CASUAL) { + i_clothId = WEARS_CASUAL; + param_1 = false; + } + + if (param_1 && dComIfGs_getSelectEquipClothes() != NO_ITEM) { + u8 equip_cloth = dComIfGs_getSelectEquipClothes(); + dComIfGs_offItemFirstBit(equip_cloth); + } + dComIfGs_setSelectEquipClothes(i_clothId); + dComIfGp_setSelectEquipClothes(i_clothId); } -#pragma pop /* 8021E530-8021E5D4 218E70 00A4+00 0/0 3/3 3/3 .text dMeter2Info_setSword__FUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_setSword(u8 param_0, bool param_1) { - nofralloc -#include "asm/d/meter/d_meter2_info/dMeter2Info_setSword__FUcb.s" +void dMeter2Info_setSword(u8 i_itemId, bool param_1) { + switch (i_itemId) { + case NO_ITEM: + case WOOD_STICK: + case SWORD: + case MASTER_SWORD: + case LIGHT_SWORD: + break; + default: + i_itemId = NO_ITEM; + param_1 = false; + } + + if (param_1 && dComIfGs_getSelectEquipSword() != 0xFF) { + u8 tmp = dComIfGs_getSelectEquipSword(); + dComIfGs_offItemFirstBit(tmp); + } + dComIfGs_setSelectEquipSword(i_itemId); + dComIfGp_setSelectEquipSword(i_itemId); } -#pragma pop /* 8021E5D4-8021E660 218F14 008C+00 0/0 3/3 0/0 .text dMeter2Info_setShield__FUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_setShield(u8 param_0, bool param_1) { - nofralloc -#include "asm/d/meter/d_meter2_info/dMeter2Info_setShield__FUcb.s" +void dMeter2Info_setShield(u8 i_itemId, bool param_1) { + switch (i_itemId) { + case NO_ITEM: + case WOOD_SHIELD: + case SHIELD: + case HYLIA_SHIELD: + break; + default: + i_itemId = NO_ITEM; + param_1 = false; + } + + if (param_1 && dComIfGs_getSelectEquipShield() != 0xFF) { + u8 tmp = dComIfGs_getSelectEquipShield(); + dComIfGs_offItemFirstBit(tmp); + } + dComIfGs_setSelectEquipShield(i_itemId); + dComIfGp_setSelectEquipShield(i_itemId); } -#pragma pop /* 8021E660-8021E668 218FA0 0008+00 0/0 1/1 0/0 .text dMeter2Info_is2DActiveTouchArea__Fv */ @@ -1106,20 +1311,9 @@ bool dMeter2Info_is2DActiveTouchArea() { } /* 8021E668-8021E688 218FA8 0020+00 0/0 1/1 0/0 .text dMeter2Info_isMapOpenCheck__Fv */ -#ifdef NONMATCHING bool dMeter2Info_isMapOpenCheck() { return dMeter2Info_getMeterMapClass()->isMapOpenCheck(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_isMapOpenCheck() { - nofralloc -#include "asm/d/meter/d_meter2_info/dMeter2Info_isMapOpenCheck__Fv.s" -} -#pragma pop -#endif /* 8021E688-8021E6E4 218FC8 005C+00 0/0 2/2 0/0 .text dMeter2Info_isItemOpenCheck__Fv */ #ifdef NONMATCHING @@ -1144,27 +1338,57 @@ asm void dMeter2Info_isItemOpenCheck() { /* 8021E6E4-8021E754 219024 0070+00 1/1 2/2 0/0 .text dMeter2Info_getRecieveLetterNum__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_getRecieveLetterNum() { - nofralloc -#include "asm/d/meter/d_meter2_info/dMeter2Info_getRecieveLetterNum__Fv.s" +u8 dMeter2Info_getRecieveLetterNum() { + u8 letterNum = 0; + + for (int i = 0; i < 0x40; i++) { + if (dComIfGs_isLetterGetFlag(i)) { + letterNum++; + } + } + return letterNum; } -#pragma pop /* 8021E754-8021E804 219094 00B0+00 0/0 4/4 2/2 .text dMeter2Info_getNewLetterNum__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeter2Info_getNewLetterNum() { - nofralloc -#include "asm/d/meter/d_meter2_info/dMeter2Info_getNewLetterNum__Fv.s" +u8 dMeter2Info_getNewLetterNum() { + u8 letterNum = 0; + + for (int i = 0; i < 0x40; i++) { + if (!dComIfGs_isLetterGetFlag(i) && dMenu_Letter::getLetterName(i) != 0) { + u16 letterEvent = dMenu_Letter::getLetterEventFlag(i); + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[letterEvent])) { + letterNum++; + } + } + } + return letterNum; } -#pragma pop /* 8021E804-8021E8DC 219144 00D8+00 0/0 1/1 0/0 .text dMeter2Info_setNewLetterSender__Fv */ +// regalloc +#ifdef NONMATCHING +int dMeter2Info_setNewLetterSender() { + u8 check = 0; + + for (int i = 0; i < 0x40; i++) { + if (!dComIfGs_isLetterGetFlag(i) && dMenu_Letter::getLetterName(i) != 0) { + u16 letterEvent = dMenu_Letter::getLetterEventFlag(i); + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[letterEvent])) { + if (check == 0) { + u16 letterName = dMenu_Letter::getLetterName(i); + dMsgObject_c::setLetterNameID(letterName); + } else { + dMsgObject_c::setLetterNameID(0); + return 0; + } + check++; + } + } + } + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1173,6 +1397,7 @@ asm void dMeter2Info_setNewLetterSender() { #include "asm/d/meter/d_meter2_info/dMeter2Info_setNewLetterSender__Fv.s" } #pragma pop +#endif /* 8021E8DC-8021E9D0 21921C 00F4+00 0/0 1/1 0/0 .text dMeter2Info_recieveLetter__Fv */ #pragma push diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp index bf2c94e26e..7d6af2e5a2 100644 --- a/src/d/meter/d_meter_HIO.cpp +++ b/src/d/meter/d_meter_HIO.cpp @@ -80,11 +80,6 @@ struct dMeter_drawEmpButtonHIO_c { /* 80200DA0 */ ~dMeter_drawEmpButtonHIO_c(); }; -struct dMeter_drawCollectHIO_c { - /* 801FE348 */ dMeter_drawCollectHIO_c(); - /* 80200FE0 */ ~dMeter_drawCollectHIO_c(); -}; - struct dMeter_drawCalibrationHIO_c { /* 801FE954 */ dMeter_drawCalibrationHIO_c(); /* 80200E78 */ ~dMeter_drawCalibrationHIO_c(); @@ -95,17 +90,6 @@ struct dMeter_cursorHIO_c { /* 80201098 */ ~dMeter_cursorHIO_c(); }; -struct cXyz { - /* 80009184 */ ~cXyz(); - /* 800125DC */ cXyz(); -}; - -struct JUtility { - struct TColor { - /* 80193960 */ TColor(); - }; -}; - struct JKRHeap { /* 802CE548 */ void free(void*); }; @@ -353,6 +337,47 @@ SECTION_SDATA2 static f32 lit_3802 = 26.0f; /* 801FE348-801FE4EC 1F8C88 01A4+00 1/1 0/0 0/0 .text __ct__23dMeter_drawCollectHIO_cFv */ +#ifdef NONMATCHING +dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c() { + mItemScaleSmall = lit_3787; + mItemScaleLarge = lit_3788; + mSaveOptionItemScaleSmall = lit_3787; + mSaveOptionItemScaleLarge = lit_3789; + mBlueFuzzPosX = lit_3790; + mBlueFuzzPosY = lit_3791; + mBlueFuzzScale = lit_3791; + mBlueFuzzAlpha = lit_3792; + mMaskMirrorPos.set(FLOAT_LABEL(lit_3793), FLOAT_LABEL(lit_3793), FLOAT_LABEL(lit_3793)); + mMaskMirrorAngle.set(0, 0, 0); + field_0x9a = false; + mMaskMirrorScale = FLOAT_LABEL(lit_3793); + mMaskMirrorAnimation = lit_3787; + mHeartVesselPosX = lit_3794; + mHeartVesselPosY = lit_3795; + mHeartVesselScale = lit_3796; + mHeartPiecePosX = FLOAT_LABEL(lit_3793); + mHeartPiecePosY = FLOAT_LABEL(lit_3793); + mHeartPieceScale = lit_3787; + mButtonDebugON = false; + mAButtonPosX = lit_3797; + mAButtonPosY = lit_3798; + mAButtonScale = lit_3791; + mBButtonPosX = lit_3797; + mBButtonPosY = lit_3799; + mBButtonScale = lit_3791; + mAButtonTextPosX = lit_3800; + mAButtonTextPosY = lit_3798; + mAButtonTextScale = lit_3789; + mBButtonTextPosX = lit_3801; + mBButtonTextPosY = lit_3802; + mBButtonTextScale = lit_3789; + mColorDebugON = false; + mBasBlack[0].set(0, 0, 0, 0); + mBasWhite[0].set(250, 250, 210, 220); + mBasBlack[1].set(200, 190, 100, 0); + mBasWhite[1].set(200, 190, 100, 175); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -361,6 +386,7 @@ asm dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c() { #include "asm/d/meter/d_meter_HIO/__ct__23dMeter_drawCollectHIO_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454520-80454524 002B20 0004+00 3/3 0/0 0/0 .sdata2 @3828 */ @@ -1251,7 +1277,8 @@ asm dMeter_drawOptionHIO_c::~dMeter_drawOptionHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMeter_drawCollectHIO_c::~dMeter_drawCollectHIO_c() { +// asm dMeter_drawCollectHIO_c::~dMeter_drawCollectHIO_c() { +extern "C" asm void __dt__23dMeter_drawCollectHIO_cFv() { nofralloc #include "asm/d/meter/d_meter_HIO/__dt__23dMeter_drawCollectHIO_cFv.s" } diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 2d9dc7c934..e3ede34992 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -4,6 +4,7 @@ // #include "d/msg/d_msg_flow.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -15,132 +16,11 @@ struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; -struct daPy_py_c { - /* 8015F3FC */ void getAttentionOffsetY(); - /* 8015F954 */ void setMidnaMotionNum(int); - /* 8015F968 */ void setMidnaFaceNum(int); - - static u8 m_midnaActor[4]; -}; - -struct daAlink_c { - /* 800B4938 */ void setMidnaMsg(); -}; - -struct dSv_player_status_a_c { - /* 80032A5C */ void getSelectItemIndex(int) const; - /* 80032AA8 */ void getRupeeMax() const; -}; - -struct dSv_player_item_record_c { - /* 80033F6C */ void setBombNum(u8, u8); - /* 80033F7C */ void getBombNum(u8) const; -}; - -struct dSv_player_item_max_c { - /* 800340F8 */ void getBombNum(u8) const; -}; - -struct dSv_player_item_c { - /* 80032FB8 */ void setItem(int, u8); - /* 80033030 */ void getItem(int, bool) const; - /* 80033370 */ void setBottleItemIn(u8, u8); - /* 80033450 */ void setEmptyBottleItemIn(u8); - /* 80033754 */ void checkInsectBottle(); - /* 800337EC */ void checkEmptyBottle(); - /* 80033BEC */ void checkBombBag(u8); - /* 80033C2C */ void setWarashibeItem(u8); -}; - -struct dSv_player_get_item_c { - /* 80033E94 */ void offFirstBit(u8); -}; - -struct dSv_memBit_c { - /* 800347E8 */ void isTbox(int) const; - /* 80034810 */ void onSwitch(int); - /* 80034838 */ void offSwitch(int); - /* 80034860 */ void isSwitch(int) const; - /* 800348EC */ void isItem(int) const; -}; - -struct dSv_light_drop_c { - /* 80034340 */ void getLightDropNum(u8) const; - /* 80034368 */ void onLightDropGetFlag(u8); -}; - -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349A4 */ void offEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; - /* 800349E0 */ void setEventReg(u16, u8); - /* 80034A04 */ void getEventReg(u16) const; -}; - -struct dSv_danBit_c { - /* 80034B98 */ void onSwitch(int); - /* 80034BC0 */ void offSwitch(int); - /* 80034BE8 */ void isSwitch(int) const; - /* 80034C74 */ void isItem(int) const; -}; - -struct dStage_roomControl_c { - /* 80024384 */ void getStatusRoomDt(int); -}; - struct dShopSystem_c { /* 801975F8 */ void isFlag(int); /* 8019A354 */ void setSoldOutFlag(); }; -struct dMsgObject_c { - /* 802370FC */ void isMidonaMessage(); - /* 80237980 */ void isKillMessageFlag(); - /* 80237994 */ void onKillMessageFlag(); - /* 80237A74 */ void setTalkPartner(fopAc_ac_c*); - /* 80237A88 */ void setNowTalkFlowNo(s16); - /* 8023803C */ void changeFlowGroup(s32); - /* 80238098 */ void endFlowGroup(); - /* 80238174 */ void getMsgDtPtr(); - /* 8023822C */ void getStatus(); - /* 8023846C */ void setSelectCursorPos(u8); - /* 802384D8 */ void setArrowNum(u8); - /* 80238544 */ void setSelectWordFlag(u8); - /* 802385B4 */ void getSelectBombBagID(); - /* 802385E0 */ void getSelectBombPrice(); - /* 8023860C */ void setEquipBombInfo(); - /* 8023864C */ void setSelectCancelPos(u8); -}; - -struct dMeter2Info_c { - /* 8021E0C4 */ void resetMiniGameItem(bool); -}; - -struct dComIfG_play_c { - /* 8002B36C */ void setItemBombNumCount(u8, s16); -}; - -struct dAttention_c { - /* 80073838 */ void checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32); - /* 8014B010 */ void getDistTable(int); -}; - -struct cSGlobe { - /* 80271880 */ cSGlobe(cXyz const&); -}; - -struct cSAngle { - /* 80271228 */ void operator-(s16) const; -}; - struct Z2SeMgr { /* 802ADB14 */ void messageSePlay(u16, Vec*, s8); }; @@ -284,7 +164,6 @@ extern "C" u8 mEventList__10dMsgFlow_c[516]; // External References: // -SECTION_INIT void memcpy(); extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void fopMsgM_SearchByID__FUi(); extern "C" void fopMsgM_messageSet__FUlP10fopAc_ac_cUl(); @@ -389,15 +268,11 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" extern u32 g_saftyWhiteColor; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -405,6 +280,14 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // +inline void dComIfGp_setItemRupeeCount(int amount) { + g_dComIfG_gameInfo.play.setItemRupeeCount(amount); +} + +inline void dComIfGp_setItemLifeCount(float amount, u8 type) { + g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); +} + /* ############################################################################################## */ /* 803C14B8-803C14C4 01E5D8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -1839,14 +1722,15 @@ asm void dMsgFlow_c::nodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { /* 8024B0F0-8024B108 245A30 0018+00 16/16 0/0 0/0 .text getParam__10dMsgFlow_cFPUsPUsPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::getParam(u16* param_0, u16* param_1, u8* param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUsPUsPUc.s" +// might be fake match +int dMsgFlow_c::getParam(u16* param_0, u16* param_1, u8* param_2) { + u16* tmp = (u16*)param_2; + *param_0 = *tmp; + *param_1 = *(tmp + 1); + + int* tmp2 = (int*)param_2; + return *tmp2; } -#pragma pop /* 8024B108-8024B130 245A48 0028+00 3/3 0/0 0/0 .text getParam__10dMsgFlow_cFPUcPUc */ #pragma push @@ -1859,14 +1743,10 @@ asm void dMsgFlow_c::getParam(u8* param_0, u8* param_1) { #pragma pop /* 8024B130-8024B138 245A70 0008+00 20/20 0/0 0/0 .text getParam__10dMsgFlow_cFPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::getParam(u8* param_0) { - nofralloc -#include "asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUc.s" +int dMsgFlow_c::getParam(u8* param_0) { + int* tmp2 = (int*)param_0; + return *tmp2; } -#pragma pop /* 8024B138-8024B180 245A78 0048+00 1/0 0/0 0/0 .text * query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ @@ -2467,47 +2347,65 @@ asm void dMsgFlow_c::query053(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ /* 8024C3FC-8024C488 246D3C 008C+00 1/0 0/0 0/0 .text * event000__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event000(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event000__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event000(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + u16 prm1; + u16 prm0; + + int tmp = getParam(&prm0, &prm1, ¶m_0->param); + if (prm0 != 0) { + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[prm0]); + } + if (prm1 != 0) { + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[prm1]); + } + return 1; } -#pragma pop /* 8024C488-8024C514 246DC8 008C+00 1/0 0/0 0/0 .text * event001__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event001(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event001__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event001(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + u16 prm1; + u16 prm0; + + int tmp = getParam(&prm0, &prm1, ¶m_0->param); + if (prm0 != 0) { + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[prm0]); + } + if (prm1 != 0) { + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[prm1]); + } + return 1; } -#pragma pop /* 8024C514-8024C550 246E54 003C+00 1/0 0/0 0/0 .text * event002__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event002(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event002__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event002(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + int prm0 = getParam(¶m_0->param); + + dComIfGp_setItemRupeeCount(prm0); + return 1; } -#pragma pop /* 8024C550-8024C590 246E90 0040+00 1/0 0/0 0/0 .text * event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +// wrong instruction +#ifdef NONMATCHING +int dMsgFlow_c::event003(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + int prm0 = getParam(¶m_0->param); + + dComIfGp_setItemRupeeCount(-prm0); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event003(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event003(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454DA0-80454DA8 0033A0 0008+00 3/3 0/0 0/0 .sdata2 @6040 */ @@ -2515,17 +2413,34 @@ SECTION_SDATA2 static f64 lit_6040 = 4503601774854144.0 /* cast s32 to float */; /* 8024C590-8024C5F0 246ED0 0060+00 1/0 0/0 0/0 .text * event004__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +#ifdef NONMATCHING +int dMsgFlow_c::event004(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + f32 prm0 = getParam(¶m_0->param); + + dComIfGp_setItemLifeCount(prm0, 0); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event004(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event004(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event004__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024C5F0-8024C654 246F30 0064+00 1/0 0/0 0/0 .text * event005__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +#ifdef NONMATCHING +int dMsgFlow_c::event005(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + f32 prm0 = getParam(¶m_0->param); + + dComIfGp_setItemLifeCount(-prm0, 0); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2534,6 +2449,7 @@ asm void dMsgFlow_c::event005(mesg_flow_node_event* param_0, fopAc_ac_c* param_1 #include "asm/d/msg/d_msg_flow/event005__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024C654-8024C694 246F94 0040+00 1/0 0/0 0/0 .text * event006__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ diff --git a/src/d/pane/d_pane_class.cpp b/src/d/pane/d_pane_class.cpp index d97d79d881..cad38fb7c0 100644 --- a/src/d/pane/d_pane_class.cpp +++ b/src/d/pane/d_pane_class.cpp @@ -11,45 +11,13 @@ // Types: // -struct JUtility { - struct TColor {}; -}; - -struct JSURandomInputStream { - /* 80255328 */ ~JSURandomInputStream(); -}; - struct JSUMemoryInputStream { /* 802552B8 */ ~JSUMemoryInputStream(); /* 802DC520 */ void setBuffer(void const*, s32); }; -struct JSUIosBase { - /* 80255388 */ ~JSUIosBase(); -}; - -struct JSUInputStream { - /* 802DC23C */ ~JSUInputStream(); -}; - -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); -}; - -struct JKRExpHeap {}; - -struct JKRArchive {}; - struct JKRAramArchive {}; -struct JGeometry { - template <typename A1> - struct TBox2 {}; - /* TBox2<f32> */ - struct TBox2__template0 {}; -}; - struct J2DWindow { /* 80254000 */ void getBlack() const; /* 8025400C */ void getWhite() const; @@ -62,56 +30,11 @@ struct J2DTextBox { /* 80254408 */ void setBlack(JUtility::TColor); }; -struct J2DScreen { - /* 802F8748 */ void setPriority(JSURandomInputStream*, u32, JKRArchive*); -}; - -struct J2DRotateAxis {}; - -struct J2DPane { - /* 802F7100 */ void getBounds(); - /* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32); - /* 802F7A8C */ void getFirstChildPane(); - /* 802F7AC4 */ void getNextChildPane(); - /* 802F7AFC */ void getParentPane(); -}; - struct J2DOrthoGraph { /* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32); /* 802E980C */ void setOrtho(JGeometry::TBox2<f32> const&, f32, f32); }; -struct CPaneMgrAlpha { - /* 802553EC */ CPaneMgrAlpha(); - /* 8025546C */ ~CPaneMgrAlpha(); - /* 80255658 */ void rateCalc(s16, s16, u8); - /* 80255A60 */ void childPaneCount(J2DPane*); - /* 80255ACC */ void childPaneGetAlpha(J2DPane*); - /* 80255B5C */ void childPaneSetAlpha(J2DPane*, u8); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80253930 */ CPaneMgr(); - /* 80253A18 */ ~CPaneMgr(); - /* 80253AB4 */ void setAlpha(u8); - /* 80253B2C */ void reinit(); - /* 80253C08 */ void initiate(J2DPane*, JKRExpHeap*); - /* 80254018 */ void childPaneGetSize(J2DPane*); - /* 80254134 */ void childPaneSetSize(J2DPane*, f32, f32); - /* 802542E8 */ void getGlobalPosX(); - /* 80254364 */ void getGlobalPosY(); - /* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 802545B0 */ void paneTrans(f32, f32); - /* 80254638 */ void paneScale(f32, f32); - /* 802547CC */ void scaleAnime(s16, f32, f32, u8); - /* 802548BC */ void colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor, - JUtility::TColor, u8); - /* 80254C90 */ void getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); - /* 80254FB8 */ void getBounds(J2DPane*); -}; - // // Forward References: // @@ -174,8 +97,6 @@ extern "C" void getFirstChildPane__7J2DPaneFv(); extern "C" void getNextChildPane__7J2DPaneFv(); extern "C" void getParentPane__7J2DPaneFv(); extern "C" void setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); extern "C" void _savegpr_24(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); @@ -543,7 +464,8 @@ asm void dPaneClass_setPriority(void** param_0, JKRHeap* param_1, J2DScreen* par #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JSUMemoryInputStream::~JSUMemoryInputStream() { +// asm JSUMemoryInputStream::~JSUMemoryInputStream() { +extern "C" asm void __dt__20JSUMemoryInputStreamFv() { nofralloc #include "asm/d/pane/d_pane_class/__dt__20JSUMemoryInputStreamFv.s" } @@ -553,7 +475,8 @@ asm JSUMemoryInputStream::~JSUMemoryInputStream() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JSURandomInputStream::~JSURandomInputStream() { +// asm JSURandomInputStream::~JSURandomInputStream() { +extern "C" asm void __dt__20JSURandomInputStreamFv() { nofralloc #include "asm/d/pane/d_pane_class/__dt__20JSURandomInputStreamFv.s" } @@ -563,7 +486,8 @@ asm JSURandomInputStream::~JSURandomInputStream() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JSUIosBase::~JSUIosBase() { +// asm JSUIosBase::~JSUIosBase() { +extern "C" asm void __dt__10JSUIosBaseFv() { nofralloc #include "asm/d/pane/d_pane_class/__dt__10JSUIosBaseFv.s" } diff --git a/src/d/pane/d_pane_class_alpha.cpp b/src/d/pane/d_pane_class_alpha.cpp index 08141634ec..7d4cd81f0e 100644 --- a/src/d/pane/d_pane_class_alpha.cpp +++ b/src/d/pane/d_pane_class_alpha.cpp @@ -8,53 +8,6 @@ #include "dolphin/types.h" // -// Types: -// - -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); -}; - -struct JKRExpHeap {}; - -struct J2DScreen {}; - -struct J2DPane { - /* 802F7A8C */ void getFirstChildPane(); - /* 802F7AC4 */ void getNextChildPane(); -}; - -struct CPaneMgrAlphaMorf { - /* 80255C68 */ CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80255CAC */ ~CPaneMgrAlphaMorf(); - /* 80255D48 */ void initiateAlphaMorf(); - /* 80255DD0 */ void setBackupAlpha(); - /* 80255E28 */ void setAlphaMorfRate(f32); - /* 80255E98 */ void childPaneBackupAlpha(J2DPane*); - /* 80255F28 */ void childPaneSetAlphaMorf(J2DPane*, f32); -}; - -struct CPaneMgrAlpha { - /* 802553EC */ CPaneMgrAlpha(); - /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); - /* 8025546C */ ~CPaneMgrAlpha(); - /* 802554E0 */ void initiateAlpha(J2DPane*, JKRExpHeap*); - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 8025564C */ void isVisible(); - /* 80255658 */ void rateCalc(s16, s16, u8); - /* 80255758 */ void setAlpha(u8); - /* 802557D0 */ void setAlphaRate(f32); - /* 80255828 */ void getAlphaRate(); - /* 80255878 */ void alphaAnime(s16, u8, u8, u8); - /* 80255964 */ void alphaAnimeLoop(s16, u8, u8, u8); - /* 80255A60 */ void childPaneCount(J2DPane*); - /* 80255ACC */ void childPaneGetAlpha(J2DPane*); - /* 80255B5C */ void childPaneSetAlpha(J2DPane*, u8); -}; - -// // Forward References: // diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index a1aaf05966..2c64592c5f 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -19,10 +19,6 @@ struct mDoGph_gInf_c { static u8 mFrameBufferTimg[4]; }; -struct JKRHeap { - /* 802CE500 */ void free(void*, JKRHeap*); -}; - struct mDoDvdThd_toMainRam_c { /* 80016394 */ void create(char const*, u8, JKRHeap*); }; @@ -124,11 +120,6 @@ struct dPa_modelPcallBack { /* 80050038 */ ~dPa_modelPcallBack(); }; -struct J3DModelData { - /* 803260CC */ void syncJ3DSysPointers() const; - /* 803260F8 */ void syncJ3DSysFlags() const; -}; - struct dPa_modelEcallBack { struct model_c { /* 8004A608 */ void set(J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, u8); @@ -311,12 +302,6 @@ struct JMath { static u8 sincosTable_[65536]; }; -struct JKRSolidHeap {}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - struct J3DUClipper { /* 802738FC */ void clip(f32 const (*)[4], Vec, f32) const; }; @@ -325,31 +310,12 @@ struct J3DTexture { /* 8031204C */ void loadGX(u16, _GXTexMapID) const; }; -struct J3DSys { - /* 8031073C */ void reinitGX(); -}; - struct J3DShape { /* 80315300 */ void loadPreDrawSetting() const; static u8 sOldVcdVatCmd[4]; }; -struct J3DAnmTexPattern { - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DAnmTevRegKey { - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DMaterialTable { - /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); - /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); - /* 8032FBC8 */ void entryTexNoAnimator(J3DAnmTexPattern*); - /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); -}; - // // Forward References: // @@ -524,7 +490,6 @@ extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; // External References: // -extern "C" void OSReport(); extern "C" void mDoExt_getArchiveHeap__Fv(); extern "C" void mDoExt_createSolidHeapFromGame__FUlUl(); extern "C" void mDoExt_createSolidHeapFromSystem__FUlUl(); @@ -607,32 +572,17 @@ extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(); extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); extern "C" void entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(); extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void PSMTXMultVec(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); extern "C" void GXInvalidateVtxCache(); extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); extern "C" void GXFlush(); -extern "C" void GXBegin(); extern "C" void GXEnableTexOffsets(); extern "C" void GXSetCullMode(); extern "C" void GXSetCoPlanar(); extern "C" void GXSetChanAmbColor(); extern "C" void GXSetChanMatColor(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetBlendMode(); extern "C" void GXSetColorUpdate(); extern "C" void GXSetAlphaUpdate(); extern "C" void GXSetZMode(); @@ -677,7 +627,6 @@ extern "C" u8 s_o_id__8dPa_name[28]; extern "C" u8 mClipper__14mDoLib_clipper[92]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 g_whiteColor; extern "C" extern u32 __float_nan; diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 1767dbbd9b..d7bbf88c78 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -24,10 +24,6 @@ struct daSus_c { /* 800314D4 */ void check(fopAc_ac_c*); }; -struct dScnKy_env_light_c { - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - struct dRes_info_c {}; struct dRes_control_c { @@ -58,21 +54,6 @@ struct dDemo_actor_c { /* 8003815C */ void setActor(fopAc_ac_c*); }; -struct J3DModel {}; - -struct J3DAnmTevRegKey { - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DAnmTextureSRTKey { - /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DMaterialTable { - /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*); - /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); -}; - // // Forward References: // diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index b4a20a12c5..ec8875c295 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -4,6 +4,7 @@ // // #include "f_op/f_op_msg_mng.h" +#include "JSystem/J2DGraph/J2DPane.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -49,10 +50,6 @@ struct JMath { static u8 sincosTable_[65536]; }; -struct JKRHeap { - /* 802CE448 */ void destroy(); -}; - struct JKRExpHeap { /* 802CEE2C */ void create(u32, JKRHeap*, bool); }; @@ -63,10 +60,6 @@ struct J2DPicture { /* 80020368 */ void insert(char const*, u8, f32); }; -struct J2DPane { - /* 80020158 */ void setAlpha(u8); -}; - // // Forward References: // |