diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-08-28 07:25:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-28 16:25:03 +0200 |
| commit | daf45f768d9ae091a97dce1be8d048ac2b7bd54c (patch) | |
| tree | 138798649ad35cb95ff5a0dd49bc7884ed6cdff0 /asm | |
| parent | e14b04c54a40e95f0117df44f1186f2d44799ac7 (diff) | |
move J2D / JUTResFont (#144)
* move some JSystem and meter2_info stuff
* more J2D / JUTTexture / JUTPalette
* setup dScnKy_env_light_c
Diffstat (limited to 'asm')
103 files changed, 0 insertions, 2871 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 |